[CI Skip] release/stable 2.10.1

skip-checks: true

.yarnrc.yml

@@ -9,7 +9,5 @@ plugins:
     spec: "@yarnpkg/plugin-interactive-tools"
   - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
     spec: "@yarnpkg/plugin-version"
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
 
-yarnPath: .yarn/releases/yarn-2.3.3.cjs
+yarnPath: .yarn/releases/yarn-2.4.0.cjs

CHANGELOG.md

@@ -1,5 +1,23 @@
 # CHANGELOG
 
+## 2.10.1 Dec 7, 2020
+
+Upgrade priority: Low. Recommended when following Substrate master and/or parachains development, contains the latest types for both.
+
+- **Breaking change** If using the `staking.query` derive, you now need to pass flags as to which values to retrieve
+
+Changes:
+
+- Ensure that maximum era is limited to `consts.system.blockHashCount` (don't overflow on very low blocktimes)
+- Apply current Polkadot master parachain types
+- Apply current Substrate master asset types
+- Add `system_{addLogFilter, resetLogFilter}` RPCs
+- Adjust tests for latest Substrate metadata
+- Adjust staking derives to be more performant (flags indicate which query values to retrieve)
+- Add account derive to cater for the availability of identities
+- Use `import type` in all cases
+
+
 ## 2.9.1 Nov 30, 2020
 
 Upgrade priority: Low. No major changes when on at least 2.8.2. Users encouraged to upgrade to at least that patch.

package.json

@@ -23,14 +23,14 @@
     "test:watch": "polkadot-dev-run-test --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.8",
+    "@babel/core": "^7.12.9",
     "@babel/register": "^7.12.1",
     "@babel/runtime": "^7.12.5",
-    "@polkadot/dev": "^0.60.5",
-    "@polkadot/ts": "^0.3.55",
+    "@polkadot/dev": "^0.60.8",
+    "@polkadot/ts": "^0.3.57",
     "@polkadot/typegen": "workspace:packages/typegen",
-    "@types/jest": "^26.0.15",
-    "copyfiles": "^2.4.0"
+    "@types/jest": "^26.0.16",
+    "copyfiles": "^2.4.1"
   },
-  "version": "2.9.1"
+  "version": "2.10.1"
 }

packages/api-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "2.9.1",
+  "version": "2.10.1",
   "description": "Interfaces for interacting with contracts and contract ABIs",
   "main": "index.js",
   "sideEffects": false,
@@ -17,8 +17,8 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/api": "2.9.1",
-    "@polkadot/types": "2.9.1",
+    "@polkadot/api": "2.10.1",
+    "@polkadot/types": "2.10.1",
     "@polkadot/util": "^4.2.1",
     "bn.js": "^4.11.9",
     "rxjs": "^6.6.3"

packages/api-contract/src/Abi.ts

@@ -1,11 +1,11 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AnyJson, Codec, CodecArg } from '@polkadot/types/types';
-import { ChainProperties, ContractConstructorSpec, ContractEventSpec, ContractMessageSpec, ContractMessageParamSpec, ContractProject } from '@polkadot/types/interfaces';
-import { AbiConstructor, AbiEvent, AbiMessage, AbiParam, DecodedEvent, DecodedMessage } from './types';
+import type { Bytes } from '@polkadot/types';
+import type { AnyJson, Codec, CodecArg } from '@polkadot/types/types';
+import type { ChainProperties, ContractConstructorSpec, ContractEventSpec, ContractMessageSpec, ContractMessageParamSpec, ContractProject } from '@polkadot/types/interfaces';
+import type { AbiConstructor, AbiEvent, AbiMessage, AbiParam, DecodedEvent, DecodedMessage } from './types';
 
-import { Bytes } from '@polkadot/types';
 import { assert, assertReturn, compactAddLength, compactStripLength, isNumber, isObject, isString, logger, stringCamelCase, u8aConcat, u8aToHex } from '@polkadot/util';
 
 import { MetaRegistry } from './MetaRegistry';

packages/api-contract/src/MetaRegistry.ts

@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ContractDisplayName, ChainProperties, SiField, SiLookupTypeId, SiType, SiTypeDefArray, SiTypeDefVariant, SiTypeDefSequence, SiTypeDefTuple, SiVariant } from '@polkadot/types/interfaces';
-import { InterfaceTypes, TypeDef, TypeDefInfo } from '@polkadot/types/types';
+import type { ContractDisplayName, ChainProperties, SiField, SiLookupTypeId, SiType, SiTypeDefArray, SiTypeDefVariant, SiTypeDefSequence, SiTypeDefTuple, SiVariant } from '@polkadot/types/interfaces';
+import type { InterfaceTypes, TypeDef } from '@polkadot/types/types';
 
 import { assert, isUndefined } from '@polkadot/util';
 import { TypeRegistry, withTypeString } from '@polkadot/types/create';
+import { TypeDefInfo } from '@polkadot/types/types';
 
 interface PartialTypeSpec {
   readonly type: SiLookupTypeId;

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

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiTypes, DecorateMethod } from '@polkadot/api/types';
-import { AnyJson, Registry } from '@polkadot/types/types';
+import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
+import type { AnyJson, Registry } from '@polkadot/types/types';
 
 import { ApiBase } from '@polkadot/api/base';
 import { assert } from '@polkadot/util';

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

