[CI Skip] release/stable 6.1.2

skip-checks: true
6.1.2 (#4001 )
2021-09-29 08:08:58 +00:00 · 2021-09-29 09:50:25 +02:00 · 2021-09-29 06:08:50 +00:00 · 2021-09-29 07:46:13 +02:00 · 2021-09-27 11:20:10 +00:00 · 2021-09-27 13:02:18 +02:00
581 changed files with 186297 additions and 15764 deletions
@@ -1,4 +1,4 @@
-30
+33
 1.4.2
 1.6.2
 1.11.2
@@ -23,3 +23,15 @@
 4.7.2
 4.9.2
 4.11.2
+4.16.2
+
+5.3.2
+5.5.2
+5.8.2
+5.8.3
+
+6.0.2
+6.0.3
+6.0.4
+6.0.5
+6.1.2
@@ -10,4 +10,4 @@ plugins:
  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
    spec: "@yarnpkg/plugin-version"

-yarnPath: .yarn/releases/yarn-3.0.0-rc.2.cjs
+yarnPath: .yarn/releases/yarn-3.0.1.cjs
@@ -1,5 +1,351 @@
 # CHANGELOG

+## 6.1.2 Sep 29, 2021
+
+Upgrade priority: Low. Recommended for 6.x users using historic queries.
+
+Changes:
+
+- Fix `.at` queries/decoration for pre-V13 metadata
+- Added `BridgeMessageId` & `SpecVersion` types for bridges
+- Added `WrapperOpaque` encoding/decoding (as per latest Substrate)
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 6.1.1 Sep 27, 2021
+
+Upgrade priority: Low. Minor maintenance changes from the 6.0.x versions.
+
+Contributed:
+
+- Adjust bridges `OutboundLaneData` type (Thanks to https://github.com/HackFisher)
+- Fix README 404 (Thanks to https://github.com/nblogist)
+
+Changes:
+
+- Add `childstate_getStorageEntries` RPC
+- Allow for scale-info v0 -> v1 conversion
+
+
+## 6.0.5 Sep 20, 2021
+
+Upgrade priority: Low. Recommended for all users on 6.0.4 using `api.query.*.*.at` calls
+
+Changes:
+
+- Revert cross-registry (now-inactive) change introduced in 6.0.3
+- Ensure `Option` is correctly imported for TS query generation
+
+
+## 6.0.4 Sep 20, 2021
+
+Upgrade priority: Low. Recommended for all users on 6.0.3 using `api.query.*.*.at` calls
+
+Changes:
+
+- `api.query.<module>.<method>.at` will now use `at.at(<hash>)`
+- Use and expose `metadata/util/getSiName` to get human type names
+
+
+## 6.0.3 Sep 19, 2021
+
+Upgrade priority: Low. Recommended for all users on 6.0.2 using `api.query.*.*.at` calls
+
+Changes:
+
+- Fix `api.query.<module>.<method>.at` queries
+- Adjust typegen formatting for metadata documentation
+
+
+## 6.0.2 Sep 18, 2021
+
+Upgrade priority: Low. Recommended for all users on 6.0.1, especially those using `api.query.substrate.*` calls
+
+Changes:
+
+- Fix `api.query.substrate.*` key generation
+
+
+## 6.0.1 Sep 18, 2021
+
+Upgrade priority: Low. Recommended for users of the latest Substrate/Polkadot with Metadata v14.
+
+- **Important** The Metadata v14 change allows the metadata to expose the chain types. This has been a major overhaul of the metadata handling, hence the major version bump.
+
+Contributed:
+
+- Allow for `.clone` on Http provider (Thanks to https://github.com/ianhe8x)
+
+Changes:
+
+- Allow for Metadata v14 parsing & usage
+- Align `DigestItem` to latest Substrate
+- Adjust Kusama `IdentityInfo` type for historic versions
+- All `null` values in bundles min/max
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 5.9.1 Sep 13, 2021
+
+Upgrade priority: Low. Recommended for chains using Xcm.
+
+Contributed:
+
+- Adjust Centrifuge `ProxyType` (Thanks to https://github.com/branan)
+
+Changes:
+
+- Additional types for parachain Disputes
+- Adjust Xcm Error enum types
+- Add Polkadot 9090 upgrade block
+- Decoding enhancements with narrowing checks for TS
+
+
+## 5.8.3 Sep 6, 2021
+
+Upgrade priority: Low.
+
+Changes:
+
+- Adjust Statemint, Rococo and Westend Xcm overrides
+
+
+## 5.8.2 Sep 6, 2021
+
+Upgrade priority: Low.
+
+Contributed:
+
+- Correct Xcm V1 `MultiLocation` definitions (Thanks to https://github.com/apopiak)
+
+Changes:
+
+- Adjust Kusama Xcm overrides
+
+
+## 5.8.1 Sep 6, 2021
+
+Upgrade priority: Low.
+
+Changes:
+
+- Add `Auction` to Kusama `ProxyType` definition
+- Adjust Xcm definitions with latest v1 & v2 types
+- Support for `scale-info` 1.0 `Range` mapping
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 5.7.1 Aug 29, 2021
+
+Upgrade priority: Low.
+
+Changes:
+
+- Optimize `Vec` construction (no re-create on new arrays)
+- Adjust output for enums in `toHuman`
+- Adjust aliases for new parachain module locations
+- Support for versioned xcm types (Polkadot master)
+- Add support for `Range` in `PortableRegistry` (used in Metadata 14)
+- Adjust balances derive for non-existent instances
+- Ensure Statemint (current) defaults to xcm v0
+- Add Kusama 9090 upgrade block
+
+
+## 5.6.1 Aug 23, 2021
+
+Upgrade priority: Low. Recommended for users of Xcm, preparing for Kusama/Westend 9100
+
+Contributed:
+
+- Support 0...N-1 args on `keys/entries` (Thanks to https://github.com/hamidra)
+
+Changes:
+
+- Updated XCM types, `AssetId`, `MultiAssets`, `MultiAssetV1`, `AssetInstanceV1`, `XcmOrderV1`
+- Rename `Null` entry in `MultiLocation` to `Here` (Xcm V1)
+- Westend 9090 upgrade block
+- Bump static Substrate, Kusama & Polkadot metadata
+
+
+## 5.5.2 Aug 19, 2021
+
+Upgrade priority: Medium. Contains fixes for parachain types, affecting historic block retrieval on Kusama.
+
+Changes:
+
+- Adjust `ValidDisputeStatementKind` enum to latest version
+- Only enable API health keepalive on connections supporting subscriptions
+
+
+## 5.5.1 Aug 15, 2021
+
+Upgrade priority: Low. Recommended for users of TS (`createType` and `bigint` adjustments)
+
+Contributed:
+
+- Add `Range` & `RangeInclusive` types (Thanks to https://github.com/c410-f3r)
+- Always use TS `bigint` type (Thanks to https://github.com/ntduan)
+
+Changes:
+
+- Loosen pedantic check not to fail on all-empty values
+- Extend `createType` auto-TS decoration for `BreeMap`, `BTreeSet`, `HashMap`, `Range`
+- Add Polkadot 9080 upgrade block
+
+
+## 5.4.1 Aug 9, 2021
+
+Upgrade priority: Low. Recommended for potential users of NMap.
+
+- **Important** The `ClassOf` alias for `createClass` has been removed, use `createClass` (with new generics) directly
+
+Contributed:
+
+- Enable `.keys()/.entries()` on NMap (Thanks to https://github.com/hamidra)
+
+Changes:
+
+- `createType<T = Codec>('...': K)` now returns `Codec` when `K` is not known
+- `createType` does basic TypeScript type matching on the input type
+- Handle `BitSequence` in `PortableRegistry`
+- Ensure API `isConnected` is set before connect/disconnect events are fired
+- Move all static test support files into `@polkadot/types-support`
+- Align static Metadata with latest Substrate, Polkadot & Kusama
+- Adjust v14 Metadata definitions to latest version
+
+
+## 5.3.2 Aug 3, 2021
+
+Upgrade priority: Low. Recommended for users of bridges.
+
+Contributed:
+
+- Add missing bridges types (Thanks to https://github.com/tomusdrw)
+
+Changes:
+
+- Align static metadata with latest Substrate
+
+
+## 5.3.1 Aug 2, 2021
+
+Upgrade priority: Low. Recommended for users of `api.at(...)` interfaces
+
+Changes:
+
+- Check specName & specVersion for historic registries (caters for runtime renames)
+- Fix circular dependencies in codec utils
+- Fix `api.at(<blockHash>)` to decorate with the correct storage hash
+- Adjustments for upcoming metadata v14 in type creation & `PortableRegistry`
+- Add Kusama 9080 upgrade block
+- Add v13/v14 static metadata for Polkadot
+- Align static metadata with latest Substrate
+
+
+## 5.2.1 Jul 26, 2021
+
+Upgrade priority: Low. Recommended for users of `BTreeMap` and `BTreeSet`
+
+Contributed:
+
+- Perform sorting on `BTree{Map, Set}`, aligning with Substrate (Thanks to https://github.com/Lezek123)
+
+Changes:
+
+- Adjust RPC to use `registry.createType` with optionality (required for metadata v14)
+- Adjust alphabetical sorting for TS type generation
+- Adjustments for upcoming metadata v14 in type creation & `PortableRegistry`
+- Provide the capability to convert v13 Metadata to upcoming v14
+
+
+## 5.1.1 Jul 19, 2021
+
+Upgrade priority: Low. Recommended for users of XCM with type fixes.
+
+- **Breaking changes** With the support for v14 metadata parsing, the `documentation` fields on metadata was renamed to `docs` for consistency, aligning with the SCALE type generators.
+
+Contributed:
+
+- Don't clear rpc decoration on Api clone (Thanks to https://github.com/ianhe8x)
+- Align Xcm Junction type with Substrate (Thanks to https://github.com/dt665m)
+
+Changes:
+
+- Update `ParaPastCodeMeta` with `ReplacementTimes`
+- Add mappings for `AccountId20` & `AccountId32` types
+- Adjust scale-info types with Substrate (mapping for api-contracts to old)
+- Allow nested structs in enum definitions & generation
+- Allow for parsing of v14 metadata (not enabled by default, not merged into Substrate as of yet)
+
+
+## 5.0.1 Jul 11, 2021
+
+Upgrade priority: Low. Recommended for users of current-generation Substrate chains.
+
+- **Breaking change** The `@polkadot/metadata` package has been removed, adjust imports to `@polkadot/types`
+- **Important** Internally rxjs has been upgraded to the 7.0 version, affecting users of the `ApiRx` interface
+
+Changes:
+
+- Remove the `@polkadot/metadata` package, consolidate into `@polkadot/types`
+- Contract reads will now expose an additional `gasRequired` (total estimated)
+- Allow schedule derives to handle scheduler entries that cannot decode
+- Add missing historic `Heartbeat: HeartbeatTo244` mapping to Westend
+- Adjust Ws `.disconnect()` logic to always clear auto-connect
+- Add `BlockNumberFor` type mapping
+- Add Westend 9080 upgrade block
+- Add `derive.crowdloan.contributions(paraId)`
+- Allow building as a completely stand-alone browser bundle (experimental)
+- Update to latest `@polkadot/x-rxjs` with RxJs 7.2
+- Align static metadata with latest Substrate
+
+
+## 4.17.1 Jul 5, 2021
+
+Upgrade priority: Low. Allows cleaner access to multiple `.at` queries via new API.
+
+Contributed:
+
+- Added `Emergency` to `ElectionPhase` (Thanks to https://github.com/arjanz)
+
+Changes:
+
+- Added `await api.at(<blockHash>)` to retrieve API instances at a point
+- Added `fallbackType` for type classes (only struct, as defined)
+- Allow `instances` API config to drive derive collective locations
+- Ensure correct registry is attached to historic metadata
+- Align static metadata with latest Substrate
+
+
+## 4.16.2 Jun 27, 2021
+
+Upgrade priority: Low. Recommended for Polkadot with runtime >= 9050.
+
+Changes:
+
+- Correct `CompactAssignments` & `RawSolution` types for Polkadot
+
+
+## 4.16.1 Jun 26, 2021
+
+Upgrade priority: Low. Recommended for full from-genesis queries on Kusama.
+
+Contributed:
+
+- Adjust types for uniques (Thanks to https://github.com/Yuripetusko)
+
+Changes:
+
+- Add Kusama, Polkadot & Westend 9050 upgrade blocks
+- Add Kusama & Westend 9070 upgrade blocks
+- Adjust API decoration to lazy-create event and storage types
+- Use TS `override` as applicable (with `--noImplicitOverrides` option)
+- Add missing historic `Heartbeat: HeartbeatTo244` mapping to Kusama
+- Remove duplication from contracts registry
+- Add explicit check for scale-info 0.7+ (contracts index lookups)
+- Align static metadata with latest Substrate
+
+
 ## 4.15.1 Jun 19, 2021

 Upgrade priority: Medium. Recommended for all chains where Xcm is used (addition of new `XcmOrigin`)
@@ -12,21 +12,9 @@ module.exports = {
    '@polkadot/metadata(.*)$': '<rootDir>/packages/metadata/src/$1',
    '@polkadot/rpc-(core|provider)(.*)$': '<rootDir>/packages/rpc-$1/src/$2',
    '@polkadot/typegen(.*)$': '<rootDir>/packages/typegen/src/$1',
-    '@polkadot/types-known(.*)$': '<rootDir>/packages/types-known/src/$1',
+    '@polkadot/types-(known|support)(.*)$': '<rootDir>/packages/types-$1/src/$2',
    // eslint-disable-next-line sort-keys
    '@polkadot/types(.*)$': '<rootDir>/packages/types/src/$1'
  },
-  modulePathIgnorePatterns: [
-    '<rootDir>/packages/api/build',
-    '<rootDir>/packages/api-contract/build',
-    '<rootDir>/packages/api-derive/build',
-    '<rootDir>/packages/metadata/build',
-    '<rootDir>/packages/rpc-core/build',
-    '<rootDir>/packages/rpc-provider/build',
-    '<rootDir>/packages/typegen/build',
-    '<rootDir>/packages/types/build',
-    '<rootDir>/packages/types-known/build'
-  ],
-  testTimeout: 10000,
-  transformIgnorePatterns: ['/node_modules/(?!@polkadot|@babel/runtime/helpers/esm/)']
+  testTimeout: 30000
 };
@@ -8,13 +8,14 @@
    "packages/*"
  ],
  "resolutions": {
-    "typescript": "^4.3.2"
+    "typescript": "^4.4.3"
  },
  "scripts": {
    "build": "yarn build:interfaces && polkadot-dev-build-ts",
    "build:extra": "(cd packages/typegen && copyfiles scripts/* build)",
    "build:interfaces": "polkadot-types-internal-interfaces",
    "build:release": "polkadot-ci-ghact-build",
+    "build:rollup": "polkadot-exec-rollup --config",
    "docs:metadata": "polkadot-types-internal-metadata",
    "chain:info": "polkadot-types-chain-info",
    "lint": "polkadot-dev-run-lint",
@@ -25,14 +26,15 @@
    "test:watch": "polkadot-dev-run-test --watch"
  },
  "devDependencies": {
-    "@babel/core": "^7.14.5",
-    "@babel/register": "^7.14.5",
-    "@babel/runtime": "^7.14.5",
-    "@polkadot/dev": "^0.62.42",
-    "@polkadot/ts": "^0.3.90",
+    "@babel/core": "^7.15.5",
+    "@babel/register": "^7.15.3",
+    "@babel/runtime": "^7.15.4",
+    "@polkadot/dev": "^0.62.68",
+    "@polkadot/ts": "^0.4.8",
    "@polkadot/typegen": "workspace:packages/typegen",
-    "@types/jest": "^26.0.23",
+    "@types/jest": "^27.0.2",
    "copyfiles": "^2.4.1"
  },
-  "version": "4.15.1"
+  "version": "6.1.2",
+  "packageManager": "yarn@3.0.1"
 }
@@ -1,6 +1,6 @@
 {
  "name": "@polkadot/api-contract",
-  "version": "4.15.1",
+  "version": "6.1.2",
  "type": "module",
  "description": "Interfaces for interacting with contracts and contract ABIs",
  "main": "index.js",
@@ -19,10 +19,10 @@
  "bugs": "https://github.com/polkadot-js/api/issues",
  "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme",
  "dependencies": {
-    "@babel/runtime": "^7.14.5",
-    "@polkadot/api": "4.15.1",
-    "@polkadot/types": "4.15.1",
-    "@polkadot/util": "^6.9.1",
-    "@polkadot/x-rxjs": "^6.9.1"
+    "@babel/runtime": "^7.15.4",
+    "@polkadot/api": "6.1.2",
+    "@polkadot/types": "6.1.2",
+    "@polkadot/util": "^7.4.1",
+    "rxjs": "^7.3.0"
  }
 }
@@ -3,7 +3,7 @@

 import type { Bytes } from '@polkadot/types';
 import type { ChainProperties, ContractConstructorSpec, ContractEventSpec, ContractMessageParamSpec, ContractMessageSpec, ContractProject } from '@polkadot/types/interfaces';
-import type { AnyJson, Codec, CodecArg } from '@polkadot/types/types';
+import type { AnyJson, Codec } from '@polkadot/types/types';
 import type { AbiConstructor, AbiEvent, AbiMessage, AbiParam, DecodedEvent, DecodedMessage } from './types';

 import { assert, assertReturn, compactAddLength, compactStripLength, isNumber, isObject, isString, logger, stringCamelCase, stringify, u8aConcat, u8aToHex } from '@polkadot/util';
@@ -19,7 +19,7 @@ function findMessage <T extends AbiMessage> (list: T[], messageOrId: T | string
      ? list.find(({ identifier }) => [identifier, stringCamelCase(identifier)].includes(messageOrId.toString()))
      : messageOrId;

-  return assertReturn(message, `Attempted to call an invalid contract interface, ${stringify(messageOrId)}`);
+  return assertReturn(message, () => `Attempted to call an invalid contract interface, ${stringify(messageOrId)}`);
 }

 export class Abi {
@@ -49,7 +49,7 @@ export class Abi {
    this.registry.setMetaTypes(this.project.types);

    this.project.types.forEach((_, index) =>
-      this.registry.getMetaTypeDef({ type: this.registry.createType('SiLookupTypeId', index + this.registry.typeOffset) })
+      this.registry.getMetaTypeDef({ type: this.registry.createType('Si0LookupTypeId', index + this.registry.typeOffset) })
    );
    this.constructors = this.project.spec.constructors.map((spec: ContractConstructorSpec, index) =>
      this.#createMessage(spec, index, {
@@ -127,7 +127,7 @@ export class Abi {
    const args = this.#createArgs(spec.args, spec);
    const event = {
      args,
-      docs: spec.docs.map((doc) => doc.toString()),
+      docs: spec.docs.map((d) => d.toString()),
      fromU8a: (data: Uint8Array): DecodedEvent => ({
        args: this.#decodeArgs(args, data),
        event
@@ -145,7 +145,7 @@ export class Abi {
    const message = {
      ...add,
      args,
-      docs: spec.docs.map((doc) => doc.toString()),
+      docs: spec.docs.map((d) => d.toString()),
      fromU8a: (data: Uint8Array): DecodedMessage => ({
        args: this.#decodeArgs(args, data),
        message
@@ -154,7 +154,7 @@ export class Abi {
      index,
      method: stringCamelCase(identifier),
      selector: spec.selector,
-      toU8a: (params: CodecArg[]) =>
+      toU8a: (params: unknown[]) =>
        this.#encodeArgs(spec, args, params)
    };

@@ -185,7 +185,7 @@ export class Abi {
    return message.fromU8a(trimmed.subarray(4));
  }

-  #encodeArgs = ({ name, selector }: ContractMessageSpec | ContractConstructorSpec, args: AbiParam[], data: CodecArg[]): Uint8Array => {
+  #encodeArgs = ({ name, selector }: ContractMessageSpec | ContractConstructorSpec, args: AbiParam[], data: unknown[]): Uint8Array => {
    assert(data.length === args.length, () => `Expected ${args.length} arguments to contract message '${name.toString()}', found ${data.length}`);

    return compactAddLength(
@@ -4,27 +4,35 @@
 import fs from 'fs';
 import path from 'path';

+import { TypeDefInfo } from '@polkadot/types/types';
+
 import abis from '../test/contracts';
 import { Abi } from '.';

+function stringifyInfo (key: string, value: unknown): unknown {
+  return key === 'info'
+    ? TypeDefInfo[value as number]
+    : value;
+}
+
 describe('MetaRegistry', (): void => {
  Object.keys(abis).forEach((abiName) => {
    it(`initializes from a contract ABI (${abiName})`, (): void => {
      const abi = new Abi(abis[abiName]);
+      const json = JSON.stringify(abi.registry.metaTypeDefs, stringifyInfo, 2);
+      const cmpPath = path.join(__dirname, `../test/compare/${abiName}.test.json`);

      try {
-        const cmpPath = path.join(__dirname, `../test/compare/${abiName}.test.json`);
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        expect(JSON.parse(json)).toEqual(require(cmpPath));
+      } catch (error) {
+        if (process.env.GITHUB_REPOSITORY) {
+          console.error(JSON.stringify(abi.registry.metaTypeDefs, stringifyInfo));

-        if (!fs.existsSync(cmpPath)) {
-          fs.writeFileSync(cmpPath, JSON.stringify(abi.registry.metaTypeDefs, null, 2), { flag: 'w' });
+          throw error;
        }

-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        expect(abi.registry.metaTypeDefs).toEqual(require(cmpPath));
-      } catch (error) {
-        console.error(JSON.stringify(abi.registry.metaTypeDefs));
-
-        throw error;
+        fs.writeFileSync(cmpPath, json, { flag: 'w' });
      }
    });
  });
@@ -1,20 +1,19 @@
 // Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import type { ChainProperties, ContractDisplayName, SiField, SiLookupTypeId, SiType, SiTypeDefArray, SiTypeDefSequence, SiTypeDefTuple, SiTypeDefVariant, SiVariant } from '@polkadot/types/interfaces';
+import type { ChainProperties, ContractDisplayName, Si0Field, Si0LookupTypeId, Si0Type, Si0TypeDefArray, Si0TypeDefSequence, Si0TypeDefTuple, Si0TypeDefVariant, Si0Variant } from '@polkadot/types/interfaces';
 import type { InterfaceTypes, TypeDef } from '@polkadot/types/types';

-import { TypeRegistry, withTypeString } from '@polkadot/types/create';
-import { TypeDefInfo } from '@polkadot/types/types';
+import { TypeDefInfo, TypeRegistry, withTypeString } from '@polkadot/types';
 import { assert, isUndefined } from '@polkadot/util';

 interface PartialTypeSpec {
-  readonly type: SiLookupTypeId;
+  readonly type: Si0LookupTypeId;
  readonly displayName?: ContractDisplayName;
 }

 // convert the offset into project-specific, index-1
-export function getRegistryOffset (id: SiLookupTypeId, typeOffset: number): number {
+export function getRegistryOffset (id: Si0LookupTypeId, typeOffset: number): number {
  return id.toNumber() - typeOffset;
 }

@@ -25,25 +24,28 @@ const PRIMITIVE_ALIAS: Record<string, keyof InterfaceTypes> = {

 const PRIMITIVE_ALWAYS = ['AccountId', 'AccountIndex', 'Address', 'Balance'];

+// TODO Replace usages with PortableRegistry
 export class MetaRegistry extends TypeRegistry {
  public readonly metaTypeDefs: TypeDef[] = [];

  public readonly typeOffset;

-  #siTypes: SiType[] = [];
+  #siTypes: Si0Type[] = [];

  constructor (metadataVersion: string, chainProperties?: ChainProperties) {
    super();

-    // type indexes are 1-based pre-1.0 and 0-based post-1.0
-    this.typeOffset = metadataVersion.split('.')[0] === '0' ? 1 : 0;
+    const [major, minor] = metadataVersion.split('.').map((n) => parseInt(n, 10));
+
+    // type indexes are 1-based pre 0.7 and 0-based post
+    this.typeOffset = (major === 0 && minor < 7) ? 1 : 0;

    if (chainProperties) {
      this.setChainProperties(chainProperties);
    }
  }

-  public setMetaTypes (metaTypes: SiType[]): void {
+  public setMetaTypes (metaTypes: Si0Type[]): void {
    this.#siTypes = metaTypes;
  }

@@ -82,15 +84,15 @@ export class MetaRegistry extends TypeRegistry {
    return typeDef;
  }

-  #getMetaType = (id: SiLookupTypeId): SiType => {
+  #getMetaType = (id: Si0LookupTypeId): Si0Type => {
    const type = this.#siTypes[getRegistryOffset(id, this.typeOffset)];

    assert(!isUndefined(type), () => `getMetaType:: Unable to find ${id.toNumber()} in type values`);

-    return this.createType('SiType', type);
+    return this.createType('Si0Type', type);
  }

-  #extract = (type: SiType, id: SiLookupTypeId): TypeDef => {
+  #extract = (type: Si0Type, id: Si0LookupTypeId): TypeDef => {
    const path = [...type.path];
    const isPrimitivePath = !!path.length && (
      (path.length > 2 && path[0].eq('ink_env') && path[1].eq('types')) ||
@@ -118,13 +120,13 @@ export class MetaRegistry extends TypeRegistry {

    const displayName = path.pop()?.toString();

-    return withTypeString({
+    return withTypeString(this, {
      ...(displayName
        ? { displayName }
        : {}
      ),
      ...(path.length > 1
-        ? { namespace: path.map((segment) => segment.toString()).join('::') }
+        ? { namespace: path.map((s) => s.toString()).join('::') }
        : {}
      ),
      ...(type.params.length > 0
@@ -135,7 +137,7 @@ export class MetaRegistry extends TypeRegistry {
    });
  }

-  #extractArray = ({ len: length, type }: SiTypeDefArray): Omit<TypeDef, 'type'> => {
+  #extractArray = ({ len: length, type }: Si0TypeDefArray): Omit<TypeDef, 'type'> => {
    assert(!length || length.toNumber() <= 256, 'MetaRegistry: Only support for [Type; <length>], where length <= 256');

    return {
@@ -145,7 +147,7 @@ export class MetaRegistry extends TypeRegistry {
    };
  }

-  #extractFields = (fields: SiField[]): Omit<TypeDef, 'type'> => {
+  #extractFields = (fields: Si0Field[]): Omit<TypeDef, 'type'> => {
    const [isStruct, isTuple] = fields.reduce(([isAllNamed, isAllUnnamed], { name }) => ([
      isAllNamed && name.isSome,
      isAllUnnamed && name.isNone
@@ -154,15 +156,13 @@ export class MetaRegistry extends TypeRegistry {

    assert(isTuple || isStruct, 'Invalid fields type detected, expected either Tuple or Struct');

-    const sub = fields.map(({ name, type }) => {
-      return {
-        ...this.getMetaTypeDef({ type }),
-        ...(name.isSome
-          ? { name: name.unwrap().toString() }
-          : {}
-        )
-      };
-    });
+    const sub = fields.map(({ name, type }) => ({
+      ...this.getMetaTypeDef({ type }),
+      ...(name.isSome
+        ? { name: name.unwrap().toString() }
+        : {}
+      )
+    }));

    return isTuple && sub.length === 1
      ? sub[0]
@@ -175,7 +175,7 @@ export class MetaRegistry extends TypeRegistry {
      };
  }

-  #extractPrimitive = (type: SiType): TypeDef => {
+  #extractPrimitive = (type: Si0Type): TypeDef => {
    const typeStr = type.def.asPrimitive.type.toString();

    return {
@@ -184,14 +184,14 @@ export class MetaRegistry extends TypeRegistry {
    };
  }

-  #extractPrimitivePath = (type: SiType): TypeDef => {
+  #extractPrimitivePath = (type: Si0Type): TypeDef => {
    return {
      info: TypeDefInfo.Plain,
      type: type.path[type.path.length - 1].toString()
    };
  }

-  #extractSequence = ({ type }: SiTypeDefSequence, id: SiLookupTypeId): Omit<TypeDef, 'type'> => {
+  #extractSequence = ({ type }: Si0TypeDefSequence, id: Si0LookupTypeId): Omit<TypeDef, 'type'> => {
    assert(!!type, () => `ContractRegistry: Invalid sequence type found at id ${id.toString()}`);

    return {
@@ -200,7 +200,7 @@ export class MetaRegistry extends TypeRegistry {
    };
  }

-  #extractTuple = (ids: SiTypeDefTuple): Omit<TypeDef, 'type'> => {
+  #extractTuple = (ids: Si0TypeDefTuple): Omit<TypeDef, 'type'> => {
    return ids.length === 1
      ? this.getMetaTypeDef({ type: ids[0] })
      : {
@@ -209,36 +209,32 @@ export class MetaRegistry extends TypeRegistry {
      };
  }

-  #extractVariant = ({ variants }: SiTypeDefVariant, id: SiLookupTypeId): Omit<TypeDef, 'type'> => {
+  #extractVariant = ({ variants }: Si0TypeDefVariant, id: Si0LookupTypeId): Omit<TypeDef, 'type'> => {
    const { params, path } = this.#getMetaType(id);
    const specialVariant = path[0].toString();

-    if (specialVariant === 'Option') {
-      return {
+    return specialVariant === 'Option'
+      ? {
        info: TypeDefInfo.Option,
        sub: this.getMetaTypeDef({ type: params[0] })
-      };
-    } else if (specialVariant === 'Result') {
-      return {
-        info: TypeDefInfo.Result,
-        sub: params.map((type, index) => ({
-          name: ['Ok', 'Error'][index],
-          ...this.getMetaTypeDef({ type })
-        }))
-      };
-    }
-
-    return {
-      info: TypeDefInfo.Enum,
-      sub: this.#extractVariantSub(variants)
-    };
+      }
+      : specialVariant === 'Result'
+        ? {
+          info: TypeDefInfo.Result,
+          sub: params.map((type, index) => ({
+            name: ['Ok', 'Error'][index],
+            ...this.getMetaTypeDef({ type })
+          }))
+        }
+        : {
+          info: TypeDefInfo.Enum,
+          sub: this.#extractVariantSub(variants)
+        };
  }

-  #extractVariantSub = (variants: SiVariant[]): TypeDef[] => {
-    const isAllUnitVariants = variants.every(({ fields }) => fields.length === 0);
-
-    if (isAllUnitVariants) {
-      return variants.map(({ discriminant, name }) => ({
+  #extractVariantSub = (variants: Si0Variant[]): TypeDef[] => {
+    return variants.every(({ fields }) => fields.length === 0)
+      ? variants.map(({ discriminant, name }) => ({
        ...(
          discriminant.isSome
            ? { ext: { discriminant: discriminant.unwrap().toNumber() } }
@@ -247,14 +243,10 @@ export class MetaRegistry extends TypeRegistry {
        info: TypeDefInfo.Plain,
        name: name.toString(),
        type: 'Null'
-      }));
-    }
-
-    return variants.map(({ fields, name }) =>
-      withTypeString({
+      }))
+      : variants.map(({ fields, name }) => withTypeString(this, {
        ...this.#extractFields(fields),
        name: name.toString()
-      })
-    );
+      }));
  }
 }
@@ -4,7 +4,7 @@
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import type { AccountId, EventRecord, Hash } from '@polkadot/types/interfaces';
-import type { AnyJson, CodecArg, ISubmittableResult } from '@polkadot/types/types';
+import type { AnyJson, ISubmittableResult } from '@polkadot/types/types';
 import type { AbiConstructor, BlueprintOptions } from '../types';
 import type { MapConstructorExec } from './types';

@@ -52,7 +52,7 @@ export class Blueprint<ApiType extends ApiTypes> extends Base<ApiType> {
    return this.#tx;
  }

-  #deploy = (constructorOrId: AbiConstructor | string | number, { gasLimit = BN_ZERO, salt, value = BN_ZERO }: BlueprintOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType, BlueprintSubmittableResult<ApiType>> => {
+  #deploy = (constructorOrId: AbiConstructor | string | number, { gasLimit = BN_ZERO, salt, value = BN_ZERO }: BlueprintOptions, params: unknown[]): SubmittableExtrinsic<ApiType, BlueprintSubmittableResult<ApiType>> => {
    return this.api.tx.contracts
      .instantiate(
        value,
@@ -4,7 +4,7 @@
 import fs from 'fs';
 import path from 'path';

-import { decorateMethod } from '@polkadot/api/promise';
+import { decorateMethodPromise } from '@polkadot/api';

 import contractFlipper from '../../test/contracts/ink/flipper.contract.json';
 import abiFlipper from '../../test/contracts/ink/flipper.json';
@@ -16,13 +16,13 @@ const wasmFlipper = fs.readFileSync(path.join(__dirname, '../../test/contracts/i
 describe('Code', (): void => {
  it('can construct with an individual ABI/WASM combo', (): void => {
    expect(
-      () => new Code(mockApi, abiFlipper, wasmFlipper, decorateMethod)
+      () => new Code(mockApi, abiFlipper, wasmFlipper, decorateMethodPromise)
    ).not.toThrow();
  });

  it('can construct with an .contract ABI', (): void => {
    expect(
-      () => new Code(mockApi, contractFlipper, null, decorateMethod)
+      () => new Code(mockApi, contractFlipper, null, decorateMethodPromise)
    ).not.toThrow();
  });
 });
@@ -4,7 +4,7 @@
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import type { EventRecord } from '@polkadot/types/interfaces';
-import type { AnyJson, CodecArg, ISubmittableResult } from '@polkadot/types/types';
+import type { AnyJson, ISubmittableResult } from '@polkadot/types/types';
 import type { AbiConstructor, BlueprintOptions } from '../types';
 import type { MapConstructorExec } from './types';

@@ -56,7 +56,7 @@ export class Code<ApiType extends ApiTypes> extends Base<ApiType> {
    return this.#tx;
  }

-  #instantiate = (constructorOrId: AbiConstructor | string | number, { gasLimit = BN_ZERO, salt, value = BN_ZERO }: BlueprintOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> => {
+  #instantiate = (constructorOrId: AbiConstructor | string | number, { gasLimit = BN_ZERO, salt, value = BN_ZERO }: BlueprintOptions, params: unknown[]): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> => {
    return this.api.tx.contracts
      .instantiateWithCode(
        value,
@@ -5,15 +5,16 @@ import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import type { Bytes } from '@polkadot/types';
 import type { AccountId, EventRecord, Weight } from '@polkadot/types/interfaces';
-import type { AnyJson, CodecArg, ISubmittableResult } from '@polkadot/types/types';
+import type { AnyJson, ISubmittableResult } from '@polkadot/types/types';
 import type { AbiMessage, ContractCallOutcome, ContractOptions, DecodedEvent } from '../types';
 import type { ContractCallResult, ContractCallSend, ContractQuery, ContractTx, MapMessageQuery, MapMessageTx } from './types';

+import { map } from 'rxjs';
+
 import { SubmittableResult } from '@polkadot/api';
 import { ApiBase } from '@polkadot/api/base';
 import { createTypeUnsafe } from '@polkadot/types';
 import { assert, BN, BN_HUNDRED, BN_ONE, BN_ZERO, bnToBn, isFunction, isUndefined, logger } from '@polkadot/util';
-import { map } from '@polkadot/x-rxjs/operators';

 import { Abi } from '../Abi';
 import { applyOnEvent, extractOptions, isOptions } from '../util';
@@ -25,15 +26,15 @@ const ERROR_NO_CALL = 'Your node does not expose the contracts.call RPC. This is

 const l = logger('Contract');

-function createQuery <ApiType extends ApiTypes> (fn: (origin: string | AccountId | Uint8Array, options: ContractOptions, params: CodecArg[]) => ContractCallResult<ApiType, ContractCallOutcome>): ContractQuery<ApiType> {
-  return (origin: string | AccountId | Uint8Array, options: BigInt | string | number | BN | ContractOptions, ...params: CodecArg[]): ContractCallResult<ApiType, ContractCallOutcome> =>
+function createQuery <ApiType extends ApiTypes> (fn: (origin: string | AccountId | Uint8Array, options: ContractOptions, params: unknown[]) => ContractCallResult<ApiType, ContractCallOutcome>): ContractQuery<ApiType> {
+  return (origin: string | AccountId | Uint8Array, options: bigint | string | number | BN | ContractOptions, ...params: unknown[]): ContractCallResult<ApiType, ContractCallOutcome> =>
    isOptions(options)
      ? fn(origin, options, params)
      : fn(origin, ...extractOptions(options, params));
 }

-function createTx <ApiType extends ApiTypes> (fn: (options: ContractOptions, params: CodecArg[]) => SubmittableExtrinsic<ApiType>): ContractTx<ApiType> {
-  return (options: BigInt | string | number | BN | ContractOptions, ...params: CodecArg[]): SubmittableExtrinsic<ApiType> =>
+function createTx <ApiType extends ApiTypes> (fn: (options: ContractOptions, params: unknown[]) => SubmittableExtrinsic<ApiType>): ContractTx<ApiType> {
+  return (options: bigint | string | number | BN | ContractOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType> =>
    isOptions(options)
      ? fn(options, params)
      : fn(...extractOptions(options, params));
@@ -89,7 +90,7 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
    return this.#tx;
  }

-  #getGas = (_gasLimit: BigInt | BN | string | number, isCall = false): BN => {
+  #getGas = (_gasLimit: bigint | BN | string | number, isCall = false): BN => {
    const gasLimit = bnToBn(_gasLimit);

    return gasLimit.lte(BN_ZERO)
@@ -102,7 +103,7 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
      : gasLimit;
  }

-  #exec = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, value = BN_ZERO }: ContractOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType> => {
+  #exec = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, value = BN_ZERO }: ContractOptions, params: unknown[]): SubmittableExtrinsic<ApiType> => {
    return this.api.tx.contracts
      .call(
        this.address,
@@ -128,7 +129,7 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
      );
  }

-  #read = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, value = BN_ZERO }: ContractOptions, params: CodecArg[]): ContractCallSend<ApiType> => {
+  #read = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, value = BN_ZERO }: ContractOptions, params: unknown[]): ContractCallSend<ApiType> => {
    assert(this.hasRpcContractsCall, ERROR_NO_CALL);

    const message = this.abi.findMessage(messageOrId);
@@ -145,9 +146,12 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
            value
          })
          .pipe(
-            map(({ debugMessage, gasConsumed, result }): ContractCallOutcome => ({
+            map(({ debugMessage, gasConsumed, gasRequired, result }): ContractCallOutcome => ({
              debugMessage,
              gasConsumed,
+              gasRequired: gasRequired && !gasRequired.isZero()
+                ? gasRequired
+                : gasConsumed,
              output: result.isOk && message.returnType
                ? createTypeUnsafe(this.registry, message.returnType.type, [result.asOk.data.toU8a(true)], { isPedantic: true })
                : null,
@@ -1,32 +1,31 @@
 // Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes, ObsInnerType } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { CodecArg } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { AbiMessage, BlueprintOptions, ContractCallOutcome, ContractOptions } from '../types';

 export interface BlueprintDeploy<ApiType extends ApiTypes> {
-  (options: BlueprintOptions, ...params: CodecArg[]): SubmittableExtrinsic<ApiType>;
-  (value: BigInt | string | number | BN, gasLimit: BigInt | string | number | BN, ...params: CodecArg[]): SubmittableExtrinsic<ApiType>;
+  (options: BlueprintOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType>;
+  (value: bigint | string | number | BN, gasLimit: bigint | string | number | BN, ...params: unknown[]): SubmittableExtrinsic<ApiType>;
 }

 export interface ContractQuery<ApiType extends ApiTypes> {
-  (origin: AccountId | string | Uint8Array, options: ContractOptions, ...params: CodecArg[]): ContractCallResult<ApiType, ContractCallOutcome>;
-  (origin: AccountId | string | Uint8Array, value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, ...params: CodecArg[]): ContractCallResult<ApiType, ContractCallOutcome>;
+  (origin: AccountId | string | Uint8Array, options: ContractOptions, ...params: unknown[]): ContractCallResult<ApiType, ContractCallOutcome>;
+  (origin: AccountId | string | Uint8Array, value: bigint | BN | string | number, gasLimit: bigint | BN | string | number, ...params: unknown[]): ContractCallResult<ApiType, ContractCallOutcome>;
 }

 export interface ContractTx<ApiType extends ApiTypes> {
-  (options: ContractOptions, ...params: CodecArg[]): SubmittableExtrinsic<ApiType>;
-  (value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, ...params: CodecArg[]): SubmittableExtrinsic<ApiType>;
+  (options: ContractOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType>;
+  (value: bigint | BN | string | number, gasLimit: bigint | BN | string | number, ...params: unknown[]): SubmittableExtrinsic<ApiType>;
 }

 export interface ContractGeneric<O, T> {
-  (messageOrId: AbiMessage | string | number, options: O, ...params: CodecArg[]): T;
-  (messageOrId: AbiMessage | string | number, value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, ...params: CodecArg[]): T;
+  (messageOrId: AbiMessage | string | number, options: O, ...params: unknown[]): T;
+  (messageOrId: AbiMessage | string | number, value: bigint | BN | string | number, gasLimit: bigint | BN | string | number, ...params: unknown[]): T;
 }

 export type ContractCallResult<ApiType extends ApiTypes, T> = ApiType extends 'rxjs'
@@ -4,7 +4,6 @@
 import type { SubmittableResult } from '@polkadot/api';
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes } from '@polkadot/api/types';
-import type { CodecArg } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
 import type { AbiConstructor, BlueprintOptions } from '../types';
 import type { BlueprintDeploy, ContractGeneric } from './types';
@@ -17,15 +16,15 @@ import { extractOptions, isOptions } from '../util';

 export const EMPTY_SALT = new Uint8Array();

-export function createBluePrintTx <ApiType extends ApiTypes, R extends SubmittableResult> (fn: (options: BlueprintOptions, params: CodecArg[]) => SubmittableExtrinsic<ApiType, R>): BlueprintDeploy<ApiType> {
-  return (options: BigInt | string | number | BN | BlueprintOptions, ...params: CodecArg[]): SubmittableExtrinsic<ApiType, R> =>
+export function createBluePrintTx <ApiType extends ApiTypes, R extends SubmittableResult> (fn: (options: BlueprintOptions, params: unknown[]) => SubmittableExtrinsic<ApiType, R>): BlueprintDeploy<ApiType> {
+  return (options: bigint | string | number | BN | BlueprintOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType, R> =>
    isOptions(options)
      ? fn(options, params)
      : fn(...extractOptions(options, params));
 }

-export function createBluePrintWithId <T> (fn: (constructorOrId: AbiConstructor | string | number, options: BlueprintOptions, params: CodecArg[]) => T): ContractGeneric<BlueprintOptions, T> {
-  return (constructorOrId: AbiConstructor | string | number, options: BigInt | string | number | BN | BlueprintOptions, ...params: CodecArg[]): T =>
+export function createBluePrintWithId <T> (fn: (constructorOrId: AbiConstructor | string | number, options: BlueprintOptions, params: unknown[]) => T): ContractGeneric<BlueprintOptions, T> {
+  return (constructorOrId: AbiConstructor | string | number, options: bigint | string | number | BN | BlueprintOptions, ...params: unknown[]): T =>
    isOptions(options)
      ? fn(constructorOrId, options, params)
      : fn(constructorOrId, ...extractOptions(options, params));
@@ -0,0 +1,7 @@
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export { Abi } from './Abi';
+export { packageInfo } from './packageInfo';
+export { Blueprint as BlueprintPromise, Code as CodePromise, Contract as ContractPromise } from './promise';
+export { Blueprint as BlueprintRx, Code as CodeRx, Contract as ContractRx } from './rx';
@@ -3,7 +3,4 @@

 import './detectPackage';

-export { Abi } from './Abi';
-export { packageInfo } from './packageInfo';
-export { Blueprint as BlueprintPromise, Code as CodePromise, Contract as ContractPromise } from './promise';
-export { Blueprint as BlueprintRx, Code as CodeRx, Contract as ContractRx } from './rx';
+export * from './bundle';
@@ -3,4 +3,4 @@

 // Auto-generated by @polkadot/dev, do not edit

-export const packageInfo = { name: '@polkadot/api-contract', version: '4.15.1' };
+export const packageInfo = { name: '@polkadot/api-contract', version: '6.1.2' };
@@ -4,14 +4,13 @@
 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';
+import { ApiPromise, decorateMethodPromise } from '@polkadot/api';

 import { Abi } from '../Abi';
 import { Blueprint as BaseBlueprint } from '../base';

 export class Blueprint extends BaseBlueprint<'promise'> {
  constructor (api: ApiPromise, abi: AnyJson | Abi, codeHash: string | Hash) {
-    super(api, abi, codeHash, decorateMethod);
+    super(api, abi, codeHash, decorateMethodPromise);
  }
 }
@@ -4,13 +4,13 @@
 import type { ApiPromise } from '@polkadot/api';
 import type { AnyJson } from '@polkadot/types/types';

-import { decorateMethod } from '@polkadot/api/promise';
+import { decorateMethodPromise } from '@polkadot/api';

 import { Abi } from '../Abi';
 import { Code as BaseCode } from '../base';

 export class Code extends BaseCode<'promise'> {
  constructor (api: ApiPromise, abi: AnyJson | Abi, wasm: Uint8Array | string | Buffer | null | undefined) {
-    super(api, abi, wasm, decorateMethod);
+    super(api, abi, wasm, decorateMethodPromise);
  }
 }
@@ -4,14 +4,13 @@
 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';
+import { ApiPromise, decorateMethodPromise } from '@polkadot/api';

 import { Abi } from '../Abi';
 import { Contract as BaseContract } from '../base';

 export class Contract extends BaseContract<'promise'> {
  constructor (api: ApiPromise, abi: AnyJson | Abi, address: string | AccountId) {
-    super(api, abi, address, decorateMethod);
+    super(api, abi, address, decorateMethodPromise);
  }
 }
@@ -4,14 +4,13 @@
 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';
+import { ApiRx, decorateMethodRx } from '@polkadot/api';

 import { Abi } from '../Abi';
 import { Blueprint as BaseBlueprint } from '../base';

 export class Blueprint extends BaseBlueprint<'rxjs'> {
  constructor (api: ApiRx, abi: AnyJson | Abi, codeHash: string | Hash) {
-    super(api, abi, codeHash, decorateMethod);
+    super(api, abi, codeHash, decorateMethodRx);
  }
 }
@@ -4,13 +4,13 @@
 import type { ApiRx } from '@polkadot/api';
 import type { AnyJson } from '@polkadot/types/types';

-import { decorateMethod } from '@polkadot/api/rx';
+import { decorateMethodRx } from '@polkadot/api';

 import { Abi } from '../Abi';
 import { Code as BaseCode } from '../base';

 export class Code extends BaseCode<'rxjs'> {
  constructor (api: ApiRx, abi: AnyJson | Abi, wasm: Uint8Array | string | Buffer | null | undefined) {
-    super(api, abi, wasm, decorateMethod);
+    super(api, abi, wasm, decorateMethodRx);
  }
 }
@@ -4,14 +4,13 @@
 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';
+import { ApiRx, decorateMethodRx } from '@polkadot/api';

 import { Abi } from '../Abi';
 import { Contract as BaseContract } from '../base';

 export class Contract extends BaseContract<'rxjs'> {
  constructor (api: ApiRx, abi: AnyJson | Abi, address: string | AccountId) {
-    super(api, abi, address, decorateMethod);
+    super(api, abi, address, decorateMethodRx);
  }
 }
@@ -5,7 +5,7 @@ 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 { Codec, TypeDef } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
 import type { Abi } from '.';

@@ -42,7 +42,7 @@ export interface AbiMessage {
  method: string;
  returnType?: TypeDef | null;
  selector: ContractSelector;
-  toU8a: (params: CodecArg[]) => Uint8Array;
+  toU8a: (params: unknown[]) => Uint8Array;
 }

 export type AbiConstructor = AbiMessage;
@@ -55,6 +55,7 @@ export interface InterfaceContractCalls {
 export interface ContractCallOutcome {
  debugMessage: Text;
  gasConsumed: u64;
+  gasRequired: u64;
  output: Codec | null;
  result: ContractExecResultResult;
 }
@@ -70,12 +71,12 @@ export interface DecodedMessage {
 }

 export interface BlueprintOptions {
-  gasLimit?: BigInt | string | number | BN;
+  gasLimit?: bigint | string | number | BN;
  salt?: Uint8Array | string | null;
-  value?: BigInt | string | number | BN;
+  value?: bigint | string | number | BN;
 }

 export interface ContractOptions {
-  gasLimit?: BigInt | BN | string | number;
-  value?: BigInt | BN | string | number;
+  gasLimit?: bigint | BN | string | number;
+  value?: bigint | BN | string | number;
 }
@@ -3,7 +3,6 @@

 import type { SubmittableResult } from '@polkadot/api';
 import type { EventRecord } from '@polkadot/types/interfaces';
-import type { CodecArg } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
 import type { BlueprintOptions, ContractOptions } from './types';

@@ -25,11 +24,11 @@ export function applyOnEvent <T> (result: SubmittableResult, types: ContractEven
  return undefined;
 }

-export function isOptions <T> (options: BigInt | string | number | BN | T): options is T {
+export function isOptions <T> (options: bigint | string | number | BN | T): options is T {
  return !(isBn(options) || isBigInt(options) || isNumber(options) || isString(options));
 }

-export function extractOptions <T extends TOptions> (value: BigInt | string | number | BN, params: CodecArg[]): [T, CodecArg[]] {
+export function extractOptions <T extends TOptions> (value: bigint | string | number | BN, params: unknown[]): [T, unknown[]] {
  const gasLimit = params.shift() as BN;

  return [{ gasLimit, value } as T, params];
@@ -2,30 +2,30 @@
  {
    "displayName": "AccountId",
    "namespace": "ink_env::types",
-    "info": 6,
+    "info": "Plain",
    "type": "AccountId"
  },
  {
-    "info": 12,
+    "info": "VecFixed",
    "length": 32,
    "sub": {
-      "info": 6,
+      "info": "Plain",
      "type": "u8"
    },
    "type": "[u8;32]"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u8"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "i32"
  },
  {
    "displayName": "Hash",
    "namespace": "ink_env::types",
-    "info": 6,
+    "info": "Plain",
    "type": "Hash"
  }
 ]
@@ -2,20 +2,20 @@
  {
    "displayName": "Header",
    "namespace": "ink_storage::collections::stash",
-    "info": 9,
+    "info": "Struct",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "last_vacant"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "len"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "len_entries"
      }
@@ -23,7 +23,7 @@
    "type": "{\"last_vacant\":\"u32\",\"len\":\"u32\",\"len_entries\":\"u32\"}"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u32"
  },
  {
@@ -33,15 +33,15 @@
      {
        "displayName": "VacantEntry",
        "namespace": "ink_storage::collections::stash",
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "next"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "prev"
          }
@@ -52,45 +52,45 @@
      {
        "displayName": "Hash",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "Hash",
        "name": "Occupied"
      }
    ],
-    "info": 3,
+    "info": "Enum",
    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"Hash\"}}"
  },
  {
    "displayName": "Hash",
    "namespace": "ink_env::types",
-    "info": 6,
+    "info": "Plain",
    "type": "Hash"
  },
  {
-    "info": 12,
+    "info": "VecFixed",
    "length": 32,
    "sub": {
-      "info": 6,
+      "info": "Plain",
      "type": "u8"
    },
    "type": "[u8;32]"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u8"
  },
  {
    "displayName": "VacantEntry",
    "namespace": "ink_storage::collections::stash",
-    "info": 9,
+    "info": "Struct",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "next"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "prev"
      }
@@ -104,23 +104,23 @@
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId",
        "name": "value"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "key_index"
      }
    ],
-    "info": 9,
+    "info": "Struct",
    "type": "{\"value\":\"AccountId\",\"key_index\":\"u32\"}"
  },
  {
    "displayName": "AccountId",
    "namespace": "ink_env::types",
-    "info": 6,
+    "info": "Plain",
    "type": "AccountId"
  },
  {
@@ -128,7 +128,7 @@
    "sub": [
      {
        "name": "Ok",
-        "info": 10,
+        "info": "Tuple",
        "sub": [],
        "type": "()"
      },
@@ -136,13 +136,13 @@
        "name": "Error",
        "displayName": "Error",
        "namespace": "dns::dns",
-        "info": 3,
+        "info": "Enum",
        "sub": [
          {
            "ext": {
              "discriminant": 0
            },
-            "info": 6,
+            "info": "Plain",
            "name": "NameAlreadyExists",
            "type": "Null"
          },
@@ -150,7 +150,7 @@
            "ext": {
              "discriminant": 1
            },
-            "info": 6,
+            "info": "Plain",
            "name": "CallerIsNotOwner",
            "type": "Null"
          }
@@ -158,24 +158,24 @@
        "type": "{\"_enum\":[\"NameAlreadyExists\",\"CallerIsNotOwner\"]}"
      }
    ],
-    "info": 7,
+    "info": "Result",
    "type": "Result<(), Error>"
  },
  {
-    "info": 10,
+    "info": "Tuple",
    "sub": [],
    "type": "()"
  },
  {
    "displayName": "Error",
    "namespace": "dns::dns",
-    "info": 3,
+    "info": "Enum",
    "sub": [
      {
        "ext": {
          "discriminant": 0
        },
-        "info": 6,
+        "info": "Plain",
        "name": "NameAlreadyExists",
        "type": "Null"
      },
@@ -183,7 +183,7 @@
        "ext": {
          "discriminant": 1
        },
-        "info": 6,
+        "info": "Plain",
        "name": "CallerIsNotOwner",
        "type": "Null"
      }
@@ -195,10 +195,10 @@
    "sub": {
      "displayName": "AccountId",
      "namespace": "ink_env::types",
-      "info": 6,
+      "info": "Plain",
      "type": "AccountId"
    },
-    "info": 5,
+    "info": "Option",
    "type": "Option<AccountId>"
  }
 ]
@@ -1,25 +1,25 @@
 [
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u128"
  },
  {
    "displayName": "Header",
    "namespace": "ink_storage::collections::stash",
-    "info": 9,
+    "info": "Struct",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "last_vacant"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "len"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "len_entries"
      }
@@ -27,7 +27,7 @@
    "type": "{\"last_vacant\":\"u32\",\"len\":\"u32\",\"len_entries\":\"u32\"}"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u32"
  },
  {
@@ -37,15 +37,15 @@
      {
        "displayName": "VacantEntry",
        "namespace": "ink_storage::collections::stash",
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "next"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "prev"
          }
@@ -56,45 +56,45 @@
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId",
        "name": "Occupied"
      }
    ],
-    "info": 3,
+    "info": "Enum",
    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"AccountId\"}}"
  },
  {
    "displayName": "AccountId",
    "namespace": "ink_env::types",
-    "info": 6,
+    "info": "Plain",
    "type": "AccountId"
  },
  {
-    "info": 12,
+    "info": "VecFixed",
    "length": 32,
    "sub": {
-      "info": 6,
+      "info": "Plain",
      "type": "u8"
    },
    "type": "[u8;32]"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u8"
  },
  {
    "displayName": "VacantEntry",
    "namespace": "ink_storage::collections::stash",
-    "info": 9,
+    "info": "Struct",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "next"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "prev"
      }
@@ -106,17 +106,17 @@
    "namespace": "ink_storage::collections::hashmap",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u128",
        "name": "value"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "key_index"
      }
    ],
-    "info": 9,
+    "info": "Struct",
    "type": "{\"value\":\"u128\",\"key_index\":\"u32\"}"
  },
  {
@@ -126,15 +126,15 @@
      {
        "displayName": "VacantEntry",
        "namespace": "ink_storage::collections::stash",
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "next"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "prev"
          }
@@ -143,48 +143,48 @@
        "name": "Vacant"
      },
      {
-        "info": 10,
+        "info": "Tuple",
        "sub": [
          {
            "displayName": "AccountId",
            "namespace": "ink_env::types",
-            "info": 6,
+            "info": "Plain",
            "type": "AccountId"
          },
          {
            "displayName": "AccountId",
            "namespace": "ink_env::types",
-            "info": 6,
+            "info": "Plain",
            "type": "AccountId"
          }
        ],
-        "type": "(AccountId, AccountId)",
+        "type": "(AccountId,AccountId)",
        "name": "Occupied"
      }
    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(AccountId, AccountId)\"}}"
+    "info": "Enum",
+    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(AccountId,AccountId)\"}}"
  },
  {
-    "info": 10,
+    "info": "Tuple",
    "sub": [
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId"
      },
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId"
      }
    ],
-    "type": "(AccountId, AccountId)"
+    "type": "(AccountId,AccountId)"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "bool"
  },
  {
@@ -192,10 +192,10 @@
    "sub": {
      "displayName": "AccountId",
      "namespace": "ink_env::types",
-      "info": 6,
+      "info": "Plain",
      "type": "AccountId"
    },
-    "info": 5,
+    "info": "Option",
    "type": "Option<AccountId>"
  }
 ]
@@ -2,20 +2,20 @@
  {
    "displayName": "Header",
    "namespace": "ink_storage::collections::stash",
-    "info": 9,
+    "info": "Struct",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "last_vacant"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "len"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "len_entries"
      }
@@ -23,7 +23,7 @@
    "type": "{\"last_vacant\":\"u32\",\"len\":\"u32\",\"len_entries\":\"u32\"}"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u32"
  },
  {
@@ -33,15 +33,15 @@
      {
        "displayName": "VacantEntry",
        "namespace": "ink_storage::collections::stash",
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "next"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "prev"
          }
@@ -50,26 +50,26 @@
        "name": "Vacant"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "Occupied"
      }
    ],
-    "info": 3,
+    "info": "Enum",
    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"u32\"}}"
  },
  {
    "displayName": "VacantEntry",
    "namespace": "ink_storage::collections::stash",
-    "info": 9,
+    "info": "Struct",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "next"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "prev"
      }
@@ -83,36 +83,36 @@
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId",
        "name": "value"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "key_index"
      }
    ],
-    "info": 9,
+    "info": "Struct",
    "type": "{\"value\":\"AccountId\",\"key_index\":\"u32\"}"
  },
  {
    "displayName": "AccountId",
    "namespace": "ink_env::types",
-    "info": 6,
+    "info": "Plain",
    "type": "AccountId"
  },
  {
-    "info": 12,
+    "info": "VecFixed",
    "length": 32,
    "sub": {
-      "info": 6,
+      "info": "Plain",
      "type": "u8"
    },
    "type": "[u8;32]"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u8"
  },
  {
@@ -122,15 +122,15 @@
      {
        "displayName": "VacantEntry",
        "namespace": "ink_storage::collections::stash",
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "next"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "prev"
          }
@@ -141,12 +141,12 @@
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId",
        "name": "Occupied"
      }
    ],
-    "info": 3,
+    "info": "Enum",
    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"AccountId\"}}"
  },
  {
@@ -154,17 +154,17 @@
    "namespace": "ink_storage::collections::hashmap",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "value"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "key_index"
      }
    ],
-    "info": 9,
+    "info": "Struct",
    "type": "{\"value\":\"u32\",\"key_index\":\"u32\"}"
  },
  {
@@ -174,15 +174,15 @@
      {
        "displayName": "VacantEntry",
        "namespace": "ink_storage::collections::stash",
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "next"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "prev"
          }
@@ -191,66 +191,66 @@
        "name": "Vacant"
      },
      {
-        "info": 10,
+        "info": "Tuple",
        "sub": [
          {
            "displayName": "AccountId",
            "namespace": "ink_env::types",
-            "info": 6,
+            "info": "Plain",
            "type": "AccountId"
          },
          {
            "displayName": "AccountId",
            "namespace": "ink_env::types",
-            "info": 6,
+            "info": "Plain",
            "type": "AccountId"
          }
        ],
-        "type": "(AccountId, AccountId)",
+        "type": "(AccountId,AccountId)",
        "name": "Occupied"
      }
    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(AccountId, AccountId)\"}}"
+    "info": "Enum",
+    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(AccountId,AccountId)\"}}"
  },
  {
-    "info": 10,
+    "info": "Tuple",
    "sub": [
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId"
      },
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId"
      }
    ],
-    "type": "(AccountId, AccountId)"
+    "type": "(AccountId,AccountId)"
  },
  {
    "displayName": "ValueEntry",
    "namespace": "ink_storage::collections::hashmap",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "bool",
        "name": "value"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "key_index"
      }
    ],
-    "info": 9,
+    "info": "Struct",
    "type": "{\"value\":\"bool\",\"key_index\":\"u32\"}"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "bool"
  },
  {
@@ -258,10 +258,10 @@
    "sub": {
      "displayName": "AccountId",
      "namespace": "ink_env::types",
-      "info": 6,
+      "info": "Plain",
      "type": "AccountId"
    },
-    "info": 5,
+    "info": "Option",
    "type": "Option<AccountId>"
  },
  {
@@ -269,7 +269,7 @@
    "sub": [
      {
        "name": "Ok",
-        "info": 10,
+        "info": "Tuple",
        "sub": [],
        "type": "()"
      },
@@ -277,13 +277,13 @@
        "name": "Error",
        "displayName": "Error",
        "namespace": "erc721::erc721",
-        "info": 3,
+        "info": "Enum",
        "sub": [
          {
            "ext": {
              "discriminant": 0
            },
-            "info": 6,
+            "info": "Plain",
            "name": "NotOwner",
            "type": "Null"
          },
@@ -291,7 +291,7 @@
            "ext": {
              "discriminant": 1
            },
-            "info": 6,
+            "info": "Plain",
            "name": "NotApproved",
            "type": "Null"
          },
@@ -299,7 +299,7 @@
            "ext": {
              "discriminant": 2
            },
-            "info": 6,
+            "info": "Plain",
            "name": "TokenExists",
            "type": "Null"
          },
@@ -307,7 +307,7 @@
            "ext": {
              "discriminant": 3
            },
-            "info": 6,
+            "info": "Plain",
            "name": "TokenNotFound",
            "type": "Null"
          },
@@ -315,7 +315,7 @@
            "ext": {
              "discriminant": 4
            },
-            "info": 6,
+            "info": "Plain",
            "name": "CannotInsert",
            "type": "Null"
          },
@@ -323,7 +323,7 @@
            "ext": {
              "discriminant": 5
            },
-            "info": 6,
+            "info": "Plain",
            "name": "CannotRemove",
            "type": "Null"
          },
@@ -331,7 +331,7 @@
            "ext": {
              "discriminant": 6
            },
-            "info": 6,
+            "info": "Plain",
            "name": "CannotFetchValue",
            "type": "Null"
          },
@@ -339,7 +339,7 @@
            "ext": {
              "discriminant": 7
            },
-            "info": 6,
+            "info": "Plain",
            "name": "NotAllowed",
            "type": "Null"
          }
@@ -347,24 +347,24 @@
        "type": "{\"_enum\":[\"NotOwner\",\"NotApproved\",\"TokenExists\",\"TokenNotFound\",\"CannotInsert\",\"CannotRemove\",\"CannotFetchValue\",\"NotAllowed\"]}"
      }
    ],
-    "info": 7,
+    "info": "Result",
    "type": "Result<(), Error>"
  },
  {
-    "info": 10,
+    "info": "Tuple",
    "sub": [],
    "type": "()"
  },
  {
    "displayName": "Error",
    "namespace": "erc721::erc721",
-    "info": 3,
+    "info": "Enum",
    "sub": [
      {
        "ext": {
          "discriminant": 0
        },
-        "info": 6,
+        "info": "Plain",
        "name": "NotOwner",
        "type": "Null"
      },
@@ -372,7 +372,7 @@
        "ext": {
          "discriminant": 1
        },
-        "info": 6,
+        "info": "Plain",
        "name": "NotApproved",
        "type": "Null"
      },
@@ -380,7 +380,7 @@
        "ext": {
          "discriminant": 2
        },
-        "info": 6,
+        "info": "Plain",
        "name": "TokenExists",
        "type": "Null"
      },
@@ -388,7 +388,7 @@
        "ext": {
          "discriminant": 3
        },
-        "info": 6,
+        "info": "Plain",
        "name": "TokenNotFound",
        "type": "Null"
      },
@@ -396,7 +396,7 @@
        "ext": {
          "discriminant": 4
        },
-        "info": 6,
+        "info": "Plain",
        "name": "CannotInsert",
        "type": "Null"
      },
@@ -404,7 +404,7 @@
        "ext": {
          "discriminant": 5
        },
-        "info": 6,
+        "info": "Plain",
        "name": "CannotRemove",
        "type": "Null"
      },
@@ -412,7 +412,7 @@
        "ext": {
          "discriminant": 6
        },
-        "info": 6,
+        "info": "Plain",
        "name": "CannotFetchValue",
        "type": "Null"
      },
@@ -420,7 +420,7 @@
        "ext": {
          "discriminant": 7
        },
-        "info": 6,
+        "info": "Plain",
        "name": "NotAllowed",
        "type": "Null"
      }
@@ -1,6 +1,6 @@
 [
  {
-    "info": 6,
+    "info": "Plain",
    "type": "bool"
  }
 ]
@@ -1,6 +1,6 @@
 [
  {
-    "info": 6,
+    "info": "Plain",
    "type": "bool"
  }
 ]
@@ -1,6 +1,6 @@
 [
  {
-    "info": 6,
+    "info": "Plain",
    "type": "i32"
  }
 ]
@@ -2,20 +2,20 @@
  {
    "displayName": "Header",
    "namespace": "ink_storage::collections::stash",
-    "info": 9,
+    "info": "Struct",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "last_vacant"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "len"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "len_entries"
      }
@@ -23,7 +23,7 @@
    "type": "{\"last_vacant\":\"u32\",\"len\":\"u32\",\"len_entries\":\"u32\"}"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u32"
  },
  {
@@ -33,15 +33,15 @@
      {
        "displayName": "VacantEntry",
        "namespace": "ink_storage::collections::stash",
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "next"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "prev"
          }
@@ -50,73 +50,73 @@
        "name": "Vacant"
      },
      {
-        "info": 10,
+        "info": "Tuple",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32"
          },
          {
            "displayName": "AccountId",
            "namespace": "ink_env::types",
-            "info": 6,
+            "info": "Plain",
            "type": "AccountId"
          }
        ],
-        "type": "(u32, AccountId)",
+        "type": "(u32,AccountId)",
        "name": "Occupied"
      }
    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(u32, AccountId)\"}}"
+    "info": "Enum",
+    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(u32,AccountId)\"}}"
  },
  {
-    "info": 10,
+    "info": "Tuple",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32"
      },
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId"
      }
    ],
-    "type": "(u32, AccountId)"
+    "type": "(u32,AccountId)"
  },
  {
    "displayName": "AccountId",
    "namespace": "ink_env::types",
-    "info": 6,
+    "info": "Plain",
    "type": "AccountId"
  },
  {
-    "info": 12,
+    "info": "VecFixed",
    "length": 32,
    "sub": {
-      "info": 6,
+      "info": "Plain",
      "type": "u8"
    },
    "type": "[u8;32]"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u8"
  },
  {
    "displayName": "VacantEntry",
    "namespace": "ink_storage::collections::stash",
-    "info": 9,
+    "info": "Struct",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "next"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "prev"
      }
@@ -128,22 +128,22 @@
    "namespace": "ink_storage::collections::hashmap",
    "sub": [
      {
-        "info": 10,
+        "info": "Tuple",
        "sub": [],
        "type": "()",
        "name": "value"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "key_index"
      }
    ],
-    "info": 9,
+    "info": "Struct",
    "type": "{\"value\":\"()\",\"key_index\":\"u32\"}"
  },
  {
-    "info": 10,
+    "info": "Tuple",
    "sub": [],
    "type": "()"
  },
@@ -154,15 +154,15 @@
      {
        "displayName": "VacantEntry",
        "namespace": "ink_storage::collections::stash",
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "next"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "prev"
          }
@@ -171,12 +171,12 @@
        "name": "Vacant"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "Occupied"
      }
    ],
