[CI Skip] release/stable 4.8.1

skip-checks: true

.123trigger

@@ -19,3 +19,6 @@
 3.10.2
 4.0.2
 4.0.3
+
+4.6.2
+4.7.2

.nvmrc

@@ -1 +1 @@
-12
+14

CHANGELOG.md

@@ -1,5 +1,65 @@
 # CHANGELOG
 
+## 4.8.1 May 2, 2021
+
+Upgrade priority: Low. Recommended when using or developing for parachains.
+
+Changes:
+
+- De-alias xcm `Outcome` (used in multiple pallettes)
+- Adjust xcm types as per latest, e.g. `XcmError`
+- Fix generate of well-known storage keys (e.g. `:code`)
+- Optimize metadata unknown type validation
+- Allow metadata creation for `Map` or `Record`
+- Expose additional camelCase `method` on `AbiMessage` (maps to decorated name)
+- Added explicit double-byte ss58 `AccountId` encoding test
+- Add known upgrade block for Polkadot v30
+- Cleanup WebSocket handlers when close event has been received
+- Update to latest Substrate metadata
+
+
+## 4.7.2 Apr 26, 2021
+
+Upgrade priority: Low. Recommended for users of 4.7.1 using nvm
+
+Changes:
+
+- Update `EthBlock`/`EthHeader` types (as per Rust origin)
+- Updated Xcm `OriginKind` enum
+- Add derives for `membership`
+- Cleanups on encodedLength calculations
+- Update `.nvmrc` to reflect engines changes
+
+
+## 4.7.1 Apr 25, 2021
+
+Upgrade priority: Low. Recommended for users following Substrate master.
+
+Changes:
+
+- Adjust Struct decoding with better error messages on invalid input objects
+- Add support for new `BoundedVec` type
+- Expand `Data` type (as used in identity), with all is/as getters
+- Updated `Xcm` types (with Plularity)
+- Adjust `DispatchError` type as per current Substrate master
+- Adjusted Statemint `Proxy` type
+- Remove metadata generation dependency on well-known.json (dedupe)
+- Adjust WebSocket reconnection delay from 1s to 2.5s
+- Revert Beefy keys addition for Westend
+- Add explicit `engines` config to `package.json`
+- Support for `None` in `RewardDestination`
+- Align with latest substrate metadata
+
+
+## 4.6.2 Apr 19, 2021
+
+Upgrade priority: Low. Recommended for users of Kusama/Polkadot.
+
+Changes:
+
+- Correct Kusama/Polkadot runtime 30 session key definitions
+
+
 ## 4.6.1 Apr 19, 2021
 
 Upgrade priority: Low. Recommended if used in a Node.js 15.x environment.
@@ -9,7 +69,7 @@ Changes:
 - Assert keypair validity in signing operations
 - Expose `internalError` on submittable results (e.g. event decoding errors)
 - Simplify session derives for old/new
-- Add statemint to known types
+- Add Statemint to known types
 - Add support for `rpc.beefy.subscribeJustifications`
 - Update Xcm types
 - Explicitly handle `isReadyOrError` with `Api.create`

README.md

@@ -21,7 +21,7 @@ The API is split up into a number of internal packages -
 
 - [@polkadot/api](packages/api/) The API library, providing both Promise and RxJS Observable-based interfaces. This is the main user-facing entry point.
 - [@polkadot/api-derive](packages/api-derive/) Derived results that are injected into the API, allowing for combinations of various query results (only used internally and exposed on the Api instances via `api.derive.*`)
-- [@polkadot/api-metadata](packages/api-metadata/) Base extrinsic, storage and constant injectors for injection
+- [@polkadot/metadata](packages/metadata/) Base extrinsic, storage and constant injectors for injection
 - [@polkadot/rpc-core](packages/rpc-core/) Wrapper around all [JSON-RPC methods](https://polkadot.js.org/docs/substrate/rpc) exposed by a Polkadot network client
 - [@polkadot/rpc-provider](packages/rpc-provider/) Providers for connecting to nodes, including WebSockets and Http
 

package.json

@@ -25,14 +25,14 @@
     "test:watch": "polkadot-dev-run-test --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.13.15",
+    "@babel/core": "^7.14.0",
-    "@babel/register": "^7.13.14",
+    "@babel/register": "^7.13.16",
-    "@babel/runtime": "^7.13.10",
+    "@babel/runtime": "^7.14.0",
-    "@polkadot/dev": "^0.62.8",
+    "@polkadot/dev": "^0.62.11",
-    "@polkadot/ts": "^0.3.62",
+    "@polkadot/ts": "^0.3.64",
     "@polkadot/typegen": "workspace:packages/typegen",
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^26.0.23",
     "copyfiles": "^2.4.1"
   },
-  "version": "4.6.1"
+  "version": "4.8.1"
 }

packages/api-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "4.6.1",
+  "version": "4.8.1",
   "type": "module",
   "description": "Interfaces for interacting with contracts and contract ABIs",
   "main": "index.js",
@@ -8,6 +8,9 @@
     "./detectPackage.js",
     "./detectPackage.cjs"
   ],
+  "engines": {
+    "node": ">=14.0.0"
+  },
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "contributors": [],
@@ -16,11 +19,11 @@
   "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.13.10",
+    "@babel/runtime": "^7.14.0",
-    "@polkadot/api": "4.6.1",
+    "@polkadot/api": "4.8.1",
-    "@polkadot/types": "4.6.1",
+    "@polkadot/types": "4.8.1",
-    "@polkadot/util": "^6.2.1",
+    "@polkadot/util": "^6.3.1",
-    "@polkadot/x-rxjs": "^6.2.1",
+    "@polkadot/x-rxjs": "^6.3.1",
     "bn.js": "^4.11.9"
   }
 }

packages/api-contract/src/Abi.ts