@@ -1,12 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiTypes, DecorateMethod } from '@polkadot/api/types';
-import { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
-import { AccountId, EventRecord, Hash } from '@polkadot/types/interfaces';
-import { AnyJson, CodecArg, ISubmittableResult } from '@polkadot/types/types';
-import { AbiConstructor, BlueprintOptions } from '../types';
-import { BlueprintDeploy, ContractGeneric, MapConstructorExec } from './types';
+import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
+import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
+import type { AccountId, EventRecord, Hash } from '@polkadot/types/interfaces';
+import type { AnyJson, CodecArg, ISubmittableResult } from '@polkadot/types/types';
+import type { AbiConstructor, BlueprintOptions } from '../types';
+import type { BlueprintDeploy, ContractGeneric, MapConstructorExec } from './types';
 
 import BN from 'bn.js';
 import { SubmittableResult } from '@polkadot/api';
@@ -92,9 +92,9 @@ export class Blueprint<ApiType extends ApiTypes> extends Base<ApiType> {
     const withSalt = this.api.tx.contracts.instantiate.meta.args.length === 5;
     const encoded = this.abi.findConstructor(constructorOrId).toU8a(params, withSalt ? EMPTY_SALT : encodedSalt);
     const tx = withSalt
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore new style with salt included
       ? this.api.tx.contracts.instantiate(value, gasLimit, this.codeHash, encoded, encodedSalt)
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore old style with salt included
       : this.api.tx.contracts.instantiate(value, gasLimit, this.codeHash, encoded);
 
     return tx.withResultTransform((result: ISubmittableResult) =>

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

@@ -1,10 +1,10 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiTypes, DecorateMethod } from '@polkadot/api/types';
-import { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
-import { EventRecord, Hash } from '@polkadot/types/interfaces';
-import { AnyJson, ISubmittableResult } from '@polkadot/types/types';
+import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
+import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
+import type { EventRecord, Hash } from '@polkadot/types/interfaces';
+import type { AnyJson, ISubmittableResult } from '@polkadot/types/types';
 
 import { SubmittableResult } from '@polkadot/api';
 import { ApiBase } from '@polkadot/api/base';

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

@@ -1,18 +1,18 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiTypes, DecorateMethod } from '@polkadot/api/types';
-import { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
-import { AccountId, ContractExecResult, EventRecord } from '@polkadot/types/interfaces';
-import { AnyJson, CodecArg, ISubmittableResult, Registry } from '@polkadot/types/types';
-import { AbiMessage, ContractCallOutcome, ContractOptions, DecodedEvent } from '../types';
-import { ContractCallResult, ContractCallSend, ContractGeneric, ContractQuery, ContractTx, MapMessageQuery, MapMessageTx } from './types';
+import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
+import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
+import type { Bytes } from '@polkadot/types';
+import type { AccountId, ContractExecResult, EventRecord } from '@polkadot/types/interfaces';
+import type { AnyJson, CodecArg, ISubmittableResult, Registry } from '@polkadot/types/types';
+import type { AbiMessage, ContractCallOutcome, ContractOptions, DecodedEvent } from '../types';
+import type { ContractCallResult, ContractCallSend, ContractGeneric, ContractQuery, ContractTx, MapMessageQuery, MapMessageTx } from './types';
 
 import BN from 'bn.js';
 import { map } from 'rxjs/operators';
 import { SubmittableResult } from '@polkadot/api';
 import { ApiBase } from '@polkadot/api/base';
-import { Bytes } from '@polkadot/types';
 import { assert, bnToBn, isFunction, isUndefined, logger, stringCamelCase } from '@polkadot/util';
 
 import { Abi } from '../Abi';

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

@@ -1,14 +1,13 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiTypes, ObsInnerType } from '@polkadot/api/types';
-import { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
-import { AccountId } from '@polkadot/types/interfaces';
-import { CodecArg } from '@polkadot/types/types';
-import { AbiMessage, BlueprintOptions, ContractCallOutcome, ContractOptions } from '../types';
-
-import BN from 'bn.js';
-import { Observable } from 'rxjs';
+import type BN from 'bn.js';
+import type { Observable } from 'rxjs';
+import type { ApiTypes, ObsInnerType } from '@polkadot/api/types';
+import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
+import type { AccountId } from '@polkadot/types/interfaces';
+import type { CodecArg } from '@polkadot/types/types';
+import type { AbiMessage, BlueprintOptions, ContractCallOutcome, ContractOptions } from '../types';
 
 export interface BlueprintDeploy<ApiType extends ApiTypes> {
   (options: BlueprintOptions, ...params: CodecArg[]): SubmittableExtrinsic<ApiType>;

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

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { Hash } from '@polkadot/types/interfaces';
-import { AnyJson } from '@polkadot/types/types';
+import type { Hash } from '@polkadot/types/interfaces';
+import type { AnyJson } from '@polkadot/types/types';
 
 import { ApiPromise } from '@polkadot/api';
 import { decorateMethod } from '@polkadot/api/promise';

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

@@ -1,9 +1,10 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiPromise } from '@polkadot/api';
+import type { ApiPromise } from '@polkadot/api';
+import type { AnyJson } from '@polkadot/types/types';
+
 import { decorateMethod } from '@polkadot/api/promise';
-import { AnyJson } from '@polkadot/types/types';
 
 import { Abi } from '../Abi';
 import { Code as BaseCode } from '../base';

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

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId } from '@polkadot/types/interfaces';
-import { AnyJson } from '@polkadot/types/types';
+import type { AccountId } from '@polkadot/types/interfaces';
+import type { AnyJson } from '@polkadot/types/types';
 
 import { ApiPromise } from '@polkadot/api';
 import { decorateMethod } from '@polkadot/api/promise';

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

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { Hash } from '@polkadot/types/interfaces';
-import { AnyJson } from '@polkadot/types/types';
+import type { Hash } from '@polkadot/types/interfaces';
+import type { AnyJson } from '@polkadot/types/types';
 
 import { ApiRx } from '@polkadot/api';
 import { decorateMethod } from '@polkadot/api/rx';

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

@@ -1,9 +1,9 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AnyJson } from '@polkadot/types/types';
+import type { ApiRx } from '@polkadot/api';
+import type { AnyJson } from '@polkadot/types/types';
 
-import { ApiRx } from '@polkadot/api';
 import { decorateMethod } from '@polkadot/api/rx';
 
 import { Abi } from '../Abi';

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

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId } from '@polkadot/types/interfaces';
-import { AnyJson } from '@polkadot/types/types';
+import type { AccountId } from '@polkadot/types/interfaces';
+import type { AnyJson } from '@polkadot/types/types';
 
 import { ApiRx } from '@polkadot/api';
 import { decorateMethod } from '@polkadot/api/rx';

packages/api-contract/src/types.ts

@@ -1,15 +1,13 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiTypes } from '@polkadot/api/types';
-import { ContractExecResultResult, ContractSelector } from '@polkadot/types/interfaces';
-import { Codec, CodecArg, TypeDef } from '@polkadot/types/types';
-
-import BN from 'bn.js';
-import { ApiBase } from '@polkadot/api/base';
-import { Text, u64 } from '@polkadot/types';
-
-import { Abi } from '.';
+import type BN from 'bn.js';
+import type { ApiBase } from '@polkadot/api/base';
+import type { ApiTypes } from '@polkadot/api/types';
+import type { Text, u64 } from '@polkadot/types';
+import type { ContractExecResultResult, ContractSelector } from '@polkadot/types/interfaces';
+import type { Codec, CodecArg, TypeDef } from '@polkadot/types/types';
+import type { Abi } from '.';
 
 export interface ContractBase<ApiType extends ApiTypes> {
   readonly abi: Abi;

packages/api-contract/src/util.ts

@@ -1,13 +1,13 @@
 // Copyright 2017-2020 @polkadot/rpc-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { SubmittableResult } from '@polkadot/api';
-import { EventRecord } from '@polkadot/types/interfaces';
-import { Codec, CodecArg, Registry, TypeDef } from '@polkadot/types/types';
-import { BlueprintOptions, ContractOptions } from './types';
+import type { SubmittableResult } from '@polkadot/api';
+import type { Raw } from '@polkadot/types';
+import type { EventRecord } from '@polkadot/types/interfaces';
+import type { Codec, CodecArg, Registry, TypeDef } from '@polkadot/types/types';
+import type { BlueprintOptions, ContractOptions } from './types';
 
 import BN from 'bn.js';
-import { Raw } from '@polkadot/types';
 import { createTypeUnsafe } from '@polkadot/types/create';
 import { isBn, isBigInt, isNumber, isString } from '@polkadot/util';
 

packages/api-derive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "2.9.1",
+  "version": "2.10.1",
   "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
   "main": "index.js",
   "sideEffects": false,
@@ -18,9 +18,9 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-derive#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/api": "2.9.1",
-    "@polkadot/rpc-core": "2.9.1",
-    "@polkadot/types": "2.9.1",
+    "@polkadot/api": "2.10.1",
+    "@polkadot/rpc-core": "2.10.1",
+    "@polkadot/types": "2.10.1",
     "@polkadot/util": "^4.2.1",
     "@polkadot/util-crypto": "^4.2.1",
     "bn.js": "^4.11.9",
@@ -29,6 +29,6 @@
   },
   "devDependencies": {
     "@polkadot/keyring": "^4.2.1",
-    "@polkadot/rpc-provider": "2.9.1"
+    "@polkadot/rpc-provider": "2.10.1"
   }
 }

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