-    "info": 3,
+    "info": "Enum",
    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"u32\"}}"
  },
  {
@@ -184,17 +184,17 @@
    "namespace": "ink_storage::collections::hashmap",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "value"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "key_index"
      }
    ],
-    "info": 9,
+    "info": "Struct",
    "type": "{\"value\":\"u32\",\"key_index\":\"u32\"}"
  },
  {
@@ -204,15 +204,15 @@
      {
        "displayName": "VacantEntry",
        "namespace": "ink_storage::collections::stash",
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "next"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "prev"
          }
@@ -223,41 +223,41 @@
      {
        "displayName": "Transaction",
        "namespace": "multisig_plain::multisig_plain",
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
            "displayName": "AccountId",
            "namespace": "ink_env::types",
-            "info": 6,
+            "info": "Plain",
            "type": "AccountId",
            "name": "callee"
          },
          {
-            "info": 12,
+            "info": "VecFixed",
            "length": 4,
            "sub": {
-              "info": 6,
+              "info": "Plain",
              "type": "u8"
            },
            "type": "[u8;4]",
            "name": "selector"
          },
          {
-            "info": 11,
+            "info": "Vec",
            "sub": {
-              "info": 6,
+              "info": "Plain",
              "type": "u8"
            },
            "type": "Vec<u8>",
            "name": "input"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u128",
            "name": "transferred_value"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u64",
            "name": "gas_limit"
          }
@@ -266,47 +266,47 @@
        "name": "Occupied"
      }
    ],