@@ -6,7 +6,7 @@ import type { ChainProperties, ContractConstructorSpec, ContractEventSpec, Contr
 import type { AnyJson, Codec, CodecArg } from '@polkadot/types/types';
 import type { AbiConstructor, AbiEvent, AbiMessage, AbiParam, DecodedEvent, DecodedMessage } from './types';
 
-import { assert, assertReturn, compactAddLength, compactStripLength, isNumber, isObject, isString, logger, stringCamelCase, u8aConcat, u8aToHex } from '@polkadot/util';
+import { assert, assertReturn, compactAddLength, compactStripLength, isNumber, isObject, isString, logger, stringCamelCase, stringify, u8aConcat, u8aToHex } from '@polkadot/util';
 
 import { MetaRegistry } from './MetaRegistry';
 
@@ -21,7 +21,7 @@ function findMessage <T extends AbiMessage> (list: T[], messageOrId: T | string
       ? list.find(({ identifier }) => [identifier, stringCamelCase(identifier)].includes(messageOrId.toString()))
       : messageOrId;
 
-  return assertReturn(message, `Attempted to call an invalid contract interface, ${JSON.stringify(messageOrId)}`);
+  return assertReturn(message, `Attempted to call an invalid contract interface, ${stringify(messageOrId)}`);
 }
 
 export class Abi {
@@ -81,7 +81,7 @@ export class Abi {
     const index = data[0];
     const event = this.#events[index];
 
-    assert(event, `Unable to find event with index ${index}`);
+    assert(event, () => `Unable to find event with index ${index}`);
 
     return event.fromU8a(data.subarray(1));
   }
@@ -118,7 +118,7 @@ export class Abi {
           type: this.registry.getMetaTypeDef(arg.type)
         };
       } catch (error) {
-        l.error(`Error expanding argument ${index} in ${JSON.stringify(spec)}`);
+        l.error(`Error expanding argument ${index} in ${stringify(spec)}`);
 
         throw error;
       }
@@ -143,6 +143,7 @@ export class Abi {
 
   #createMessage = (spec: ContractMessageSpec | ContractConstructorSpec, index: number, add: Partial<AbiMessage> = {}): AbiMessage => {
     const args = this.#createArgs(spec.args, spec);
+    const identifier = spec.name.toString();
     const message = {
       ...add,
       args,
@@ -151,8 +152,9 @@ export class Abi {
         args: this.#decodeArgs(args, data),
         message
       }),
-      identifier: spec.name.toString(),
+      identifier,
       index,
+      method: stringCamelCase(identifier),
       selector: spec.selector,
       toU8a: (params: CodecArg[], additional?: Uint8Array) =>
         this.#encodeArgs(spec, args, params, additional)
@@ -186,7 +188,7 @@ export class Abi {
   }
 
   #encodeArgs = ({ name, selector }: ContractMessageSpec | ContractConstructorSpec, args: AbiParam[], data: CodecArg[], additional = EMPTY_U8A): Uint8Array => {
-    assert(data.length === args.length, `Expected ${args.length} arguments to contract message '${name.toString()}', found ${data.length}`);
+    assert(data.length === args.length, () => `Expected ${args.length} arguments to contract message '${name.toString()}', found ${data.length}`);
 
     return compactAddLength(
       u8aConcat(

packages/api-contract/src/MetaRegistry.ts

@@ -80,7 +80,7 @@ export class MetaRegistry extends TypeRegistry {
   #getMetaType = (id: SiLookupTypeId): SiType => {
     const type = this.#siTypes[getRegistryOffset(id)];
 
-    assert(!isUndefined(type), `getMetaType:: Unable to find ${id.toNumber()} in type values`);
+    assert(!isUndefined(type), () => `getMetaType:: Unable to find ${id.toNumber()} in type values`);
 
     return this.createType('SiType', type);
   }
@@ -184,7 +184,7 @@ export class MetaRegistry extends TypeRegistry {
   }
 
   #extractSequence = ({ type }: SiTypeDefSequence, id: SiLookupTypeId): Omit<TypeDef, 'type'> => {
-    assert(!!type, `ContractRegistry: Invalid sequence type found at id ${id.toString()}`);
+    assert(!!type, () => `ContractRegistry: Invalid sequence type found at id ${id.toString()}`);
 
     return {
       info: TypeDefInfo.Vec,

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

@@ -10,7 +10,7 @@ import type { ContractGeneric, MapConstructorExec } from './types';
 
 import { SubmittableResult } from '@polkadot/api';
 import { ApiBase } from '@polkadot/api/base';
-import { isUndefined, stringCamelCase } from '@polkadot/util';
+import { isUndefined } from '@polkadot/util';
 
 import { Abi } from '../Abi';
 import { applyOnEvent } from '../util';
@@ -49,10 +49,8 @@ export class Blueprint<ApiType extends ApiTypes> extends Base<ApiType> {
     this.createContract = createBluePrintWithId(this.#deploy);
 
     this.abi.constructors.forEach((c): void => {
-      const messageName = stringCamelCase(c.identifier);
+      if (isUndefined(this.#tx[c.method])) {
-
+        this.#tx[c.method] = createBluePrintTx((o, p) => this.#deploy(c, o, p));
-      if (isUndefined(this.#tx[messageName])) {
-        this.#tx[messageName] = createBluePrintTx((o, p) => this.#deploy(c, o, p));
       }
     });
   }

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

@@ -10,7 +10,7 @@ import type { MapConstructorExec } from './types';
 
 import { SubmittableResult } from '@polkadot/api';
 import { ApiBase } from '@polkadot/api/base';
-import { assert, compactAddLength, isFunction, isUndefined, isWasm, logger, stringCamelCase, u8aToU8a } from '@polkadot/util';
+import { assert, compactAddLength, isFunction, isUndefined, isWasm, logger, u8aToU8a } from '@polkadot/util';
 import { blake2AsU8a } from '@polkadot/util-crypto';
 
 import { Abi } from '../Abi';
@@ -49,10 +49,8 @@ export class Code<ApiType extends ApiTypes> extends Base<ApiType> {
     assert(isWasm(this.code), 'No WASM code provided');
 
     this.abi.constructors.forEach((c): void => {
-      const messageName = stringCamelCase(c.identifier);
+      if (isUndefined(this.#tx[c.method])) {
-
+        this.#tx[c.method] = createBluePrintTx((o, p) => this.#instantiate(c, o, p));
-      if (isUndefined(this.#tx[messageName])) {
-        this.#tx[messageName] = createBluePrintTx((o, p) => this.#instantiate(c, o, p));
       }
     });
   }

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

@@ -13,7 +13,7 @@ import BN from 'bn.js';
 
 import { SubmittableResult } from '@polkadot/api';
 import { ApiBase } from '@polkadot/api/base';
-import { assert, bnToBn, isFunction, isUndefined, logger, stringCamelCase } from '@polkadot/util';
+import { assert, bnToBn, isFunction, isUndefined, logger } from '@polkadot/util';
 import { map } from '@polkadot/x-rxjs/operators';
 
 import { Abi } from '../Abi';
@@ -117,14 +117,12 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
     this.read = createWithId(this.#read, '.read is deprecated, use contract.query.<messageName>(...) instead (where contract refers to this instance)');
 
     this.abi.messages.forEach((m): void => {
-      const messageName = stringCamelCase(m.identifier);
+      if (isUndefined(this.#tx[m.method])) {
-
+        this.#tx[m.method] = createTx((o, p) => this.#exec(m, o, p));
-      if (isUndefined(this.#tx[messageName])) {
-        this.#tx[messageName] = createTx((o, p) => this.#exec(m, o, p));
       }
 
-      if (isUndefined(this.#query[messageName])) {
+      if (isUndefined(this.#query[m.method])) {
-        this.#query[messageName] = createQuery((f, o, p) => this.#read(m, o, p).send(f));
+        this.#query[m.method] = createQuery((f, o, p) => this.#read(m, o, p).send(f));
       }
     });
   }

packages/api-contract/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/api-contract', version: '4.6.1' };
+export const packageInfo = { name: '@polkadot/api-contract', version: '4.8.1' };

packages/api-contract/src/types.ts

@@ -39,6 +39,7 @@ export interface AbiMessage {
   isConstructor?: boolean;
   isMutating?: boolean;
   isPayable?: boolean;
+  method: string;
   returnType?: TypeDef | null;
   selector: ContractSelector;
   toU8a: (params: CodecArg[], additional?: Uint8Array) => Uint8Array;

packages/api-derive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "4.6.1",
+  "version": "4.8.1",
   "type": "module",
   "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
   "main": "index.js",
@@ -8,6 +8,9 @@
     "./detectPackage.js",
     "./detectPackage.cjs"
   ],
+  "engines": {
+    "node": ">=14.0.0"
+  },
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "contributors": [],
@@ -16,17 +19,17 @@
   "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.13.10",
+    "@babel/runtime": "^7.14.0",
-    "@polkadot/api": "4.6.1",
+    "@polkadot/api": "4.8.1",
-    "@polkadot/rpc-core": "4.6.1",
+    "@polkadot/rpc-core": "4.8.1",
-    "@polkadot/types": "4.6.1",
+    "@polkadot/types": "4.8.1",
-    "@polkadot/util": "^6.2.1",
+    "@polkadot/util": "^6.3.1",
-    "@polkadot/util-crypto": "^6.2.1",
+    "@polkadot/util-crypto": "^6.3.1",
-    "@polkadot/x-rxjs": "^6.2.1",
+    "@polkadot/x-rxjs": "^6.3.1",
     "bn.js": "^4.11.9"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.2.1",
+    "@polkadot/keyring": "^6.3.1",
-    "@polkadot/rpc-provider": "4.6.1"
+    "@polkadot/rpc-provider": "4.8.1"
   }
 }

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

@@ -13,6 +13,8 @@ import { catchError, map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
+type Collective = 'council' | 'membership' | 'technicalCommittee';
+
 type Result = [(Hash | Uint8Array | string)[], (Option<Proposal> | null)[], Option<Votes>[]];
 
 function parse (api: ApiInterfaceRx, [hashes, proposals, votes]: Result): DeriveCollectiveProposal[] {
@@ -29,7 +31,7 @@ function parse (api: ApiInterfaceRx, [hashes, proposals, votes]: Result): Derive
     .filter((proposal): proposal is DeriveCollectiveProposal => !!proposal);
 }
 
-function _proposalsFrom (instanceId: string, api: ApiInterfaceRx, section: 'council' | 'technicalCommittee' = 'council'): (hashes: (Hash | Uint8Array | string)[]) => Observable<DeriveCollectiveProposal[]> {
+function _proposalsFrom (instanceId: string, api: ApiInterfaceRx, section: Collective): (hashes: (Hash | Uint8Array | string)[]) => Observable<DeriveCollectiveProposal[]> {
   return memo(instanceId, (hashes: (Hash | Uint8Array | string)[]): Observable<DeriveCollectiveProposal[]> =>
     (isFunction(api.query[section]?.proposals) && hashes.length
       ? combineLatest<Result>([
@@ -49,19 +51,19 @@ function _proposalsFrom (instanceId: string, api: ApiInterfaceRx, section: 'coun
   );
 }
 
-export function proposals (instanceId: string, api: ApiInterfaceRx, section: 'council' | 'technicalCommittee' = 'council'): () => Observable<DeriveCollectiveProposal[]> {
+export function proposals (instanceId: string, api: ApiInterfaceRx, section: Collective): () => Observable<DeriveCollectiveProposal[]> {
   const proposalsFrom = _proposalsFrom(instanceId, api, section);
 
   return memo(instanceId, (): Observable<DeriveCollectiveProposal[]> =>
     isFunction(api.query[section]?.proposals)
-      ? api.query[section].proposals().pipe(
+      ? api.query[section as 'council'].proposals().pipe(
         switchMap(proposalsFrom)
       )
       : of([] as DeriveCollectiveProposal[])
   );
 }
 
-export function proposal (instanceId: string, api: ApiInterfaceRx, section: 'council' | 'technicalCommittee' = 'council'): (hash: Hash | Uint8Array | string) => Observable<DeriveCollectiveProposal | null> {
+export function proposal (instanceId: string, api: ApiInterfaceRx, section: Collective): (hash: Hash | Uint8Array | string) => Observable<DeriveCollectiveProposal | null> {
   const proposalsFrom = _proposalsFrom(instanceId, api, section);
 
   return memo(instanceId, (hash: Hash | Uint8Array | string): Observable<DeriveCollectiveProposal | null> =>

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

@@ -10,9 +10,9 @@ import { proposal as collectiveProposal, proposals as collectiveProposals } from
 import { memo } from '../util';
 
 export function proposal (instanceId: string, api: ApiInterfaceRx): (hash: Hash | Uint8Array | string) => Observable<DeriveCollectiveProposal | null> {
-  return memo(instanceId, collectiveProposal(instanceId, api));
+  return memo(instanceId, collectiveProposal(instanceId, api, 'council'));
 }
 
 export function proposals (instanceId: string, api: ApiInterfaceRx): () => Observable<DeriveCollectiveProposal[]> {
-  return memo(instanceId, collectiveProposals(instanceId, api));
+  return memo(instanceId, collectiveProposals(instanceId, api, 'council'));
 }

packages/api-derive/src/index.ts

@@ -16,6 +16,7 @@ import * as council from './council';
 import * as democracy from './democracy';
 import * as elections from './elections';
 import * as imOnline from './imOnline';
+import * as membership from './membership';
 import * as parachains from './parachains';
 import * as session from './session';
 import * as society from './society';
@@ -27,7 +28,7 @@ import * as tx from './tx';
 export { packageInfo } from './packageInfo';
 export * from './type';
 
-export const derive = { accounts, balances, bounties, chain, contracts, council, democracy, elections, imOnline, parachains, session, society, staking, technicalCommittee, treasury, tx };
+export const derive = { accounts, balances, bounties, chain, contracts, council, democracy, elections, imOnline, membership, parachains, session, society, staking, technicalCommittee, treasury, tx };
 
 type DeriveSection<Section> = {
   [Method in keyof Section]: Section[Method] extends AnyFunction
@@ -49,6 +50,7 @@ const deriveAvail: Record<string, string[]> = {
   democracy: ['democracy'],
   elections: ['electionsPhragmen', 'elections'],
   imOnline: ['imOnline'],
+  membership: ['membership'],
   parachains: ['parachains', 'registrar'],
   session: ['session'],
   society: ['society'],

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

@@ -0,0 +1,4 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export * from './proposals';

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

@@ -0,0 +1,13 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Observable } from '@polkadot/x-rxjs';
+import type { DeriveCollectiveProposal } from '../types';
+
+import { proposals as collectiveProposals } from '../collective';
+import { memo } from '../util';
+
+export function proposals (instanceId: string, api: ApiInterfaceRx): () => Observable<DeriveCollectiveProposal[]> {
+  return memo(instanceId, collectiveProposals(instanceId, api, 'membership'));
+}

packages/api-derive/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/api-derive', version: '4.6.1' };
+export const packageInfo = { name: '@polkadot/api-derive', version: '4.8.1' };

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api",
-  "version": "4.6.1",
+  "version": "4.8.1",
   "type": "module",
   "description": "Promise and RxJS wrappers around the Polkadot JS RPC",
   "main": "index.js",
@@ -8,6 +8,9 @@
     "./detectPackage.js",
     "./detectPackage.cjs"
   ],
+  "engines": {
+    "node": ">=14.0.0"
+  },
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "contributors": [],
@@ -16,17 +19,17 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api#readme",
   "dependencies": {
-    "@babel/runtime": "^7.13.10",
+    "@babel/runtime": "^7.14.0",
-    "@polkadot/api-derive": "4.6.1",
+    "@polkadot/api-derive": "4.8.1",
-    "@polkadot/keyring": "^6.2.1",
+    "@polkadot/keyring": "^6.3.1",
-    "@polkadot/metadata": "4.6.1",
+    "@polkadot/metadata": "4.8.1",
-    "@polkadot/rpc-core": "4.6.1",
+    "@polkadot/rpc-core": "4.8.1",
-    "@polkadot/rpc-provider": "4.6.1",
+    "@polkadot/rpc-provider": "4.8.1",
-    "@polkadot/types": "4.6.1",
+    "@polkadot/types": "4.8.1",
-    "@polkadot/types-known": "4.6.1",
+    "@polkadot/types-known": "4.8.1",
-    "@polkadot/util": "^6.2.1",
+    "@polkadot/util": "^6.3.1",
-    "@polkadot/util-crypto": "^6.2.1",
+    "@polkadot/util-crypto": "^6.3.1",
-    "@polkadot/x-rxjs": "^6.2.1",
+    "@polkadot/x-rxjs": "^6.3.1",
     "bn.js": "^4.11.9",
     "eventemitter3": "^4.0.7"
   }

packages/api/src/augment/consts.ts

@@ -200,12 +200,38 @@ declare module '@polkadot/api/types/consts' {
     };
     elections: {
       [key: string]: Codec;
+      /**
+       * How much should be locked up in order to submit one's candidacy.
+       **/
       candidacyBond: BalanceOf & AugmentedConst<ApiType>;
+      /**
+       * Number of members to elect.
+       **/
       desiredMembers: u32 & AugmentedConst<ApiType>;
+      /**
+       * Number of runners_up to keep.
+       **/
       desiredRunnersUp: u32 & AugmentedConst<ApiType>;
+      /**
+       * Identifier for the elections-phragmen pallet's lock
+       **/
       palletId: LockIdentifier & AugmentedConst<ApiType>;
+      /**
+       * How long each seat is kept. This defines the next block number at which an election
+       * round will happen. If set to zero, no elections are ever triggered and the module will
+       * be in passive mode.
+       **/
       termDuration: BlockNumber & AugmentedConst<ApiType>;
+      /**
+       * Base deposit associated with voting.
+       * 
+       * This should be sensibly high to economically ensure the pallet cannot be attacked by
+       * creating a gigantic number of votes.
+       **/
       votingBondBase: BalanceOf & AugmentedConst<ApiType>;
+      /**
+       * The amount of bond that need to be locked for each vote (32 bytes).
+       **/
       votingBondFactor: BalanceOf & AugmentedConst<ApiType>;
     };
     gilt: {

packages/api/src/augment/errors.ts

@@ -1291,6 +1291,10 @@ declare module '@polkadot/api/types/errors' {
        * No proposal or bounty at that index.
        **/
       InvalidIndex: AugmentedError<ApiType>;
+      /**
+       * Too many approvals in the queue.
+       **/
+      TooManyApprovals: AugmentedError<ApiType>;
     };
     vesting: {
       [key: string]: AugmentedError<ApiType>;

packages/api/src/augment/events.ts

@@ -418,10 +418,11 @@ declare module '@polkadot/api/types/events' {
        **/
       MemberKicked: AugmentedEvent<ApiType, [AccountId]>;
       /**
-       * A new term with \[new_members\]. This indicates that enough candidates existed to run the
+       * A new term with \[new_members\]. This indicates that enough candidates existed to run
-       * election, not that enough have has been elected. The inner value must be examined for
+       * the election, not that enough have has been elected. The inner value must be examined
-       * this purpose. A `NewTerm(\[\])` indicates that some candidates got their bond slashed and
+       * for this purpose. A `NewTerm(\[\])` indicates that some candidates got their bond
-       * none were elected, whilst `EmptyTerm` means that no candidates existed to begin with.
+       * slashed and none were elected, whilst `EmptyTerm` means that no candidates existed to
+       * begin with.
        **/
       NewTerm: AugmentedEvent<ApiType, [Vec<ITuple<[AccountId, Balance]>>]>;
       /**

packages/api/src/augment/tx.ts

@@ -1276,8 +1276,8 @@ declare module '@polkadot/api/types/submittable' {
        * origin is removed as a runner-up.
        * - `origin` is a current member. In this case, the deposit is unreserved and origin is
        * removed as a member, consequently not being a candidate for the next round anymore.
-       * Similar to [`remove_members`], if replacement runners exists, they are immediately used.
+       * Similar to [`remove_members`], if replacement runners exists, they are immediately
-       * If the prime is renouncing, then no prime will exist until the next round.
+       * used. If the prime is renouncing, then no prime will exist until the next round.
        * 
        * The dispatch origin of this call must be signed, and have one of the above roles.
        * 
@@ -2836,7 +2836,7 @@ declare module '@polkadot/api/types/submittable' {
        * - Write: Bonded, Payee, [Origin Account], Locks, Ledger
        * # </weight>
        **/
-      bond: AugmentedSubmittable<(controller: LookupSource | { Id: any } | { Index: any } | { Raw: any } | { Address32: any } | { Address20: any } | string | Uint8Array, value: Compact<BalanceOf> | AnyNumber | Uint8Array, payee: RewardDestination | { Staked: any } | { Stash: any } | { Controller: any } | { Account: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [LookupSource, Compact<BalanceOf>, RewardDestination]>;
+      bond: AugmentedSubmittable<(controller: LookupSource | { Id: any } | { Index: any } | { Raw: any } | { Address32: any } | { Address20: any } | string | Uint8Array, value: Compact<BalanceOf> | AnyNumber | Uint8Array, payee: RewardDestination | { Staked: any } | { Stash: any } | { Controller: any } | { Account: any } | { None: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [LookupSource, Compact<BalanceOf>, RewardDestination]>;
       /**
        * Add some extra amount that have appeared in the stash `free_balance` into the balance up
        * for staking.
@@ -3142,7 +3142,7 @@ declare module '@polkadot/api/types/submittable' {
        * - Write: Payee
        * # </weight>
        **/
-      setPayee: AugmentedSubmittable<(payee: RewardDestination | { Staked: any } | { Stash: any } | { Controller: any } | { Account: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [RewardDestination]>;
+      setPayee: AugmentedSubmittable<(payee: RewardDestination | { Staked: any } | { Stash: any } | { Controller: any } | { Account: any } | { None: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [RewardDestination]>;
       /**
        * Sets the ideal number of validators.
        * 

packages/api/src/base/Init.ts

@@ -13,7 +13,7 @@ import BN from 'bn.js';
 import { Metadata } from '@polkadot/metadata';
 import { TypeRegistry } from '@polkadot/types/create';
 import { getSpecAlias, getSpecExtensions, getSpecHasher, getSpecRpc, getSpecTypes, getUpgradeVersion } from '@polkadot/types-known';
-import { assert, BN_ZERO, logger, u8aEq, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { assert, BN_ZERO, logger, stringify, u8aEq, u8aToHex, u8aToU8a } from '@polkadot/util';
 import { cryptoWaitReady } from '@polkadot/util-crypto';
 import { of } from '@polkadot/x-rxjs';
 import { map, switchMap } from '@polkadot/x-rxjs/operators';
@@ -31,7 +31,7 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
 
   #registries: VersionedRegistry[] = [];
 
-  #updateSub?: Subscription;
+  #updateSub?: Subscription | null = null;
 
   constructor (options: ApiOptions, type: ApiTypes, decorateMethod: DecorateMethod<ApiType>) {
     super(options, type, decorateMethod);
@@ -156,10 +156,10 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
     // on re-connection to the same chain, we don't want to re-do everything from chain again
     if (this._isReady) {
       return true;
-    } else if (this.#updateSub) {
-      this.#updateSub.unsubscribe();
     }
 
+    this._unsubscribeUpdates();
+
     // only load from on-chain if we are not a clone (default path), alternatively
     // just use the values from the source instance provided
     [this._genesisHash, this._runtimeMetadata] = this._options.source?._isReady
@@ -197,7 +197,7 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
         if (Object.keys(types).length) {
           (registry || this.registry).register(types as Record<string, string>);
 
-          l.debug(`Capabilities detected${blockHash ? ` (${u8aToHex(u8aToU8a(blockHash))})` : ''}: ${JSON.stringify(types)}`);
+          l.debug(() => `Capabilities detected${blockHash ? ` (${u8aToHex(u8aToU8a(blockHash))})` : ''}: ${stringify(types)}`);
         }
       })
       .catch(l.error);
@@ -302,6 +302,25 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
     return true;
   }
 
+  private _unsubscribeHealth (): void {
+    if (this.#healthTimer) {
+      clearInterval(this.#healthTimer);
+      this.#healthTimer = null;
+    }
+  }
+
+  private _unsubscribeUpdates (): void {
+    if (this.#updateSub) {
+      this.#updateSub.unsubscribe();
+      this.#updateSub = null;
+    }
+  }
+
+  protected _unsubscribe (): void {
+    this._unsubscribeHealth();
+    this._unsubscribeUpdates();
+  }
+
   #onProviderConnect = async (): Promise<void> => {
     this.emit('connected');
     this._isConnected.next(true);
@@ -337,10 +356,7 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
     this.emit('disconnected');
     this._isConnected.next(false);
 
-    if (this.#healthTimer) {
+    this._unsubscribeHealth();
-      clearInterval(this.#healthTimer);
-      this.#healthTimer = null;
-    }
   };
 
   #onProviderError = (error: Error): void => {

packages/api/src/base/capabilities.ts

@@ -75,7 +75,7 @@ function mapCapabilities ({ accountIdLength }: Constants, [leasePeriodsPerSlot,
       const numIds = tupleLength / accountIdLength;
       const numIdsRound = Math.floor(numIds);
 
-      assert(numIds >= 2 && numIds <= 11, `Detected ${numIds} in Keys, should be >= 2 and <= 11`);
+      assert(numIds >= 2 && numIds <= 11, () => `Detected ${numIds} in Keys, should be >= 2 and <= 11`);
 
       if (numIdsRound !== numIds) {
         // Beefy?
@@ -84,7 +84,7 @@ function mapCapabilities ({ accountIdLength }: Constants, [leasePeriodsPerSlot,
           // @ts-ignore
           types.Keys = `SessionKeys${numIdsRound - 1}B`;
         } else {
-          assert(false, `Expected integer number of keys, found ${numIds.toFixed(2)}`);
+          assert(false, () => `Expected integer number of keys, found ${numIds.toFixed(2)}`);
         }
       } else {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment

packages/api/src/base/index.ts

@@ -50,6 +50,8 @@ export abstract class ApiBase<ApiType extends ApiTypes> extends Getters<ApiType>
    * @description Disconnect from the underlying provider, halting all network traffic
    */
   public disconnect (): Promise<void> {
+    this._unsubscribe();
+
     return this._rpcCore.disconnect();
   }
 

packages/api/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/api', version: '4.6.1' };
+export const packageInfo = { name: '@polkadot/api', version: '4.8.1' };

packages/api/src/rx/index.ts

@@ -165,9 +165,7 @@ export class ApiRx extends ApiBase<'rxjs'> {
     this.#isReadyRx = from<Promise<ApiRx>>(
       // You can create an observable from an event, however my mind groks this form better
       new Promise((resolve): void => {
-        super.on('ready', (): void => {
+        super.on('ready', () => resolve(this));
-          resolve(this);
-        });
       })
     );
   }

packages/api/src/util/validate.ts

@@ -13,7 +13,7 @@ function sig ({ method, section }: StorageEntry, ...args: Type[]): string {
 function doDoubleMap (creator: StorageEntry, args: unknown[]): [StorageEntry, [any, any]] {
   const { key1, key2 } = creator.meta.type.asDoubleMap;
 
-  assert(args.length === 2, `${sig(creator, key1, key2)} is a doublemap, requiring 2 arguments, ${args.length} found`);
+  assert(args.length === 2, () => `${sig(creator, key1, key2)} is a doublemap, requiring 2 arguments, ${args.length} found`);
 
   // pass as tuple
   return [creator, args as [any, any]];
@@ -22,7 +22,7 @@ function doDoubleMap (creator: StorageEntry, args: unknown[]): [StorageEntry, [a
 function doMap (creator: StorageEntry, args: unknown[]): [StorageEntry] | [StorageEntry, any] {
   const { key } = creator.meta.type.asMap;
 
-  assert(args.length === 1, `${sig(creator, key)} is a map, requiring 1 argument, ${args.length} found`);
+  assert(args.length === 1, () => `${sig(creator, key)} is a map, requiring 1 argument, ${args.length} found`);
 
   // expand
   return args.length
@@ -41,7 +41,7 @@ export function extractStorageArgs (creator: StorageEntry, _args: unknown[]): [S
     return doMap(creator, args);
   }
 
-  assert(args.length === 0, `${sig(creator)} does not take any arguments, ${args.length} found`);
+  assert(args.length === 0, () => `${sig(creator)} does not take any arguments, ${args.length} found`);
 
   // no args
   return [creator];

packages/metadata/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/metadata",
-  "version": "4.6.1",
+  "version": "4.8.1",
   "type": "module",
   "description": "Helpers to extract information from runtime metadata",
   "main": "index.js",
@@ -8,6 +8,9 @@
     "./detectPackage.js",
     "./detectPackage.cjs"
   ],
+  "engines": {
+    "node": ">=14.0.0"
+  },
   "repository": "github:polkadot-js/api",
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
@@ -16,14 +19,14 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/type-metadata#readme",
   "dependencies": {
-    "@babel/runtime": "^7.13.10",
+    "@babel/runtime": "^7.14.0",
-    "@polkadot/types": "4.6.1",
+    "@polkadot/types": "4.8.1",
-    "@polkadot/types-known": "4.6.1",
+    "@polkadot/types-known": "4.8.1",
-    "@polkadot/util": "^6.2.1",
+    "@polkadot/util": "^6.3.1",
-    "@polkadot/util-crypto": "^6.2.1",
+    "@polkadot/util-crypto": "^6.3.1",
     "bn.js": "^4.11.9"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.2.1"
+    "@polkadot/keyring": "^6.3.1"
   }
 }

packages/metadata/src/MagicNumber.ts

@@ -15,7 +15,7 @@ export class MagicNumber extends U32 {
     if (!this.isEmpty) {
       const magic = registry.createType('u32', MAGIC_NUMBER);
 
-      assert(this.eq(magic), `MagicNumber mismatch: expected ${magic.toHex()}, found ${this.toHex()}`);
+      assert(this.eq(magic), () => `MagicNumber mismatch: expected ${magic.toHex()}, found ${this.toHex()}`);
     }
   }
 }

packages/metadata/src/Metadata.ts

@@ -3,7 +3,7 @@
 
 import type { Registry } from '@polkadot/types/types';
 
-import { isString, u8aConcat, u8aToU8a } from '@polkadot/util';
+import { isHex, isU8a, u8aToU8a } from '@polkadot/util';
 
 import { MetadataVersioned } from './MetadataVersioned';
 
@@ -11,37 +11,39 @@ import { MetadataVersioned } from './MetadataVersioned';
 const VERSION_IDX = 4;
 
 // magic + lowest supported version
-const EMPTY_METADATA = u8aConcat(new Uint8Array([0x6d, 0x65, 0x74, 0x61, 9]));
+const EMPTY_METADATA = new Uint8Array([0x6d, 0x65, 0x74, 0x61, 9]);
 const EMPTY_U8A = new Uint8Array();
 
-function sanitizeInput (_value: Uint8Array | string = EMPTY_U8A): Uint8Array {
+function toU8a (value: Uint8Array | string = EMPTY_U8A): Uint8Array {
-  if (isString(_value)) {
+  return isHex(value)
-    return sanitizeInput(u8aToU8a(_value));
+    ? toU8a(u8aToU8a(value))
-  }
+    : isU8a(value) && value.length === 0
-
+      ? EMPTY_METADATA
-  return _value.length === 0
+      : value;
-    ? EMPTY_METADATA
-    : _value;
 }
 
-function decodeMetadata (registry: Registry, _value?: Uint8Array | string): MetadataVersioned {
+function decodeMetadata (registry: Registry, _value?: Uint8Array | string | Map<string, unknown> | Record<string, unknown>): MetadataVersioned {
-  const value = sanitizeInput(_value);
+  if (!_value || isU8a(_value) || isHex(_value)) {
-  const version = value[VERSION_IDX];
+    const value = toU8a(_value);
+    const version = value[VERSION_IDX];
 
-  try {
+    try {
-    return new MetadataVersioned(registry, value);
+      return new MetadataVersioned(registry, value);
-  } catch (error) {
+    } catch (error) {
-    // This is an f-ing hack as a follow-up to another ugly hack
+      // This is an f-ing hack as a follow-up to another ugly hack
-    // https://github.com/polkadot-js/api/commit/a9211690be6b68ad6c6dad7852f1665cadcfa5b2
+      // https://github.com/polkadot-js/api/commit/a9211690be6b68ad6c6dad7852f1665cadcfa5b2
-    // when we fail on V9, try to re-parse it as v10... yes... HACK
+      // when we fail on V9, try to re-parse it as v10... yes... HACK
-    if (version === 9) {
+      if (version === 9) {
-      value[VERSION_IDX] = 10;
+        value[VERSION_IDX] = 10;
 
-      return decodeMetadata(registry, value);
+        return decodeMetadata(registry, value);
+      }
+
+      throw error;
     }
-
-    throw error;
   }
+
+  return new MetadataVersioned(registry, _value);
 }
 
 /**
@@ -50,7 +52,7 @@ function decodeMetadata (registry: Registry, _value?: Uint8Array | string): Meta
  * The versioned runtime metadata as a decoded structure
  */
 export class Metadata extends MetadataVersioned {
-  constructor (registry: Registry, value?: Uint8Array | string) {
+  constructor (registry: Registry, value?: Uint8Array | string | Map<string, unknown> | Record<string, unknown>) {
     super(registry, decodeMetadata(registry, value));
   }
 }

packages/metadata/src/MetadataVersioned.ts

@@ -34,7 +34,7 @@ export class MetadataVersioned extends Struct {
   }
 
   #assertVersion = (version: number): boolean => {
-    assert(this.version <= version, `Cannot convert metadata from v${this.version} to v${version}`);
+    assert(this.version <= version, () => `Cannot convert metadata from v${this.version} to v${version}`);
 
     return this.version === version;
   };

packages/metadata/src/decorate/constants/index.spec.ts

@@ -17,7 +17,7 @@ function init (meta: string): [Constants, TypeRegistry] {
 
   registry.setMetadata(metadata);
 
-  return [decorateConstants(registry, metadata.asLatest), registry];
+  return [decorateConstants(registry, metadata.asLatest, 12), registry];
 }
 
 describe('decorateConstants', (): void => {

packages/metadata/src/decorate/constants/index.ts

@@ -8,7 +8,8 @@ import type { ConstantCodec, Constants, ModuleConstants } from '../types';
 import { hexToU8a, stringCamelCase } from '@polkadot/util';
 
 /** @internal */
-export function decorateConstants (registry: Registry, { modules }: MetadataLatest): Constants {
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function decorateConstants (registry: Registry, { modules }: MetadataLatest, _metaVersion: number): Constants {
   return modules.reduce((result: Constants, { constants, name }): Constants => {
     if (constants.isEmpty) {
       return result;

packages/metadata/src/decorate/extrinsics/createUnchecked.ts

@@ -16,7 +16,7 @@ export function createUnchecked (registry: Registry, section: string, callIndex:
   const funcName = stringCamelCase(callMetadata.name);
 
   const extrinsicFn = (...args: any[]): Call => {
-    assert(expectedArgs.length === args.length, `Extrinsic ${section}.${funcName} expects ${expectedArgs.length.valueOf()} arguments, got ${args.length}.`);
+    assert(expectedArgs.length === args.length, () => `Extrinsic ${section}.${funcName} expects ${expectedArgs.length.valueOf()} arguments, got ${args.length}.`);
 
     return registry.createType('Call', {
       args,

packages/metadata/src/decorate/index.spec.ts

@@ -46,7 +46,7 @@ describe('Decorated', () => {
   });
 
   it('should return constants with the correct type and value', (): void => {
-    const consts = decorateConstants(registry, metadata.asLatest);
+    const consts = decorateConstants(registry, metadata.asLatest, metadata.version);
 
     expect(consts.democracy.cooloffPeriod).toBeInstanceOf(registry.createClass('BlockNumber'));
     expect(consts.democracy.cooloffPeriod.toHex()).toEqual('0x000c4e00');

packages/metadata/src/decorate/index.ts

@@ -20,13 +20,14 @@ export function expandMetadata (registry: Registry, metadata: Metadata): Decorat
   assert(metadata instanceof Metadata, 'You need to pass a valid Metadata instance to Decorated');
 
   const latest = metadata.asLatest;
+  const version = metadata.version;
 
   return {
-    consts: decorateConstants(registry, latest),
+    consts: decorateConstants(registry, latest, version),
-    errors: decorateErrors(registry, latest, metadata.version),
+    errors: decorateErrors(registry, latest, version),
-    events: decorateEvents(registry, latest, metadata.version),
+    events: decorateEvents(registry, latest, version),
-    query: decorateStorage(registry, latest, metadata.version),
+    query: decorateStorage(registry, latest, version),
-    tx: decorateExtrinsics(registry, latest, metadata.version)
+    tx: decorateExtrinsics(registry, latest, version)
   };
 }
 

packages/metadata/src/decorate/storage/createFunction.spec.ts

@@ -28,7 +28,7 @@ describe('createFunction', (): void => {
       method: 'NextKeys',
       prefix: 'Session',
       section: 'session'
-    }, { metaVersion: 9 });
+    }, {});
 
     expect(
       u8aToHex(

packages/metadata/src/decorate/storage/createFunction.ts

@@ -8,16 +8,15 @@ import type { Codec, Registry } from '@polkadot/types/types';
 import BN from 'bn.js';
 
 import { Raw } from '@polkadot/types/codec';
-import { StorageKey } from '@polkadot/types/primitive';
+import { StorageKey, Type } from '@polkadot/types/primitive';
-import { assert, compactAddLength, compactStripLength, isNull, isUndefined, stringLowerFirst, u8aConcat } from '@polkadot/util';
+import { assert, compactAddLength, compactStripLength, isNull, isUndefined, stringCamelCase, stringify, stringLowerFirst, u8aConcat, u8aToU8a } from '@polkadot/util';
 import { xxhashAsU8a } from '@polkadot/util-crypto';
 
-import { getHasher, HasherFunction } from './getHasher';
+import { getHasher } from './getHasher';
 
 export interface CreateItemOptions {
   key?: string;
-  metaVersion: number;
+  skipHashing?: boolean;
-  skipHashing?: boolean; // We don't hash the keys defined in ./substrate.ts
 }
 
 export interface CreateItemFn {
@@ -34,81 +33,35 @@ interface IterFn {
 
 type CreateArgType = boolean | string | number | null | BN | BigInt | Uint8Array | Codec;
 
-const EMPTY_U8A = new Uint8Array([]);
+type U8aHasher = (input: Uint8Array) => Uint8Array;
-const NULL_HASHER = (value: Uint8Array): Uint8Array => value;
 
-// get the hashers, the base (and  in the case of DoubleMap), the second key
-/** @internal */
-function getHashers ({ meta: { type } }: CreateItemFn): [HasherFunction, HasherFunction?] {
-  if (type.isDoubleMap) {
-    return [
-      getHasher(type.asDoubleMap.hasher),
-      getHasher(type.asDoubleMap.key2Hasher)
-    ];
-  } else if (type.isMap) {
-    return [getHasher(type.asMap.hasher)];
-  }
-
-  // the default
-  return [getHasher()];
-}
-
-// create a base prefixed key
-/** @internal */
 function createPrefixedKey ({ method, prefix }: CreateItemFn): Uint8Array {
   return u8aConcat(xxhashAsU8a(prefix, 128), xxhashAsU8a(method, 128));
 }
 
-// create a key for a DoubleMap type
+function createKey (registry: Registry, itemFn: CreateItemFn, keys: Type[], hashers: U8aHasher[], args: CreateArgType[]): Uint8Array {
-/** @internal */
+  const { method, section } = itemFn;
-function createKeyDoubleMap (registry: Registry, itemFn: CreateItemFn, args: [CreateArgType, CreateArgType], [hasher1, hasher2]: [HasherFunction, HasherFunction?]): Uint8Array {
-  const { meta: { name, type } } = itemFn;
 
-  // since we are passing an almost-unknown through, trust, but verify
+  assert(Array.isArray(args) && args.length === keys.length, () => `Call to ${stringCamelCase(section || 'unknown')}.${stringCamelCase(method || 'unknown')} needs ${keys.length} arguments, found ${stringify(args)}`);
-  assert(Array.isArray(args) && !isUndefined(args[0]) && !isNull(args[0]) && !isUndefined(args[1]) && !isNull(args[1]), `${(name || 'unknown').toString()} is a DoubleMap and requires two arguments`);
-
-  // if this fails, we have bigger issues
-  assert(!isUndefined(hasher2), '2 hashing functions should be defined for DoubleMaps');
-
-  const [key1, key2] = args;
-  const map = type.asDoubleMap;
-  const val1 = registry.createType(map.key1.toString() as 'Raw', key1).toU8a();
-  const val2 = registry.createType(map.key2.toString() as 'Raw', key2).toU8a();
 
   // as per createKey, always add the length prefix (underlying it is Bytes)
-  return compactAddLength(u8aConcat(
+  return compactAddLength(
-    createPrefixedKey(itemFn),
+    u8aConcat(
-    hasher1(val1),
+      createPrefixedKey(itemFn),
-    hasher2(val2)
+      ...keys.map((type, index): Uint8Array => {
-  ));
+        const arg = args[index];
-}
 
-// create a key for either a map or a plain value
+        assert(!isUndefined(arg) && !isNull(arg), () => `Call to ${stringCamelCase(section || 'unknown')}.${stringCamelCase(method || 'unknown')} has a null or undefined argument at position ${index}`);
-/** @internal */
-function createKey (registry: Registry, itemFn: CreateItemFn, arg: CreateArgType, hasher: (value: Uint8Array) => Uint8Array): Uint8Array {
-  const { meta: { name, type } } = itemFn;
-  let param: Uint8Array = EMPTY_U8A;
 
-  if (type.isMap) {
+        return hashers[index](registry.createType(type.toString() as 'Raw', arg).toU8a());
-    const map = type.asMap;
+      })
-
+    )
-    assert(!isUndefined(arg) && !isNull(arg), `${name.toString()} is a Map and requires one argument`);
+  );
-
-    param = registry.createType(map.key.toString() as 'Raw', arg).toU8a();
-  }
-
-  // StorageKey is a Bytes, so is length-prefixed
-  return compactAddLength(u8aConcat(
-    createPrefixedKey(itemFn),
-    param.length
-      ? hasher(param)
-      : EMPTY_U8A
-  ));
 }
 
 // attach the metadata to expand to a StorageFunction
 /** @internal */
-function expandWithMeta ({ meta, method, prefix, section }: CreateItemFn, _storageFn: (arg?: CreateArgType | [CreateArgType?, CreateArgType?]) => Uint8Array): StorageEntry {
+function expandWithMeta ({ meta, method, prefix, section }: CreateItemFn, _storageFn: (arg?: CreateArgType | CreateArgType[]) => Uint8Array): StorageEntry {
   const storageFn = _storageFn as StorageEntry;
 
   storageFn.meta = meta;
@@ -177,16 +130,19 @@ function extendPrefixedMap (registry: Registry, itemFn: CreateItemFn, storageFn:
 /** @internal */
 export function createFunction (registry: Registry, itemFn: CreateItemFn, options: CreateItemOptions): StorageEntry {
   const { meta: { type } } = itemFn;
-  const [hasher, key2Hasher] = getHashers(itemFn);
 
   // Can only have zero or one argument:
   //   - storage.system.account(address)
   //   - storage.timestamp.blockPeriod()
-  // For doublemap queries the params is passed in as an tuple, [key1, key2]
+  // For higher-map queries the params are passed in as an tuple, [key1, key2]
-  const storageFn = expandWithMeta(itemFn, (arg?: CreateArgType | [CreateArgType?, CreateArgType?]): Uint8Array =>
+  const storageFn = expandWithMeta(itemFn, (arg?: CreateArgType | CreateArgType[]) =>
     type.isDoubleMap
-      ? createKeyDoubleMap(registry, itemFn, arg as [CreateArgType, CreateArgType], [hasher, key2Hasher])
+      ? createKey(registry, itemFn, [type.asDoubleMap.key1, type.asDoubleMap.key2], [getHasher(type.asDoubleMap.hasher), getHasher(type.asDoubleMap.key2Hasher)], arg as CreateArgType[])
-      : createKey(registry, itemFn, arg as CreateArgType, options.skipHashing ? NULL_HASHER : hasher)
+      : type.isMap
+        ? createKey(registry, itemFn, [type.asMap.key], [getHasher(type.asMap.hasher)], [arg as CreateArgType])
+        : options.skipHashing
+          ? compactAddLength(u8aToU8a(options.key))
+          : createKey(registry, itemFn, [], [], [])
   );
 
   if (type.isMap || type.isDoubleMap) {
@@ -194,7 +150,8 @@ export function createFunction (registry: Registry, itemFn: CreateItemFn, option
   }
 
   storageFn.keyPrefix = (arg?: any): Uint8Array =>
-    (storageFn.iterKey && storageFn.iterKey(arg)) || compactStripLength(storageFn())[1];
+    (storageFn.iterKey && storageFn.iterKey(arg)) ||
+    compactStripLength(storageFn())[1];
 
   return storageFn;
 }

packages/metadata/src/decorate/storage/getHasher.ts

@@ -31,6 +31,6 @@ const HASHERS: Record<keyof typeof AllHashers, HasherFunction> = {
 };
 
 /** @internal */
-export function getHasher (hasher?: StorageHasher): HasherFunction {
+export function getHasher (hasher: StorageHasher): HasherFunction {
-  return HASHERS[hasher?.type as 'Identity'] || DEFAULT_FN;
+  return HASHERS[hasher.type as 'Identity'] || DEFAULT_FN;
 }

packages/metadata/src/decorate/storage/getStorage.spec.ts

@@ -2,19 +2,21 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TypeRegistry } from '@polkadot/types/create';
+import { compactAddLength, u8aToU8a } from '@polkadot/util';
 
 import { getStorage } from './getStorage';
 
 describe('getSorage', (): void => {
   const registry = new TypeRegistry();
-  const storage = getStorage(registry, 8);
+  const storage = getStorage(registry);
 
   it('should return well known keys', (): void => {
     expect(typeof storage.substrate).toBe('object');
 
+    expect(storage.substrate.code()).toEqual(compactAddLength(u8aToU8a(':code')));
+
     expect(storage.substrate.changesTrieConfig).toBeTruthy();
     expect(storage.substrate.childStorageKeyPrefix).toBeTruthy();
-    expect(storage.substrate.code).toBeTruthy();
     expect(storage.substrate.extrinsicIndex).toBeTruthy();
     expect(storage.substrate.heapPages).toBeTruthy();
   });

packages/metadata/src/decorate/storage/getStorage.ts

@@ -5,15 +5,15 @@ import type { StorageEntry } from '@polkadot/types/primitive/types';
 import type { Registry } from '@polkadot/types/types';
 import type { Storage } from '../types';
 
-import * as substrate from './substrate';
+import { substrate } from './substrate';
 
 /** @internal */
-export function getStorage (registry: Registry, metaVersion: number): Storage {
+export function getStorage (registry: Registry): Storage {
   return {
     substrate: Object
       .entries(substrate)
       .reduce((storage: Record<string, StorageEntry>, [key, fn]): Record<string, StorageEntry> => {
-        (storage as Record<string, unknown>)[key] = fn(registry, metaVersion);
+        (storage as Record<string, unknown>)[key] = fn(registry);
 
         return storage;
       }, {})

packages/metadata/src/decorate/storage/index.spec.ts

@@ -21,7 +21,11 @@ describe('decorateStorage', (): void => {
     const query = decorateStorage(registry, metadata.asLatest, metadata.version);
 
     it('should throw if the storage function expects an argument', (): void => {
-      expect(() => query.balances.account()).toThrowError(/requires one argument/);
+      expect(() => query.balances.account()).toThrowError('Call to balances.account has a null or undefined argument at position 0');
+    });
+
+    it('should throw if the storage function expects multiple arguments', (): void => {
+      expect(() => query.staking.erasStakers([1])).toThrowError('Call to staking.erasStakers needs 2 arguments, found [1]');
     });
 
     it('should return a value if the storage function does not expect an argument', (): void => {

packages/metadata/src/decorate/storage/index.ts

@@ -11,7 +11,8 @@ import { createFunction } from './createFunction';
 import { getStorage } from './getStorage';
 
 /** @internal */
-export function decorateStorage (registry: Registry, { modules }: MetadataLatest, metaVersion: number): Storage {
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function decorateStorage (registry: Registry, { modules }: MetadataLatest, _metaVersion: number): Storage {
   return modules.reduce((result: Storage, moduleMetadata): Storage => {
     if (moduleMetadata.storage.isNone) {
       return result;
@@ -31,11 +32,11 @@ export function decorateStorage (registry: Registry, { modules }: MetadataLatest
         method,
         prefix,
         section
-      }, { metaVersion });
+      }, {});
 
       return newModule;
     }, {} as ModuleStorage);
 
     return result;
-  }, { ...getStorage(registry, metaVersion) });
+  }, { ...getStorage(registry) });
 }

packages/metadata/src/decorate/storage/substrate.spec.ts

@@ -0,0 +1,19 @@
+// Copyright 2017-2021 @polkadot/metadata authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { TypeRegistry } from '@polkadot/types/create';
+import { compactAddLength, u8aToU8a } from '@polkadot/util';
+
+import { substrate } from './substrate';
+
+const registry = new TypeRegistry();
+
+describe('substrate', (): void => {
+  it('creates a well-known :code key', (): void => {
+    expect(
+      substrate.code(registry)()
+    ).toEqual(
+      compactAddLength(u8aToU8a(':code'))
+    );
+  });
+});

packages/metadata/src/decorate/storage/substrate.ts

@@ -12,44 +12,45 @@ interface SubstrateMetadata {
   type: string;
 }
 
+type Creator = (registry: Registry) => StorageEntry;
+
 // Small helper function to factorize code on this page.
 /** @internal */
-function createRuntimeFunction (method: string, key: string, { documentation, type }: SubstrateMetadata): (registry: Registry, metaVersion: number) => StorageEntry {
+function createRuntimeFunction (method: string, key: string, { documentation, type }: SubstrateMetadata): (registry: Registry) => StorageEntry {
-  return (registry: Registry, metaVersion: number): StorageEntry =>
+  return (registry: Registry): StorageEntry =>
     createFunction(registry, {
       meta: {
         documentation: registry.createType('Vec<Text>', [documentation]),
         modifier: registry.createType('StorageEntryModifierLatest', 1), // required
+        name: registry.createType('Text', method),
         toJSON: (): any => key,
         type: registry.createType('StorageEntryTypeLatest', type, 0)
       } as StorageEntryMetadataLatest,
       method,
       prefix: 'Substrate',
       section: 'substrate'
-    }, { key, metaVersion, skipHashing: true });
+    }, { key, skipHashing: true });
 }
 
-export const code = createRuntimeFunction('code', ':code', {
+export const substrate: Record<string, Creator> = {
-  documentation: 'Wasm code of the runtime.',
+  changesTrieConfig: createRuntimeFunction('changesTrieConfig', ':changes_trie', {
-  type: 'Bytes'
+    documentation: ' Changes trie configuration is stored under this key.',
-});
+    type: 'u32'
-
+  }),
-export const heapPages = createRuntimeFunction('heapPages', ':heappages', {
+  childStorageKeyPrefix: createRuntimeFunction('childStorageKeyPrefix', ':child_storage:', {
-  documentation: 'Number of wasm linear memory pages required for execution of the runtime.',
+    documentation: ' Prefix of child storage keys.',
-  type: 'u64'
+    type: 'u32'
-});
+  }),
-
+  code: createRuntimeFunction('code', ':code', {
-export const extrinsicIndex = createRuntimeFunction('extrinsicIndex', ':extrinsic_index', {
+    documentation: ' Wasm code of the runtime.',
-  documentation: 'Current extrinsic index (u32) is stored under this key.',
+    type: 'Bytes'
-  type: 'u32'
+  }),
-});
+  extrinsicIndex: createRuntimeFunction('extrinsicIndex', ':extrinsic_index', {
-
+    documentation: ' Current extrinsic index (u32) is stored under this key.',
-export const changesTrieConfig = createRuntimeFunction('changesTrieConfig', ':changes_trie', {
+    type: 'u32'
-  documentation: 'Changes trie configuration is stored under this key.',
+  }),
-  type: 'u32'
+  heapPages: createRuntimeFunction('heapPages', ':heappages', {
-});
+    documentation: ' Number of wasm linear memory pages required for execution of the runtime.',
-
+    type: 'u64'
-export const childStorageKeyPrefix = createRuntimeFunction('childStorageKeyPrefix', ':child_storage:', {
+  })
-  documentation: 'Prefix of child storage keys.',
+};
-  type: 'u32'
-});

packages/metadata/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/metadata', version: '4.6.1' };
+export const packageInfo = { name: '@polkadot/metadata', version: '4.8.1' };

packages/metadata/src/util/flattenUniq.ts

@@ -4,16 +4,16 @@
 type Types = string | Types[];
 
 /** @internal */
-export function flattenUniq (list: Types[]): string[] {
+export function flattenUniq (list: Types[], start: string[] = []): string[] {
-  const flat = list.reduce((result: string[], entry): string[] => {
+  return [...new Set(
-    return result.concat(
+    list.reduce((result: string[], entry): string[] => {
-      Array.isArray(entry)
+      if (Array.isArray(entry)) {
-        ? flattenUniq(entry)
+        return flattenUniq(entry, result);
-        : entry
+      }
-    );
-  }, []);
 
-  return [...new Set(flat)]
+      result.push(entry);
-    .filter((value: string) => value)
+
-    .sort();
+      return result;
+    }, start)
+  )];
 }

packages/metadata/src/util/getUniqTypes.ts

@@ -28,12 +28,7 @@ type Item = {
   };
 } & Codec;
 
-type Storage = Option<Vec<Item> | {
+type Storage = Option<{ items: Vec<Item> } & Codec>;
-  // v0
-  functions?: Vec<Item>;
-  // V7+
-  items?: Vec<Item>;
-} & Codec>;
 
 type Call = { args: Vec<Arg> } & Codec;
 
@@ -44,12 +39,6 @@ type Event = { args: Vec<Type> } & Codec;
 type Events = Option<Vec<Event>>;
 
 type Module = {
-  // V0
-  module?: {
-    call: {
-      functions: Vec<Call>;
-    };
-  };
   // V1+
   calls?: Calls;
   // V6+
@@ -60,30 +49,25 @@ type Module = {
 
 interface ExtractionMetadata {
   modules: Vec<Module>;
-
-  // V0
-  outerEvent?: {
-    events: Vec<[Text, Vec<Event>] & Codec>;
-  };
 }
 
 /** @internal */
 function unwrapCalls (mod: Module): Call[] {
   return mod.calls
     ? mod.calls.unwrapOr([])
-    // V0
+    : [];
-    : mod.module
+}
-      ? mod.module.call.functions
+
-      : [];
+/** @internal */
+function typeToString ({ type }: Arg): string {
+  return type.toString();
 }
 
 /** @internal */
 function getCallNames ({ modules }: ExtractionMetadata): string[][][] {
   return modules.map((mod): string[][] =>
     unwrapCalls(mod).map(({ args }): string[] =>
-      args.map((arg): string =>
+      args.map(typeToString)
-        arg.type.toString()
-      )
     )
   );
 }
@@ -91,90 +75,61 @@ function getCallNames ({ modules }: ExtractionMetadata): string[][][] {
 /** @internal */
 function getConstantNames ({ modules }: ExtractionMetadata): string[][] {
   return modules.map(({ constants }): string[] =>
-    constants
+    (constants || []).map(typeToString)
-      ? constants.map((constant): string =>
-        constant.type.toString()
-      )
-      : []
   );
 }
 
 /** @internal */
 function unwrapEvents (events?: Events): Event[] {
-  if (!events) {
+  return events
-    return [];
+    ? events.unwrapOr([])
-  }
+    : [];
-
-  return events.unwrapOr([]);
 }
 
 /** @internal */
-function getEventNames ({ modules, outerEvent }: ExtractionMetadata): string[][][] {
+function getEventNames ({ modules }: ExtractionMetadata): string[][][] {
-  const mapArg = ({ args }: Event): string[] =>
-    args.map((arg): string =>
-      arg.toString()
-    );
-
-  // V0
-  if (outerEvent) {
-    return outerEvent.events.map(([, events]): string[][] =>
-      events.map(mapArg)
-    );
-  }
-
-  // V1+
   return modules.map(({ events }): string[][] =>
-    unwrapEvents(events).map(mapArg)
+    unwrapEvents(events).map(({ args }: Event): string[] =>
+      args.map((a) => a.toString())
+    )
   );
 }
 
 /** @internal */
 function unwrapStorage (storage?: Storage): Item[] {
-  if (!storage) {
+  return storage
-    return [];
+    ? storage.unwrapOr({ items: [] }).items
-  }
+    : [];
-
-  const data = storage.unwrapOr([]);
-
-  return Array.isArray(data)
-    ? data
-    : (data.items || data.functions) as Item[];
 }
 
 /** @internal */
 function getStorageNames ({ modules }: ExtractionMetadata): string[][][] {
   return modules.map(({ storage }): string[][] =>
-    unwrapStorage(storage).map(({ type }): string[] => {
+    unwrapStorage(storage).map(({ type }) =>
-      if (type.isDoubleMap && type.asDoubleMap) {
+      type.isDoubleMap && type.asDoubleMap
-        return [
+        ? [
           type.asDoubleMap.key1.toString(),
           type.asDoubleMap.key2.toString(),
           type.asDoubleMap.value.toString()
-        ];
+        ]
-      } else if (type.isMap) {
+        : type.isMap
-        return [
+          ? [
-          type.asMap.key.toString(),
+            type.asMap.key.toString(),
-          type.asMap.value.toString()
+            type.asMap.value.toString()
-        ];
+          ]
-      } else {
+          : [
-        return [
+            type.asPlain.toString()
-          type.asPlain.toString()
+          ]
-        ];
+    )
-      }
-    })
   );
 }
 
 /** @internal */
 export function getUniqTypes (registry: Registry, meta: ExtractionMetadata, throwError: boolean): string[] {
-  const types = flattenUniq([
+  return validateTypes(registry, throwError, flattenUniq([
     getCallNames(meta),
     getConstantNames(meta),
     getEventNames(meta),
     getStorageNames(meta)
-  ]);
+  ]));
-
-  validateTypes(registry, types, throwError);
-
-  return types;
 }

packages/metadata/src/util/testUtil.ts

@@ -5,7 +5,7 @@ import type { Codec, Registry } from '@polkadot/types/types';
 import type { MetadataInterface } from '../types';
 
 import { unwrapStorageType } from '@polkadot/types/primitive/StorageKey';
-import { assert, hexToU8a, u8aToHex } from '@polkadot/util';
+import { assert, hexToU8a, stringify, u8aToHex } from '@polkadot/util';
 
 import { Metadata } from '../Metadata';
 import { getUniqTypes } from './getUniqTypes';
@@ -22,7 +22,7 @@ export function decodeLatestSubstrate<Modules extends Codec> (registry: Registry
       expect((metadata[`asV${version}` as keyof Metadata] as unknown as MetadataInterface<Modules>).modules.length).not.toBe(0);
       expect(metadata.toJSON()).toEqual(staticSubstrate);
     } catch (error) {
-      console.error(JSON.stringify(metadata.toJSON()));
+      console.error(stringify(metadata.toJSON()));
 
       throw error;
     }
@@ -65,7 +65,7 @@ export function defaultValues (registry: Registry, rpcData: string, withThrow =
               if (withFallbackCheck) {
                 const [hexType, hexOrig] = [u8aToHex(type.toU8a()), u8aToHex(fallback.toU8a(true))];
 
-                assert(hexType === hexOrig, `Fallback does not match (${((hexOrig.length - 2) / 2) - ((hexType.length - 2) / 2)} bytes missing): ${hexType} !== ${hexOrig}`);
+                assert(hexType === hexOrig, () => `Fallback does not match (${((hexOrig.length - 2) / 2) - ((hexType.length - 2) / 2)} bytes missing): ${hexType} !== ${hexOrig}`);
               }
             } catch (error) {
               const message = `${location}:: ${(error as Error).message}`;

packages/metadata/src/util/validateTypes.ts

@@ -11,8 +11,10 @@ import { flattenUniq } from './flattenUniq';
 const l = logger('metadata');
 
 /** @internal */
-export function validateTypes (registry: Registry, types: string[], throwError: boolean): void {
+export function validateTypes (registry: Registry, throwError: boolean, types: string[]): string[] {
-  const missing = flattenUniq(extractTypes(types)).filter((type) => !registry.hasType(type));
+  const missing = flattenUniq(extractTypes(types))
+    .filter((type) => !registry.hasType(type))
+    .sort();
 
   if (missing.length !== 0) {
     const message = `Unknown types found, no types for ${missing.join(', ')}`;
@@ -23,4 +25,6 @@ export function validateTypes (registry: Registry, types: string[], throwError:
       l.warn(message);
     }
   }
+
+  return types;
 }

packages/metadata/src/v12/static-substrate.json

@@ -5786,7 +5786,7 @@
         {
           "name": "Elections",
           "storage": {
-            "prefix": "PhragmenElection",
+            "prefix": "Elections",
             "items": [
               {
                 "name": "Members",
@@ -5956,8 +5956,8 @@
                 "   origin is removed as a runner-up.",
                 " - `origin` is a current member. In this case, the deposit is unreserved and origin is",
                 "   removed as a member, consequently not being a candidate for the next round anymore.",
-                "   Similar to [`remove_members`], if replacement runners exists, they are immediately used.",
+                "   Similar to [`remove_members`], if replacement runners exists, they are immediately",
-                "   If the prime is renouncing, then no prime will exist until the next round.",
+                "   used. If the prime is renouncing, then no prime will exist until the next round.",
                 "",
                 " The dispatch origin of this call must be signed, and have one of the above roles.",
                 "",
@@ -6028,10 +6028,11 @@
                 "Vec<(AccountId,Balance)>"
               ],
               "documentation": [
-                " A new term with \\[new_members\\]. This indicates that enough candidates existed to run the",
+                " A new term with \\[new_members\\]. This indicates that enough candidates existed to run",
-                " election, not that enough have has been elected. The inner value must be examined for",
+                " the election, not that enough have has been elected. The inner value must be examined",
-                " this purpose. A `NewTerm(\\[\\])` indicates that some candidates got their bond slashed and",
+                " for this purpose. A `NewTerm(\\[\\])` indicates that some candidates got their bond",
-                " none were elected, whilst `EmptyTerm` means that no candidates existed to begin with."
+                " slashed and none were elected, whilst `EmptyTerm` means that no candidates existed to",
+                " begin with."
               ]
             },
             {
@@ -6093,47 +6094,66 @@
             }
           ],
           "constants": [
+            {
+              "name": "PalletId",
+              "type": "LockIdentifier",
+              "value": "0x706872656c656374",
+              "documentation": [
+                " Identifier for the elections-phragmen pallet's lock"
+              ]
+            },
             {
               "name": "CandidacyBond",
               "type": "BalanceOf",
               "value": "0x0080c6a47e8d03000000000000000000",
-              "documentation": []
+              "documentation": [
+                " How much should be locked up in order to submit one's candidacy."
+              ]
             },
             {
               "name": "VotingBondBase",
               "type": "BalanceOf",
               "value": "0x00f0436de36a01000000000000000000",
-              "documentation": []
+              "documentation": [
+                " Base deposit associated with voting.",
+                "",
+                " This should be sensibly high to economically ensure the pallet cannot be attacked by",
+                " creating a gigantic number of votes."
+              ]
             },
             {
               "name": "VotingBondFactor",
               "type": "BalanceOf",
               "value": "0x0000cc7b9fae00000000000000000000",
-              "documentation": []
+              "documentation": [
+                " The amount of bond that need to be locked for each vote (32 bytes)."
+              ]
             },
             {
               "name": "DesiredMembers",
               "type": "u32",
               "value": "0x0d000000",
-              "documentation": []
+              "documentation": [
+                " Number of members to elect."
+              ]
             },
             {
               "name": "DesiredRunnersUp",
               "type": "u32",
               "value": "0x07000000",
-              "documentation": []
+              "documentation": [
+                " Number of runners_up to keep."
+              ]
             },
             {
               "name": "TermDuration",
               "type": "BlockNumber",
               "value": "0x80130300",
-              "documentation": []
+              "documentation": [
-            },
+                " How long each seat is kept. This defines the next block number at which an election",
-            {
+                " round will happen. If set to zero, no elections are ever triggered and the module will",
-              "name": "PalletId",
+                " be in passive mode."
-              "type": "LockIdentifier",
+              ]
-              "value": "0x706872656c656374",
-              "documentation": []
             }
           ],
           "errors": [
@@ -6897,6 +6917,12 @@
               "documentation": [
                 " No proposal or bounty at that index."
               ]
+            },
+            {
+              "name": "TooManyApprovals",
+              "documentation": [
+                " Too many approvals in the queue."
+              ]
             }
           ],
           "index": 17

packages/rpc-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-core",
-  "version": "4.6.1",
+  "version": "4.8.1",
   "type": "module",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
@@ -8,6 +8,9 @@
     "./detectPackage.js",
     "./detectPackage.cjs"
   ],
+  "engines": {
+    "node": ">=14.0.0"
+  },
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "contributors": [],
@@ -16,14 +19,14 @@
   "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.13.10",
+    "@babel/runtime": "^7.14.0",
-    "@polkadot/metadata": "4.6.1",
+    "@polkadot/metadata": "4.8.1",
-    "@polkadot/rpc-provider": "4.6.1",
+    "@polkadot/rpc-provider": "4.8.1",
-    "@polkadot/types": "4.6.1",
+    "@polkadot/types": "4.8.1",
-    "@polkadot/util": "^6.2.1",
+    "@polkadot/util": "^6.3.1",
-    "@polkadot/x-rxjs": "^6.2.1"
+    "@polkadot/x-rxjs": "^6.3.1"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.2.1"
+    "@polkadot/keyring": "^6.3.1"
   }
 }

packages/rpc-core/src/index.ts

@@ -343,7 +343,7 @@ export class RpcCore {
       ? ''
       : ` (${def.params.length - reqArgCount} optional)`;
 
-    assert(inputs.length >= reqArgCount && inputs.length <= def.params.length, `Expected ${def.params.length} parameters${optText}, ${inputs.length} found instead`);
+    assert(inputs.length >= reqArgCount && inputs.length <= def.params.length, () => `Expected ${def.params.length} parameters${optText}, ${inputs.length} found instead`);
 
     return inputs.map((input, index): Codec =>
       createTypeUnsafe(registry, def.params[index].type, [input], { blockHash })

packages/rpc-core/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/rpc-core', version: '4.6.1' };
+export const packageInfo = { name: '@polkadot/rpc-core', version: '4.8.1' };

packages/rpc-core/src/util/drr.ts

@@ -3,7 +3,7 @@
 
 import type { Observable } from '@polkadot/x-rxjs';
 
-import { logger } from '@polkadot/util';
+import { logger, stringify } from '@polkadot/util';
 import { catchError, distinctUntilChanged, publishReplay, refCount, tap } from '@polkadot/x-rxjs/operators';
 
 import { refCountDelay } from './refCountDelay';
@@ -19,7 +19,7 @@ interface Options {
 const l = logger('drr');
 
 const CMP = (a: unknown, b: unknown): boolean =>
-  JSON.stringify({ t: a }) === JSON.stringify({ t: b });
+  stringify({ t: a }) === stringify({ t: b });
 
 const ERR = (error: Error): Observable<never> => {
   l.error(error);

packages/rpc-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-provider",
-  "version": "4.6.1",
+  "version": "4.8.1",
   "type": "module",
   "description": "Transport providers for the API",
   "main": "index.js",
@@ -8,6 +8,9 @@
     "./detectPackage.js",
     "./detectPackage.cjs"
   ],
+  "engines": {
+    "node": ">=14.0.0"
+  },
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "contributors": [],
@@ -16,19 +19,19 @@
   "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.13.10",
+    "@babel/runtime": "^7.14.0",
-    "@polkadot/types": "4.6.1",
+    "@polkadot/types": "4.8.1",
-    "@polkadot/util": "^6.2.1",
+    "@polkadot/util": "^6.3.1",
-    "@polkadot/util-crypto": "^6.2.1",
+    "@polkadot/util-crypto": "^6.3.1",
-    "@polkadot/x-fetch": "^6.2.1",
+    "@polkadot/x-fetch": "^6.3.1",
-    "@polkadot/x-global": "^6.2.1",
+    "@polkadot/x-global": "^6.3.1",
-    "@polkadot/x-ws": "^6.2.1",
+    "@polkadot/x-ws": "^6.3.1",
     "bn.js": "^4.11.9",
     "eventemitter3": "^4.0.7"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.2.1",
+    "@polkadot/keyring": "^6.3.1",
-    "@polkadot/metadata": "4.6.1",
+    "@polkadot/metadata": "4.8.1",
     "mock-socket": "^9.0.3",
     "nock": "^13.0.11"
   }

packages/rpc-provider/src/coder/index.ts

@@ -3,7 +3,7 @@
 
 import type { JsonRpcRequest, JsonRpcResponse, JsonRpcResponseBaseError } from '../types';
 
-import { assert, isNumber, isString, isUndefined } from '@polkadot/util';
+import { assert, isNumber, isString, isUndefined, stringify } from '@polkadot/util';
 
 function formatErrorData (data?: string | number): string {
   if (isUndefined(data)) {
@@ -12,7 +12,7 @@ function formatErrorData (data?: string | number): string {
 
   const formatted = `: ${isString(data)
     ? data.replace(/Error\("/g, '').replace(/\("/g, '(').replace(/"\)/g, ')').replace(/\(/g, ', ').replace(/\)/g, '')
-    : JSON.stringify(data)}`;
+    : stringify(data)}`;
 
   // We need some sort of cut-off here since these can be very large and
   // very nested, pick a number and trim the result display to it
@@ -47,7 +47,7 @@ export class RpcCoder {
   }
 
   public encodeJson (method: string, params: any | any[]): string {
-    return JSON.stringify(
+    return stringify(
       this.encodeObject(method, params)
     );
   }

packages/rpc-provider/src/http/index.ts

@@ -44,7 +44,7 @@ export class HttpProvider implements ProviderInterface {
    * @param {string} endpoint The endpoint url starting with http://
    */
   constructor (endpoint: string = defaults.HTTP_URL, headers: Record<string, string> = {}) {
-    assert(/^(https|http):\/\//.test(endpoint), `Endpoint should start with 'http://', received '${endpoint}'`);
+    assert(/^(https|http):\/\//.test(endpoint), () => `Endpoint should start with 'http://', received '${endpoint}'`);
 
     this.#coder = new RpcCoder();
     this.#endpoint = endpoint;
@@ -116,7 +116,7 @@ export class HttpProvider implements ProviderInterface {
       method: 'POST'
     });
 
-    assert(response.ok, `[${response.status}]: ${response.statusText}`);
+    assert(response.ok, () => `[${response.status}]: ${response.statusText}`);
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const result = await response.json();

packages/rpc-provider/src/mock/index.ts

@@ -60,7 +60,7 @@ export class MockProvider implements ProviderInterface {
     chain_getFinalizedHead: () => this.registry.createType('Header', rpcHeader.result).hash,
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     chain_getHeader: () => this.registry.createType('Header', rpcHeader.result).toJSON(),
-    rpc_methods: (): string[] => [],
+    rpc_methods: () => this.registry.createType('RpcMethods').toJSON(),
     state_getKeys: (): string[] => [],
     state_getKeysPaged: (): string[] => [],
     state_getMetadata: (): string => rpcMetadata,
@@ -121,7 +121,7 @@ export class MockProvider implements ProviderInterface {
 
   // eslint-disable-next-line @typescript-eslint/require-await
   public async send (method: string, params: any[]): Promise<unknown> {
-    assert(this.requests[method], `provider.send: Invalid method '${method}'`);
+    assert(this.requests[method], () => `provider.send: Invalid method '${method}'`);
 
     return this.requests[method](this.db, params);
   }
@@ -130,7 +130,7 @@ export class MockProvider implements ProviderInterface {
   public async subscribe (type: string, method: string, ...params: unknown[]): Promise<number> {
     l.debug((): any => ['subscribe', method, params]);
 
-    assert(this.subscriptions[method], `provider.subscribe: Invalid method '${method}'`);
+    assert(this.subscriptions[method], () => `provider.subscribe: Invalid method '${method}'`);
 
     const callback = params.pop() as MockStateSubscriptionCallback;
     const id = ++this.subscriptionId;
@@ -151,7 +151,7 @@ export class MockProvider implements ProviderInterface {
 
     l.debug((): any => ['unsubscribe', id, sub]);
 
-    assert(sub, `Unable to find subscription for ${id}`);
+    assert(sub, () => `Unable to find subscription for ${id}`);
 
     delete this.subscriptionMap[id];
     delete this.subscriptions[sub].callbacks[id];

packages/rpc-provider/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/rpc-provider', version: '4.6.1' };
+export const packageInfo = { name: '@polkadot/rpc-provider', version: '4.8.1' };

packages/rpc-provider/src/ws/index.ts

@@ -32,13 +32,13 @@ interface WsStateSubscription extends SubscriptionHandler {
   params: any[];
 }
 
-const ALIASSES: { [index: string]: string } = {
+const ALIASES: { [index: string]: string } = {
   chain_finalisedHead: 'chain_finalizedHead',
   chain_subscribeFinalisedHeads: 'chain_subscribeFinalizedHeads',
   chain_unsubscribeFinalisedHeads: 'chain_unsubscribeFinalizedHeads'
 };
 
-const RETRY_DELAY = 1000;
+const RETRY_DELAY = 2500;
 
 const l = logger('api-ws');
 
@@ -109,7 +109,7 @@ export class WsProvider implements ProviderInterface {
     assert(endpoints.length !== 0, 'WsProvider requires at least one Endpoint');
 
     endpoints.forEach((endpoint) => {
-      assert(/^(wss|ws):\/\//.test(endpoint), `Endpoint should start with 'ws://', received '${endpoint}'`);
+      assert(/^(wss|ws):\/\//.test(endpoint), () => `Endpoint should start with 'ws://', received '${endpoint}'`);
     });
 
     this.#eventemitter = new EventEmitter();
@@ -225,7 +225,6 @@ export class WsProvider implements ProviderInterface {
 
       // 1000 - Normal closure; the connection successfully completed
       this.#websocket.close(1000);
-      this.#websocket = null;
     } catch (error) {
       l.error(error);
 
@@ -351,9 +350,19 @@ export class WsProvider implements ProviderInterface {
     }
 
     this.#isConnected = false;
+
+    if (this.#websocket) {
+      this.#websocket.onclose = null;
+      this.#websocket.onerror = null;
+      this.#websocket.onmessage = null;
+      this.#websocket.onopen = null;
+      this.#websocket = null;
+    }
+
     this.#emit('disconnected');
+
     // reject all hanging requests
-    eraseRecord(this.#handlers, (handler) => handler.callback(error, undefined));
+    eraseRecord(this.#handlers, (h) => h.callback(error, undefined));
     eraseRecord(this.#waitingForId);
 
     if (this.#autoConnectMs > 0) {
@@ -419,7 +428,7 @@ export class WsProvider implements ProviderInterface {
   }
 
   #onSocketMessageSubscribe = (response: JsonRpcResponse): void => {
-    const method = ALIASSES[response.method as string] || response.method || 'invalid';
+    const method = ALIASES[response.method as string] || response.method || 'invalid';
     const subId = `${method}::${response.params.subscription}`;
     const handler = this.#subscriptions[subId];
 

packages/rpc-provider/test/mockWs.ts

@@ -3,6 +3,8 @@
 
 import { Server, WebSocket } from 'mock-socket';
 
+import { stringify } from '@polkadot/util';
+
 interface Scope {
   body: { [index: string]: Record<string, any> };
   requests: number;
@@ -79,7 +81,7 @@ export function mockWs (requests: ({ method: string } & ErrorDef)[], wsUrl: stri
       scope.body[request.method] = body;
       requestCount++;
 
-      socket.send(JSON.stringify(response));
+      socket.send(stringify(response));
     });
   });
 

packages/typegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/typegen",
-  "version": "4.6.1",
+  "version": "4.8.1",
   "type": "module",
   "description": "Type generation scripts",
   "main": "index.js",
@@ -8,6 +8,9 @@
     "./detectPackage.js",
     "./detectPackage.cjs"
   ],
+  "engines": {
+    "node": ">=14.0.0"
+  },
   "bin": {
     "polkadot-types-chain-info": "./scripts/polkadot-types-chain-info.cjs",
     "polkadot-types-from-chain": "./scripts/polkadot-types-from-chain.cjs",
@@ -23,14 +26,14 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/typegen#readme",
   "dependencies": {
-    "@babel/core": "^7.13.15",
+    "@babel/core": "^7.14.0",
-    "@babel/register": "^7.13.14",
+    "@babel/register": "^7.13.16",
-    "@babel/runtime": "^7.13.10",
+    "@babel/runtime": "^7.14.0",
-    "@polkadot/api": "4.6.1",
+    "@polkadot/api": "4.8.1",
-    "@polkadot/metadata": "4.6.1",
+    "@polkadot/metadata": "4.8.1",
-    "@polkadot/rpc-provider": "4.6.1",
+    "@polkadot/rpc-provider": "4.8.1",
-    "@polkadot/types": "4.6.1",
+    "@polkadot/types": "4.8.1",
-    "@polkadot/util": "^6.2.1",
+    "@polkadot/util": "^6.3.1",
     "handlebars": "^4.7.7",
     "websocket": "^1.0.34",
     "yargs": "^16.2.0"

packages/typegen/src/generate/tsDef.ts

@@ -10,7 +10,7 @@ import path from 'path';
 import { getTypeDef } from '@polkadot/types/create';
 import { TypeDefInfo } from '@polkadot/types/create/types';
 import * as defaultDefinitions from '@polkadot/types/interfaces/definitions';
-import { assert, isString, stringCamelCase, stringUpperFirst } from '@polkadot/util';
+import { assert, isString, stringCamelCase, stringify, stringUpperFirst } from '@polkadot/util';
 
 import { createImports, exportInterface, exportType, formatType, readTemplate, setImports, TypeImports, writeFile } from '../util';
 
@@ -192,7 +192,7 @@ function generateInterfaces (definitions: Record<string, ModuleTypes>, { types }
   };
 
   return Object.entries(types).map(([name, type]): [string, string] => {
-    const def = getTypeDef(isString(type) ? type : JSON.stringify(type), { name });
+    const def = getTypeDef(isString(type) ? type : stringify(type), { name });
 
     return [name, generators[def.info](definitions, def, imports)];
   });

packages/typegen/src/metadataMd.ts

@@ -7,6 +7,7 @@ import type { Codec, DefinitionRpcParam } from '@polkadot/types/types';
 import fs from 'fs';
 
 import { Metadata } from '@polkadot/metadata';
+import { getStorage as getSubstrateStorage } from '@polkadot/metadata/decorate/storage/getStorage';
 import rpcdata from '@polkadot/metadata/static';
 import { Vec } from '@polkadot/types/codec';
 import { TypeRegistry } from '@polkadot/types/create';
@@ -16,15 +17,17 @@ import { Text } from '@polkadot/types/primitive';
 import { unwrapStorageType } from '@polkadot/types/primitive/StorageKey';
 import { stringCamelCase, stringLowerFirst } from '@polkadot/util';
 
+interface SectionItem {
+  link?: string;
+  name: string;
+  [bullet: string]: undefined | string | Vec<Text>;
+}
+
 interface Section {
   link?: string;
   name: string;
   description?: string;
-  items: {
+  items: SectionItem[];
-    link?: string;
-    name: string;
-    [bullet: string]: undefined | string | Vec<Text>;
-  }[];
 }
 
 interface Page {
@@ -156,7 +159,7 @@ function addRpc (): string {
           });
 
         return all;
-      }, []).sort((a, b) => a.name.localeCompare(b.name)),
+      }, []).sort(sortByName),
     title: 'JSON-RPC'
   });
 }
@@ -192,10 +195,11 @@ function addConstants (metadata: MetadataLatest): string {
 
 /** @internal */
 function addStorage (metadata: MetadataLatest): string {
+  const { substrate } = getSubstrateStorage(metadata.registry);
   const moduleSections = metadata.modules
     .sort(sortByName)
     .filter((moduleMetadata) => !moduleMetadata.storage.isNone)
-    .map((moduleMetadata) => {
+    .map((moduleMetadata): Section => {
       const sectionName = stringLowerFirst(moduleMetadata.name);
 
       return {
@@ -220,12 +224,27 @@ function addStorage (metadata: MetadataLatest): string {
       };
     });
 
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  const knownSection: any = JSON.parse(fs.readFileSync('docs/substrate/storage-known-section.json', 'utf8'));
-
   return renderPage({
     description: DESC_STORAGE,
-    sections: moduleSections.concat([knownSection]),
+    sections: moduleSections.concat([{
+      description: 'These are well-known keys that are always available to the runtime implementation of any Substrate-based network.',
+      items: Object.entries(substrate).map(([name, { meta }]) => {
+        const arg = meta.type.isMap
+          ? ('`' + meta.type.asMap.key.toString() + '`')
+          : meta.type.isDoubleMap
+            ? ('`' + meta.type.asDoubleMap.key1.toString() + ', ' + meta.type.asDoubleMap.key2.toString() + '`')
+            : '';
+        const methodName = stringLowerFirst(name);
+        const outputType = unwrapStorageType(meta.type, meta.modifier.isOptional);
+
+        return {
+          interface: '`' + `api.query.substrate.${methodName}` + '`',
+          name: `${methodName}(${arg}): ` + '`' + outputType + '`',
+          summary: meta.documentation
+        };
+      }),
+      name: 'substrate'
+    }]).sort(sortByName),
     title: 'Storage'
   });
 }

packages/typegen/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/typegen', version: '4.6.1' };
+export const packageInfo = { name: '@polkadot/typegen', version: '4.8.1' };

packages/typegen/src/util/derived.ts

@@ -12,7 +12,7 @@ import { GenericAccountId, GenericLookupSource, GenericVote } from '@polkadot/ty
 import { AllConvictions } from '@polkadot/types/interfaces/democracy/definitions';
 import { Null } from '@polkadot/types/primitive';
 import * as primitiveClasses from '@polkadot/types/primitive';
-import { isChildClass } from '@polkadot/util';
+import { isChildClass, stringify } from '@polkadot/util';
 
 import { isCompactEncodable } from './class';
 import { formatType } from './formatting';
@@ -98,7 +98,7 @@ export function getSimilarTypes (registry: Registry, definitions: Record<string,
 
         possibleTypes.push(`([${subs.join(', ')}])[]`);
       } else {
-        throw new Error(`Unhandled subtype in Vec, ${JSON.stringify(subDef)}`);
+        throw new Error(`Unhandled subtype in Vec, ${stringify(subDef)}`);
       }
     }
   } else if (isChildClass(Enum, Clazz)) {

packages/typegen/src/util/formatting.ts

@@ -7,7 +7,7 @@ import Handlebars from 'handlebars';
 
 import { getTypeDef, paramsNotation } from '@polkadot/types/create';
 import { TypeDefInfo } from '@polkadot/types/create/types';
-import { isString } from '@polkadot/util';
+import { isString, stringify } from '@polkadot/util';
 
 import { readTemplate } from './file';
 import { ModuleTypes, setImports, TypeImports } from './imports';
@@ -284,7 +284,7 @@ export function formatType (definitions: Record<string, ModuleTypes>, type: stri
     }
 
     default: {
-      throw new Error(`Cannot format ${JSON.stringify(type)}`);
+      throw new Error(`Cannot format ${stringify(type)}`);
     }
   }
 }

packages/types-known/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types-known",
-  "version": "4.6.1",
+  "version": "4.8.1",
   "type": "module",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
@@ -8,6 +8,9 @@
     "./detectPackage.js",
     "./detectPackage.cjs"
   ],
+  "engines": {
+    "node": ">=14.0.0"
+  },
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "contributors": [],
@@ -16,10 +19,10 @@
   "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.13.10",
+    "@babel/runtime": "^7.14.0",
-    "@polkadot/networks": "^6.2.1",
+    "@polkadot/networks": "^6.3.1",
-    "@polkadot/types": "4.6.1",
+    "@polkadot/types": "4.8.1",
-    "@polkadot/util": "^6.2.1",
+    "@polkadot/util": "^6.3.1",
     "bn.js": "^4.11.9"
   },
   "devDependencies": {

packages/types-known/src/modules.ts

@@ -72,12 +72,6 @@ const typesModules: Record<string, OverrideModuleType> = {
   },
   treasury: {
     Proposal: 'TreasuryProposal'
-  },
-  xcm: {
-    Outcome: 'XcmOutcome'
-  },
-  xcmPallet: {
-    Outcome: 'XcmOutcome'
   }
 };
 

packages/types-known/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/types-known', version: '4.6.1' };
+export const packageInfo = { name: '@polkadot/types-known', version: '4.8.1' };

packages/types-known/src/spec/kusama.ts

@@ -6,14 +6,10 @@
 import type { OverrideVersionedType } from '@polkadot/types/types';
 
 const sharedTypes = {
-  AccountInfo: 'AccountInfoWithDualRefCount',
+  Keys: 'SessionKeys6',
-  Address: 'MultiAddress',
-  Keys: 'SessionKeys7B',
-  LookupSource: 'MultiAddress',
   ProxyType: {
     _enum: ['Any', 'NonTransfer', 'Governance', 'Staking', 'IdentityJudgement', 'CancelProxy']
-  },
+  }
-  ValidatorPrefs: 'ValidatorPrefsWithBlocked'
 };
 
 const addrIndicesTypes = {
@@ -168,7 +164,7 @@ const versioned: OverrideVersionedType[] = [
     minmax: [2028, 2029],
     types: {
       ...sharedTypes,
-      Keys: 'SessionKeys6'
+      AccountInfo: 'AccountInfoWithDualRefCount'
     }
   },
   {

packages/types-known/src/spec/polkadot.ts

@@ -6,10 +6,7 @@
 import type { OverrideVersionedType } from '@polkadot/types/types';
 
 const sharedTypes = {
-  AccountInfo: 'AccountInfoWithDualRefCount',
+  Keys: 'SessionKeys6',
-  Address: 'MultiAddress',
-  Keys: 'SessionKeys7B',
-  LookupSource: 'MultiAddress',
   ProxyType: {
     _enum: {
       Any: 0,
@@ -20,8 +17,7 @@ const sharedTypes = {
       IdentityJudgement: 5,
       CancelProxy: 6
     }
-  },
+  }
-  ValidatorPrefs: 'ValidatorPrefsWithBlocked'
 };
 
 const addrAccountIdTypes = {
@@ -72,7 +68,7 @@ const versioned: OverrideVersionedType[] = [
     minmax: [28, 29],
     types: {
       ...sharedTypes,
-      Keys: 'SessionKeys6'
+      AccountInfo: 'AccountInfoWithDualRefCount'
     }
   },
   {

packages/types-known/src/spec/statemint.ts

@@ -12,14 +12,15 @@ const versioned: OverrideVersionedType[] = [
     types: {
       TAssetBalance: 'u128',
       ProxyType: {
-        _enum: {
+        _enum: [
-          Any: 0,
+          'Any',
-          NonTransfer: 1,
+          'NonTransfer',
-          CancelProxy: 2,
+          'CancelProxy',
-          Assets: 3,
+          'Assets',
-          AssetOwner: 4,
+          'AssetOwner',
-          AssetManager: 5
+          'AssetManager',
-        }
+          'Staking'
+        ]
       }
     }
   }

packages/types-known/src/spec/westend.ts

@@ -6,7 +6,7 @@
 import type { OverrideVersionedType } from '@polkadot/types/types';
 
 const sharedTypes = {
-  Keys: 'SessionKeys7B',
+  Keys: 'SessionKeys6',
   ProxyType: {
     _enum: ['Any', 'NonTransfer', 'Staking', 'SudoBalances', 'IdentityJudgement', 'CancelProxy']
   }
@@ -71,20 +71,11 @@ const versioned: OverrideVersionedType[] = [
     minmax: [48, 49],
     types: {
       ...sharedTypes,
-      AccountInfo: 'AccountInfoWithDualRefCount',
+      AccountInfo: 'AccountInfoWithDualRefCount'
-      Keys: 'SessionKeys6'
     }
   },
   {
-    // 50 was supposed to have Beefy, didn't
+    minmax: [50, undefined],
-    minmax: [50, 50],
-    types: {
-      ...sharedTypes,
-      Keys: 'SessionKeys6'
-    }
-  },
-  {
-    minmax: [51, undefined],
     types: {
       ...sharedTypes
     }

packages/types-known/src/upgrades/index.ts

@@ -7,7 +7,7 @@ import type { ChainUpgradesRaw } from './types';
 import BN from 'bn.js';
 
 import networks from '@polkadot/networks';
-import { assert, hexToU8a } from '@polkadot/util';
+import { assert, hexToU8a, stringify } from '@polkadot/util';
 
 import kusama from './kusama';
 import polkadot from './polkadot';
@@ -30,7 +30,7 @@ function checkOrder (network: string, versions: ChainUpgradesRaw): [number, numb
       : curr[0] <= prev[0] || curr[1] <= prev[1];
   });
 
-  assert(!ooo.length, `${network}: Mismatched upgrade ordering: ${JSON.stringify(ooo)}`);
+  assert(!ooo.length, () => `${network}: Mismatched upgrade ordering: ${stringify(ooo)}`);
 
   return versions;
 }
@@ -39,7 +39,7 @@ function checkOrder (network: string, versions: ChainUpgradesRaw): [number, numb
 function mapRaw ([network, versions]: [string, ChainUpgradesRaw]): ChainUpgrades {
   const chain = networks.find((n) => n.network === network) || NET_EXTRA[network];
 
-  assert(chain, `Unable to find info for chain ${network}`);
+  assert(chain, () => `Unable to find info for chain ${network}`);
 
   return {
     genesisHash: hexToU8a(chain.genesisHash[0]),

packages/types-known/src/upgrades/polkadot.ts

@@ -8,7 +8,7 @@ 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]
+  [3613564, 27], [3899547, 28], [4345767, 29], [4876134, 30]
 ];
 
 export default upgrades;

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types",
-  "version": "4.6.1",
+  "version": "4.8.1",
   "type": "module",
   "description": "Implementation of the Parity codec",
   "main": "index.js",
@@ -8,6 +8,9 @@
     "./detectPackage.js",
     "./detectPackage.cjs"
   ],
+  "engines": {
+    "node": ">=14.0.0"
+  },
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "contributors": [],
@@ -16,15 +19,15 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme",
   "dependencies": {
-    "@babel/runtime": "^7.13.10",
+    "@babel/runtime": "^7.14.0",
-    "@polkadot/metadata": "4.6.1",
+    "@polkadot/metadata": "4.8.1",
-    "@polkadot/util": "^6.2.1",
+    "@polkadot/util": "^6.3.1",
-    "@polkadot/util-crypto": "^6.2.1",
+    "@polkadot/util-crypto": "^6.3.1",
-    "@polkadot/x-rxjs": "^6.2.1",
+    "@polkadot/x-rxjs": "^6.3.1",
     "@types/bn.js": "^4.11.6",
     "bn.js": "^4.11.9"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.2.1"
+    "@polkadot/keyring": "^6.3.1"
   }
 }

packages/types/src/augment/registry.ts

@@ -21,7 +21,7 @@ import type { FundIndex, FundInfo, LastContribution, TrieIndex } from '@polkadot
 import type { AccountVote, AccountVoteSplit, AccountVoteStandard, Conviction, Delegations, PreimageStatus, PreimageStatusAvailable, PriorLock, PropIndex, Proposal, ProxyState, ReferendumIndex, ReferendumInfo, ReferendumInfoFinished, ReferendumInfoTo239, ReferendumStatus, Tally, Voting, VotingDelegating, VotingDirect, VotingDirectVote } from '@polkadot/types/interfaces/democracy';
 import type { ApprovalFlag, DefunctVoter, Renouncing, SetIndex, Vote, VoteIndex, VoteThreshold, VoterInfo } from '@polkadot/types/interfaces/elections';
 import type { CreatedBlock, ImportedAux } from '@polkadot/types/interfaces/engine';
-import type { EthAccount, EthBlock, EthBloom, EthCallRequest, EthFilter, EthFilterAddress, EthFilterChanges, EthFilterTopic, EthFilterTopicEntry, EthFilterTopicInner, EthHeader, EthLog, EthReceipt, EthRichBlock, EthRichHeader, EthStorageProof, EthSubKind, EthSubParams, EthSubResult, EthSyncInfo, EthSyncStatus, EthTransaction, EthTransactionAction, EthTransactionCondition, EthTransactionRequest, EthTransactionStatus, EthWork, EthereumAccountId, EthereumLookupSource, EthereumSignature } from '@polkadot/types/interfaces/eth';
+import type { EthAccount, EthBlock, EthBloom, EthCallRequest, EthFilter, EthFilterAddress, EthFilterChanges, EthFilterTopic, EthFilterTopicEntry, EthFilterTopicInner, EthHeader, EthLog, EthReceipt, EthRichBlock, EthRichHeader, EthStorageProof, EthSubKind, EthSubParams, EthSubResult, EthSyncInfo, EthSyncStatus, EthTransaction, EthTransactionAction, EthTransactionCondition, EthTransactionRequest, EthTransactionSignature, EthTransactionStatus, EthWork, EthereumAccountId, EthereumLookupSource, EthereumSignature } from '@polkadot/types/interfaces/eth';
 import type { EvmAccount, EvmLog, EvmVicinity, ExitError, ExitFatal, ExitReason, ExitRevert, ExitSucceed } from '@polkadot/types/interfaces/evm';
 import type { AnySignature, EcdsaSignature, Ed25519Signature, Extrinsic, ExtrinsicEra, ExtrinsicPayload, ExtrinsicPayloadUnknown, ExtrinsicPayloadV4, ExtrinsicSignature, ExtrinsicSignatureV4, ExtrinsicUnknown, ExtrinsicV4, ImmortalEra, MortalEra, MultiSignature, Signature, SignerPayload, Sr25519Signature } from '@polkadot/types/interfaces/extrinsics';
 import type { AssetOptions, Owner, PermissionLatest, PermissionVersions, PermissionsV1 } from '@polkadot/types/interfaces/genericAsset';
@@ -41,7 +41,7 @@ import type { ProxyAnnouncement, ProxyDefinition, ProxyType } from '@polkadot/ty
 import type { AccountStatus, AccountValidity } from '@polkadot/types/interfaces/purchase';
 import type { ActiveRecovery, RecoveryConfig } from '@polkadot/types/interfaces/recovery';
 import type { RpcMethods } from '@polkadot/types/interfaces/rpc';
-import type { AccountId, AccountIdOf, AccountIndex, Address, AssetId, Balance, BalanceOf, Block, BlockNumber, Call, CallHash, CallHashOf, ChangesTrieConfiguration, CodecHash, Consensus, ConsensusEngineId, Digest, DigestItem, EncodedJustification, ExtrinsicsWeight, Fixed128, Fixed64, FixedI128, FixedI64, FixedU128, FixedU64, H1024, H128, H160, H2048, H256, H512, H64, Hash, Header, I32F32, Index, IndicesLookupSource, Justification, Justifications, KeyTypeId, KeyValue, LockIdentifier, LookupSource, LookupTarget, ModuleId, Moment, MultiAddress, MultiSigner, OpaqueCall, Origin, OriginCaller, PalletId, PalletVersion, PalletsOrigin, Pays, PerU16, Perbill, Percent, Permill, Perquintill, Phantom, PhantomData, PreRuntime, Releases, RuntimeDbWeight, Seal, SealV0, SignedBlock, SignedBlockWithJustification, SignedBlockWithJustifications, Slot, StorageData, StorageProof, TransactionPriority, U32F32, ValidatorId, ValidatorIdOf, Weight, WeightMultiplier } from '@polkadot/types/interfaces/runtime';
+import type { AccountId, AccountIdOf, AccountIndex, Address, AssetId, Balance, BalanceOf, Block, BlockNumber, Call, CallHash, CallHashOf, ChangesTrieConfiguration, CodecHash, Consensus, ConsensusEngineId, Digest, DigestItem, EncodedJustification, ExtrinsicsWeight, Fixed128, Fixed64, FixedI128, FixedI64, FixedU128, FixedU64, H1024, H128, H160, H2048, H256, H32, H512, H64, Hash, Header, I32F32, Index, IndicesLookupSource, Justification, Justifications, KeyTypeId, KeyValue, LockIdentifier, LookupSource, LookupTarget, ModuleId, Moment, MultiAddress, MultiSigner, OpaqueCall, Origin, OriginCaller, PalletId, PalletVersion, PalletsOrigin, Pays, PerU16, Perbill, Percent, Permill, Perquintill, Phantom, PhantomData, PreRuntime, Releases, RuntimeDbWeight, Seal, SealV0, SignedBlock, SignedBlockWithJustification, SignedBlockWithJustifications, Slot, StorageData, StorageProof, TransactionPriority, U32F32, ValidatorId, ValidatorIdOf, Weight, WeightMultiplier } from '@polkadot/types/interfaces/runtime';
 import type { SiField, SiLookupTypeId, SiPath, SiType, SiTypeDef, SiTypeDefArray, SiTypeDefComposite, SiTypeDefPrimitive, SiTypeDefSequence, SiTypeDefTuple, SiTypeDefVariant, SiVariant } from '@polkadot/types/interfaces/scaleInfo';
 import type { Period, Priority, SchedulePeriod, SchedulePriority, Scheduled, ScheduledTo254, TaskAddress } from '@polkadot/types/interfaces/scheduler';
 import type { BeefyKey, FullIdentification, IdentificationTuple, Keys, MembershipProof, SessionIndex, SessionKeys1, SessionKeys10, SessionKeys10B, SessionKeys2, SessionKeys3, SessionKeys4, SessionKeys5, SessionKeys6, SessionKeys6B, SessionKeys7, SessionKeys7B, SessionKeys8, SessionKeys8B, SessionKeys9, SessionKeys9B, ValidatorCount } from '@polkadot/types/interfaces/session';
@@ -49,12 +49,12 @@ import type { Bid, BidKind, SocietyJudgement, SocietyVote, StrikeCount, Vouching
 import type { ActiveEraInfo, CompactAssignments, CompactAssignmentsTo257, CompactScore, CompactScoreCompact, ElectionCompute, ElectionPhase, ElectionResult, ElectionScore, ElectionSize, ElectionStatus, EraIndex, EraPoints, EraRewardPoints, EraRewards, Exposure, ExtendedBalance, Forcing, IndividualExposure, KeyType, MomentOf, Nominations, NominatorIndex, NominatorIndexCompact, OffchainAccuracy, OffchainAccuracyCompact, PhragmenScore, Points, RawSolution, ReadySolution, RewardDestination, RewardPoint, RoundSnapshot, SeatHolder, SlashJournalEntry, SlashingSpans, SlashingSpansTo204, SolutionOrSnapshotSize, SolutionSupport, SolutionSupports, SpanIndex, SpanRecord, StakingLedger, StakingLedgerTo223, StakingLedgerTo240, UnappliedSlash, UnappliedSlashOther, UnlockChunk, ValidatorIndex, ValidatorIndexCompact, ValidatorPrefs, ValidatorPrefsTo145, ValidatorPrefsTo196, ValidatorPrefsWithBlocked, ValidatorPrefsWithCommission, VoteWeight, Voter } from '@polkadot/types/interfaces/staking';
 import type { ApiId, KeyValueOption, ReadProof, RuntimeVersion, RuntimeVersionApi, StorageChangeSet } from '@polkadot/types/interfaces/state';
 import type { WeightToFeeCoefficient } from '@polkadot/types/interfaces/support';
-import type { AccountInfo, AccountInfoWithDualRefCount, AccountInfoWithProviders, AccountInfoWithRefCount, AccountInfoWithTripleRefCount, ApplyExtrinsicResult, BlockLength, BlockWeights, ChainProperties, ChainType, ConsumedWeight, DigestOf, DispatchClass, DispatchError, DispatchErrorModule, DispatchErrorTo198, DispatchInfo, DispatchInfoTo190, DispatchInfoTo244, DispatchOutcome, DispatchResult, DispatchResultOf, DispatchResultTo198, Event, EventId, EventIndex, EventRecord, Health, InvalidTransaction, Key, LastRuntimeUpgradeInfo, NetworkState, NetworkStatePeerset, NetworkStatePeersetInfo, NodeRole, NotConnectedPeer, Peer, PeerEndpoint, PeerEndpointAddr, PeerInfo, PeerPing, PerDispatchClassU32, PerDispatchClassWeight, PerDispatchClassWeightsPerClass, Phase, RawOrigin, RefCount, RefCountTo259, SyncState, SystemOrigin, TransactionValidityError, UnknownTransaction, WeightPerClass } from '@polkadot/types/interfaces/system';
+import type { AccountInfo, AccountInfoWithDualRefCount, AccountInfoWithProviders, AccountInfoWithRefCount, AccountInfoWithTripleRefCount, ApplyExtrinsicResult, BlockLength, BlockWeights, ChainProperties, ChainType, ConsumedWeight, DigestOf, DispatchClass, DispatchError, DispatchErrorModule, DispatchErrorTo198, DispatchInfo, DispatchInfoTo190, DispatchInfoTo244, DispatchOutcome, DispatchResult, DispatchResultOf, DispatchResultTo198, Event, EventId, EventIndex, EventRecord, Health, InvalidTransaction, Key, LastRuntimeUpgradeInfo, NetworkState, NetworkStatePeerset, NetworkStatePeersetInfo, NodeRole, NotConnectedPeer, Peer, PeerEndpoint, PeerEndpointAddr, PeerInfo, PeerPing, PerDispatchClassU32, PerDispatchClassWeight, PerDispatchClassWeightsPerClass, Phase, RawOrigin, RefCount, RefCountTo259, SyncState, SystemOrigin, TokenError, TransactionValidityError, UnknownTransaction, WeightPerClass } from '@polkadot/types/interfaces/system';
 import type { Bounty, BountyIndex, BountyStatus, BountyStatusActive, BountyStatusCuratorProposed, BountyStatusPendingPayout, OpenTip, OpenTipFinderTo225, OpenTipTip, OpenTipTo225, TreasuryProposal } from '@polkadot/types/interfaces/treasury';
 import type { Multiplier } from '@polkadot/types/interfaces/txpayment';
 import type { Multisig, Timepoint } from '@polkadot/types/interfaces/utility';
 import type { VestingInfo } from '@polkadot/types/interfaces/vesting';
-import type { AccountId32Junction, AccountIndex64Junction, AccountKey20Junction, AssetInstance, DoubleEncodedCall, Junction, MultiAsset, MultiAssetAbstractFungible, MultiAssetAbstractNonFungible, MultiAssetConcreteFungible, MultiAssetConcreteNonFungible, MultiLocation, NetworkId, VersionedMultiAsset, VersionedMultiLocation, VersionedXcm, Xcm, XcmAssetEffects, XcmError, XcmHrmpChannelAccepted, XcmHrmpChannelClosing, XcmHrmpNewChannelOpenRequest, XcmOrder, XcmOrderBuyExecution, XcmOrderDepositAsset, XcmOrderDepositReserveAsset, XcmOrderExchangeAsset, XcmOrderInitiateReserveWithdraw, XcmOrderInitiateTeleport, XcmOrderQueryHolding, XcmOriginKind, XcmOutcome, XcmQueryResponse, XcmRelayedFrom, XcmReserveAssetDeposit, XcmResponse, XcmTeleportAsset, XcmTransact, XcmTransferAsset, XcmTransferReserveAsset, XcmWithdrawAsset } from '@polkadot/types/interfaces/xcm';
+import type { AccountId32Junction, AccountIndex64Junction, AccountKey20Junction, AssetInstance, BodyId, BodyPart, BodyPartAtLeastProportion, BodyPartFraction, BodyPartMoreThanProportion, DoubleEncodedCall, Junction, MultiAsset, MultiAssetAbstractFungible, MultiAssetAbstractNonFungible, MultiAssetConcreteFungible, MultiAssetConcreteNonFungible, MultiLocation, NetworkId, Outcome, PluralityJunction, VersionedMultiAsset, VersionedMultiLocation, VersionedXcm, Xcm, XcmAssetEffects, XcmError, XcmHrmpChannelAccepted, XcmHrmpChannelClosing, XcmHrmpNewChannelOpenRequest, XcmOrder, XcmOrderBuyExecution, XcmOrderDepositAsset, XcmOrderDepositReserveAsset, XcmOrderExchangeAsset, XcmOrderInitiateReserveWithdraw, XcmOrderInitiateTeleport, XcmOrderQueryHolding, XcmOriginKind, XcmQueryResponse, XcmRelayedFrom, XcmReserveAssetDeposit, XcmResponse, XcmTeleportAsset, XcmTransact, XcmTransferAsset, XcmTransferReserveAsset, XcmWithdrawAsset } from '@polkadot/types/interfaces/xcm';
 
 declare module '@polkadot/types/types/registry' {
   export interface InterfaceTypes {
@@ -226,6 +226,11 @@ declare module '@polkadot/types/types/registry' {
     'Option<BlockLength>': Option<BlockLength>;
     'Option<BlockNumber>': Option<BlockNumber>;
     'Option<BlockWeights>': Option<BlockWeights>;
+    'Option<BodyId>': Option<BodyId>;
+    'Option<BodyPart>': Option<BodyPart>;
+    'Option<BodyPartAtLeastProportion>': Option<BodyPartAtLeastProportion>;
+    'Option<BodyPartFraction>': Option<BodyPartFraction>;
+    'Option<BodyPartMoreThanProportion>': Option<BodyPartMoreThanProportion>;
     'Option<bool>': Option<bool>;
     'Option<Bool>': Option<Bool>;
     'Option<Bounty>': Option<Bounty>;
@@ -380,6 +385,7 @@ declare module '@polkadot/types/types/registry' {
     'Option<EthTransactionAction>': Option<EthTransactionAction>;
     'Option<EthTransactionCondition>': Option<EthTransactionCondition>;
     'Option<EthTransactionRequest>': Option<EthTransactionRequest>;
+    'Option<EthTransactionSignature>': Option<EthTransactionSignature>;
     'Option<EthTransactionStatus>': Option<EthTransactionStatus>;
     'Option<EthWork>': Option<EthWork>;
     'Option<Event>': Option<Event>;
@@ -452,6 +458,7 @@ declare module '@polkadot/types/types/registry' {
     'Option<H160>': Option<H160>;
     'Option<H2048>': Option<H2048>;
     'Option<H256>': Option<H256>;
+    'Option<H32>': Option<H32>;
     'Option<H512>': Option<H512>;
     'Option<H64>': Option<H64>;
     'Option<Hash>': Option<Hash>;
@@ -602,6 +609,7 @@ declare module '@polkadot/types/types/registry' {
     'Option<Origin>': Option<Origin>;
     'Option<OriginCaller>': Option<OriginCaller>;
     'Option<OutboundHrmpMessage>': Option<OutboundHrmpMessage>;
+    'Option<Outcome>': Option<Outcome>;
     'Option<Owner>': Option<Owner>;
     'Option<PalletId>': Option<PalletId>;
     'Option<PalletsOrigin>': Option<PalletsOrigin>;
@@ -645,6 +653,7 @@ declare module '@polkadot/types/types/registry' {
     'Option<PhantomData>': Option<PhantomData>;
     'Option<Phase>': Option<Phase>;
     'Option<PhragmenScore>': Option<PhragmenScore>;
+    'Option<PluralityJunction>': Option<PluralityJunction>;
     'Option<Points>': Option<Points>;
     'Option<Precommits>': Option<Precommits>;
     'Option<PrefabWasmModule>': Option<PrefabWasmModule>;
@@ -827,6 +836,7 @@ declare module '@polkadot/types/types/registry' {
     'Option<TAssetDepositBalance>': Option<TAssetDepositBalance>;
     'Option<Text>': Option<Text>;
     'Option<Timepoint>': Option<Timepoint>;
+    'Option<TokenError>': Option<TokenError>;
     'Option<TombstoneContractInfo>': Option<TombstoneContractInfo>;
     'Option<TransactionPriority>': Option<TransactionPriority>;
     'Option<TransactionValidityError>': Option<TransactionValidityError>;
@@ -920,7 +930,6 @@ declare module '@polkadot/types/types/registry' {
     'Option<XcmOrderInitiateTeleport>': Option<XcmOrderInitiateTeleport>;
     'Option<XcmOrderQueryHolding>': Option<XcmOrderQueryHolding>;
     'Option<XcmOriginKind>': Option<XcmOriginKind>;
-    'Option<XcmOutcome>': Option<XcmOutcome>;
     'Option<XcmQueryResponse>': Option<XcmQueryResponse>;
     'Option<XcmRelayedFrom>': Option<XcmRelayedFrom>;
     'Option<XcmReserveAssetDeposit>': Option<XcmReserveAssetDeposit>;
@@ -1011,6 +1020,11 @@ declare module '@polkadot/types/types/registry' {
     'Vec<BlockLength>': Vec<BlockLength>;
     'Vec<BlockNumber>': Vec<BlockNumber>;
     'Vec<BlockWeights>': Vec<BlockWeights>;
+    'Vec<BodyId>': Vec<BodyId>;
+    'Vec<BodyPart>': Vec<BodyPart>;
+    'Vec<BodyPartAtLeastProportion>': Vec<BodyPartAtLeastProportion>;
+    'Vec<BodyPartFraction>': Vec<BodyPartFraction>;
+    'Vec<BodyPartMoreThanProportion>': Vec<BodyPartMoreThanProportion>;
     'Vec<bool>': Vec<bool>;
     'Vec<Bool>': Vec<Bool>;
     'Vec<Bounty>': Vec<Bounty>;
@@ -1165,6 +1179,7 @@ declare module '@polkadot/types/types/registry' {
     'Vec<EthTransactionAction>': Vec<EthTransactionAction>;
     'Vec<EthTransactionCondition>': Vec<EthTransactionCondition>;
     'Vec<EthTransactionRequest>': Vec<EthTransactionRequest>;
+    'Vec<EthTransactionSignature>': Vec<EthTransactionSignature>;
     'Vec<EthTransactionStatus>': Vec<EthTransactionStatus>;
     'Vec<EthWork>': Vec<EthWork>;
     'Vec<Event>': Vec<Event>;
@@ -1237,6 +1252,7 @@ declare module '@polkadot/types/types/registry' {
     'Vec<H160>': Vec<H160>;
     'Vec<H2048>': Vec<H2048>;
     'Vec<H256>': Vec<H256>;
+    'Vec<H32>': Vec<H32>;
     'Vec<H512>': Vec<H512>;
     'Vec<H64>': Vec<H64>;
     'Vec<Hash>': Vec<Hash>;
@@ -1387,6 +1403,7 @@ declare module '@polkadot/types/types/registry' {
     'Vec<Origin>': Vec<Origin>;
     'Vec<OriginCaller>': Vec<OriginCaller>;
     'Vec<OutboundHrmpMessage>': Vec<OutboundHrmpMessage>;
+    'Vec<Outcome>': Vec<Outcome>;
     'Vec<Owner>': Vec<Owner>;
     'Vec<PalletId>': Vec<PalletId>;
     'Vec<PalletsOrigin>': Vec<PalletsOrigin>;
@@ -1430,6 +1447,7 @@ declare module '@polkadot/types/types/registry' {
     'Vec<PhantomData>': Vec<PhantomData>;
     'Vec<Phase>': Vec<Phase>;
     'Vec<PhragmenScore>': Vec<PhragmenScore>;
+    'Vec<PluralityJunction>': Vec<PluralityJunction>;
     'Vec<Points>': Vec<Points>;
     'Vec<Precommits>': Vec<Precommits>;
     'Vec<PrefabWasmModule>': Vec<PrefabWasmModule>;
@@ -1612,6 +1630,7 @@ declare module '@polkadot/types/types/registry' {
     'Vec<TAssetDepositBalance>': Vec<TAssetDepositBalance>;
     'Vec<Text>': Vec<Text>;
     'Vec<Timepoint>': Vec<Timepoint>;
+    'Vec<TokenError>': Vec<TokenError>;
     'Vec<TombstoneContractInfo>': Vec<TombstoneContractInfo>;
     'Vec<TransactionPriority>': Vec<TransactionPriority>;
     'Vec<TransactionValidityError>': Vec<TransactionValidityError>;
@@ -1705,7 +1724,6 @@ declare module '@polkadot/types/types/registry' {
     'Vec<XcmOrderInitiateTeleport>': Vec<XcmOrderInitiateTeleport>;
     'Vec<XcmOrderQueryHolding>': Vec<XcmOrderQueryHolding>;
     'Vec<XcmOriginKind>': Vec<XcmOriginKind>;
-    'Vec<XcmOutcome>': Vec<XcmOutcome>;
     'Vec<XcmQueryResponse>': Vec<XcmQueryResponse>;
     'Vec<XcmRelayedFrom>': Vec<XcmRelayedFrom>;
     'Vec<XcmReserveAssetDeposit>': Vec<XcmReserveAssetDeposit>;
@@ -1796,6 +1814,11 @@ declare module '@polkadot/types/types/registry' {
     BlockLength: BlockLength;
     BlockNumber: BlockNumber;
     BlockWeights: BlockWeights;
+    BodyId: BodyId;
+    BodyPart: BodyPart;
+    BodyPartAtLeastProportion: BodyPartAtLeastProportion;
+    BodyPartFraction: BodyPartFraction;
+    BodyPartMoreThanProportion: BodyPartMoreThanProportion;
     bool: bool;
     Bool: Bool;
     Bounty: Bounty;
@@ -1950,6 +1973,7 @@ declare module '@polkadot/types/types/registry' {
     EthTransactionAction: EthTransactionAction;
     EthTransactionCondition: EthTransactionCondition;
     EthTransactionRequest: EthTransactionRequest;
+    EthTransactionSignature: EthTransactionSignature;
     EthTransactionStatus: EthTransactionStatus;
     EthWork: EthWork;
     Event: Event;
@@ -2022,6 +2046,7 @@ declare module '@polkadot/types/types/registry' {
     H160: H160;
     H2048: H2048;
     H256: H256;
+    H32: H32;
     H512: H512;
     H64: H64;
     Hash: Hash;
@@ -2172,6 +2197,7 @@ declare module '@polkadot/types/types/registry' {
     Origin: Origin;
     OriginCaller: OriginCaller;
     OutboundHrmpMessage: OutboundHrmpMessage;
+    Outcome: Outcome;
     Owner: Owner;
     PalletId: PalletId;
     PalletsOrigin: PalletsOrigin;
@@ -2215,6 +2241,7 @@ declare module '@polkadot/types/types/registry' {
     PhantomData: PhantomData;
     Phase: Phase;
     PhragmenScore: PhragmenScore;
+    PluralityJunction: PluralityJunction;
     Points: Points;
     Precommits: Precommits;
     PrefabWasmModule: PrefabWasmModule;
@@ -2397,6 +2424,7 @@ declare module '@polkadot/types/types/registry' {
     TAssetDepositBalance: TAssetDepositBalance;
     Text: Text;
     Timepoint: Timepoint;
+    TokenError: TokenError;
     TombstoneContractInfo: TombstoneContractInfo;
     TransactionPriority: TransactionPriority;
     TransactionValidityError: TransactionValidityError;
@@ -2490,7 +2518,6 @@ declare module '@polkadot/types/types/registry' {
     XcmOrderInitiateTeleport: XcmOrderInitiateTeleport;
     XcmOrderQueryHolding: XcmOrderQueryHolding;
     XcmOriginKind: XcmOriginKind;
-    XcmOutcome: XcmOutcome;
     XcmQueryResponse: XcmQueryResponse;
     XcmRelayedFrom: XcmRelayedFrom;
     XcmReserveAssetDeposit: XcmReserveAssetDeposit;

packages/types/src/codec/AbstractArray.ts

@@ -30,9 +30,7 @@ export abstract class AbstractArray<T extends Codec> extends Array<T> implements
    * @description The length of the value when encoded as a Uint8Array
    */
   public get encodedLength (): number {
-    return this.reduce((total, raw): number => {
+    return this.reduce((total, entry) => total + entry.encodedLength, compactToU8a(this.length).length);
-      return total + raw.encodedLength;
-    }, compactToU8a(this.length).length);
   }
 
   /**

packages/types/src/codec/AbstractInt.ts

@@ -7,7 +7,7 @@ import type { UIntBitLength } from './types';
 
 import BN from 'bn.js';
 
-import { assert, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_QUINTILL, BN_ZERO, bnToBn, bnToHex, bnToU8a, formatBalance, formatNumber, hexToBn, isHex, isString, isU8a, u8aToBn } from '@polkadot/util';
+import { assert, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_QUINTILL, BN_ZERO, bnToBn, bnToHex, bnToU8a, formatBalance, formatNumber, hexToBn, isHex, isString, isU8a, stringify, u8aToBn } from '@polkadot/util';
 
 export const DEFAULT_UINT_BITS = 64;
 
@@ -37,7 +37,7 @@ function decodeAbstracIntU8a (value: Uint8Array, bitLength: UIntBitLength, isNeg
     // NOTE When passing u8a in (typically from decoded data), it is always Little Endian
     return u8aToBn(value.subarray(0, bitLength / 8), { isLe: true, isNegative }).toString();
   } catch (error) {
-    throw new Error(`AbstractInt: failed on ${JSON.stringify(value)}:: ${(error as Error).message}`);
+    throw new Error(`AbstractInt: failed on ${stringify(value)}:: ${(error as Error).message}`);
   }
 }
 
@@ -83,8 +83,8 @@ export abstract class AbstractInt extends BN implements Codec {
     const isPositive = this.gte(BN_ZERO);
     const maxBits = bitLength - (isSigned && isPositive ? 1 : 0);
 
-    assert(isSigned || isPositive, `${this.toRawType()}: Negative number passed to unsigned type`);
+    assert(isSigned || isPositive, () => `${this.toRawType()}: Negative number passed to unsigned type`);
-    assert(super.bitLength() <= maxBits, `${this.toRawType()}: Input too large. Found input with ${super.bitLength()} bits, expected ${maxBits}`);
+    assert(super.bitLength() <= maxBits, () => `${this.toRawType()}: Input too large. Found input with ${super.bitLength()} bits, expected ${maxBits}`);
   }
 
   /**

packages/types/src/codec/BTreeSet.ts

@@ -4,7 +4,7 @@
 import type { CodecHash, Hash } from '../interfaces/runtime';
 import type { AnyJson, Codec, Constructor, InterfaceTypes, Registry } from '../types';
 
-import { compactFromU8a, compactToU8a, isHex, isU8a, logger, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { compactFromU8a, compactToU8a, isHex, isU8a, logger, stringify, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
 
 import { compareSet, decodeU8a, typeToConstructor } from './utils';
 
@@ -176,7 +176,7 @@ export class BTreeSet<V extends Codec = Codec> extends Set<V> implements Codec {
    * @description Returns the string representation of the value
    */
   public toString (): string {
-    return JSON.stringify(this.toJSON());
+    return stringify(this.toJSON());
   }
 
   /**

packages/types/src/codec/Compact.ts

@@ -3,7 +3,7 @@
 
 import type { CodecHash, Hash } from '../interfaces';
 import type { AnyJson, AnyNumber, Constructor, ICompact, InterfaceTypes, Registry } from '../types';
-import type { CompactEncodable, UIntBitLength } from './types';
+import type { CompactEncodable } from './types';
 
 import BN from 'bn.js';
 
@@ -50,9 +50,7 @@ export class Compact<T extends CompactEncodable> implements ICompact<T> {
       return new Type(registry, value);
     }
 
-    const [, _value] = compactFromU8a(value, new Type(registry, 0).bitLength() as UIntBitLength);
+    return new Type(registry, compactFromU8a(value)[1]);
-
-    return new Type(registry, _value);
   }
 
   /**

packages/types/src/codec/Enum.ts

@@ -4,7 +4,7 @@
 import type { CodecHash, Hash } from '../interfaces';
 import type { AnyJson, Codec, Constructor, InterfaceTypes, Registry } from '../types';
 
-import { assert, hexToU8a, isHex, isNumber, isObject, isString, isU8a, isUndefined, stringCamelCase, stringUpperFirst, u8aConcat, u8aToHex } from '@polkadot/util';
+import { assert, hexToU8a, isHex, isNumber, isObject, isString, isU8a, isUndefined, stringCamelCase, stringify, stringUpperFirst, u8aConcat, u8aToHex } from '@polkadot/util';
 
 import { Null } from '../primitive/Null';
 import { Struct } from './Struct';
@@ -88,7 +88,7 @@ function extractDef (registry: Registry, _def: Record<string, keyof InterfaceTyp
 function createFromValue (registry: Registry, def: TypesDef, index = 0, value?: any): Decoded {
   const entry = Object.values(def).find((e) => e.index === index);
 
-  assert(!isUndefined(entry), `Unable to create Enum via index ${index}, in ${Object.keys(def).join(', ')}`);
+  assert(!isUndefined(entry), () => `Unable to create Enum via index ${index}, in ${Object.keys(def).join(', ')}`);
 
   return {
     index,
@@ -105,7 +105,7 @@ function decodeFromJSON (registry: Registry, def: TypesDef, key: string, value?:
   const keyLower = key.toLowerCase();
   const index = keys.indexOf(keyLower);
 
-  assert(index !== -1, `Cannot map Enum JSON, unable to find '${key}' in ${keys.join(', ')}`);
+  assert(index !== -1, () => `Cannot map Enum JSON, unable to find '${key}' in ${keys.join(', ')}`);
 
   try {
     return createFromValue(registry, def, Object.values(def)[index].index, value);
@@ -213,7 +213,7 @@ export class Enum implements Codec {
             Object.defineProperty(this, askey, {
               enumerable: true,
               get: (): Codec => {
-                assert(this[iskey as keyof this], `Cannot convert '${this.type}' via ${askey}`);
+                assert(this[iskey as keyof this], () => `Cannot convert '${this.type}' via ${askey}`);
 
                 return this.value;
               }
@@ -384,7 +384,7 @@ export class Enum implements Codec {
    * @description Returns the base runtime type name for this instance
    */
   public toRawType (): string {
-    return JSON.stringify({ _enum: this._toRawStruct() });
+    return stringify({ _enum: this._toRawStruct() });
   }
 
   /**
@@ -393,7 +393,7 @@ export class Enum implements Codec {
   public toString (): string {
     return this.isNull
       ? this.type
-      : JSON.stringify(this.toJSON());
+      : stringify(this.toJSON());
   }
 
   /**

packages/types/src/codec/Json.ts

@@ -4,7 +4,7 @@
 import type { CodecHash, Hash } from '../interfaces/runtime';
 import type { AnyJson, Codec, Registry } from '../types';
 
-import { isFunction, isUndefined } from '@polkadot/util';
+import { isFunction, isUndefined, stringify } from '@polkadot/util';
 
 import { compareMap } from './utils';
 
@@ -112,7 +112,7 @@ export class Json extends Map<string, any> implements Codec {
    * @description Returns the string representation of the value
    */
   public toString (): string {
-    return JSON.stringify(this.toJSON());
+    return stringify(this.toJSON());
   }
 
   /**

packages/types/src/codec/Map.ts

@@ -4,7 +4,7 @@
 import type { CodecHash, Hash } from '../interfaces/runtime';
 import type { AnyJson, Codec, Constructor, InterfaceTypes, Registry } from '../types';
 
-import { compactFromU8a, compactToU8a, isHex, isObject, isU8a, logger, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { compactFromU8a, compactToU8a, isHex, isObject, isU8a, logger, stringify, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
 
 import { compareMap, decodeU8a, typeToConstructor } from './utils';
 
@@ -183,7 +183,7 @@ export class CodecMap<K extends Codec = Codec, V extends Codec = Codec> extends
    * @description Returns the string representation of the value
    */
   public toString (): string {
-    return JSON.stringify(this.toJSON());
+    return stringify(this.toJSON());
   }
 
   /**

packages/types/src/codec/Set.ts

@@ -6,7 +6,7 @@ import type { Codec, Constructor, Registry } from '../types';
 
 import BN from 'bn.js';
 
-import { assert, bnToBn, bnToU8a, isBn, isNumber, isString, isU8a, isUndefined, stringCamelCase, stringUpperFirst, u8aToBn, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { assert, bnToBn, bnToU8a, isBn, isNumber, isString, isU8a, isUndefined, stringCamelCase, stringify, stringUpperFirst, u8aToBn, u8aToHex, u8aToU8a } from '@polkadot/util';
 
 import { compareArray } from './utils';
 
@@ -21,7 +21,7 @@ function encodeSet (setValues: SetValues, value: string[]): BN {
 /** @internal */
 function decodeSetArray (setValues: SetValues, value: string[]): string[] {
   return value.reduce((result, key): string[] => {
-    assert(!isUndefined(setValues[key]), `Set: Invalid key '${key}' passed to Set, allowed ${Object.keys(setValues).join(', ')}`);
+    assert(!isUndefined(setValues[key]), () => `Set: Invalid key '${key}' passed to Set, allowed ${Object.keys(setValues).join(', ')}`);
 
     result.push(key);
 
@@ -42,14 +42,14 @@ function decodeSetNumber (setValues: SetValues, _value: BN | number): string[] {
 
   const computed = encodeSet(setValues, result);
 
-  assert(bn.eq(computed), `Set: Mismatch decoding '${bn.toString()}', computed as '${computed.toString()}' with ${result.join(', ')}`);
+  assert(bn.eq(computed), () => `Set: Mismatch decoding '${bn.toString()}', computed as '${computed.toString()}' with ${result.join(', ')}`);
 
   return result;
 }
 
 /** @internal */
 function decodeSet (setValues: SetValues, value: string[] | Set<string> | Uint8Array | BN | number | string = 0, bitLength: number): string[] {
-  assert(bitLength % 8 === 0, `Expected valid bitLength, power of 8, found ${bitLength}`);
+  assert(bitLength % 8 === 0, () => `Expected valid bitLength, power of 8, found ${bitLength}`);
 
   const byteLength = bitLength / 8;
 
@@ -155,7 +155,7 @@ export class CodecSet extends Set<string> implements Codec {
     // ^^^ add = () property done to assign this instance's this, otherwise Set.add creates "some" chaos
     // we have the isUndefined(this._setValues) in here as well, add is used internally
     // in the Set constructor (so it is undefined at this point, and should allow)
-    assert(isUndefined(this.#allowed) || !isUndefined(this.#allowed[key]), `Set: Invalid key '${key}' on add`);
+    assert(isUndefined(this.#allowed) || !isUndefined(this.#allowed[key]), () => `Set: Invalid key '${key}' on add`);
 
     super.add(key);
 
@@ -210,7 +210,7 @@ export class CodecSet extends Set<string> implements Codec {
    * @description Returns the base runtime type name for this instance
    */
   public toRawType (): string {
-    return JSON.stringify({ _set: this.#allowed });
+    return stringify({ _set: this.#allowed });
   }
 
   /**

packages/types/src/codec/Struct.spec.ts

@@ -119,6 +119,14 @@ describe('Struct', (): void => {
     ).toThrowError(/Cannot decode value/);
   });
 
+  it('throws a sensical error on incorrect array values passed to structs', (): void => {
+    expect(
+      () => new Struct(registry, {
+        _: 'Vec<u32>'
+      }, [123, 456])
+    ).toThrow(/array to object with known keys/);
+  });
+
   it('provides a clean toString()', (): void => {
     expect(
       new (

packages/types/src/codec/Struct.ts

@@ -4,7 +4,7 @@
 import type { CodecHash, Hash } from '../interfaces/runtime';
 import type { AnyJson, BareOpts, Codec, Constructor, ConstructorDef, InterfaceTypes, Registry } from '../types';
 
-import { hexToU8a, isBoolean, isFunction, isHex, isObject, isU8a, isUndefined, stringCamelCase, u8aConcat, u8aToHex } from '@polkadot/util';
+import { assert, hexToU8a, isBoolean, isFunction, isHex, isObject, isU8a, isUndefined, stringCamelCase, stringify, u8aConcat, u8aToHex } from '@polkadot/util';
 
 import { compareMap, decodeU8a, mapToTypeMap } from './utils';
 
@@ -13,8 +13,11 @@ type TypesDef<T = Codec> = Record<string, keyof InterfaceTypes | Constructor<T>>
 /** @internal */
 function decodeStructFromObject <T> (registry: Registry, Types: ConstructorDef, value: any, jsonMap: Map<any, string>): T {
   let jsonObj: Record<string, any> | undefined;
+  const inputKeys = Object.keys(Types);
 
-  return Object.keys(Types).reduce((raw, key, index): T => {
+  assert(!Array.isArray(value) || value.length === inputKeys.length, () => `Struct: Unable to map ${stringify(value)} array to object with known keys ${inputKeys.join(', ')}`);
+
+  return inputKeys.reduce((raw, key, index): T => {
     // The key in the JSON can be snake_case (or other cases), but in our
     // Types, result or any other maps, it's camelCase
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
@@ -60,7 +63,7 @@ function decodeStructFromObject <T> (registry: Registry, Types: ConstructorDef,
           ? assign
           : new Types[key](registry, assign);
       } else {
-        throw new Error(`Cannot decode value ${JSON.stringify(value)}`);
+        throw new Error(`Cannot decode value ${stringify(value)} (typeof ${typeof value}), expected an input object with known keys`);
       }
     } catch (error) {
       let type = Types[key].name;
@@ -297,7 +300,7 @@ export class Struct<
    * @description Returns the base runtime type name for this instance
    */
   public toRawType (): string {
-    return JSON.stringify(
+    return stringify(
       Struct.typesToMap(this.registry, this.#Types)
     );
   }
@@ -306,7 +309,7 @@ export class Struct<
    * @description Returns the string representation of the value
    */
   public toString (): string {
-    return JSON.stringify(this.toJSON());
+    return stringify(this.toJSON());
   }
 
   /**

packages/types/src/codec/Tuple.ts

@@ -3,7 +3,7 @@
 
 import type { AnyNumber, AnyString, AnyU8a, Codec, Constructor, InterfaceTypes, Registry } from '../types';
 
-import { isHex, isU8a, u8aConcat, u8aToU8a } from '@polkadot/util';
+import { isHex, isU8a, stringify, u8aConcat, u8aToU8a } from '@polkadot/util';
 
 import { AbstractArray } from './AbstractArray';
 import { decodeU8a, mapToTypeMap, typeToConstructor } from './utils';
@@ -74,11 +74,7 @@ export class Tuple extends AbstractArray<Codec> {
    * @description The length of the value when encoded as a Uint8Array
    */
   public get encodedLength (): number {
-    return this.reduce((length: number, entry: Codec): number => {
+    return this.reduce((total, entry) => total + entry.encodedLength, 0);
-      length += entry.encodedLength;
-
-      return length;
-    }, 0);
   }
 
   /**
@@ -110,7 +106,7 @@ export class Tuple extends AbstractArray<Codec> {
    */
   public toString (): string {
     // Overwrite the default toString representation of Array.
-    return JSON.stringify(this.toJSON());
+    return stringify(this.toJSON());
   }
 
   /**

packages/types/src/codec/Vec.ts

@@ -50,7 +50,7 @@ export class Vec<T extends Codec> extends AbstractArray<T> {
     const u8a = u8aToU8a(value);
     const [offset, length] = compactFromU8a(u8a);
 
-    assert(length.lten(MAX_LENGTH), `Vec length ${length.toString()} exceeds ${MAX_LENGTH}`);
+    assert(length.lten(MAX_LENGTH), () => `Vec length ${length.toString()} exceeds ${MAX_LENGTH}`);
 
     return decodeU8a(registry, u8a.subarray(offset), new Array(length.toNumber()).fill(Type)) as T[];
   }

packages/types/src/codec/VecFixed.ts

@@ -39,7 +39,7 @@ export class VecFixed<T extends Codec> extends AbstractArray<T> {
       values.push(new Type(registry));
     }
 
-    assert(values.length === allocLength, `Expected a length of exactly ${allocLength} entries`);
+    assert(values.length === allocLength, () => `Expected a length of exactly ${allocLength} entries`);
 
     return values;
   }
@@ -63,7 +63,7 @@ export class VecFixed<T extends Codec> extends AbstractArray<T> {
    * @description The length of the value when encoded as a Uint8Array
    */
   public get encodedLength (): number {
-    return this.toU8a().length;
+    return this.reduce((total, entry) => total + entry.encodedLength, 0);
   }
 
   public toU8a (): Uint8Array {

packages/types/src/create/createClass.ts

@@ -5,7 +5,7 @@ import type { U8aBitLength, UIntBitLength } from '../codec/types';
 import type { Codec, Constructor, InterfaceTypes, Registry } from '../types';
 import type { FromReg, TypeDef } from './types';
 
-import { assert, isNumber, isUndefined } from '@polkadot/util';
+import { assert, isNumber, isUndefined, stringify } from '@polkadot/util';
 
 import { BTreeMap, BTreeSet, CodecSet, Compact, Enum, HashMap, Int, Option, Result, Struct, Tuple, U8aFixed, UInt, Vec, VecFixed } from '../codec';
 import { DoNotConstruct } from '../primitive';
@@ -33,13 +33,13 @@ export function ClassOf<K extends keyof InterfaceTypes> (registry: Registry, nam
 }
 
 function getSubDefArray (value: TypeDef): TypeDef[] {
-  assert(value.sub && Array.isArray(value.sub), `Expected subtype as TypeDef[] in ${JSON.stringify(value)}`);
+  assert(value.sub && Array.isArray(value.sub), () => `Expected subtype as TypeDef[] in ${stringify(value)}`);
 
   return value.sub;
 }
 
 function getSubDef (value: TypeDef): TypeDef {
-  assert(value.sub && !Array.isArray(value.sub), `Expected subtype as TypeDef in ${JSON.stringify(value)}`);
+  assert(value.sub && !Array.isArray(value.sub), () => `Expected subtype as TypeDef in ${stringify(value)}`);
 
   return value.sub;
 }
@@ -67,7 +67,7 @@ function getTypeClassArray (value: TypeDef): (keyof InterfaceTypes)[] {
 }
 
 function createInt ({ displayName, length }: TypeDef, Clazz: typeof Int | typeof UInt): Constructor {
-  assert(isNumber(length), `Expected bitLength information for ${displayName || Clazz.constructor.name}<bitLength>`);
+  assert(isNumber(length), () => `Expected bitLength information for ${displayName || Clazz.constructor.name}<bitLength>`);
 
   return Clazz.with(length as UIntBitLength, displayName);
 }
@@ -185,7 +185,7 @@ export function getTypeClass<T extends Codec = Codec> (registry: Registry, value
 
   const getFn = infoMapping[value.info];
 
-  assert(getFn, `Unable to construct class from ${JSON.stringify(value)}`);
+  assert(getFn, () => `Unable to construct class from ${stringify(value)}`);
 
   return getFn(registry, value) as Constructor<T>;
 }

packages/types/src/create/encodeTypes.ts

@@ -3,7 +3,7 @@
 
 import type { TypeDef } from './types';
 
-import { assert, isNumber, isUndefined } from '@polkadot/util';
+import { assert, isNumber, isUndefined, stringify } from '@polkadot/util';
 
 import { TypeDefInfo } from './types';
 
@@ -34,7 +34,7 @@ function encodeWithParams (typeDef: TypeDef, outer: string): string {
       return paramsNotation(outer, sub, (param) => encodeTypeDef(param));
   }
 
-  throw new Error(`Unable to encode ${JSON.stringify(typeDef)} with params`);
+  throw new Error(`Unable to encode ${stringify(typeDef)} with params`);
 }
 
 function encodeDoNotConstruct ({ displayName }: TypeDef): string {
@@ -44,14 +44,14 @@ function encodeDoNotConstruct ({ displayName }: TypeDef): string {
 function encodeSubTypes (sub: TypeDef[], asEnum?: boolean): string {
   const names = sub.map(({ name }) => name);
 
-  assert(names.every((n) => !!n), `Subtypes does not have consistent names, ${names.join(', ')}`);
+  assert(names.every((n) => !!n), () => `Subtypes does not have consistent names, ${names.join(', ')}`);
 
   const inner = sub.reduce((result: Record<string, string>, type): Record<string, string> => ({
     ...result,
     [type.name as string]: encodeTypeDef(type)
   }), {});
 
-  return JSON.stringify(
+  return stringify(
     asEnum
       ? { _enum: inner }
       : inner
@@ -66,7 +66,7 @@ function encodeEnum (typeDef: TypeDef): string {
   // c-like enums have all Null entries
   // TODO We need to take the disciminant into account and auto-add empty entries
   return sub.every(({ type }) => type === 'Null')
-    ? JSON.stringify({ _enum: sub.map(({ name }, index) => `${name || `Empty${index}`}`) })
+    ? stringify({ _enum: sub.map(({ name }, index) => `${name || `Empty${index}`}`) })
     : encodeSubTypes(sub, true);
 }
 
@@ -121,13 +121,13 @@ const encoders: Record<TypeDefInfo, (typeDef: TypeDef) => string> = {
 function encodeType (typeDef: TypeDef): string {
   const encoder = encoders[typeDef.info];
 
-  assert(encoder, `Cannot encode type: ${JSON.stringify(typeDef)}`);
+  assert(encoder, () => `Cannot encode type: ${stringify(typeDef)}`);
 
   return encoder(typeDef);
 }
 
 export function encodeTypeDef (typeDef: TypeDef): string {
-  assert(!isUndefined(typeDef.info), `Invalid type definition with no instance info, ${JSON.stringify(typeDef)}`);
+  assert(!isUndefined(typeDef.info), () => `Invalid type definition with no instance info, ${stringify(typeDef)}`);
 
   // In the case of contracts we do have the unfortunate situation where the displayName would
   // refer to "Option" when it is an option. For these, string it out, only using when actually

packages/types/src/create/getTypeDef.ts

@@ -110,7 +110,7 @@ function _decodeFixedVec (value: TypeDef, type: string, _: string, count: number
   const length = parseInt(strLength.trim(), 10);
 
   // as a first round, only u8 via u8aFixed, we can add more support
-  assert(length <= 256, `${type}: Only support for [Type; <length>], where length <= 256`);
+  assert(length <= 256, () => `${type}: Only support for [Type; <length>], where length <= 256`);
 
   value.displayName = displayName;
   value.length = length;
@@ -137,7 +137,7 @@ function _decodeAnyInt (value: TypeDef, type: string, _: string, clazz: 'Int' |
   const length = parseInt(strLength.trim(), 10);
 
   // as a first round, only u8 via u8aFixed, we can add more support
-  assert(length <= 8192 && (length % 8) === 0, `${type}: Only support for ${clazz}<bitLength>, where length <= 8192 and a power of 8, found ${length}`);
+  assert(length <= 8192 && (length % 8) === 0, () => `${type}: Only support for ${clazz}<bitLength>, where length <= 8192 and a power of 8, found ${length}`);
 
   value.displayName = displayName;
   value.length = length;