@@ -1,9 +1,10 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
+import type { Observable } from 'rxjs';
+import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { isU8a, assertReturn } from '@polkadot/util';

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, Address, Balance } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveAccountFlags } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Vec } from '@polkadot/types';
+import type { AccountId, Address, Balance } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveAccountFlags } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Vec } from '@polkadot/types';
 
 import { memo } from '../util';
 

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

@@ -1,10 +1,11 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
-import { AccountIdAndIndex } from '../types';
+import type { Observable } from 'rxjs';
+import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
+import type { AccountIdAndIndex } from '../types';
 
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { isU8a } from '@polkadot/util';

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

@@ -1,10 +1,10 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, AccountIndex } from '@polkadot/types/interfaces';
-import { AccountIndexes } from '../types';
+import type { Observable } from 'rxjs';
+import type { AccountId, AccountIndex } from '@polkadot/types/interfaces';
+import type { AccountIndexes } from '../types';
 
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 

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

@@ -1,15 +1,16 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, IdentityInfoAdditional, Registration } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveAccountRegistration, DeriveHasIdentity } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Data, Option } from '@polkadot/types';
+import type { AccountId, IdentityInfoAdditional, Registration } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveAccountRegistration, DeriveHasIdentity } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Data, Option } from '@polkadot/types';
-import { u8aToString } from '@polkadot/util';
+import { isHex, u8aToString } from '@polkadot/util';
 
 import { memo } from '../util';
 
@@ -78,15 +79,13 @@ function getParent (api: ApiInterfaceRx, identityOfOpt: Option<Registration> | u
   return of([undefined, undefined]);
 }
 
-export function _identityBase (instanceId: string, api: ApiInterfaceRx): (accountId?: AccountId | Uint8Array | string) => Observable<[Option<Registration> | undefined, Option<ITuple<[AccountId, Data]>> | undefined]> {
-  return memo(instanceId, (accountId?: AccountId | Uint8Array | string): Observable<[Option<Registration> | undefined, Option<ITuple<[AccountId, Data]>> | undefined]> =>
-    accountId && api.query.identity?.identityOf
-      ? api.queryMulti<[Option<Registration>, Option<ITuple<[AccountId, Data]>>]>([
-        [api.query.identity.identityOf, accountId],
-        [api.query.identity.superOf, accountId]
-      ])
-      : of([undefined, undefined])
-  );
+function getBase (api: ApiInterfaceRx, accountId?: AccountId | Uint8Array | string): Observable<[Option<Registration> | undefined, Option<ITuple<[AccountId, Data]>> | undefined]> {
+  return accountId && api.query.identity?.identityOf
+    ? api.queryMulti<[Option<Registration>, Option<ITuple<[AccountId, Data]>>]>([
+      [api.query.identity.identityOf, accountId],
+      [api.query.identity.superOf, accountId]
+    ])
+    : of([undefined, undefined]);
 }
 
 /**
@@ -95,7 +94,7 @@ export function _identityBase (instanceId: string, api: ApiInterfaceRx): (accoun
  */
 export function identity (instanceId: string, api: ApiInterfaceRx): (accountId?: AccountId | Uint8Array | string) => Observable<DeriveAccountRegistration> {
   return memo(instanceId, (accountId?: AccountId | Uint8Array | string): Observable<DeriveAccountRegistration> =>
-    api.derive.accounts._identityBase(accountId).pipe(
+    getBase(api, accountId).pipe(
       switchMap(([identityOfOpt, superOfOpt]) => getParent(api, identityOfOpt, superOfOpt)),
       map(([identityOfOpt, superOf]) => extractIdentity(identityOfOpt, superOf))
     )
@@ -104,23 +103,39 @@ export function identity (instanceId: string, api: ApiInterfaceRx): (accountId?:
 
 export function hasIdentity (instanceId: string, api: ApiInterfaceRx): (accountId: AccountId | Uint8Array | string) => Observable<DeriveHasIdentity> {
   return memo(instanceId, (accountId: AccountId | Uint8Array | string): Observable<DeriveHasIdentity> =>
-    api.derive.accounts._identityBase(accountId).pipe(
-      map(([identityOfOpt, superOfOpt]: [Option<Registration> | undefined, Option<ITuple<[AccountId, Data]>> | undefined]): DeriveHasIdentity => {
-        const parentId = superOfOpt && superOfOpt.isSome
-          ? superOfOpt.unwrap()[0].toString()
-          : null;
-        const hasIdentity = !!parentId || !!(identityOfOpt && identityOfOpt.isSome);
-
-        return { hasIdentity, parentId };
-      })
+    api.derive.accounts.hasIdentityMulti([accountId]).pipe(
+      map(([first]) => first)
     )
   );
 }
 
 export function hasIdentityMulti (instanceId: string, api: ApiInterfaceRx): (accountIds: (AccountId | Uint8Array | string)[]) => Observable<DeriveHasIdentity[]> {
   return memo(instanceId, (accountIds: (AccountId | Uint8Array | string)[]): Observable<DeriveHasIdentity[]> =>
-    combineLatest(
-      accountIds.map((accountId) => api.derive.accounts.hasIdentity(accountId))
-    )
+    api.query.identity?.identityOf
+      ? combineLatest([
+        api.query.identity.identityOf.multi<Option<Registration>>(accountIds),
+        api.query.identity.superOf.multi<Option<ITuple<[AccountId, Data]>>>(accountIds)
+      ]).pipe(
+        map(([identities, supers]) =>
+          identities.map((identityOfOpt, index): DeriveHasIdentity => {
+            const superOfOpt = supers[index];
+            const parentId = superOfOpt && superOfOpt.isSome
+              ? superOfOpt.unwrap()[0].toString()
+              : undefined;
+            let display: string | undefined;
+
+            if (identityOfOpt && identityOfOpt.isSome) {
+              const value = dataAsString(identityOfOpt.unwrap().info.display);
+
+              if (value && !isHex(value)) {
+                display = value;
+              }
+            }
+
+            return { display, hasIdentity: !!(display || parentId), parentId };
+          })
+        )
+      )
+      : of(accountIds.map(() => ({ hasIdentity: false })))
   );
 }

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, AccountIndex, BalanceOf } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
+import type { Observable } from 'rxjs';
+import type { Option, Vec } from '@polkadot/types';
+import type { AccountId, AccountIndex, BalanceOf } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
 
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { ENUMSET_SIZE } from '@polkadot/types/generic/AccountIndex';
-import { Option, Vec } from '@polkadot/types';
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, AccountIndex } from '@polkadot/types/interfaces';
-import { AccountIndexes } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Vec } from '@polkadot/types';
+import type { AccountId, AccountIndex } from '@polkadot/types/interfaces';
+import type { AccountIndexes } from '../types';
 
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map, startWith, switchMap } from 'rxjs/operators';
 import { ENUMSET_SIZE } from '@polkadot/types/generic/AccountIndex';
-import { Vec } from '@polkadot/types';
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, AccountIndex, Address, Balance } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveAccountInfo, DeriveAccountRegistration } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Bytes, Option, u32 } from '@polkadot/types';
+import type { AccountId, AccountIndex, Address, Balance } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveAccountInfo, DeriveAccountRegistration } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Bytes, Option, u32 } from '@polkadot/types';
 import { u8aToString } from '@polkadot/util';
 
 import { memo } from '../util';

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