-    "info": 3,
+    "info": "Enum",
    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"Transaction\"}}"
  },
  {
    "displayName": "Transaction",
    "namespace": "multisig_plain::multisig_plain",
-    "info": 9,
+    "info": "Struct",
    "sub": [
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId",
        "name": "callee"
      },
      {
-        "info": 12,
+        "info": "VecFixed",
        "length": 4,
        "sub": {
-          "info": 6,
+          "info": "Plain",
          "type": "u8"
        },
        "type": "[u8;4]",
        "name": "selector"
      },
      {
-        "info": 11,
+        "info": "Vec",
        "sub": {
-          "info": 6,
+          "info": "Plain",
          "type": "u8"
        },
        "type": "Vec<u8>",
        "name": "input"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u128",
        "name": "transferred_value"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u64",
        "name": "gas_limit"
      }
@@ -314,28 +314,28 @@
    "type": "{\"callee\":\"AccountId\",\"selector\":\"[u8;4]\",\"input\":\"Vec<u8>\",\"transferred_value\":\"u128\",\"gas_limit\":\"u64\"}"
  },
  {
-    "info": 12,
+    "info": "VecFixed",
    "length": 4,
    "sub": {
-      "info": 6,
+      "info": "Plain",
      "type": "u8"
    },
    "type": "[u8;4]"
  },
  {
-    "info": 11,
+    "info": "Vec",
    "sub": {
-      "info": 6,
+      "info": "Plain",
      "type": "u8"
    },
    "type": "Vec<u8>"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u128"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u64"
  },
  {
@@ -345,15 +345,15 @@
      {
        "displayName": "VacantEntry",
        "namespace": "ink_storage::collections::stash",
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "next"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "prev"
          }
@@ -364,44 +364,44 @@
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId",
        "name": "Occupied"
      }
    ],
