[CI Skip] 0.100.1

skip-checks: true

.123trigger

@@ -1 +1 @@
-8
+16

.github/workflows/push-master.yml

@@ -53,3 +53,15 @@ jobs:
       run: |
         yarn install --frozen-lockfile
         yarn polkadot-dev-ghact-docs
+
+  dummy:
+    name: Dummy
+    if: "contains(github.event.head_commit.message, '[CI Skip]')"
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [12.x]
+    steps:
+    - name: dummy
+      run: |
+        echo "Dummy skip step"

.gitignore

@@ -12,6 +12,7 @@ tmp/
 .env.production.local
 .npmrc
 .rpt2_cache
+.vscode/
 cc-test-reporter
 lerna-debug.log*
 npm-debug.log*

CHANGELOG.md

@@ -1,3 +1,44 @@
+# 0.100.1
+
+- **Important** This will the the last API version with Substrate 1.x support. Although you will still be able to use subsequent versions with older chans, dependent libraries such as sr25519 may not be compatible.
+- Add support for the Substrate identity module
+- Remove the `codec/Data` type, to remove a conflict with Substrate. This type is now named `Raw`
+- Fix for linked maps using `Option`
+- Add support for `BTreeSet` (Thanks to https://github.com/satellitex)
+- Add support for Metadata v10
+- Add support for latest Polkadot/Substrate types
+- Add `paymentInfo` to submittables to calculate fees
+
+# 0.99.1
+
+- **Breaking change** The `Data` and `U8a` type has been renamed and just replaced with the `Raw` type
+- **Breaking change** The `api.derive.staking.info` has been split into 2 - `staking.query` for non-balance related information (more effective) and `staking.account` that enhances query for all the information previously found `.info`
+- Cleanup `DoubleMap` hashing to always hash over the full value (in the case of `Vec<T>`, this includes the length)
+- Update democracy derives to take care of nextTally and lowestU*nbaked
+- Add additional derives for both council & treasury
+- Alignment with latest Polkadot/Substrate master branch types
+
+# 0.98.1
+
+- Make the TypeScript generation script mor re-usable (Thanks to https://github.com/xlc)
+- Add `.entries()` for all map-types, returning storage keys and values
+- Add `.signAsync` to submittable extrinsics (Thanks to https://github.com/c410-f3r)
+- Cleanup circular references between internal dependencies
+- Support for new Substrate democracy with preimages in derive
+- Alignment of types with Substrate/Polkadot master branches
+
+# 0.97.1
+
+- **Breaking change** Add the passing on an explicit `Registry` to all calls to `createType` as well as all codec classes. If you are upgrading form an older version, use the [migration guide](UPGRADING.md) to walk through the changes required.
+- **Breaking change** The metadata classes have been moved from `@polkadot/types` into `@polkadot/metadata`. If you explicitly create `Metadata` classes, you now would need to do so with the `import Metadata from '@polkadot/metadata';` This is a decorated class, where the previous metadata is now available on `Metadata.metadata`, alongside decorated `consts.*`', `tx.*` and `query.*`.
+- **Breaking change** Session `Keys` defaults to 4 keys now (Substrate master), depending on your node config, you would want to override with e.g. `Keys: 'SessionKeys3'` (1, 2, 3, 4, 5 & 6)
+- **Breaking change** `ValidatorPrefs` now default to the new percentage commission model, to use the previous `validatorPayment`, you can override with `ValidatorPrefs: 'ValidatorPrefsTo196'`
+- `api.derive.*` now has built-in memomization
+- Various fixes and cleanups to `api.derive.*` including era length progress and vesting calculations
+- Aligned all types with the latest Polkadot & Substrate, including Kusama CC3
+- Support for Metadata V9, which adjusts the hashing methods of storage entries
+- Support for Metadata V10 (still un-released), which includes prefixed map support
+
 # 0.96.1
 
 - Updated types for latest Kusama

UPGRADING.md

@@ -2,7 +2,91 @@
 
 This is an upgrade guide for users of the API. It does not attempt to detail each version (the [CHANGELOG](CHANGELOG.md) has all the changes between versions), but rather tries to explain the rationale behind major breaking changes and how users of the API should handle this.
 
-While we try to keep the user-facing interfaces as stable as possible, sometimes you just need to make additions to move forward and improve things down the road, as painful as they may be. Like you, we are also users of the API, and eat our own dogfood - and as such, feel any pains introduced first.
+While we try to keep the user-facing interfaces as stable as possible, sometimes you just need to make additions to move forward and improve things down the road, as painful as they may be. Like you, we are also users of the API, and eat our own dog food - and as such, feel any pains introduced first.
+
+
+## 0.97.1 (and newer)
+
+The 0.97 series lays the groundwork to allow type registration  to be ties to a specific chain and a specific Api instance. In the past, 2 Api instances in the same process would share types, which mean that you could not connect to 2 independent chains with different types. This is very problematic for Polkadot chains, where the idea is to connect to multiple chains.
+
+When using the Api, a new `Registry` will be created on using `new Api(...)` or `Api.create(...)` and this will be transparently passed when creating types. In the cases where you create type instances explicitly or create type classes for injection, you would need to make adjustments.
+
+### Type classes
+
+In a number of instances, developers are creating classes and making these available for interacting with their chains. For instance, an example of a custom type could be -
+
+```js
+import { Struct, Text, u32 } from '@polkadot/types';
+
+export class Preferences extends Struct {
+  constructor (value?: ahy) {
+    super({
+      name: Text,
+      id: u32
+    }, value);
+  }
+
+  ...
+}
+```
+
+In the current iteration, the underlying `@polkadot/types` bases structures now require a `Registry` to be passed as the first parameter. This means that the above signature would be adjusted to -
+
+```js
+// the next import is only required for TypeScript
+import { Registry } from '@polkadot/types/types';
+import { Struct, Text, u32 } from '@polkadot/types';
+
+export class Preferences extends Struct {
+  constructor (registry: Registry, value?: ahy) {
+    super(registry, {
+      name: Text,
+      id: u32
+    }, value);
+  }
+
+  ...
+}
+```
+
+Where the type is used or returned from the API, the `Registry` will be automatically passed to class creation.
+
+### createType
+
+Previously, when creating a type instance such as `BlockNumber`, you would do `api.createType('BlockNumber', <initValue>)`, this is unchanged. In the cases where you directly import from `@polkadot/types`, the following pattern is required -
+
+```js
+import { createType } from '@polkadot/types';
+
+...
+const blockNumber = createType(api.registry, 'BlockNumber', 12345);
+```
+
+In some cases, you would want to explicitly pass a `Registry` interface to the API, instead of relying on it explicitly. This is generally applicable in the cases where you want to use the `createType` independently from the API -
+
+```js
+import { ApiPromise } from '@polkadot/api';
+import { TypeRegistry, createType } from '@polkadot/types';
+
+...
+const registry = new TypeRegistry();
+const blockNumber = createType(registry, 'BlockNumber', 12345);
+const api = await ApiPromise.create({ registry });
+```
+
+### Extrinsic metadata
+
+In some applications, the undocumented `findFunction` has been used to determine the Api has the metadata for a specific extrinsic. The has been exposed on top of `GenericCall`, and it typically used in applications such as signers. Along with the compulsory registry, the above functions have been moved to the `Registry` itself, so if you previously had -
+
+```js
+const { meta, method, section } = GenericCall.findFunction(extrinsic.callIndex);
+```
+
+You need to change it to -
+
+```js
+const { meta, method, section } = registry.findMetaCall(extrinsic.callIndex);
+```
 
 ## 0.90.1 (and newer), from 0.81.1 (and older)
 
@@ -29,10 +113,10 @@ To better align with the actual types from the metadata, and avoid (too much) co
 
 The [@polkadot/api](packages/api) has always handled the conversion of types for parameters when making calls or queries. For example, when making a transfer to `BOB` (address), any of the following is valid -
 
-- `api.tx.balances.transfer(BOB, 12345)` - value specied as a number
-- `api.tx.balances.transfer(BOB, '12345')` - value specied as a string
-- `api.tx.balances.transfer(BOB, '0x3039')` - value specied as a hex
-- `api.tx.balances.transfer(BOB, new BN(12345))` - value specied as a [BN](https://github.com/indutny/bn.js/)
+- `api.tx.balances.transfer(BOB, 12345)` - value specified as a number
+- `api.tx.balances.transfer(BOB, '12345')` - value specified as a string
+- `api.tx.balances.transfer(BOB, '0x3039')` - value specified as a hex
+- `api.tx.balances.transfer(BOB, new BN(12345))` - value specified as a [BN](https://github.com/indutny/bn.js/)
 
 Internally the API will take the input and convert the value into a `Balance`, serialize it using the SCALE codec and transfer it to the node. In some cases users would construct the `Balance` type manually, by importing the class and calling `new` on it. This last approach has now been removed, and where classes are still available (limited reach), discouraged.
 
@@ -108,7 +192,7 @@ export class MyStruct extends Struct {
 }
 ```
 
-Internally the [@polkadot/types](packages/types) package now only defines classes where there are specific encoding logic applied. For all other types, the definitions are done via a JSON-like format and then the TypeScript definitions are generated from these. (In a world where nodes inject types and the type definitions are not needed, this functionality will be useful to allow TS devs to auto-generate type definitions based on what the node defines.)
+Internally the [@polkadot/types](packages/types) package now only defines classes where there are specific encoding logic applied. For all other types, the definitions are done via a JSON-like format and then the TypeScript definitions are generated from these. (In a world where nodes inject types and the type definitions are not needed, this functionality will be useful to allow TS developers to auto-generate type definitions based on what the node defines.)
 
 ### Signing transactions (Signer interface)
 

copy-to-apps.sh

@@ -15,7 +15,7 @@ yarn polkadot-dev-build-ts
 copy_folder "api" "api"
 copy_folder "api-contract" "api-contract"
 copy_folder "api-derive" "api-derive"
-copy_folder "api-metadata" "api-metadata"
+copy_folder "metadata" "metadata"
 copy_folder "rpc-core" "rpc-core"
 copy_folder "rpc-provider" "rpc-provider"
 copy_folder "type-jsonrpc" "jsonrpc"

jest.config.js

@@ -6,8 +6,8 @@ module.exports = Object.assign({}, config, {
   moduleNameMapper: {
     '@polkadot/api-contract(.*)$': '<rootDir>/packages/api-contract/src/$1',
     '@polkadot/api-derive(.*)$': '<rootDir>/packages/api-derive/src/$1',
-    '@polkadot/api-metadata(.*)$': '<rootDir>/packages/api-metadata/src/$1',
     '@polkadot/api(.*)$': '<rootDir>/packages/api/src/$1',
+    '@polkadot/metadata(.*)$': '<rootDir>/packages/metadata/src/$1',
     '@polkadot/rpc-(core|provider)(.*)$': '<rootDir>/packages/rpc-$1/src/$2',
     '@polkadot/jsonrpc(.*)$': '<rootDir>/packages/type-jsonrpc/src/$1',
     '@polkadot/types(.*)$': '<rootDir>/packages/types/src/$1'
@@ -16,7 +16,7 @@ module.exports = Object.assign({}, config, {
     '<rootDir>/packages/api/build',
     '<rootDir>/packages/api-derive/build',
     '<rootDir>/packages/api-contract/build',
-    '<rootDir>/packages/api-metadata/build',
+    '<rootDir>/packages/metadata/build',
     '<rootDir>/packages/rpc-core/build',
     '<rootDir>/packages/rpc-provider/build',
     '<rootDir>/packages/type-jsonrpc/build',

lerna.json

@@ -9,5 +9,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.96.1"
+  "version": "0.100.1"
 }

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.96.1",
+  "version": "0.100.1",
   "private": true,
   "engines": {
     "yarn": "^1.10.1"
@@ -9,11 +9,12 @@
   ],
   "resolutions": {
     "babel-core": "^7.0.0-bridge.0",
-    "typescript": "^3.7.2"
+    "typescript": "^3.7.4"
   },
   "scripts": {
     "build": "yarn build:interfaces && polkadot-dev-build-ts",
     "build:interfaces": "node packages/types/src/scripts/interfacesTsWrapper.js",
+    "circular": "madge --circular --extensions ts ./",
     "docs": "node packages/types/src/scripts/MetadataMdWrapper.js && polkadot-dev-build-docs",
     "chain:info": "node packages/types/src/scripts/extractChainWrapper.js",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx . && tsc --noEmit --pretty",
@@ -28,10 +29,10 @@
     "test:watch": "jest --coverage --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.7.0",
-    "@babel/register": "^7.7.0",
-    "@babel/runtime": "^7.6.3",
-    "@polkadot/dev": "^0.32.0-beta.13",
-    "@polkadot/ts": "^0.1.84"
+    "@babel/core": "^7.7.7",
+    "@babel/register": "^7.7.7",
+    "@babel/runtime": "^7.7.7",
+    "@polkadot/dev": "^0.32.14",
+    "@polkadot/ts": "^0.1.90"
   }
 }

packages/api-contract/README.md

@@ -3,9 +3,12 @@
 Interfaces to allow for the encoding and decoding of Substrate contract ABIs.
 
 ```js
+import {ApiPromise, WsProvider } from '@polkadot/api';
 import { Abi } from '@polkadot/api-contract';
 
-const abi = new Abi(<...JSON ABI...>);
+const wsProvider = new WsProvider(<...Node Url...>);
+const api = await ApiPromise.create({ provider: wsProvider });
+const abi = new Abi(api.registry, <...JSON ABI...>);
 
 api.tx.contracts
   .call(<contract addr>, <value>, <max gas>, abi.messages.<method name>(<...params...>))

packages/api-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "0.96.1",
+  "version": "0.100.1",
   "description": "Interfaces for interacting with contracts and contract ABIs",
   "main": "index.js",
   "keywords": [
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme",
   "dependencies": {
-    "@babel/runtime": "^7.7.1",
-    "@polkadot/types": "^0.96.1"
+    "@babel/runtime": "^7.7.7",
+    "@polkadot/types": "^0.100.1"
   }
 }

packages/api-contract/src/Abi.spec.ts

@@ -1,17 +1,20 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import incrementerAbi from '../test/contracts/incrementer.json';
+import { TypeRegistry } from '@polkadot/types';
 
+import incrementerAbi from '../test/contracts/incrementer.json';
 import { Abi } from '.';
 
 describe('Abi', (): void => {
+  const registry = new TypeRegistry();
+
   describe('incrementer', (): void => {
     let abi: Abi;
 
     beforeEach((): void => {
-      abi = new Abi(incrementerAbi);
+      abi = new Abi(registry, incrementerAbi);
     });
 
     it('has the attached methods', (): void => {

packages/api-contract/src/Abi.ts

@@ -1,8 +1,10 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { Registry } from '@polkadot/types/types';
 import { AbiConstructors, AbiMessages, ContractABI, ContractABIPre, ContractABIFn, InterfaceAbi } from './types';
+
 import { stringCamelCase } from '@polkadot/util';
 
 import ContractRegistry from './ContractRegistry';
@@ -14,8 +16,8 @@ export default class ContractAbi extends ContractRegistry implements InterfaceAb
 
   public readonly messages: AbiMessages;
 
-  constructor (abi: ContractABIPre) {
-    super(abi);
+  constructor (registry: Registry, abi: ContractABIPre) {
+    super(registry, abi);
     [this.abi, this.constructors, this.messages] = this.decodeAbi(abi);
   }
 

packages/api-contract/src/ContractRegistry.ts

@@ -1,29 +1,29 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { CodecArg, Constructor, TypeDef } from '@polkadot/types/types';
+import { CodecArg, Constructor, Registry, TypeDef } from '@polkadot/types/types';
 import { ContractABIArgBasePre, ContractABIContract, ContractABIContractPre, ContractABIEvent, ContractABIEventPre, ContractABIFn, ContractABIFnArg, ContractABIMessage, ContractABIMessageBase, ContractABIMessagePre, ContractABI, ContractABIMessageCommon, ContractABIPre, ContractABIRange, ContractABIRangePre, ContractABIStorage, ContractABIStorageLayout, ContractABIStorageLayoutPre, ContractABIStoragePre, ContractABIStorageStruct, ContractABIStorageStructPre, ContractABITypePre } from './types';
-import { Compact, u32, createClass, createType, encodeType } from '@polkadot/types';
 
+import { Compact, u32, createClass, createType, encodeType } from '@polkadot/types';
 import { assert, hexToU8a, isNumber, isString, isNull, isObject, isUndefined, stringCamelCase, isHex, hexToNumber } from '@polkadot/util';
 
 import MetaRegistry from './MetaRegistry';
 
 // parse a selector, this can be a number (older) or of [<hex>, <hex>, ...]. However,
 // just catch everything (since this is now non-standard for u32 anyway)
-function parseSelector (fnname: string, input: ContractABIMessageCommon['selector']): u32 {
+function parseSelector (registry: Registry, fnname: string, input: ContractABIMessageCommon['selector']): u32 {
   if (isNumber(input)) {
-    return createType('u32', input);
+    return createType(registry, 'u32', input);
   } else if (isHex(input)) {
-    return createType('u32', hexToU8a(input));
+    return createType(registry, 'u32', hexToU8a(input));
   } else if (typeof input === 'string') {
     try {
       const array = JSON.parse(input);
 
       assert(array.length === 4, `${fnname}: Invalid selector length`);
 
-      return createType('u32', Uint8Array.from(
+      return createType(registry, 'u32', Uint8Array.from(
         // the as number[] is here to pacify TS, it doesn't quite know how to handle the cb
         (array as number[]).map((value: string | number): number =>
           isHex(value)
@@ -39,8 +39,9 @@ function parseSelector (fnname: string, input: ContractABIMessageCommon['selecto
   throw new Error(`${fnname}: Unable to parse selector`);
 }
 
-function createArgClass (args: ContractABIFnArg[], baseDef: Record<string, string>): Constructor {
+function createArgClass (registry: Registry, args: ContractABIFnArg[], baseDef: Record<string, string>): Constructor {
   return createClass(
+    registry,
     JSON.stringify(
       args.reduce((base: Record<string, any>, { name, type }): Record<string, any> => {
         base[name] = type.displayName || encodeType(type);
@@ -87,7 +88,7 @@ export default class ContractRegistry extends MetaRegistry {
       assert(isNumber(name) && isString(this.stringAt(name)), `Expected name for ${fnname}`);
       assert(isNull(returnType) || (isNumber(returnType.ty) && isObject(this.typeDefAt(returnType.ty))), `Expected return_type for ${fnname}`);
 
-      parseSelector(fnname, selector);
+      parseSelector(this.registry, fnname, selector);
       this.validateArgs(fnname, message.args);
     });
   }
@@ -113,12 +114,13 @@ export default class ContractRegistry extends MetaRegistry {
         type
       };
     });
-    const Clazz = createArgClass(args, isUndefined(message.selector) ? {} : { __selector: 'u32' });
-    const baseStruct: { [index: string]: any } = { __selector: isUndefined(message.selector) ? undefined : parseSelector(name, message.selector) };
+    const Clazz = createArgClass(this.registry, args, isUndefined(message.selector) ? {} : { __selector: 'u32' });
+    const baseStruct: { [index: string]: any } = { __selector: isUndefined(message.selector) ? undefined : parseSelector(this.registry, name, message.selector) };
     const encoder = (...params: CodecArg[]): Uint8Array => {
       assert(params.length === args.length, `Expected ${args.length} arguments to contract ${name}, found ${params.length}`);
 
       const u8a = new Clazz(
+        this.registry,
         args.reduce((mapped, { name }, index): Record<string, CodecArg> => {
           mapped[name] = params[index];
 

packages/api-contract/src/MetaRegistry.spec.ts

@@ -1,33 +1,42 @@
-// Copyright 2017-2019 @polkadot/types authors & contributors
+// Copyright 2017-2020 @polkadot/types authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import fs from 'fs';
-import path from 'path';
+import { TypeRegistry } from '@polkadot/types';
 
 import MetaRegistry from './MetaRegistry';
 
 import erc20Abi from '../test/contracts/Erc20.json';
+import erc20Cmp from '../test/compare/erc20.test.json';
 import sharedVecAbi from '../test/contracts/SharedVecV2.json';
+import sharedVecCmp from '../test/compare/shared-vec.test.json';
+import test001Abi from '../test/abi/test001.json';
+import test001Cmp from '../test/compare/test001.cmp.json';
+
+function compare (meta: MetaRegistry, other: any): void {
+  try {
+    expect(meta.typeDefs).toEqual(other);
+  } catch (error) {
+    console.error(JSON.stringify(meta.typeDefs));
+
+    throw error;
+  }
+}
 
 describe('MetaRegistry', (): void => {
+  const registry = new TypeRegistry();
+
   describe('construction', (): void => {
     it('initializes from a contract ABI (ERC20)', (): void => {
-      const metaRegistry = new MetaRegistry(erc20Abi);
-      fs.writeFile(path.join(__dirname, '../test/compare/erc20.test.json'), JSON.stringify(metaRegistry.typeDefs, null, 2), function (err): void {
-        if (err) throw err;
-      });
-
-      expect(true).toBe(true);
+      compare(new MetaRegistry(registry, erc20Abi), erc20Cmp);
     });
 
     it('initializes from a contract ABI (SharedVec)', (): void => {
-      const metaRegistry = new MetaRegistry(sharedVecAbi);
-      fs.writeFile(path.join(__dirname, '../test/compare/shared-vec.test.json'), JSON.stringify(metaRegistry.typeDefs, null, 2), function (err): void {
-        if (err) throw err;
-      });
+      compare(new MetaRegistry(registry, sharedVecAbi), sharedVecCmp);
+    });
 
-      expect(true).toBe(true);
+    it('initializes from a contract ABI (Other, test001)', (): void => {
+      compare(new MetaRegistry(registry, test001Abi), test001Cmp);
     });
   });
 });

packages/api-contract/src/MetaRegistry.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { MetaRegistryItem, MetaRegistryJson, MetaTypeDefClikeEnum, MetaType, MetaTypeDefEnum, MetaTypeDefEnumVariant, MetaTypeDefEnumVariantStruct, MetaTypeDefEnumVariantTupleStruct, MetaTypeDefEnumVariantUnit, MetaTypeDefStruct, MetaTypeDefStructField, MetaTypeDefTupleStruct, MetaTypeDefUnion, MetaTypeIdCustom, MetaTypeIdVec, MetaTypeIdVecFixed, MetaTypeInfo, StringIndex, TypeDef, TypeDefInfo, TypeIndex } from '@polkadot/types/types';
+import { MetaRegistryItem, MetaRegistryJson, MetaTypeDefClikeEnum, MetaType, MetaTypeDefEnum, MetaTypeDefEnumVariant, MetaTypeDefEnumVariantStruct, MetaTypeDefEnumVariantTupleStruct, MetaTypeDefEnumVariantUnit, MetaTypeDefStruct, MetaTypeDefStructField, MetaTypeDefTupleStruct, MetaTypeDefUnion, MetaTypeIdCustom, MetaTypeIdVec, MetaTypeIdVecFixed, MetaTypeInfo, Registry, StringIndex, TypeDef, TypeDefInfo, TypeIndex } from '@polkadot/types/types';
 
 import { assert } from '@polkadot/util';
 import { displayType, withTypeString } from '@polkadot/types';
@@ -34,13 +34,16 @@ function detectedType ({ def, id }: MetaType): MetaTypeInfo {
 }
 
 class MetadataRegistryLookup {
+  public readonly registry: Registry;
+
   protected _strings: string[] = [];
 
   protected _types: MetaType[] = [];
 
   public typeDefs: TypeDef[] = [];
 
-  constructor ({ registry: { strings, types } }: MetaRegistryJson) {
+  constructor (registry: Registry, { registry: { strings, types } }: MetaRegistryJson) {
+    this.registry = registry;
     this._strings = strings;
     this._types = types;
   }
@@ -102,8 +105,8 @@ class MetadataRegistryLookup {
 }
 
 export default class MetaRegistry extends MetadataRegistryLookup {
-  constructor (json: MetaRegistryJson) {
-    super(json);
+  constructor (registry: Registry, json: MetaRegistryJson) {
+    super(registry, json);
 
     // Generate TypeDefs for each provided registry type
     this._types.forEach((_, index: number): void => this.setTypeDefAtIndex(index + 1));

packages/api-contract/src/base/Blueprint.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -41,7 +41,7 @@ export default class Blueprint<ApiType extends ApiTypes> extends BaseWithTx<ApiT
   constructor (api: ApiObject<ApiType>, abi: ContractABIPre | Abi, decorateMethod: DecorateMethod<ApiType>, codeHash: string | Hash) {
     super(api, abi, decorateMethod);
 
-    this.codeHash = createType('Hash', codeHash);
+    this.codeHash = createType(this.registry, 'Hash', codeHash);
   }
 
   public deployContract (constructorIndex = 0, endowment: number | BN, maxGas: number | BN, ...params: any[]): BlueprintCreate<ApiType> {

packages/api-contract/src/base/Code.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-contract/src/base/Contract.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -41,10 +41,10 @@ export default class Contract<ApiType extends ApiTypes> extends BaseWithTxAndRpc
 
     return {
       send: this.decorateMethod(
-        as === 'rpc'
+        as === 'rpc' && this.hasRpcContractsCall
           ? (account: IKeyringPair | string | AccountId | Address): ContractCallResult<'rpc'> => {
             return this.rpcContractsCall(
-              createType('ContractCallRequest', {
+              createType(this.registry, 'ContractCallRequest', {
                 origin: account,
                 dest: this.address.toString(),
                 value,
@@ -54,7 +54,7 @@ export default class Contract<ApiType extends ApiTypes> extends BaseWithTxAndRpc
             )
               .pipe(
                 map((result: ContractExecResult): ContractCallOutcome =>
-                  this.createOutcome(result, createType('AccountId', account), def, params)
+                  this.createOutcome(result, createType(this.registry, 'AccountId', account), def, params)
                 )
               );
           }
@@ -74,8 +74,8 @@ export default class Contract<ApiType extends ApiTypes> extends BaseWithTxAndRpc
       const { data } = result.asSuccess;
 
       output = message.returnType
-        ? formatData(data, message.returnType)
-        : createType('Data', data);
+        ? formatData(this.registry, data, message.returnType)
+        : createType(this.registry, 'Raw', data);
     }
 
     return {
@@ -92,6 +92,6 @@ export default class Contract<ApiType extends ApiTypes> extends BaseWithTxAndRpc
   constructor (api: ApiObject<ApiType>, abi: ContractABIPre | Abi, decorateMethod: DecorateMethod<ApiType>, address: string | AccountId | Address) {
     super(api, abi, decorateMethod);
 
-    this.address = createType('Address', address);
+    this.address = createType(this.registry, 'Address', address);
   }
 }

packages/api-contract/src/base/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api authors & contributors
+// Copyright 2017-2020 @polkadot/api authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-contract/src/base/util.ts

@@ -1,12 +1,13 @@
-// Copyright 2017-2019 @polkadot/api authors & contributors
+// Copyright 2017-2020 @polkadot/api authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ApiTypes, DecorateMethod, DecoratedRpc, SubmittableModuleExtrinsics } from '@polkadot/api/types';
 import { ApiObject, ContractABIMessage, ContractABIPre, ContractBase, ContractMessage } from '../types';
 import { RpcInterface } from '@polkadot/rpc-core/jsonrpc.types';
+import { Registry } from '@polkadot/types/types';
 
-import { assert, stringCamelCase } from '@polkadot/util';
+import { assert, isFunction, stringCamelCase } from '@polkadot/util';
 import Abi from '../Abi';
 
 export abstract class Base<ApiType extends ApiTypes> implements ContractBase<ApiType> {
@@ -16,10 +17,13 @@ export abstract class Base<ApiType extends ApiTypes> implements ContractBase<Api
 
   public readonly decorateMethod: DecorateMethod<ApiType>;
 
+  public readonly registry: Registry;
+
   constructor (api: ApiObject<ApiType>, abi: ContractABIPre | Abi, decorateMethod: DecorateMethod<ApiType>) {
     this.abi = abi instanceof Abi
       ? abi
-      : new Abi(abi);
+      : new Abi(api.registry, abi);
+    this.registry = api.registry;
     this.api = api;
     this.decorateMethod = decorateMethod;
   }
@@ -62,13 +66,13 @@ export abstract class BaseWithTx<ApiType extends ApiTypes> extends Base<ApiType>
 }
 
 export abstract class BaseWithTxAndRpcCall<ApiType extends ApiTypes> extends BaseWithTx<ApiType> {
+  public get hasRpcContractsCall (): boolean {
+    return isFunction(this.api.rx.rpc.contracts?.call);
+  }
+
   protected get rpcContractsCall (): DecoratedRpc<'rxjs', RpcInterface>['contracts']['call'] {
+    assert(this.hasRpcContractsCall, 'You need to connect to a node with the contracts.call RPC method.');
+
     return this.api.rx.rpc.contracts.call;
   }
-
-  constructor (api: ApiObject<ApiType>, abi: ContractABIPre | Abi, decorateMethod: DecorateMethod<ApiType>) {
-    super(api, abi, decorateMethod);
-
-    assert(this.api.rx.rpc.contracts && this.api.rx.tx.contracts.call, 'You need to connect to a node with the contracts module, the metadata does not enable api.rpc.contracts.call on this instance');
-  }
 }

packages/api-contract/src/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-contract/src/promise/PromiseBlueprint.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-contract/src/promise/PromiseCode.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-contract/src/promise/PromiseContract.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-contract/src/promise/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-contract/src/rx/RxBlueprint.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-contract/src/rx/RxCode.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-contract/src/rx/RxContract.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-contract/src/rx/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-contract/src/types.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-contract authors & contributors
+// Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-contract/src/util.ts

@@ -1,21 +1,20 @@
-// Copyright 2017-2019 @polkadot/rpc-core authors & contributors
+// Copyright 2017-2020 @polkadot/rpc-core authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Codec, TypeDefInfo, TypeDef } from '@polkadot/types/types';
+import { Codec, Registry, TypeDefInfo, TypeDef } from '@polkadot/types/types';
 
-import { Data, Option, createClass } from '@polkadot/types';
+import { Option, Raw, createClass } from '@polkadot/types';
 import { createTypeUnsafe } from '@polkadot/types/codec';
 
-export function formatData (data: Data, { info, type }: TypeDef): Codec {
-  const u8a = data.toU8a();
-
+export function formatData (registry: Registry, data: Raw, { info, type }: TypeDef): Codec {
   if (info === TypeDefInfo.Option) {
     return new Option(
-      createClass(type),
-      createTypeUnsafe(type, [u8a], true)
+      registry,
+      createClass(registry, type),
+      createTypeUnsafe(registry, type, [data], true)
     );
   }
 
-  return createTypeUnsafe(type, [u8a], true);
+  return createTypeUnsafe(registry, type, [data], true);
 }

packages/api-contract/test/abi/test001.json

@@ -0,0 +1,467 @@
+{
+  "registry": {
+    "strings": [
+      "StorageAndEnv",
+      "app",
+      "__ink_private",
+      "__ink_storage",
+      "__storage",
+      "Storage",
+      "value",
+      "Value",
+      "ink_core",
+      "storage",
+      "cell",
+      "SyncCell",
+      "sync_cell",
+      "Key",
+      "key",
+      "name",
+      "vec",
+      "Vec",
+      "elems",
+      "__env",
+      "EnvAccess",
+      "env2",
+      "env_access",
+      "immutable",
+      "TestEnv",
+      "test",
+      "accessor",
+      "DefaultSrmlTypes",
+      "types",
+      "access",
+      "EnvAccessMut",
+      "mutable",
+      "env",
+      "PhantomData",
+      "buffer",
+      "has_interacted",
+      "has_returned_value",
+      "new",
+      "init_value",
+      "bool",
+      "default",
+      "flip",
+      "get"
+    ],
+    "types": [
+      {
+        "id": {
+          "custom.name": 1,
+          "custom.namespace": [
+            2,
+            2,
+            3,
+            4
+          ],
+          "custom.params": []
+        },
+        "def": {
+          "struct.fields": [
+            {
+              "name": 5,
+              "type": 2
+            },
+            {
+              "name": 20,
+              "type": 14
+            }
+          ]
+        }
+      },
+      {
+        "id": {
+          "custom.name": 6,
+          "custom.namespace": [
+            2,
+            2,
+            3,
+            4
+          ],
+          "custom.params": []
+        },
+        "def": {
+          "struct.fields": [
+            {
+              "name": 7,
+              "type": 3
+            },
+            {
+              "name": 16,
+              "type": 9
+            }
+          ]
+        }
+      },
+      {
+        "id": {
+          "custom.name": 8,
+          "custom.namespace": [
+            9,
+            10,
+            7
+          ],
+          "custom.params": [
+            4
+          ]
+        },
+        "def": {
+          "struct.fields": [
+            {
+              "name": 11,
+              "type": 5
+            }
+          ]
+        }
+      },
+      {
+        "id": "bool",
+        "def": "builtin"
+      },
+      {
+        "id": {
+          "custom.name": 12,
+          "custom.namespace": [
+            9,
+            10,
+            11,
+            13
+          ],
+          "custom.params": [
+            4
+          ]
+        },
+        "def": {
+          "struct.fields": [
+            {
+              "name": 11,
+              "type": 6
+            }
+          ]
+        }
+      },
+      {
+        "id": {
+          "custom.name": 14,
+          "custom.namespace": [
+            9,
+            10,
+            15
+          ],
+          "custom.params": []
+        },
+        "def": {
+          "tuple_struct.types": [
+            7
+          ]
+        }
+      },
+      {
+        "id": {
+          "array.len": 32,
+          "array.type": 8
+        },
+        "def": "builtin"
+      },
+      {
+        "id": "u8",
+        "def": "builtin"
+      },
+      {
+        "id": {
+          "custom.name": 8,
+          "custom.namespace": [
+            9,
+            10,
+            7
+          ],
+          "custom.params": [
+            10
+          ]
+        },
+        "def": {
+          "struct.fields": [
+            {
+              "name": 11,
+              "type": 13
+            }
+          ]
+        }
+      },
+      {
+        "id": "str",
+        "def": {
+          "struct.fields": [
+            {
+              "name": 17,
+              "type": 11
+            }
+          ]
+        }
+      },
+      {
+        "id": {
+          "custom.name": 18,
+          "custom.namespace": [],
+          "custom.params": [
+            8
+          ]
+        },
+        "def": {
+          "struct.fields": [
+            {
+              "name": 19,
+              "type": 12
+            }
+          ]
+        }
+      },
+      {
+        "id": {
+          "slice.type": 8
+        },
+        "def": "builtin"
+      },
+      {
+        "id": {
+          "custom.name": 12,
+          "custom.namespace": [
+            9,
+            10,
+            11,
+            13
+          ],
+          "custom.params": [
+            10
+          ]
+        },
+        "def": {
+          "struct.fields": [
+            {
+              "name": 11,
+              "type": 6
+            }
+          ]
+        }
+      },
+      {
+        "id": {
+          "custom.name": 21,
+          "custom.namespace": [
+            9,
+            22,
+            23,
+            24
+          ],
+          "custom.params": [
+            15
+          ]
+        },
+        "def": {
+          "struct.fields": [
+            {
+              "name": 30,
+              "type": 17
+            }
+          ]
+        }
+      },
+      {
+        "id": {
+          "custom.name": 25,
+          "custom.namespace": [
+            9,
+            22,
+            26,
+            27
+          ],
+          "custom.params": [
+            16
+          ]
+        },
+        "def": {
+          "struct.fields": []
+        }
+      },
+      {
+        "id": {
+          "custom.name": 28,
+          "custom.namespace": [
+            9,
+            22,
+            29
+          ],
+          "custom.params": []
+        },
+        "def": {
+          "clike_enum.variants": []
+        }
+      },
+      {
+        "id": {
+          "custom.name": 31,
+          "custom.namespace": [
+            9,
+            22,
+            23,
+            32
+          ],
+          "custom.params": [
+            15
+          ]
+        },
+        "def": {
+          "struct.fields": [
+            {
+              "name": 33,
+              "type": 18
+            },
+            {
+              "name": 35,
+              "type": 11
+            },
+            {
+              "name": 36,
+              "type": 4
+            },
+            {
+              "name": 37,
+              "type": 4
+            }
+          ]
+        }
+      },
+      {
+        "id": {
+          "custom.name": 34,
+          "custom.namespace": [],
+          "custom.params": [
+            15
+          ]
+        },
+        "def": {
+          "tuple_struct.types": []
+        }
+      }
+    ]
+  },
+  "storage": {
+    "struct.type": 1,
+    "struct.fields": [
+      {
+        "name": 10,
+        "layout": {
+          "struct.type": 2,
+          "struct.fields": [
+            {
+              "name": 7,
+              "layout": {
+                "struct.type": 3,
+                "struct.fields": [
+                  {
+                    "name": 11,
+                    "layout": {
+                      "range.offset": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                      "range.len": 1,
+                      "range.elem_type": 4
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              "name": 16,
+              "layout": {
+                "struct.type": 9,
+                "struct.fields": [
+                  {
+                    "name": 11,
+                    "layout": {
+                      "range.offset": "0x0000000000000000000000000000000000000000000000000000000000000001",
+                      "range.len": 1,
+                      "range.elem_type": 10
+                    }
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      }
+    ]
+  },
+  "contract": {
+    "name": 2,
+    "constructors": [
+      {
+        "name": 38,
+        "selector": "[\"0x5E\",\"0xBD\",\"0x88\",\"0xD6\"]",
+        "args": [
+          {
+            "name": 16,
+            "type": {
+              "ty": 11,
+              "display_name": [
+                18
+              ]
+            }
+          },
+          {
+            "name": 39,
+            "type": {
+              "ty": 4,
+              "display_name": [
+                40
+              ]
+            }
+          }
+        ],
+        "docs": [
+          "Constructor that initializes the `bool` value to the given `init_value`."
+        ]
+      },
+      {
+        "name": 41,
+        "selector": "[\"0x02\",\"0x22\",\"0xFF\",\"0x18\"]",
+        "args": [],
+        "docs": [
+          "Constructor that initializes the `bool` value to `false`.",
+          "",
+          "Constructors can delegate to other constructors."
+        ]
+      }
+    ],
+    "messages": [
+      {
+        "name": 42,
+        "selector": "[\"0x8C\",\"0x97\",\"0xDB\",\"0x39\"]",
+        "mutates": true,
+        "args": [],
+        "return_type": null,
+        "docs": [
+          "A message that can be called on instantiated contracts.",
+          "This one flips the value of the stored `bool` from `true`",
+          "to `false` and vice versa."
+        ]
+      },
+      {
+        "name": 43,
+        "selector": "[\"0x25\",\"0x44\",\"0x4A\",\"0xFE\"]",
+        "mutates": false,
+        "args": [],
+        "return_type": {
+          "ty": 4,
+          "display_name": [
+            40
+          ]
+        },
+        "docs": [
+          "Simply returns the current value of our `bool`."
+        ]
+      }
+    ],
+    "events": [],
+    "docs": []
+  }
+}

packages/api-contract/test/compare/erc20.test.json

@@ -1,15 +1,15 @@
 [
   {
     "info": 9,
-    "type": "{ \"total_supply\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u128>\" }<u128>\", \"balances\": \"{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }<([u8;32]), u128>>\" }<([u8;32]), u128>\", \"allowances\": \"{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }<(AccountId, AccountId), u128>>\" }<(AccountId, AccountId), u128>\" }",
+    "type": "{\"total_supply\":\"{\\\"cell\\\":\\\"{\\\\\\\"cell\\\\\\\":\\\\\\\"([u8;32])\\\\\\\"}\\\"}\",\"balances\":\"{\\\"len\\\":\\\"{\\\\\\\"cell\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"cell\\\\\\\\\\\\\\\":\\\\\\\\\\\\\\\"([u8;32])\\\\\\\\\\\\\\\"}\\\\\\\"}\\\",\\\"entries\\\":\\\"{\\\\\\\"cells_key\\\\\\\":\\\\\\\"([u8;32])\\\\\\\"}\\\"}\",\"allowances\":\"{\\\"len\\\":\\\"{\\\\\\\"cell\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"cell\\\\\\\\\\\\\\\":\\\\\\\\\\\\\\\"([u8;32])\\\\\\\\\\\\\\\"}\\\\\\\"}\\\",\\\"entries\\\":\\\"{\\\\\\\"cells_key\\\\\\\":\\\\\\\"([u8;32])\\\\\\\"}\\\"}\"}",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u128>\" }",
+        "type": "{\"cell\":\"{\\\"cell\\\":\\\"([u8;32])\\\"}\"}",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"([u8;32])\" }",
+            "type": "{\"cell\":\"([u8;32])\"}",
             "sub": [
               {
                 "info": 10,
@@ -54,15 +54,15 @@
       },
       {
         "info": 9,
-        "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }<([u8;32]), u128>>\" }",
+        "type": "{\"len\":\"{\\\"cell\\\":\\\"{\\\\\\\"cell\\\\\\\":\\\\\\\"([u8;32])\\\\\\\"}\\\"}\",\"entries\":\"{\\\"cells_key\\\":\\\"([u8;32])\\\"}\"}",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
+            "type": "{\"cell\":\"{\\\"cell\\\":\\\"([u8;32])\\\"}\"}",
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"cell\": \"([u8;32])\" }",
+                "type": "{\"cell\":\"([u8;32])\"}",
                 "sub": [
                   {
                     "info": 10,
@@ -107,7 +107,7 @@
           },
           {
             "info": 9,
-            "type": "{ \"cells_key\": \"([u8;32])\" }",
+            "type": "{\"cells_key\":\"([u8;32])\"}",
             "sub": [
               {
                 "info": 10,
@@ -136,7 +136,7 @@
             "params": [
               {
                 "info": 3,
-                "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }",
+                "type": "{\"_enum\":{\"Occupied\":\"({\\\"key\\\":\\\"([u8;32])\\\",\\\"val\\\":\\\"u128\\\"})\",\"Removed\":\"Null\"}}",
                 "sub": [
                   {
                     "info": 10,
@@ -144,11 +144,11 @@
                     "sub": [
                       {
                         "info": 9,
-                        "type": "{ \"key\": \"AccountId\", \"val\": \"u128\" }",
+                        "type": "{\"key\":\"([u8;32])\",\"val\":\"u128\"}",
                         "sub": [
                           {
                             "info": 10,
-                            "type": "AccountId",
+                            "type": "([u8;32])",
                             "sub": [
                               {
                                 "info": 12,
@@ -178,7 +178,7 @@
                         "params": [
                           {
                             "info": 10,
-                            "type": "AccountId",
+                            "type": "([u8;32])",
                             "sub": [
                               {
                                 "info": 12,
@@ -205,7 +205,7 @@
                         "index": 0
                       }
                     ],
-                    "type": "({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)"
+                    "type": "({\"key\":\"([u8;32])\",\"val\":\"u128\"})"
                   },
                   {
                     "info": 6,
@@ -218,7 +218,7 @@
                 "params": [
                   {
                     "info": 10,
-                    "type": "AccountId",
+                    "type": "([u8;32])",
                     "sub": [
                       {
                         "info": 12,
@@ -251,7 +251,7 @@
         "params": [
           {
             "info": 10,
-            "type": "AccountId",
+            "type": "([u8;32])",
             "sub": [
               {
                 "info": 12,
@@ -278,15 +278,15 @@
       },
       {
         "info": 9,
-        "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }<(AccountId, AccountId), u128>>\" }",
+        "type": "{\"len\":\"{\\\"cell\\\":\\\"{\\\\\\\"cell\\\\\\\":\\\\\\\"([u8;32])\\\\\\\"}\\\"}\",\"entries\":\"{\\\"cells_key\\\":\\\"([u8;32])\\\"}\"}",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
+            "type": "{\"cell\":\"{\\\"cell\\\":\\\"([u8;32])\\\"}\"}",
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"cell\": \"([u8;32])\" }",
+                "type": "{\"cell\":\"([u8;32])\"}",
                 "sub": [
                   {
                     "info": 10,
@@ -331,7 +331,7 @@
           },
           {
             "info": 9,
-            "type": "{ \"cells_key\": \"([u8;32])\" }",
+            "type": "{\"cells_key\":\"([u8;32])\"}",
             "sub": [
               {
                 "info": 10,
@@ -360,7 +360,7 @@
             "params": [
               {
                 "info": 3,
-                "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }",
+                "type": "{\"_enum\":{\"Occupied\":\"({\\\"key\\\":\\\"(([u8;32]), ([u8;32]))\\\",\\\"val\\\":\\\"u128\\\"})\",\"Removed\":\"Null\"}}",
                 "sub": [
                   {
                     "info": 10,
@@ -368,15 +368,15 @@
                     "sub": [
                       {
                         "info": 9,
-                        "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }",
+                        "type": "{\"key\":\"(([u8;32]), ([u8;32]))\",\"val\":\"u128\"}",
                         "sub": [
                           {
                             "info": 10,
-                            "type": "(AccountId, AccountId)",
+                            "type": "(([u8;32]), ([u8;32]))",
                             "sub": [
                               {
                                 "info": 10,
-                                "type": "AccountId",
+                                "type": "([u8;32])",
                                 "sub": [
                                   {
                                     "info": 12,
@@ -397,7 +397,7 @@
                               },
                               {
                                 "info": 10,
-                                "type": "AccountId",
+                                "type": "([u8;32])",
                                 "sub": [
                                   {
                                     "info": 12,
@@ -430,11 +430,11 @@
                         "params": [
                           {
                             "info": 10,
-                            "type": "(AccountId, AccountId)",
+                            "type": "(([u8;32]), ([u8;32]))",
                             "sub": [
                               {
                                 "info": 10,
-                                "type": "AccountId",
+                                "type": "([u8;32])",
                                 "sub": [
                                   {
                                     "info": 12,
@@ -455,7 +455,7 @@
                               },
                               {
                                 "info": 10,
-                                "type": "AccountId",
+                                "type": "([u8;32])",
                                 "sub": [
                                   {
                                     "info": 12,
@@ -484,7 +484,7 @@
                         "index": 0
                       }
                     ],
-                    "type": "({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)"
+                    "type": "({\"key\":\"(([u8;32]), ([u8;32]))\",\"val\":\"u128\"})"
                   },
                   {
                     "info": 6,
@@ -497,11 +497,11 @@
                 "params": [
                   {
                     "info": 10,
-                    "type": "(AccountId, AccountId)",
+                    "type": "(([u8;32]), ([u8;32]))",
                     "sub": [
                       {
                         "info": 10,
-                        "type": "AccountId",
+                        "type": "([u8;32])",
                         "sub": [
                           {
                             "info": 12,
@@ -522,7 +522,7 @@
                       },
                       {
                         "info": 10,
-                        "type": "AccountId",
+                        "type": "([u8;32])",
                         "sub": [
                           {
                             "info": 12,
@@ -557,11 +557,11 @@
         "params": [
           {
             "info": 10,
-            "type": "(AccountId, AccountId)",
+            "type": "(([u8;32]), ([u8;32]))",
             "sub": [
               {
                 "info": 10,
-                "type": "AccountId",
+                "type": "([u8;32])",
                 "sub": [
                   {
                     "info": 12,
@@ -582,7 +582,7 @@
               },
               {
                 "info": 10,
-                "type": "AccountId",
+                "type": "([u8;32])",
                 "sub": [
                   {
                     "info": 12,
@@ -615,11 +615,11 @@
   },
   {
     "info": 9,
-    "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u128>\" }",
+    "type": "{\"cell\":\"{\\\"cell\\\":\\\"([u8;32])\\\"}\"}",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"([u8;32])\" }",
+        "type": "{\"cell\":\"([u8;32])\"}",
         "sub": [
           {
             "info": 10,
@@ -668,7 +668,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cell\": \"([u8;32])\" }",
+    "type": "{\"cell\":\"([u8;32])\"}",
     "sub": [
       {
         "info": 10,
@@ -740,15 +740,15 @@
   },
   {
     "info": 9,
-    "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }<([u8;32]), u128>>\" }",
+    "type": "{\"len\":\"{\\\"cell\\\":\\\"{\\\\\\\"cell\\\\\\\":\\\\\\\"([u8;32])\\\\\\\"}\\\"}\",\"entries\":\"{\\\"cells_key\\\":\\\"([u8;32])\\\"}\"}",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
+        "type": "{\"cell\":\"{\\\"cell\\\":\\\"([u8;32])\\\"}\"}",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"([u8;32])\" }",
+            "type": "{\"cell\":\"([u8;32])\"}",
             "sub": [
               {
                 "info": 10,
@@ -793,7 +793,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"cells_key\": \"([u8;32])\" }",
+        "type": "{\"cells_key\":\"([u8;32])\"}",
         "sub": [
           {
             "info": 10,
@@ -822,7 +822,7 @@
         "params": [
           {
             "info": 3,
-            "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }",
+            "type": "{\"_enum\":{\"Occupied\":\"({\\\"key\\\":\\\"([u8;32])\\\",\\\"val\\\":\\\"u128\\\"})\",\"Removed\":\"Null\"}}",
             "sub": [
               {
                 "info": 10,
@@ -830,11 +830,11 @@
                 "sub": [
                   {
                     "info": 9,
-                    "type": "{ \"key\": \"AccountId\", \"val\": \"u128\" }",
+                    "type": "{\"key\":\"([u8;32])\",\"val\":\"u128\"}",
                     "sub": [
                       {
                         "info": 10,
-                        "type": "AccountId",
+                        "type": "([u8;32])",
                         "sub": [
                           {
                             "info": 12,
@@ -864,7 +864,7 @@
                     "params": [
                       {
                         "info": 10,
-                        "type": "AccountId",
+                        "type": "([u8;32])",
                         "sub": [
                           {
                             "info": 12,
@@ -891,7 +891,7 @@
                     "index": 0
                   }
                 ],
-                "type": "({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)"
+                "type": "({\"key\":\"([u8;32])\",\"val\":\"u128\"})"
               },
               {
                 "info": 6,
@@ -904,7 +904,7 @@
             "params": [
               {
                 "info": 10,
-                "type": "AccountId",
+                "type": "([u8;32])",
                 "sub": [
                   {
                     "info": 12,
@@ -937,7 +937,7 @@
     "params": [
       {
         "info": 10,
-        "type": "AccountId",
+        "type": "([u8;32])",
         "sub": [
           {
             "info": 12,
@@ -964,7 +964,7 @@
   },
   {
     "info": 10,
-    "type": "AccountId",
+    "type": "([u8;32])",
     "sub": [
       {
         "info": 12,
@@ -985,11 +985,11 @@
   },
   {
     "info": 9,
-    "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
+    "type": "{\"cell\":\"{\\\"cell\\\":\\\"([u8;32])\\\"}\"}",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"([u8;32])\" }",
+        "type": "{\"cell\":\"([u8;32])\"}",
         "sub": [
           {
             "info": 10,
@@ -1038,7 +1038,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cell\": \"([u8;32])\" }",
+    "type": "{\"cell\":\"([u8;32])\"}",
     "sub": [
       {
         "info": 10,
@@ -1073,7 +1073,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cells_key\": \"([u8;32])\" }",
+    "type": "{\"cells_key\":\"([u8;32])\"}",
     "sub": [
       {
         "info": 10,
@@ -1102,7 +1102,7 @@
     "params": [
       {
         "info": 3,
-        "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }",
+        "type": "{\"_enum\":{\"Occupied\":\"({\\\"key\\\":\\\"([u8;32])\\\",\\\"val\\\":\\\"u128\\\"})\",\"Removed\":\"Null\"}}",
         "sub": [
           {
             "info": 10,
@@ -1110,11 +1110,11 @@
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"key\": \"AccountId\", \"val\": \"u128\" }",
+                "type": "{\"key\":\"([u8;32])\",\"val\":\"u128\"}",
                 "sub": [
                   {
                     "info": 10,
-                    "type": "AccountId",
+                    "type": "([u8;32])",
                     "sub": [
                       {
                         "info": 12,
@@ -1144,7 +1144,7 @@
                 "params": [
                   {
                     "info": 10,
-                    "type": "AccountId",
+                    "type": "([u8;32])",
                     "sub": [
                       {
                         "info": 12,
@@ -1171,7 +1171,7 @@
                 "index": 0
               }
             ],
-            "type": "({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)"
+            "type": "({\"key\":\"([u8;32])\",\"val\":\"u128\"})"
           },
           {
             "info": 6,
@@ -1184,7 +1184,7 @@
         "params": [
           {
             "info": 10,
-            "type": "AccountId",
+            "type": "([u8;32])",
             "sub": [
               {
                 "info": 12,
@@ -1213,7 +1213,7 @@
   },
   {
     "info": 3,
-    "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)\", \"Removed\": \"Null\"\" }\" }",
+    "type": "{\"_enum\":{\"Occupied\":\"({\\\"key\\\":\\\"([u8;32])\\\",\\\"val\\\":\\\"u128\\\"})\",\"Removed\":\"Null\"}}",
     "sub": [
       {
         "info": 10,
@@ -1221,11 +1221,11 @@
         "sub": [
           {
             "info": 9,
-            "type": "{ \"key\": \"AccountId\", \"val\": \"u128\" }",
+            "type": "{\"key\":\"([u8;32])\",\"val\":\"u128\"}",
             "sub": [
               {
                 "info": 10,
-                "type": "AccountId",
+                "type": "([u8;32])",
                 "sub": [
                   {
                     "info": 12,
@@ -1255,7 +1255,7 @@
             "params": [
               {
                 "info": 10,
-                "type": "AccountId",
+                "type": "([u8;32])",
                 "sub": [
                   {
                     "info": 12,
@@ -1282,7 +1282,7 @@
             "index": 0
           }
         ],
-        "type": "({ \"key\": \"AccountId\", \"val\": \"u128\" }<([u8;32]), u128>)"
+        "type": "({\"key\":\"([u8;32])\",\"val\":\"u128\"})"
       },
       {
         "info": 6,
@@ -1295,7 +1295,7 @@
     "params": [
       {
         "info": 10,
-        "type": "AccountId",
+        "type": "([u8;32])",
         "sub": [
           {
             "info": 12,
@@ -1322,11 +1322,11 @@
   },
   {
     "info": 9,
-    "type": "{ \"key\": \"AccountId\", \"val\": \"u128\" }",
+    "type": "{\"key\":\"([u8;32])\",\"val\":\"u128\"}",
     "sub": [
       {
         "info": 10,
-        "type": "AccountId",
+        "type": "([u8;32])",
         "sub": [
           {
             "info": 12,
@@ -1356,7 +1356,7 @@
     "params": [
       {
         "info": 10,
-        "type": "AccountId",
+        "type": "([u8;32])",
         "sub": [
           {
             "info": 12,
@@ -1383,15 +1383,15 @@
   },
   {
     "info": 9,
-    "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }<(AccountId, AccountId), u128>>\" }",
+    "type": "{\"len\":\"{\\\"cell\\\":\\\"{\\\\\\\"cell\\\\\\\":\\\\\\\"([u8;32])\\\\\\\"}\\\"}\",\"entries\":\"{\\\"cells_key\\\":\\\"([u8;32])\\\"}\"}",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
+        "type": "{\"cell\":\"{\\\"cell\\\":\\\"([u8;32])\\\"}\"}",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"([u8;32])\" }",
+            "type": "{\"cell\":\"([u8;32])\"}",
             "sub": [
               {
                 "info": 10,
@@ -1436,7 +1436,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"cells_key\": \"([u8;32])\" }",
+        "type": "{\"cells_key\":\"([u8;32])\"}",
         "sub": [
           {
             "info": 10,
@@ -1465,7 +1465,7 @@
         "params": [
           {
             "info": 3,
-            "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }",
+            "type": "{\"_enum\":{\"Occupied\":\"({\\\"key\\\":\\\"(([u8;32]), ([u8;32]))\\\",\\\"val\\\":\\\"u128\\\"})\",\"Removed\":\"Null\"}}",
             "sub": [
               {
                 "info": 10,
@@ -1473,15 +1473,15 @@
                 "sub": [
                   {
                     "info": 9,
-                    "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }",
+                    "type": "{\"key\":\"(([u8;32]), ([u8;32]))\",\"val\":\"u128\"}",
                     "sub": [
                       {
                         "info": 10,
-                        "type": "(AccountId, AccountId)",
+                        "type": "(([u8;32]), ([u8;32]))",
                         "sub": [
                           {
                             "info": 10,
-                            "type": "AccountId",
+                            "type": "([u8;32])",
                             "sub": [
                               {
                                 "info": 12,
@@ -1502,7 +1502,7 @@
                           },
                           {
                             "info": 10,
-                            "type": "AccountId",
+                            "type": "([u8;32])",
                             "sub": [
                               {
                                 "info": 12,
@@ -1535,11 +1535,11 @@
                     "params": [
                       {
                         "info": 10,
-                        "type": "(AccountId, AccountId)",
+                        "type": "(([u8;32]), ([u8;32]))",
                         "sub": [
                           {
                             "info": 10,
-                            "type": "AccountId",
+                            "type": "([u8;32])",
                             "sub": [
                               {
                                 "info": 12,
@@ -1560,7 +1560,7 @@
                           },
                           {
                             "info": 10,
-                            "type": "AccountId",
+                            "type": "([u8;32])",
                             "sub": [
                               {
                                 "info": 12,
@@ -1589,7 +1589,7 @@
                     "index": 0
                   }
                 ],
-                "type": "({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)"
+                "type": "({\"key\":\"(([u8;32]), ([u8;32]))\",\"val\":\"u128\"})"
               },
               {
                 "info": 6,
@@ -1602,11 +1602,11 @@
             "params": [
               {
                 "info": 10,
-                "type": "(AccountId, AccountId)",
+                "type": "(([u8;32]), ([u8;32]))",
                 "sub": [
                   {
                     "info": 10,
-                    "type": "AccountId",
+                    "type": "([u8;32])",
                     "sub": [
                       {
                         "info": 12,
@@ -1627,7 +1627,7 @@
                   },
                   {
                     "info": 10,
-                    "type": "AccountId",
+                    "type": "([u8;32])",
                     "sub": [
                       {
                         "info": 12,
@@ -1662,11 +1662,11 @@
     "params": [
       {
         "info": 10,
-        "type": "(AccountId, AccountId)",
+        "type": "(([u8;32]), ([u8;32]))",
         "sub": [
           {
             "info": 10,
-            "type": "AccountId",
+            "type": "([u8;32])",
             "sub": [
               {
                 "info": 12,
@@ -1687,7 +1687,7 @@
           },
           {
             "info": 10,
-            "type": "AccountId",
+            "type": "([u8;32])",
             "sub": [
               {
                 "info": 12,
@@ -1716,11 +1716,11 @@
   },
   {
     "info": 10,
-    "type": "(AccountId, AccountId)",
+    "type": "(([u8;32]), ([u8;32]))",
     "sub": [
       {
         "info": 10,
-        "type": "AccountId",
+        "type": "([u8;32])",
         "sub": [
           {
             "info": 12,
@@ -1741,7 +1741,7 @@
       },
       {
         "info": 10,
-        "type": "AccountId",
+        "type": "([u8;32])",
         "sub": [
           {
             "info": 12,
@@ -1764,7 +1764,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cells_key\": \"([u8;32])\" }",
+    "type": "{\"cells_key\":\"([u8;32])\"}",
     "sub": [
       {
         "info": 10,
@@ -1793,7 +1793,7 @@
     "params": [
       {
         "info": 3,
-        "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }",
+        "type": "{\"_enum\":{\"Occupied\":\"({\\\"key\\\":\\\"(([u8;32]), ([u8;32]))\\\",\\\"val\\\":\\\"u128\\\"})\",\"Removed\":\"Null\"}}",
         "sub": [
           {
             "info": 10,
@@ -1801,15 +1801,15 @@
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }",
+                "type": "{\"key\":\"(([u8;32]), ([u8;32]))\",\"val\":\"u128\"}",
                 "sub": [
                   {
                     "info": 10,
-                    "type": "(AccountId, AccountId)",
+                    "type": "(([u8;32]), ([u8;32]))",
                     "sub": [
                       {
                         "info": 10,
-                        "type": "AccountId",
+                        "type": "([u8;32])",
                         "sub": [
                           {
                             "info": 12,
@@ -1830,7 +1830,7 @@
                       },
                       {
                         "info": 10,
-                        "type": "AccountId",
+                        "type": "([u8;32])",
                         "sub": [
                           {
                             "info": 12,
@@ -1863,11 +1863,11 @@
                 "params": [
                   {
                     "info": 10,
-                    "type": "(AccountId, AccountId)",
+                    "type": "(([u8;32]), ([u8;32]))",
                     "sub": [
                       {
                         "info": 10,
-                        "type": "AccountId",
+                        "type": "([u8;32])",
                         "sub": [
                           {
                             "info": 12,
@@ -1888,7 +1888,7 @@
                       },
                       {
                         "info": 10,
-                        "type": "AccountId",
+                        "type": "([u8;32])",
                         "sub": [
                           {
                             "info": 12,
@@ -1917,7 +1917,7 @@
                 "index": 0
               }
             ],
-            "type": "({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)"
+            "type": "({\"key\":\"(([u8;32]), ([u8;32]))\",\"val\":\"u128\"})"
           },
           {
             "info": 6,
@@ -1930,11 +1930,11 @@
         "params": [
           {
             "info": 10,
-            "type": "(AccountId, AccountId)",
+            "type": "(([u8;32]), ([u8;32]))",
             "sub": [
               {
                 "info": 10,
-                "type": "AccountId",
+                "type": "([u8;32])",
                 "sub": [
                   {
                     "info": 12,
@@ -1955,7 +1955,7 @@
               },
               {
                 "info": 10,
-                "type": "AccountId",
+                "type": "([u8;32])",
                 "sub": [
                   {
                     "info": 12,
@@ -1986,7 +1986,7 @@
   },
   {
     "info": 3,
-    "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)\", \"Removed\": \"Null\"\" }\" }",
+    "type": "{\"_enum\":{\"Occupied\":\"({\\\"key\\\":\\\"(([u8;32]), ([u8;32]))\\\",\\\"val\\\":\\\"u128\\\"})\",\"Removed\":\"Null\"}}",
     "sub": [
       {
         "info": 10,
@@ -1994,15 +1994,15 @@
         "sub": [
           {
             "info": 9,
-            "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }",
+            "type": "{\"key\":\"(([u8;32]), ([u8;32]))\",\"val\":\"u128\"}",
             "sub": [
               {
                 "info": 10,
-                "type": "(AccountId, AccountId)",
+                "type": "(([u8;32]), ([u8;32]))",
                 "sub": [
                   {
                     "info": 10,
-                    "type": "AccountId",
+                    "type": "([u8;32])",
                     "sub": [
                       {
                         "info": 12,
@@ -2023,7 +2023,7 @@
                   },
                   {
                     "info": 10,
-                    "type": "AccountId",
+                    "type": "([u8;32])",
                     "sub": [
                       {
                         "info": 12,
@@ -2056,11 +2056,11 @@
             "params": [
               {
                 "info": 10,
-                "type": "(AccountId, AccountId)",
+                "type": "(([u8;32]), ([u8;32]))",
                 "sub": [
                   {
                     "info": 10,
-                    "type": "AccountId",
+                    "type": "([u8;32])",
                     "sub": [
                       {
                         "info": 12,
@@ -2081,7 +2081,7 @@
                   },
                   {
                     "info": 10,
-                    "type": "AccountId",
+                    "type": "([u8;32])",
                     "sub": [
                       {
                         "info": 12,
@@ -2110,7 +2110,7 @@
             "index": 0
           }
         ],
-        "type": "({ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }<(AccountId, AccountId), u128>)"
+        "type": "({\"key\":\"(([u8;32]), ([u8;32]))\",\"val\":\"u128\"})"
       },
       {
         "info": 6,
@@ -2123,11 +2123,11 @@
     "params": [
       {
         "info": 10,
-        "type": "(AccountId, AccountId)",
+        "type": "(([u8;32]), ([u8;32]))",
         "sub": [
           {
             "info": 10,
-            "type": "AccountId",
+            "type": "([u8;32])",
             "sub": [
               {
                 "info": 12,
@@ -2148,7 +2148,7 @@
           },
           {
             "info": 10,
-            "type": "AccountId",
+            "type": "([u8;32])",
             "sub": [
               {
                 "info": 12,
@@ -2177,15 +2177,15 @@
   },
   {
     "info": 9,
-    "type": "{ \"key\": \"(AccountId, AccountId)\", \"val\": \"u128\" }",
+    "type": "{\"key\":\"(([u8;32]), ([u8;32]))\",\"val\":\"u128\"}",
     "sub": [
       {
         "info": 10,
-        "type": "(AccountId, AccountId)",
+        "type": "(([u8;32]), ([u8;32]))",
         "sub": [
           {
             "info": 10,
-            "type": "AccountId",
+            "type": "([u8;32])",
             "sub": [
               {
                 "info": 12,
@@ -2206,7 +2206,7 @@
           },
           {
             "info": 10,
-            "type": "AccountId",
+            "type": "([u8;32])",
             "sub": [
               {
                 "info": 12,
@@ -2239,11 +2239,11 @@
     "params": [
       {
         "info": 10,
-        "type": "(AccountId, AccountId)",
+        "type": "(([u8;32]), ([u8;32]))",
         "sub": [
           {
             "info": 10,
-            "type": "AccountId",
+            "type": "([u8;32])",
             "sub": [
               {
                 "info": 12,
@@ -2264,7 +2264,7 @@
           },
           {
             "info": 10,
-            "type": "AccountId",
+            "type": "([u8;32])",
             "sub": [
               {
                 "info": 12,
@@ -2300,7 +2300,7 @@
     "type": "Option<([u8;32])>",
     "sub": {
       "info": 10,
-      "type": "AccountId",
+      "type": "([u8;32])",
       "sub": [
         {
           "info": 12,
@@ -2323,7 +2323,7 @@
     "params": [
       {
         "info": 10,
-        "type": "AccountId",
+        "type": "([u8;32])",
         "sub": [
           {
             "info": 12,
@@ -2344,4 +2344,4 @@
       }
     ]
   }
-]
+]

packages/api-contract/test/compare/flipper.test.json

@@ -1,49 +1,49 @@
 [
   {
-    "info": 7,
+    "info": 8,
     "type": "{\"value\": {\"cell\": {\"cell\": ([u8;32])}}}",
     "name": "Flipper",
     "namespace": "flipper::normal",
     "sub": [
       {
-        "info": 7,
+        "info": 8,
         "type": "{\"cell\": {\"cell\": ([u8;32])}}",
         "name": "value",
         "namespace": "ink_core::storage::value",
         "params": [
           {
-            "info": 5,
+            "info": 6,
             "type": "bool"
           }
         ],
         "sub": [
           {
-            "info": 7,
+            "info": 8,
             "type": "{\"cell\": ([u8;32])}",
             "name": "cell",
             "namespace": "ink_core::storage::cell::sync_cell",
             "params": [
               {
-                "info": 5,
+                "info": 6,
                 "type": "bool"
               }
             ],
             "sub": [
               {
-                "info": 8,
+                "info": 9,
                 "type": "([u8;32])",
                 "name": "cell",
                 "namespace": "ink_core::storage::key",
                 "sub": [
                   {
-                    "info": 10,
+                    "info": 11,
                     "type": "[u8;32]",
                     "ext": {
                       "length": 32,
                       "type": ""
                     },
                     "sub": {
-                      "info": 5,
+                      "info": 6,
                       "type": "u8"
                     },
                     "index": 0
@@ -57,44 +57,44 @@
     ]
   },
   {
-    "info": 7,
+    "info": 8,
     "type": "{\"cell\": {\"cell\": ([u8;32])}}",
     "name": "Value",
     "namespace": "ink_core::storage::value",
     "params": [
       {
-        "info": 5,
+        "info": 6,
         "type": "bool"
       }
     ],
     "sub": [
       {
-        "info": 7,
+        "info": 8,
         "type": "{\"cell\": ([u8;32])}",
         "name": "cell",
         "namespace": "ink_core::storage::cell::sync_cell",
         "params": [
           {
-            "info": 5,
+            "info": 6,
             "type": "bool"
           }
         ],
         "sub": [
           {
-            "info": 8,
+            "info": 9,
             "type": "([u8;32])",
             "name": "cell",
             "namespace": "ink_core::storage::key",
             "sub": [
               {
-                "info": 10,
+                "info": 11,
                 "type": "[u8;32]",
                 "ext": {
                   "length": 32,
                   "type": ""
                 },
                 "sub": {
-                  "info": 5,
+                  "info": 6,
                   "type": "u8"
                 },
                 "index": 0
@@ -106,36 +106,36 @@
     ]
   },
   {
-    "info": 5,
+    "info": 6,
     "type": "bool"
   },
   {
-    "info": 7,
+    "info": 8,
     "type": "{\"cell\": ([u8;32])}",
     "name": "SyncCell",
     "namespace": "ink_core::storage::cell::sync_cell",
     "params": [
       {
-        "info": 5,
+        "info": 6,
         "type": "bool"
       }
     ],
     "sub": [
       {
-        "info": 8,
+        "info": 9,
         "type": "([u8;32])",
         "name": "cell",
         "namespace": "ink_core::storage::key",
         "sub": [
           {
-            "info": 10,
+            "info": 11,
             "type": "[u8;32]",
             "ext": {
               "length": 32,
               "type": ""
             },
             "sub": {
-              "info": 5,
+              "info": 6,
               "type": "u8"
             },
             "index": 0
@@ -145,20 +145,20 @@
     ]
   },
   {
-    "info": 8,
+    "info": 9,
     "type": "([u8;32])",
     "name": "Key",
     "namespace": "ink_core::storage::key",
     "sub": [
       {
-        "info": 10,
+        "info": 11,
         "type": "[u8;32]",
         "ext": {
           "length": 32,
           "type": ""
         },
         "sub": {
-          "info": 5,
+          "info": 6,
           "type": "u8"
         },
         "index": 0
@@ -166,19 +166,19 @@
     ]
   },
   {
-    "info": 10,
+    "info": 11,
     "type": "[u8;32]",
     "ext": {
       "length": 32,
       "type": ""
     },
     "sub": {
-      "info": 5,
+      "info": 6,
       "type": "u8"
     }
   },
   {
-    "info": 5,
+    "info": 6,
     "type": "u8"
   }
 ]

packages/api-contract/test/compare/incrementer.test.json

@@ -1,29 +1,29 @@
 [
   {
-    "info": 9,
+    "info": 10,
     "type": "{ \"value\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }<u32>\"} }",
     "sub": [
       {
-        "info": 9,
+        "info": 10,
         "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }",
         "sub": [
           {
-            "info": 9,
+            "info": 10,
             "type": "{ \"cell\": \"([u8;32])\"} }",
             "sub": [
               {
-                "info": 10,
+                "info": 11,
                 "type": "([u8;32])",
                 "sub": [
                   {
-                    "info": 12,
+                    "info": 13,
                     "type": "[u8;32]",
                     "ext": {
                       "length": 32,
                       "type": "u8"
                     },
                     "sub": {
-                      "info": 6,
+                      "info": 7,
                       "type": "u8"
                     },
                     "index": 0
@@ -37,7 +37,7 @@
             "namespace": "ink_core::storage::cell::sync_cell",
             "params": [
               {
-                "info": 6,
+                "info": 7,
                 "type": "u32"
               }
             ]
@@ -47,7 +47,7 @@
         "namespace": "ink_core::storage::value",
         "params": [
           {
-            "info": 6,
+            "info": 7,
             "type": "u32"
           }
         ]
@@ -57,26 +57,26 @@
     "namespace": "incrementer::normal"
   },
   {
-    "info": 9,
+    "info": 10,
     "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\"} }<u32>\"} }",
     "sub": [
       {
-        "info": 9,
+        "info": 10,
         "type": "{ \"cell\": \"([u8;32])\"} }",
         "sub": [
           {
-            "info": 10,
+            "info": 11,
             "type": "([u8;32])",
             "sub": [
               {
-                "info": 12,
+                "info": 13,
                 "type": "[u8;32]",
                 "ext": {
                   "length": 32,
                   "type": "u8"
                 },
                 "sub": {
-                  "info": 6,
+                  "info": 7,
                   "type": "u8"
                 },
                 "index": 0
@@ -90,7 +90,7 @@
         "namespace": "ink_core::storage::cell::sync_cell",
         "params": [
           {
-            "info": 6,
+            "info": 7,
             "type": "u32"
           }
         ]
@@ -100,32 +100,32 @@
     "namespace": "ink_core::storage::value",
     "params": [
       {
-        "info": 6,
+        "info": 7,
         "type": "u32"
       }
     ]
   },
   {
-    "info": 6,
+    "info": 7,
     "type": "u32"
   },
   {
-    "info": 9,
+    "info": 10,
     "type": "{ \"cell\": \"([u8;32])\"} }",
     "sub": [
       {
-        "info": 10,
+        "info": 11,
         "type": "([u8;32])",
         "sub": [
           {
-            "info": 12,
+            "info": 13,
             "type": "[u8;32]",
             "ext": {
               "length": 32,
               "type": "u8"
             },
             "sub": {
-              "info": 6,
+              "info": 7,
               "type": "u8"
             },
             "index": 0
@@ -139,24 +139,24 @@
     "namespace": "ink_core::storage::cell::sync_cell",
     "params": [
       {
-        "info": 6,
+        "info": 7,
         "type": "u32"
       }
     ]
   },
   {
-    "info": 10,
+    "info": 11,
     "type": "([u8;32])",
     "sub": [
       {
-        "info": 12,
+        "info": 13,
         "type": "[u8;32]",
         "ext": {
           "length": 32,
           "type": "u8"
         },
         "sub": {
-          "info": 6,
+          "info": 7,
           "type": "u8"
         },
         "index": 0
@@ -166,23 +166,23 @@
     "namespace": "ink_core::storage::key"
   },
   {
-    "info": 12,
+    "info": 13,
     "type": "[u8;32]",
     "ext": {
       "length": 32,
       "type": "u8"
     },
     "sub": {
-      "info": 6,
+      "info": 7,
       "type": "u8"
     }
   },
   {
-    "info": 6,
+    "info": 7,
     "type": "u8"
   },
   {
-    "info": 6,
+    "info": 7,
     "type": "bool"
   }
 ]

packages/api-contract/test/compare/shared-vec.test.json

@@ -1,19 +1,19 @@
 [
   {
     "info": 9,
-    "type": "{ \"mutators\": \"{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>>\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>\", \"vec\": \"{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"cells\": \"{ \"cells_key\": \"([u8;32])\" }<i32>\" }<i32>\" }",
+    "type": "{\"mutators\":\"{\\\"len\\\":\\\"{\\\\\\\"cell\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"cell\\\\\\\\\\\\\\\":\\\\\\\\\\\\\\\"([u8;32])\\\\\\\\\\\\\\\"}\\\\\\\"}\\\",\\\"entries\\\":\\\"{\\\\\\\"cells_key\\\\\\\":\\\\\\\"([u8;32])\\\\\\\"}\\\"}\",\"vec\":\"{\\\"len\\\":\\\"{\\\\\\\"cell\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"cell\\\\\\\\\\\\\\\":\\\\\\\\\\\\\\\"([u8;32])\\\\\\\\\\\\\\\"}\\\\\\\"}\\\",\\\"cells\\\":\\\"{\\\\\\\"cells_key\\\\\\\":\\\\\\\"([u8;32])\\\\\\\"}\\\"}\"}",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>>\" }",
+        "type": "{\"len\":\"{\\\"cell\\\":\\\"{\\\\\\\"cell\\\\\\\":\\\\\\\"([u8;32])\\\\\\\"}\\\"}\",\"entries\":\"{\\\"cells_key\\\":\\\"([u8;32])\\\"}\"}",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
+            "type": "{\"cell\":\"{\\\"cell\\\":\\\"([u8;32])\\\"}\"}",
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"cell\": \"([u8;32])\" }",
+                "type": "{\"cell\":\"([u8;32])\"}",
                 "sub": [
                   {
                     "info": 10,
@@ -58,7 +58,7 @@
           },
           {
             "info": 9,
-            "type": "{ \"cells_key\": \"([u8;32])\" }",
+            "type": "{\"cells_key\":\"([u8;32])\"}",
             "sub": [
               {
                 "info": 10,
@@ -87,7 +87,7 @@
             "params": [
               {
                 "info": 3,
-                "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }",
+                "type": "{\"_enum\":{\"Occupied\":\"({\\\"key\\\":\\\"([u8;32])\\\",\\\"val\\\":\\\"{\\\\\\\"begin\\\\\\\":\\\\\\\"Option<u32>\\\\\\\",\\\\\\\"end\\\\\\\":\\\\\\\"Option<u32>\\\\\\\"}\\\"})\",\"Removed\":\"Null\"}}",
                 "sub": [
                   {
                     "info": 10,
@@ -95,11 +95,11 @@
                     "sub": [
                       {
                         "info": 9,
-                        "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }",
+                        "type": "{\"key\":\"([u8;32])\",\"val\":\"{\\\"begin\\\":\\\"Option<u32>\\\",\\\"end\\\":\\\"Option<u32>\\\"}\"}",
                         "sub": [
                           {
                             "info": 10,
-                            "type": "AccountId",
+                            "type": "([u8;32])",
                             "sub": [
                               {
                                 "info": 12,
@@ -120,7 +120,7 @@
                           },
                           {
                             "info": 9,
-                            "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+                            "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
                             "sub": [
                               {
                                 "info": 5,
@@ -162,7 +162,7 @@
                         "params": [
                           {
                             "info": 10,
-                            "type": "AccountId",
+                            "type": "([u8;32])",
                             "sub": [
                               {
                                 "info": 12,
@@ -183,7 +183,7 @@
                           },
                           {
                             "info": 9,
-                            "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+                            "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
                             "sub": [
                               {
                                 "info": 5,
@@ -223,7 +223,7 @@
                         "index": 0
                       }
                     ],
-                    "type": "({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)"
+                    "type": "({\"key\":\"([u8;32])\",\"val\":\"{\\\"begin\\\":\\\"Option<u32>\\\",\\\"end\\\":\\\"Option<u32>\\\"}\"})"
                   },
                   {
                     "info": 6,
@@ -236,7 +236,7 @@
                 "params": [
                   {
                     "info": 10,
-                    "type": "AccountId",
+                    "type": "([u8;32])",
                     "sub": [
                       {
                         "info": 12,
@@ -257,7 +257,7 @@
                   },
                   {
                     "info": 9,
-                    "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+                    "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
                     "sub": [
                       {
                         "info": 5,
@@ -303,7 +303,7 @@
         "params": [
           {
             "info": 10,
-            "type": "AccountId",
+            "type": "([u8;32])",
             "sub": [
               {
                 "info": 12,
@@ -324,7 +324,7 @@
           },
           {
             "info": 9,
-            "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+            "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
             "sub": [
               {
                 "info": 5,
@@ -364,15 +364,15 @@
       },
       {
         "info": 9,
-        "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"cells\": \"{ \"cells_key\": \"([u8;32])\" }<i32>\" }",
+        "type": "{\"len\":\"{\\\"cell\\\":\\\"{\\\\\\\"cell\\\\\\\":\\\\\\\"([u8;32])\\\\\\\"}\\\"}\",\"cells\":\"{\\\"cells_key\\\":\\\"([u8;32])\\\"}\"}",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
+            "type": "{\"cell\":\"{\\\"cell\\\":\\\"([u8;32])\\\"}\"}",
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"cell\": \"([u8;32])\" }",
+                "type": "{\"cell\":\"([u8;32])\"}",
                 "sub": [
                   {
                     "info": 10,
@@ -417,7 +417,7 @@
           },
           {
             "info": 9,
-            "type": "{ \"cells_key\": \"([u8;32])\" }",
+            "type": "{\"cells_key\":\"([u8;32])\"}",
             "sub": [
               {
                 "info": 10,
@@ -466,15 +466,15 @@
   },
   {
     "info": 9,
-    "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"entries\": \"{ \"cells_key\": \"([u8;32])\" }<{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>>\" }",
+    "type": "{\"len\":\"{\\\"cell\\\":\\\"{\\\\\\\"cell\\\\\\\":\\\\\\\"([u8;32])\\\\\\\"}\\\"}\",\"entries\":\"{\\\"cells_key\\\":\\\"([u8;32])\\\"}\"}",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
+        "type": "{\"cell\":\"{\\\"cell\\\":\\\"([u8;32])\\\"}\"}",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"([u8;32])\" }",
+            "type": "{\"cell\":\"([u8;32])\"}",
             "sub": [
               {
                 "info": 10,
@@ -519,7 +519,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"cells_key\": \"([u8;32])\" }",
+        "type": "{\"cells_key\":\"([u8;32])\"}",
         "sub": [
           {
             "info": 10,
@@ -548,7 +548,7 @@
         "params": [
           {
             "info": 3,
-            "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }",
+            "type": "{\"_enum\":{\"Occupied\":\"({\\\"key\\\":\\\"([u8;32])\\\",\\\"val\\\":\\\"{\\\\\\\"begin\\\\\\\":\\\\\\\"Option<u32>\\\\\\\",\\\\\\\"end\\\\\\\":\\\\\\\"Option<u32>\\\\\\\"}\\\"})\",\"Removed\":\"Null\"}}",
             "sub": [
               {
                 "info": 10,
@@ -556,11 +556,11 @@
                 "sub": [
                   {
                     "info": 9,
-                    "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }",
+                    "type": "{\"key\":\"([u8;32])\",\"val\":\"{\\\"begin\\\":\\\"Option<u32>\\\",\\\"end\\\":\\\"Option<u32>\\\"}\"}",
                     "sub": [
                       {
                         "info": 10,
-                        "type": "AccountId",
+                        "type": "([u8;32])",
                         "sub": [
                           {
                             "info": 12,
@@ -581,7 +581,7 @@
                       },
                       {
                         "info": 9,
-                        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+                        "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
                         "sub": [
                           {
                             "info": 5,
@@ -623,7 +623,7 @@
                     "params": [
                       {
                         "info": 10,
-                        "type": "AccountId",
+                        "type": "([u8;32])",
                         "sub": [
                           {
                             "info": 12,
@@ -644,7 +644,7 @@
                       },
                       {
                         "info": 9,
-                        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+                        "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
                         "sub": [
                           {
                             "info": 5,
@@ -684,7 +684,7 @@
                     "index": 0
                   }
                 ],
-                "type": "({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)"
+                "type": "({\"key\":\"([u8;32])\",\"val\":\"{\\\"begin\\\":\\\"Option<u32>\\\",\\\"end\\\":\\\"Option<u32>\\\"}\"})"
               },
               {
                 "info": 6,
@@ -697,7 +697,7 @@
             "params": [
               {
                 "info": 10,
-                "type": "AccountId",
+                "type": "([u8;32])",
                 "sub": [
                   {
                     "info": 12,
@@ -718,7 +718,7 @@
               },
               {
                 "info": 9,
-                "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+                "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
                 "sub": [
                   {
                     "info": 5,
@@ -764,7 +764,7 @@
     "params": [
       {
         "info": 10,
-        "type": "AccountId",
+        "type": "([u8;32])",
         "sub": [
           {
             "info": 12,
@@ -785,7 +785,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+        "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
         "sub": [
           {
             "info": 5,
@@ -825,7 +825,7 @@
   },
   {
     "info": 10,
-    "type": "AccountId",
+    "type": "([u8;32])",
     "sub": [
       {
         "info": 12,
@@ -862,7 +862,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+    "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
     "sub": [
       {
         "info": 5,
@@ -919,11 +919,11 @@
   },
   {
     "info": 9,
-    "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
+    "type": "{\"cell\":\"{\\\"cell\\\":\\\"([u8;32])\\\"}\"}",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"([u8;32])\" }",
+        "type": "{\"cell\":\"([u8;32])\"}",
         "sub": [
           {
             "info": 10,
@@ -968,7 +968,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cell\": \"([u8;32])\" }",
+    "type": "{\"cell\":\"([u8;32])\"}",
     "sub": [
       {
         "info": 10,
@@ -1024,7 +1024,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cells_key\": \"([u8;32])\" }",
+    "type": "{\"cells_key\":\"([u8;32])\"}",
     "sub": [
       {
         "info": 10,
@@ -1053,7 +1053,7 @@
     "params": [
       {
         "info": 3,
-        "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }",
+        "type": "{\"_enum\":{\"Occupied\":\"({\\\"key\\\":\\\"([u8;32])\\\",\\\"val\\\":\\\"{\\\\\\\"begin\\\\\\\":\\\\\\\"Option<u32>\\\\\\\",\\\\\\\"end\\\\\\\":\\\\\\\"Option<u32>\\\\\\\"}\\\"})\",\"Removed\":\"Null\"}}",
         "sub": [
           {
             "info": 10,
@@ -1061,11 +1061,11 @@
             "sub": [
               {
                 "info": 9,
-                "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }",
+                "type": "{\"key\":\"([u8;32])\",\"val\":\"{\\\"begin\\\":\\\"Option<u32>\\\",\\\"end\\\":\\\"Option<u32>\\\"}\"}",
                 "sub": [
                   {
                     "info": 10,
-                    "type": "AccountId",
+                    "type": "([u8;32])",
                     "sub": [
                       {
                         "info": 12,
@@ -1086,7 +1086,7 @@
                   },
                   {
                     "info": 9,
-                    "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+                    "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
                     "sub": [
                       {
                         "info": 5,
@@ -1128,7 +1128,7 @@
                 "params": [
                   {
                     "info": 10,
-                    "type": "AccountId",
+                    "type": "([u8;32])",
                     "sub": [
                       {
                         "info": 12,
@@ -1149,7 +1149,7 @@
                   },
                   {
                     "info": 9,
-                    "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+                    "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
                     "sub": [
                       {
                         "info": 5,
@@ -1189,7 +1189,7 @@
                 "index": 0
               }
             ],
-            "type": "({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)"
+            "type": "({\"key\":\"([u8;32])\",\"val\":\"{\\\"begin\\\":\\\"Option<u32>\\\",\\\"end\\\":\\\"Option<u32>\\\"}\"})"
           },
           {
             "info": 6,
@@ -1202,7 +1202,7 @@
         "params": [
           {
             "info": 10,
-            "type": "AccountId",
+            "type": "([u8;32])",
             "sub": [
               {
                 "info": 12,
@@ -1223,7 +1223,7 @@
           },
           {
             "info": 9,
-            "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+            "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
             "sub": [
               {
                 "info": 5,
@@ -1265,7 +1265,7 @@
   },
   {
     "info": 3,
-    "type": "{ \"_enum\": { \"Occupied\": \"({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)\", \"Removed\": \"Null\"\" }\" }",
+    "type": "{\"_enum\":{\"Occupied\":\"({\\\"key\\\":\\\"([u8;32])\\\",\\\"val\\\":\\\"{\\\\\\\"begin\\\\\\\":\\\\\\\"Option<u32>\\\\\\\",\\\\\\\"end\\\\\\\":\\\\\\\"Option<u32>\\\\\\\"}\\\"})\",\"Removed\":\"Null\"}}",
     "sub": [
       {
         "info": 10,
@@ -1273,11 +1273,11 @@
         "sub": [
           {
             "info": 9,
-            "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }",
+            "type": "{\"key\":\"([u8;32])\",\"val\":\"{\\\"begin\\\":\\\"Option<u32>\\\",\\\"end\\\":\\\"Option<u32>\\\"}\"}",
             "sub": [
               {
                 "info": 10,
-                "type": "AccountId",
+                "type": "([u8;32])",
                 "sub": [
                   {
                     "info": 12,
@@ -1298,7 +1298,7 @@
               },
               {
                 "info": 9,
-                "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+                "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
                 "sub": [
                   {
                     "info": 5,
@@ -1340,7 +1340,7 @@
             "params": [
               {
                 "info": 10,
-                "type": "AccountId",
+                "type": "([u8;32])",
                 "sub": [
                   {
                     "info": 12,
@@ -1361,7 +1361,7 @@
               },
               {
                 "info": 9,
-                "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+                "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
                 "sub": [
                   {
                     "info": 5,
@@ -1401,7 +1401,7 @@
             "index": 0
           }
         ],
-        "type": "({ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }<([u8;32]), { \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }>)"
+        "type": "({\"key\":\"([u8;32])\",\"val\":\"{\\\"begin\\\":\\\"Option<u32>\\\",\\\"end\\\":\\\"Option<u32>\\\"}\"})"
       },
       {
         "info": 6,
@@ -1414,7 +1414,7 @@
     "params": [
       {
         "info": 10,
-        "type": "AccountId",
+        "type": "([u8;32])",
         "sub": [
           {
             "info": 12,
@@ -1435,7 +1435,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+        "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
         "sub": [
           {
             "info": 5,
@@ -1475,11 +1475,11 @@
   },
   {
     "info": 9,
-    "type": "{ \"key\": \"AccountId\", \"val\": \"{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }\" }",
+    "type": "{\"key\":\"([u8;32])\",\"val\":\"{\\\"begin\\\":\\\"Option<u32>\\\",\\\"end\\\":\\\"Option<u32>\\\"}\"}",
     "sub": [
       {
         "info": 10,
-        "type": "AccountId",
+        "type": "([u8;32])",
         "sub": [
           {
             "info": 12,
@@ -1500,7 +1500,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+        "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
         "sub": [
           {
             "info": 5,
@@ -1542,7 +1542,7 @@
     "params": [
       {
         "info": 10,
-        "type": "AccountId",
+        "type": "([u8;32])",
         "sub": [
           {
             "info": 12,
@@ -1563,7 +1563,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"begin\": \"Option<u32><u32>\", \"end\": \"Option<u32><u32>\" }",
+        "type": "{\"begin\":\"Option<u32>\",\"end\":\"Option<u32>\"}",
         "sub": [
           {
             "info": 5,
@@ -1603,15 +1603,15 @@
   },
   {
     "info": 9,
-    "type": "{ \"len\": \"{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }<u32>\", \"cells\": \"{ \"cells_key\": \"([u8;32])\" }<i32>\" }",
+    "type": "{\"len\":\"{\\\"cell\\\":\\\"{\\\\\\\"cell\\\\\\\":\\\\\\\"([u8;32])\\\\\\\"}\\\"}\",\"cells\":\"{\\\"cells_key\\\":\\\"([u8;32])\\\"}\"}",
     "sub": [
       {
         "info": 9,
-        "type": "{ \"cell\": \"{ \"cell\": \"([u8;32])\" }<u32>\" }",
+        "type": "{\"cell\":\"{\\\"cell\\\":\\\"([u8;32])\\\"}\"}",
         "sub": [
           {
             "info": 9,
-            "type": "{ \"cell\": \"([u8;32])\" }",
+            "type": "{\"cell\":\"([u8;32])\"}",
             "sub": [
               {
                 "info": 10,
@@ -1656,7 +1656,7 @@
       },
       {
         "info": 9,
-        "type": "{ \"cells_key\": \"([u8;32])\" }",
+        "type": "{\"cells_key\":\"([u8;32])\"}",
         "sub": [
           {
             "info": 10,
@@ -1705,7 +1705,7 @@
   },
   {
     "info": 9,
-    "type": "{ \"cells_key\": \"([u8;32])\" }",
+    "type": "{\"cells_key\":\"([u8;32])\"}",
     "sub": [
       {
         "info": 10,
@@ -1810,4 +1810,4 @@
       }
     ]
   }
-]
+]

packages/api-derive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "0.96.1",
+  "version": "0.100.1",
   "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
   "main": "index.js",
   "keywords": [
@@ -27,11 +27,11 @@
   },
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-derive#readme",
   "dependencies": {
-    "@babel/runtime": "^7.7.1",
-    "@polkadot/api": "^0.96.1",
-    "@polkadot/types": "^0.96.1"
+    "@babel/runtime": "^7.7.7",
+    "@polkadot/api": "^0.100.1",
+    "@polkadot/types": "^0.100.1"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^1.7.0-beta.5"
+    "@polkadot/keyring": "^1.8.1"
   }
 }

packages/api-derive/src/accounts/idAndIndex.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -7,11 +7,11 @@ import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
+import { createType } from '@polkadot/types';
 import { isU8a } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
-import { createType } from '@polkadot/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 export type AccountIdAndIndex = [AccountId?, AccountIndex?];
 
@@ -23,14 +23,14 @@ function retrieve (api: ApiInterfaceRx, address: Address | AccountId | AccountIn
       : decodeAddress((address || '').toString());
 
     if (decoded.length === 32) {
-      const accountId = createType('AccountId', decoded);
+      const accountId = createType(api.registry, 'AccountId', decoded);
 
       return api.derive.accounts.idToIndex(accountId).pipe(
         map((accountIndex): AccountIdAndIndex => [accountId, accountIndex] as AccountIdAndIndex)
       );
     }
 
-    const accountIndex = createType('AccountIndex', decoded);
+    const accountIndex = createType(api.registry, 'AccountIndex', decoded);
 
     return api.derive.accounts.indexToId(accountIndex).pipe(
       map((accountId): AccountIdAndIndex => [accountId, accountIndex] as AccountIdAndIndex)
@@ -54,6 +54,6 @@ function retrieve (api: ApiInterfaceRx, address: Address | AccountId | AccountIn
  * ```
  */
 export function idAndIndex (api: ApiInterfaceRx): (address?: Address | AccountId | AccountIndex | string | null) => Observable<AccountIdAndIndex> {
-  return (address?: Address | AccountId | AccountIndex | string | null): Observable<AccountIdAndIndex> =>
-    retrieve(api, address).pipe(drr());
+  return memo((address?: Address | AccountId | AccountIndex | string | null): Observable<AccountIdAndIndex> =>
+    retrieve(api, address));
 }

packages/api-derive/src/accounts/idToIndex.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -9,7 +9,7 @@ import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 /**
  * @name idToIndex
@@ -26,12 +26,11 @@ import { drr } from '../util';
  * ```
  */
 export function idToIndex (api: ApiInterfaceRx): (accountId: AccountId | string) => Observable<AccountIndex | undefined> {
-  return (accountId: AccountId | string): Observable<AccountIndex | undefined> =>
+  return memo((accountId: AccountId | string): Observable<AccountIndex | undefined> =>
     api.derive.accounts.indexes().pipe(
       startWith({}),
       map((indexes: AccountIndexes): AccountIndex | undefined =>
         (indexes || {})[accountId.toString()]
-      ),
-      drr()
-    );
+      )
+    ));
 }

packages/api-derive/src/accounts/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-derive/src/accounts/indexToId.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -8,9 +8,9 @@ import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { ENUMSET_SIZE } from '@polkadot/types/primitive/Generic/AccountIndex';
-import { createType, ClassOf, Vec } from '@polkadot/types';
+import { ClassOf, Vec, createType } from '@polkadot/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 /**
  * @name indexToId
@@ -28,17 +28,16 @@ import { drr } from '../util';
 export function indexToId (api: ApiInterfaceRx): (accountIndex: AccountIndex | string) => Observable<AccountId | undefined> {
   const querySection = api.query.indices || api.query.balances;
 
-  return (_accountIndex: AccountIndex | string): Observable<AccountId | undefined> => {
-    const accountIndex = _accountIndex instanceof ClassOf('AccountIndex')
+  return memo((_accountIndex: AccountIndex | string): Observable<AccountId | undefined> => {
+    const accountIndex = _accountIndex instanceof ClassOf(api.registry, 'AccountIndex')
       ? _accountIndex
-      : createType('AccountIndex', _accountIndex);
+      : createType(api.registry, 'AccountIndex', _accountIndex);
 
     return querySection.enumSet<Vec<AccountId>>(accountIndex.div(ENUMSET_SIZE)).pipe(
       startWith([]),
       map((accounts): AccountId | undefined =>
         (accounts || [])[accountIndex.mod(ENUMSET_SIZE).toNumber()]
-      ),
-      drr()
+      )
     );
-  };
+  });
 }

packages/api-derive/src/accounts/indexes.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -9,9 +9,9 @@ import { AccountIndexes } from '../types';
 import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { ENUMSET_SIZE } from '@polkadot/types/primitive/Generic/AccountIndex';
-import { createType } from '@polkadot/types';
+import { Vec, createType } from '@polkadot/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 const enumsetSize = ENUMSET_SIZE.toNumber();
 
@@ -31,27 +31,26 @@ const enumsetSize = ENUMSET_SIZE.toNumber();
  * ```
  */
 export function indexes (api: ApiInterfaceRx): () => Observable<AccountIndexes> {
-  return (): Observable<AccountIndexes> =>
+  return memo((): Observable<AccountIndexes> =>
     api.query.indices.nextEnumSet<AccountIndex>().pipe(
       // use the nextEnumSet (which is a counter of the number of sets) to construct
       // a range of values to query [0, 1, 2, ...]. Retrieve the full enum set for the
       // specific index - each query can return up to ENUMSET_SIZE (64) records, each
       // containing an AccountId
-      switchMap((next: AccountIndex): Observable<any> =>
-        api.query.indices.enumSet.multi([...Array(next.toNumber() + 1).keys()]) as Observable<any>
+      switchMap((next: AccountIndex): Observable<Vec<AccountId>[]> =>
+        api.query.indices.enumSet.multi<Vec<AccountId>>([...Array(next.toNumber() + 1).keys()])
       ),
-      map((all: (AccountId[] | undefined)[]): AccountIndexes =>
-        (all || []).reduce((result, list, outerIndex): AccountIndexes => {
+      map((all: AccountId[][]): AccountIndexes =>
+        all.reduce((result: AccountIndexes, list, outerIndex): AccountIndexes => {
           (list || []).forEach((accountId, innerIndex): void => {
             // re-create the index based on position 0 is [0][0] and likewise
             // 64 (0..63 in first) is [1][0] (the first index value in set 2)
             const index = (outerIndex * enumsetSize) + innerIndex;
 
-            result[accountId.toString()] = createType('AccountIndex', index);
+            result[accountId.toString()] = createType(api.registry, 'AccountIndex', index);
           });
 
           return result;
-        }, {} as AccountIndexes)),
-      drr()
-    );
+        }, {}))
+    ));
 }

packages/api-derive/src/accounts/info.ts

@@ -1,31 +1,102 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, AccountIndex, Address, Balance } from '@polkadot/types/interfaces';
-import { Codec } from '@polkadot/types/types';
-import { DeriveAccountInfo } from '../types';
+import { AccountId, AccountIndex, Address, Balance, Registration } from '@polkadot/types/interfaces';
+import { ITuple } from '@polkadot/types/types';
+import { DeriveAccountInfo, DeriveAccountRegistration } from '../types';
 
 import { Observable, combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Bytes, Option, u32 } from '@polkadot/types';
+import { Bytes, Data, Option, u32 } from '@polkadot/types';
 import { u8aToString } from '@polkadot/util';
 
-import { drr } from '../util';
+import { memo } from '../util';
+
+function dataAsString (data: Data): string | undefined {
+  return data.isRaw
+    ? u8aToString(data.asRaw.toU8a(true))
+    : data.isSha256
+      ? data.asSha256.toHex()
+      : undefined;
+}
 
 function retrieveNick (api: ApiInterfaceRx, accountId?: AccountId): Observable<string | undefined> {
-  return accountId && api.query.nicks
-    ? api.query.nicks
-      .nameOf<Option<[Bytes, Balance] & Codec>>(accountId)
-      .pipe(
-        map((nameOf): string | undefined =>
-          nameOf?.isSome
-            ? u8aToString(nameOf.unwrap()[0]).substr(0, (api.consts.nicks.maxLength as u32).toNumber())
-            : undefined
-        )
-      )
-    : of(undefined);
+  return ((
+    accountId && api.query.nicks?.nameOf
+      ? api.query.nicks.nameOf<Option<ITuple<[Bytes, Balance]>>>(accountId)
+      : of(undefined)
+  ) as Observable<Option<ITuple<[Bytes, Balance]>> | undefined>).pipe(
+    map((nameOf): string | undefined =>
+      nameOf?.isSome
+        ? u8aToString(nameOf.unwrap()[0]).substr(0, (api.consts.nicks.maxLength as u32).toNumber())
+        : undefined
+    )
+  );
+}
+
+function extractIdentity (identityOfOpt?: Option<Registration>, superOf?: [AccountId, Data]): DeriveAccountRegistration {
+  if (!identityOfOpt?.isSome) {
+    return { judgements: [] };
+  }
+
+  const { info, judgements } = identityOfOpt.unwrap();
+  const topDisplay = dataAsString(info.display);
+
+  return {
+    display: superOf
+      ? dataAsString(superOf[1]) || topDisplay
+      : topDisplay,
+    displayParent: superOf
+      ? topDisplay
+      : undefined,
+    email: dataAsString(info.email),
+    image: dataAsString(info.image),
+    legal: dataAsString(info.legal),
+    parent: superOf
+      ? superOf[0]
+      : undefined,
+    pgp: info.pgpFingerprint.isSome
+      ? info.pgpFingerprint.unwrap().toHex()
+      : undefined,
+    riot: dataAsString(info.riot),
+    twitter: dataAsString(info.twitter),
+    web: dataAsString(info.web),
+    judgements
+  };
+}
+
+function retrieveIdentity (api: ApiInterfaceRx, accountId?: AccountId): Observable<DeriveAccountRegistration> {
+  return ((
+    accountId && api.query.identity?.identityOf
+      ? api.queryMulti([
+        [api.query.identity.identityOf, accountId],
+        [api.query.identity.superOf, accountId]
+      ])
+      : of([undefined, undefined])
+  ) as Observable<[Option<Registration> | undefined, Option<ITuple<[AccountId, Data]>> | undefined]>).pipe(
+    switchMap(([identityOfOpt, superOfOpt]): Observable<[Option<Registration> | undefined, [AccountId, Data] | undefined]> => {
+      if (identityOfOpt?.isSome) {
+        // this identity has something set
+        return of([identityOfOpt, undefined]);
+      } else if (superOfOpt?.isSome) {
+        const superOf = superOfOpt.unwrap();
+
+        // we have a super
+        return combineLatest([
+          api.query.identity.identityOf<Option<Registration>>(superOf[0]),
+          of(superOf)
+        ]);
+      }
+
+      // nothing of value returned
+      return of([undefined, undefined]);
+    }),
+    map(([identityOfOpt, superOf]): DeriveAccountRegistration =>
+      extractIdentity(identityOfOpt, superOf)
+    )
+  );
 }
 
 /**
@@ -33,17 +104,17 @@ function retrieveNick (api: ApiInterfaceRx, accountId?: AccountId): Observable<s
  * @description Returns aux. info with regards to an account, current that includes the accountId, accountIndex and nickname
  */
 export function info (api: ApiInterfaceRx): (address?: AccountIndex | AccountId | Address | string | null) => Observable<DeriveAccountInfo> {
-  return (address?: AccountIndex | AccountId | Address | string | null): Observable<DeriveAccountInfo> =>
+  return memo((address?: AccountIndex | AccountId | Address | string | null): Observable<DeriveAccountInfo> =>
     api.derive.accounts.idAndIndex(address).pipe(
-      switchMap(([accountId, accountIndex]): Observable<[DeriveAccountInfo, string?]> =>
+      switchMap(([accountId, accountIndex]): Observable<[Partial<DeriveAccountInfo>, DeriveAccountRegistration, string?]> =>
         combineLatest([
           of({ accountId, accountIndex }),
+          retrieveIdentity(api, accountId),
           retrieveNick(api, accountId)
         ])
       ),
-      map(([{ accountId, accountIndex }, nickname]): DeriveAccountInfo => ({
-        accountId, accountIndex, nickname
-      })),
-      drr()
-    );
+      map(([{ accountId, accountIndex }, identity, nickname]): DeriveAccountInfo => ({
+        accountId, accountIndex, identity, nickname
+      }))
+    ));
 }

packages/api-derive/src/balances/all.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -12,13 +12,13 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
 import { Option, Vec, createType } from '@polkadot/types';
 import { bnMax } from '@polkadot/util';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 type ResultBalance = [Balance, Balance, BalanceLock[], Option<VestingSchedule>];
 type Result = [AccountId, BlockNumber, ResultBalance, Index];
 
-function calcBalances ([accountId, bestNumber, [freeBalance, reservedBalance, locks, vesting], accountNonce]: Result): DerivedBalances {
-  let lockedBalance = createType('Balance');
+function calcBalances (api: ApiInterfaceRx, [accountId, bestNumber, [freeBalance, reservedBalance, locks, vesting], accountNonce]: Result): DerivedBalances {
+  let lockedBalance = createType(api.registry, 'Balance');
   let lockedBreakdown: BalanceLock[] = [];
 
   if (Array.isArray(locks)) {
@@ -27,27 +27,40 @@ function calcBalances ([accountId, bestNumber, [freeBalance, reservedBalance, lo
 
     // get the maximum of the locks according to https://github.com/paritytech/substrate/blob/master/srml/balances/src/lib.rs#L699
     if (lockedBreakdown.length) {
-      lockedBalance = createType('Balance', bnMax(...lockedBreakdown.map(({ amount }): Balance => amount)));
+      lockedBalance = createType(api.registry, 'Balance', bnMax(...lockedBreakdown.map(({ amount }): Balance => amount)));
     }
   }
 
-  // offset = balance locked at genesis, perBlock is the unlock amount
-  const { offset: vestingTotal, perBlock } = vesting.unwrapOr(createType('VestingSchedule'));
-  const vestedNow = createType('Balance', perBlock.mul(bestNumber));
-  const vestedBalance = createType('Balance', vestedNow.gt(vestingTotal) ? new BN(0) : bnMax(new BN(0), freeBalance.sub(vestingTotal).add(vestedNow)));
-  const availableBalance = createType('Balance', bnMax(new BN(0), (vestedBalance.gtn(0) ? vestedBalance : freeBalance).sub(lockedBalance)));
+  // Calculate the vesting balances,
+  //  - offset = balance locked at genesis,
+  //  - perBlock is the unlock amount
+  const { offset: vestingTotal, perBlock } = vesting.unwrapOr(createType(api.registry, 'VestingSchedule'));
+  const vestedBalance = createType(api.registry, 'Balance', perBlock.mul(bestNumber));
+  const isVesting = vestedBalance.lt(vestingTotal);
+
+  // The available balance & vested has an interplay here
+  // "
+  // vesting is a guarantee that the account's balance will never go below a certain amount. so it functions in the opposite way, a bit like a lock that is monotonically decreasing rather than a liquid amount that is monotonically increasing.
+  // locks function as the same guarantee - that a balance will not be lower than a particular amount.
+  // because of this you can see that if there is a "vesting lock" that guarantees the balance cannot go below 200, and a "staking lock" that guarantees the balance cannot drop below 300, then we just have two guarantees of which the first is irrelevant.
+  // i.e. (balance >= 200 && balance >= 300) == (balance >= 300)
+  // ""
+  const floating = freeBalance.sub(lockedBalance);
+  const extraReceived = isVesting ? freeBalance.sub(vestingTotal) : new BN(0);
+  const availableBalance = createType(api.registry, 'Balance', bnMax(new BN(0), isVesting && floating.gt(vestedBalance) ? vestedBalance.add(extraReceived) : floating));
 
   return {
     accountId,
     accountNonce,
     availableBalance,
     freeBalance,
+    isVesting,
     lockedBalance,
     lockedBreakdown,
     reservedBalance,
     vestedBalance,
     vestingTotal,
-    votingBalance: createType('Balance', freeBalance.add(reservedBalance))
+    votingBalance: createType(api.registry, 'Balance', freeBalance.add(reservedBalance))
   };
 }
 
@@ -76,7 +89,7 @@ function queryBalances (api: ApiInterfaceRx, accountId: AccountId): Observable<R
  * ```
  */
 export function all (api: ApiInterfaceRx): (address: AccountIndex | AccountId | Address | string) => Observable<DerivedBalances> {
-  return (address: AccountIndex | AccountId | Address | string): Observable<DerivedBalances> =>
+  return memo((address: AccountIndex | AccountId | Address | string): Observable<DerivedBalances> =>
     api.derive.accounts.info(address).pipe(
       switchMap(({ accountId }): Observable<Result> =>
         (accountId
@@ -91,10 +104,9 @@ export function all (api: ApiInterfaceRx): (address: AccountIndex | AccountId |
             //   : api.query.system.accountNonce<Index>(accountId)
             api.query.system.accountNonce<Index>(accountId)
           ])
-          : of([createType('AccountId'), createType('BlockNumber'), [createType('Balance'), createType('Balance'), createType('Vec<BalanceLock>'), createType('Option<VestingSchedule>', null)], createType('Index')])
+          : of([createType(api.registry, 'AccountId'), createType(api.registry, 'BlockNumber'), [createType(api.registry, 'Balance'), createType(api.registry, 'Balance'), createType(api.registry, 'Vec<BalanceLock>'), createType(api.registry, 'Option<VestingSchedule>', null)], createType(api.registry, 'Index')])
         )
       ),
-      map(calcBalances),
-      drr()
-    );
+      map((result): DerivedBalances => calcBalances(api, result))
+    ));
 }

packages/api-derive/src/balances/fees.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -9,7 +9,7 @@ import { DerivedFees } from '../types';
 import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 type Result = [Balance, Balance, Balance, Balance, Balance];
 
@@ -19,9 +19,9 @@ function queryV2 (api: ApiInterfaceRx): Observable<Result> {
   return of([
     // get values from api.const for substrate versions post spec_version: 101
     // https://github.com/paritytech/substrate/pull/2883/files#diff-5e5e1c3aec9ddfde0a9054d062ab3db9R131
-    api.consts.balances.creationFee as Balance,
-    api.consts.balances.existentialDeposit as Balance,
-    api.consts.balances.transferFee as Balance,
+    api.consts.balances.creationFee,
+    api.consts.balances.existentialDeposit,
+    api.consts.balances.transferFee,
     paymentBase.transactionBaseFee as Balance,
     paymentBase.transactionByteFee as Balance
   ]);
@@ -56,7 +56,7 @@ export function fees (api: ApiInterfaceRx): () => Observable<DerivedFees> {
     ? queryV2
     : queryV1;
 
-  return (): Observable<DerivedFees> =>
+  return memo((): Observable<DerivedFees> =>
     query(api).pipe(
       map(([creationFee, existentialDeposit, transferFee, transactionBaseFee, transactionByteFee]): DerivedFees => ({
         creationFee,
@@ -64,7 +64,6 @@ export function fees (api: ApiInterfaceRx): () => Observable<DerivedFees> {
         transactionBaseFee,
         transactionByteFee,
         transferFee
-      })),
-      drr()
-    );
+      }))
+    ));
 }

packages/api-derive/src/balances/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-derive/src/balances/votingBalances.ts

@@ -1,25 +1,22 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
+import { DerivedBalances } from '../types';
 
 import { combineLatest, Observable, of } from 'rxjs';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
-import { DerivedBalances } from '../types';
-import { drr } from '../util';
+import { memo } from '../util';
 
 export function votingBalances (api: ApiInterfaceRx): (addresses?: (AccountId | AccountIndex | Address | string)[]) => Observable<DerivedBalances[]> {
-  return (addresses?: (AccountId | AccountIndex | Address | string)[]): Observable<DerivedBalances[]> =>
-    (
-      !addresses || !addresses.length
-        ? of([] as DerivedBalances[])
-        : combineLatest(
-          addresses.map((accountId): Observable<DerivedBalances> =>
-            api.derive.balances.all(accountId))
-        )
-    ).pipe(
-      drr()
-    );
+  return memo((addresses?: (AccountId | AccountIndex | Address | string)[]): Observable<DerivedBalances[]> =>
+    !addresses || !addresses.length
+      ? of([] as DerivedBalances[])
+      : combineLatest(
+        addresses.map((accountId): Observable<DerivedBalances> =>
+          api.derive.balances.all(accountId))
+      )
+  );
 }

packages/api-derive/src/balances/votingBalancesNominatorsFor.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -10,10 +10,10 @@ import { switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { Vec } from '@polkadot/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 export function votingBalancesNominatorsFor (api: ApiInterfaceRx): (address: AccountId | AccountIndex | Address | string) => Observable<DerivedBalances[]> {
-  return (address: AccountId | AccountIndex | Address | string): Observable<DerivedBalances[]> =>
+  return memo((address: AccountId | AccountIndex | Address | string): Observable<DerivedBalances[]> =>
     api.derive.accounts.info(address).pipe(
       switchMap(({ accountId }): Observable<AccountId[]> =>
         accountId
@@ -22,7 +22,6 @@ export function votingBalancesNominatorsFor (api: ApiInterfaceRx): (address: Acc
       ),
       switchMap((accounts): Observable<DerivedBalances[]> =>
         api.derive.balances.votingBalances(accounts)
-      ),
-      drr()
-    );
+      )
+    ));
 }

packages/api-derive/src/chain/bestNumber.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 /**
  * @name bestNumber
@@ -23,9 +23,8 @@ import { drr } from '../util';
  * ```
  */
 export function bestNumber (api: ApiInterfaceRx): () => Observable<BlockNumber> {
-  return (): Observable<BlockNumber> =>
+  return memo((): Observable<BlockNumber> =>
     api.derive.chain.subscribeNewHeads().pipe(
-      map((header: Header): BlockNumber => header.number.unwrap()),
-      drr()
-    );
+      map((header: Header): BlockNumber => header.number.unwrap())
+    ));
 }

packages/api-derive/src/chain/bestNumberFinalized.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 /**
  * @name bestNumberFinalized
@@ -24,9 +24,8 @@ import { drr } from '../util';
  * ```
  */
 export function bestNumberFinalized (api: ApiInterfaceRx): () => Observable<BlockNumber> {
-  return (): Observable<BlockNumber> =>
+  return memo((): Observable<BlockNumber> =>
     api.rpc.chain.subscribeFinalizedHeads().pipe(
-      map((header): BlockNumber => header.number.unwrap()),
-      drr()
-    );
+      map((header): BlockNumber => header.number.unwrap())
+    ));
 }

packages/api-derive/src/chain/bestNumberLag.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -9,7 +9,7 @@ import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { createType } from '@polkadot/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 /**
  * @name bestNumberLag
@@ -25,14 +25,13 @@ import { drr } from '../util';
  * ```
  */
 export function bestNumberLag (api: ApiInterfaceRx): () => Observable<BlockNumber> {
-  return (): Observable<BlockNumber> =>
+  return memo((): Observable<BlockNumber> =>
     combineLatest([
       api.derive.chain.bestNumber(),
       api.derive.chain.bestNumberFinalized()
     ]).pipe(
       map(([bestNumber, bestNumberFinalized]): BlockNumber =>
-        createType('BlockNumber', bestNumber.sub(bestNumberFinalized))
-      ),
-      drr()
-    );
+        createType(api.registry, 'BlockNumber', bestNumber.sub(bestNumberFinalized))
+      )
+    ));
 }

packages/api-derive/src/chain/getHeader.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -11,7 +11,7 @@ import { catchError, map } from 'rxjs/operators';
 import { Vec } from '@polkadot/types';
 
 import { HeaderExtended } from '../type';
-import { drr } from '../util';
+import { memo } from '../util';
 
 /**
  * @name bestNumberFinalized
@@ -28,7 +28,7 @@ import { drr } from '../util';
  * ```
  */
 export function getHeader (api: ApiInterfaceRx): (hash: Uint8Array | string) => Observable<HeaderExtended | undefined> {
-  return (hash: Uint8Array | string): Observable<HeaderExtended | undefined> =>
+  return memo((hash: Uint8Array | string): Observable<HeaderExtended | undefined> =>
     combineLatest([
       api.rpc.chain.getHeader(hash),
       api.query.session
@@ -36,14 +36,13 @@ export function getHeader (api: ApiInterfaceRx): (hash: Uint8Array | string) =>
         : of([])
     ]).pipe(
       map(([header, validators]): HeaderExtended =>
-        new HeaderExtended(header, validators)
+        new HeaderExtended(api.registry, header, validators)
       ),
       catchError((): Observable<undefined> =>
         // where rpc.chain.getHeader throws, we will land here - it can happen that
         // we supplied an invalid hash. (Due to defaults, storeage will have an
         // empty value, so only the RPC is affected). So return undefined
         of()
-      ),
-      drr()
-    );
+      )
+    ));
 }

packages/api-derive/src/chain/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-derive/src/chain/subscribeNewHeads.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -8,7 +8,7 @@ import { Observable, combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { HeaderExtended } from '../type';
-import { drr } from '../util';
+import { memo } from '../util';
 
 /**
  * @name subscribeNewHeads
@@ -24,14 +24,13 @@ import { drr } from '../util';
  * ```
  */
 export function subscribeNewHeads (api: ApiInterfaceRx): () => Observable<HeaderExtended> {
-  return (): Observable<HeaderExtended> =>
+  return memo((): Observable<HeaderExtended> =>
     combineLatest([
       api.rpc.chain.subscribeNewHeads(),
       api.derive.staking.validators()
     ]).pipe(
       map(([header, { validators }]): HeaderExtended =>
-        new HeaderExtended(header, validators)
-      ),
-      drr()
-    );
+        new HeaderExtended(api.registry, header, validators)
+      )
+    ));
 }

packages/api-derive/src/collective/index.ts

@@ -0,0 +1,5 @@
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+export * from './proposals';

packages/api-derive/src/collective/proposals.ts

@@ -0,0 +1,44 @@
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+import { ApiInterfaceRx } from '@polkadot/api/types';
+import { Hash, Proposal, Votes } from '@polkadot/types/interfaces';
+import { DerivedCollectiveProposals } from '../types';
+
+import { combineLatest, Observable, of } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import { Option } from '@polkadot/types';
+
+export function proposals (api: ApiInterfaceRx, section: 'council' | 'technicalCommittee'): () => Observable<DerivedCollectiveProposals> {
+  return (): Observable<DerivedCollectiveProposals> =>
+    api.query[section]
+      ? api.query[section].proposals()
+        .pipe(
+          switchMap((hashes: Hash[]): Observable<[Hash[], Option<Proposal>[], Option<Votes>[]]> => {
+            return combineLatest([
+              of(hashes),
+              combineLatest(
+                hashes.map((hash): Observable<Option<Proposal>> => api.query[section].proposalOf(hash))
+              ),
+              api.query[section].voting.multi<Option<Votes>>(hashes)
+            ]);
+          }),
+          map(([hashes, proposals, votes]): DerivedCollectiveProposals => {
+            const result: DerivedCollectiveProposals = [];
+
+            proposals.forEach((proposalOpt, index): void => {
+              if (proposalOpt.isSome) {
+                result.push({
+                  hash: hashes[index],
+                  proposal: proposalOpt.unwrap(),
+                  votes: votes[index].unwrapOr(null)
+                });
+              }
+            });
+
+            return result;
+          })
+        )
+      : of([] as DerivedCollectiveProposals);
+}

packages/api-derive/src/contracts/fees.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -9,7 +9,7 @@ import BN from 'bn.js';
 import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 type ResultV2 = [BN, BN, BN, BN, BN, BN, BN, BN, BN, BN];
 
@@ -31,49 +31,6 @@ function parseResult ([callBaseFee, contractFee, createBaseFee, creationFee, ren
   };
 }
 
-// Only for 1.0 support. rentByteFee, rentDepositOffset, tombstoneDeposit are not available in substrate 1.0.
-// TODO remove this once 1.0 support is dropped
-function queryV1 (api: ApiInterfaceRx): Observable<DerivedContractFees> {
-  return (
-    api.queryMulti([
-      api.query.contract.callBaseFee,
-      api.query.contract.contractFee,
-      api.query.contract.createBaseFee,
-      api.query.contract.creationFee,
-      api.query.contract.transactionBaseFee,
-      api.query.contract.transactionByteFee,
-      api.query.contract.transferFee
-    ]) as unknown as Observable<BN[]>
-  ).pipe(
-    map(([callBaseFee, contractFee, createBaseFee, creationFee, transactionBaseFee, transactionByteFee, transferFee]): DerivedContractFees =>
-      // We've done this on purpose, i.e. so we can  just copy the name/order from the parse above and
-      // see gaps, in this case those are filled with `ZERO`
-      parseResult([
-        callBaseFee, contractFee, createBaseFee, creationFee, ZERO, ZERO, ZERO, transactionBaseFee, transactionByteFee, transferFee
-      ])
-    ),
-    drr()
-  );
-}
-
-// query via query (early v2, non-current, support to be dropped])
-function queryQuery (api: ApiInterfaceRx): Observable<ResultV2> {
-  const queryBase = api.query.contracts || api.query.contract;
-
-  return api.queryMulti([
-    queryBase.callBaseFee,
-    queryBase.contractFee,
-    queryBase.createBaseFee,
-    queryBase.creationFee,
-    queryBase.rentByteFee,
-    queryBase.rentDepositOffset,
-    queryBase.tombstoneDeposit,
-    queryBase.transactionBaseFee,
-    queryBase.transactionByteFee,
-    queryBase.transferFee
-  ]) as unknown as Observable<ResultV2>;
-}
-
 // query via constants (current applicable path)
 function queryConstants (api: ApiInterfaceRx): Observable<ResultV2> {
   return of([
@@ -104,23 +61,18 @@ function queryConstants (api: ApiInterfaceRx): Observable<ResultV2> {
  * ```
  */
 export function fees (api: ApiInterfaceRx): () => Observable<DerivedContractFees> {
-  return (): Observable<DerivedContractFees> => {
-    if (api.query.contract && !api.query.contract.rentByteFee) {
-      return queryV1(api);
-    }
-
+  return memo((): Observable<DerivedContractFees> => {
     return (
       api.consts.contracts
         ? queryConstants(api)
-        : queryQuery(api)
+        : of([ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO])
     ).pipe(
       map(([callBaseFee, contractFee, createBaseFee, creationFee, rentByteFee, rentDepositOffset, tombstoneDeposit, transactionBaseFee, transactionByteFee, transferFee]): DerivedContractFees =>
         // We've done this on purpose, i.e. so we can  just copy the name/order from the parse above and see gaps
         parseResult([
           callBaseFee, contractFee, createBaseFee, creationFee, rentByteFee, rentDepositOffset, tombstoneDeposit, transactionBaseFee, transactionByteFee, transferFee
         ])
-      ),
-      drr()
+      )
     );
-  };
+  });
 }

packages/api-derive/src/contracts/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-derive/src/council/index.ts

@@ -0,0 +1,5 @@
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+export * from './proposals';

packages/api-derive/src/council/proposals.ts

@@ -0,0 +1,14 @@
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+import { ApiInterfaceRx } from '@polkadot/api/types';
+import { DerivedCollectiveProposals } from '../types';
+
+import { Observable } from 'rxjs';
+import { proposals as collectiveProposals } from '../collective';
+import { memo } from '../util';
+
+export function proposals (api: ApiInterfaceRx): () => Observable<DerivedCollectiveProposals> {
+  return memo(collectiveProposals(api, 'council'));
+}

packages/api-derive/src/democracy/index.ts

@@ -1,7 +1,8 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+export * from './proposals';
 export * from './referendumInfos';
 export * from './referendums';
 export * from './referendumVotesFor';

packages/api-derive/src/democracy/proposals.ts

@@ -0,0 +1,83 @@
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+import { AccountId, Balance, BlockNumber, Hash, PropIndex, Proposal } from '@polkadot/types/interfaces';
+import { ITuple } from '@polkadot/types/types';
+import { DeriveProposal } from '../types';
+
+import { Observable, combineLatest, of } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import { ApiInterfaceRx } from '@polkadot/api/types';
+import { Bytes, Option, Vec, createType } from '@polkadot/types';
+
+import { memo } from '../util';
+
+export type PreImage = Option<ITuple<[Bytes, AccountId, Balance, BlockNumber]>>;
+
+type Depositors = Option<ITuple<[Balance, Vec<AccountId>]>>;
+type Proposals = Vec<ITuple<[PropIndex, Hash, AccountId]>>;
+
+interface Result {
+  depositors: Depositors[];
+  preimages: PreImage[];
+  proposals: Proposals;
+}
+
+function parse (api: ApiInterfaceRx, { depositors, proposals, preimages }: Result): DeriveProposal[] {
+  return proposals
+    .filter(([, , proposer], index): boolean =>
+      !!(depositors[index]?.isSome) && !proposer.isEmpty
+    )
+    .map(([propIndex, hash, proposer], index): DeriveProposal => {
+      const preimage = preimages[index].unwrapOr(null);
+      const depositor = depositors[index].unwrap();
+      let proposal: undefined | Proposal;
+
+      // we could end up in a situation where the proposal is non-decodable, e.g. after an upgrade
+      if (preimage) {
+        try {
+          proposal = createType(api.registry, 'Proposal', preimage[0].toU8a(true));
+        } catch (error) {
+          console.error(error);
+        }
+      }
+
+      return {
+        balance: depositor[0],
+        hash,
+        index: propIndex,
+        preimage: preimage
+          ? {
+            at: preimage[3],
+            balance: preimage[2],
+            proposer: preimage[1]
+          }
+          : undefined,
+        proposal,
+        proposer,
+        seconds: depositor[1]
+      };
+    });
+}
+
+export function proposals (api: ApiInterfaceRx): () => Observable<DeriveProposal[]> {
+  return memo((): Observable<DeriveProposal[]> =>
+    api.query.democracy?.publicProps
+      ? api.query.democracy
+        .publicProps<Proposals>()
+        .pipe(
+          switchMap((proposals) =>
+            combineLatest([
+              of(proposals),
+              api.query.democracy.preimages.multi<PreImage>(proposals.map(([, hash]): Hash => hash)),
+              api.query.democracy.depositOf.multi<Depositors>(proposals.map(([index]): PropIndex => index))
+            ])
+          ),
+          map(([proposals, preimages, depositors]): DeriveProposal[] =>
+            parse(api, { depositors, proposals, preimages })
+          )
+        )
+      : of([] as DeriveProposal[])
+  );
+}

packages/api-derive/src/democracy/referendumInfo.ts

@@ -1,38 +1,64 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ReferendumInfo } from '@polkadot/types/interfaces/democracy';
+import { DerivedReferendum } from '../types';
+import { PreImage } from './proposals';
 
 import BN from 'bn.js';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, of } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Option } from '@polkadot/types';
-import { isNull } from '@polkadot/util';
+import { Option, createType } from '@polkadot/types';
 
-import { ReferendumInfoExtended } from '../type';
-import { drr } from '../util';
+import { memo } from '../util';
 
-export function constructInfo (index: BN | number, optionInfo?: Option<ReferendumInfo>): Option<ReferendumInfoExtended> {
-  const info = optionInfo
-    ? optionInfo.unwrapOr(null)
+function constructInfo (api: ApiInterfaceRx, index: BN | number, _info: Option<ReferendumInfo>, _preimage?: PreImage): DerivedReferendum | null {
+  const preImage = _preimage?.isSome
+    ? _preimage.unwrap()
     : null;
+  const info = _info.unwrapOr(null);
 
-  return new Option<ReferendumInfoExtended>(
-    ReferendumInfoExtended,
-    isNull(info)
-      ? null
-      : new ReferendumInfoExtended(info, index)
+  if (!info) {
+    return null;
+  }
+
+  return {
+    index: createType(api.registry, 'PropIndex', index),
+    info,
+    hash: info.proposalHash,
+    proposal: preImage
+      ? createType(api.registry, 'Proposal', preImage[0].toU8a(true))
+      : undefined,
+    preimage: preImage
+      ? {
+        at: preImage[3],
+        balance: preImage[2],
+        proposer: preImage[1]
+      }
+      : undefined
+  };
+}
+
+export function retrieveInfo (api: ApiInterfaceRx, index: BN | number, info: Option<ReferendumInfo>): Observable<DerivedReferendum | null> {
+  return ((
+    info?.isSome
+      ? api.query.democracy.preimages<PreImage>(info.unwrap().proposalHash)
+      : of(undefined)
+  ) as Observable<PreImage | undefined>).pipe(
+    map((preimage?: PreImage): DerivedReferendum | null =>
+      constructInfo(api, index, info, preimage)
+    )
   );
 }
 
-export function referendumInfo (api: ApiInterfaceRx): (index: BN | number) => Observable<Option<ReferendumInfoExtended>> {
-  return (index: BN | number): Observable<Option<ReferendumInfoExtended>> =>
+export function referendumInfo (api: ApiInterfaceRx): (index: BN | number) => Observable<DerivedReferendum | null> {
+  return memo((index: BN | number): Observable<DerivedReferendum | null> =>
     api.query.democracy.referendumInfoOf<Option<ReferendumInfo>>(index).pipe(
-      map((optionInfo): Option<ReferendumInfoExtended> =>
-        constructInfo(index, optionInfo)
-      ),
-      drr()
-    );
+      switchMap((info): Observable<DerivedReferendum | null> =>
+        retrieveInfo(api, index, info)
+      )
+    )
+  );
 }

packages/api-derive/src/democracy/referendumInfos.ts

@@ -1,31 +1,35 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ReferendumInfo } from '@polkadot/types/interfaces/democracy';
+import { DerivedReferendum } from '../types';
 
 import BN from 'bn.js';
-import { Observable, of } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, combineLatest, of } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { Option, Vec } from '@polkadot/types';
 
-import { ReferendumInfoExtended } from '../type';
-import { drr } from '../util';
-import { constructInfo } from './referendumInfo';
+import { memo } from '../util';
+import { retrieveInfo } from './referendumInfo';
 
-export function referendumInfos (api: ApiInterfaceRx): (ids?: (BN | number)[]) => Observable<Option<ReferendumInfoExtended>[]> {
-  return (ids: (BN | number)[] = []): Observable<Option<ReferendumInfoExtended>[]> =>
+export function referendumInfos (api: ApiInterfaceRx): (ids?: (BN | number)[]) => Observable<DerivedReferendum[]> {
+  return memo((ids: (BN | number)[] = []): Observable<DerivedReferendum[]> =>
     (
       !ids || !ids.length
         ? of([] as Option<ReferendumInfo>[])
         : api.query.democracy.referendumInfoOf.multi(ids) as Observable<Vec<Option<ReferendumInfo>>>
     ).pipe(
-      map((infos): Option<ReferendumInfoExtended>[] =>
-        ids.map((id, index): Option<ReferendumInfoExtended> =>
-          constructInfo(id, infos[index])
+      switchMap((infos): Observable<(DerivedReferendum | null)[]> =>
+        combineLatest(
+          ...ids.map((id, index): Observable<DerivedReferendum | null> =>
+            retrieveInfo(api, id, infos[index])
+          )
         )
       ),
-      drr()
-    );
+      map((infos): DerivedReferendum[] =>
+        infos.filter((referendum): boolean => !!referendum) as DerivedReferendum[]
+      )
+    ));
 }

packages/api-derive/src/democracy/referendumVotesFor.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -11,10 +11,10 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
 import { Vec, createType } from '@polkadot/types';
 
 import { DerivedBalances, DerivedReferendumVote } from '../types';
-import { drr } from '../util';
+import { memo } from '../util';
 
 export function referendumVotesFor (api: ApiInterfaceRx): (referendumId: BN | number) => Observable<DerivedReferendumVote[]> {
-  return (referendumId: BN | number): Observable<DerivedReferendumVote[]> =>
+  return memo((referendumId: BN | number): Observable<DerivedReferendumVote[]> =>
     api.query.democracy.votersFor<Vec<AccountId>>(referendumId).pipe(
       switchMap((votersFor): Observable<[Vec<AccountId>, Vote[], DerivedBalances[]]> =>
         combineLatest([
@@ -26,10 +26,9 @@ export function referendumVotesFor (api: ApiInterfaceRx): (referendumId: BN | nu
       map(([votersFor, votes, balances]): DerivedReferendumVote[] =>
         votersFor.map((accountId, index): DerivedReferendumVote => ({
           accountId,
-          balance: balances[index].votingBalance || createType('Balance'),
-          vote: votes[index] || createType('Vote')
-        } as unknown as DerivedReferendumVote))
-      ),
-      drr()
-    );
+          balance: balances[index].votingBalance || createType(api.registry, 'Balance'),
+          vote: votes[index] || createType(api.registry, 'Vote')
+        } as DerivedReferendumVote))
+      )
+    ));
 }

packages/api-derive/src/democracy/referendums.ts

@@ -1,33 +1,35 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ReferendumIndex } from '@polkadot/types/interfaces/democracy';
+import { DerivedReferendum } from '../types';
 
 import BN from 'bn.js';
 import { Observable, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Option } from '@polkadot/types';
 
-import { ReferendumInfoExtended } from '../type';
-import { drr } from '../util';
+import { memo } from '../util';
 
-export function referendums (api: ApiInterfaceRx): () => Observable<Option<ReferendumInfoExtended>[]> {
-  return (): Observable<Option<ReferendumInfoExtended>[]> =>
-    api.queryMulti<[ReferendumIndex, ReferendumIndex]>([
-      api.query.democracy.nextTally,
-      api.query.democracy.referendumCount
-    ]).pipe(
-      switchMap(([nextTally, referendumCount]): Observable<Option<ReferendumInfoExtended>[]> =>
-        referendumCount && nextTally && referendumCount.gt(nextTally) && referendumCount.gtn(0)
-          ? api.derive.democracy.referendumInfos(
-            [...Array(referendumCount.sub(nextTally).toNumber())].map((_, i): BN =>
-              nextTally.addn(i)
+export function referendums (api: ApiInterfaceRx): () => Observable<DerivedReferendum[]> {
+  return memo((): Observable<DerivedReferendum[]> =>
+    // V2 vs V1 (and early V2)
+    api.query.democracy?.lowestUnbaked || api.query.democracy?.nextTally
+      ? api.queryMulti<[ReferendumIndex, ReferendumIndex]>([
+        api.query.democracy.lowestUnbaked || api.query.democracy.nextTally,
+        api.query.democracy.referendumCount
+      ]).pipe(
+        switchMap(([earliest, referendumCount]): Observable<DerivedReferendum[]> =>
+          referendumCount?.gt(earliest) && referendumCount?.gtn(0)
+            ? api.derive.democracy.referendumInfos(
+              [...Array(referendumCount.sub(earliest).toNumber())].map((_, i): BN =>
+                earliest.addn(i)
+              )
             )
-          )
-          : of([])
-      ),
-      drr()
-    );
+            : of([])
+        )
+      )
+      : of([] as DerivedReferendum[])
+  );
 }

packages/api-derive/src/democracy/votes.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -8,17 +8,16 @@ import BN from 'bn.js';
 import { Observable, of } from 'rxjs';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 export function votes (api: ApiInterfaceRx): (referendumId: BN, accountIds?: AccountId[]) => Observable<Vote[]> {
-  return (referendumId: BN, accountIds: AccountId[] = []): Observable<Vote[]> =>
-    (
-      !accountIds || !accountIds.length
-        ? of([] as Vote[])
-        : api.query.democracy.voteOf.multi<Vote>(
-          accountIds.map((accountId): [BN, AccountId] =>
-            [referendumId, accountId]
-          )
+  return memo((referendumId: BN, accountIds: AccountId[] = []): Observable<Vote[]> =>
+    !accountIds || !accountIds.length
+      ? of([] as Vote[])
+      : api.query.democracy.voteOf.multi<Vote>(
+        accountIds.map((accountId): [BN, AccountId] =>
+          [referendumId, accountId]
         )
-    ).pipe(drr());
+      )
+  );
 }

packages/api-derive/src/elections/approvalsOf.ts

@@ -1,43 +0,0 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-import { AccountId, ApprovalFlag, SetIndex } from '@polkadot/types/interfaces';
-
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Observable } from 'rxjs';
-import { Vec } from '@polkadot/types';
-import { switchMap, map } from 'rxjs/operators';
-import { approvalFlagsToBools } from '../util/approvalFlagsToBools';
-import { drr } from '../util';
-
-/**
- * @name approvalsOf
- * @returns A nested array of boolean approvals for the given account in each voter set index, converted from its ApprovalFlag(s).
- * @example
- * <BR>
- *
- * ```javascript
- * api.derive.elections.approvalsOf(ALICE, (approvals) => {
- *   // approvals === [[false], [true, false], ...]
- * });
- * ```
- */
-export function approvalsOf (api: ApiInterfaceRx): (who: AccountId) => Observable<boolean[][]> {
-  return (who: AccountId | string): Observable<boolean[][]> =>
-    api.query.elections.nextVoterSet<SetIndex>().pipe(
-      switchMap((nextVoterSet: SetIndex): Observable<Vec<ApprovalFlag>[]> =>
-        api.query.elections.approvalsOf.multi(
-          [...Array(nextVoterSet.toNumber() + 1).keys()].map((i): [string, number] => [
-            who.toString(), i]
-          )
-        ) as any as Observable<Vec<ApprovalFlag>[]>
-      ),
-      map((votes: Vec<ApprovalFlag>[]): boolean[][] =>
-        votes.map((flags: Vec<ApprovalFlag>): boolean[] =>
-          approvalFlagsToBools(flags)
-        )
-      ),
-      drr()
-    );
-}

packages/api-derive/src/elections/approvalsOfAt.ts

@@ -1,34 +0,0 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-import { AccountId, ApprovalFlag, SetIndex } from '@polkadot/types/interfaces';
-
-import BN from 'bn.js';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Vec } from '@polkadot/types';
-
-import { approvalFlagsToBools } from '../util/approvalFlagsToBools';
-import { drr } from '../util';
-
-/**
- * @name approvalsOfAt
- * @returns An array of boolean approvals for the account and set index, converted from the returned ApprovalFlag.
- * @example
- * <BR>
- *
- * ```javascript
- * api.derive.elections.approvalsOfAt(ALICE, new BN(0), (approvals) => {
- *   // approvals === [false, true, ...]
- * });
- * ```
- */
-export function approvalsOfAt (api: ApiInterfaceRx): (who: AccountId, at: SetIndex) => Observable<boolean[]> {
-  return (who: AccountId | string, at: SetIndex | BN | number): Observable<boolean[]> =>
-    api.query.elections.approvalsOf<Vec<ApprovalFlag>>([who.toString(), at]).pipe(
-      map((flags: Vec<ApprovalFlag>): boolean[] => approvalFlagsToBools(flags)),
-      drr()
-    );
-}

packages/api-derive/src/elections/index.ts

@@ -1,9 +1,5 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-export * from './approvalsOf';
-export * from './approvalsOfAt';
 export * from './info';
-export * from './voters';
-export * from './voterPositions';

packages/api-derive/src/elections/info.ts

@@ -1,9 +1,9 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AccountId, Balance, BlockNumber, SetIndex, VoteIndex } from '@polkadot/types/interfaces';
-import { Codec } from '@polkadot/types/types';
+import { AccountId, Balance, BlockNumber } from '@polkadot/types/interfaces';
+import { ITuple } from '@polkadot/types/types';
 
 import { Observable, combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -11,70 +11,40 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
 import { createType, Vec, u32 } from '@polkadot/types';
 
 import { DerivedElectionsInfo } from '../types';
-import { drr } from '../util';
+import { memo } from '../util';
 
-type ResultElectionsInner = [u32, u32, Vec<[AccountId, BlockNumber] & Codec>, SetIndex, BlockNumber, VoteIndex, SetIndex];
-type ResultElections = [Vec<AccountId>, ResultElectionsInner];
-
-function deriveElections ([candidates, [candidateCount, desiredSeats, members, nextVoterSet, termDuration, voteCount, voterCount]]: ResultElections): DerivedElectionsInfo {
+function deriveElections (api: ApiInterfaceRx, candidates: AccountId[], members: [AccountId, Balance][], runnersUp: [AccountId, Balance][], candidacyBond: Balance, desiredSeats: u32, termDuration: BlockNumber, votingBond: Balance): DerivedElectionsInfo {
   return {
     candidates,
-    candidateCount,
-    desiredSeats,
-    nextVoterSet,
-    members: members.map(([accountId]): [AccountId, Balance] => [accountId, createType('Balance')]),
-    runnersUp: [],
-    termDuration,
-    voteCount,
-    voterCount
-  };
-}
-
-function queryElections (api: ApiInterfaceRx): Observable<DerivedElectionsInfo> {
-  // NOTE We have an issue where candidates can return `null` for an empty array
-  return combineLatest([
-    api.query.elections.candidates<Vec<AccountId>>(),
-    api.queryMulti<ResultElectionsInner>([
-      api.query.elections.candidateCount,
-      api.query.elections.desiredSeats,
-      api.query.elections.members,
-      api.query.elections.nextVoterSet,
-      api.query.elections.termDuration,
-      api.query.elections.voteCount,
-      api.query.elections.voterCount
-    ])
-  ]).pipe(map(deriveElections));
-}
-
-function derivePhragmen (candidates: AccountId[], members: [AccountId, Balance][], runnersUp: [AccountId, Balance][], candidacyBond: Balance, desiredSeats: u32, termDuration: BlockNumber, votingBond: Balance): DerivedElectionsInfo {
-  return {
-    candidates,
-    candidateCount: createType('u32', candidates.length),
+    candidateCount: createType(api.registry, 'u32', candidates.length),
     candidacyBond,
     desiredSeats,
-    members,
-    runnersUp,
+    members: members.sort((a, b): number => b[1].cmp(a[1])),
+    runnersUp: runnersUp.sort((a, b): number => b[1].cmp(a[1])),
     termDuration,
     votingBond
   };
 }
 
-function queryPhragmen (api: ApiInterfaceRx): Observable<DerivedElectionsInfo> {
+function queryElections (api: ApiInterfaceRx): Observable<DerivedElectionsInfo> {
+  const section = api.query.electionsPhragmen ? 'electionsPhragmen' : 'elections';
+
   // NOTE We have an issue where candidates can return `null` for an empty array, hence
   // we are not using multi queries here, so empty array is empty (instead of space-filled)
   return combineLatest([
-    api.query.electionsPhragmen.candidates<Vec<AccountId>>(),
-    api.query.electionsPhragmen.members<Vec<[AccountId, Balance] & Codec>>(),
-    api.query.electionsPhragmen.runnersUp<Vec<[AccountId, Balance] & Codec>>()
+    api.query[section].candidates<Vec<AccountId>>(),
+    api.query[section].members<Vec<ITuple<[AccountId, Balance]>>>(),
+    api.query[section].runnersUp<Vec<ITuple<[AccountId, Balance]>>>()
   ]).pipe(
-    map(([candidates, members, runnersUp]): DerivedElectionsInfo => derivePhragmen(
+    map(([candidates, members, runnersUp]): DerivedElectionsInfo => deriveElections(
+      api,
       candidates,
       members,
       runnersUp,
-      api.consts.electionsPhragmen.candidacyBond as Balance,
-      api.consts.electionsPhragmen.desiredMembers as u32,
-      api.consts.electionsPhragmen.termDuration as BlockNumber,
-      api.consts.electionsPhragmen.votingBond as Balance
+      api.consts[section].candidacyBond as Balance,
+      api.consts[section].desiredMembers as u32,
+      api.consts[section].termDuration as BlockNumber,
+      api.consts[section].votingBond as Balance
     ))
   );
 }
@@ -93,10 +63,5 @@ function queryPhragmen (api: ApiInterfaceRx): Observable<DerivedElectionsInfo> {
  * ```
  */
 export function info (api: ApiInterfaceRx): () => Observable<DerivedElectionsInfo> {
-  const query = api.query.electionsPhragmen
-    ? queryPhragmen
-    : queryElections;
-
-  return (): Observable<DerivedElectionsInfo> =>
-    query(api).pipe(drr());
+  return memo((): Observable<DerivedElectionsInfo> => queryElections(api));
 }

packages/api-derive/src/elections/voterPositions.ts

@@ -1,59 +0,0 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-import { AccountId, SetIndex } from '@polkadot/types/interfaces';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Vec, Option, createType } from '@polkadot/types';
-import { DerivedVoterPositions } from '../types';
-
-import BN from 'bn.js';
-import { of, combineLatest, Observable } from 'rxjs';
-import { switchMap, map } from 'rxjs/operators';
-
-import { drr } from '../util';
-
-/**
- * @name voterPositions
- * @returns An mapping of all current voter accounts to their voter set and global index.
- * @example
- * <BR>
- *
- * ```javascript
- * api.derive.elections.voterPositions((voters) => {
- *   const { index, setIndex, globalIndex } = voters[ALICE];
- *   console.log(`ALICE is a voter at index ${index} in voter set ${setIndex}, with global index ${globalIndex}.`);
- * });
- * ```
- */
-export function voterPositions (api: ApiInterfaceRx): () => Observable<DerivedVoterPositions> {
-  return (): Observable<DerivedVoterPositions> =>
-    api.query.elections.nextVoterSet<SetIndex>().pipe(
-      switchMap((nextVoterSet: SetIndex): Observable<[BN, Vec<Option<AccountId>>[]]> => combineLatest(
-        of(api.consts.elections.voterSetSize) as any as Observable<BN>,
-        api.query.elections.voters.multi([...Array(+nextVoterSet + 1).keys()].map((_, i): [number] => [i])) as any as Observable<Vec<Option<AccountId>>[]>
-      )),
-      map((result: [BN, Vec<Option<AccountId>>[]]): DerivedVoterPositions => {
-        const [setSize, voters] = result;
-
-        return voters.reduce((result: DerivedVoterPositions, vec, setIndex): DerivedVoterPositions => {
-          vec.forEach((e, index): void => {
-            // re-create the index based on position 0 is [0][0] and likewise
-            // 64 (0..63 in first) is [1][0] (the first index value in set 2)
-            const accountId: AccountId | null = e.unwrapOr(null);
-
-            if (accountId) {
-              result[accountId.toString()] = {
-                globalIndex: setSize.muln(setIndex).addn(index),
-                index: new BN(index),
-                setIndex: createType('SetIndex', setIndex)
-              };
-            }
-          });
-
-          return result;
-        }, {});
-      }),
-      drr()
-    );
-}

packages/api-derive/src/elections/voters.ts

@@ -1,40 +0,0 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId } from '@polkadot/types/interfaces';
-import { DerivedVoterPositions } from '../types';
-
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { createType, Vec } from '@polkadot/types';
-
-import { drr } from '../util';
-
-/**
- * @name voters
- * @returns An array of all current voters from all sets.
- * @example
- * <BR>
- *
- * ```javascript
- * api.derive.elections.voters((voters) => {
- *   console.log(`There are ${voters.length} current voters.`);
- * });
- * ```
- */
-export function voters (api: ApiInterfaceRx): () => Observable<Vec<AccountId>> {
-  return (): Observable<Vec<AccountId>> =>
-    api.derive.elections.voterPositions().pipe(
-      map((voterPositions: DerivedVoterPositions): Vec<AccountId> =>
-        createType(
-          'Vec<AccountId>',
-          Object.entries(voterPositions)
-            .sort((a, b): number => a[1].globalIndex.cmp(b[1].globalIndex))
-            .map(([accountId]): AccountId => createType('AccountId', accountId))
-        )
-      ),
-      drr()
-    );
-}

packages/api-derive/src/imOnline/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-derive/src/imOnline/receivedHeartbeats.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -10,13 +10,13 @@ import { map, switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { Bytes, Option, u32 } from '@polkadot/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 /**
  * @description Return a boolean array indicating whether the passed accounts had received heartbeats in the current session
  */
 export function receivedHeartbeats (api: ApiInterfaceRx): () => Observable<DerivedHeartbeats> {
-  return (): Observable<DerivedHeartbeats> =>
+  return memo((): Observable<DerivedHeartbeats> =>
     api.query.imOnline?.receivedHeartbeats && api.query.imOnline.authoredBlocks
       ? api.derive.staking.overview().pipe(
         switchMap(({ currentIndex, validators }): Observable<[AccountId[], Option<Bytes>[], u32[]]> =>
@@ -35,8 +35,7 @@ export function receivedHeartbeats (api: ApiInterfaceRx): () => Observable<Deriv
               isOnline: !heartbeats[index].isEmpty || numBlocks[index].gtn(0)
             }
           }), {})
-        ),
-        drr()
+        )
       )
-      : of({});
+      : of({}));
 }

packages/api-derive/src/index.spec.ts

@@ -1,10 +1,11 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Observable, from } from 'rxjs';
 import ApiRx from '@polkadot/api/rx/Api';
 import MockProvider from '@polkadot/rpc-provider/mock';
+import { TypeRegistry } from '@polkadot/types';
 
 import { ExactDerive } from '.';
 
@@ -26,8 +27,10 @@ const testFunction = (api: ApiRx): any => {
 };
 
 describe('derive', (): void => {
+  const registry = new TypeRegistry();
+
   describe('builtin', (): void => {
-    const api = new ApiRx({ provider: new MockProvider() });
+    const api = new ApiRx({ provider: new MockProvider(registry), registry });
 
     beforeAll((done): void => {
       api.isReady.subscribe((): void => done());
@@ -52,17 +55,13 @@ describe('derive', (): void => {
     testFunction(api)('democracy', 'referendumVotesFor', []);
     testFunction(api)('democracy', 'votes', []);
 
-    testFunction(api)('elections', 'approvalsOf', []);
-    // FIXME This one has an additional check which mock doesnt (yet) cater for
-    // testFunction(api)('elections', 'approvalsOfAt', []);
     testFunction(api)('elections', 'info', []);
-    testFunction(api)('elections', 'voters', []);
 
     testFunction(api)('session', 'eraLength', []);
     testFunction(api)('session', 'eraProgress', []);
     testFunction(api)('session', 'sessionProgress', []);
 
-    testFunction(api)('staking', 'info', []);
+    testFunction(api)('staking', 'account', []);
     testFunction(api)('staking', 'recentlyOffline', []);
     testFunction(api)('staking', 'controllers', []);
   });
@@ -77,7 +76,8 @@ describe('derive', (): void => {
           test: (): any => (): Observable<any> => from([1, 2, 3])
         }
       },
-      provider: new MockProvider()
+      provider: new MockProvider(registry),
+      registry
     });
 
     beforeAll((done): void => {

packages/api-derive/src/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -11,11 +11,14 @@ import * as accounts from './accounts';
 import * as balances from './balances';
 import * as chain from './chain';
 import * as contracts from './contracts';
+import * as council from './council';
 import * as democracy from './democracy';
 import * as elections from './elections';
 import * as imOnline from './imOnline';
 import * as session from './session';
 import * as staking from './staking';
+import * as technicalCommittee from './technicalCommittee';
+import * as treasury from './treasury';
 
 export * from './type';
 
@@ -56,7 +59,7 @@ function injectFunctions<AllSections> (api: ApiInterfaceRx, allSections: AllSect
     }, {} as DeriveAllSections<AllSections>);
 }
 
-export const derive = { accounts, balances, chain, contracts, democracy, elections, imOnline, session, staking };
+export const derive = { accounts, balances, chain, contracts, council, democracy, elections, imOnline, session, staking, technicalCommittee, treasury };
 export type ExactDerive = DeriveAllSections<typeof derive>;
 
 // FIXME The return type of this function should be {...ExactDerive, ...DeriveCustom}

packages/api-derive/src/session/eraLength.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -9,12 +9,11 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 export function eraLength (api: ApiInterfaceRx): () => Observable<BlockNumber> {
-  return (): Observable<BlockNumber> =>
+  return memo((): Observable<BlockNumber> =>
     api.derive.session.info().pipe(
-      map(({ eraLength }: DerivedSessionInfo): BlockNumber => eraLength),
-      drr()
-    );
+      map(({ eraLength }: DerivedSessionInfo): BlockNumber => eraLength)
+    ));
 }

packages/api-derive/src/session/eraProgress.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -9,12 +9,11 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 export function eraProgress (api: ApiInterfaceRx): () => Observable<BlockNumber> {
-  return (): Observable<BlockNumber> =>
+  return memo((): Observable<BlockNumber> =>
     api.derive.session.info().pipe(
-      map(({ eraProgress }: DerivedSessionInfo): BlockNumber => eraProgress),
-      drr()
-    );
+      map(({ eraProgress }: DerivedSessionInfo): BlockNumber => eraProgress)
+    ));
 }

packages/api-derive/src/session/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/api-derive/src/session/indexes.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -6,22 +6,26 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
 import { EraIndex, SessionIndex } from '@polkadot/types/interfaces';
 import { DeriveSessionIndexes } from '../types';
 
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { u32 } from '@polkadot/types';
+import { createType, u32 as U32 } from '@polkadot/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 export function indexes (api: ApiInterfaceRx): () => Observable<DeriveSessionIndexes> {
-  return (): Observable<DeriveSessionIndexes> =>
-    api.queryMulti<[SessionIndex, EraIndex, u32]>([
-      api.query.session.currentIndex,
-      api.query.staking.currentEra,
-      api.query.staking.validatorCount
-    ]).pipe(
+  return memo((): Observable<DeriveSessionIndexes> =>
+    (
+      // Some chains (eg. very limited node-template), does not have session
+      api.query.session && api.query.staking
+        ? api.queryMulti<[SessionIndex, EraIndex, U32]>([
+          api.query.session.currentIndex,
+          api.query.staking.currentEra,
+          api.query.staking.validatorCount
+        ])
+        : of([createType(api.registry, 'SessionIndex', 1), createType(api.registry, 'EraIndex', 1), createType(api.registry, 'u32')])
+    ).pipe(
       map(([currentIndex, currentEra, validatorCount]): DeriveSessionIndexes => ({
         currentIndex, currentEra, validatorCount
-      })),
-      drr()
-    );
+      }))
+    ));
 }

packages/api-derive/src/session/info.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -10,7 +10,7 @@ import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { Option, u64, createType } from '@polkadot/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 type ResultV1Session = [Option<BlockNumber>, BlockNumber, BlockNumber, SessionIndex];
 type ResultV1 = [BlockNumber, DeriveSessionIndexes, ResultV1Session];
@@ -20,8 +20,8 @@ type ResultType = [boolean, u64, SessionIndex];
 type Result = [ResultType, DeriveSessionIndexes, ResultSlots];
 
 // internal helper to just split the logic - take all inputs, do the calculations and combine
-function createDerivedV1 ([bestNumber, { currentIndex, validatorCount }, [_lastLengthChange, sessionLength, lastEraLengthChange, sessionsPerEra]]: ResultV1): DerivedSessionInfo {
-  const lastLengthChange = _lastLengthChange?.unwrapOr(null) || createType('BlockNumber');
+function createDerivedV1 (api: ApiInterfaceRx, [bestNumber, { currentIndex, validatorCount }, [_lastLengthChange, sessionLength, lastEraLengthChange, sessionsPerEra]]: ResultV1): DerivedSessionInfo {
+  const lastLengthChange = _lastLengthChange?.unwrapOr(null) || createType(api.registry, 'BlockNumber');
   const sessionProgress = bestNumber
     .sub(lastLengthChange)
     .add(sessionLength)
@@ -34,38 +34,32 @@ function createDerivedV1 ([bestNumber, { currentIndex, validatorCount }, [_lastL
     .add(sessionProgress);
 
   return {
-    currentEra: createType('EraIndex', currentEra),
+    currentEra: createType(api.registry, 'EraIndex', currentEra),
     currentIndex,
-    eraLength: createType('BlockNumber', sessionLength.mul(sessionsPerEra)),
-    eraProgress: createType('BlockNumber', eraProgress),
+    eraLength: createType(api.registry, 'BlockNumber', sessionLength.mul(sessionsPerEra)),
+    eraProgress: createType(api.registry, 'BlockNumber', eraProgress),
     isEpoch: false,
-    lastEraLengthChange,
-    lastLengthChange,
     sessionLength,
     sessionsPerEra,
-    sessionProgress: createType('BlockNumber', sessionProgress),
+    sessionProgress: createType(api.registry, 'BlockNumber', sessionProgress),
     validatorCount
   };
 }
 
-function createDerivedLatest ([[hasBabe, epochDuration, sessionsPerEra], { currentIndex, currentEra, validatorCount }, [currentSlot, epochIndex, epochOrGenesisStartSlot, currentEraStartSessionIndex]]: Result): DerivedSessionInfo {
+function createDerivedLatest (api: ApiInterfaceRx, [[hasBabe, epochDuration, sessionsPerEra], { currentIndex, currentEra, validatorCount }, [currentSlot, epochIndex, epochOrGenesisStartSlot, currentEraStartSessionIndex]]: Result): DerivedSessionInfo {
   const epochStartSlot = epochIndex.mul(epochDuration).add(epochOrGenesisStartSlot);
   const sessionProgress = currentSlot.sub(epochStartSlot);
-  const eraProgress = currentIndex.sub(currentEraStartSessionIndex).add(sessionProgress);
-
-  // console.log(sessionProgress);
+  const eraProgress = currentIndex.sub(currentEraStartSessionIndex).mul(epochDuration).add(sessionProgress);
 
   return {
     currentEra,
     currentIndex,
-    eraLength: createType('BlockNumber', sessionsPerEra.mul(epochDuration)),
-    eraProgress: createType('BlockNumber', eraProgress),
+    eraLength: createType(api.registry, 'BlockNumber', sessionsPerEra.mul(epochDuration)),
+    eraProgress: createType(api.registry, 'BlockNumber', eraProgress),
     isEpoch: hasBabe,
-    lastEraLengthChange: createType('BlockNumber'),
-    lastLengthChange: createType('BlockNumber', epochStartSlot),
     sessionLength: epochDuration,
     sessionsPerEra,
-    sessionProgress: createType('BlockNumber', sessionProgress),
+    sessionProgress: createType(api.registry, 'BlockNumber', sessionProgress),
     validatorCount
   };
 }
@@ -81,17 +75,17 @@ function infoV1 (api: ApiInterfaceRx): Observable<DerivedSessionInfo> {
       api.query.staking.sessionsPerEra
     ])
   ]).pipe(
-    map(createDerivedV1)
+    map((result): DerivedSessionInfo => createDerivedV1(api, result))
   );
 }
 
 function infoLatestAura (api: ApiInterfaceRx): Observable<DerivedSessionInfo> {
   return api.derive.session.indexes().pipe(
     map((indexes): DerivedSessionInfo =>
-      createDerivedLatest([
-        [false, createType('u64', 1), api.consts.staking.sessionsPerEra as SessionIndex],
+      createDerivedLatest(api, [
+        [false, createType(api.registry, 'u64', 1), api.consts.staking?.sessionsPerEra || createType(api.registry, 'SessionIndex', 1)],
         indexes,
-        [createType('u64', 1), createType('u64', 1), createType('u64', 1), createType('SessionIndex', 1)]
+        [createType(api.registry, 'u64', 1), createType(api.registry, 'u64', 1), createType(api.registry, 'u64', 1), createType(api.registry, 'SessionIndex', 1)]
       ])
     )
   );
@@ -108,8 +102,8 @@ function infoLatestBabe (api: ApiInterfaceRx): Observable<DerivedSessionInfo> {
     ])
   ]).pipe(
     map(([indexes, slots]: [DeriveSessionIndexes, ResultSlots]): DerivedSessionInfo =>
-      createDerivedLatest([
-        [true, api.consts.babe.epochDuration as u64, api.consts.staking.sessionsPerEra as SessionIndex],
+      createDerivedLatest(api, [
+        [true, api.consts.babe.epochDuration, api.consts.staking.sessionsPerEra],
         indexes,
         slots
       ])
@@ -121,12 +115,12 @@ function infoLatestBabe (api: ApiInterfaceRx): Observable<DerivedSessionInfo> {
  * @description Retrieves all the session and era info and calculates specific values on it as the length of the session and eras
  */
 export function info (api: ApiInterfaceRx): () => Observable<DerivedSessionInfo> {
-  const query = api.consts.staking
+  const query = api.consts.timestamp || api.consts.babe || api.consts.aura
     ? api.consts.babe
       ? infoLatestBabe // 2.x with Babe
       : infoLatestAura // 2.x with Aura (not all info there)
     : infoV1;
 
-  return (): Observable<DerivedSessionInfo> =>
-    query(api).pipe(drr());
+  return memo((): Observable<DerivedSessionInfo> =>
+    query(api));
 }

packages/api-derive/src/session/sessionProgress.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -9,12 +9,11 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 export function sessionProgress (api: ApiInterfaceRx): () => Observable<BlockNumber> {
-  return (): Observable<BlockNumber> =>
+  return memo((): Observable<BlockNumber> =>
     api.derive.session.info().pipe(
-      map(({ sessionProgress }: DerivedSessionInfo): BlockNumber => sessionProgress),
-      drr()
-    );
+      map(({ sessionProgress }: DerivedSessionInfo): BlockNumber => sessionProgress)
+    ));
 }

packages/api-derive/src/staking/account.ts

@@ -0,0 +1,100 @@
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+import { ApiInterfaceRx } from '@polkadot/api/types';
+import { Balance, BlockNumber, StakingLedger, UnlockChunk } from '@polkadot/types/interfaces';
+import { DerivedSessionInfo, DerivedStakingAccount, DerivedStakingQuery, DerivedUnlocking } from '../types';
+
+import BN from 'bn.js';
+import { combineLatest, Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { createType } from '@polkadot/types';
+
+import { isUndefined } from '@polkadot/util';
+
+import { memo } from '../util';
+
+// groups the supplied chunks by era, i.e. { [era]: BN(total of values) }
+function groupByEra (list: UnlockChunk[]): Record<string, BN> {
+  return list.reduce((map: Record<string, BN>, { era, value }): Record<string, BN> => {
+    const key = era.toString();
+
+    map[key] = !map[key]
+      ? value.unwrap()
+      : map[key].add(value.unwrap());
+
+    return map;
+  }, {});
+}
+
+// calculate the remaining blocks in a specific unlock era
+function remainingBlocks (api: ApiInterfaceRx, era: BN, sessionInfo: DerivedSessionInfo): BlockNumber {
+  const remaining = era.sub(sessionInfo.currentEra);
+
+  // on the Rust side the current-era >= era-for-unlock (removal done on >)
+  return createType(api.registry, 'BlockNumber', remaining.gtn(0)
+    ? remaining
+      .subn(1)
+      .mul(sessionInfo.eraLength)
+      .add(sessionInfo.eraLength.sub(sessionInfo.eraProgress))
+    : 0
+  );
+}
+
+function calculateUnlocking (api: ApiInterfaceRx, stakingLedger: StakingLedger | undefined, sessionInfo: DerivedSessionInfo): DerivedUnlocking[] | undefined {
+  if (isUndefined(stakingLedger)) {
+    return undefined;
+  }
+
+  const unlockingChunks = stakingLedger.unlocking.filter(({ era }): boolean =>
+    remainingBlocks(api, era.unwrap(), sessionInfo).gtn(0)
+  );
+
+  if (!unlockingChunks.length) {
+    return undefined;
+  }
+
+  // group the unlock chunks that have the same era and sum their values
+  const groupedResult = groupByEra(unlockingChunks);
+  const results = Object.entries(groupedResult).map(([eraString, value]): DerivedUnlocking => ({
+    value: createType(api.registry, 'Balance', value),
+    remainingBlocks: remainingBlocks(api, new BN(eraString), sessionInfo)
+  }));
+
+  return results.length ? results : undefined;
+}
+
+function redeemableSum (api: ApiInterfaceRx, stakingLedger: StakingLedger | undefined, sessionInfo: DerivedSessionInfo): Balance {
+  if (isUndefined(stakingLedger)) {
+    return createType(api.registry, 'Balance');
+  }
+
+  return createType(api.registry, 'Balance', stakingLedger.unlocking.reduce((total, { era, value }): BN => {
+    return remainingBlocks(api, era.unwrap(), sessionInfo).eqn(0)
+      ? total.add(value.unwrap())
+      : total;
+  }, new BN(0)));
+}
+
+function parseResult (api: ApiInterfaceRx, sessionInfo: DerivedSessionInfo, query: DerivedStakingQuery): DerivedStakingAccount {
+  return {
+    ...query,
+    redeemable: redeemableSum(api, query.stakingLedger, sessionInfo),
+    unlocking: calculateUnlocking(api, query.stakingLedger, sessionInfo)
+  };
+}
+
+/**
+ * @description From a stash, retrieve the controllerId and fill in all the relevant staking details
+ */
+export function account (api: ApiInterfaceRx): (accountId: Uint8Array | string) => Observable<DerivedStakingAccount> {
+  return memo((accountId: Uint8Array | string): Observable<DerivedStakingAccount> =>
+    combineLatest([
+      api.derive.session.info(),
+      api.derive.staking.query(accountId)
+    ]).pipe(
+      map(([sessionInfo, query]: [DerivedSessionInfo, DerivedStakingQuery]) =>
+        parseResult(api, sessionInfo, query))
+    ));
+}

packages/api-derive/src/staking/controllers.ts

@@ -1,24 +1,26 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId } from '@polkadot/types/interfaces';
-import { Codec } from '@polkadot/types/types';
+import { AccountId, ValidatorPrefs } from '@polkadot/types/interfaces';
+import { ITuple } from '@polkadot/types/types';
 
 import { Observable, combineLatest, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { Option } from '@polkadot/types';
+import { Option, Vec } from '@polkadot/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
+
+type DeriveControllers = [AccountId[], Option<AccountId>[]];
 
 /**
  * @description From the list of stash accounts, retrieve the list of controllers
  */
-export function controllers (api: ApiInterfaceRx): () => Observable<[AccountId[], Option<AccountId>[]]> {
-  return (): Observable<[AccountId[], Option<AccountId>[]]> =>
-    api.query.staking.validators<[AccountId[]] & Codec>().pipe(
-      switchMap(([stashIds]): Observable<[AccountId[], Option<AccountId>[]]> =>
+export function controllers (api: ApiInterfaceRx): () => Observable<DeriveControllers> {
+  return memo((): Observable<[AccountId[], Option<AccountId>[]]> =>
+    api.query.staking.validators<ITuple<[Vec<AccountId>, Vec<ValidatorPrefs>]>>().pipe(
+      switchMap(([stashIds]): Observable<DeriveControllers> =>
         combineLatest([
           of(stashIds),
           // for V2, don't return all the controllers, we call bonded at a later point
@@ -26,7 +28,6 @@ export function controllers (api: ApiInterfaceRx): () => Observable<[AccountId[]
             ? of([])
             : api.query.staking.bonded.multi<Option<AccountId>>(stashIds)
         ])
-      ),
-      drr()
-    );
+      )
+    ));
 }

packages/api-derive/src/staking/electedInfo.ts

@@ -0,0 +1,30 @@
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+import { ApiInterfaceRx } from '@polkadot/api/types';
+import { AccountId } from '@polkadot/types/interfaces';
+import { DerivedStakingQuery, DerivedStakingElected } from '../types';
+
+import { Observable, combineLatest, of } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+
+import { memo } from '../util';
+
+export function electedInfo (api: ApiInterfaceRx): () => Observable<DerivedStakingElected> {
+  return memo((): Observable<DerivedStakingElected> =>
+    api.derive.staking.validators().pipe(
+      switchMap(({ currentElected }): Observable<[AccountId[], DerivedStakingQuery[]]> =>
+        combineLatest([
+          of(currentElected),
+          combineLatest(currentElected.map((accountId): Observable<DerivedStakingQuery> =>
+            api.derive.staking.query(accountId)
+          ))
+        ])
+      ),
+      map(([currentElected, info]): DerivedStakingElected => ({
+        currentElected, info
+      }))
+    )
+  );
+}

packages/api-derive/src/staking/index.ts

@@ -1,9 +1,11 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+export * from './account';
 export * from './controllers';
-export * from './info';
+export * from './electedInfo';
 export * from './overview';
+export * from './query';
 export * from './recentlyOffline';
 export * from './validators';

packages/api-derive/src/staking/info.ts

@@ -1,223 +0,0 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-import { AccountId, Balance, BlockNumber, Exposure, Keys, RewardDestination, StakingLedger, UnlockChunk, ValidatorPrefs } from '@polkadot/types/interfaces';
-import { Codec } from '@polkadot/types/types';
-
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { DerivedRecentlyOffline, DerivedStaking, DerivedUnlocking } from '../types';
-
-import BN from 'bn.js';
-import { combineLatest, Observable, of } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-import { createType, Option, Vec } from '@polkadot/types';
-
-import { isUndefined } from '@polkadot/util';
-
-import { drr } from '../util';
-
-interface ParseInput {
-  accountId: AccountId;
-  bestNumber: BlockNumber;
-  controllerId: AccountId;
-  eraLength: BlockNumber;
-  recentlyOffline?: DerivedRecentlyOffline;
-  nominators: AccountId[];
-  rewardDestination: RewardDestination;
-  queuedKeys?: [AccountId, Keys][];
-  stakers: Exposure;
-  stakingLedger: Option<StakingLedger>;
-  stashId: AccountId;
-  validatorPrefs: ValidatorPrefs;
-  nextKeys?: Option<Keys>;
-  nextKeyFor?: Option<AccountId>;
-}
-
-// groups the supplied chunks by era, i.e. { [era]: BN(total of values) }
-function groupByEra (list: UnlockChunk[]): Record<string, BN> {
-  return list.reduce((map: Record<string, BN>, { era, value }): Record<string, BN> => {
-    const key = era.toString();
-
-    map[key] = !map[key]
-      ? value.unwrap()
-      : map[key].add(value.unwrap());
-
-    return map;
-  }, {});
-}
-
-// calculate the remining blocks in a specific unlock era
-function remainingBlocks (era: BN, eraLength: BN, bestNumber: BlockNumber): BlockNumber {
-  const remaining = eraLength.mul(era).sub(bestNumber);
-
-  return createType('BlockNumber', remaining.lten(0)
-    ? new BN(0)
-    : remaining
-  );
-}
-
-function calculateUnlocking (stakingLedger: StakingLedger | undefined, eraLength: BN, bestNumber: BlockNumber): DerivedUnlocking[] | undefined {
-  if (isUndefined(stakingLedger)) {
-    return undefined;
-  }
-
-  const unlockingChunks = stakingLedger.unlocking.filter(({ era }): boolean =>
-    remainingBlocks(era.unwrap(), eraLength, bestNumber).gtn(0)
-  );
-
-  if (!unlockingChunks.length) {
-    return undefined;
-  }
-
-  // group the Unlockchunks that have the same era and sum their values
-  const groupedResult = groupByEra(unlockingChunks);
-  const results = Object.entries(groupedResult).map(([eraString, value]): DerivedUnlocking => ({
-    value: createType('Balance', value),
-    remainingBlocks: remainingBlocks(createType('BlockNumber', eraString), eraLength, bestNumber)
-  }));
-
-  return results.length ? results : undefined;
-}
-
-function redeemableSum (stakingLedger: StakingLedger | undefined, eraLength: BN, bestNumber: BlockNumber): Balance {
-  if (isUndefined(stakingLedger)) {
-    return createType('Balance');
-  }
-
-  return createType('Balance', stakingLedger.unlocking.reduce((total, { era, value }): BN => {
-    return remainingBlocks(era.unwrap(), eraLength, bestNumber).eqn(0)
-      ? total.add(value.unwrap())
-      : total;
-  }, new BN(0)));
-}
-
-function unwrapSessionIds (stashId: AccountId, queuedKeys: Option<AccountId> | [AccountId, Keys][], nextKeys: Option<Keys>): { nextSessionIds: AccountId[]; sessionIds: AccountId[] } {
-  // for 2.x we have a Vec<(ValidatorId,Keys)> of the keys
-  if (Array.isArray(queuedKeys)) {
-    const sessionIds = (queuedKeys.find(([currentId]): boolean =>
-      currentId.eq(stashId)
-    ) || [undefined, [] as AccountId[]])[1];
-    const nextSessionIds = nextKeys.unwrapOr([] as AccountId[]);
-
-    return {
-      nextSessionIds,
-      sessionIds
-    };
-  }
-
-  // substrate 1.x
-  const nextSessionIds = queuedKeys.isSome
-    ? [queuedKeys.unwrap()]
-    : [];
-
-  return {
-    nextSessionIds,
-    sessionIds: nextSessionIds
-  };
-}
-
-function parseResult ({ accountId, controllerId, stashId, eraLength, bestNumber, recentlyOffline = {}, nextKeyFor = createType('Option<AccountId>', null), queuedKeys, stakingLedger, nominators, rewardDestination, stakers, validatorPrefs, nextKeys = createType('Option<Keys>', null) }: ParseInput): DerivedStaking {
-  const _stakingLedger = stakingLedger.unwrapOr(undefined);
-
-  return {
-    accountId,
-    controllerId,
-    nominators,
-    offline: recentlyOffline[stashId.toString()],
-    redeemable: redeemableSum(_stakingLedger, eraLength, bestNumber),
-    rewardDestination,
-    stakers,
-    stakingLedger: _stakingLedger,
-    stashId,
-    unlocking: calculateUnlocking(_stakingLedger, eraLength, bestNumber),
-    validatorPrefs,
-    ...unwrapSessionIds(stashId, queuedKeys || nextKeyFor, nextKeys)
-  };
-}
-
-type MultiResultV1 = [Option<AccountId>, Option<StakingLedger>, [Vec<AccountId>], RewardDestination, Exposure, [ValidatorPrefs] & Codec];
-
-function retrieveInfoV1 (api: ApiInterfaceRx, accountId: AccountId, stashId: AccountId, controllerId: AccountId): Observable<DerivedStaking> {
-  return combineLatest([
-    api.derive.chain.bestNumber(),
-    api.derive.session.eraLength(),
-    api.derive.staking.recentlyOffline(),
-    api.queryMulti([
-      [api.query.session.nextKeyFor, controllerId],
-      [api.query.staking.ledger, controllerId],
-      [api.query.staking.nominators, stashId],
-      [api.query.staking.payee, stashId],
-      [api.query.staking.stakers, stashId],
-      [api.query.staking.validators, stashId]
-    ]) as Observable<MultiResultV1>
-  ]).pipe(map(([
-    bestNumber, eraLength, recentlyOffline,
-    [nextKeyFor, stakingLedger, [nominators], rewardDestination, stakers, [validatorPrefs]]
-  ]: [BlockNumber, BlockNumber, DerivedRecentlyOffline, MultiResultV1]): DerivedStaking =>
-    parseResult({
-      accountId, controllerId, stashId, eraLength, bestNumber, recentlyOffline, nextKeyFor, stakingLedger, nominators, rewardDestination, stakers, validatorPrefs
-    })
-  ));
-}
-
-type MultiResultV2 = [Option<StakingLedger>, [Vec<AccountId>], RewardDestination, Exposure, [ValidatorPrefs], Option<Keys>];
-
-function retrieveInfoV2 (api: ApiInterfaceRx, accountId: AccountId, stashId: AccountId, controllerId: AccountId): Observable<DerivedStaking> {
-  return combineLatest([
-    api.derive.chain.bestNumber(),
-    api.derive.session.eraLength(),
-    api.query.session.queuedKeys<Vec<[AccountId, Keys] & Codec>>(),
-    api.queryMulti([
-      [api.query.staking.ledger, controllerId],
-      [api.query.staking.nominators, stashId],
-      [api.query.staking.payee, stashId],
-      [api.query.staking.stakers, stashId],
-      [api.query.staking.validators, stashId],
-      [api.query.session.nextKeys, [api.consts.session.dedupKeyPrefix, stashId]]
-    ]) as Observable<MultiResultV2>
-  ]).pipe(map(([
-    bestNumber, eraLength, queuedKeys,
-    [stakingLedger, [nominators], rewardDestination, stakers, [validatorPrefs], nextKeys]
-  ]: [BlockNumber, BlockNumber, [AccountId, Keys][], MultiResultV2]): DerivedStaking =>
-    parseResult({
-      accountId, controllerId, stashId, eraLength, bestNumber, queuedKeys, stakingLedger, nominators, rewardDestination, stakers, validatorPrefs, nextKeys
-    })
-  ));
-}
-
-function retrieveV1 (api: ApiInterfaceRx, controllerId: AccountId): Observable<DerivedStaking> {
-  return api.query.staking
-    .ledger<Option<StakingLedger>>(controllerId)
-    .pipe(
-      switchMap((stakingLedger): Observable<DerivedStaking> =>
-        stakingLedger.isSome
-          ? retrieveInfoV1(api, controllerId, stakingLedger.unwrap().stash, controllerId)
-          : of({ accountId: controllerId, nextSessionIds: [], sessionIds: [] })
-      )
-    );
-}
-
-function retrieveV2 (api: ApiInterfaceRx, stashId: AccountId): Observable<DerivedStaking> {
-  return api.query.staking
-    .bonded<Option<AccountId>>(stashId)
-    .pipe(
-      switchMap((controllerId): Observable<DerivedStaking> =>
-        controllerId.isSome
-          ? retrieveInfoV2(api, stashId, stashId, controllerId.unwrap())
-          : of({ accountId: stashId, nextSessionIds: [], sessionIds: [] })
-      )
-    );
-}
-
-/**
- * @description From a stash, retrieve the controllerId and fill in all the relevant staking details
- */
-export function info (api: ApiInterfaceRx): (_accountId: Uint8Array | string) => Observable<DerivedStaking> {
-  const query = api.consts.session
-    ? retrieveV2
-    : retrieveV1;
-
-  return (accountId: Uint8Array | string): Observable<DerivedStaking> =>
-    query(api, createType('AccountId', accountId)).pipe(drr());
-}

packages/api-derive/src/staking/infoStash.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -11,7 +11,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { Option, Vec } from '@polkadot/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 // NOTE Unused ATM, preparing for V2-only
 
@@ -57,9 +57,8 @@ export function infoStash (api: ApiInterfaceRx): (stashId: AccountId) => Observa
     ? retrieveV2
     : retrieveV1;
 
-  return (stashId: AccountId): Observable<DerivedStakingStash> =>
+  return memo((stashId: AccountId): Observable<DerivedStakingStash> =>
     query(api, stashId).pipe(
-      map((result): DerivedStakingStash => parse(stashId, result)),
-      drr()
-    );
+      map((result): DerivedStakingStash => parse(stashId, result))
+    ));
 }

packages/api-derive/src/staking/overview.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -10,13 +10,13 @@ import { Observable, combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { createType } from '@polkadot/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 /**
  * @description Retrieve the staking overview, including elected and points earned
  */
 export function overview (api: ApiInterfaceRx): () => Observable<DerivedStakingOverview> {
-  return (): Observable<DerivedStakingOverview> =>
+  return memo((): Observable<DerivedStakingOverview> =>
     combineLatest([
       api.derive.session.indexes(),
       api.derive.staking.validators()
@@ -25,14 +25,13 @@ export function overview (api: ApiInterfaceRx): () => Observable<DerivedStakingO
         combineLatest([
           of({ currentElected, currentEra, currentIndex, validators, validatorCount }),
           // this will change on a per block basis, keep it innermost (and it needs eraIndex)
-          api.query.staking.currentEraPointsEarned
+          api.query.staking?.currentEraPointsEarned
             ? api.query.staking.currentEraPointsEarned<EraPoints>(currentEra)
-            : of(createType('EraPoints'))
+            : of(createType(api.registry, 'EraPoints'))
         ])
       ),
       map(([{ currentElected, currentEra, currentIndex, validators, validatorCount }, eraPoints]): DerivedStakingOverview => ({
         currentElected, currentEra, currentIndex, eraPoints, validators, validatorCount
-      })),
-      drr()
-    );
+      }))
+    ));
 }

packages/api-derive/src/staking/query.ts

@@ -0,0 +1,154 @@
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+import { ApiInterfaceRx } from '@polkadot/api/types';
+import { AccountId, Exposure, Keys, Nominations, RewardDestination, StakingLedger, ValidatorPrefs } from '@polkadot/types/interfaces';
+import { ITuple } from '@polkadot/types/types';
+import { DerivedStakingQuery } from '../types';
+
+import { combineLatest, Observable, of } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import { createType, Option, Vec } from '@polkadot/types';
+
+import { memo } from '../util';
+
+interface ParseInput {
+  accountId: AccountId;
+  controllerId: AccountId;
+  nominators: AccountId[];
+  rewardDestination: RewardDestination;
+  queuedKeys?: [AccountId, Keys][];
+  stakers: Exposure;
+  stakingLedger: Option<StakingLedger>;
+  stashId: AccountId;
+  validatorPrefs: ValidatorPrefs;
+  nextKeys?: Option<Keys>;
+  nextKeyFor?: Option<AccountId>;
+}
+
+function unwrapSessionIds (stashId: AccountId, queuedKeys: Option<AccountId> | [AccountId, Keys][], nextKeys: Option<Keys>): { nextSessionIds: AccountId[]; sessionIds: AccountId[] } {
+  // for 2.x we have a Vec<(ValidatorId,Keys)> of the keys
+  if (Array.isArray(queuedKeys)) {
+    const sessionIds = (queuedKeys.find(([currentId]): boolean =>
+      currentId.eq(stashId)
+    ) || [undefined, [] as AccountId[]])[1];
+    const nextSessionIds = nextKeys.unwrapOr([] as AccountId[]);
+
+    return {
+      nextSessionIds,
+      sessionIds
+    };
+  }
+
+  // substrate 1.x
+  const nextSessionIds = queuedKeys.isSome
+    ? [queuedKeys.unwrap()]
+    : [];
+
+  return {
+    nextSessionIds,
+    sessionIds: nextSessionIds
+  };
+}
+
+function parseResult (api: ApiInterfaceRx, { accountId, controllerId, stashId, nextKeyFor, queuedKeys, stakingLedger, nominators, rewardDestination, stakers, validatorPrefs, nextKeys }: ParseInput): DerivedStakingQuery {
+  const _stakingLedger = stakingLedger.unwrapOr(undefined);
+  const _nextKeyFor = nextKeyFor || createType(api.registry, 'Option<AccountId>', null);
+  const _nextKeys = nextKeys || createType(api.registry, 'Option<Keys>', null);
+
+  return {
+    accountId,
+    controllerId,
+    nominators,
+    rewardDestination,
+    stakers,
+    stakingLedger: _stakingLedger,
+    stashId,
+    validatorPrefs,
+    ...unwrapSessionIds(stashId, queuedKeys || _nextKeyFor, _nextKeys)
+  };
+}
+
+type MultiResultV1 = [Option<AccountId>, Option<StakingLedger>, [Vec<AccountId>], RewardDestination, Exposure, ITuple<[ValidatorPrefs]>];
+
+function retrieveInfoV1 (api: ApiInterfaceRx, accountId: AccountId, stashId: AccountId, controllerId: AccountId): Observable<DerivedStakingQuery> {
+  return (
+    api.queryMulti([
+      [api.query.session.nextKeyFor, controllerId],
+      [api.query.staking.ledger, controllerId],
+      [api.query.staking.nominators, stashId],
+      [api.query.staking.payee, stashId],
+      [api.query.staking.stakers, stashId],
+      [api.query.staking.validators, stashId]
+    ]) as Observable<MultiResultV1>
+  ).pipe(map(([nextKeyFor, stakingLedger, [nominators], rewardDestination, stakers, [validatorPrefs]]: MultiResultV1): DerivedStakingQuery =>
+    parseResult(api, {
+      accountId, controllerId, stashId, nextKeyFor, stakingLedger, nominators, rewardDestination, stakers, validatorPrefs
+    })
+  ));
+}
+
+type MultiResultV2 = [[Vec<AccountId>] | Option<ITuple<[Nominations]>>, RewardDestination, Exposure, [ValidatorPrefs], Option<Keys>, Option<StakingLedger>];
+
+function retrieveInfoV2 (api: ApiInterfaceRx, accountId: AccountId, stashId: AccountId, controllerId: AccountId): Observable<DerivedStakingQuery> {
+  return combineLatest([
+    api.query.session.queuedKeys<Vec<ITuple<[AccountId, Keys]>>>(),
+    api.queryMulti([
+      [api.query.staking.nominators, stashId],
+      [api.query.staking.payee, stashId],
+      [api.query.staking.stakers, stashId],
+      [api.query.staking.validators, stashId],
+      [api.query.session.nextKeys, [api.consts.session.dedupKeyPrefix, stashId]],
+      [api.query.staking.ledger, controllerId]
+    ]) as Observable<MultiResultV2>
+  ]).pipe(map(([queuedKeys, [_nominators, rewardDestination, stakers, [validatorPrefs], nextKeys, stakingLedger]]: [[AccountId, Keys][], MultiResultV2]): DerivedStakingQuery => {
+    // if we have staking.storageVersion it indicates the new structure, unwrap as needed
+    // FIXME We really want to be pulling all the new (valuable) info along
+    const nominators: AccountId[] = api.query.staking.storageVersion
+      ? (_nominators as Option<ITuple<[Nominations]>>).isSome
+        ? (_nominators as Option<ITuple<[Nominations]>>).unwrap()[0].targets
+        : []
+      : (_nominators as [Vec<AccountId>])[0];
+
+    return parseResult(api, {
+      accountId, controllerId, stashId, queuedKeys, stakingLedger, nominators, rewardDestination, stakers, validatorPrefs, nextKeys
+    });
+  }));
+}
+
+function retrieveV1 (api: ApiInterfaceRx, accountId: AccountId): Observable<DerivedStakingQuery> {
+  // depending on where we come from, this may be a controller or stash
+  return combineLatest([
+    api.query.staking.bonded<Option<AccountId>>(accountId),
+    api.query.staking.ledger<Option<StakingLedger>>(accountId)
+  ]).pipe(switchMap(([bonded, stakingLedger]): Observable<DerivedStakingQuery> =>
+    stakingLedger.isSome
+      ? retrieveInfoV1(api, accountId, stakingLedger.unwrap().stash, accountId)
+      : bonded.isSome
+        ? retrieveInfoV1(api, accountId, accountId, bonded.unwrap())
+        : of({ accountId: accountId, nextSessionIds: [], sessionIds: [] })
+  ));
+}
+
+function retrieveV2 (api: ApiInterfaceRx, stashId: AccountId): Observable<DerivedStakingQuery> {
+  return api.query.staking
+    .bonded<Option<AccountId>>(stashId)
+    .pipe(switchMap((controllerId): Observable<DerivedStakingQuery> =>
+      controllerId.isSome
+        ? retrieveInfoV2(api, stashId, stashId, controllerId.unwrap())
+        : of({ accountId: stashId, nextSessionIds: [], sessionIds: [] })
+    ));
+}
+
+/**
+ * @description From a stash, retrieve the controllerId and fill in all the relevant staking details
+ */
+export function query (api: ApiInterfaceRx): (_accountId: Uint8Array | string) => Observable<DerivedStakingQuery> {
+  const retrieve = api.consts.session
+    ? retrieveV2
+    : retrieveV1;
+
+  return memo((accountId: Uint8Array | string): Observable<DerivedStakingQuery> =>
+    retrieve(api, createType(api.registry, 'AccountId', accountId)));
+}

packages/api-derive/src/staking/recentlyOffline.ts

@@ -1,19 +1,19 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AccountId, BlockNumber } from '@polkadot/types/interfaces';
-import { Codec } from '@polkadot/types/types';
-
-import BN from 'bn.js';
-import { Observable, of } from 'rxjs';
-import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
+import { AccountId, BlockNumber } from '@polkadot/types/interfaces';
+import { ITuple } from '@polkadot/types/types';
 import { DerivedRecentlyOffline } from '../types';
 
-import { drr } from '../util';
+import { Observable, of } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { Vec, u32 } from '@polkadot/types';
 
-type OfflineResult = [AccountId, BlockNumber, BN][] & Codec;
+import { memo } from '../util';
+
+type OfflineResult = Vec<ITuple<[AccountId, BlockNumber, u32]>>;
 
 function expandDerived (recentlyOffline: OfflineResult): DerivedRecentlyOffline {
   return recentlyOffline.reduce((result: DerivedRecentlyOffline, [accountId, blockNumber, count]): DerivedRecentlyOffline => {
@@ -36,7 +36,7 @@ function expandDerived (recentlyOffline: OfflineResult): DerivedRecentlyOffline
  * @description Retrieve a keyed record of accounts recently reported to be offline
  */
 export function recentlyOffline (api: ApiInterfaceRx): () => Observable<DerivedRecentlyOffline> {
-  return (): Observable<DerivedRecentlyOffline> =>
+  return memo((): Observable<DerivedRecentlyOffline> =>
     (
       // TODO recentlyOffline  has been dropped for 2.x and replaced, figure out the
       // replacement as actually use and implement it
@@ -44,7 +44,6 @@ export function recentlyOffline (api: ApiInterfaceRx): () => Observable<DerivedR
         ? api.query.staking.recentlyOffline<OfflineResult>()
         : of([] as unknown as OfflineResult)
     ).pipe(
-      map(expandDerived),
-      drr()
-    );
+      map(expandDerived)
+    ));
 }

packages/api-derive/src/staking/validators.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 @polkadot/api-derive authors & contributors
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -6,24 +6,29 @@ import { AccountId } from '@polkadot/types/interfaces';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { DeriveStakingValidators } from '../types';
 
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { Vec } from '@polkadot/types';
 
-import { drr } from '../util';
+import { memo } from '../util';
 
 /**
  * @description Retrieve latest list of validators
  */
 export function validators (api: ApiInterfaceRx): () => Observable<DeriveStakingValidators> {
-  return (): Observable<DeriveStakingValidators> =>
-    api.queryMulti<[Vec<AccountId>, Vec<AccountId>]>([
-      api.query.session.validators,
-      api.query.staking.currentElected
-    ]).pipe(
+  return memo((): Observable<DeriveStakingValidators> =>
+    (
+      // Sadly the node-template is (for some obscure reason) not comprehensive, so while the derive works
+      // in all actual real-world deployed chains, it does create some confusion for limited template chains
+      api.query.session && api.query.staking
+        ? api.queryMulti<[Vec<AccountId>, Vec<AccountId>]>([
+          api.query.session.validators,
+          api.query.staking.currentElected
+        ])
+        : of([[], []] as [AccountId[], AccountId[]])
+    ).pipe(
       map(([validators, currentElected]): DeriveStakingValidators => ({
         currentElected, validators
-      })),
-      drr()
-    );
+      }))
+    ));
 }

packages/api-derive/src/technicalCommittee/index.ts

@@ -0,0 +1,5 @@
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+export * from './proposals';

packages/api-derive/src/technicalCommittee/proposals.ts

@@ -0,0 +1,14 @@
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+import { ApiInterfaceRx } from '@polkadot/api/types';
+import { DerivedCollectiveProposals } from '../types';
+
+import { Observable } from 'rxjs';
+import { proposals as collectiveProposals } from '../collective';
+import { memo } from '../util';
+
+export function proposals (api: ApiInterfaceRx): () => Observable<DerivedCollectiveProposals> {
+  return memo(collectiveProposals(api, 'technicalCommittee'));
+}

packages/api-derive/src/treasury/index.ts

@@ -0,0 +1,5 @@
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+export * from './proposals';

packages/api-derive/src/treasury/proposals.ts

@@ -0,0 +1,97 @@
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+import { ApiInterfaceRx } from '@polkadot/api/types';
+import { ProposalIndex, TreasuryProposal } from '@polkadot/types/interfaces';
+import { DerivedCollectiveProposals, DerivedTreasuryProposal, DerivedTreasuryProposals } from '../types';
+
+import { Observable, combineLatest, of } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import { createType, Option } from '@polkadot/types';
+
+import { memo } from '../util';
+
+interface Result {
+  allIds: ProposalIndex[];
+  allProposals: Option<TreasuryProposal>[];
+  approvalIds: ProposalIndex[];
+  councilProposals: DerivedCollectiveProposals;
+  proposalCount: ProposalIndex;
+}
+
+function parseResult (_api: ApiInterfaceRx, { allIds, allProposals, approvalIds, councilProposals, proposalCount }: Result): DerivedTreasuryProposals {
+  const approvals: DerivedTreasuryProposal[] = [];
+  const proposals: DerivedTreasuryProposal[] = [];
+  const councilTreasury = councilProposals.filter(({ proposal: { methodName, sectionName } }): boolean =>
+    sectionName === 'treasury' &&
+    ['approveProposal', 'rejectProposal'].includes(methodName)
+  );
+
+  allIds.forEach((id, index): void => {
+    if (allProposals[index].isSome) {
+      const council = councilTreasury
+        .filter(({ proposal }): boolean => id.eq(proposal.args[0]))
+        .sort((a, b): number => a.proposal.methodName.localeCompare(b.proposal.methodName));
+      const isApproval = approvalIds.some((approvalId): boolean => approvalId.eq(id));
+      const derived = { council, id, proposal: allProposals[index].unwrap() };
+
+      if (isApproval) {
+        approvals.push(derived);
+      } else {
+        proposals.push(derived);
+      }
+    }
+  });
+
+  return { approvals, proposalCount, proposals };
+}
+
+function retrieveProposals (api: ApiInterfaceRx, proposalCount: ProposalIndex, approvalIds: ProposalIndex[]): Observable<DerivedTreasuryProposals> {
+  const proposalIds: ProposalIndex[] = [];
+  const count = proposalCount.toNumber();
+
+  for (let index = 0; index < count; index++) {
+    const isApproval = approvalIds.some((id): boolean => id.eqn(index));
+
+    if (!isApproval) {
+      proposalIds.push(createType(api.registry, 'ProposalIndex', index));
+    }
+  }
+
+  const allIds = [...proposalIds, ...approvalIds];
+
+  return combineLatest([
+    // We are doing single subscriptions on all these, multi may yield old results
+    combineLatest(
+      allIds.map((id): Observable<Option<TreasuryProposal>> => api.query.treasury.proposals(id))
+    ),
+    api.derive.council.proposals()
+  ]).pipe(
+    map(([allProposals, councilProposals]: [Option<TreasuryProposal>[], DerivedCollectiveProposals]): DerivedTreasuryProposals =>
+      parseResult(api, { allIds, allProposals, approvalIds, councilProposals, proposalCount })
+    )
+  );
+}
+
+/**
+ * @description Retrieve all active and approved treasury proposals, along with their info
+ */
+export function proposals (api: ApiInterfaceRx): () => Observable<DerivedTreasuryProposals> {
+  return memo((): Observable<DerivedTreasuryProposals> =>
+    api.query.treasury
+      ? combineLatest([
+        api.query.treasury.proposalCount(),
+        api.query.treasury.approvals()
+      ]).pipe(
+        switchMap(([proposalCount, approvalIds]: [ProposalIndex, ProposalIndex[]]) =>
+          retrieveProposals(api, proposalCount, approvalIds)
+        )
+      )
+      : of({
+        approvals: [],
+        proposalCount: createType(api.registry, 'ProposalIndex'),
+        proposals: []
+      } as DerivedTreasuryProposals)
+  );
+}