@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, AccountIndex, RegistrationJudgement } from '@polkadot/types/interfaces';
+import type { AccountId, AccountIndex, RegistrationJudgement } from '@polkadot/types/interfaces';
 
 export type AccountIdAndIndex = [AccountId?, AccountIndex?];
 
@@ -37,6 +37,7 @@ export interface DeriveAccountInfo {
 }
 
 export interface DeriveHasIdentity {
+  display?: string;
   hasIdentity: boolean;
-  parentId: string | null;
+  parentId?: string;
 }

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

@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, AccountData, AccountIndex, AccountInfo, Address, Balance, Index } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveBalancesAccount } from '../types';
+import type { Observable } from 'rxjs';
+import type { AccountId, AccountData, AccountIndex, AccountInfo, Address, Balance, Index } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveBalancesAccount } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { isFunction } from '@polkadot/util';

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, AccountIndex, Address, Balance, BalanceLock, BalanceLockTo212, BlockNumber, VestingInfo, VestingSchedule } from '@polkadot/types/interfaces';
-import { DeriveBalancesAccount, DeriveBalancesAll } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option, Vec } from '@polkadot/types';
+import type { AccountId, AccountIndex, Address, Balance, BalanceLock, BalanceLockTo212, BlockNumber, VestingInfo, VestingSchedule } from '@polkadot/types/interfaces';
+import type { DeriveBalancesAccount, DeriveBalancesAll } from '../types';
 
 import BN from 'bn.js';
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Option, Vec } from '@polkadot/types';
 import { bnMax, isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

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

@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Balance } from '@polkadot/types/interfaces';
-import { DeriveFees } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Balance } from '@polkadot/types/interfaces';
+import type { DeriveFees } from '../types';
 
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { memo } from '../util';

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

@@ -1,10 +1,11 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
-import { DeriveBalancesAccount } from '../types';
+import type { Observable } from 'rxjs';
+import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
+import type { DeriveBalancesAccount } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';

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

@@ -1,9 +1,9 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { BlockNumber } from '@polkadot/types/interfaces';
+import type { Observable } from 'rxjs';
+import type { BlockNumber } from '@polkadot/types/interfaces';
 
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 

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

@@ -1,9 +1,9 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { BlockNumber } from '@polkadot/types/interfaces';
+import type { Observable } from 'rxjs';
+import type { BlockNumber } from '@polkadot/types/interfaces';
 
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 

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

@@ -1,9 +1,10 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { BlockNumber } from '@polkadot/types/interfaces';
+import type { Observable } from 'rxjs';
+import type { BlockNumber } from '@polkadot/types/interfaces';
 
-import { Observable, combineLatest } from 'rxjs';
+import { combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 

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

@@ -1,9 +1,10 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
 import { SignedBlockExtended } from '../type';

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

@@ -1,9 +1,10 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
 import { HeaderExtended } from '../type';

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

@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { EventRecord, Hash, SignedBlock } from '@polkadot/types/interfaces';
-import { FullNewBlock } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { EventRecord, Hash, SignedBlock } from '@polkadot/types/interfaces';
+import type { FullNewBlock } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
 import { memo } from '../util';

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

@@ -1,9 +1,10 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { HeaderExtended } from '../type';

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

@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { Block, BlockNumber, EventRecord, Hash, Justification } from '@polkadot/types/interfaces';
+import type { Block, BlockNumber, EventRecord, Hash, Justification } from '@polkadot/types/interfaces';
 
 export interface FullNewBlock {
   block: Block;

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

@@ -1,13 +1,14 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Hash, Proposal, Votes } from '@polkadot/types/interfaces';
-import { DeriveCollectiveProposal } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option } from '@polkadot/types';
+import type { Hash, Proposal, Votes } from '@polkadot/types/interfaces';
+import type { DeriveCollectiveProposal } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
-import { Option } from '@polkadot/types';
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

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

@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { DeriveContractFees } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { DeriveContractFees } from '../types';
 
 import BN from 'bn.js';
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { memo } from '../util';

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

@@ -1,11 +1,11 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Hash } from '@polkadot/types/interfaces';
-import { DeriveCollectiveProposal } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Hash } from '@polkadot/types/interfaces';
+import type { DeriveCollectiveProposal } from '../types';
 
-import { Observable } from 'rxjs';
 import { proposal as collectiveProposal, proposals as collectiveProposals } from '../collective';
 import { memo } from '../util';
 

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

@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, Balance } from '@polkadot/types/interfaces';
+import type { AccountId, Balance } from '@polkadot/types/interfaces';
 
 export interface DeriveCouncilVote {
   stake: Balance;

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, Balance } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { DeriveCouncilVote, DeriveCouncilVotes } from '../types';
+import type { Observable } from 'rxjs';
+import type { Vec } from '@polkadot/types';
+import type { AccountId, Balance } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { DeriveCouncilVote, DeriveCouncilVotes } from '../types';
 
-import { Observable, combineLatest } from 'rxjs';
+import { combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Vec } from '@polkadot/types';
 
 import { memo } from '../util';
 

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