-    "info": 3,
+    "info": "Enum",
    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"AccountId\"}}"
  },
  {
-    "info": 11,
+    "info": "Vec",
    "sub": {
      "displayName": "AccountId",
      "namespace": "ink_env::types",
-      "info": 6,
+      "info": "Plain",
      "type": "AccountId"
    },
    "type": "Vec<AccountId>"
  },
  {
-    "info": 10,
+    "info": "Tuple",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32"
      },
      {
        "displayName": "ConfirmationStatus",
        "namespace": "multisig_plain::multisig_plain",
-        "info": 3,
+        "info": "Enum",
        "sub": [
          {
-            "info": 10,
+            "info": "Tuple",
            "sub": [],
            "name": "Confirmed",
            "type": "()"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "ConfirmationsNeeded"
          }
@@ -409,21 +409,21 @@
        "type": "{\"_enum\":{\"Confirmed\":\"()\",\"ConfirmationsNeeded\":\"u32\"}}"
      }
    ],
-    "type": "(u32, ConfirmationStatus)"
+    "type": "(u32,ConfirmationStatus)"
  },
  {
    "displayName": "ConfirmationStatus",
    "namespace": "multisig_plain::multisig_plain",
-    "info": 3,
+    "info": "Enum",
    "sub": [
      {
-        "info": 10,
+        "info": "Tuple",
        "sub": [],
        "name": "Confirmed",
        "type": "()"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "ConfirmationsNeeded"
      }
@@ -435,18 +435,18 @@
    "sub": [
      {
        "name": "Ok",
-        "info": 10,
+        "info": "Tuple",
        "sub": [],
        "type": "()"
      },
      {
        "name": "Error",
-        "info": 10,
+        "info": "Tuple",
        "sub": [],
        "type": "()"
      }
    ],
-    "info": 7,
+    "info": "Result",
    "type": "Result<(), ()>"
  },
  {
@@ -454,21 +454,21 @@
    "sub": [
      {
        "name": "Ok",
-        "info": 11,
+        "info": "Vec",
        "sub": {
-          "info": 6,
+          "info": "Plain",
          "type": "u8"
        },
        "type": "Vec<u8>"
      },
      {
        "name": "Error",
-        "info": 10,
+        "info": "Tuple",
        "sub": [],
        "type": "()"
      }
    ],
-    "info": 7,
+    "info": "Result",
    "type": "Result<Vec<u8>, ()>"
  },
  {
@@ -478,37 +478,37 @@
        "name": "Ok",
        "displayName": "Option",
        "sub": {
-          "info": 11,
+          "info": "Vec",
          "sub": {
-            "info": 6,
+            "info": "Plain",
            "type": "u8"
          },
          "type": "Vec<u8>"
        },
-        "info": 5,
+        "info": "Option",
        "type": "Option<Vec<u8>>"
      },
      {
        "name": "Error",
-        "info": 10,
+        "info": "Tuple",
        "sub": [],
        "type": "()"
      }
    ],
