[CI Skip] 1.1.1

skip-checks: true

.123trigger

@@ -1 +1 @@
-13
+17

.codeclimate.yml

@@ -4,6 +4,6 @@ exclude_patterns:
 - "**/*.test.js"
 - "**/*.test.ts"
 - "docs/**/*.js"
-- "packages/api/src/query.types.ts"
+- "packages/api/src/types/augment/"
 - "packages/types/src/interfaces/"
 - "packages/types/src/scripts/"

.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,64 @@
+# 1.1.1
+
+- Add support for `balances.account` in all applicable derives (incl. `vesting` module)
+- Inject and use SignedExtensions by name from V11 metadata (V4 extrinsics only)
+- Add typings for `api.tx.*.*` - the `polkadot-types-from-chain` now also generates these
+- Remove additional V1-only derives `(staking.recentlyOffline`, `balances.nominatorsFor`)
+- Add `.isMax()` on int values, an opposite of `isZero()` (e.g. `u128`, as well as derived, e.g. `Balances`)
+- Add `.keyPrefix()` to all `api.query.*` complementing the `.key()` call, both returning a hex string
+- Council derives now takes bootstrapping (member, no elections) into account
+- Account derives now allow for an optional indices module (not required)
+- Adjust balances fees derivation with optional transfer and creation fees (removed in Substrate)
+- Adjust enum `.toJSON()` to return type name as specified
+
+# 1.0.1
+
+- **Breaking change** Drop support for Substrate v1 chain in all derives
+- Return unsub functions from provider .on emitters (Thanks to https://github.com/jak-pan)
+- `ApiPromise.isReady` now rejects on unrecoverable errors (Thanks to https://github.com/laec)
+- Add `polkadot-types-from-chain` & `polkadot-types-from-defs` TypeScript generators to `@polkadot/types`
+- Only decorate derives where relevant parent `api.query.*` is available
+- Support `.entries(arg?: any)` lookups on DoubleMaps (in addition to previously supported maps)
+- Allow v9 metadata to parse even in cases where it was wrongly deployed pre-v10
+- Allow type-aliases on a per-module basis (e.g. `Judgement` in identity as well as society)
+- Allow passing `{ signer }` to both `api.tx.*` and `api.sign` (in addition to `api.setSigner`)
+- Add derives for the society module
+- Don't map empty tuples, e.. `()` to `Null`, rather keep them empty
+- Add lookups to the metadata errors via `findMetaError`
+- Update metadata and types for the latest Substrate & Polkadot versions
+- Support metadata V11 as per latest Substrate
+- Remove support for un-deployed metadata
+- Remove old known types for Substrate V1
+
+# 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.

UPGRADING.md

@@ -5,7 +5,7 @@ This is an upgrade guide for users of the API. It does not attempt to detail eac
 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), from 0.90.1 (and older)
+## 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.
 

docs/.vuepress/config.js

@@ -45,6 +45,7 @@ module.exports = {
           ['start/types.extend.md', 'Extending types'],
           ['start/extrinsic.extend.md', 'Extending extrinsics'],
           ['start/typescript.md', 'TypeScript interfaces'],
+          ['start/typescript.user.md', 'TypeScript user generated'],
           ['start/FAQ.md', 'FAQ']
         ]
       },

docs/SUMMARY.md

@@ -17,6 +17,7 @@
   - [Type basics](start/types.basics.md)
   - [Type extension](start/types.extend.md)
   - [TypeScript interfaces](start/typescript.md)
+  - [TypeScript user generated](start/typescript.user.md)
 
 ## Packages
 

docs/start/typescript.md

@@ -46,11 +46,6 @@ As of this writing, there are still some gray areas to type detection, specifica
 - `.at` & `.multi` on `api.query` does not (yet) have a `<TypeOverride>` interface. This means `as <TypeOverride>` casts are presently needed for these results
 - `api.queryMulti` does not (yet) allow you to provide a hint to the types returned, this ties to the previous point
 
-In addition to expanding the type coverage, we wish to make the actual generation script for the types from `@polkadot/types/interfaces` available in 2 ways -
+## Adding user types
 