@@ -1,11 +1,11 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId } from '@polkadot/types/interfaces';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { DeriveCouncilVote } from '../types';
+import type { Observable } from 'rxjs';
+import type { AccountId } from '@polkadot/types/interfaces';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { DeriveCouncilVote } from '../types';
 
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { memo } from '../util';
 

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { BlockNumber, Hash, ReferendumIndex, Scheduled } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveDispatch, DeriveProposalImage } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option, Vec, u64 } from '@polkadot/types';
+import type { BlockNumber, Hash, ReferendumIndex, Scheduled } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveDispatch, DeriveProposalImage } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Option, Vec, u64 } from '@polkadot/types';
 import { isFunction, stringToHex } from '@polkadot/util';
 
 import { memo } from '../util';

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, ReferendumInfo, ReferendumInfoFinished, ReferendumInfoTo239, Vote, VotingDelegating, VotingDirect, VotingDirectVote } from '@polkadot/types/interfaces';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { DeriveDemocracyLock } from '../types';
+import type { Observable } from 'rxjs';
+import type { Option } from '@polkadot/types';
+import type { AccountId, ReferendumInfo, ReferendumInfoFinished, ReferendumInfoTo239, Vote, VotingDelegating, VotingDirect, VotingDirectVote } from '@polkadot/types/interfaces';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { DeriveDemocracyLock } from '../types';
 
 import BN from 'bn.js';
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Option } from '@polkadot/types';
 import { BN_ZERO, isUndefined } from '@polkadot/util';
 
 import { memo } from '../util';

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { Hash, VoteThreshold } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveProposalExternal } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option } from '@polkadot/types';
+import type { Hash, VoteThreshold } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveProposalExternal } from '../types';
 
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Option } from '@polkadot/types';
 
 import { memo } from '../util';
 

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

@@ -1,14 +1,14 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, Balance, BlockNumber, Hash } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { DeriveProposalImage } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Bytes, Option } from '@polkadot/types';
+import type { AccountId, Balance, BlockNumber, Hash } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveProposalImage } from '../types';
 
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Bytes, Option } from '@polkadot/types';
 
 import { memo } from '../util';
 import { parseImage } from './util';

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

@@ -1,14 +1,14 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, Balance, BlockNumber, Hash } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { DeriveProposalImage } from '../types';
+import type { Observable } from 'rxjs';
+import type { Bytes, Option } from '@polkadot/types';
+import type { AccountId, Balance, BlockNumber, Hash } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { DeriveProposalImage } from '../types';
 
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Bytes, Option } from '@polkadot/types';
 
 import { memo } from '../util';
 import { parseImage } from './util';

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, Balance, Hash, PropIndex } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveProposalImage, DeriveProposal } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option, Vec } from '@polkadot/types';
+import type { AccountId, Balance, Hash, PropIndex } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveProposalImage, DeriveProposal } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Option, Vec } from '@polkadot/types';
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

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

@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { ReferendumIndex } from '@polkadot/types/interfaces';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { ReferendumIndex } from '@polkadot/types/interfaces';
 
 import BN from 'bn.js';
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { memo } from '../util';

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

@@ -1,10 +1,11 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { DeriveReferendumExt } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { DeriveReferendumExt } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
 import { memo } from '../util';

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

@@ -1,10 +1,11 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { DeriveReferendum } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { DeriveReferendum } from '../types';
 
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
 import { memo } from '../util';

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

@@ -1,12 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { ReferendumInfo, ReferendumInfoFinished } from '@polkadot/types/interfaces';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option } from '@polkadot/types';
+import type { ReferendumInfo, ReferendumInfoFinished } from '@polkadot/types/interfaces';
 
-import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Option } from '@polkadot/types';
 
 import { memo } from '../util';
 

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, ReferendumInfo, ReferendumInfoTo239, Vote, Voting, VotingDirectVote, VotingDelegating } from '@polkadot/types/interfaces';
-import { DeriveBalancesAccount, DeriveReferendum, DeriveReferendumVote, DeriveReferendumVotes } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option, Vec } from '@polkadot/types';
+import type { AccountId, ReferendumInfo, ReferendumInfoTo239, Vote, Voting, VotingDirectVote, VotingDelegating } from '@polkadot/types/interfaces';
+import type { DeriveBalancesAccount, DeriveReferendum, DeriveReferendumVote, DeriveReferendumVotes } from '../types';
 
 import BN from 'bn.js';
-import { Observable, of, combineLatest } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Option, Vec } from '@polkadot/types';
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

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

@@ -1,10 +1,10 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import BN from 'bn.js';
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { bnSqrt } from '@polkadot/util';
 

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

@@ -2,9 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type BN from 'bn.js';
-import { AccountId, Balance, BlockNumber, Hash, Proposal, PropIndex, ReferendumInfoTo239, ReferendumStatus, Vote, ReferendumIndex, VoteThreshold } from '@polkadot/types/interfaces';
-
-import { Vec } from '@polkadot/types';
+import type { Vec } from '@polkadot/types';
+import type { AccountId, Balance, BlockNumber, Hash, Proposal, PropIndex, ReferendumInfoTo239, ReferendumStatus, Vote, ReferendumIndex, VoteThreshold } from '@polkadot/types/interfaces';
 
 export interface DeriveDemocracyLock {
   balance: Balance;

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

@@ -1,13 +1,13 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, Balance, BlockNumber, PreimageStatus, Proposal, ReferendumInfo, ReferendumInfoTo239, ReferendumStatus, Tally, VoteThreshold } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveProposalImage, DeriveReferendum, DeriveReferendumVote, DeriveReferendumVotes, DeriveReferendumVoteState } from '../types';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Bytes, Option } from '@polkadot/types';
+import type { AccountId, Balance, BlockNumber, PreimageStatus, Proposal, ReferendumInfo, ReferendumInfoTo239, ReferendumStatus, Tally, VoteThreshold } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveProposalImage, DeriveReferendum, DeriveReferendumVote, DeriveReferendumVotes, DeriveReferendumVoteState } from '../types';
 
 import BN from 'bn.js';
-import { Bytes, Option } from '@polkadot/types';
 import { bnSqrt } from '@polkadot/util';
 
 type PreimageInfo = [Bytes, AccountId, Balance, BlockNumber];

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

@@ -1,14 +1,14 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, Balance, BlockNumber } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveElectionsInfo } from './types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Vec, u32 } from '@polkadot/types';
+import type { AccountId, Balance, BlockNumber } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveElectionsInfo } from './types';
 
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Vec, u32 } from '@polkadot/types';
 
 import { memo } from '../util';
 

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

@@ -1,9 +1,8 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, Balance, BlockNumber, SetIndex, VoteIndex } from '@polkadot/types/interfaces';
-
-import { u32 } from '@polkadot/types';
+import type { AccountId, Balance, BlockNumber, SetIndex, VoteIndex } from '@polkadot/types/interfaces';
+import type { u32 } from '@polkadot/types';
 
 export interface DeriveElectionsInfo {
   candidates: AccountId[];

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

@@ -1,13 +1,14 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId } from '@polkadot/types/interfaces';
-import { DeriveHeartbeats } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Bytes, Option, u32 } from '@polkadot/types';
+import type { AccountId } from '@polkadot/types/interfaces';
+import type { DeriveHeartbeats } from '../types';
 
-import { Observable, of, combineLatest } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Bytes, Option, u32 } from '@polkadot/types';
 import { BN_ZERO } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/index.ts

@@ -1,10 +1,9 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AnyFunction } from '@polkadot/types/types';
-
-import { Observable } from 'rxjs';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { AnyFunction } from '@polkadot/types/types';
 
 import * as accounts from './accounts';
 import * as balances from './balances';

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