-    "info": 7,
+    "info": "Result",
    "type": "Result<Option<Vec<u8>>, ()>"
  },
  {
    "displayName": "Option",
    "sub": {
-      "info": 11,
+      "info": "Vec",
      "sub": {
-        "info": 6,
+        "info": "Plain",
        "type": "u8"
      },
      "type": "Vec<u8>"
    },
-    "info": 5,
+    "info": "Option",
    "type": "Option<Vec<u8>>"
  }
 ]
@@ -1,6 +1,6 @@
 [
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u256"
  }
 ]
@@ -1,28 +1,28 @@
 [
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u256"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u8"
  },
  {
-    "info": 12,
+    "info": "VecFixed",
    "length": 32,
    "sub": {
-      "info": 6,
+      "info": "Plain",
      "type": "u8"
    },
    "type": "[u8;32]"
  },
  {
    "displayName": "AccountId",
-    "info": 6,
+    "info": "Plain",
    "type": "AccountId"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "Text"
  }
 ]
@@ -1,23 +1,23 @@
 [
  {
-    "info": 6,
+    "info": "Plain",
    "type": "i32"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u32"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u8"
  },
  {
    "displayName": "Variant",
    "namespace": "enum_example::enum_example",
-    "info": 3,
+    "info": "Enum",
    "sub": [
      {
-        "info": 10,
+        "info": "Tuple",
        "sub": [],
        "name": "None",
        "type": "()"
@@ -25,13 +25,13 @@
      {
        "displayName": "Weekday",
        "namespace": "enum_example::enum_example",
-        "info": 3,
+        "info": "Enum",
        "sub": [
          {
            "ext": {
              "discriminant": 0
            },
-            "info": 6,
+            "info": "Plain",
            "name": "Monday",
            "type": "Null"
          },
@@ -39,7 +39,7 @@
            "ext": {
              "discriminant": 1
            },
-            "info": 6,
+            "info": "Plain",
            "name": "Tuesday",
            "type": "Null"
          },
@@ -47,7 +47,7 @@
            "ext": {
              "discriminant": 2
            },
-            "info": 6,
+            "info": "Plain",
            "name": "Wednesday",
            "type": "Null"
          },
@@ -55,7 +55,7 @@
            "ext": {
              "discriminant": 3
            },
-            "info": 6,
+            "info": "Plain",
            "name": "Thursday",
            "type": "Null"
          },
@@ -63,7 +63,7 @@
            "ext": {
              "discriminant": 4
            },
-            "info": 6,
+            "info": "Plain",
            "name": "Friday",
            "type": "Null"
          },
@@ -71,7 +71,7 @@
            "ext": {
              "discriminant": 5
            },
-            "info": 6,
+            "info": "Plain",
            "name": "Saturday",
            "type": "Null"
          },
@@ -79,7 +79,7 @@
            "ext": {
              "discriminant": 6
            },
-            "info": 6,
+            "info": "Plain",
            "name": "Sunday",
            "type": "Null"
          }
@@ -90,15 +90,15 @@
      {
        "displayName": "TupleMaybeSigned",
        "namespace": "enum_example::enum_example",
-        "info": 3,
+        "info": "Enum",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "i32",
            "name": "Signed"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "Unsigned"
          }
@@ -109,13 +109,13 @@
      {
        "displayName": "NamedMaybeSigned",
        "namespace": "enum_example::enum_example",
-        "info": 3,
+        "info": "Enum",
        "sub": [
          {
-            "info": 9,
+            "info": "Struct",
            "sub": [
              {
-                "info": 6,
+                "info": "Plain",
                "type": "i32",
                "name": "value"
              }
@@ -124,10 +124,10 @@
            "type": "{\"value\":\"i32\"}"
          },
          {
-            "info": 9,
+            "info": "Struct",
            "sub": [
              {
-                "info": 6,
+                "info": "Plain",
                "type": "u32",
                "name": "value"
              }
@@ -142,47 +142,47 @@
      {
        "displayName": "Color",
        "namespace": "enum_example::enum_example",
-        "info": 3,
+        "info": "Enum",
        "sub": [
          {
-            "info": 10,
+            "info": "Tuple",
            "sub": [],
            "name": "Red",
            "type": "()"
          },
          {
-            "info": 10,
+            "info": "Tuple",
            "sub": [],
            "name": "Blue",
            "type": "()"
          },
          {
-            "info": 10,
+            "info": "Tuple",
            "sub": [],
            "name": "Green",
            "type": "()"
          },
          {
-            "info": 10,
+            "info": "Tuple",
            "sub": [],
            "name": "Yellow",
            "type": "()"
          },
          {
-            "info": 9,
+            "info": "Struct",
            "sub": [
              {
-                "info": 6,
+                "info": "Plain",
                "type": "u8",
                "name": "r"
              },
              {
-                "info": 6,
+                "info": "Plain",
                "type": "u8",
                "name": "g"
              },
              {
-                "info": 6,
+                "info": "Plain",
                "type": "u8",
                "name": "b"
              }
@@ -191,25 +191,25 @@
            "type": "{\"r\":\"u8\",\"g\":\"u8\",\"b\":\"u8\"}"
          },
          {
-            "info": 9,
+            "info": "Struct",
            "sub": [
              {
-                "info": 6,
+                "info": "Plain",
                "type": "u8",
                "name": "r"
              },
              {
-                "info": 6,
+                "info": "Plain",
                "type": "u8",
                "name": "g"
              },
              {
-                "info": 6,
+                "info": "Plain",
                "type": "u8",
                "name": "b"
              },
              {
-                "info": 6,
+                "info": "Plain",
                "type": "u8",
                "name": "a"
              }
@@ -227,13 +227,13 @@
  {
    "displayName": "Weekday",
    "namespace": "enum_example::enum_example",
-    "info": 3,
+    "info": "Enum",
    "sub": [
      {
        "ext": {
          "discriminant": 0
        },
-        "info": 6,
+        "info": "Plain",
        "name": "Monday",
        "type": "Null"
      },
@@ -241,7 +241,7 @@
        "ext": {
          "discriminant": 1
        },
-        "info": 6,
+        "info": "Plain",
        "name": "Tuesday",
        "type": "Null"
      },
@@ -249,7 +249,7 @@
        "ext": {
          "discriminant": 2
        },
-        "info": 6,
+        "info": "Plain",
        "name": "Wednesday",
        "type": "Null"
      },
@@ -257,7 +257,7 @@
        "ext": {
          "discriminant": 3
        },
-        "info": 6,
+        "info": "Plain",
        "name": "Thursday",
        "type": "Null"
      },
@@ -265,7 +265,7 @@
        "ext": {
          "discriminant": 4
        },
-        "info": 6,
+        "info": "Plain",
        "name": "Friday",
        "type": "Null"
      },
@@ -273,7 +273,7 @@
        "ext": {
          "discriminant": 5
        },
-        "info": 6,
+        "info": "Plain",
        "name": "Saturday",
        "type": "Null"
      },
@@ -281,7 +281,7 @@
        "ext": {
          "discriminant": 6
        },
-        "info": 6,
+        "info": "Plain",
        "name": "Sunday",
        "type": "Null"
      }
@@ -291,15 +291,15 @@
  {
    "displayName": "TupleMaybeSigned",
    "namespace": "enum_example::enum_example",
-    "info": 3,
+    "info": "Enum",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "i32",
        "name": "Signed"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "Unsigned"
      }
@@ -309,13 +309,13 @@
  {
    "displayName": "NamedMaybeSigned",
    "namespace": "enum_example::enum_example",
-    "info": 3,
+    "info": "Enum",
    "sub": [
      {
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "i32",
            "name": "value"
          }
@@ -324,10 +324,10 @@
        "type": "{\"value\":\"i32\"}"
      },
      {
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "value"
          }
@@ -341,47 +341,47 @@
  {
    "displayName": "Color",
    "namespace": "enum_example::enum_example",
-    "info": 3,
+    "info": "Enum",
    "sub": [
      {
-        "info": 10,
+        "info": "Tuple",
        "sub": [],
        "name": "Red",
        "type": "()"
      },
      {
-        "info": 10,
+        "info": "Tuple",
        "sub": [],
        "name": "Blue",
        "type": "()"
      },
      {
-        "info": 10,
+        "info": "Tuple",
        "sub": [],
        "name": "Green",
        "type": "()"
      },
      {
-        "info": 10,
+        "info": "Tuple",
        "sub": [],
        "name": "Yellow",
        "type": "()"
      },
      {
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u8",
            "name": "r"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u8",
            "name": "g"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u8",
            "name": "b"
          }
@@ -390,25 +390,25 @@
        "type": "{\"r\":\"u8\",\"g\":\"u8\",\"b\":\"u8\"}"
      },
      {
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u8",
            "name": "r"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u8",
            "name": "g"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u8",
            "name": "b"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u8",
            "name": "a"
          }
@@ -1,25 +1,25 @@
 [
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u128"
  },
  {
    "displayName": "Header",
    "namespace": "ink_storage::collections::stash",
-    "info": 9,
+    "info": "Struct",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "last_vacant"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "len"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "len_entries"
      }
@@ -27,7 +27,7 @@
    "type": "{\"last_vacant\":\"u32\",\"len\":\"u32\",\"len_entries\":\"u32\"}"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u32"
  },
  {
@@ -37,15 +37,15 @@
      {
        "displayName": "VacantEntry",
        "namespace": "ink_storage::collections::stash",
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "next"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "prev"
          }
@@ -56,45 +56,45 @@
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId",
        "name": "Occupied"
      }
    ],
-    "info": 3,
+    "info": "Enum",
    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"AccountId\"}}"
  },
  {
    "displayName": "AccountId",
    "namespace": "ink_env::types",
-    "info": 6,
+    "info": "Plain",
    "type": "AccountId"
  },
  {
-    "info": 12,
+    "info": "VecFixed",
    "length": 32,
    "sub": {
-      "info": 6,
+      "info": "Plain",
      "type": "u8"
    },
    "type": "[u8;32]"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "u8"
  },
  {
    "displayName": "VacantEntry",
    "namespace": "ink_storage::collections::stash",
-    "info": 9,
+    "info": "Struct",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "next"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "prev"
      }
@@ -106,17 +106,17 @@
    "namespace": "ink_storage::collections::hashmap",
    "sub": [
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u128",
        "name": "value"
      },
      {
-        "info": 6,
+        "info": "Plain",
        "type": "u32",
        "name": "key_index"
      }
    ],
-    "info": 9,
+    "info": "Struct",
    "type": "{\"value\":\"u128\",\"key_index\":\"u32\"}"
  },
  {
@@ -126,15 +126,15 @@
      {
        "displayName": "VacantEntry",
        "namespace": "ink_storage::collections::stash",
-        "info": 9,
+        "info": "Struct",
        "sub": [
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "next"
          },
          {
-            "info": 6,
+            "info": "Plain",
            "type": "u32",
            "name": "prev"
          }
@@ -143,52 +143,52 @@
        "name": "Vacant"
      },
      {
-        "info": 10,
+        "info": "Tuple",
        "sub": [
          {
            "displayName": "AccountId",
            "namespace": "ink_env::types",
-            "info": 6,
+            "info": "Plain",
            "type": "AccountId"
          },
          {
            "displayName": "AccountId",
            "namespace": "ink_env::types",
-            "info": 6,
+            "info": "Plain",
            "type": "AccountId"
          }
        ],
-        "type": "(AccountId, AccountId)",
+        "type": "(AccountId,AccountId)",
        "name": "Occupied"
      }
    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(AccountId, AccountId)\"}}"
+    "info": "Enum",
+    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(AccountId,AccountId)\"}}"
  },
  {
-    "info": 10,
+    "info": "Tuple",
    "sub": [
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId"
      },
      {
        "displayName": "AccountId",
        "namespace": "ink_env::types",
-        "info": 6,
+        "info": "Plain",
        "type": "AccountId"
      }
    ],
-    "type": "(AccountId, AccountId)"
+    "type": "(AccountId,AccountId)"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "Text"
  },
  {
-    "info": 6,
+    "info": "Plain",
    "type": "bool"
  },
  {
@@ -196,10 +196,10 @@
    "sub": {
      "displayName": "AccountId",
      "namespace": "ink_env::types",
-      "info": 6,
+      "info": "Plain",
      "type": "AccountId"
    },
-    "info": 5,
+    "info": "Option",
    "type": "Option<AccountId>"
  }
 ]
@@ -1,6 +1,6 @@
 {
  "name": "@polkadot/api-derive",
-  "version": "4.15.1",
+  "version": "6.1.2",
  "type": "module",
  "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
  "main": "index.js",
@@ -19,16 +19,16 @@
  "bugs": "https://github.com/polkadot-js/api/issues",
  "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-derive#readme",
  "dependencies": {
-    "@babel/runtime": "^7.14.5",
-    "@polkadot/api": "4.15.1",
-    "@polkadot/rpc-core": "4.15.1",
-    "@polkadot/types": "4.15.1",
-    "@polkadot/util": "^6.9.1",
-    "@polkadot/util-crypto": "^6.9.1",
-    "@polkadot/x-rxjs": "^6.9.1"
+    "@babel/runtime": "^7.15.4",
+    "@polkadot/api": "6.1.2",
+    "@polkadot/rpc-core": "6.1.2",
+    "@polkadot/types": "6.1.2",
+    "@polkadot/util": "^7.4.1",
+    "@polkadot/util-crypto": "^7.4.1",
+    "rxjs": "^7.3.0"
  },
  "devDependencies": {
-    "@polkadot/keyring": "^6.9.1",
-    "@polkadot/rpc-provider": "4.15.1"
+    "@polkadot/keyring": "^7.4.1",
+    "@polkadot/rpc-provider": "6.1.2"
  }
 }
@@ -1,14 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
+
+import { map, of } from 'rxjs';

 import { assertReturn, isU8a } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';

 import { memo } from '../util';

@@ -1,15 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+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 { Observable } from '@polkadot/x-rxjs';
 import type { DeriveAccountFlags } from '../types';

-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of } from 'rxjs';

 import { memo } from '../util';

