[CI Skip] release/stable 5.5.1

skip-checks: true
5.5.1 (#3877 )
2021-08-15 10:04:17 +00:00 · 2021-08-15 11:54:51 +02:00 · 2021-08-15 11:34:27 +02:00 · 2021-08-15 10:54:25 +02:00 · 2021-08-14 07:23:58 +00:00 · 2021-08-14 09:14:53 +02:00
230 changed files with 68243 additions and 6891 deletions
@@ -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,42 @@
 # CHANGELOG

+## 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.
@@ -12,7 +12,7 @@ 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'
  },
@@ -25,7 +25,8 @@ module.exports = {
    '<rootDir>/packages/rpc-provider/build',
    '<rootDir>/packages/typegen/build',
    '<rootDir>/packages/types/build',
-    '<rootDir>/packages/types-known/build'
+    '<rootDir>/packages/types-known/build',
+    '<rootDir>/packages/types-support/build'
  ],
  testTimeout: 30000,
  transformIgnorePatterns: ['/node_modules/(?!@polkadot|@babel/runtime/helpers/esm/)']
@@ -26,14 +26,15 @@
    "test:watch": "polkadot-dev-run-test --watch"
  },
  "devDependencies": {
-    "@babel/core": "^7.14.8",
-    "@babel/register": "^7.14.5",
-    "@babel/runtime": "^7.14.8",
-    "@polkadot/dev": "^0.62.57",
+    "@babel/core": "^7.15.0",
+    "@babel/register": "^7.15.3",
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/dev": "^0.62.59",
    "@polkadot/ts": "^0.4.4",
    "@polkadot/typegen": "workspace:packages/typegen",
    "@types/jest": "^26.0.24",
    "copyfiles": "^2.4.1"
  },
-  "version": "5.3.2"
+  "version": "5.5.1",
+  "packageManager": "yarn@3.0.1"
 }
@@ -1,6 +1,6 @@
 {
  "name": "@polkadot/api-contract",
-  "version": "5.3.2",
+  "version": "5.5.1",
  "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.8",
-    "@polkadot/api": "5.3.2",
-    "@polkadot/types": "5.3.2",
-    "@polkadot/util": "^7.1.1",
-    "rxjs": "^7.2.0"
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/api": "5.5.1",
+    "@polkadot/types": "5.5.1",
+    "@polkadot/util": "^7.2.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';
@@ -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' });
      }
    });
  });
@@ -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 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,7 +5,7 @@ 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';

@@ -26,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));
@@ -90,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)
@@ -103,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,
@@ -129,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);
@@ -5,28 +5,27 @@ 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 { 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));
@@ -3,4 +3,4 @@

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

-export const packageInfo = { name: '@polkadot/api-contract', version: '5.3.2' };
+export const packageInfo = { name: '@polkadot/api-contract', version: '5.5.1' };
@@ -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;
@@ -71,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,18 +143,18 @@
        "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"
          }
        ],
@@ -162,29 +162,29 @@
        "name": "Occupied"
      }
    ],
-    "info": 3,
+    "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)"
  },
  {
-    "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,18 +191,18 @@
        "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"
          }
        ],
@@ -210,22 +210,22 @@
        "name": "Occupied"
      }
    ],
-    "info": 3,
+    "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"
      }
    ],
@@ -236,21 +236,21 @@
    "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,11 +420,11 @@
        "ext": {
          "discriminant": 7
        },
-        "info": 6,
+        "info": "Plain",
        "name": "NotAllowed",
        "type": "Null"
      }
    ],
    "type": "{\"_enum\":[\"NotOwner\",\"NotApproved\",\"TokenExists\",\"TokenNotFound\",\"CannotInsert\",\"CannotRemove\",\"CannotFetchValue\",\"NotAllowed\"]}"
  }
-]
+]
@@ -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,16 +50,16 @@
        "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"
          }
        ],
@@ -67,20 +67,20 @@
        "name": "Occupied"
      }
    ],
-    "info": 3,
+    "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"
      }
    ],
@@ -89,34 +89,34 @@
  {
    "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"
          }
@@ -414,16 +414,16 @@
  {
    "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,18 +143,18 @@
        "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"
          }
        ],
@@ -162,33 +162,33 @@
        "name": "Occupied"
      }
    ],
-    "info": 3,
+    "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)"
  },
  {
-    "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": "5.3.2",
+  "version": "5.5.1",
  "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.8",
-    "@polkadot/api": "5.3.2",
-    "@polkadot/rpc-core": "5.3.2",
-    "@polkadot/types": "5.3.2",
-    "@polkadot/util": "^7.1.1",
-    "@polkadot/util-crypto": "^7.1.1",
-    "rxjs": "^7.2.0"
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/api": "5.5.1",
+    "@polkadot/rpc-core": "5.5.1",
+    "@polkadot/types": "5.5.1",
+    "@polkadot/util": "^7.2.1",
+    "@polkadot/util-crypto": "^7.2.1",
+    "rxjs": "^7.3.0"
  },
  "devDependencies": {
-    "@polkadot/keyring": "^7.1.1",
-    "@polkadot/rpc-provider": "5.3.2"
+    "@polkadot/keyring": "^7.2.1",
+    "@polkadot/rpc-provider": "5.5.1"
  }
 }
@@ -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])
+      ];
    })
  );
 }