@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { CollatorId, ParaId } from '@polkadot/types/interfaces';
-import { DeriveParachainInfo, DeriveParachainFull, DeriveParachainActive } from '../types';
-import { Active, DidUpdate, Heads, ParaInfoResult, PendingSwap, RelayDispatchQueue, RetryQueue, SelectedThreads } from './types';
+import type { Observable } from 'rxjs';
+import type { CollatorId, ParaId } from '@polkadot/types/interfaces';
+import type { DeriveParachainInfo, DeriveParachainFull, DeriveParachainActive } from '../types';
+import type { Active, DidUpdate, Heads, ParaInfoResult, PendingSwap, RelayDispatchQueue, RetryQueue, SelectedThreads } from './types';
 
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 

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

@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ParaId } from '@polkadot/types/interfaces';
-import { DeriveParachain, DeriveParachainInfo } from '../types';
-import { DidUpdate, ParaInfoResult, PendingSwap, RelayDispatchQueueSize } from './types';
+import type { Observable } from 'rxjs';
+import type { ParaId } from '@polkadot/types/interfaces';
+import type { DeriveParachain, DeriveParachainInfo } from '../types';
+import type { DidUpdate, ParaInfoResult, PendingSwap, RelayDispatchQueueSize } from './types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 

packages/api-derive/src/parachains/types.ts

@@ -1,10 +1,9 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { CollatorId, ParaId, ParaInfo, Retriable, UpwardMessage } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-
-import { Bytes, Option, u32, Vec } from '@polkadot/types';
+import type { CollatorId, ParaId, ParaInfo, Retriable, UpwardMessage } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { Bytes, Option, u32, Vec } from '@polkadot/types';
 
 export type ParaInfoResult = Option<ParaInfo>;
 export type PendingSwap = Option<ParaId>;

packages/api-derive/src/parachains/util.ts

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ParaId } from '@polkadot/types/interfaces';
-import { DidUpdate } from './types';
+import type { ParaId } from '@polkadot/types/interfaces';
+import type { DidUpdate } from './types';
 
 export function didUpdateToBool (didUpdate: DidUpdate, id: ParaId): boolean {
   return didUpdate.isSome

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

@@ -1,9 +1,9 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { BlockNumber } from '@polkadot/types/interfaces';
+import type { Observable } from 'rxjs';
+import type { BlockNumber } from '@polkadot/types/interfaces';
 
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 

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

@@ -1,9 +1,9 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { BlockNumber } from '@polkadot/types/interfaces';
+import type { Observable } from 'rxjs';
+import type { BlockNumber } from '@polkadot/types/interfaces';
 
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 

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

@@ -1,13 +1,14 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { ActiveEraInfo, EraIndex, Moment, SessionIndex } from '@polkadot/types/interfaces';
-import { DeriveSessionIndexes } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option, u32 } from '@polkadot/types';
+import type { ActiveEraInfo, EraIndex, Moment, SessionIndex } from '@polkadot/types/interfaces';
+import type { DeriveSessionIndexes } from '../types';
 
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Option, u32 } from '@polkadot/types';
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

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

@@ -1,13 +1,13 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { SessionIndex } from '@polkadot/types/interfaces';
-import { DeriveSessionInfo, DeriveSessionIndexes } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { u64 } from '@polkadot/types';
+import type { SessionIndex } from '@polkadot/types/interfaces';
+import type { DeriveSessionInfo, DeriveSessionIndexes } from '../types';
 
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { u64 } from '@polkadot/types';
 
 import { memo } from '../util';
 

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

@@ -1,13 +1,14 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { SessionIndex } from '@polkadot/types/interfaces';
-import { DeriveSessionInfo, DeriveSessionProgress } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option, u64 } from '@polkadot/types';
+import type { SessionIndex } from '@polkadot/types/interfaces';
+import type { DeriveSessionInfo, DeriveSessionProgress } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Option, u64 } from '@polkadot/types';
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

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

@@ -1,9 +1,9 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { BlockNumber } from '@polkadot/types/interfaces';
+import type { Observable } from 'rxjs';
+import type { BlockNumber } from '@polkadot/types/interfaces';
 
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 

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

@@ -1,9 +1,8 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { BlockNumber, EraIndex, Moment, SessionIndex } from '@polkadot/types/interfaces';
-
-import { Option, u32 } from '@polkadot/types';
+import type { BlockNumber, EraIndex, Moment, SessionIndex } from '@polkadot/types/interfaces';
+import type { Option, u32 } from '@polkadot/types';
 
 export interface DeriveSessionIndexes {
   activeEra: EraIndex;

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-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 type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option, Vec } from '@polkadot/types';
+import type { AccountId, BalanceOf, Bid, BidKind } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveSocietyCandidate } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Option, Vec } from '@polkadot/types';
 
 import { memo } from '../util';
 

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

@@ -1,13 +1,13 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, BalanceOf, Bid } from '@polkadot/types/interfaces';
-import { DeriveSociety } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option, Vec, u32 } from '@polkadot/types';
+import type { AccountId, BalanceOf, Bid } from '@polkadot/types/interfaces';
+import type { DeriveSociety } from '../types';
 
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Option, Vec, u32 } from '@polkadot/types';
 
 import { memo } from '../util';
 

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

@@ -1,14 +1,14 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-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 type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { bool, Option, Vec } from '@polkadot/types';
+import type { AccountId, Balance, BlockNumber, SocietyVote, StrikeCount, VouchingStatus } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveSocietyMember } from '../types';
 
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { bool, Option, Vec } from '@polkadot/types';
 
 import { memo } from '../util';
 

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

@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId } from '@polkadot/types/interfaces';
-import { DeriveSocietyMember } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { AccountId } from '@polkadot/types/interfaces';
+import type { DeriveSocietyMember } from '../types';
 
-import { Observable, combineLatest } from 'rxjs';
+import { combineLatest } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
 import { memo } from '../util';

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

@@ -1,9 +1,9 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Balance, StakingLedger, UnlockChunk } from '@polkadot/types/interfaces';
-import { DeriveSessionInfo, DeriveStakingAccount, DeriveStakingKeys, DeriveStakingQuery, DeriveUnlocking } from '../types';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Balance, StakingLedger, UnlockChunk } from '@polkadot/types/interfaces';
+import type { DeriveSessionInfo, DeriveStakingAccount, DeriveStakingKeys, DeriveStakingQuery, DeriveUnlocking } from '../types';
 
 import BN from 'bn.js';
 import { combineLatest, Observable } from 'rxjs';
@@ -12,6 +12,13 @@ import { BN_ZERO } from '@polkadot/util';
 
 import { memo } from '../util';
 