-- allowing you to point to a folder of types and auto-generate the TypeScript typings from those. (Which is akin to what we do internally). This would allow a reduction in type classes explicitly written and injected.
-- once the metadata itself supports full type definitions, the script can be used to generate interface definitions specifically tailored for a chain
-
-## And that's a wrap
-
-This brings us to the end of our overview and jump through the API. While the documentation is still very much and ever evolving item, we can encourage you to try out what you have learned with some [examples](../examples). As we [indicated right at the start of this journey](README.md#help-us-help-others), if there are areas for improvement, let us know.
+In addition to the generated and available interfaces, there is also the ability to [create TypeScript interfaces from your own definitions and well as your on-chain modules](typescript.user.md).

docs/start/typescript.user.md

@@ -0,0 +1,26 @@
+# TypeScript user generated
+
+In the previous section we looked at the TypeScript definitions that are available and is generated from both the chain and definitions. Here we will expand upon the use of the infrastructure created to define types as part of the `@polkadot/types` library and see how to use them to generate your onw defintions and chain types.
+
+## Definitions
+
+A large part of the type definitions are defined not as classes, but rather as structures from which type definitions are extracted and that can be used as-is to let the API know how to decode a type. By now you should be familiar with [type extensions](types.extend.md), but effectively the [types library does exactly the same](https://github.com/polkadot-js/api/tree/master/packages/types/src/interfaces).
+
+To create TypeScript-aware definitions and keep your files in a single place, you can follow the same approach. Assuming you have a package named `@MeInc/stuff` where you have the definitions in an `stuff/interfaces` folder. Each sub-folder would indicate a runtime module, e.g. 
+
+- `stuff/interfaces/<module>/definitions.ts` for each module (`types.ts` & `index.ts` will be generated)
+- `stuff/interfaces/defnitions.ts` importing all sub-definitions`
+
+With this structure setup, you can generate TypeScript defintions.
+
+In the root of your project (with the `@polkadot/api`), you can run `yarn polkadot-types-from-defs --input ./stuff/interfaces --package @MeInc/stuff/interfaces` which will create `types.ts` and `index.ts` files with the generated types. You can use these in exactly the same way as you would use your types from `@polkadot/types/interfaces`.
+
+## Chain modules
+
+In the same way as the type library provides defaults from a substrate-base chain, you can also, directly from chain from metadata, generate a complete `api.{consts,query}.*` defintion for your specific chain. The command will create 2 files, `{consts, query}.types.ts` which you can either use to augment the TypeScript defintions, or replace those in `@polkadot/api/*` with your versions (copy, TypeScript replacement or browser/node aliassing).
+
+In the root of your project, you can run `yarn polkadot-types-from-chain --endpoint wss://<url> --output ./stuff` and it will create the required output. (Here you can specify an optional `--package @MeInc/stuff` to read definitions for the targetted output folder with the specified package name.)
+
+## And that's a wrap
+
+This brings us to the end of our overview and jump through the API. While the documentation is still very much and ever evolving item, we can encourage you to try out what you have learned with some [examples](../examples). As we [indicated right at the start of this journey](README.md#help-us-help-others), if there are areas for improvement, let us know.

jest.config.js

@@ -31,5 +31,6 @@ module.exports = Object.assign({}, config, {
     ws_local_polkadot_alex: 'ws://127.0.0.1:9949/',
     ws_substrate_1: 'wss://substrate-rpc.parity.io/',
     ws_polkadot_alex: 'wss://poc3-rpc.polkadot.io/'
-  }
+  },
+  resolver: './jest.resolver.js'
 });

jest.resolver.js

@@ -0,0 +1,15 @@
+// Copyright 2017-2020 @polkadot/util authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const path = require('path');
+
+module.exports = function resolver (file, config) {
+  if (file.includes('package.json')) {
+    console.error(file, config);
+    return path.join(config.basedir.replace('/src', '/'), file);
+  }
+
+  return config.defaultResolver(file, config);
+};

lerna.json

@@ -9,5 +9,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.97.1"
+  "version": "1.1.1"
 }

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.97.1",
+  "version": "1.1.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.5"
   },
   "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",
@@ -21,17 +22,14 @@
     "postinstall": "polkadot-dev-yarn-only",
     "test": "jest --coverage --runInBand --testPathIgnorePatterns e2e",
     "test:all": "jest",
-    "test:e2e": "jest packages/api/test/e2e",
-    "test:e2e-docker": "TEST_DOCKER=1 jest packages/api/test/e2e",
-    "test:e2e-remote": "TEST_REMOTE=1 jest packages/api/test/e2e",
     "test:one": "jest",
     "test:watch": "jest --coverage --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.7.4",
-    "@babel/register": "^7.7.4",
-    "@babel/runtime": "^7.7.4",
-    "@polkadot/dev": "^0.32.0-beta.15",
-    "@polkadot/ts": "^0.1.86"
+    "@babel/core": "^7.8.3",
+    "@babel/register": "^7.8.3",
+    "@babel/runtime": "^7.8.3",
+    "@polkadot/dev": "^0.33.3",
+    "@polkadot/ts": "^0.2.1"
   }
 }

packages/api-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "0.97.1",
+  "version": "1.1.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.4",
-    "@polkadot/types": "^0.97.1"
+    "@babel/runtime": "^7.8.3",
+    "@polkadot/types": "^1.1.1"
   }
 }

packages/api-contract/src/Abi.spec.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/Abi.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/ContractRegistry.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/MetaRegistry.spec.ts

@@ -1,4 +1,4 @@
-// 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.
 

packages/api-contract/src/MetaRegistry.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/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.
 

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,7 +41,7 @@ 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(this.registry, 'ContractCallRequest', {
@@ -75,7 +75,7 @@ export default class Contract<ApiType extends ApiTypes> extends BaseWithTxAndRpc
 
       output = message.returnType
         ? formatData(this.registry, data, message.returnType)
-        : createType(this.registry, 'Data', data);
+        : createType(this.registry, 'Raw', data);
     }
 
     return {

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,13 +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 { RpcInterface } from '@polkadot/rpc-core/types';
 import { Registry } from '@polkadot/types/types';
+import { ApiObject, ContractABIMessage, ContractABIPre, ContractBase, ContractMessage } from '../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> {
@@ -66,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,22 +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, 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 (registry: Registry, 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(
       registry,
       createClass(registry, type),
-      createTypeUnsafe(registry, type, [u8a], true)
+      createTypeUnsafe(registry, type, [data], true)
     );
   }
 
-  return createTypeUnsafe(registry, type, [u8a], true);
+  return createTypeUnsafe(registry, type, [data], true);
 }

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-derive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "0.97.1",
+  "version": "1.1.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.4",
-    "@polkadot/api": "^0.97.1",
-    "@polkadot/types": "^0.97.1"
+    "@babel/runtime": "^7.8.3",
+    "@polkadot/api": "^1.1.1",
+    "@polkadot/types": "^1.1.1"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^1.7.1"
+    "@polkadot/keyring": "^2.2.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.
 

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.
 

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,10 +1,10 @@
-// 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 } from '@polkadot/types/interfaces';
 
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { ENUMSET_SIZE } from '@polkadot/types/primitive/Generic/AccountIndex';
@@ -26,18 +26,18 @@ import { memo } from '../util';
  * ```
  */
 export function indexToId (api: ApiInterfaceRx): (accountIndex: AccountIndex | string) => Observable<AccountId | undefined> {
-  const querySection = api.query.indices || api.query.balances;
-
   return memo((_accountIndex: AccountIndex | string): Observable<AccountId | undefined> => {
     const accountIndex = _accountIndex instanceof ClassOf(api.registry, '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()]
+    return api.query.indices.enumSet
+      ? api.query.indices.enumSet<Vec<AccountId>>(accountIndex.div(ENUMSET_SIZE)).pipe(
+        startWith([]),
+        map((accounts): AccountId | undefined =>
+          (accounts || [])[accountIndex.mod(ENUMSET_SIZE).toNumber()]
+        )
       )
-    );
+      : of(undefined);
   });
 }

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.
 
@@ -6,7 +6,7 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
 import { AccountId, AccountIndex } from '@polkadot/types/interfaces';
 import { AccountIndexes } from '../types';
 
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { ENUMSET_SIZE } from '@polkadot/types/primitive/Generic/AccountIndex';
 import { Vec, createType } from '@polkadot/types';
@@ -32,14 +32,18 @@ const enumsetSize = ENUMSET_SIZE.toNumber();
  */
 export function indexes (api: ApiInterfaceRx): () => 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<Vec<AccountId>[]> =>
-        api.query.indices.enumSet.multi<Vec<AccountId>>([...Array(next.toNumber() + 1).keys()])
-      ),
+    (api.query.indices.nextEnumSet
+      ? 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<Vec<AccountId>[]> =>
+          api.query.indices.enumSet.multi<Vec<AccountId>>([...Array(next.toNumber() + 1).keys()])
+        )
+      )
+      : of([] as AccountId[][])
+    ).pipe(
       map((all: AccountId[][]): AccountIndexes =>
         all.reduce((result: AccountIndexes, list, outerIndex): AccountIndexes => {
           (list || []).forEach((accountId, innerIndex): void => {

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

@@ -1,22 +1,30 @@
-// 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 { AccountId, AccountIndex, Address, Balance, Registration } from '@polkadot/types/interfaces';
 import { ITuple } from '@polkadot/types/types';
-import { DeriveAccountInfo } from '../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 { 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
+    accountId && api.query.nicks?.nameOf
       ? api.query.nicks.nameOf<Option<ITuple<[Bytes, Balance]>>>(accountId)
       : of(undefined)
   ) as Observable<Option<ITuple<[Bytes, Balance]>> | undefined>).pipe(
@@ -28,6 +36,69 @@ function retrieveNick (api: ApiInterfaceRx, accountId?: AccountId): Observable<s
   );
 }
 
+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)
+    )
+  );
+}
+
 /**
  * @name info
  * @description Returns aux. info with regards to an account, current that includes the accountId, accountIndex and nickname
@@ -35,14 +106,15 @@ function retrieveNick (api: ApiInterfaceRx, accountId?: AccountId): Observable<s
 export function info (api: ApiInterfaceRx): (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
+      map(([{ accountId, accountIndex }, identity, nickname]): DeriveAccountInfo => ({
+        accountId, accountIndex, identity, nickname
       }))
     ));
 }

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

@@ -0,0 +1,84 @@
+// 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, AccountData, AccountIndex, Address, Balance, Index } from '@polkadot/types/interfaces';
+import { DerivedBalancesAccount } from '../types';
+
+import { combineLatest, of, Observable } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import { ApiInterfaceRx } from '@polkadot/api/types';
+import { createType } from '@polkadot/types';
+
+import { memo } from '../util';
+
+type Result = [Balance, Balance, Balance, Balance, Index];
+
+function calcBalances (api: ApiInterfaceRx, [accountId, [freeBalance, reservedBalance, frozenFee, frozenMisc, accountNonce]]: [AccountId, Result]): DerivedBalancesAccount {
+  return {
+    accountId,
+    accountNonce,
+    freeBalance,
+    frozenFee,
+    frozenMisc,
+    reservedBalance,
+    votingBalance: createType(api.registry, 'Balance', freeBalance.add(reservedBalance))
+  };
+}
+
+// old
+function queryOld (api: ApiInterfaceRx, accountId: AccountId): Observable<Result> {
+  return api.queryMulti<[Balance, Balance, Index]>([
+    [api.query.balances.freeBalance, accountId],
+    [api.query.balances.reservedBalance, accountId],
+    [api.query.system.accountNonce, accountId]
+  ]).pipe(
+    map(([freeBalance, reservedBalance, accountNonce]): Result =>
+      [freeBalance, reservedBalance, createType(api.registry, 'Balance'), createType(api.registry, 'Balance'), accountNonce]
+    )
+  );
+}
+
+function queryCurrent (api: ApiInterfaceRx, accountId: AccountId): Observable<Result> {
+  return api.queryMulti<[AccountData, Index]>([
+    [api.query.balances.account, accountId],
+    [api.query.system.accountNonce, accountId]
+  ]).pipe(
+    map(([{ free, reserved, miscFrozen, feeFrozen }, accountNonce]): Result =>
+      [free, reserved, feeFrozen, miscFrozen, accountNonce]
+    )
+  );
+}
+
+/**
+ * @name account
+ * @param {( AccountIndex | AccountId | Address | string )} address - An accounts Id in different formats.
+ * @returns An object containing the results of various balance queries
+ * @example
+ * <BR>
+ *
+ * ```javascript
+ * const ALICE = 'F7Hs';
+ *
+ * api.derive.balances.all(ALICE, ({ accountId, lockedBalance }) => {
+ *   console.log(`The account ${accountId} has a locked balance ${lockedBalance} units.`);
+ * });
+ * ```
+ */
+export function account (api: ApiInterfaceRx): (address: AccountIndex | AccountId | Address | string) => Observable<DerivedBalancesAccount> {
+  return memo((address: AccountIndex | AccountId | Address | string): Observable<DerivedBalancesAccount> =>
+    api.derive.accounts.info(address).pipe(
+      switchMap(({ accountId }): Observable<[AccountId, Result]> =>
+        (accountId
+          ? combineLatest([
+            of(accountId),
+            api.query.balances.account
+              ? queryCurrent(api, accountId)
+              : queryOld(api, accountId)
+          ])
+          : of([createType(api.registry, 'AccountId'), [createType(api.registry, 'Balance'), createType(api.registry, 'Balance'), createType(api.registry, 'Balance'), createType(api.registry, 'Balance'), createType(api.registry, 'Index')]])
+        )
+      ),
+      map((result): DerivedBalancesAccount => calcBalances(api, result))
+    ));
+}