@@ -86,7 +86,7 @@ function queryScheduler (api: ApiInterfaceRx): Observable<DeriveDispatch[]> {
              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 [, index] = api.registry.createType<ITuple<[u64, ReferendumIndex]>>('(u64, ReferendumIndex)', id);
                const imageHash = scheduled.call.args[0] as Hash;

                result.push({ at, imageHash, index });
@@ -14,10 +14,7 @@ import { TypeRegistry } from '@polkadot/types/create';
 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');
@@ -96,7 +93,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,4 +3,4 @@

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

-export const packageInfo = { name: '@polkadot/api-derive', version: '5.3.2' };
+export const packageInfo = { name: '@polkadot/api-derive', version: '5.5.1' };
@@ -1,7 +1,7 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import type { Option, u32 } from '@polkadot/types';
+import type { Option, u32, u64 } from '@polkadot/types';
 import type { BlockNumber, EraIndex, Moment, SessionIndex } from '@polkadot/types/interfaces';

 export interface DeriveSessionIndexes {
@@ -15,7 +15,7 @@ export interface DeriveSessionIndexes {
 export interface DeriveSessionInfo extends DeriveSessionIndexes {
  eraLength: BlockNumber;
  isEpoch: boolean;
-  sessionLength: BlockNumber;
+  sessionLength: u64;
  sessionsPerEra: SessionIndex;
 }

@@ -3,7 +3,7 @@

 import { ApiPromise, WsProvider } from '@polkadot/api';
 import { Metadata, TypeRegistry } from '@polkadot/types';
-import metaStatic from '@polkadot/types/metadata/static-substrate';
+import metaStatic from '@polkadot/types-support/metadata/static-substrate';

 export function createApiWithAugmentations (): ApiPromise {
  const registry = new TypeRegistry();
@@ -1,6 +1,6 @@
 {
  "name": "@polkadot/api",
-  "version": "5.3.2",
+  "version": "5.5.1",
  "type": "module",
  "description": "Promise and RxJS wrappers around the Polkadot JS RPC",
  "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#readme",
  "dependencies": {
-    "@babel/runtime": "^7.14.8",
-    "@polkadot/api-derive": "5.3.2",
-    "@polkadot/keyring": "^7.1.1",
-    "@polkadot/rpc-core": "5.3.2",
-    "@polkadot/rpc-provider": "5.3.2",
-    "@polkadot/types": "5.3.2",
-    "@polkadot/types-known": "5.3.2",
-    "@polkadot/util": "^7.1.1",
-    "@polkadot/util-crypto": "^7.1.1",
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/api-derive": "5.5.1",
+    "@polkadot/keyring": "^7.2.1",
+    "@polkadot/rpc-core": "5.5.1",
+    "@polkadot/rpc-provider": "5.5.1",
+    "@polkadot/types": "5.5.1",
+    "@polkadot/types-known": "5.5.1",
+    "@polkadot/util": "^7.2.1",
+    "@polkadot/util-crypto": "^7.2.1",
    "eventemitter3": "^4.0.7",
-    "rxjs": "^7.2.0"
+    "rxjs": "^7.3.0"
  }
 }
@@ -7,7 +7,7 @@ import type { Option, Raw, StorageKey, Text, u64 } from '@polkadot/types';
 import type { Call, Hash, RuntimeVersion } from '@polkadot/types/interfaces';
 import type { DecoratedMeta } from '@polkadot/types/metadata/decorate/types';
 import type { StorageEntry } from '@polkadot/types/primitive/types';
-import type { AnyFunction, AnyTuple, CallFunction, Codec, CodecArg as Arg, DefinitionRpc, DefinitionRpcSub, IMethod, InterfaceTypes, IStorageKey, Registry, RegistryTypes } from '@polkadot/types/types';
+import type { AnyFunction, AnyTuple, CallFunction, Codec, DefinitionRpc, DefinitionRpcSub, DetectCodec, IMethod, IStorageKey, Registry, RegistryTypes } from '@polkadot/types/types';
 import type { SubmittableExtrinsic } from '../submittable/types';
 import type { ApiDecoration, ApiInterfaceRx, ApiOptions, ApiTypes, DecoratedErrors, DecoratedEvents, DecoratedRpc, DecoratedRpcSection, DecorateMethod, PaginationOptions, QueryableConsts, QueryableModuleStorage, QueryableModuleStorageAt, QueryableStorage, QueryableStorageAt, QueryableStorageEntry, QueryableStorageEntryAt, QueryableStorageMulti, QueryableStorageMultiArg, SubmittableExtrinsicFunction, SubmittableExtrinsics, SubmittableModuleExtrinsics } from '../types';
 import type { VersionedRegistry } from './types';
@@ -164,7 +164,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
  /**
   * @description Creates an instance of a type as registered
   */
-  public createType <K extends keyof InterfaceTypes> (type: K, ...params: unknown[]): InterfaceTypes[K] {
+  public createType <T extends Codec = Codec, K extends string = string> (type: K, ...params: unknown[]): DetectCodec<T, K> {
    return this.#registry.createType(type, ...params);
  }

@@ -379,7 +379,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
  }

  private _decorateExtrinsicEntry<ApiType extends ApiTypes> (method: CallFunction, creator: (value: Call | Uint8Array | string) => SubmittableExtrinsic<ApiType>): SubmittableExtrinsicFunction<ApiType> {
-    const decorated = (...params: Arg[]): SubmittableExtrinsic<ApiType> =>
+    const decorated = (...params: unknown[]): SubmittableExtrinsic<ApiType> =>
      creator(method(...params));

    // pass through the `.is`
@@ -425,17 +425,17 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {

    decorated.creator = creator;

-    decorated.at = decorateMethod((hash: Hash, ...args: Arg[]): Observable<Codec> =>
+    decorated.at = decorateMethod((hash: Hash, ...args: unknown[]): Observable<Codec> =>
      this._rpcCore.state.getStorage(getArgs(args), hash));

-    decorated.hash = decorateMethod((...args: Arg[]): Observable<Hash> =>
+    decorated.hash = decorateMethod((...args: unknown[]): Observable<Hash> =>
      this._rpcCore.state.getStorageHash(getArgs(args)));

    decorated.is = <A extends AnyTuple> (key: IStorageKey<AnyTuple>): key is IStorageKey<A> =>
      key.section === creator.section &&
      key.method === creator.method;

-    decorated.key = (...args: Arg[]): string =>
+    decorated.key = (...args: unknown[]): string =>
      u8aToHex(compactStripLength(creator(
        creator.meta.type.isPlain
          ? undefined
@@ -446,27 +446,27 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
              : args
      ))[1]);

-    decorated.keyPrefix = (...keys: Arg[]): string =>
+    decorated.keyPrefix = (...keys: unknown[]): string =>
      u8aToHex(creator.keyPrefix(...keys));

-    decorated.range = decorateMethod((range: [Hash, Hash?], ...args: Arg[]): Observable<[Hash, Codec][]> =>
+    decorated.range = decorateMethod((range: [Hash, Hash?], ...args: unknown[]): Observable<[Hash, Codec][]> =>
      this._decorateStorageRange(decorated, args, range));

-    decorated.size = decorateMethod((...args: Arg[]): Observable<u64> =>
+    decorated.size = decorateMethod((...args: unknown[]): Observable<u64> =>
      this._rpcCore.state.getStorageSize(getArgs(args)));

-    decorated.sizeAt = decorateMethod((hash: Hash | Uint8Array | string, ...args: Arg[]): Observable<u64> =>
+    decorated.sizeAt = decorateMethod((hash: Hash | Uint8Array | string, ...args: unknown[]): Observable<u64> =>
      this._rpcCore.state.getStorageSize(getArgs(args), hash));

    // FIXME NMap support
    // .keys() & .entries() only available on map types
-    if (creator.iterKey && (creator.meta.type.isMap || creator.meta.type.isDoubleMap)) {
+    if (creator.iterKey && (creator.meta.type.isMap || creator.meta.type.isDoubleMap || creator.meta.type.isNMap)) {
      decorated.entries = decorateMethod(
-        memo(this.#instanceId, (...args: Arg[]): Observable<[StorageKey, Codec][]> =>
+        memo(this.#instanceId, (...args: unknown[]): Observable<[StorageKey, Codec][]> =>
          this._retrieveMapEntries(creator, null, args)));

      decorated.entriesAt = decorateMethod(
-        memo(this.#instanceId, (hash: Hash | Uint8Array | string, ...args: Arg[]): Observable<[StorageKey, Codec][]> =>
+        memo(this.#instanceId, (hash: Hash | Uint8Array | string, ...args: unknown[]): Observable<[StorageKey, Codec][]> =>
          this._retrieveMapEntries(creator, hash, args)));

      decorated.entriesPaged = decorateMethod(
@@ -474,11 +474,11 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
          this._retrieveMapEntriesPaged(creator, opts)));

      decorated.keys = decorateMethod(
-        memo(this.#instanceId, (...args: Arg[]): Observable<StorageKey[]> =>
+        memo(this.#instanceId, (...args: unknown[]): Observable<StorageKey[]> =>
          this._retrieveMapKeys(creator, null, args)));

      decorated.keysAt = decorateMethod(
-        memo(this.#instanceId, (hash: Hash | Uint8Array | string, ...args: Arg[]): Observable<StorageKey[]> =>
+        memo(this.#instanceId, (hash: Hash | Uint8Array | string, ...args: unknown[]): Observable<StorageKey[]> =>
          this._retrieveMapKeys(creator, hash, args)));

      decorated.keysPaged = decorateMethod(
@@ -488,7 +488,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {

    if (this.supportMulti) {
      // When using double map storage function, user need to pass double map key as an array
-      decorated.multi = decorateMethod((args: (Arg | Arg[])[]): Observable<Codec[]> =>
+      decorated.multi = decorateMethod((args: (unknown | unknown[])[]): Observable<Codec[]> =>
        this._retrieveMulti(args.map((arg) => [creator, arg])));
    }

@@ -504,19 +504,19 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
    // Disable this where it occurs for each field we are decorating
    /* eslint-disable @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment */

-    const decorated = decorateMethod((...args: Arg[]): Observable<Codec> =>
+    const decorated = decorateMethod((...args: unknown[]): Observable<Codec> =>
      this._rpcCore.state.getStorage(getArgs(args), blockHash));

    decorated.creator = creator;

-    decorated.hash = decorateMethod((...args: Arg[]): Observable<Hash> =>
+    decorated.hash = decorateMethod((...args: unknown[]): Observable<Hash> =>
      this._rpcCore.state.getStorageHash(getArgs(args), blockHash));

    decorated.is = <A extends AnyTuple> (key: IStorageKey<AnyTuple>): key is IStorageKey<A> =>
      key.section === creator.section &&
      key.method === creator.method;

-    decorated.key = (...args: Arg[]): string =>
+    decorated.key = (...args: unknown[]): string =>
      u8aToHex(compactStripLength(creator(
        creator.meta.type.isPlain
          ? undefined
@@ -527,21 +527,21 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
              : args
      ))[1]);

-    decorated.keyPrefix = (...keys: Arg[]): string =>
+    decorated.keyPrefix = (...keys: unknown[]): string =>
      u8aToHex(creator.keyPrefix(...keys));

-    decorated.size = decorateMethod((...args: Arg[]): Observable<u64> =>
+    decorated.size = decorateMethod((...args: unknown[]): Observable<u64> =>
      this._rpcCore.state.getStorageSize(getArgs(args), blockHash));

    // FIXME NMap support
    // .keys() & .entries() only available on map types
    if (creator.iterKey && (creator.meta.type.isMap || creator.meta.type.isDoubleMap)) {
      decorated.entries = decorateMethod(
-        memo(this.#instanceId, (...args: Arg[]): Observable<[StorageKey, Codec][]> =>
+        memo(this.#instanceId, (...args: unknown[]): Observable<[StorageKey, Codec][]> =>
          this._retrieveMapEntries(creator, blockHash, args)));

      decorated.keys = decorateMethod(
-        memo(this.#instanceId, (...args: Arg[]): Observable<StorageKey[]> =>
+        memo(this.#instanceId, (...args: unknown[]): Observable<StorageKey[]> =>
          this._retrieveMapKeys(creator, blockHash, args)));
    }

@@ -553,7 +553,6 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
  // Decorate the base storage call. In the case or rxjs or promise-without-callback (await)
  // we make a subscription, alternatively we push this through a single-shot query
  private _decorateStorageCall<ApiType extends ApiTypes> (creator: StorageEntry, decorateMethod: DecorateMethod<ApiType>): ReturnType<DecorateMethod<ApiType>> {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
    return decorateMethod((...args: unknown[]): Observable<Codec> => {
      return this.hasSubscriptions
        ? this._rpcCore.state.subscribeStorage<[Codec]>([extractStorageArgs(this.#registry, creator, args)]).pipe(
@@ -566,7 +565,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
    });
  }

-  private _decorateStorageRange<ApiType extends ApiTypes> (decorated: QueryableStorageEntry<ApiType>, args: Arg[], range: [Hash, Hash?]): Observable<[Hash, Codec][]> {
+  private _decorateStorageRange<ApiType extends ApiTypes> (decorated: QueryableStorageEntry<ApiType>, args: unknown[], range: [Hash, Hash?]): Observable<[Hash, Codec][]> {
    const outputType = unwrapStorageType(this.#registry, decorated.creator.meta.type, decorated.creator.meta.modifier.isOptional);

    return this._rpcCore.state
@@ -580,7 +579,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
  }

  // retrieve a set of values for a specific set of keys - here we chunk the keys into PAGE_SIZE sizes
-  private _retrieveMulti (keys: [StorageEntry, Arg | Arg[]][]): Observable<Codec[]> {
+  private _retrieveMulti (keys: [StorageEntry, unknown | unknown[]][]): Observable<Codec[]> {
    if (!keys.length) {
      return of([]);
    }
@@ -596,7 +595,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
    );
  }

-  private _retrieveMapKeys ({ iterKey, meta, method, section }: StorageEntry, at: Hash | Uint8Array | string | null, args: Arg[]): Observable<StorageKey[]> {
+  private _retrieveMapKeys ({ iterKey, meta, method, section }: StorageEntry, at: Hash | Uint8Array | string | null, args: unknown[]): Observable<StorageKey[]> {
    assert(iterKey && (meta.type.isMap || meta.type.isDoubleMap || meta.type.isNMap), 'keys can only be retrieved on maps, linked maps and double maps');

    const headKey = iterKey(...args).toHex();
@@ -630,7 +629,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
    );
  }

-  private _retrieveMapEntries (entry: StorageEntry, at: Hash | Uint8Array | string | null, args: Arg[]): Observable<[StorageKey, Codec][]> {
+  private _retrieveMapEntries (entry: StorageEntry, at: Hash | Uint8Array | string | null, args: unknown[]): Observable<[StorageKey, Codec][]> {
    const query = at
      ? (keyset: StorageKey[]) => this._rpcCore.state.queryStorageAt(keyset, at)
      : (keyset: StorageKey[]) => this._rpcCore.state.queryStorageAt(keyset);
@@ -352,8 +352,8 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
  }

  #onProviderConnect = async (): Promise<void> => {
-    this.emit('connected');
    this._isConnected.next(true);
+    this.emit('connected');

    try {
      const [hasMeta, cryptoReady] = await Promise.all([
@@ -382,10 +382,9 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
  }

  #onProviderDisconnect = (): void => {
-    this.emit('disconnected');
    this._isConnected.next(false);
-
    this._unsubscribeHealth();
+    this.emit('disconnected');
  };

  #onProviderError = (error: Error): void => {
@@ -190,7 +190,7 @@ function types (api: ApiPromise): void {
 }

 async function tx (api: ApiPromise, pairs: TestKeyringMap): Promise<void> {
-  // transfer, also allows for BigInt inputs here
+  // transfer, also allows for bigint inputs here
  const transfer = api.tx.balances.transfer(pairs.bob.address, 123456789n);

  console.log('transfer casted', transfer as IMethod<AnyTuple>, transfer as IExtrinsic<AnyTuple>);
@@ -3,4 +3,4 @@

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

-export const packageInfo = { name: '@polkadot/api', version: '5.3.2' };
+export const packageInfo = { name: '@polkadot/api', version: '5.5.1' };
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 import type { Observable } from 'rxjs';
-import type { AnyFunction, Callback, Codec, CodecArg } from '@polkadot/types/types';
+import type { AnyFunction, Callback, Codec } from '@polkadot/types/types';

 export type Push<T extends readonly unknown[], V> = [...T, V]

@@ -57,9 +57,8 @@ export interface DecorateMethodOptions {

 export type DecorateFn <T extends Codec> = (...args: any[]) => Observable<T>;

-// FIXME We need a solution for NMap
-export interface PaginationOptions<ArgType = CodecArg> {
-  args: ArgType[];
+export interface PaginationOptions<A = unknown> {
+  args: A[];
  pageSize: number;
  startKey?: string;
 }
@@ -5,34 +5,34 @@ import type { Observable } from 'rxjs';
 import type { StorageKey, u64 } from '@polkadot/types';
 import type { Hash } from '@polkadot/types/interfaces';
 import type { StorageEntry } from '@polkadot/types/primitive/types';
-import type { AnyFunction, AnyTuple, Callback, Codec, CodecArg, IStorageKey } from '@polkadot/types/types';
+import type { AnyFunction, AnyTuple, Callback, Codec, IStorageKey } from '@polkadot/types/types';
 import type { ApiTypes, DropLast, MethodResult, ObsInnerType, PaginationOptions, PromiseOrObs, UnsubscribePromise } from './base';

 interface StorageEntryObservableMulti {
-  <T extends Codec>(args: (CodecArg[] | CodecArg)[]): Observable<T[]>;
+  <T extends Codec>(args: (unknown[] | unknown)[]): Observable<T[]>;
 }

 interface StorageEntryPromiseMulti {
-  <T extends Codec>(args: (CodecArg[] | CodecArg)[]): Promise<T[]>;
-  <T extends Codec>(args: (CodecArg[] | CodecArg)[], callback: Callback<T[]>): UnsubscribePromise;
+  <T extends Codec>(args: (unknown[] | unknown)[]): Promise<T[]>;
+  <T extends Codec>(args: (unknown[] | unknown)[], callback: Callback<T[]>): UnsubscribePromise;
 }

 export interface StorageEntryPromiseOverloads {
-  (arg1?: CodecArg, arg2?: CodecArg, arg3?: CodecArg): Promise<Codec>;
-  <T extends Codec>(arg1?: CodecArg, arg2?: CodecArg, arg3?: CodecArg): Promise<T>;
+  (arg1?: unknown, arg2?: unknown, arg3?: unknown): Promise<Codec>;
+  <T extends Codec>(arg1?: unknown, arg2?: unknown, arg3?: unknown): Promise<T>;
  <T extends Codec>(callback: Callback<T>): UnsubscribePromise;
-  <T extends Codec>(arg: CodecArg, callback: Callback<T>): UnsubscribePromise;
-  <T extends Codec>(arg1: CodecArg, arg2: CodecArg, callback: Callback<T>): UnsubscribePromise;
-  <T extends Codec>(arg1: CodecArg, arg2: CodecArg, arg3: CodecArg, callback: Callback<T>): UnsubscribePromise;
+  <T extends Codec>(arg: unknown, callback: Callback<T>): UnsubscribePromise;
+  <T extends Codec>(arg1: unknown, arg2: unknown, callback: Callback<T>): UnsubscribePromise;
+  <T extends Codec>(arg1: unknown, arg2: unknown, arg3: unknown, callback: Callback<T>): UnsubscribePromise;
 }

 export interface StorageEntryPromiseOverloadsAt {
-  (arg1?: CodecArg, arg2?: CodecArg, arg3?: CodecArg): Promise<Codec>;
-  <T extends Codec>(arg1?: CodecArg, arg2?: CodecArg, arg3?: CodecArg): Promise<T>;
+  (arg1?: unknown, arg2?: unknown, arg3?: unknown): Promise<Codec>;
+  <T extends Codec>(arg1?: unknown, arg2?: unknown, arg3?: unknown): Promise<T>;
 }

 // This is the most generic typings we can have for a storage entry function
-type GenericStorageEntryFunction = (...args: CodecArg[]) => Observable<Codec>
+type GenericStorageEntryFunction = (...args: unknown[]) => Observable<Codec>

 export type QueryableStorageEntry<ApiType extends ApiTypes, A extends AnyTuple = AnyTuple> =
  ApiType extends 'rxjs'
@@ -92,7 +92,7 @@ export interface QueryableModuleStorageAt<ApiType extends ApiTypes> {

 export type QueryableStorageMultiArg<ApiType extends ApiTypes> =
  QueryableStorageEntry<ApiType> |
-  [QueryableStorageEntry<ApiType>, ...CodecArg[]];
+  [QueryableStorageEntry<ApiType>, ...unknown[]];

 export interface QueryableStorageMultiBase<ApiType extends ApiTypes> {
  <T extends Codec[]>(calls: QueryableStorageMultiArg<ApiType>[]): Observable<T>;
@@ -4,7 +4,7 @@
 import type { Storage } from '@polkadot/types/metadata/decorate/types';

 import { decorateStorage, Metadata, TypeRegistry } from '@polkadot/types';
-import metaStatic from '@polkadot/types/metadata/static-substrate';
+import metaStatic from '@polkadot/types-support/metadata/static-substrate';

 import { extractStorageArgs } from './validate';

@@ -1,6 +1,6 @@
 {
  "name": "@polkadot/rpc-core",
-  "version": "5.3.2",
+  "version": "5.5.1",
  "type": "module",
  "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
  "main": "index.js",
@@ -19,13 +19,13 @@
  "bugs": "https://github.com/polkadot-js/api/issues",
  "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-core#readme",
  "dependencies": {
-    "@babel/runtime": "^7.14.8",
-    "@polkadot/rpc-provider": "5.3.2",
-    "@polkadot/types": "5.3.2",
-    "@polkadot/util": "^7.1.1",
-    "rxjs": "^7.2.0"
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/rpc-provider": "5.5.1",
+    "@polkadot/types": "5.5.1",
+    "@polkadot/util": "^7.2.1",
+    "rxjs": "^7.3.0"
  },
  "devDependencies": {
-    "@polkadot/keyring": "^7.1.1"
+    "@polkadot/keyring": "^7.2.1"
  }
 }
@@ -3,4 +3,4 @@

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

-export const packageInfo = { name: '@polkadot/rpc-core', version: '5.3.2' };
+export const packageInfo = { name: '@polkadot/rpc-core', version: '5.5.1' };
@@ -1,6 +1,6 @@
 {
  "name": "@polkadot/rpc-provider",
-  "version": "5.3.2",
+  "version": "5.5.1",
  "type": "module",
  "description": "Transport providers for the API",
  "main": "index.js",
@@ -19,18 +19,18 @@
  "bugs": "https://github.com/polkadot-js/api/issues",
  "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-provider#readme",
  "dependencies": {
-    "@babel/runtime": "^7.14.8",
-    "@polkadot/types": "5.3.2",
-    "@polkadot/util": "^7.1.1",
-    "@polkadot/util-crypto": "^7.1.1",
-    "@polkadot/x-fetch": "^7.1.1",
-    "@polkadot/x-global": "^7.1.1",
-    "@polkadot/x-ws": "^7.1.1",
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/types": "5.5.1",
+    "@polkadot/util": "^7.2.1",
+    "@polkadot/util-crypto": "^7.2.1",
+    "@polkadot/x-fetch": "^7.2.1",
+    "@polkadot/x-global": "^7.2.1",
+    "@polkadot/x-ws": "^7.2.1",
    "eventemitter3": "^4.0.7"
  },
  "devDependencies": {
-    "@polkadot/keyring": "^7.1.1",
-    "@polkadot/types": "5.3.2",
+    "@polkadot/keyring": "^7.2.1",
+    "@polkadot/types": "5.5.1",
    "mock-socket": "^9.0.3",
    "nock": "^13.1.1"
  }
@@ -13,9 +13,9 @@ import EventEmitter from 'eventemitter3';
 import { createTestKeyring } from '@polkadot/keyring/testing';
 import { decorateStorage, Metadata } from '@polkadot/types';
 import jsonrpc from '@polkadot/types/interfaces/jsonrpc';
-import rpcHeader from '@polkadot/types/json/Header.004.json';
-import rpcSignedBlock from '@polkadot/types/json/SignedBlock.004.immortal.json';
-import rpcMetadata from '@polkadot/types/metadata/static-substrate';
+import rpcHeader from '@polkadot/types-support/json/Header.004.json';
+import rpcSignedBlock from '@polkadot/types-support/json/SignedBlock.004.immortal.json';
+import rpcMetadata from '@polkadot/types-support/metadata/static-substrate';
 import { assert, BN, bnToU8a, logger, u8aToHex } from '@polkadot/util';
 import { randomAsU8a } from '@polkadot/util-crypto';

@@ -3,4 +3,4 @@

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

-export const packageInfo = { name: '@polkadot/rpc-provider', version: '5.3.2' };
+export const packageInfo = { name: '@polkadot/rpc-provider', version: '5.5.1' };
@@ -1,6 +1,6 @@
 {
  "name": "@polkadot/typegen",
-  "version": "5.3.2",
+  "version": "5.5.1",
  "type": "module",
  "description": "Type generation scripts",
  "main": "index.js",
@@ -26,16 +26,17 @@
  "bugs": "https://github.com/polkadot-js/api/issues",
  "homepage": "https://github.com/polkadot-js/api/tree/master/packages/typegen#readme",
  "dependencies": {
-    "@babel/core": "^7.14.8",
-    "@babel/register": "^7.14.5",
-    "@babel/runtime": "^7.14.8",
-    "@polkadot/api": "5.3.2",
-    "@polkadot/rpc-provider": "5.3.2",
-    "@polkadot/types": "5.3.2",
-    "@polkadot/util": "^7.1.1",
+    "@babel/core": "^7.15.0",
+    "@babel/register": "^7.15.3",
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/api": "5.5.1",
+    "@polkadot/rpc-provider": "5.5.1",
+    "@polkadot/types": "5.5.1",
+    "@polkadot/types-support": "5.5.1",
+    "@polkadot/util": "^7.2.1",
    "handlebars": "^4.7.7",
    "websocket": "^1.0.34",
-    "yargs": "^17.0.1"
+    "yargs": "^17.1.0"
  },
  "devDependencies": {
    "@types/websocket": "^1.0.4",
@@ -21,6 +21,7 @@ try {
          '^@polkadot/rpc-core(.*)': './packages/rpc-core/src\\1',
          '^@polkadot/rpc-provider(.*)': './packages/rpc-provider/src\\1',
          '^@polkadot/types-known(.*)': './packages/types-known/src\\1',
+          '^@polkadot/types-support(.*)': './packages/types-support/src\\1',
          '^@polkadot/types(.*)': './packages/types/src\\1'
        }
      }]
@@ -17,6 +17,7 @@ try {
      ['module-resolver', {
        alias: {
          '^@polkadot/types-known(.*)': './packages/types-known/src\\1',
+          '^@polkadot/types-support(.*)': './packages/types-support/src\\1',
          '^@polkadot/types(.*)': './packages/types/src\\1'
        }
      }]
@@ -18,6 +18,7 @@ try {
        alias: {
          '^@polkadot/typegen(.*)': './packages/typegen/src\\1',
          '^@polkadot/types-known(.*)': './packages/types-known/src\\1',
+          '^@polkadot/types-support(.*)': './packages/types-support/src\\1',
          '^@polkadot/types(.*)': './packages/types/src\\1'
        }
      }]
@@ -17,6 +17,7 @@ try {
      ['module-resolver', {
        alias: {
          '^@polkadot/types-known(.*)': './packages/types-known/src\\1',
+          '^@polkadot/types-support(.*)': './packages/types-support/src\\1',
          '^@polkadot/types(.*)': './packages/types/src\\1'
        }
      }]
@@ -17,6 +17,7 @@ try {
      ['module-resolver', {
        alias: {
          '^@polkadot/types-known(.*)': './packages/types-known/src\\1',
+          '^@polkadot/types-support(.*)': './packages/types-support/src\\1',
          '^@polkadot/types(.*)': './packages/types/src\\1'
        }
      }]
@@ -8,7 +8,7 @@ import { TypeRegistry } from '@polkadot/types/create';
 import * as defaultDefinitions from '@polkadot/types/interfaces/definitions';
 import * as defaultPrimitives from '@polkadot/types/primitive';

-import { createImports, getDerivedTypes, readTemplate, setImports, writeFile } from '../util';
+import { createImports, readTemplate, setImports, writeFile } from '../util';
 import { ModuleTypes } from '../util/imports';

 const primitiveClasses = {
@@ -35,10 +35,10 @@ export function generateInterfaceTypes (importDefinitions: { [importPath: string
    Object
      .keys(primitiveClasses)
      .filter((name) => !name.includes('Generic'))
-      .forEach((primitiveName) => {
+      .forEach((primitiveName): void => {
        setImports(definitions, imports, [primitiveName]);

-        items.push(...getDerivedTypes(registry, definitions, primitiveName, primitiveName, imports));
+        items.push(primitiveName);
      });

    const existingTypes: Record<string, boolean> = {};
@@ -55,10 +55,10 @@ export function generateInterfaceTypes (importDefinitions: { [importPath: string

      const uniqueTypes = Object.keys(types).filter((type) => !existingTypes[type]);

-      uniqueTypes.forEach((type) => {
+      uniqueTypes.forEach((type): void => {
        existingTypes[type] = true;

-        items.push(...getDerivedTypes(registry, definitions, type, types[type] as string, imports));
+        items.push(type);
      });
    });

@@ -189,6 +189,7 @@ const encoders: Record<TypeDefInfo, (registry: Registry, definitions: Record<str
  [TypeDefInfo.Null]: errorUnhandled,
  [TypeDefInfo.Option]: tsOption,
  [TypeDefInfo.Plain]: tsPlain,
+  [TypeDefInfo.Range]: errorUnhandled,
  [TypeDefInfo.Result]: tsResult,
  [TypeDefInfo.Set]: tsSet,
  [TypeDefInfo.Si]: tsSi,
@@ -9,9 +9,9 @@ import fs from 'fs';
 import { GenericCall as Call, Metadata, TypeRegistry, Vec } from '@polkadot/types';
 import * as definitions from '@polkadot/types/interfaces/definitions';
 import { getStorage as getSubstrateStorage } from '@polkadot/types/metadata/decorate/storage/getStorage';
-import rpcdata from '@polkadot/types/metadata/static-substrate';
 import { Text } from '@polkadot/types/primitive';
 import { unwrapStorageType } from '@polkadot/types/primitive/StorageKey';
+import rpcdata from '@polkadot/types-support/metadata/static-substrate';
 import { stringCamelCase, stringLowerFirst } from '@polkadot/util';

 interface SectionItem {
@@ -3,4 +3,4 @@

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

-export const packageInfo = { name: '@polkadot/typegen', version: '5.3.2' };
+export const packageInfo = { name: '@polkadot/typegen', version: '5.5.1' };
@@ -5,7 +5,7 @@
 declare module '@polkadot/types/types/registry' {
  export interface InterfaceTypes {
    {{#each items}}
-    {{{this}}}
+    {{{this}}}: {{{this}}};
    {{/each}}
  }
 }
@@ -1,12 +0,0 @@
-// Copyright 2017-2021 @polkadot/typegen authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import type { Constructor } from '@polkadot/types/types';
-
-import { UInt } from '@polkadot/types/codec';
-import { isChildClass } from '@polkadot/util';
-
-/** @internal */
-export function isCompactEncodable (Child: Constructor<any>): boolean {
-  return isChildClass(UInt, Child);
-}
@@ -6,15 +6,13 @@ import type { Constructor, Registry } from '@polkadot/types/types';

 import { Compact, Enum, Option, Struct, Tuple, UInt, Vec } from '@polkadot/types/codec';
 import { AbstractInt } from '@polkadot/types/codec/AbstractInt';
-import { ClassOfUnsafe, getTypeDef } from '@polkadot/types/create';
+import { getTypeDef } from '@polkadot/types/create';
 import { TypeDefInfo } from '@polkadot/types/create/types';
 import { GenericAccountId, GenericLookupSource, GenericVote } from '@polkadot/types/generic';
 import { AllConvictions } from '@polkadot/types/interfaces/democracy/definitions';
 import { bool, Null } from '@polkadot/types/primitive';
-import * as primitiveClasses from '@polkadot/types/primitive';
 import { isChildClass, stringify } from '@polkadot/util';

-import { isCompactEncodable } from './class';
 import { formatType } from './formatting';
 import { ModuleTypes, setImports, TypeImports } from './imports';

@@ -24,46 +22,6 @@ function arrayToStrType (arr: string[]): string {

 const voteConvictions = arrayToStrType(AllConvictions);

-// From `T`, generate `Compact<T>, Option<T>, Vec<T>`
-/** @internal */
-export function getDerivedTypes (registry: Registry, definitions: Record<string, ModuleTypes>, type: string, primitiveName: string, imports: TypeImports): string[] {
-  // `primitiveName` represents the actual primitive type our type is mapped to
-  const isCompact = isCompactEncodable(
-    (primitiveClasses as Record<string, any>)[primitiveName] ||
-    ClassOfUnsafe(registry, type)
-  );
-  const def = getTypeDef(type);
-
-  setImports(definitions, imports, ['Option', 'Vec', isCompact ? 'Compact' : '']);
-
-  const types = [
-    {
-      info: TypeDefInfo.Option,
-      sub: def,
-      type
-    },
-    {
-      info: TypeDefInfo.Vec,
-      sub: def,
-      type
-    }
-  ];
-
-  if (isCompact) {
-    types.unshift({
-      info: TypeDefInfo.Compact,
-      sub: def,
-      type
-    });
-  }
-
-  const result = types.map((t) => formatType(registry, definitions, t, imports)).map((t) => `'${t}': ${t};`);
-
-  result.unshift(`${type}: ${type};`);
-
-  return result;
-}
-
 // Make types a little bit more flexible
 // - if param instanceof AbstractInt, then param: u64 | Uint8array | AnyNumber
 // etc
@@ -87,7 +45,7 @@ export function getSimilarTypes (registry: Registry, definitions: Record<string,
    return ['null'];
  }

-  const Clazz = ClassOfUnsafe(registry, type);
+  const Clazz = registry.createClass(type);

  if (isChildClass(Vec, Clazz)) {
    const vecDef = getTypeDef(type);
@@ -129,6 +129,9 @@ const formatters: Record<TypeDefInfo, (registry: Registry, typeDef: TypeDef, def

    return typeDef.type;
  },
+  [TypeDefInfo.Range]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
+    throw new Error(`TypeDefInfo.Range: Not implemented on ${stringify(typeDef)}`);
+  },
  [TypeDefInfo.Set]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
    throw new Error(`TypeDefInfo.Set: Not implemented on ${stringify(typeDef)}`);
  },
@@ -4,7 +4,7 @@
 import type { ExtraTypes } from '../generate/types';

 import { Metadata, TypeRegistry } from '@polkadot/types';
-import staticData from '@polkadot/types/metadata/static-substrate';
+import staticData from '@polkadot/types-support/metadata/static-substrate';

 import { registerDefinitions } from './register';

@@ -1,8 +1,8 @@
 {
  "name": "@polkadot/types-known",
-  "version": "5.3.2",
+  "version": "5.5.1",
  "type": "module",
-  "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
+  "description": "Known type definitions",
  "main": "index.js",
  "sideEffects": [
    "./detectPackage.js",
@@ -19,9 +19,9 @@
  "bugs": "https://github.com/polkadot-js/api/issues",
  "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-known#readme",
  "dependencies": {
-    "@babel/runtime": "^7.14.8",
-    "@polkadot/networks": "^7.1.1",
-    "@polkadot/types": "5.3.2",
-    "@polkadot/util": "^7.1.1"
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/networks": "^7.2.1",
+    "@polkadot/types": "5.5.1",
+    "@polkadot/util": "^7.2.1"
  }
 }
@@ -57,7 +57,7 @@ export function getSpecExtensions ({ knownTypes }: Registry, chainName: Text | s
 /**
 * @description Based on the chain and runtimeVersion, get the applicable types (ready for registration)
 */
-export function getSpecTypes ({ knownTypes }: Registry, chainName: Text | string, specName: Text | string, specVersion: BigInt | BN | number): RegistryTypes {
+export function getSpecTypes ({ knownTypes }: Registry, chainName: Text | string, specName: Text | string, specVersion: bigint | BN | number): RegistryTypes {
  const _chainName = chainName.toString();
  const _specName = specName.toString();
  const _specVersion = bnToBn(specVersion).toNumber();
@@ -3,4 +3,4 @@

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

-export const packageInfo = { name: '@polkadot/types-known', version: '5.3.2' };
+export const packageInfo = { name: '@polkadot/types-known', version: '5.5.1' };
@@ -8,7 +8,8 @@ const upgrades: ChainUpgradesRaw = [
  [244358, 8], [303079, 9], [314201, 10], [342400, 11], [443963, 12],
  [528470, 13], [687751, 14], [746085, 15], [787923, 16], [799302, 17],
  [1205128, 18], [1603423, 23], [1733218, 24], [2005673, 25], [2436698, 26],
-  [3613564, 27], [3899547, 28], [4345767, 29], [4876134, 30], [5661442, 9050]
+  [3613564, 27], [3899547, 28], [4345767, 29], [4876134, 30], [5661442, 9050],
+  [6321619, 9080]
 ];

 export default upgrades;
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                    http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have made,
+  use, offer to sell, sell, import, and otherwise transfer the Work,
+  where such license applies only to those patent claims licensable
+  by such Contributor that are necessarily infringed by their
+  Contribution(s) alone or by combination of their Contribution(s)
+  with the Work to which such Contribution(s) was submitted. If You
+  institute patent litigation against any entity (including a
+  cross-claim or counterclaim in a lawsuit) alleging that the Work
+  or a Contribution incorporated within the Work constitutes direct
+  or contributory patent infringement, then any patent licenses
+  granted to You under this License for that Work shall terminate
+  as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+  Work or Derivative Works thereof in any medium, with or without
+  modifications, and in Source or Object form, provided that You
+  meet the following conditions:
+
+  (a) You must give any other recipients of the Work or
+      Derivative Works a copy of this License; and
+
+  (b) You must cause any modified files to carry prominent notices
+      stating that You changed the files; and
+
+  (c) You must retain, in the Source form of any Derivative Works
+      that You distribute, all copyright, patent, trademark, and
+      attribution notices from the Source form of the Work,
+      excluding those notices that do not pertain to any part of
+      the Derivative Works; and
+
+  (d) If the Work includes a "NOTICE" text file as part of its
+      distribution, then any Derivative Works that You distribute must
+      include a readable copy of the attribution notices contained
+      within such NOTICE file, excluding those notices that do not
+      pertain to any part of the Derivative Works, in at least one
+      of the following places: within a NOTICE text file distributed
+      as part of the Derivative Works; within the Source form or
+      documentation, if provided along with the Derivative Works; or,
+      within a display generated by the Derivative Works, if and
+      wherever such third-party notices normally appear. The contents
+      of the NOTICE file are for informational purposes only and
+      do not modify the License. You may add Your own attribution
+      notices within Derivative Works that You distribute, alongside
+      or as an addendum to the NOTICE text from the Work, provided
+      that such additional attribution notices cannot be construed
+      as modifying the License.
+
+  You may add Your own copyright statement to Your modifications and
+  may provide additional or different license terms and conditions
+  for use, reproduction, or distribution of Your modifications, or
+  for any such Derivative Works as a whole, provided Your use,
+  reproduction, and distribution of the Work otherwise complies with
+  the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+  any Contribution intentionally submitted for inclusion in the Work
+  by You to the Licensor shall be under the terms and conditions of
+  this License, without any additional terms or conditions.
+  Notwithstanding the above, nothing herein shall supersede or modify
+  the terms of any separate license agreement you may have executed
+  with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+  names, trademarks, service marks, or product names of the Licensor,
+  except as required for reasonable and customary use in describing the
+  origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+  agreed to in writing, Licensor provides the Work (and each
+  Contributor provides its Contributions) on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  implied, including, without limitation, any warranties or conditions
+  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+  PARTICULAR PURPOSE. You are solely responsible for determining the
+  appropriateness of using or redistributing the Work and assume any
+  risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+  whether in tort (including negligence), contract, or otherwise,
+  unless required by applicable law (such as deliberate and grossly
+  negligent acts) or agreed to in writing, shall any Contributor be
+  liable to You for damages, including any direct, indirect, special,
+  incidental, or consequential damages of any character arising as a
+  result of this License or out of the use or inability to use the
+  Work (including but not limited to damages for loss of goodwill,
+  work stoppage, computer failure or malfunction, or any and all
+  other commercial damages or losses), even if such Contributor
+  has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+  the Work or Derivative Works thereof, You may choose to offer,
+  and charge a fee for, acceptance of support, warranty, indemnity,
+  or other liability obligations and/or rights consistent with this
+  License. However, in accepting such obligations, You may act only
+  on Your own behalf and on Your sole responsibility, not on behalf
+  of any other Contributor, and only if You agree to indemnify,
+  defend, and hold each Contributor harmless for any liability
+  incurred by, or claims asserted against, such Contributor by reason
+  of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+  To apply the Apache License to your work, attach the following
+  boilerplate notice, with the fields enclosed by brackets "[]"
+  replaced with your own identifying information. (Don't include
+  the brackets!)  The text should be enclosed in the appropriate
+  comment syntax for the file format. We also recommend that a
+  file or class name and description of purpose be included on the
+  same "printed page" as the copyright notice for easier
+  identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
@@ -0,0 +1,3 @@
+# @polkadot/types-known
+
+Specific known base type overrides (e.g. `Address`, etc) for chains & specs. This does not contain user-specfic types.
@@ -0,0 +1,25 @@
+{
+  "name": "@polkadot/types-support",
+  "version": "5.5.1",
+  "type": "module",
+  "description": "Supporting files for types, mostly for testing",
+  "main": "index.js",
+  "sideEffects": [
+    "./detectPackage.js",
+    "./detectPackage.cjs"
+  ],
+  "engines": {
+    "node": ">=14.0.0"
+  },
+  "author": "Jaco Greeff <jacogr@gmail.com>",
+  "maintainers": [],
+  "contributors": [],
+  "license": "Apache-2.0",
+  "repository": "github:polkadot-js/api",
+  "bugs": "https://github.com/polkadot-js/api/issues",
+  "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-support#readme",
+  "dependencies": {
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/util": "^7.2.1"
+  }
+}
@@ -0,0 +1,8 @@
+// Copyright 2017-2021 @polkadot/types-support authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { detectPackage } from '@polkadot/util';
+
+import { packageInfo } from './packageInfo';
+
+detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, []);
@@ -0,0 +1,4 @@
+// Copyright 2017-2021 @polkadot/types-support authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import './detectPackage';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/types authors & contributors
+// Copyright 2017-2021 @polkadot/types-support authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 // Be able to import json in TS
@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/types-support authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import metadata from './v13/kusama-hex';
+
+export default metadata;
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/types authors & contributors
+// Copyright 2017-2021 @polkadot/types-support authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import metadata from './v13/polkadot-hex';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/types authors & contributors
+// Copyright 2017-2021 @polkadot/types-support authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import metadata from './v13/substrate-hex';
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Github Actions	bfd5642d64	[CI Skip] release/stable 5.5.1 skip-checks: true	2021-08-15 10:04:17 +00:00
Jaco	126871bd46	5.5.1 (#3877 ) * 5.5.1 * CHANGELOG	2021-08-15 11:54:51 +02:00
Jaco	714234b7af	TypeDefInfo alphabetical (adjust ABI compares) (#3878 )	2021-08-15 11:34:27 +02:00
Jaco	a7a0965d73	9080 Upgrade block (#3876 ) * 9080 Upgrade block * Update CHANGELOG.md	2021-08-15 10:54:25 +02:00
Github Actions	9b1f9c214b	[CI Skip] release/beta 5.4.2-8 skip-checks: true	2021-08-14 07:23:58 +00:00
Jaco	ca17955d83	Range as primitive (#3874 ) * Range as primitive * Result/Range * INumber as Range inner * Update * .with on Range * Basic range decoding * With * RangeName * TypeDefInfo for Range	2021-08-14 09:14:53 +02:00
Github Actions	9b0d260b33	[CI Skip] release/beta 5.4.2-7 skip-checks: true	2021-08-13 12:01:16 +00:00
Jaco Greeff	fed2913684	bump berry	2021-08-13 14:48:57 +03:00
Github Actions	fc777377ef	[CI Skip] release/beta 5.4.2-6 skip-checks: true	2021-08-13 11:25:41 +00:00
Jaco	ce7968f870	Loosen pedantic check for fully-empty compares (#3873 ) * Loosen pedantic check for fully-empty compares * Bump dev * Update CHANGELOG * Bump common	2021-08-13 13:16:17 +02:00
Jaco	07594a33b5	Extends createType decoration with missing (#3872 ) * Extends createType decoration with missing * Simplify * Correct __IntType * Uint mismatch	2021-08-13 12:58:17 +02:00
Github Actions	48620ea7a3	[CI Skip] release/beta 5.4.2-5 skip-checks: true	2021-08-13 06:23:57 +00:00
Caio	f86ace2680	Add `Range` and `RangeInclusive` types (#3791 ) * Add Range and RangeInclusive types * Lint * Typo	2021-08-13 08:13:14 +02:00
Github Actions	0e22308954	[CI Skip] release/beta 5.4.2-4 skip-checks: true	2021-08-12 15:41:53 +00:00
Jaco	ae21d13b23	Use base interfaces for base Codec (#3870 )	2021-08-12 17:32:25 +02:00
Github Actions	b594158275	[CI Skip] release/beta 5.4.2-3 skip-checks: true	2021-08-12 12:16:10 +00:00
Jaco	76da6a6af5	Adjust createType with inference parser (#3866 ) * Adjust createType with inference parser * Santize fixed vecs * __Tokenize * Shortcut ending sequences * Update tests & checks * greedy matching * Additional linting * s/extends Codec/extends Codec \| undefined/ * Adjust * Shortcut interfacetypes * Cleanups * set & enum * Adjust getTypeClass fallback set * CC * Adjust * Adjust createTypeUnsafe	2021-08-12 14:07:09 +02:00
Github Actions	e1f510f5e9	[CI Skip] release/beta 5.4.2-2 skip-checks: true	2021-08-12 08:11:31 +00:00
Nantian	db6c44615f	fix bigint type (#3869 )	2021-08-12 10:02:15 +02:00
Github Actions	4ce01fe16f	[CI Skip] release/beta 5.4.2-1 skip-checks: true	2021-08-10 09:42:35 +00:00
Jaco	c52576149a	Bump deps (#3861 )	2021-08-10 11:32:00 +02:00
Github Actions	0b5e4fe1cc	[CI Skip] release/beta 5.4.2-0 skip-checks: true	2021-08-10 08:40:26 +00:00
Jaco	8404170240	createType with single trim (#3859 ) * createType with single trim * Adjust * Template struct extraction * Adjust * Additional * Additional checks	2021-08-10 10:28:43 +02:00
Github Actions	2b6e66b906	[CI Skip] release/stable 5.4.1 skip-checks: true	2021-08-09 08:54:48 +00:00
Jaco	b165c0fe8d	5.4.1 (#3857 ) * 5.4.1 * CHANGELOG * CHANGELOG	2021-08-09 10:44:27 +02:00
hamidra	c0751f1a67	enable keys(), entries() for NMaps (#3858 )	2021-08-09 08:44:56 +02:00
Github Actions	2a95046fb2	[CI Skip] release/beta 5.3.3-9 skip-checks: true	2021-08-07 11:21:27 +00:00
Jaco	e1828af4c4	createType TS tuple definitions (#3854 )	2021-08-07 13:12:02 +02:00
Github Actions	a133fec533	[CI Skip] release/beta 5.3.3-8 skip-checks: true	2021-08-06 12:08:30 +00:00
Jaco Greeff	c51f3d5d2a	Remove extra params to type detection	2021-08-06 14:56:03 +03:00
Jaco	54bb965537	Cater for higher-order tuples (#3851 ) * Cater for higher-order tuples * IEnum	2021-08-06 13:42:50 +02:00
Github Actions	9ab662881f	[CI Skip] release/beta 5.3.3-7 skip-checks: true	2021-08-06 11:01:01 +00:00
Jaco	697781fb52	Type detection with trimming (#3850 ) * Type detection with trimming * Additional interface check	2021-08-06 12:48:45 +02:00
Github Actions	a60d80953b	[CI Skip] release/beta 5.3.3-6 skip-checks: true	2021-08-06 09:37:29 +00:00
Jaco	a7edf81279	Detect resulting types from createType (#3849 ) * Detect resulting types from createType * Additional detect overrides * additional * Empy (), never for invalids	2021-08-06 11:28:32 +02:00
Github Actions	3423fb1717	[CI Skip] release/beta 5.3.3-5 skip-checks: true	2021-08-05 15:02:48 +00:00
Jaco	4ae4e4298c	Ensure flags are set before connect/disconnect events (#3846 )	2021-08-05 16:46:33 +02:00
Github Actions	90a84baa52	[CI Skip] release/beta 5.3.3-4 skip-checks: true	2021-08-05 10:41:02 +00:00
Jaco	a80df7d846	Swap CodecArg usage to unknown (#3845 ) * Swap CodecArg usage to unknown * Adjust Constructor defintion	2021-08-05 12:27:51 +02:00
Github Actions	9961595634	[CI Skip] release/beta 5.3.3-3 skip-checks: true	2021-08-05 07:24:40 +00:00
Jaco	e0ecaccb09	Adjust Registry createType return detection (#3844 ) * Adjust Registry createType return detection * type as 'OtherType' cast removal * Use createClass via registry	2021-08-05 09:15:06 +02:00
Github Actions	fd7c80bd8a	[CI Skip] release/beta 5.3.3-2 skip-checks: true	2021-08-04 14:43:15 +00:00
Jaco	44a81bc00c	Metadata v14 only has combined Map (#3843 ) * Metadata v14 only has combined Map * v14 Map conversion de-duped * Substrate Map conversion * v13 tests * Apply suggestions from code review * Housekeeping * v14 bump	2021-08-04 16:31:16 +02:00
Github Actions	7d71726024	[CI Skip] release/beta 5.3.3-1 skip-checks: true	2021-08-04 08:52:18 +00:00
Jaco	f603100b8b	Add @polkadot/types-support (#3842 ) * Add @polkadot/types-support * jest config fix * typegen lookups * Build fixes * Explicit kusama naming * testMeta for v14 (local) * CI test failure * CI test failure v14 * Update with corrected data after test * types-support json imports	2021-08-04 10:39:21 +02:00
Github Actions	70ac38cfd2	[CI Skip] release/beta 5.3.3-0 skip-checks: true	2021-08-03 11:40:44 +00:00
Jaco	0bf0d27a39	Handle BitSequence in PortableRegistry (#3838 ) * Handle BitSequence in PortableRegistry * Use Kusama-dev v14 metadata	2021-08-03 13:27:52 +02:00