+const QUERY_OPTS = {
+  withDestination: true,
+  withLedger: true,
+  withNominations: true,
+  withPrefs: true
+};
+
 function groupByEra (list: UnlockChunk[]): Record<string, BN> {
   return list.reduce((map: Record<string, BN>, { era, value }): Record<string, BN> => {
     const key = era.toString();
@@ -63,7 +70,7 @@ export function accounts (instanceId: string, api: ApiInterfaceRx): (accountIds:
       switchMap((sessionInfo) =>
         combineLatest([
           api.derive.staking.keysMulti(accountIds),
-          api.derive.staking.queryMulti(accountIds)
+          api.derive.staking.queryMulti(accountIds, QUERY_OPTS)
         ]).pipe(
           map(([keys, queries]) => queries.map((query, index) => parseResult(api, sessionInfo, keys[index], query)))
         )

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

@@ -1,10 +1,11 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, EraPoints, EraRewardPoints, RewardPoint } from '@polkadot/types/interfaces';
-import { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Observable } from 'rxjs';
+import type { AccountId, EraPoints, EraRewardPoints, RewardPoint } from '@polkadot/types/interfaces';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
 import { memo } from '../util';

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

@@ -1,11 +1,11 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId } from '@polkadot/types/interfaces';
-import { DeriveStakingElected } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { AccountId } from '@polkadot/types/interfaces';
+import type { DeriveStakingElected } from '../types';
 
-import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
 import { memo } from '../util';
@@ -18,7 +18,7 @@ export function electedInfo (instanceId: string, api: ApiInterfaceRx): () => Obs
   return memo(instanceId, (): Observable<DeriveStakingElected> =>
     api.derive.staking.validators().pipe(
       switchMap(({ nextElected, validators }): Observable<DeriveStakingElected> =>
-        api.derive.staking.queryMulti(combineAccounts(nextElected, validators)).pipe(
+        api.derive.staking.queryMulti(combineAccounts(nextElected, validators), { withExposure: true, withLedger: true, withPrefs: true }).pipe(
           map((info): DeriveStakingElected => ({
             info,
             nextElected,

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

@@ -1,13 +1,14 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { EraIndex, Exposure } from '@polkadot/types/interfaces';
-import { DeriveEraExposure, DeriveEraNominatorExposure, DeriveEraValidatorExposure } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { StorageKey } from '@polkadot/types';
+import type { EraIndex, Exposure } from '@polkadot/types/interfaces';
+import type { DeriveEraExposure, DeriveEraNominatorExposure, DeriveEraValidatorExposure } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { StorageKey } from '@polkadot/types';
 
 import { deriveCache, memo } from '../util';
 

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

@@ -1,13 +1,14 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { ActiveEraInfo, EraIndex } from '@polkadot/types/interfaces';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option, u32 } from '@polkadot/types';
+import type { ActiveEraInfo, EraIndex } from '@polkadot/types/interfaces';
 
 import BN from 'bn.js';
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Option, u32 } from '@polkadot/types';
 
 import { memo } from '../util';
 

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

@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { EraIndex, EraRewardPoints } from '@polkadot/types/interfaces';
-import { DeriveEraPoints, DeriveEraValPoints } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { EraIndex, EraRewardPoints } from '@polkadot/types/interfaces';
+import type { DeriveEraPoints, DeriveEraValPoints } from '../types';
 
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { BN_ZERO } from '@polkadot/util';
 

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

@@ -1,13 +1,14 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { EraIndex, ValidatorPrefs } from '@polkadot/types/interfaces';
-import { DeriveEraPrefs, DeriveEraValPrefs } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { StorageKey } from '@polkadot/types';
+import type { EraIndex, ValidatorPrefs } from '@polkadot/types/interfaces';
+import type { DeriveEraPrefs, DeriveEraValPrefs } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { StorageKey } from '@polkadot/types';
 
 import { deriveCache, memo } from '../util';
 

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

@@ -1,13 +1,14 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Balance, EraIndex } from '@polkadot/types/interfaces';
-import { DeriveEraRewards } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option } from '@polkadot/types';
+import type { Balance, EraIndex } from '@polkadot/types/interfaces';
+import type { DeriveEraRewards } from '../types';
 
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Option } from '@polkadot/types';
 
 import { deriveCache, memo } from '../util';
 import { filterEras } from './util';

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { BalanceOf, EraIndex, Perbill } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveEraSlashes, DeriveEraValSlash } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option, StorageKey } from '@polkadot/types';
+import type { BalanceOf, EraIndex, Perbill } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveEraSlashes, DeriveEraValSlash } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Option, StorageKey } from '@polkadot/types';
 
 import { deriveCache, memo } from '../util';
 

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

@@ -22,5 +22,4 @@ export * from './stakerRewards';
 export * from './stakerSlashes';
 export * from './stashes';
 export * from './validators';
-export * from './validatorsFrom';
 export * from './waitingInfo';

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, Keys } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveStakingKeys } from './types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option, Vec } from '@polkadot/types';
+import type { AccountId, Keys } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveStakingKeys } from './types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Option, Vec } from '@polkadot/types';
 
 import { memo } from '../util';
 

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

@@ -1,10 +1,11 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { DeriveStakingOverview } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { DeriveStakingOverview } from '../types';
 
-import { Observable, combineLatest } from 'rxjs';
+import { combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { memo } from '../util';

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

@@ -1,11 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { EraIndex, Exposure } from '@polkadot/types/interfaces';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { DeriveOwnExposure } from '../types';
+import type { Observable } from 'rxjs';
+import type { EraIndex, Exposure } from '@polkadot/types/interfaces';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { DeriveOwnExposure } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
 import { deriveCache, memo } from '../util';

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

@@ -1,14 +1,15 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { BalanceOf, EraIndex, Perbill } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveStakerSlashes } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option } from '@polkadot/types';
+import type { BalanceOf, EraIndex, Perbill } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveStakerSlashes } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Option } from '@polkadot/types';
 
 import { deriveCache, memo } from '../util';
 

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

@@ -1,26 +1,37 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, EraIndex, Exposure, Nominations, RewardDestination, StakingLedger, ValidatorPrefs } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveStakingQuery } from '../types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option } from '@polkadot/types';
+import type { AccountId, EraIndex, Exposure, Nominations, RewardDestination, StakingLedger, ValidatorPrefs } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { DeriveStakingQuery } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
+import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Option } from '@polkadot/types';
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';
 
+interface QueryFlags {
+  withDestination?: boolean;
+  withExposure?: boolean;
+  withLedger?: boolean;
+  withNominations?: boolean;
+  withPrefs?: boolean;
+}
+
 type MultiResult = [Option<AccountId>, Option<ITuple<[Nominations]> | Nominations>, RewardDestination, ITuple<[ValidatorPrefs]> | ValidatorPrefs, Exposure];
 