packages/api-derive/src/balances/all.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, AccountIndex, Address, Balance, BalanceLock, BlockNumber, Index, VestingSchedule } from '@polkadot/types/interfaces';
-import { DerivedBalances } from '../types';
+import { AccountId, AccountIndex, Address, Balance, BalanceLock, BalanceLockTo212, BlockNumber, VestingInfo, VestingSchedule } from '@polkadot/types/interfaces';
+import { DerivedBalancesAccount, DerivedBalancesAll } from '../types';
 
 import BN from 'bn.js';
 import { combineLatest, of, Observable } from 'rxjs';
@@ -14,29 +14,32 @@ import { bnMax } from '@polkadot/util';
 
 import { memo } from '../util';
 
-type ResultBalance = [Balance, Balance, BalanceLock[], Option<VestingSchedule>];
-type Result = [AccountId, BlockNumber, ResultBalance, Index];
+type ResultBalance = [VestingInfo | null, (BalanceLock | BalanceLockTo212)[]];
+type Result = [DerivedBalancesAccount, BlockNumber, ResultBalance];
 
-function calcBalances (api: ApiInterfaceRx, [accountId, bestNumber, [freeBalance, reservedBalance, locks, vesting], accountNonce]: Result): DerivedBalances {
+function calcBalances (api: ApiInterfaceRx, [{ accountId, accountNonce, freeBalance, frozenFee, frozenMisc, reservedBalance, votingBalance }, bestNumber, [vesting, locks]]: Result): DerivedBalancesAll {
   let lockedBalance = createType(api.registry, 'Balance');
-  let lockedBreakdown: BalanceLock[] = [];
+  let lockedBreakdown: (BalanceLock | BalanceLockTo212)[] = [];
 
   if (Array.isArray(locks)) {
     // only get the locks that are valid until passed the current block
-    lockedBreakdown = locks.filter(({ until }): boolean => bestNumber && until.gt(bestNumber));
+    lockedBreakdown = (locks as BalanceLockTo212[]).filter(({ until }): boolean => !until || (bestNumber && until.gt(bestNumber)));
+
+    const notAll = lockedBreakdown.filter(({ amount }): boolean => !amount.isMax());
 
     // 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(api.registry, 'Balance', bnMax(...lockedBreakdown.map(({ amount }): Balance => amount)));
+    if (notAll.length) {
+      lockedBalance = createType(api.registry, 'Balance', bnMax(...notAll.map(({ amount }): Balance => amount)));
     }
   }
 
   // Calculate the vesting balances,
-  //  - offset = balance locked at genesis,
+  //  - offset = balance locked at startingBlock
   //  - 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);
+  const { locked: vestingTotal, perBlock, startingBlock } = vesting || createType(api.registry, 'VestingInfo');
+  const isStarted = bestNumber.gt(startingBlock);
+  const vestedBalance = createType(api.registry, 'Balance', isStarted ? perBlock.mul(bestNumber.sub(startingBlock)) : 0);
+  const isVesting = isStarted && vestedBalance.lt(vestingTotal);
 
   // The available balance & vested has an interplay here
   // "
@@ -46,30 +49,64 @@ function calcBalances (api: ApiInterfaceRx, [accountId, bestNumber, [freeBalance
   // i.e. (balance >= 200 && balance >= 300) == (balance >= 300)
   // ""
   const floating = freeBalance.sub(lockedBalance);
-  const availableBalance = createType(api.registry, 'Balance', bnMax(new BN(0), isVesting && floating.gt(vestedBalance) ? vestedBalance : floating));
+  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,
+    frozenFee,
+    frozenMisc,
     isVesting,
     lockedBalance,
     lockedBreakdown,
     reservedBalance,
     vestedBalance,
     vestingTotal,
-    votingBalance: createType(api.registry, 'Balance', freeBalance.add(reservedBalance))
+    votingBalance
   };
 }
 
-function queryBalances (api: ApiInterfaceRx, accountId: AccountId): Observable<ResultBalance> {
-  return api.queryMulti<[Balance, Balance, Vec<BalanceLock>, Option<VestingSchedule>]>([
-    [api.query.balances.freeBalance, accountId],
-    [api.query.balances.reservedBalance, accountId],
+// old
+function queryOld (api: ApiInterfaceRx, accountId: AccountId): Observable<ResultBalance> {
+  return api.queryMulti<[Vec<BalanceLock>, Option<VestingSchedule>]>([
     [api.query.balances.locks, accountId],
     [api.query.balances.vesting, accountId]
-  ]);
+  ]).pipe(
+    map(([locks, optVesting]): ResultBalance => {
+      let vestingNew = null;
+
+      if (optVesting.isSome) {
+        const { offset: locked, perBlock, startingBlock } = optVesting.unwrap();
+
+        vestingNew = createType(api.registry, 'VestingInfo', { locked, perBlock, startingBlock });
+      }
+
+      return [vestingNew, locks];
+    })
+  );
+}
+
+// current (balances  vesting)
+function queryCurrent (api: ApiInterfaceRx, accountId: AccountId): Observable<ResultBalance> {
+  return (
+    api.query.vesting.vesting
+      ? api.queryMulti<[Vec<BalanceLock>, Option<VestingInfo>]>([
+        [api.query.balances.locks, accountId],
+        [api.query.vesting.vesting, accountId]
+      ])
+      : api.query.balances.locks(accountId).pipe(
+        map((locks): [Vec<BalanceLock>, Option<VestingInfo>] =>
+          [locks, createType(api.registry, 'Option<VestingInfo>')]
+        )
+      )
+  ).pipe(
+    map(([locks, optVesting]): ResultBalance =>
+      [optVesting.unwrapOr(null), locks]
+    )
+  );
 }
 
 /**
@@ -87,25 +124,21 @@ function queryBalances (api: ApiInterfaceRx, accountId: AccountId): Observable<R
  * });
  * ```
  */
-export function all (api: ApiInterfaceRx): (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
+export function all (api: ApiInterfaceRx): (address: AccountIndex | AccountId | Address | string) => Observable<DerivedBalancesAll> {
+  return memo((address: AccountIndex | AccountId | Address | string): Observable<DerivedBalancesAll> =>
+    api.derive.balances.account(address).pipe(
+      switchMap((account): Observable<Result> =>
+        (!account.accountId.isEmpty
           ? combineLatest([
-            of(accountId),
+            of(account),
             api.derive.chain.bestNumber(),
-            queryBalances(api, accountId),
-            // FIXME This is having issues with Kusama, only use accountNonce atm
-            // api.rpc.account && api.rpc.account.nextIndex
-            //   ? api.rpc.account.nextIndex(accountId)
-            //   // otherwise we end up with this: type 'Codec | Index' is not assignable to type 'Index'.
-            //   : api.query.system.accountNonce<Index>(accountId)
-            api.query.system.accountNonce<Index>(accountId)
+            api.query.balances.account
+              ? queryCurrent(api, account.accountId)
+              : queryOld(api, account.accountId)
           ])
-          : 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')])
+          : of([account, createType(api.registry, 'BlockNumber'), [null, createType(api.registry, 'Vec<BalanceLock>')]])
         )
       ),
-      map((result): DerivedBalances => calcBalances(api, result))
+      map((result): DerivedBalancesAll => 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.
 
@@ -8,33 +8,22 @@ import { DerivedFees } from '../types';
 
 import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { createType } from '@polkadot/types';
 
 import { memo } from '../util';
 
 type Result = [Balance, Balance, Balance, Balance, Balance];
 
-function queryV2 (api: ApiInterfaceRx): Observable<Result> {
-  const paymentBase = api.consts.transactionPayment || api.consts.balances;
-
+function query (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,
-    api.consts.balances.existentialDeposit,
-    api.consts.balances.transferFee,
-    paymentBase.transactionBaseFee as Balance,
-    paymentBase.transactionByteFee as Balance
-  ]);
-}
+    // deprecated - remove
+    (api.consts.balances.creationFee as Balance) || createType(api.registry, 'Balance'),
+    (api.consts.balances.transferFee as Balance) || createType(api.registry, 'Balance'),
 
-function queryV1 (api: ApiInterfaceRx): Observable<Result> {
-  return api.queryMulti<Result>([
-    // Support older versions and get values from storage
-    api.query.balances.creationFee,
-    api.query.balances.existentialDeposit,
-    api.query.balances.transferFee,
-    api.query.balances.transactionBaseFee,
-    api.query.balances.transactionByteFee
+    // current
+    api.consts.balances.existentialDeposit,
+    api.consts.transactionPayment.transactionBaseFee,
+    api.consts.transactionPayment.transactionByteFee
   ]);
 }
 
@@ -52,13 +41,9 @@ function queryV1 (api: ApiInterfaceRx): Observable<Result> {
  * ```
  */
 export function fees (api: ApiInterfaceRx): () => Observable<DerivedFees> {
-  const query = api.consts.balances
-    ? queryV2
-    : queryV1;
-
   return memo((): Observable<DerivedFees> =>
     query(api).pipe(
-      map(([creationFee, existentialDeposit, transferFee, transactionBaseFee, transactionByteFee]): DerivedFees => ({
+      map(([creationFee, transferFee, existentialDeposit, transactionBaseFee, transactionByteFee]): DerivedFees => ({
         creationFee,
         existentialDeposit,
         transactionBaseFee,

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

@@ -1,12 +1,12 @@
-// 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 { all } from './all';
 
+export * from './account';
 export * from './fees';
 export * from './votingBalances';
-export * from './votingBalancesNominatorsFor';
 
 const votingBalance = all;
 

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

@@ -1,22 +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 { DerivedBalancesAccount } from '../types';
 
 import { combineLatest, Observable, of } from 'rxjs';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 
-export function votingBalances (api: ApiInterfaceRx): (addresses?: (AccountId | AccountIndex | Address | string)[]) => Observable<DerivedBalances[]> {
-  return memo((addresses?: (AccountId | AccountIndex | Address | string)[]): Observable<DerivedBalances[]> =>
+export function votingBalances (api: ApiInterfaceRx): (addresses?: (AccountId | AccountIndex | Address | string)[]) => Observable<DerivedBalancesAccount[]> {
+  return memo((addresses?: (AccountId | AccountIndex | Address | string)[]): Observable<DerivedBalancesAccount[]> =>
     !addresses || !addresses.length
-      ? of([] as DerivedBalances[])
+      ? of([] as DerivedBalancesAccount[])
       : combineLatest(
-        addresses.map((accountId): Observable<DerivedBalances> =>
-          api.derive.balances.all(accountId))
+        addresses.map((accountId): Observable<DerivedBalancesAccount> =>
+          api.derive.balances.account(accountId))
       )
   );
 }

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

@@ -1,27 +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, AccountIndex, Address } from '@polkadot/types/interfaces';
-import { DerivedBalances } from '../types';
-
-import { Observable, of } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Vec } from '@polkadot/types';
-
-import { memo } from '../util';
-
-export function votingBalancesNominatorsFor (api: ApiInterfaceRx): (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
-          ? api.query.staking.nominatorsFor<Vec<AccountId>>(accountId)
-          : of([] as AccountId[])
-      ),
-      switchMap((accounts): Observable<DerivedBalances[]> =>
-        api.derive.balances.votingBalances(accounts)
-      )
-    ));
-}

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.
 

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.
 

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.
 

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.
 

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,10 +1,10 @@
-// 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 { Observable, combineLatest } from 'rxjs';
+import { Observable, combineLatest, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { HeaderExtended } from '../type';
@@ -27,9 +27,11 @@ export function subscribeNewHeads (api: ApiInterfaceRx): () => Observable<Header
   return memo((): Observable<HeaderExtended> =>
     combineLatest([
       api.rpc.chain.subscribeNewHeads(),
-      api.derive.staking.validators()
+      api.query.session
+        ? api.query.session.validators()
+        : of([])
     ]).pipe(
-      map(([header, { validators }]): HeaderExtended =>
+      map(([header, validators]): HeaderExtended =>
         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,43 @@
+// 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 { DerivedCollectiveProposal } from '../types';
+
+import { combineLatest, Observable, of } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import { Option } from '@polkadot/types';
+
+type Result = [Hash[], Option<Proposal>[], Option<Votes>[]];
+
+export function proposals (api: ApiInterfaceRx, section: 'council' | 'technicalCommittee'): () => Observable<DerivedCollectiveProposal[]> {
+  return (): Observable<DerivedCollectiveProposal[]> =>
+    api.query[section]
+      ? api.query[section].proposals().pipe(
+        switchMap((hashes: Hash[]): Observable<Result> =>
+          hashes.length
+            ? combineLatest([
+              of(hashes),
+              api.query[section].proposalOf.multi<Option<Proposal>>(hashes),
+              api.query[section].voting.multi<Option<Votes>>(hashes)
+            ])
+            : of([[], [], []])
+        ),
+        map(([hashes, proposals, votes]: Result): DerivedCollectiveProposal[] =>
+          proposals
+            .map((proposalOpt, index): DerivedCollectiveProposal | null =>
+              proposalOpt.isSome
+                ? {
+                  hash: hashes[index],
+                  proposal: proposalOpt.unwrap(),
+                  votes: votes[index].unwrapOr(null)
+                }
+                : null
+            )
+            .filter((proposal): boolean => !!proposal) as DerivedCollectiveProposal[]
+        )
+      )
+      : of([] as DerivedCollectiveProposal[]);
+}

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.
 
@@ -8,42 +8,27 @@ import { DerivedContractFees } from '../types';
 import BN from 'bn.js';
 import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { createType } from '@polkadot/types';
 
 import { memo } from '../util';
 
-type ResultV2 = [BN, BN, BN, BN, BN, BN, BN, BN, BN, BN];
-
-const ZERO = new BN(0);
-
-// parse the result
-function parseResult ([callBaseFee, contractFee, createBaseFee, creationFee, rentByteFee, rentDepositOffset, tombstoneDeposit, transactionBaseFee, transactionByteFee, transferFee]: ResultV2): DerivedContractFees {
-  return {
-    callBaseFee,
-    contractFee,
-    createBaseFee,
-    creationFee,
-    rentByteFee,
-    rentDepositOffset,
-    tombstoneDeposit,
-    transactionBaseFee,
-    transactionByteFee,
-    transferFee
-  };
-}
+type ResultV2 = [BN, BN, BN, BN, BN, BN, BN, BN, BN];
 
 // query via constants (current applicable path)
 function queryConstants (api: ApiInterfaceRx): Observable<ResultV2> {
   return of([
+    // deprecated
+    api.consts.contracts.creationFee || createType(api.registry, 'Balance'),
+    api.consts.contracts.transferFee || createType(api.registry, 'Balance'),
+
+    // current
     api.consts.contracts.callBaseFee,
     api.consts.contracts.contractFee,
-    api.consts.contracts.createBaseFee,
-    api.consts.contracts.creationFee,
     api.consts.contracts.rentByteFee,
     api.consts.contracts.rentDepositOffset,
     api.consts.contracts.tombstoneDeposit,
     api.consts.contracts.transactionBaseFee,
-    api.consts.contracts.transactionByteFee,
-    api.consts.contracts.transferFee
+    api.consts.contracts.transactionByteFee
   ]) as unknown as Observable<ResultV2>;
 }
 
@@ -62,17 +47,18 @@ function queryConstants (api: ApiInterfaceRx): Observable<ResultV2> {
  */
 export function fees (api: ApiInterfaceRx): () => Observable<DerivedContractFees> {
   return memo((): Observable<DerivedContractFees> => {
-    return (
-      api.consts.contracts
-        ? queryConstants(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
-        ])
-      )
+    return queryConstants(api).pipe(
+      map(([creationFee, transferFee, callBaseFee, contractFee, rentByteFee, rentDepositOffset, tombstoneDeposit, transactionBaseFee, transactionByteFee]): DerivedContractFees => ({
+        callBaseFee,
+        contractFee,
+        creationFee,
+        rentByteFee,
+        rentDepositOffset,
+        tombstoneDeposit,
+        transactionBaseFee,
+        transactionByteFee,
+        transferFee
+      }))
     );
   });
 }

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 { memo } from '../util';
 
-export function constructInfo (api: ApiInterfaceRx, 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>(
-    api.registry,
-    ReferendumInfoExtended,
-    isNull(info)
-      ? null
-      : new ReferendumInfoExtended(api.registry, 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 memo((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(api, index, optionInfo)
+      switchMap((info): Observable<DerivedReferendum | null> =>
+        retrieveInfo(api, index, info)
       )
-    ));
+    )
+  );
 }

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

@@ -1,30 +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 { Option } from '@polkadot/types';
 
-import { ReferendumInfoExtended } from '../type';
 import { memo } from '../util';
-import { constructInfo } from './referendumInfo';
+import { retrieveInfo } from './referendumInfo';
 
-export function referendumInfos (api: ApiInterfaceRx): (ids?: (BN | number)[]) => Observable<Option<ReferendumInfoExtended>[]> {
-  return memo((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
+      !ids?.length
         ? of([] as Option<ReferendumInfo>[])
-        : api.query.democracy.referendumInfoOf.multi(ids) as Observable<Vec<Option<ReferendumInfo>>>
+        : api.query.democracy.referendumInfoOf.multi<Option<ReferendumInfo>>(ids)
     ).pipe(
-      map((infos): Option<ReferendumInfoExtended>[] =>
-        ids.map((id, index): Option<ReferendumInfoExtended> =>
-          constructInfo(api, id, infos[index])
+      switchMap((infos): Observable<(DerivedReferendum | null)[]> =>
+        combineLatest(
+          ...ids.map((id, index): Observable<DerivedReferendum | null> =>
+            retrieveInfo(api, id, infos[index])
+          )
         )
+      ),
+      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.
 
@@ -10,16 +10,16 @@ import { map, switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { Vec, createType } from '@polkadot/types';
 
-import { DerivedBalances, DerivedReferendumVote } from '../types';
+import { DerivedBalancesAccount, DerivedReferendumVote } from '../types';
 import { memo } from '../util';
 
 export function referendumVotesFor (api: ApiInterfaceRx): (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[]]> =>
+      switchMap((votersFor): Observable<[Vec<AccountId>, Vote[], DerivedBalancesAccount[]]> =>
         combineLatest([
           of(votersFor),
-          api.derive.democracy.votes(referendumId as BN, votersFor),
+          api.derive.democracy.votes(referendumId, votersFor),
           api.derive.balances.votingBalances(votersFor)
         ])
       ),
@@ -28,7 +28,7 @@ export function referendumVotesFor (api: ApiInterfaceRx): (referendumId: BN | nu
           accountId,
           balance: balances[index].votingBalance || createType(api.registry, 'Balance'),
           vote: votes[index] || createType(api.registry, 'Vote')
-        } as unknown as DerivedReferendumVote))
+        } as DerivedReferendumVote))
       )
     ));
 }

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

@@ -1,32 +1,34 @@
-// 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 { memo } from '../util';
 
-export function referendums (api: ApiInterfaceRx): () => Observable<Option<ReferendumInfoExtended>[]> {
-  return memo((): 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[]> =>
+    api.query.democracy?.lowestUnbaked
+      ? api.queryMulti<[ReferendumIndex, ReferendumIndex]>([
+        api.query.democracy.lowestUnbaked,
+        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([])
+            : 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.
 
@@ -10,12 +10,12 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 
-export function votes (api: ApiInterfaceRx): (referendumId: BN, accountIds?: AccountId[]) => Observable<Vote[]> {
-  return memo((referendumId: BN, accountIds: AccountId[] = []): Observable<Vote[]> =>
+export function votes (api: ApiInterfaceRx): (referendumId: BN | number, accountIds?: AccountId[]) => Observable<Vote[]> {
+  return memo((referendumId: BN | number, accountIds: AccountId[] = []): Observable<Vote[]> =>
     !accountIds || !accountIds.length
       ? of([] as Vote[])
       : api.query.democracy.voteOf.multi<Vote>(
-        accountIds.map((accountId): [BN, AccountId] =>
+        accountIds.map((accountId): [BN | number, AccountId] =>
           [referendumId, accountId]
         )
       )

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

@@ -1,49 +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, of } from 'rxjs';
-import { Vec } from '@polkadot/types';
-import { switchMap, map } from 'rxjs/operators';
-import { approvalFlagsToBools } from '../util/approvalFlagsToBools';
-import { memo } from '../util';
-
-function queryElections (api: ApiInterfaceRx, who: AccountId | string): Observable<boolean[][]> {
-  return 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)
-      )
-    )
-  );
-}
-
-/**
- * @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 | string) => Observable<boolean[][]> {
-  return memo((who: AccountId | string): Observable<boolean[][]> =>
-    api.query.elections
-      ? queryElections(api, who)
-      : of([])
-  );
-}

packages/api-derive/src/elections/approvalsOfAt.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 { AccountId, ApprovalFlag, SetIndex } from '@polkadot/types/interfaces';
-
-import BN from 'bn.js';
-import { Observable, of } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Vec } from '@polkadot/types';
-
-import { approvalFlagsToBools } from '../util/approvalFlagsToBools';
-import { memo } from '../util';
-
-function queryElections (api: ApiInterfaceRx, who: AccountId | string, at: SetIndex | BN | number): Observable<boolean[]> {
-  return api.query.elections.approvalsOf<Vec<ApprovalFlag>>([who.toString(), at]).pipe(
-    map((flags: Vec<ApprovalFlag>): boolean[] => approvalFlagsToBools(flags))
-  );
-}
-
-/**
- * @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 memo((who: AccountId | string, at: SetIndex | BN | number): Observable<boolean[]> =>
-    api.query.elections
-      ? queryElections(api, who, at)
-      : of([])
-  );
-}

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,11 +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 { AccountId, Balance, BlockNumber, SetIndex, VoteIndex } from '@polkadot/types/interfaces';
+import { AccountId, Balance, BlockNumber } from '@polkadot/types/interfaces';
 import { ITuple } from '@polkadot/types/types';
 
-import { Observable, combineLatest } from 'rxjs';
+import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { createType, Vec, u32 } from '@polkadot/types';
@@ -13,71 +13,31 @@ import { createType, Vec, u32 } from '@polkadot/types';
 import { DerivedElectionsInfo } from '../types';
 import { memo } from '../util';
 
-type ResultElectionsInner = [u32, u32, Vec<ITuple<[AccountId, BlockNumber]>>, SetIndex, BlockNumber, VoteIndex, SetIndex];
-type ResultElections = [Vec<AccountId>, ResultElectionsInner];
-
-function deriveElections (api: ApiInterfaceRx, [candidates, [candidateCount, desiredSeats, members, nextVoterSet, termDuration, voteCount, voterCount]]: ResultElections): DerivedElectionsInfo {
-  return {
-    candidates,
-    candidateCount,
-    desiredSeats,
-    nextVoterSet,
-    members: members.map(([accountId]): [AccountId, Balance] => [accountId, createType(api.registry, 'Balance')]),
-    runnersUp: [],
-    termDuration,
-    voteCount,
-    voterCount
-  };
+function sortAccounts ([, balanceA]: ITuple<[AccountId, Balance]>, [, balanceB]: ITuple<[AccountId, Balance]>): number {
+  return balanceB.cmp(balanceA);
 }
 
 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((result): DerivedElectionsInfo => deriveElections(api, result)));
-}
+  const section = api.query.electionsPhragmen ? 'electionsPhragmen' : 'elections';
 
-function derivePhragmen (api: ApiInterfaceRx, candidates: AccountId[], members: [AccountId, Balance][], runnersUp: [AccountId, Balance][], candidacyBond: Balance, desiredSeats: u32, termDuration: BlockNumber, votingBond: Balance): DerivedElectionsInfo {
-  return {
-    candidates,
-    candidateCount: createType(api.registry, 'u32', candidates.length),
-    candidacyBond,
-    desiredSeats,
-    members,
-    // place in most-likely-to-be-in order
-    runnersUp: runnersUp.reverse(),
-    termDuration,
-    votingBond
-  };
-}
-
-function queryPhragmen (api: ApiInterfaceRx): Observable<DerivedElectionsInfo> {
-  // 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<ITuple<[AccountId, Balance]>>>(),
-    api.query.electionsPhragmen.runnersUp<Vec<ITuple<[AccountId, Balance]>>>()
+  return api.queryMulti<[Vec<AccountId>, Vec<AccountId>, Vec<ITuple<[AccountId, Balance]>>, Vec<ITuple<[AccountId, Balance]>>]>([
+    api.query.council.members,
+    api.query[section].candidates,
+    api.query[section].members,
+    api.query[section].runnersUp
   ]).pipe(
-    map(([candidates, members, runnersUp]): DerivedElectionsInfo => derivePhragmen(
-      api,
+    map(([councilMembers, candidates, members, runnersUp]): DerivedElectionsInfo => ({
       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
-    ))
+      candidateCount: createType(api.registry, 'u32', candidates.length),
+      candidacyBond: api.consts[section].candidacyBond as Balance,
+      desiredSeats: api.consts[section].desiredMembers as u32,
+      members: members.length
+        ? members.sort(sortAccounts)
+        : councilMembers.map((accountId): [AccountId, Balance] => [accountId, createType(api.registry, 'Balance')]),
+      runnersUp: runnersUp.sort(sortAccounts),
+      termDuration: api.consts[section].termDuration as BlockNumber,
+      votingBond: api.consts[section].votingBond as Balance
+    }))
   );
 }
 
@@ -95,9 +55,5 @@ function queryPhragmen (api: ApiInterfaceRx): Observable<DerivedElectionsInfo> {
  * ```
  */
 export function info (api: ApiInterfaceRx): () => Observable<DerivedElectionsInfo> {
-  return memo((): Observable<DerivedElectionsInfo> =>
-    api.query.electionsPhragmen
-      ? queryPhragmen(api)
-      : queryElections(api)
-  );
+  return memo((): Observable<DerivedElectionsInfo> => queryElections(api));
 }

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

@@ -1,62 +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, u32 } from '@polkadot/types';
-import { DerivedVoterPositions } from '../types';
-
-import BN from 'bn.js';
-import { of, Observable } from 'rxjs';
-import { switchMap, map } from 'rxjs/operators';
-
-import { memo } from '../util';
-
-function queryElections (api: ApiInterfaceRx): Observable<DerivedVoterPositions> {
-  return api.query.elections.nextVoterSet<SetIndex>().pipe(
-    switchMap((nextVoterSet: SetIndex): Observable<Vec<Option<AccountId>>[]> =>
-      api.query.elections.voters.multi<Vec<Option<AccountId>>>([...Array(+nextVoterSet + 1).keys()].map((_, i): [number] => [i]))
-    ),
-    map((voters: Vec<Option<AccountId>>[]): DerivedVoterPositions => {
-      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: (api.consts.elections.voterSetSize as u32).muln(setIndex).addn(index),
-              index: new BN(index),
-              setIndex: createType(api.registry, 'SetIndex', setIndex)
-            };
-          }
-        });
-
-        return result;
-      }, {});
-    })
-  );
-}
-
-/**
- * @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 memo((): Observable<DerivedVoterPositions> =>
-    api.query.elections
-      ? queryElections(api)
-      : of({})
-  );
-}

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

@@ -1,46 +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, of } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { createType, Vec } from '@polkadot/types';
-
-import { memo } from '../util';
-
-function queryElections (api: ApiInterfaceRx): Observable<AccountId[]> {
-  return api.derive.elections.voterPositions().pipe(
-    map((voterPositions: DerivedVoterPositions): Vec<AccountId> =>
-      createType(
-        api.registry,
-        'Vec<AccountId>',
-        Object.entries(voterPositions)
-          .sort((a, b): number => a[1].globalIndex.cmp(b[1].globalIndex))
-          .map(([accountId]): AccountId => createType(api.registry, 'AccountId', accountId))
-      )
-    )
-  );
-}
-/**
- * @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<AccountId[]> {
-  return memo((): Observable<AccountId[]> =>
-    api.query.elections
-      ? queryElections(api)
-      : of([])
-  );
-}

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.
 
@@ -17,13 +17,15 @@ import { memo } from '../util';
  */
 export function receivedHeartbeats (api: ApiInterfaceRx): () => Observable<DerivedHeartbeats> {
   return memo((): Observable<DerivedHeartbeats> =>
-    api.query.imOnline?.receivedHeartbeats && api.query.imOnline.authoredBlocks
+    api.query.imOnline?.receivedHeartbeats
       ? api.derive.staking.overview().pipe(
         switchMap(({ currentIndex, validators }): Observable<[AccountId[], Option<Bytes>[], u32[]]> =>
           combineLatest([
             of(validators),
-            api.query.imOnline.receivedHeartbeats.multi<Option<Bytes>>(validators.map((_address, index): [SessionIndex, number] => [currentIndex, index])),
-            api.query.imOnline.authoredBlocks.multi<u32>(validators.map((address): [SessionIndex, AccountId] => [currentIndex, address]))
+            api.query.imOnline.receivedHeartbeats.multi<Option<Bytes>>(
+              validators.map((_address, index): [SessionIndex, number] => [currentIndex, index])),
+            api.query.imOnline.authoredBlocks.multi<u32>(
+              validators.map((address): [SessionIndex, AccountId] => [currentIndex, address]))
           ])
         ),
         map(([validators, heartbeats, numBlocks]): DerivedHeartbeats =>

packages/api-derive/src/index.spec.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.
 
@@ -45,7 +45,6 @@ describe('derive', (): void => {
     testFunction(api)('balances', 'fees', []);
     testFunction(api)('balances', 'votingBalance', []);
     testFunction(api)('balances', 'votingBalances', []);
-    testFunction(api)('balances', 'votingBalancesNominatorsFor', []);
 
     testFunction(api)('chain', 'bestNumber', []);
     testFunction(api)('chain', 'bestNumberFinalized', []);
@@ -55,18 +54,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', 'recentlyOffline', []);
+    testFunction(api)('staking', 'account', []);
     testFunction(api)('staking', 'controllers', []);
   });
 

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,14 +11,20 @@ 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 society from './society';
 import * as staking from './staking';
+import * as technicalCommittee from './technicalCommittee';
+import * as treasury from './treasury';
 
 export * from './type';
 
+export const derive = { accounts, balances, chain, contracts, council, democracy, elections, imOnline, session, society, staking, technicalCommittee, treasury };
+
 type DeriveSection<Section> = {
   [Method in keyof Section]: Section[Method] extends AnyFunction
     ? ReturnType<Section[Method]> // ReturnType<Section[Method]> will be the inner function, i.e. without (api) argument
@@ -30,13 +36,35 @@ type DeriveAllSections<AllSections> = {
 
 export type DeriveCustom = Record<string, Record<string, (api: ApiInterfaceRx) => (...args: any[]) => Observable<any>>>;
 
+export type ExactDerive = DeriveAllSections<typeof derive>;
+
+// Enable derive only if some of these modules are available
+const deriveAvail: Record<string, string[]> = {
+  contracts: ['contracts'],
+  council: ['council'],
+  democracy: ['democracy'],
+  elections: ['electionsPhragmen', 'elections'],
+  imOnline: ['imOnline'],
+  session: ['session'],
+  society: ['society'],
+  staking: ['staking'],
+  technicalCommittee: ['technicalCommittee'],
+  treasury: ['treasury']
+};
+
 /**
  * Returns an object that will inject `api` into all the functions inside
  * `allSections`, and keep the object architecture of `allSections`.
  */
+/** @internal */
 function injectFunctions<AllSections> (api: ApiInterfaceRx, allSections: AllSections): DeriveAllSections<AllSections> {
+  const queryKeys = Object.keys(api.query);
+
   return Object
     .keys(allSections)
+    .filter((sectionName): boolean =>
+      !deriveAvail[sectionName] || deriveAvail[sectionName].some((query): boolean => queryKeys.includes(query))
+    )
     .reduce((deriveAcc, sectionName): DeriveAllSections<AllSections> => {
       const section = allSections[sectionName as keyof AllSections];
 
@@ -56,11 +84,9 @@ function injectFunctions<AllSections> (api: ApiInterfaceRx, allSections: AllSect
     }, {} as DeriveAllSections<AllSections>);
 }
 
-export const derive = { accounts, balances, chain, contracts, democracy, elections, imOnline, session, staking };
-export type ExactDerive = DeriveAllSections<typeof derive>;
-
 // FIXME The return type of this function should be {...ExactDerive, ...DeriveCustom}
 // For now we just drop the custom derive typings
+/** @internal */
 export default function decorateDerive (api: ApiInterfaceRx, custom: DeriveCustom = {}): ExactDerive {
   return {
     ...injectFunctions(api, derive),

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.
 

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.
 

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.
 

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

@@ -1,51 +1,21 @@
-// 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 { BlockNumber, SessionIndex } from '@polkadot/types/interfaces';
+import { SessionIndex } from '@polkadot/types/interfaces';
 import { DerivedSessionInfo, DeriveSessionIndexes } from '../types';
 
 import { Observable, combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Option, u64, createType } from '@polkadot/types';
+import { u64, createType } from '@polkadot/types';
 
 import { memo } from '../util';
 
-type ResultV1Session = [Option<BlockNumber>, BlockNumber, BlockNumber, SessionIndex];
-type ResultV1 = [BlockNumber, DeriveSessionIndexes, ResultV1Session];
-
 type ResultSlots = [u64, u64, u64, SessionIndex];
 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 (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)
-    .mod(sessionLength);
-  const currentEra = currentIndex
-    .sub(lastEraLengthChange)
-    .mod(sessionsPerEra);
-  const eraProgress = currentEra
-    .mul(sessionLength)
-    .add(sessionProgress);
-
-  return {
-    currentEra: createType(api.registry, 'EraIndex', currentEra),
-    currentIndex,
-    eraLength: createType(api.registry, 'BlockNumber', sessionLength.mul(sessionsPerEra)),
-    eraProgress: createType(api.registry, 'BlockNumber', eraProgress),
-    isEpoch: false,
-    sessionLength,
-    sessionsPerEra,
-    sessionProgress: createType(api.registry, 'BlockNumber', sessionProgress),
-    validatorCount
-  };
-}
-
 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);
@@ -64,21 +34,6 @@ function createDerivedLatest (api: ApiInterfaceRx, [[hasBabe, epochDuration, ses
   };
 }
 
-function infoV1 (api: ApiInterfaceRx): Observable<DerivedSessionInfo> {
-  return combineLatest([
-    api.derive.chain.bestNumber(),
-    api.derive.session.indexes(),
-    api.queryMulti<ResultV1Session>([
-      api.query.session.lastLengthChange,
-      api.query.session.sessionLength,
-      api.query.staking.lastEraLengthChange,
-      api.query.staking.sessionsPerEra
-    ])
-  ]).pipe(
-    map((result): DerivedSessionInfo => createDerivedV1(api, result))
-  );
-}
-
 function infoLatestAura (api: ApiInterfaceRx): Observable<DerivedSessionInfo> {
   return api.derive.session.indexes().pipe(
     map((indexes): DerivedSessionInfo =>
@@ -115,11 +70,9 @@ 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.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;
+  const query = api.consts.babe
+    ? infoLatestBabe // 2.x with Babe
+    : infoLatestAura; // 2.x with Aura (not all info there)
 
   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.
 

packages/api-derive/src/society/candidates.ts

@@ -0,0 +1,42 @@
+// 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, BalanceOf, Bid, BidKind } from '@polkadot/types/interfaces';
+import { ITuple } from '@polkadot/types/types';
+import { DeriveSocietyCandidate } from '../types';
+
+import { combineLatest, of, Observable } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import { Option, Vec } from '@polkadot/types';
+
+import { memo } from '../util';
+
+type ResultSuspend = Option<ITuple<[BalanceOf, BidKind]>>;
+type Result = [Bid[], ResultSuspend[]]
+
+/**
+ * @description Get the candidate info for a society
+ */
+export function candidates (api: ApiInterfaceRx): () => Observable<DeriveSocietyCandidate[]> {
+  return memo((): Observable<DeriveSocietyCandidate[]> =>
+    api.query.society.candidates<Vec<Bid>>().pipe(
+      switchMap((candidates: Vec<Bid>): Observable<Result> =>
+        combineLatest([
+          of(candidates),
+          api.query.society.suspendedCandidates.multi<ResultSuspend>(
+            candidates.map(({ who }): AccountId => who))
+        ])
+      ),
+      map(([candidates, suspended]: Result): DeriveSocietyCandidate[] =>
+        candidates.map(({ who, kind, value }, index) => ({
+          accountId: who,
+          isSuspended: suspended[index].isSome,
+          kind,
+          value
+        }))
+      )
+    )
+  );
+}

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

@@ -0,0 +1,8 @@
+// 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 './candidates';
+export * from './info';
+export * from './member';
+export * from './members';

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

@@ -0,0 +1,41 @@
+// 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, BalanceOf, Bid } from '@polkadot/types/interfaces';
+import { DeriveSociety } from '../types';
+
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { Option, Vec, u32 } from '@polkadot/types';
+
+import { memo } from '../util';
+
+type Result = [Vec<Bid>, Option<AccountId>, Option<AccountId>, Option<AccountId>, u32, BalanceOf]
+
+/**
+ * @description Get the overall info for a society
+ */
+export function info (api: ApiInterfaceRx): () => Observable<DeriveSociety> {
+  return memo((): Observable<DeriveSociety> =>
+    api.queryMulti<Result>([
+      api.query.society.bids,
+      api.query.society.defender,
+      api.query.society.founder,
+      api.query.society.head,
+      api.query.society.maxMembers,
+      api.query.society.pot
+    ]).pipe(
+      map(([bids, defender, founder, head, maxMembers, pot]: Result): DeriveSociety => ({
+        bids,
+        defender: defender.unwrapOr(undefined),
+        hasDefender: (defender.isSome && head.isSome && !head.eq(defender)) || false,
+        head: head.unwrapOr(undefined),
+        founder: founder.unwrapOr(undefined),
+        maxMembers,
+        pot
+      }))
+    )
+  );
+}

packages/api-derive/src/society/member.ts

@@ -0,0 +1,40 @@
+// 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, Balance, BlockNumber, SocietyVote, StrikeCount, VouchingStatus } from '@polkadot/types/interfaces';
+import { ITuple } from '@polkadot/types/types';
+import { DeriveSocietyMember } from '../types';
+
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { bool, Option, Vec } from '@polkadot/types';
+
+import { memo } from '../util';
+
+type Result = [Vec<ITuple<[BlockNumber, Balance]>>, StrikeCount, Option<SocietyVote>, bool, Option<VouchingStatus>];
+
+/**
+ * @description Get the member info for a society
+ */
+export function member (api: ApiInterfaceRx): (accountId: AccountId) => Observable<DeriveSocietyMember> {
+  return memo((accountId: AccountId): Observable<DeriveSocietyMember> =>
+    api.queryMulti<Result>([
+      [api.query.society.payouts, accountId],
+      [api.query.society.strikes, accountId],
+      [api.query.society.defenderVotes, accountId],
+      [api.query.society.suspendedMembers, accountId],
+      [api.query.society.vouching, accountId]
+    ]).pipe(
+      map(([payouts, strikes, defenderVote, suspended, vouching]: Result): DeriveSocietyMember => ({
+        accountId,
+        payouts,
+        isSuspended: suspended.isTrue,
+        strikes,
+        vote: defenderVote.unwrapOr(undefined),
+        vouching: vouching.unwrapOr(undefined)
+      }))
+    )
+  );
+}

packages/api-derive/src/society/members.ts

@@ -0,0 +1,27 @@
+// 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 { DeriveSocietyMember } from '../types';
+
+import { combineLatest, Observable } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+
+import { memo } from '../util';
+
+/**
+ * @description Get the member info for a society
+ */
+export function members (api: ApiInterfaceRx): () => Observable<DeriveSocietyMember[]> {
+  return memo((): Observable<DeriveSocietyMember[]> =>
+    api.query.society.members<AccountId[]>().pipe(
+      switchMap((members): Observable<DeriveSocietyMember[]> =>
+        combineLatest(members.map((accountId): Observable<DeriveSocietyMember> =>
+          api.derive.society.member(accountId)
+        ))
+      )
+    )
+  );
+}

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,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/staking/electedInfo.ts

@@ -1,10 +1,10 @@
-// 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 { DerivedStaking, DerivedStakingElected } from '../types';
+import { DerivedStakingQuery, DerivedStakingElected } from '../types';
 
 import { Observable, combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
@@ -14,11 +14,11 @@ import { memo } from '../util';
 export function electedInfo (api: ApiInterfaceRx): () => Observable<DerivedStakingElected> {
   return memo((): Observable<DerivedStakingElected> =>
     api.derive.staking.validators().pipe(
-      switchMap(({ currentElected }): Observable<[AccountId[], DerivedStaking[]]> =>
+      switchMap(({ currentElected }): Observable<[AccountId[], DerivedStakingQuery[]]> =>
         combineLatest([
           of(currentElected),
-          combineLatest(currentElected.map((accountId): Observable<DerivedStaking> =>
-            api.derive.staking.info(accountId)
+          combineLatest(currentElected.map((accountId): Observable<DerivedStakingQuery> =>
+            api.derive.staking.query(accountId)
           ))
         ])
       ),

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

@@ -1,10 +1,10 @@
-// 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 './electedInfo';
-export * from './info';
 export * from './overview';
-export * from './recentlyOffline';
+export * from './query';
 export * from './validators';

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

@@ -1,227 +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, Balance, BlockNumber, Exposure, Keys, Nominations, RewardDestination, StakingLedger, UnlockChunk, ValidatorPrefs } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DerivedRecentlyOffline, DerivedSessionInfo, 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 { memo } from '../util';
-
-interface ParseInput {
-  accountId: AccountId;
-  controllerId: AccountId;
-  recentlyOffline?: DerivedRecentlyOffline;
-  nominators: AccountId[];
-  rewardDestination: RewardDestination;
-  queuedKeys?: [AccountId, Keys][];
-  sessionInfo: DerivedSessionInfo;
-  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 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 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, sessionInfo, recentlyOffline = {}, nextKeyFor, queuedKeys, stakingLedger, nominators, rewardDestination, stakers, validatorPrefs, nextKeys }: ParseInput): DerivedStaking {
-  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,
-    offline: recentlyOffline[stashId.toString()],
-    redeemable: redeemableSum(api, _stakingLedger, sessionInfo),
-    rewardDestination,
-    stakers,
-    stakingLedger: _stakingLedger,
-    stashId,
-    unlocking: calculateUnlocking(api, _stakingLedger, sessionInfo),
-    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<DerivedStaking> {
-  return combineLatest([
-    api.derive.session.info(),
-    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(([sessionInfo, recentlyOffline, [nextKeyFor, stakingLedger, [nominators], rewardDestination, stakers, [validatorPrefs]]]: [DerivedSessionInfo, DerivedRecentlyOffline, MultiResultV1]): DerivedStaking =>
-    parseResult(api, {
-      accountId, controllerId, stashId, sessionInfo, recentlyOffline, 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<DerivedStaking> {
-  return combineLatest([
-    api.derive.session.info(),
-    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(([sessionInfo, queuedKeys, [_nominators, rewardDestination, stakers, [validatorPrefs], nextKeys, stakingLedger]]: [DerivedSessionInfo, [AccountId, Keys][], MultiResultV2]): DerivedStaking => {
-    // 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, sessionInfo, queuedKeys, stakingLedger, nominators, rewardDestination, stakers, validatorPrefs, nextKeys
-    });
-  }));
-}
-
-function retrieveV1 (api: ApiInterfaceRx, accountId: AccountId): Observable<DerivedStaking> {
-  // 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<DerivedStaking> =>
-    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<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 memo((accountId: Uint8Array | string): Observable<DerivedStaking> =>
-    query(api, createType(api.registry, 'AccountId', accountId)));
-}

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

@@ -1,29 +1,25 @@
-// 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, Exposure, Keys, RewardDestination, ValidatorPrefs } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
+import { AccountId, Exposure, Keys, Nominations, RewardDestination, ValidatorPrefs } from '@polkadot/types/interfaces';
 import { DerivedStakingStash } from '../types';
 
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Option, Vec } from '@polkadot/types';
+import { Option } from '@polkadot/types';
 
 import { memo } from '../util';
 
-// NOTE Unused ATM, preparing for V2-only
+type Result = [Option<AccountId>, Nominations, RewardDestination, Exposure, ValidatorPrefs, Option<Keys>];
 
-type Result = [Option<AccountId>, [Vec<AccountId>], RewardDestination, Exposure, ValidatorPrefs, Option<Keys>?];
-type ResultV1 = [Option<AccountId>, ITuple<[Vec<AccountId>]>, RewardDestination, Exposure, ValidatorPrefs];
-type ResultV2 = [Option<AccountId>, ITuple<[Vec<AccountId>]>, RewardDestination, Exposure, ValidatorPrefs, Option<Keys>];
-
-function parse (stashId: AccountId, [_controllerId, [nominators], rewardDestination, stakers, validatorPrefs, _nextKeys]: Result): DerivedStakingStash {
+function parse (stashId: AccountId, [_controllerId, nominators, rewardDestination, stakers, validatorPrefs, _nextKeys]: Result): DerivedStakingStash {
   return {
     controllerId: _controllerId.unwrapOr(undefined),
-    nextKeys: _nextKeys?.unwrapOr(undefined),
-    nominators,
+    nextKeys: _nextKeys.unwrapOr(undefined),
+    nominators: nominators.targets,
+    nominateAt: nominators.submittedIn,
     rewardDestination,
     stakers,
     stashId,
@@ -31,18 +27,8 @@ function parse (stashId: AccountId, [_controllerId, [nominators], rewardDestinat
   };
 }
 
-function retrieveV1 (api: ApiInterfaceRx, stashId: AccountId): Observable<Result> {
-  return api.queryMulti<ResultV1>([
-    [api.query.staking.bonded, stashId],
-    [api.query.staking.nominators, stashId],
-    [api.query.staking.payee, stashId],
-    [api.query.staking.stakers, stashId],
-    [api.query.staking.validators, stashId]
-  ]);
-}
-
-function retrieveV2 (api: ApiInterfaceRx, stashId: AccountId): Observable<Result> {
-  return api.queryMulti<ResultV2>([
+function query (api: ApiInterfaceRx, stashId: AccountId): Observable<Result> {
+  return api.queryMulti<Result>([
     [api.query.staking.bonded, stashId],
     [api.query.staking.nominators, stashId],
     [api.query.staking.payee, stashId],
@@ -53,10 +39,6 @@ function retrieveV2 (api: ApiInterfaceRx, stashId: AccountId): Observable<Result
 }
 
 export function infoStash (api: ApiInterfaceRx): (stashId: AccountId) => Observable<DerivedStakingStash> {
-  const query = api.consts.session
-    ? retrieveV2
-    : retrieveV1;
-
   return memo((stashId: AccountId): Observable<DerivedStakingStash> =>
     query(api, stashId).pipe(
       map((result): DerivedStakingStash => parse(stashId, result))