@@ -47,9 +46,9 @@ export function flags (instanceId: string, api: ApiInterfaceRx): (address?: Acco
        ? 'electionsPhragmen'
        : 'elections';

-    return combineLatest<FlagsIntermediate>([
+    return combineLatest([
      address && api.query[councilSection]?.members
-        ? api.query[councilSection].members()
+        ? api.query[councilSection].members<Vec<ITuple<[AccountId, Balance]>>>()
        : of(undefined),
      address && api.query.council?.members
        ? api.query.council.members()
@@ -1,15 +1,15 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { AccountIdAndIndex } from '../types';

+import { map, of } from 'rxjs';
+
 import { isU8a } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';

 import { memo } from '../util';

@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId, AccountIndex } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { AccountIndexes } from '../types';

-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';

 import { memo } from '../util';

@@ -1,16 +1,16 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+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 { Observable } from '@polkadot/x-rxjs';
 import type { DeriveAccountRegistration, DeriveHasIdentity } from '../types';

+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { isHex, u8aToString } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';

 import { memo } from '../util';

@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option } from '@polkadot/types';
 import type { AccountId, AccountIndex, BalanceOf } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';

-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { map, of } from 'rxjs';

 import { memo } from '../util';

@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { AccountIndexes } from '../types';

-import { of } from '@polkadot/x-rxjs';
-import { map, startWith } from '@polkadot/x-rxjs/operators';
+import { map, of, startWith } from 'rxjs';

 import { memo } from '../util';

@@ -1,16 +1,16 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+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 { Observable } from '@polkadot/x-rxjs';
 import type { DeriveAccountInfo, DeriveAccountRegistration } from '../types';

+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { u8aToString } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';

 import { memo } from '../util';

@@ -1,15 +1,15 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import type { ApiInterfaceRx, QueryableStorageMultiArg } from '@polkadot/api/types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx, QueryableStorageEntry } from '@polkadot/api/types';
 import type { AccountData, AccountId, AccountIndex, AccountInfo, Address, Balance, Index } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveBalancesAccount, DeriveBalancesAccountData } from '../types';

-import { assert, isFunction } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
+
+import { isFunction } from '@polkadot/util';

 import { memo } from '../util';

@@ -39,15 +39,11 @@ function getBalance (api: ApiInterfaceRx, [freeBalance, reservedBalance, frozenF
  };
 }

-function calcBalances (api: ApiInterfaceRx, [accountId, [accountNonce, balances]]: [AccountId, Result]): DeriveBalancesAccount {
-  const primary = balances[0];
-
-  assert(primary, 'No balances retrieved for account');
-
+function calcBalances (api: ApiInterfaceRx, [accountId, [accountNonce, [primary, ...additional]]]: [AccountId, Result]): DeriveBalancesAccount {
  return {
    accountId,
    accountNonce,
-    additional: balances.filter((_, index) => index !== 0).map((b) => getBalance(api, b)),
+    additional: additional.map((b) => getBalance(api, b)),
    ...getBalance(api, primary)
  };
 }
@@ -66,34 +62,44 @@ function queryBalancesFree (api: ApiInterfaceRx, accountId: AccountId): Observab
  );
 }

-function querySystemNonce (api: ApiInterfaceRx, accountId: AccountId): Observable<Result> {
-  return api.query.system.accountNonce<Index>(accountId).pipe(
-    map((accountNonce): Result => [
-      accountNonce,
-      [[zeroBalance(api), zeroBalance(api), zeroBalance(api), zeroBalance(api)]]
-    ])
-  );
+function queryNonceOnly (api: ApiInterfaceRx, accountId: AccountId): Observable<Result> {
+  const fill = (nonce: Index): Result => [
+    nonce,
+    [[zeroBalance(api), zeroBalance(api), zeroBalance(api), zeroBalance(api)]]
+  ];
+
+  return isFunction(api.query.system.account)
+    ? api.query.system.account(accountId).pipe(
+      map(({ nonce }) => fill(nonce))
+    )
+    : isFunction(api.query.system.accountNonce)
+      ? api.query.system.accountNonce<Index>(accountId).pipe(
+        map((nonce) => fill(nonce))
+      )
+      : of(fill(api.registry.createType('Index')));
 }

 function queryBalancesAccount (api: ApiInterfaceRx, accountId: AccountId, modules: string[] = ['balances']): Observable<Result> {
-  const balances = modules.map(
-    (m): QueryableStorageMultiArg<'rxjs'> => [
-      (api.derive as DeriveCustomAccount)[m]?.customAccount || api.query[m].account,
-      accountId
-    ]
-  );
+  const balances = modules
+    .map((m): QueryableStorageEntry<'rxjs'> => (api.derive as DeriveCustomAccount)[m]?.customAccount || api.query[m]?.account)
+    .filter((q) => isFunction(q))
+    .map((q): [QueryableStorageEntry<'rxjs'>, AccountId] => [q, accountId]);

-  const extract = (data: AccountData[]) =>
-    data.map(({ feeFrozen, free, miscFrozen, reserved }): BalanceResult => [free, reserved, feeFrozen, miscFrozen]);
+  const extract = (nonce: Index, data: AccountData[]): Result => [
+    nonce,
+    data.map(({ feeFrozen, free, miscFrozen, reserved }): BalanceResult => [free, reserved, feeFrozen, miscFrozen])
+  ];

  // NOTE this is for the first case where we do have instances specified
-  return isFunction(api.query.system.account)
-    ? api.queryMulti<[AccountInfo, ...(AccountData[])]>([[api.query.system.account, accountId], ...balances]).pipe(
-      map(([{ nonce }, ...balances]): Result => [nonce, extract(balances)])
-    )
-    : api.queryMulti<[Index, ...(AccountData[])]>([[api.query.system.accountNonce, accountId], ...balances]).pipe(
-      map(([nonce, ...balances]): Result => [nonce, extract(balances)])
-    );
+  return balances.length
+    ? isFunction(api.query.system.account)
+      ? api.queryMulti<[AccountInfo, ...(AccountData[])]>([[api.query.system.account, accountId], ...balances]).pipe(
+        map(([{ nonce }, ...balances]) => extract(nonce, balances))
+      )
+      : api.queryMulti<[Index, ...(AccountData[])]>([[api.query.system.accountNonce, accountId], ...balances]).pipe(
+        map(([nonce, ...balances]) => extract(nonce, balances))
+      )
+    : queryNonceOnly(api, accountId);
 }

 function querySystemAccount (api: ApiInterfaceRx, accountId: AccountId): Observable<Result> {
@@ -140,10 +146,6 @@ function querySystemAccount (api: ApiInterfaceRx, accountId: AccountId): Observa
 */
 export function account (instanceId: string, api: ApiInterfaceRx): (address: AccountIndex | AccountId | Address | string) => Observable<DeriveBalancesAccount> {
  const balanceInstances = api.registry.getModuleInstances(api.runtimeVersion.specName.toString(), 'balances');
-  const empty: Result = [
-    api.registry.createType('Index'),
-    [[zeroBalance(api), zeroBalance(api), zeroBalance(api), zeroBalance(api)]]
-  ];

  return memo(instanceId, (address: AccountIndex | AccountId | Address | string): Observable<DeriveBalancesAccount> =>
    api.derive.accounts.accountId(address).pipe(
@@ -159,11 +161,12 @@ export function account (instanceId: string, api: ApiInterfaceRx): (address: Acc
                  ? queryBalancesAccount(api, accountId)
                  : isFunction(api.query.balances?.freeBalance)
                    ? queryBalancesFree(api, accountId)
-                    : isFunction(api.query.system?.accountNonce)
-                      ? querySystemNonce(api, accountId)
-                      : of(empty)
+                    : queryNonceOnly(api, accountId)
          ])
-          : of([api.registry.createType('AccountId'), empty])
+          : of([api.registry.createType('AccountId'), [
+            api.registry.createType('Index'),
+            [[zeroBalance(api), zeroBalance(api), zeroBalance(api), zeroBalance(api)]]
+          ]])
        )
      ),
      map((result): DeriveBalancesAccount => calcBalances(api, result))
@@ -1,15 +1,15 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx, QueryableStorageMultiArg } 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 { Observable } from '@polkadot/x-rxjs';
 import type { DeriveBalancesAccount, DeriveBalancesAccountData, DeriveBalancesAll, DeriveBalancesAllAccountData } from '../types';

+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { BN, bnMax, isFunction } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';

 import { memo } from '../util';

@@ -73,7 +73,8 @@ function calcBalances (api: ApiInterfaceRx, [data, bestNumber, [vesting, allLock
  // Calculate the vesting balances,
  //  - offset = balance locked at startingBlock
  //  - perBlock is the unlock amount
-  const { locked: vestingTotal, perBlock, startingBlock } = vesting || api.registry.createType('VestingInfo');
+  const emptyVest = api.registry.createType('VestingInfo');
+  const { locked: vestingTotal, perBlock, startingBlock } = vesting || emptyVest;
  const isStarted = bestNumber.gt(startingBlock);
  const vestedNow = isStarted ? perBlock.mul(bestNumber.sub(startingBlock)) : new BN(0);
  const vestedBalance = vestedNow.gt(vestingTotal) ? vestingTotal : api.registry.createType('Balance', vestedNow);
@@ -117,33 +118,29 @@ const isNonNullable = <T>(nullable: T): nullable is NonNullable<T> => !!nullable

 // current (balances, vesting)
 function queryCurrent (api: ApiInterfaceRx, accountId: AccountId, balanceInstances: string[] = ['balances']): Observable<ResultBalance> {
-  const lockCalls = balanceInstances.map(
-    (m): ApiInterfaceRx['query']['balances']['locks'] | undefined =>
-      (api.derive as DeriveCustomLocks)[m]?.customLocks || api.query[m as 'balances']?.locks
+  const calls = balanceInstances.map((m): ApiInterfaceRx['query']['balances']['locks'] | undefined =>
+    (api.derive as DeriveCustomLocks)[m]?.customLocks || api.query[m as 'balances']?.locks
  );
-
-  const lockEmpty = lockCalls.map((c) => !c);
-  const lockQueries = lockCalls.filter(isNonNullable).map((c): QueryableStorageMultiArg<'rxjs'> => [c, accountId]);
+  const lockEmpty = calls.map((c) => !c);
+  const queries = calls.filter(isNonNullable).map((c): QueryableStorageMultiArg<'rxjs'> => [c, accountId]);

  return (
    api.query.vesting?.vesting
-      ? api.queryMulti<[Option<VestingInfo>, ...BalanceLocks]>([
-        [api.query.vesting.vesting, accountId],
-        ...lockQueries
-      ])
+      ? api.queryMulti<[Option<VestingInfo>, ...BalanceLocks]>([[api.query.vesting.vesting, accountId], ...queries])
      // TODO We need to check module instances here as well, not only the balances module
-      : lockQueries.length
-        ? api.queryMulti<[...(Vec<BalanceLock>)[]]>(lockQueries).pipe(
-          map((locks): [Option<VestingInfo>, ...BalanceLocks] =>
-            [api.registry.createType('Option<VestingInfo>'), ...locks]
-          )
+      : queries.length
+        ? api.queryMulti<[...(Vec<BalanceLock>)[]]>(queries).pipe(
+          map((r): [Option<VestingInfo>, ...BalanceLocks] => [api.registry.createType('Option<VestingInfo>'), ...r])
        )
        : of([api.registry.createType('Option<VestingInfo>')] as [Option<VestingInfo>])
  ).pipe(
-    map(([optVesting, ...locks]): ResultBalance => {
+    map(([opt, ...locks]): ResultBalance => {
      let offset = -1;

-      return [optVesting.unwrapOr(null), lockEmpty.map((e) => e ? api.registry.createType('Vec<BalanceLock>') : locks[++offset])];
+      return [
+        opt.unwrapOr(null),
+        lockEmpty.map((e) => e ? api.registry.createType('Vec<BalanceLock>') : locks[++offset])
+      ];
    })
  );
 }
@@ -1,13 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Balance } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveFees } from '../types';

-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { map, of } from 'rxjs';

 import { memo } from '../util';

@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveBalancesAccount } from '../types';

-import { combineLatest, of } from '@polkadot/x-rxjs';
+import { combineLatest, of } from 'rxjs';

 import { memo } from '../util';

@@ -6,10 +6,11 @@ import type { Bytes, Option, StorageKey } from '@polkadot/types';
 import type { Bounty, BountyIndex, ProposalIndex } from '@polkadot/types/interfaces';
 import type { Codec, InterfaceTypes } from '@polkadot/types/types';

+import { firstValueFrom, of } from 'rxjs';
+
 import { ApiPromise } from '@polkadot/api';
 import { DeriveCollectiveProposal } from '@polkadot/api-derive/types';
 import { Proposal } from '@polkadot/types/interfaces';
-import { of } from '@polkadot/x-rxjs';

 import { BountyFactory } from '../../test/bountyFactory';
 import { BytesFactory } from '../../test/bytesFactory';
@@ -98,7 +99,7 @@ describe('bounties derive', () => {
      }
    } as unknown as ApiInterfaceRx;

-    const result = await bounties('', mockApi)().toPromise();
+    const result = await firstValueFrom(bounties('', mockApi)());

    expect(result).toHaveLength(2);
    expect(result[0].bounty.proposer.toString()).toEqual(DEFAULT_PROPOSER);
@@ -110,7 +111,7 @@ describe('bounties derive', () => {
  });

  it('returns motions', async () => {
-    const result = await bounties('', defaultMockApi)().toPromise();
+    const result = await firstValueFrom(bounties('', defaultMockApi)());

    expect(result).toHaveLength(2);
    expect(result[0].proposals).toHaveLength(0);
@@ -126,7 +127,7 @@ describe('bounties derive', () => {
      }
    } as unknown as ApiInterfaceRx;

-    const result = await bounties('', mockApi)().toPromise();
+    const result = await firstValueFrom(bounties('', mockApi)());

    expect(result).toHaveLength(2);
    expect(result[0].bounty.proposer.toString()).toEqual(DEFAULT_PROPOSER);
@@ -151,7 +152,7 @@ describe('bounties derive', () => {
      }
    } as unknown as ApiInterfaceRx;

-    const result = await bounties('', mockApi)().toPromise();
+    const result = await firstValueFrom(bounties('', mockApi)());

    expect(result).toHaveLength(2);
    expect(result[0].proposals).toHaveLength(0);
@@ -1,15 +1,15 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { DeriveBounties, DeriveCollectiveProposal } from '@polkadot/api-derive/types';
 import type { Bytes, Option } from '@polkadot/types';
 import type { Bounty, BountyIndex, ProposalIndex } from '@polkadot/types/interfaces';
+import type { DeriveBounties, DeriveCollectiveProposal } from '../types';

-import { memo } from '@polkadot/api-derive/util';
-import { combineLatest, Observable, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';

+import { memo } from '../util';
 import { filterBountiesProposals } from './helpers/filterBountyProposals';

 type Result = [Option<Bounty>[], Option<Bytes>[], BountyIndex[], DeriveCollectiveProposal[]];
@@ -0,0 +1,114 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+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';
+import * as bounties from './bounties';
+import * as chain from './chain';
+import * as contracts from './contracts';
+import * as council from './council';
+import * as crowdloan from './crowdloan';
+import * as democracy from './democracy';
+import * as elections from './elections';
+import * as imOnline from './imOnline';
+import * as membership from './membership';
+import * as parachains from './parachains';
+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';
+import * as tx from './tx';
+
+export { packageInfo } from './packageInfo';
+export * from './type';
+
+interface Avail {
+  instances: string[];
+  withDetect?: boolean;
+}
+
+export const derive = { accounts, balances, bounties, chain, contracts, council, crowdloan, democracy, elections, imOnline, membership, parachains, session, society, staking, technicalCommittee, treasury, tx };
+
+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
+    : never;
+};
+type DeriveAllSections<AllSections> = {
+  [Section in keyof AllSections]: DeriveSection<AllSections[Section]>
+};
+
+type DeriveCreator = (instanceId: string, api: ApiInterfaceRx) => (...args: unknown[]) => Observable<any>;
+
+export type DeriveCustom = Record<string, Record<string, DeriveCreator>>;
+
+export type ExactDerive = DeriveAllSections<typeof derive>;
+
+// Enable derive only if some of these modules are available
+const checks: Record<string, Avail> = {
+  contracts: { instances: ['contracts'] },
+  council: { instances: ['council'], withDetect: true },
+  crowdloan: { instances: ['crowdloan'] },
+  democracy: { instances: ['democracy'] },
+  elections: { instances: ['phragmenElection', 'electionsPhragmen', 'elections', 'council'], withDetect: true },
+  imOnline: { instances: ['imOnline'] },
+  membership: { instances: ['membership'] },
+  parachains: { instances: ['parachains', 'registrar'] },
+  session: { instances: ['session'] },
+  society: { instances: ['society'] },
+  staking: { instances: ['staking'] },
+  technicalCommittee: { instances: ['technicalCommittee'], withDetect: true },
+  treasury: { instances: ['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> (instanceId: string, api: ApiInterfaceRx, allSections: AllSections): DeriveAllSections<AllSections> {
+  const queryKeys = Object.keys(api.query);
+  const specName = api.runtimeVersion.specName.toString();
+
+  return Object
+    .keys(allSections)
+    .filter((sectionName) =>
+      !checks[sectionName] ||
+      checks[sectionName].instances.some((q) => queryKeys.includes(q)) ||
+      (
+        checks[sectionName].withDetect &&
+        checks[sectionName].instances.some((q) =>
+          (api.registry.getModuleInstances(specName, q) || []).some((q) => queryKeys.includes(q))
+        )
+      )
+    )
+    .reduce((derives, sectionName): DeriveAllSections<AllSections> => {
+      const section = allSections[sectionName as keyof AllSections];
+
+      derives[sectionName as keyof AllSections] = Object
+        .entries(section)
+        .reduce((methods, [methodName, creator]): DeriveSection<typeof section> => {
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call
+          methods[methodName as keyof typeof section] = creator(instanceId, api);
+
+          return methods;
+        }, {} as DeriveSection<typeof section>);
+
+      return derives;
+    }, {} as DeriveAllSections<AllSections>);
+}
+
+// FIXME The return type of this function should be {...ExactDerive, ...DeriveCustom}
+// For now we just drop the custom derive typings
+/** @internal */
+export function decorateDerive (instanceId: string, api: ApiInterfaceRx, custom: DeriveCustom = {}): ExactDerive {
+  return {
+    ...injectFunctions(instanceId, api, derive),
+    ...injectFunctions(instanceId, api, custom)
+  };
+}
@@ -1,11 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';

-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';

 import { memo } from '../util';

@@ -1,11 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';

-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';

 import { memo } from '../util';

@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';

-import { combineLatest } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map } from 'rxjs';

 import { memo } from '../util';

@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { SignedBlockExtended } from '../type/types';

-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { catchError, map } from '@polkadot/x-rxjs/operators';
+import { catchError, combineLatest, map, of } from 'rxjs';

 import { createSignedBlockExtended } from '../type';
 import { memo } from '../util';
@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { HeaderExtended } from '../type/types';

-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { catchError, map } from '@polkadot/x-rxjs/operators';
+import { catchError, combineLatest, map, of } from 'rxjs';

 import { createHeaderExtended } from '../type';
 import { memo } from '../util';
@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Vec } from '@polkadot/types';
 import type { EventRecord, SignedBlock } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { HeaderExtended, SignedBlockExtended } from '../type/types';

-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';

 import { createSignedBlockExtended } from '../type';
 import { memo } from '../util';
@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { HeaderExtended } from '../type/types';

-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of } from 'rxjs';

 import { createHeaderExtended } from '../type';
 import { memo } from '../util';
@@ -0,0 +1,12 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+
+export function getInstance (api: ApiInterfaceRx, section: string): string {
+  const instances = api.registry.getModuleInstances(api.runtimeVersion.specName.toString(), section);
+
+  return instances && instances.length
+    ? instances[0]
+    : section;
+}
@@ -1,4 +1,6 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+export * from './members';
+export * from './prime';
 export * from './proposals';
@@ -0,0 +1,24 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { AccountId } from '@polkadot/types/interfaces';
+import type { Collective } from './types';
+
+import { of } from 'rxjs';
+
+import { isFunction } from '@polkadot/util';
+
+import { memo } from '../util';
+import { getInstance } from './getInstance';
+
+export function members (instanceId: string, api: ApiInterfaceRx, _section: Collective): () => Observable<AccountId[]> {
+  const section = getInstance(api, _section);
+
+  return memo(instanceId, (): Observable<AccountId[]> =>
+    isFunction(api.query[section]?.members)
+      ? api.query[section as 'council'].members()
+      : of([])
+  );
+}
@@ -0,0 +1,28 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option } from '@polkadot/types';
+import type { AccountId } from '@polkadot/types/interfaces';
+
+import { map, of } from 'rxjs';
+
+import { isFunction } from '@polkadot/util';
+
+import { memo } from '../util';
+import { getInstance } from './getInstance';
+
+export function prime (instanceId: string, api: ApiInterfaceRx, _section: string): () => Observable<AccountId | null> {
+  const section = getInstance(api, _section);
+
+  return memo(instanceId, (): Observable<AccountId | null> =>
+    isFunction(api.query[section as 'council']?.prime)
+      ? api.query[section as 'council'].prime<Option<AccountId>>().pipe(
+        map((optPrime): AccountId | null =>
+          optPrime.unwrapOr(null)
+        )
+      )
+      : of(null)
+  );
+}
@@ -1,19 +1,19 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Option } from '@polkadot/types';
+import type { Option, u32 } from '@polkadot/types';
 import type { Hash, Proposal, Votes } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveCollectiveProposal } from '../types';
+import type { Collective } from './types';
+
+import { catchError, combineLatest, map, of, switchMap } from 'rxjs';

 import { isFunction } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { catchError, map, switchMap } from '@polkadot/x-rxjs/operators';

 import { memo } from '../util';
-
-type Collective = 'council' | 'membership' | 'technicalCommittee';
+import { getInstance } from './getInstance';

 type Result = [(Hash | Uint8Array | string)[], (Option<Proposal> | null)[], Option<Votes>[]];

@@ -31,39 +31,73 @@ function parse (api: ApiInterfaceRx, [hashes, proposals, votes]: Result): Derive
    .filter((proposal): proposal is DeriveCollectiveProposal => !!proposal);
 }

-function _proposalsFrom (instanceId: string, api: ApiInterfaceRx, section: Collective): (hashes: (Hash | Uint8Array | string)[]) => Observable<DeriveCollectiveProposal[]> {
+function _proposalsFrom (instanceId: string, api: ApiInterfaceRx, section: string): (hashes: (Hash | Uint8Array | string)[]) => Observable<DeriveCollectiveProposal[]> {
  return memo(instanceId, (hashes: (Hash | Uint8Array | string)[]): Observable<DeriveCollectiveProposal[]> =>
    (isFunction(api.query[section]?.proposals) && hashes.length
-      ? combineLatest<Result>([
+      ? combineLatest([
        of(hashes),
+        // this should simply be api.query[section].proposalOf.multi<Option<Proposal>>(hashes),
+        // however we have had cases on Edgeware where the indices have moved around after an
+        // upgrade, which results in invalid on-chain data
        combineLatest(hashes.map((hash) =>
          // this should simply be api.query[section].proposalOf.multi<Option<Proposal>>(hashes),
          // however we have had cases on Edgeware where the indices have moved around after an
          // upgrade, which results in invalid on-chain data
-          api.query[section].proposalOf(hash).pipe(catchError(() => of(null)))
+          api.query[section].proposalOf<Option<Proposal>>(hash).pipe(
+            catchError(() => of(null))
+          )
        )),
        api.query[section].voting.multi<Option<Votes>>(hashes)
      ])
-      : of([[], [], []] as Result)
+      : of<Result>([[], [], []])
    ).pipe(
      map((result) => parse(api, result))
    )
  );
 }

-export function proposals (instanceId: string, api: ApiInterfaceRx, section: Collective): () => Observable<DeriveCollectiveProposal[]> {
-  const proposalsFrom = _proposalsFrom(instanceId, api, section);
+export function hasProposals (instanceId: string, api: ApiInterfaceRx, _section: Collective): () => Observable<boolean> {
+  const section = getInstance(api, _section);

-  return memo(instanceId, (): Observable<DeriveCollectiveProposal[]> =>
-    isFunction(api.query[section]?.proposals)
-      ? api.query[section as 'council'].proposals().pipe(
-        switchMap(proposalsFrom)
-      )
-      : of([] as DeriveCollectiveProposal[])
+  return memo(instanceId, (): Observable<boolean> =>
+    of(isFunction(api.query[section]?.proposals))
  );
 }

-export function proposal (instanceId: string, api: ApiInterfaceRx, section: Collective): (hash: Hash | Uint8Array | string) => Observable<DeriveCollectiveProposal | null> {
+export function proposalCount (instanceId: string, api: ApiInterfaceRx, _section: Collective): () => Observable<u32 | null> {
+  const section = getInstance(api, _section);
+
+  return memo(instanceId, (): Observable<u32 | null> =>
+    isFunction(api.query[section].proposalCount)
+      ? api.query[section as 'council'].proposalCount()
+      : of(null)
+  );
+}
+
+export function proposalHashes (instanceId: string, api: ApiInterfaceRx, _section: Collective): () => Observable<Hash[]> {
+  const section = getInstance(api, _section);
+
+  return memo(instanceId, (): Observable<Hash[]> =>
+    isFunction(api.query[section]?.proposals)
+      ? api.query[section as 'council'].proposals()
+      : of([])
+  );
+}
+
+export function proposals (instanceId: string, api: ApiInterfaceRx, _section: Collective): () => Observable<DeriveCollectiveProposal[]> {
+  const section = getInstance(api, _section);
+  const proposalsFrom = _proposalsFrom(instanceId, api, section);
+  const getHashes = proposalHashes(instanceId, api, _section);
+
+  return memo(instanceId, (): Observable<DeriveCollectiveProposal[]> =>
+    getHashes().pipe(
+      switchMap(proposalsFrom)
+    )
+  );
+}
+
+export function proposal (instanceId: string, api: ApiInterfaceRx, _section: Collective): (hash: Hash | Uint8Array | string) => Observable<DeriveCollectiveProposal | null> {
+  const section = getInstance(api, _section);
  const proposalsFrom = _proposalsFrom(instanceId, api, section);

  return memo(instanceId, (hash: Hash | Uint8Array | string): Observable<DeriveCollectiveProposal | null> =>
@@ -0,0 +1,4 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export type Collective = 'council' | 'membership' | 'technicalCommittee';
@@ -1,13 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveContractFees } from '../types';

-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { map, of } from 'rxjs';

 import { memo } from '../util';

@@ -1,6 +1,8 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+export * from './members';
+export * from './prime';
 export * from './proposals';
 export * from './votes';
 export * from './votesOf';
@@ -0,0 +1,13 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { AccountId } from '@polkadot/types/interfaces';
+
+import { members as collectiveMembers } from '../collective';
+import { memo } from '../util';
+
+export function members (instanceId: string, api: ApiInterfaceRx): () => Observable<AccountId[]> {
+  return memo(instanceId, collectiveMembers(instanceId, api, 'council'));
+}
@@ -0,0 +1,13 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { AccountId } from '@polkadot/types/interfaces';
+
+import { prime as collectivePrime } from '../collective';
+import { memo } from '../util';
+
+export function prime (instanceId: string, api: ApiInterfaceRx): () => Observable<AccountId | null> {
+  return memo(instanceId, collectivePrime(instanceId, api, 'council'));
+}
@@ -1,18 +1,31 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { u32 } from '@polkadot/types';
 import type { Hash } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveCollectiveProposal } from '../types';

-import { proposal as collectiveProposal, proposals as collectiveProposals } from '../collective';
+import { hasProposals as collectiveHasProposals, proposal as collectiveProposal, proposalCount as collectiveProposalCount, proposalHashes as collectiveProposalHashes, proposals as collectiveProposals } from '../collective';
 import { memo } from '../util';

+export function hasProposals (instanceId: string, api: ApiInterfaceRx): () => Observable<boolean> {
+  return memo(instanceId, collectiveHasProposals(instanceId, api, 'council'));
+}
+
 export function proposal (instanceId: string, api: ApiInterfaceRx): (hash: Hash | Uint8Array | string) => Observable<DeriveCollectiveProposal | null> {
  return memo(instanceId, collectiveProposal(instanceId, api, 'council'));
 }

+export function proposalCount (instanceId: string, api: ApiInterfaceRx): () => Observable<u32 | null> {
+  return memo(instanceId, collectiveProposalCount(instanceId, api, 'council'));
+}
+
+export function proposalHashes (instanceId: string, api: ApiInterfaceRx): () => Observable<Hash[]> {
+  return memo(instanceId, collectiveProposalHashes(instanceId, api, 'council'));
+}
+
 export function proposals (instanceId: string, api: ApiInterfaceRx): () => Observable<DeriveCollectiveProposal[]> {
  return memo(instanceId, collectiveProposals(instanceId, api, 'council'));
 }
@@ -1,15 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx, QueryableModuleStorage } from '@polkadot/api/types';
 import type { Vec } from '@polkadot/types';
 import type { AccountId, Balance, Voter } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveCouncilVote, DeriveCouncilVotes } from '../types';

-import { combineLatest } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of } from 'rxjs';

 import { memo } from '../util';

@@ -20,24 +19,27 @@ function isVoter (value: VoteEntry): value is Voter {
  return !Array.isArray(value);
 }

-function retrieveStakeOf (api: ApiInterfaceRx): Observable<[AccountId, Balance][]> {
-  return (api.query.phragmenElection || api.query.electionsPhragmen || api.query.elections).stakeOf.entries<Balance, [AccountId]>().pipe(
+function retrieveStakeOf (elections: QueryableModuleStorage<'rxjs'>): Observable<[AccountId, Balance][]> {
+  return elections.stakeOf.entries<Balance, [AccountId]>().pipe(
    map((entries) =>
      entries.map(([{ args: [accountId] }, stake]) => [accountId, stake])
    )
  );
 }

-function retrieveVoteOf (api: ApiInterfaceRx): Observable<[AccountId, AccountId[]][]> {
-  return (api.query.phragmenElection || api.query.electionsPhragmen || api.query.elections).votesOf.entries<Vec<AccountId>, [AccountId]>().pipe(
+function retrieveVoteOf (elections: QueryableModuleStorage<'rxjs'>): Observable<[AccountId, AccountId[]][]> {
+  return elections.votesOf.entries<Vec<AccountId>, [AccountId]>().pipe(
    map((entries) =>
      entries.map(([{ args: [accountId] }, votes]) => [accountId, votes])
    )
  );
 }

-function retrievePrev (api: ApiInterfaceRx): Observable<DeriveCouncilVotes> {
-  return combineLatest([retrieveStakeOf(api), retrieveVoteOf(api)]).pipe(
+function retrievePrev (api: ApiInterfaceRx, elections: QueryableModuleStorage<'rxjs'>): Observable<DeriveCouncilVotes> {
+  return combineLatest([
+    retrieveStakeOf(elections),
+    retrieveVoteOf(elections)
+  ]).pipe(
    map(([stakes, votes]): DeriveCouncilVotes => {
      const result: DeriveCouncilVotes = [];

@@ -60,9 +62,7 @@ function retrievePrev (api: ApiInterfaceRx): Observable<DeriveCouncilVotes> {
  );
 }

-function retrieveCurrent (api: ApiInterfaceRx): Observable<DeriveCouncilVotes> {
-  const elections = (api.query.phragmenElection || api.query.electionsPhragmen || api.query.elections);
-
+function retrieveCurrent (elections: QueryableModuleStorage<'rxjs'>): Observable<DeriveCouncilVotes> {
  return elections.voting.entries<VoteEntry, [AccountId]>().pipe(
    map((entries): DeriveCouncilVotes =>
      entries.map(([{ args: [accountId] }, value]): [AccountId, DeriveCouncilVote] => [
@@ -76,9 +76,13 @@ function retrieveCurrent (api: ApiInterfaceRx): Observable<DeriveCouncilVotes> {
 }

 export function votes (instanceId: string, api: ApiInterfaceRx): () => Observable<DeriveCouncilVotes> {
+  const elections = api.query.phragmenElection || api.query.electionsPhragmen || api.query.elections;
+
  return memo(instanceId, (): Observable<DeriveCouncilVotes> =>
-    (api.query.phragmenElection || api.query.electionsPhragmen || api.query.elections).stakeOf
-      ? retrievePrev(api)
-      : retrieveCurrent(api)
+    elections
+      ? elections.stakeOf
+        ? retrievePrev(api, elections)
+        : retrieveCurrent(elections)
+      : of([])
  );
 }
@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveCouncilVote } from '../types';

-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';

 import { memo } from '../util';

@@ -0,0 +1,37 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Option } from '@polkadot/types';
+import type { FundInfo, ParaId } from '@polkadot/types/interfaces';
+
+import { map } from 'rxjs';
+
+import { u8aConcat, u8aToHex } from '@polkadot/util';
+import { blake2AsU8a } from '@polkadot/util-crypto';
+
+import { memo } from '../util';
+
+function createChildKey ({ trieIndex }: FundInfo): string {
+  return u8aToHex(
+    u8aConcat(
+      ':child_storage:default:',
+      blake2AsU8a(
+        u8aConcat('crowdloan', trieIndex.toU8a())
+      )
+    )
+  );
+}
+
+export function childKey (instanceId: string, api: ApiInterfaceRx): (paraId: string | number | ParaId) => Observable<string | null> {
+  return memo(instanceId, (paraId: string | number | ParaId): Observable<string | null> =>
+    api.query.crowdloan.funds<Option<FundInfo>>(paraId).pipe(
+      map((optInfo) =>
+        optInfo.isSome
+          ? createChildKey(optInfo.unwrap())
+          : null
+      )
+    )
+  );
+}
@@ -0,0 +1,135 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { StorageKey } from '@polkadot/types';
+import type { ParaId } from '@polkadot/types/interfaces';
+import type { DeriveContributions } from '../types';
+
+import { BehaviorSubject, combineLatest, EMPTY, map, of, startWith, switchMap, tap, toArray } from 'rxjs';
+
+import { arrayFlatten, isFunction } from '@polkadot/util';
+
+import { memo } from '../util';
+import { extractContributed } from './util';
+
+interface Changes {
+  added: string[];
+  blockHash: string;
+  removed: string[];
+}
+
+const PAGE_SIZE_K = 1000; // limit aligned with the 1k on the node (trie lookups are heavy)
+
+function _getUpdates (api: ApiInterfaceRx, paraId: string | number | ParaId): Observable<Changes> {
+  let added: string[] = [];
+  let removed: string[] = [];
+
+  return api.query.system.events().pipe(
+    switchMap((events): Observable<Changes> => {
+      const changes = extractContributed(paraId, events);
+
+      if (changes.added.length || changes.removed.length) {
+        added = added.concat(...changes.added);
+        removed = removed.concat(...changes.removed);
+
+        return of({ added, addedDelta: changes.added, blockHash: events.createdAtHash?.toHex() || '-', removed, removedDelta: changes.removed });
+      }
+
+      return EMPTY;
+    }),
+    startWith({ added, addedDelta: [], blockHash: '-', removed, removedDelta: [] })
+  );
+}
+
+function _eventTriggerAll (api: ApiInterfaceRx, paraId: string | number | ParaId): Observable<string> {
+  return api.query.system.events().pipe(
+    switchMap((events): Observable<string> => {
+      const items = events.filter(({ event: { data: [eventParaId], method, section } }) =>
+        section === 'crowdloan' &&
+        ['AllRefunded', 'Dissolved', 'PartiallyRefunded'].includes(method) &&
+        eventParaId.eq(paraId)
+      );
+
+      return items.length
+        ? of(events.createdAtHash?.toHex() || '-')
+        : EMPTY;
+    }),
+    startWith('-')
+  );
+}
+
+function _getKeysPaged (api: ApiInterfaceRx, childKey: string): Observable<StorageKey[]> {
+  const startSubject = new BehaviorSubject<string | undefined>(undefined);
+
+  return startSubject.pipe(
+    switchMap((startKey) =>
+      api.rpc.childstate.getKeysPaged(childKey, '0x', PAGE_SIZE_K, startKey)
+    ),
+    tap((keys): void => {
+      setTimeout((): void => {
+        keys.length === PAGE_SIZE_K
+          ? startSubject.next(keys[PAGE_SIZE_K - 1].toHex())
+          : startSubject.complete();
+      }, 0);
+    }),
+    toArray(), // toArray since we want to startSubject to be completed
+    map((keyArr: StorageKey[][]) => arrayFlatten(keyArr))
+  );
+}
+
+function _getAll (api: ApiInterfaceRx, paraId: string | number | ParaId, childKey: string): Observable<string[]> {
+  return _eventTriggerAll(api, paraId).pipe(
+    switchMap(() =>
+      // FIXME Needs testing and being enabled
+      // eslint-disable-next-line no-constant-condition
+      isFunction(api.rpc.childstate.getKeysPaged) && false
+        ? _getKeysPaged(api, childKey)
+        : api.rpc.childstate.getKeys(childKey, '0x')
+    ),
+    map((keys) =>
+      keys.map((k) => k.toHex())
+    )
+  );
+}
+
+function _contributions (api: ApiInterfaceRx, paraId: string | number | ParaId, childKey: string): Observable<DeriveContributions> {
+  return combineLatest([
+    _getAll(api, paraId, childKey),
+    _getUpdates(api, paraId)
+  ]).pipe(
+    map(([keys, { added, blockHash, removed }]): DeriveContributions => {
+      const contributorsMap: Record<string, boolean> = {};
+
+      keys.forEach((k): void => {
+        contributorsMap[k] = true;
+      });
+
+      added.forEach((k): void => {
+        contributorsMap[k] = true;
+      });
+
+      removed.forEach((k): void => {
+        delete contributorsMap[k];
+      });
+
+      return {
+        blockHash,
+        contributorsHex: Object.keys(contributorsMap)
+      };
+    })
+  );
+}
+
+export function contributions (instanceId: string, api: ApiInterfaceRx): (paraId: string | number | ParaId) => Observable<DeriveContributions> {
+  return memo(instanceId, (paraId: string | number | ParaId): Observable<DeriveContributions> =>
+    api.derive.crowdloan.childKey(paraId).pipe(
+      switchMap((childKey) =>
+        childKey
+          ? _contributions(api, paraId, childKey)
+          : of({ blockHash: '-', contributorsHex: [] })
+      )
+    )
+  );
+}
@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export * from './childKey';
+export * from './contributions';
+export * from './onwContributions';
@@ -0,0 +1,72 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { ParaId } from '@polkadot/types/interfaces';
+import type { DeriveOwnContributions } from '../types';
+
+import { combineLatest, EMPTY, map, of, startWith, switchMap } from 'rxjs';
+
+import { memo } from '../util';
+import { extractContributed } from './util';
+
+function _getValues (api: ApiInterfaceRx, childKey: string, keys: string[]): Observable<DeriveOwnContributions> {
+  // We actually would love to use multi-keys https://github.com/paritytech/substrate/issues/9203
+  return combineLatest(keys.map((k) => api.rpc.childstate.getStorage(childKey, k))).pipe(
+    map((values) =>
+      values
+        .map((v) => api.registry.createType('Option<StorageData>', v))
+        .map((o) =>
+          o.isSome
+            ? api.registry.createType('Balance', o.unwrap())
+            : api.registry.createType('Balance')
+        )
+        .reduce((all: DeriveOwnContributions, b, index): DeriveOwnContributions => ({
+          ...all,
+          [keys[index]]: b
+        }), {})
+    )
+  );
+}
+
+function _watchOwnChanges (api: ApiInterfaceRx, paraId: string | number | ParaId, childkey: string, keys: string[]): Observable<DeriveOwnContributions> {
+  return api.query.system.events().pipe(
+    switchMap((events): Observable<DeriveOwnContributions> => {
+      const changes = extractContributed(paraId, events);
+      const filtered = keys.filter((k) =>
+        changes.added.includes(k) ||
+        changes.removed.includes(k)
+      );
+
+      return filtered.length
+        ? _getValues(api, childkey, filtered)
+        : EMPTY;
+    }),
+    startWith({})
+  );
+}
+
+function _contributions (api: ApiInterfaceRx, paraId: string | number | ParaId, childKey: string, keys: string[]): Observable<DeriveOwnContributions> {
+  return combineLatest([
+    _getValues(api, childKey, keys),
+    _watchOwnChanges(api, paraId, childKey, keys)
+  ]).pipe(
+    map(([all, latest]) => ({
+      ...all,
+      ...latest
+    }))
+  );
+}
+
+export function ownContributions (instanceId: string, api: ApiInterfaceRx): (paraId: string | number | ParaId, keys: string[]) => Observable<DeriveOwnContributions> {
+  return memo(instanceId, (paraId: string | number | ParaId, keys: string[]): Observable<DeriveOwnContributions> =>
+    api.derive.crowdloan.childKey(paraId).pipe(
+      switchMap((childKey) =>
+        childKey && keys.length
+          ? _contributions(api, paraId, childKey, keys)
+          : of({})
+      )
+    )
+  );
+}
@@ -0,0 +1,11 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Balance } from '@polkadot/types/interfaces';
+
+export interface DeriveContributions {
+  blockHash: string;
+  contributorsHex: string[];
+}
+
+export type DeriveOwnContributions = Record<string, Balance>;
@@ -0,0 +1,32 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Vec } from '@polkadot/types';
+import type { EventRecord, ParaId } from '@polkadot/types/interfaces';
+
+interface Changes {
+  added: string[];
+  blockHash: string;
+  removed: string[];
+}
+
+export function extractContributed (paraId: string | number | ParaId, events: Vec<EventRecord>): Changes {
+  const added: string[] = [];
+  const removed: string[] = [];
+
+  return events
+    .filter(({ event: { data: [, eventParaId], method, section } }) =>
+      section === 'crowdloan' &&
+      ['Contributed', 'Withdrew'].includes(method) &&
+      eventParaId.eq(paraId)
+    )
+    .reduce((result: Changes, { event: { data: [accountId], method } }): Changes => {
+      if (method === 'Contributed') {
+        result.added.push(accountId.toHex());
+      } else {
+        result.removed.push(accountId.toHex());
+      }
+
+      return result;
+    }, { added, blockHash: events.createdAtHash?.toHex() || '-', removed });
+}
@@ -1,16 +1,16 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, u64, Vec } from '@polkadot/types';
 import type { BlockNumber, Hash, ReferendumIndex, Scheduled } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveDispatch, DeriveProposalImage } from '../types';

+import { catchError, combineLatest, map, of, switchMap } from 'rxjs';
+
 import { isFunction, stringToHex } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';

 import { memo } from '../util';

@@ -42,7 +42,7 @@ function queryQueue (api: ApiInterfaceRx): Observable<DeriveDispatch[]> {
  );
 }

-function schedulerEntries (api: ApiInterfaceRx): Observable<[BlockNumber[], Option<Scheduled>[][]]> {
+function schedulerEntries (api: ApiInterfaceRx): Observable<[BlockNumber[], (Option<Scheduled>[] | null)[]]> {
  // We don't get entries, but rather we get the keys (triggered via finished referendums) and
  // the subscribe to those keys - this means we pickup when the schedulers actually executes
  // at a block, the entry for that block will become empty
@@ -53,10 +53,20 @@ function schedulerEntries (api: ApiInterfaceRx): Observable<[BlockNumber[], Opti
    switchMap((keys) => {
      const blockNumbers = keys.map(({ args: [blockNumber] }) => blockNumber);

-      return combineLatest([
-        of(blockNumbers),
-        api.query.scheduler.agenda.multi<Vec<Option<Scheduled>>>(blockNumbers)
-      ]);
+      return blockNumbers.length
+        ? combineLatest([
+          of(blockNumbers),
+          // this should simply be api.query.scheduler.agenda.multi<Vec<Option<Scheduled>>>,
+          // however we have had cases on Darwinia where the indices have moved around after an
+          // upgrade, which results in invalid on-chain data
+          combineLatest(blockNumbers.map((blockNumber) =>
+            api.query.scheduler.agenda<Vec<Option<Scheduled>>>(blockNumber).pipe(
+              // this does create an issue since it discards all at that block
+              catchError(() => of(null))
+            )
+          ))
+        ])
+        : of<[BlockNumber[], null[]]>([[], []]);
    })
  );
 }
@@ -67,26 +77,30 @@ function queryScheduler (api: ApiInterfaceRx): Observable<DeriveDispatch[]> {
      const result: SchedulerInfo[] = [];

      blockNumbers.forEach((at, index): void => {
-        agendas[index].filter((optScheduled) => optScheduled.isSome).forEach((optScheduled): void => {
-          const scheduled = optScheduled.unwrap();
+        (agendas[index] || [])
+          .filter((opt) => opt.isSome)
+          .forEach((optScheduled): void => {
+            const scheduled = optScheduled.unwrap();

-          if (scheduled.maybeId.isSome) {
-            const id = scheduled.maybeId.unwrap().toHex();
+            if (scheduled.maybeId.isSome) {
+              const id = scheduled.maybeId.unwrap().toHex();

-            if (id.startsWith(DEMOCRACY_ID)) {
-              const [, index] = api.registry.createType('(u64, ReferendumIndex)' as any, id) as ITuple<[u64, ReferendumIndex]>;
-              const imageHash = scheduled.call.args[0] as Hash;
+              if (id.startsWith(DEMOCRACY_ID)) {
+                const [, index] = api.registry.createType<ITuple<[u64, ReferendumIndex]>>('(u64, ReferendumIndex)', id);
+                const imageHash = scheduled.call.args[0] as Hash;

-              result.push({ at, imageHash, index });
+                result.push({ at, imageHash, index });
+              }
            }
-          }
-        });
+          });
      });

-      return combineLatest([
-        of(result),
-        api.derive.democracy.preimages(result.map(({ imageHash }) => imageHash))
-      ]);
+      return result.length
+        ? combineLatest([
+          of(result),
+          api.derive.democracy.preimages(result.map(({ imageHash }) => imageHash))
+        ])
+        : of([[], []]);
    }),
    map(([infos, images]): DeriveDispatch[] =>
      infos.map((info, index) => ({ ...info, image: images[index] }))
@@ -1,16 +1,16 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option } from '@polkadot/types';
 import type { AccountId, ReferendumInfo, ReferendumInfoFinished, ReferendumInfoTo239, Vote, VotingDelegating, VotingDirect, VotingDirectVote } from '@polkadot/types/interfaces';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveDemocracyLock } from '../types';

+import { map, of, switchMap } from 'rxjs';
+
 import { BN_ZERO, isUndefined } from '@polkadot/util';
-import { of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';

 import { memo } from '../util';

@@ -1,15 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+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 { Observable } from '@polkadot/x-rxjs';
 import type { DeriveProposalExternal } from '../types';

-import { of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { map, of, switchMap } from 'rxjs';

 import { memo } from '../util';

@@ -1,14 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+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 { Observable } from '@polkadot/x-rxjs';
 import type { DeriveProposalImage } from '../types';

-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';

 import { memo } from '../util';
 import { parseImage } from './util';
@@ -1,14 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+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 { Observable } from '@polkadot/x-rxjs';
 import type { DeriveProposalImage } from '../types';

-import { map } from '@polkadot/x-rxjs/operators';
+import { map, of } from 'rxjs';

 import { memo } from '../util';
 import { parseImage } from './util';
@@ -17,10 +17,12 @@ type PreImage = Option<ITuple<[Bytes, AccountId, Balance, BlockNumber]>>;

 export function preimages (instanceId: string, api: ApiInterfaceRx): (hashes: Hash[]) => Observable<(DeriveProposalImage | undefined)[]> {
  return memo(instanceId, (hashes: Hash[]): Observable<(DeriveProposalImage | undefined)[]> =>
-    api.query.democracy.preimages.multi<PreImage>(hashes).pipe(
-      map((images): (DeriveProposalImage | undefined)[] =>
-        images.map((imageOpt) => parseImage(api, imageOpt))
+    hashes.length
+      ? api.query.democracy.preimages.multi<PreImage>(hashes).pipe(
+        map((images): (DeriveProposalImage | undefined)[] =>
+          images.map((imageOpt) => parseImage(api, imageOpt))
+        )
      )
-    )
+      : of([])
  );
 }
@@ -1,23 +1,23 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+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 { Observable } from '@polkadot/x-rxjs';
 import type { DeriveProposal, DeriveProposalImage } from '../types';

+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { isFunction } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';

 import { memo } from '../util';

 type DepositorsNew = Option<ITuple<[Vec<AccountId>, Balance]>>;
 type DepositorsOld = Option<ITuple<[Balance, Vec<AccountId>]>>;
 type Depositors = DepositorsNew | DepositorsOld;
-type Proposals = Vec<ITuple<[PropIndex, Hash, AccountId]>>;
+type Proposals = ITuple<[PropIndex, Hash, AccountId]>[];
 type Result = [Proposals, (DeriveProposalImage | undefined)[], Depositors[]];

 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -54,13 +54,15 @@ export function proposals (instanceId: string, api: ApiInterfaceRx): () => Obser
    isFunction(api.query.democracy?.publicProps) && isFunction(api.query.democracy?.preimages)
      ? api.query.democracy.publicProps<Proposals>().pipe(
        switchMap((proposals) =>
-          combineLatest([
-            of(proposals),
-            api.derive.democracy.preimages(
-              proposals.map(([, hash]): Hash => hash)),
-            api.query.democracy.depositOf.multi<Depositors>(
-              proposals.map(([index]): PropIndex => index))
-          ])
+          proposals.length
+            ? combineLatest([
+              of(proposals),
+              api.derive.democracy.preimages(
+                proposals.map(([, hash]): Hash => hash)),
+              api.query.democracy.depositOf.multi<Depositors>(
+                proposals.map(([index]): PropIndex => index))
+            ])
+            : of<Result>([[], [], []])
        ),
        map(parse)
      )
@@ -1,13 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { ReferendumIndex } from '@polkadot/types/interfaces';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';

-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { map, of } from 'rxjs';

 import { memo } from '../util';

@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveReferendumExt } from '../types';

-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';

 import { memo } from '../util';

@@ -14,10 +13,12 @@ export function referendums (instanceId: string, api: ApiInterfaceRx): () => Obs
  return memo(instanceId, (): Observable<DeriveReferendumExt[]> =>
    api.derive.democracy.referendumsActive().pipe(
      switchMap((referendums) =>
-        combineLatest([
-          of(referendums),
-          api.derive.democracy._referendumsVotes(referendums)
-        ])
+        referendums.length
+          ? combineLatest([
+            of(referendums),
+            api.derive.democracy._referendumsVotes(referendums)
+          ])
+          : of([[], []])
      ),
      map(([referendums, votes]) =>
        referendums.map((referendum, index): DeriveReferendumExt => ({
@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveReferendum } from '../types';

-import { of } from '@polkadot/x-rxjs';
-import { switchMap } from '@polkadot/x-rxjs/operators';
+import { of, switchMap } from 'rxjs';

 import { memo } from '../util';

@@ -1,24 +1,25 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+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 type { Observable } from '@polkadot/x-rxjs';

-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { map, switchMap } from 'rxjs';

 import { memo } from '../util';

 export function referendumsFinished (instanceId: string, api: ApiInterfaceRx): () => Observable<ReferendumInfoFinished[]> {
  return memo(instanceId, (): Observable<ReferendumInfoFinished[]> =>
    api.derive.democracy.referendumIds().pipe(
-      switchMap((ids) => api.query.democracy.referendumInfoOf.multi<Option<ReferendumInfo>>(ids)),
+      switchMap((ids) =>
+        api.query.democracy.referendumInfoOf.multi<Option<ReferendumInfo>>(ids)
+      ),
      map((infos): ReferendumInfoFinished[] =>
        infos
-          .filter((optInfo) => optInfo.isSome)
-          .map((optInfo) => optInfo.unwrap())
-          .filter((info) => info.isFinished)
+          .map((optInfo) => optInfo.unwrapOr(null))
+          .filter((info): info is ReferendumInfo => !!info && info.isFinished)
          .map((info) => info.asFinished)
      )
    )
@@ -1,16 +1,16 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+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, VotingDelegating, VotingDirectVote } from '@polkadot/types/interfaces';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveBalancesAccount, DeriveReferendum, DeriveReferendumVote, DeriveReferendumVotes } from '../types';

+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { isFunction } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';

 import { memo } from '../util';
 import { calcVotes, getStatus, parseImage } from './util';
@@ -1,12 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
+
+import { map } from 'rxjs';

 import { bnSqrt } from '@polkadot/util';
-import { map } from '@polkadot/x-rxjs/operators';

 import { memo } from '../util';

@@ -1,14 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { u32, Vec } from '@polkadot/types';
 import type { AccountId, Balance, BlockNumber, SeatHolder } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveElectionsInfo } from './types';

-import { map } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of } from 'rxjs';

 import { memo } from '../util';

@@ -42,30 +42,48 @@ function sortAccounts ([, balanceA]: [AccountId, Balance], [, balanceB]: [Accoun
 }

 function queryElections (api: ApiInterfaceRx): Observable<DeriveElectionsInfo> {
-  const section = api.query.phragmenElection
+  const elections = api.query.phragmenElection
    ? 'phragmenElection'
    : api.query.electionsPhragmen
      ? 'electionsPhragmen'
-      : 'elections';
+      : api.query.elections
+        ? 'elections'
+        : null;
+  const [council] = api.registry.getModuleInstances(api.runtimeVersion.specName.toString(), 'council') || ['council'];

-  return api.queryMulti<[Vec<AccountId>, Vec<Candidate>, Vec<Member>, Vec<Member>]>([
-    api.query.council.members,
-    api.query[section].candidates,
-    api.query[section].members,
-    api.query[section].runnersUp
-  ]).pipe(
+  return (
+    elections
+      ? api.queryMulti<[Vec<AccountId>, Vec<Candidate>, Vec<Member>, Vec<Member>]>([
+        api.query[council].members,
+        api.query[elections].candidates,
+        api.query[elections].members,
+        api.query[elections].runnersUp
+      ])
+      : combineLatest([
+        api.query[council].members<Vec<AccountId>>(),
+        of<Candidate[]>([]),
+        of<Member[]>([]),
+        of<Member[]>([])
+      ])
+  ).pipe(
    map(([councilMembers, candidates, members, runnersUp]): DeriveElectionsInfo => ({
-      candidacyBond: api.consts[section].candidacyBond as Balance,
+      ...(
+        elections
+          ? {
+            candidacyBond: api.consts[elections].candidacyBond as Balance,
+            desiredRunnersUp: api.consts[elections].desiredRunnersUp as u32,
+            desiredSeats: api.consts[elections].desiredMembers as u32,
+            termDuration: api.consts[elections].termDuration as BlockNumber,
+            votingBond: api.consts[elections].votingBond as Balance
+          }
+          : {}
+      ),
      candidateCount: api.registry.createType('u32', candidates.length),
      candidates: candidates.map(getCandidate),
-      desiredRunnersUp: api.consts[section].desiredRunnersUp as u32,
-      desiredSeats: api.consts[section].desiredMembers as u32,
      members: members.length
        ? members.map(getAccountTuple).sort(sortAccounts)
        : councilMembers.map((accountId): [AccountId, Balance] => [accountId, api.registry.createType('Balance')]),
-      runnersUp: runnersUp.map(getAccountTuple).sort(sortAccounts),
-      termDuration: api.consts[section].termDuration as BlockNumber,
-      votingBond: api.consts[section].votingBond as Balance
+      runnersUp: runnersUp.map(getAccountTuple).sort(sortAccounts)
    }))
  );
 }
@@ -8,12 +8,12 @@ export interface DeriveElectionsInfo {
  candidates: AccountId[];
  candidateCount: u32;
  candidacyBond?: Balance;
-  desiredRunnersUp: u32;
-  desiredSeats: u32;
+  desiredRunnersUp?: u32;
+  desiredSeats?: u32;
  members: [AccountId, Balance][];
  nextVoterSet?: SetIndex;
  runnersUp: [AccountId, Balance][];
-  termDuration: BlockNumber;
+  termDuration?: BlockNumber;
  voteCount?: VoteIndex;
  voterCount?: SetIndex;
  votingBond?: Balance;
@@ -1,15 +1,15 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+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 { Observable } from '@polkadot/x-rxjs';
 import type { DeriveHeartbeats } from '../types';

+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { BN_ZERO } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';

 import { memo } from '../util';

@@ -5,18 +5,16 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */

+import { from, Observable } from 'rxjs';
+
 import { ApiRx } from '@polkadot/api/rx';
 import { MockProvider } from '@polkadot/rpc-provider/mock';
 import { TypeRegistry } from '@polkadot/types/create';
-import { from, Observable } from '@polkadot/x-rxjs';

 import { ExactDerive } from '.';

 const testFunction = (api: ApiRx): any => {
-  return <
-    Section extends keyof ExactDerive,
-    Method extends keyof (typeof api.derive[Section])
-  >(section: Section, method: Method, inputs: any[]): void => {
+  return <S extends keyof ExactDerive, M extends keyof (typeof api.derive[S])>(section: S, method: M, inputs: any[]): void => {
    describe(`derive.${section}.${method}`, (): void => {
      it('should be a function', (): void => {
        expect(typeof api.derive[section][method]).toBe('function');
@@ -80,7 +78,8 @@ describe('derive', (): void => {
        }
      },
      provider: new MockProvider(registry),
-      registry
+      registry,
+      throwOnConnect: true
    });

    beforeAll((done): void => {
@@ -95,7 +94,7 @@ describe('derive', (): void => {
    testFunction(api)('balances', 'fees', ['a', 'b']);

    // new
-    testFunction(api)('custom' as any, 'test', [1, 2, 3]);
+    testFunction(api)('custom', 'test', [1, 2, 3]);

    // existing
    testFunction(api)('chain', 'bestNumber', []);
@@ -3,103 +3,4 @@

 import './detectPackage';

-import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { AnyFunction } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
-
-import * as accounts from './accounts';
-import * as balances from './balances';
-import * as bounties from './bounties';
-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 membership from './membership';
-import * as parachains from './parachains';
-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';
-import * as tx from './tx';
-
-export { packageInfo } from './packageInfo';
-export * from './type';
-
-export const derive = { accounts, balances, bounties, chain, contracts, council, democracy, elections, imOnline, membership, parachains, session, society, staking, technicalCommittee, treasury, tx };
-
-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
-    : never;
-};
-type DeriveAllSections<AllSections> = {
-  [Section in keyof AllSections]: DeriveSection<AllSections[Section]>
-};
-
-export type DeriveCustom = Record<string, Record<string, (instanceId: 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: ['phragmenElection', 'electionsPhragmen', 'elections'],
-  imOnline: ['imOnline'],
-  membership: ['membership'],
-  parachains: ['parachains', 'registrar'],
-  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> (instanceId: string, 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];
-
-      deriveAcc[sectionName as keyof AllSections] = Object
-        .keys(section)
-        .reduce((sectionAcc, _methodName): DeriveSection<typeof section> => {
-          const methodName = _methodName as keyof typeof section;
-          // Not sure what to do here, casting as any. Though the final types are good
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call
-          const method = (section[methodName] as any)(instanceId, api);
-
-          // idem
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
-          (sectionAcc as any)[methodName] = method;
-
-          return sectionAcc;
-        }, {} as DeriveSection<typeof section>);
-
-      return deriveAcc;
-    }, {} as DeriveAllSections<AllSections>);
-}
-
-// FIXME The return type of this function should be {...ExactDerive, ...DeriveCustom}
-// For now we just drop the custom derive typings
-/** @internal */
-export function decorateDerive (instanceId: string, api: ApiInterfaceRx, custom: DeriveCustom = {}): ExactDerive {
-  return {
-    ...injectFunctions(instanceId, api, derive),
-    ...injectFunctions(instanceId, api, custom)
-  };
-}
+export * from './bundle';
@@ -1,4 +1,6 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+export * from './members';
+export * from './prime';
 export * from './proposals';
--- a/Show More
+++ b/Show More