-function parseController (stashId: AccountId, [controllerIdOpt, nominatorsOpt, rewardDestination, validatorPrefs, exposure]: MultiResult, stakingLedgerOpt: Option<StakingLedger>): DeriveStakingQuery {
-  const nominators = nominatorsOpt.unwrapOr(null);
+type MultiResultCombo = [Option<AccountId>, Option<Nominations>, RewardDestination, ValidatorPrefs, Exposure];
+
+function parseDetails (stashId: AccountId, [controllerIdOpt, nominatorsOpt, rewardDestination, validatorPrefs, exposure]: MultiResult, stakingLedgerOpt: Option<StakingLedger>): DeriveStakingQuery {
+  const nominators = nominatorsOpt && nominatorsOpt.unwrapOr(null);
 
   return {
     accountId: stashId,
-    controllerId: controllerIdOpt.unwrapOr(null),
+    controllerId: controllerIdOpt && controllerIdOpt.unwrapOr(null),
     exposure,
     nominators: nominators
       ? Array.isArray(nominators)
@@ -46,18 +57,32 @@ function retrievePrev (api: ApiInterfaceRx, stashId: AccountId): Observable<Mult
   ]);
 }
 
-function retrieveCurr (api: ApiInterfaceRx, stashIds: AccountId[], activeEra: EraIndex): Observable<MultiResult[]> {
+function retrieveCurr (api: ApiInterfaceRx, stashIds: AccountId[], activeEra: EraIndex, { withDestination, withExposure, withLedger, withNominations, withPrefs }: QueryFlags): Observable<MultiResultCombo[]> {
+  const emptyCont = api.registry.createType('Option<AccountId>');
+  const emptyNoms = api.registry.createType('Option<Nominations>');
+  const emptyRewa = api.registry.createType('RewardDestination');
+  const emptyExpo = api.registry.createType('Exposure');
+  const emptyPrefs = api.registry.createType('ValidatorPrefs');
+
   return combineLatest([
-    api.query.staking.bonded.multi<Option<AccountId>>(stashIds),
-    api.query.staking.nominators
+    withLedger
+      ? api.query.staking.bonded.multi<Option<AccountId>>(stashIds)
+      : of(stashIds.map(() => emptyCont)),
+    withNominations && api.query.staking.nominators
       ? api.query.staking.nominators.multi<Option<Nominations>>(stashIds)
-      : of(stashIds.map(() => api.registry.createType('Option<Nominations>'))),
-    api.query.staking.payee.multi<RewardDestination>(stashIds),
-    api.query.staking.validators.multi<ValidatorPrefs>(stashIds),
-    api.query.staking.erasStakers.multi<Exposure>(stashIds.map((stashId) => [activeEra, stashId]))
+      : of(stashIds.map(() => emptyNoms)),
+    withDestination
+      ? api.query.staking.payee.multi<RewardDestination>(stashIds)
+      : of(stashIds.map(() => emptyRewa)),
+    withPrefs
+      ? api.query.staking.validators.multi<ValidatorPrefs>(stashIds)
+      : of(stashIds.map(() => emptyPrefs)),
+    withExposure
+      ? api.query.staking.erasStakers.multi<Exposure>(stashIds.map((stashId) => [activeEra, stashId]))
+      : of(stashIds.map(() => emptyExpo))
   ]).pipe(
-    map(([controllerIdOpt, nominatorsOpt, rewardDestination, validatorPrefs, exposure]): MultiResult[] =>
-      controllerIdOpt.map((controllerIdOpt, index): MultiResult =>
+    map(([controllerIdOpt, nominatorsOpt, rewardDestination, validatorPrefs, exposure]): MultiResultCombo[] =>
+      controllerIdOpt.map((controllerIdOpt, index): MultiResultCombo =>
         [controllerIdOpt, nominatorsOpt[index], rewardDestination[index], validatorPrefs[index], exposure[index]]
       )
     )
@@ -66,9 +91,10 @@ function retrieveCurr (api: ApiInterfaceRx, stashIds: AccountId[], activeEra: Er
 
 function retrieveControllers (api: ApiInterfaceRx, optControllerIds: Option<AccountId>[]): Observable<Option<StakingLedger>[]> {
   const ids = optControllerIds.filter((opt) => opt.isSome).map((opt) => opt.unwrap());
+  const emptyLed = api.registry.createType('Option<StakingLedger>');
 
   if (!ids.length) {
-    return of(optControllerIds.map(() => api.registry.createType('Option<StakingLedger>')));
+    return of(optControllerIds.map(() => emptyLed));
   }
 
   return api.query.staking.ledger.multi<Option<StakingLedger>>(ids).pipe(
@@ -78,7 +104,7 @@ function retrieveControllers (api: ApiInterfaceRx, optControllerIds: Option<Acco
       return optControllerIds.map((opt): Option<StakingLedger> =>
         opt.isSome
           ? optLedgers[++offset]
-          : api.registry.createType('Option<StakingLedger>')
+          : emptyLed
       );
     })
   );
@@ -87,16 +113,16 @@ function retrieveControllers (api: ApiInterfaceRx, optControllerIds: Option<Acco
 /**
  * @description From a stash, retrieve the controllerId and all relevant details
  */
-export function query (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string) => Observable<DeriveStakingQuery> {
-  return memo(instanceId, (accountId: Uint8Array | string): Observable<DeriveStakingQuery> =>
-    api.derive.staking.queryMulti([accountId]).pipe(
+export function query (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, flags: QueryFlags) => Observable<DeriveStakingQuery> {
+  return memo(instanceId, (accountId: Uint8Array | string, flags: QueryFlags): Observable<DeriveStakingQuery> =>
+    api.derive.staking.queryMulti([accountId], flags).pipe(
       map(([first]) => first)
     )
   );
 }
 
-export function queryMulti (instanceId: string, api: ApiInterfaceRx): (accountIds: (Uint8Array | string)[]) => Observable<DeriveStakingQuery[]> {
-  return memo(instanceId, (accountIds: (Uint8Array | string)[]): Observable<DeriveStakingQuery[]> =>
+export function queryMulti (instanceId: string, api: ApiInterfaceRx): (accountIds: (Uint8Array | string)[], flags: QueryFlags) => Observable<DeriveStakingQuery[]> {
+  return memo(instanceId, (accountIds: (Uint8Array | string)[], flags: QueryFlags): Observable<DeriveStakingQuery[]> =>
     accountIds.length
       ? api.derive.session.indexes().pipe(
         switchMap(({ activeEra }): Observable<DeriveStakingQuery[]> => {
@@ -104,13 +130,13 @@ export function queryMulti (instanceId: string, api: ApiInterfaceRx): (accountId
 
           return (
             isFunction(api.query.staking.erasStakers)
-              ? retrieveCurr(api, stashIds, activeEra)
+              ? retrieveCurr(api, stashIds, activeEra, flags)
               : combineLatest(stashIds.map((stashId) => retrievePrev(api, stashId)))
           ).pipe(
             switchMap((results): Observable<DeriveStakingQuery[]> =>
               retrieveControllers(api, results.map(([optController]) => optController)).pipe(
                 map((stakingLedgerOpts) =>
-                  stashIds.map((stashId, index) => parseController(stashId, results[index], stakingLedgerOpts[index]))
+                  stashIds.map((stashId, index) => parseDetails(stashId, results[index], stakingLedgerOpts[index]))
                 )
               )
             )