[CI Skip] release/stable 8.7.1

skip-checks: true

.123trigger

@@ -53,4 +53,5 @@
 7.14.3
 8.0.2
 8.3.2
-8.4.2
+8.4.2
+8.6.2

CHANGELOG.md

@@ -1,5 +1,39 @@
 # CHANGELOG
 
+## 8.7.1 Jun 4, 2022
+
+Changes:
+
+- Add internal merge of single storage queries
+- Expose provider stats on API intrerface via `.stats`
+- Adjust flag extraction for latest phragmen types
+- Support for `Range` in typegen for `Enum`
+- Add Kusama 9220 upgrade block
+
+
+## 8.6.2 May 30, 2022
+
+Changes:
+
+- Don't apply default to `Option<bool>` opt-in
+- Lower default historic LRU cache size (128 entries, 192MB est)
+- Cater for updates required by TS 4.7.2
+
+
+## 8.6.1 May 29, 2022
+
+Changes:
+
+- Add codec support for specialized `Option<bool>`
+- Optimization for `createClass` with shortcut typeDef creation
+- Optimization of `registry.getOrUnknown` with lookup cache
+- Optimization of Array allocations in decoding
+- Use `compactFromU8aLim` & `u8aConcatStrict` variants
+- Adjust `.inspect()` for `ExtrinsicPayload`
+- Adjust Kusama `StakingLedger` for runtime 1051
+- Update to latest Substrate, Kusama & Polkadot static metadata
+
+
 ## 8.5.1 May 22, 2022
 
 Contributed:

CONTRIBUTORS

@@ -1,4 +1,4 @@
-    2966	Jaco                          	8.5.1 (#4847)
+    2999	Jaco                          	8.7.1 (#4892)
       83	Amaury Martiny                	StatementKind: Regular and Saft (#2303)
       37	Keith Ingram                  	Update contract types and rpc (#4541)
       35	Stefanie Doll                 	Updated child storage parameters (#1709)

package.json

@@ -11,7 +11,7 @@
   },
   "sideEffects": false,
   "type": "commonjs",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "workspaces": [
     "packages/*"
   ],
@@ -31,15 +31,15 @@
     "test:watch": "polkadot-dev-run-test --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.0",
+    "@babel/core": "^7.18.2",
     "@babel/register": "^7.17.7",
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/dev": "^0.66.28",
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/dev": "^0.66.34",
     "@polkadot/typegen": "workspace:packages/typegen",
-    "@types/jest": "^27.5.1",
+    "@types/jest": "^28.1.0",
     "copyfiles": "^2.4.1"
   },
   "resolutions": {
-    "typescript": "^4.6.4"
+    "typescript": "^4.7.3"
   }
 }

packages/api-augment/package.json

@@ -20,18 +20,18 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/api-base": "8.5.1",
-    "@polkadot/rpc-augment": "8.5.1",
-    "@polkadot/types": "8.5.1",
-    "@polkadot/types-augment": "8.5.1",
-    "@polkadot/types-codec": "8.5.1",
-    "@polkadot/util": "^9.2.1"
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/api-base": "8.7.1",
+    "@polkadot/rpc-augment": "8.7.1",
+    "@polkadot/types": "8.7.1",
+    "@polkadot/types-augment": "8.7.1",
+    "@polkadot/types-codec": "8.7.1",
+    "@polkadot/util": "^9.4.1"
   },
   "devDependencies": {
-    "@polkadot/types-support": "8.5.1"
+    "@polkadot/types-support": "8.7.1"
   }
 }

packages/api-augment/src/kusama/consts.ts

@@ -5,7 +5,7 @@ import type { ApiTypes } from '@polkadot/api-base/types';
 import type { Bytes, Option, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { Codec } from '@polkadot/types-codec/types';
 import type { Perbill, Percent, Permill } from '@polkadot/types/interfaces/runtime';
-import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
+import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
 
 declare module '@polkadot/api-base/types/consts' {
   export interface AugmentedConsts<ApiType extends ApiTypes> {
@@ -804,10 +804,6 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     transactionPayment: {
-      /**
-       * The polynomial that is applied in order to derive fee from length.
-       **/
-      lengthToFee: Vec<FrameSupportWeightsWeightToFeeCoefficient> & AugmentedConst<ApiType>;
       /**
        * A fee mulitplier for `Operational` extrinsics to compute "virtual tip" to boost their
        * `priority`
@@ -832,10 +828,6 @@ declare module '@polkadot/api-base/types/consts' {
        * transactions.
        **/
       operationalFeeMultiplier: u8 & AugmentedConst<ApiType>;
-      /**
-       * The polynomial that is applied in order to derive fee from weight.
-       **/
-      weightToFee: Vec<FrameSupportWeightsWeightToFeeCoefficient> & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/

packages/api-augment/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/api-augment', path: 'auto', type: 'auto', version: '8.5.1' };
+export const packageInfo = { name: '@polkadot/api-augment', path: 'auto', type: 'auto', version: '8.7.1' };

packages/api-augment/src/polkadot/consts.ts

@@ -5,7 +5,7 @@ import type { ApiTypes } from '@polkadot/api-base/types';
 import type { Bytes, Option, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { Codec } from '@polkadot/types-codec/types';
 import type { Perbill, Percent, Permill } from '@polkadot/types/interfaces/runtime';
-import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
+import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
 
 declare module '@polkadot/api-base/types/consts' {
   export interface AugmentedConsts<ApiType extends ApiTypes> {
@@ -653,10 +653,6 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     transactionPayment: {
-      /**
-       * The polynomial that is applied in order to derive fee from length.
-       **/
-      lengthToFee: Vec<FrameSupportWeightsWeightToFeeCoefficient> & AugmentedConst<ApiType>;
       /**
        * A fee mulitplier for `Operational` extrinsics to compute "virtual tip" to boost their
        * `priority`
@@ -681,10 +677,6 @@ declare module '@polkadot/api-base/types/consts' {
        * transactions.
        **/
       operationalFeeMultiplier: u8 & AugmentedConst<ApiType>;
-      /**
-       * The polynomial that is applied in order to derive fee from weight.
-       **/
-      weightToFee: Vec<FrameSupportWeightsWeightToFeeCoefficient> & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/

packages/api-augment/src/substrate/consts.ts

@@ -5,7 +5,7 @@ import type { ApiTypes } from '@polkadot/api-base/types';
 import type { Option, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { Codec } from '@polkadot/types-codec/types';
 import type { Perbill, Percent, Permill } from '@polkadot/types/interfaces/runtime';
-import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, PalletContractsSchedule, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
+import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, PalletContractsSchedule, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
 
 declare module '@polkadot/api-base/types/consts' {
   export interface AugmentedConsts<ApiType extends ApiTypes> {
@@ -947,10 +947,6 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     transactionPayment: {
-      /**
-       * The polynomial that is applied in order to derive fee from length.
-       **/
-      lengthToFee: Vec<FrameSupportWeightsWeightToFeeCoefficient> & AugmentedConst<ApiType>;
       /**
        * A fee mulitplier for `Operational` extrinsics to compute "virtual tip" to boost their
        * `priority`
@@ -975,10 +971,6 @@ declare module '@polkadot/api-base/types/consts' {
        * transactions.
        **/
       operationalFeeMultiplier: u8 & AugmentedConst<ApiType>;
-      /**
-       * The polynomial that is applied in order to derive fee from weight.
-       **/
-      weightToFee: Vec<FrameSupportWeightsWeightToFeeCoefficient> & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/

packages/api-base/package.json

@@ -20,13 +20,13 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/rpc-core": "8.5.1",
-    "@polkadot/types": "8.5.1",
-    "@polkadot/util": "^9.2.1",
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/rpc-core": "8.7.1",
+    "@polkadot/types": "8.7.1",
+    "@polkadot/util": "^9.4.1",
     "rxjs": "^7.5.5"
   }
 }

packages/api-base/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/api-base', path: 'auto', type: 'auto', version: '8.5.1' };
+export const packageInfo = { name: '@polkadot/api-base', path: 'auto', type: 'auto', version: '8.7.1' };

packages/api-contract/package.json

@@ -20,20 +20,20 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/api": "8.5.1",
-    "@polkadot/types": "8.5.1",
-    "@polkadot/types-codec": "8.5.1",
-    "@polkadot/types-create": "8.5.1",
-    "@polkadot/util": "^9.2.1",
-    "@polkadot/util-crypto": "^9.2.1",
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/api": "8.7.1",
+    "@polkadot/types": "8.7.1",
+    "@polkadot/types-codec": "8.7.1",
+    "@polkadot/types-create": "8.7.1",
+    "@polkadot/util": "^9.4.1",
+    "@polkadot/util-crypto": "^9.4.1",
     "rxjs": "^7.5.5"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "8.5.1",
-    "@polkadot/keyring": "^9.2.1"
+    "@polkadot/api-augment": "8.7.1",
+    "@polkadot/keyring": "^9.4.1"
   }
 }

packages/api-contract/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/api-contract', path: 'auto', type: 'auto', version: '8.5.1' };
+export const packageInfo = { name: '@polkadot/api-contract', path: 'auto', type: 'auto', version: '8.7.1' };

packages/api-derive/package.json

@@ -20,25 +20,25 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/api": "8.5.1",
-    "@polkadot/api-augment": "8.5.1",
-    "@polkadot/api-base": "8.5.1",
-    "@polkadot/rpc-core": "8.5.1",
-    "@polkadot/types": "8.5.1",
-    "@polkadot/types-codec": "8.5.1",
-    "@polkadot/util": "^9.2.1",
-    "@polkadot/util-crypto": "^9.2.1",
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/api": "8.7.1",
+    "@polkadot/api-augment": "8.7.1",
+    "@polkadot/api-base": "8.7.1",
+    "@polkadot/rpc-core": "8.7.1",
+    "@polkadot/types": "8.7.1",
+    "@polkadot/types-codec": "8.7.1",
+    "@polkadot/util": "^9.4.1",
+    "@polkadot/util-crypto": "^9.4.1",
     "rxjs": "^7.5.5"
   },
   "devDependencies": {
-    "@polkadot/api": "8.5.1",
-    "@polkadot/api-augment": "8.5.1",
-    "@polkadot/rpc-augment": "8.5.1",
-    "@polkadot/rpc-provider": "8.5.1",
-    "@polkadot/types-support": "8.5.1"
+    "@polkadot/api": "8.7.1",
+    "@polkadot/api-augment": "8.7.1",
+    "@polkadot/rpc-augment": "8.7.1",
+    "@polkadot/rpc-provider": "8.7.1",
+    "@polkadot/types-support": "8.7.1"
   }
 }

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

@@ -3,15 +3,19 @@
 
 import type { Observable } from 'rxjs';
 import type { AccountId, Address, Balance } from '@polkadot/types/interfaces';
+import type{ PalletElectionsPhragmenSeatHolder } from '@polkadot/types/lookup';
+import type { Codec } from '@polkadot/types/types';
 import type { Option } from '@polkadot/types-codec';
 import type { DeriveAccountFlags, DeriveApi } from '../types';
 
-import { combineLatest, map, of } from 'rxjs';
+import { map, of } from 'rxjs';
+
+import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';
 
 type FlagsIntermediate = [
-  [AccountId, Balance][] | undefined,
+  PalletElectionsPhragmenSeatHolder[] | [AccountId, Balance][] | undefined,
   AccountId[],
   AccountId[],
   AccountId[],
@@ -24,39 +28,53 @@ function parseFlags (address: AccountId | Address | string | null | undefined, [
     id.toString() === addrStr;
 
   return {
-    isCouncil: (electionsMembers?.map(([id]) => id) || councilMembers || []).some(isIncluded),
+    isCouncil: (electionsMembers?.map((r) => Array.isArray(r) ? r[0] : r.who) || councilMembers || []).some(isIncluded),
     isSociety: (societyMembers || []).some(isIncluded),
     isSudo: sudoKey?.toString() === addrStr,
     isTechCommittee: (technicalCommitteeMembers || []).some(isIncluded)
   };
 }
 
+export function _flags (instanceId: string, api: DeriveApi): () => Observable<FlagsIntermediate> {
+  return memo(instanceId, (): Observable<FlagsIntermediate> => {
+    const results: unknown[] = [undefined, [], [], [], undefined];
+    const calls = [
+      (api.query.phragmenElection || api.query.electionsPhragmen || api.query.elections)?.members,
+      api.query.council?.members,
+      api.query.technicalCommittee?.members,
+      api.query.society?.members,
+      api.query.sudo?.key
+    ];
+    const filtered = calls.filter((c) => c);
+
+    if (!filtered.length) {
+      return of(results as FlagsIntermediate);
+    }
+
+    return api.queryMulti(filtered).pipe(
+      map((values: Codec[]): FlagsIntermediate => {
+        let resultIndex = -1;
+
+        for (let i = 0; i < calls.length; i++) {
+          if (isFunction(calls[i])) {
+            results[i] = values[++resultIndex];
+          }
+        }
+
+        return results as FlagsIntermediate;
+      })
+    );
+  });
+}
+
 /**
  * @name info
  * @description Returns account membership flags
  */
 export function flags (instanceId: string, api: DeriveApi): (address?: AccountId | Address | string | null) => Observable<DeriveAccountFlags> {
-  return memo(instanceId, (address?: AccountId | Address | string | null): Observable<DeriveAccountFlags> => {
-    const elections = api.query.phragmenElection || api.query.electionsPhragmen || api.query.elections;
-
-    return combineLatest([
-      address && elections?.members
-        ? elections.members<[AccountId, Balance][]>()
-        : of(undefined),
-      address && api.query.council?.members
-        ? api.query.council.members()
-        : of([]),
-      address && api.query.technicalCommittee?.members
-        ? api.query.technicalCommittee.members()
-        : of([]),
-      address && api.query.society?.members
-        ? api.query.society.members()
-        : of([]),
-      address && api.query.sudo?.key
-        ? api.query.sudo.key()
-        : of(undefined)
-    ]).pipe(
+  return memo(instanceId, (address?: AccountId | Address | string | null): Observable<DeriveAccountFlags> =>
+    api.derive.accounts._flags().pipe(
       map((r) => parseFlags(address, r))
-    );
-  });
+    )
+  );
 }

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

@@ -71,9 +71,10 @@ function getParent (api: DeriveApi, identityOfOpt: Option<PalletIdentityRegistra
   } else if (superOfOpt?.isSome) {
     const superOf = superOfOpt.unwrap();
 
-    // we have a super
     return combineLatest([
-      api.query.identity.identityOf(superOf[0]),
+      api.derive.accounts._identity(superOf[0]).pipe(
+        map(([info]) => info)
+      ),
       of(superOf)
     ]);
   }
@@ -82,13 +83,15 @@ function getParent (api: DeriveApi, identityOfOpt: Option<PalletIdentityRegistra
   return of([undefined, undefined]);
 }
 
-function getBase (api: DeriveApi, accountId?: AccountId | Uint8Array | string): Observable<[Option<PalletIdentityRegistration> | undefined, Option<ITuple<[AccountId, Data]>> | undefined]> {
-  return accountId && api.query.identity?.identityOf
-    ? api.queryMulti<[Option<PalletIdentityRegistration>, Option<ITuple<[AccountId, Data]>>]>([
-      [api.query.identity.identityOf, accountId],
-      [api.query.identity.superOf, accountId]
-    ])
-    : of([undefined, undefined]);
+export function _identity (instanceId: string, api: DeriveApi): (accountId?: AccountId | Uint8Array | string) => Observable<[Option<PalletIdentityRegistration> | undefined, Option<ITuple<[AccountId, Data]>> | undefined]> {
+  return memo(instanceId, (accountId?: AccountId | Uint8Array | string): Observable<[Option<PalletIdentityRegistration> | undefined, Option<ITuple<[AccountId, Data]>> | undefined]> =>
+    accountId && api.query.identity?.identityOf
+      ? combineLatest([
+        api.query.identity.identityOf(accountId),
+        api.query.identity.superOf(accountId)
+      ])
+      : of([undefined, undefined])
+  );
 }
 
 /**
@@ -97,9 +100,13 @@ function getBase (api: DeriveApi, accountId?: AccountId | Uint8Array | string):
  */
 export function identity (instanceId: string, api: DeriveApi): (accountId?: AccountId | Uint8Array | string) => Observable<DeriveAccountRegistration> {
   return memo(instanceId, (accountId?: AccountId | Uint8Array | string): Observable<DeriveAccountRegistration> =>
-    getBase(api, accountId).pipe(
-      switchMap(([identityOfOpt, superOfOpt]) => getParent(api, identityOfOpt, superOfOpt)),
-      map(([identityOfOpt, superOf]) => extractIdentity(identityOfOpt, superOf))
+    api.derive.accounts._identity(accountId).pipe(
+      switchMap(([identityOfOpt, superOfOpt]) =>
+        getParent(api, identityOfOpt, superOfOpt)
+      ),
+      map(([identityOfOpt, superOf]) =>
+        extractIdentity(identityOfOpt, superOf)
+      )
     )
   );
 }

packages/api-derive/src/bagsList/listNodes.ts

@@ -9,6 +9,8 @@ import type { DeriveApi } from '../types';
 
 import { BehaviorSubject, map, of, switchMap, tap, toArray } from 'rxjs';
 
+import { nextTick } from '@polkadot/util';
+
 import { memo } from '../util';
 
 function traverseLinks (api: DeriveApi, head: AccountId32 | string): Observable<PalletBagsListListNode[]> {
@@ -19,11 +21,11 @@ function traverseLinks (api: DeriveApi, head: AccountId32 | string): Observable<
       api.query.bagsList.listNodes(account)
     ),
     tap((node: Option<PalletBagsListListNode>): void => {
-      setTimeout((): void => {
-        node.isSome && (node.value as PalletBagsListListNode).next.isSome
+      nextTick((): void => {
+        node.isSome && node.value.next.isSome
           ? subject.next(node.unwrap().next.unwrap())
           : subject.complete();
-      }, 0);
+      });
     }),
     toArray(), // toArray since we want to startSubject to be completed
     map((all: Option<PalletBagsListListNode>[]) =>

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

@@ -50,10 +50,10 @@ function calcBalances (api: DeriveApi, [accountId, [accountNonce, [primary, ...a
 
 // old
 function queryBalancesFree (api: DeriveApi, accountId: AccountId): Observable<Result> {
-  return api.queryMulti<[Balance, Balance, Index]>([
-    [api.query.balances.freeBalance, accountId],
-    [api.query.balances.reservedBalance, accountId],
-    [api.query.system.accountNonce, accountId]
+  return combineLatest([
+    api.query.balances.freeBalance<Balance>(accountId),
+    api.query.balances.reservedBalance<Balance>(accountId),
+    api.query.system.accountNonce<Index>(accountId)
   ]).pipe(
     map(([freeBalance, reservedBalance, accountNonce]): Result => [
       accountNonce,
@@ -82,8 +82,7 @@ function queryNonceOnly (api: DeriveApi, accountId: AccountId): Observable<Resul
 function queryBalancesAccount (api: DeriveApi, accountId: AccountId, modules: string[] = ['balances']): Observable<Result> {
   const balances = modules
     .map((m): QueryableStorageEntry<'rxjs'> => (api.derive as DeriveCustomAccount)[m]?.customAccount || api.query[m]?.account)
-    .filter((q) => isFunction(q))
-    .map((q): [QueryableStorageEntry<'rxjs'>, AccountId] => [q, accountId]);
+    .filter((q) => isFunction(q));
 
   const extract = (nonce: Index, data: AccountData[]): Result => [
     nonce,
@@ -93,11 +92,17 @@ function queryBalancesAccount (api: DeriveApi, accountId: AccountId, modules: st
   // NOTE this is for the first case where we do have instances specified
   return balances.length
     ? isFunction(api.query.system.account)
-      ? api.queryMulti<[AccountInfo, ...(AccountData[])]>([[api.query.system.account, accountId], ...balances]).pipe(
-        map(([{ nonce }, ...balances]) => extract(nonce, balances))
+      ? combineLatest([
+        api.query.system.account(accountId),
+        ...balances.map((c) => c(accountId))
+      ]).pipe(
+        map(([{ nonce }, ...balances]) => extract(nonce, balances as unknown as AccountData[]))
       )
-      : api.queryMulti<[Index, ...(AccountData[])]>([[api.query.system.accountNonce, accountId], ...balances]).pipe(
-        map(([nonce, ...balances]) => extract(nonce, balances))
+      : combineLatest([
+        api.query.system.accountNonce<Index>(accountId),
+        ...balances.map((c) => c(accountId))
+      ]).pipe(
+        map(([nonce, ...balances]) => extract(nonce, balances as unknown as AccountData[]))
       )
     : queryNonceOnly(api, accountId);
 }

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

@@ -2,9 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import type { QueryableStorageMultiArg } from '@polkadot/api-base/types';
 import type { Option, Vec } from '@polkadot/types';
-import type { AccountId, AccountIndex, Address, Balance, BalanceLockTo212, BlockNumber, VestingSchedule } from '@polkadot/types/interfaces';
+import type { AccountId, Balance, BalanceLockTo212, BlockNumber, VestingSchedule } from '@polkadot/types/interfaces';
 import type { PalletBalancesBalanceLock, PalletBalancesReserveData, PalletVestingVestingInfo } from '@polkadot/types/lookup';
 import type { DeriveApi, DeriveBalancesAccount, DeriveBalancesAccountData, DeriveBalancesAll, DeriveBalancesAllAccountData, DeriveBalancesAllVesting } from '../types';
 
@@ -15,7 +14,7 @@ import { BN, BN_ZERO, bnMax, bnMin, isFunction } from '@polkadot/util';
 import { memo } from '../util';
 
 type ResultBalance = [PalletVestingVestingInfo[] | null, ((PalletBalancesBalanceLock | BalanceLockTo212)[])[], PalletBalancesReserveData[][]];
-type Result = [DeriveBalancesAccount, BlockNumber, ResultBalance];
+type Result = [DeriveBalancesAccount, ResultBalance, BlockNumber];
 
 interface AllLocked {
   allLocked: boolean,
@@ -100,7 +99,7 @@ function calcVesting (bestNumber: BlockNumber, shared: DeriveBalancesAllAccountD
   };
 }
 
-function calcBalances (api: DeriveApi, [data, bestNumber, [vesting, allLocks, namedReserves]]: Result): DeriveBalancesAll {
+function calcBalances (api: DeriveApi, [data, [vesting, allLocks, namedReserves], bestNumber]: Result): DeriveBalancesAll {
   const shared = calcShared(api, bestNumber, data, allLocks[0]);
 
   return {
@@ -116,10 +115,10 @@ function calcBalances (api: DeriveApi, [data, bestNumber, [vesting, allLocks, na
 }
 
 // old
-function queryOld (api: DeriveApi, accountId: AccountId): Observable<ResultBalance> {
-  return api.queryMulti<[Vec<PalletBalancesBalanceLock>, Option<VestingSchedule>]>([
-    [api.query.balances.locks, accountId],
-    [api.query.balances.vesting, accountId]
+function queryOld (api: DeriveApi, accountId: AccountId | string): Observable<ResultBalance> {
+  return combineLatest([
+    api.query.balances.locks(accountId),
+    api.query.balances.vesting<Option<VestingSchedule>>(accountId)
   ]).pipe(
     map(([locks, optVesting]): ResultBalance => {
       let vestingNew = null;
@@ -143,26 +142,22 @@ function queryOld (api: DeriveApi, accountId: AccountId): Observable<ResultBalan
 
 const isNonNullable = <T>(nullable: T): nullable is NonNullable<T> => !!nullable;
 
-function createCalls (accountId: AccountId, calls: unknown[]): [boolean[], QueryableStorageMultiArg<'rxjs'>[]] {
+function createCalls <T> (calls: (((a: unknown) => Observable<T>) | null | undefined)[]): [boolean[], ((a: unknown) => Observable<T>)[]] {
   return [
     calls.map((c) => !c),
-    calls
-      .filter(isNonNullable)
-      .map((c) => [c, accountId] as unknown as QueryableStorageMultiArg<'rxjs'>)
+    calls.filter(isNonNullable)
   ];
 }
 
 // current (balances, vesting)
-function queryCurrent (api: DeriveApi, accountId: AccountId, balanceInstances: string[] = ['balances']): Observable<ResultBalance> {
-  const [lockEmpty, lockQueries] = createCalls(
-    accountId,
-    balanceInstances.map((m): DeriveApi['query']['balances']['locks'] | undefined =>
+function queryCurrent (api: DeriveApi, accountId: AccountId | string, balanceInstances: string[] = ['balances']): Observable<ResultBalance> {
+  const [lockEmpty, lockQueries] = createCalls<Vec<PalletBalancesBalanceLock>>(
+    balanceInstances.map((m) =>
       (api.derive as DeriveCustomLocks)[m]?.customLocks || api.query[m as 'balances']?.locks
     )
   );
-  const [reserveEmpty, reserveQueries] = createCalls(
-    accountId,
-    balanceInstances.map((m): DeriveApi['query']['balances']['reserves'] | undefined =>
+  const [reserveEmpty, reserveQueries] = createCalls<Vec<PalletBalancesReserveData>>(
+    balanceInstances.map((m) =>
       api.query[m as 'balances']?.reserves
     )
   );
@@ -172,10 +167,10 @@ function queryCurrent (api: DeriveApi, accountId: AccountId, balanceInstances: s
       ? api.query.vesting.vesting(accountId)
       : of(api.registry.createType('Option<VestingInfo>')),
     lockQueries.length
-      ? api.queryMulti<[...(Vec<PalletBalancesBalanceLock>)[]]>(lockQueries)
+      ? combineLatest(lockQueries.map((c) => c(accountId)))
       : of([] as Vec<PalletBalancesBalanceLock>[]),
     reserveQueries.length
-      ? api.queryMulti<[...(Vec<PalletBalancesReserveData>)[]]>(reserveQueries)
+      ? combineLatest(reserveQueries.map((c) => c(accountId)))
       : of([] as Vec<PalletBalancesReserveData>[])
   ]).pipe(
     map(([opt, locks, reserves]): ResultBalance => {
@@ -215,23 +210,23 @@ function queryCurrent (api: DeriveApi, accountId: AccountId, balanceInstances: s
  * });
  * ```
  */
-export function all (instanceId: string, api: DeriveApi): (address: AccountIndex | AccountId | Address | string) => Observable<DeriveBalancesAll> {
+export function all (instanceId: string, api: DeriveApi): (address: AccountId | string) => Observable<DeriveBalancesAll> {
   const balanceInstances = api.registry.getModuleInstances(api.runtimeVersion.specName.toString(), 'balances');
 
-  return memo(instanceId, (address: AccountIndex | AccountId | Address | string): Observable<DeriveBalancesAll> =>
-    api.derive.balances.account(address).pipe(
-      switchMap((account): Observable<Result> =>
-        (!account.accountId.isEmpty
-          ? combineLatest([
-            of(account),
-            api.derive.chain.bestNumber(),
-            isFunction(api.query.system?.account) || isFunction(api.query.balances?.account)
-              ? queryCurrent(api, account.accountId, balanceInstances)
-              : queryOld(api, account.accountId)
-          ])
-          : of([account, api.registry.createType('BlockNumber'), [null, [], []]])
-        )
+  return memo(instanceId, (address: AccountId | string): Observable<DeriveBalancesAll> =>
+    combineLatest([
+      api.derive.balances.account(address),
+      isFunction(api.query.system?.account) || isFunction(api.query.balances?.account)
+        ? queryCurrent(api, address, balanceInstances)
+        : queryOld(api, address)
+    ]).pipe(
+      switchMap(([account, locks]) =>
+        combineLatest([
+          of(account),
+          of(locks),
+          api.derive.chain.bestNumber()
+        ])
       ),
-      map((result): DeriveBalancesAll => calcBalances(api, result))
+      map((result) => calcBalances(api, result))
     ));
 }

packages/api-derive/src/bounties/bounties.spec.ts

@@ -156,6 +156,6 @@ describe('bounties derive', () => {
     expect(result).toHaveLength(2);
     expect(result[0].proposals).toHaveLength(0);
     expect(result[1].proposals).toHaveLength(1);
-    expect(result[1].proposals[0].proposal.method).toEqual('approveBounty');
+    expect(result[1].proposals[0].proposal && result[1].proposals[0].proposal.method).toEqual('approveBounty');
   });
 });

packages/api-derive/src/bounties/bounties.ts

@@ -23,7 +23,9 @@ function parseResult ([maybeBounties, maybeDescriptions, ids, bountyProposals]:
         bounty: bounty.unwrap(),
         description: maybeDescriptions[index].unwrapOrDefault().toUtf8(),
         index: ids[index],
-        proposals: bountyProposals.filter((bountyProposal) => ids[index].eq(bountyProposal.proposal.args[0]))
+        proposals: bountyProposals.filter((bountyProposal) =>
+          bountyProposal.proposal && ids[index].eq(bountyProposal.proposal.args[0])
+        )
       });
     }
   });

packages/api-derive/src/bounties/helpers/filterBountyProposals.ts

@@ -7,5 +7,7 @@ export function filterBountiesProposals (api: DeriveApi, allProposals: DeriveCol
   const bountyTxBase = api.tx.bounties ? api.tx.bounties : api.tx.treasury;
   const bountyProposalCalls = [bountyTxBase.approveBounty, bountyTxBase.closeBounty, bountyTxBase.proposeCurator, bountyTxBase.unassignCurator];
 
-  return allProposals.filter((proposal) => bountyProposalCalls.find((bountyCall) => bountyCall.is(proposal.proposal)));
+  return allProposals.filter((proposal) => bountyProposalCalls.find((bountyCall) =>
+    proposal.proposal && bountyCall.is(proposal.proposal))
+  );
 }

packages/api-derive/src/bundle.ts

@@ -6,8 +6,8 @@ import type { AnyFunction } from '@polkadot/types/types';
 import type { ExactDerive } from './derive';
 import type { DeriveApi } from './types';
 
-import { lazyDeriveSection } from './util/lazy';
 import { derive } from './derive';
+import { lazyDeriveSection } from './util';
 
 export * from './derive';
 export * from './type';

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

@@ -21,17 +21,13 @@ export type { Hash, Proposal, Votes } from '@polkadot/types/interfaces';
 type Result = [(Hash | Uint8Array | string)[], (Option<Proposal> | null)[], Option<Votes>[]];
 
 function parse (api: DeriveApi, [hashes, proposals, votes]: Result): DeriveCollectiveProposal[] {
-  return proposals
-    .map((o, index): DeriveCollectiveProposal | null =>
-      o && o.isSome
-        ? {
-          hash: api.registry.createType('Hash', hashes[index]),
-          proposal: o.unwrap(),
-          votes: votes[index].unwrapOr(null)
-        }
-        : null
-    )
-    .filter((proposal): proposal is DeriveCollectiveProposal => !!proposal);
+  return proposals.map((o, index): DeriveCollectiveProposal => ({
+    hash: api.registry.createType('Hash', hashes[index]),
+    proposal: o && o.isSome
+      ? o.unwrap()
+      : null,
+    votes: votes[index].unwrapOr(null)
+  }));
 }
 
 function _proposalsFrom (api: DeriveApi, query: DeriveApi['query']['council'], hashes: (Hash | Uint8Array | string)[]): Observable<DeriveCollectiveProposal[]> {
@@ -41,11 +37,9 @@ function _proposalsFrom (api: DeriveApi, query: DeriveApi['query']['council'], h
       // this should simply be api.query[section].proposalOf.multi<Option<Proposal>>(hashes),
       // however we have had cases on Edgeware where the indices have moved around after an
       // upgrade, which results in invalid on-chain data
-      combineLatest(hashes.map((h) =>
-        query.proposalOf<Option<Proposal>>(h).pipe(
-          catchError(() => of(null))
-        )
-      )),
+      query.proposalOf.multi<Option<Proposal>>(hashes).pipe(
+        catchError(() => of(hashes.map(() => null)))
+      ),
       query.voting.multi<Option<Votes>>(hashes)
     ])
     : of<Result>([[], [], []])

packages/api-derive/src/crowdloan/contributions.ts

@@ -8,7 +8,7 @@ import type { DeriveApi, DeriveContributions } from '../types';
 
 import { BehaviorSubject, combineLatest, EMPTY, map, of, startWith, switchMap, tap, toArray } from 'rxjs';
 
-import { arrayFlatten, isFunction } from '@polkadot/util';
+import { arrayFlatten, isFunction, nextTick } from '@polkadot/util';
 
 import { memo } from '../util';
 import { extractContributed } from './util';
@@ -67,11 +67,11 @@ function _getKeysPaged (api: DeriveApi, childKey: string): Observable<StorageKey
       api.rpc.childstate.getKeysPaged(childKey, '0x', PAGE_SIZE_K, startKey)
     ),
     tap((keys): void => {
-      setTimeout((): void => {
+      nextTick((): void => {
         keys.length === PAGE_SIZE_K
           ? subject.next(keys[PAGE_SIZE_K - 1].toHex())
           : subject.complete();
-      }, 0);
+      });
     }),
     toArray(), // toArray since we want to startSubject to be completed
     map((keyArr: StorageKey[][]) => arrayFlatten(keyArr))

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

@@ -47,7 +47,7 @@ function queryQueue (api: DeriveApi): Observable<DeriveDispatch[]> {
   );
 }
 
-function schedulerEntries (api: DeriveApi): Observable<[BlockNumber[], (Option<PalletSchedulerScheduledV3 | Scheduled>[] | null)[]]> {
+function schedulerEntries (api: DeriveApi): Observable<[BlockNumber[], Option<PalletSchedulerScheduledV3 | Scheduled>[][]]> {
   // We don't get entries, but rather we get the keys (triggered via finished referendums) and
   // the subscribe to those keys - this means we pickup when the schedulers actually executes
   // at a block, the entry for that block will become empty
@@ -64,12 +64,11 @@ function schedulerEntries (api: DeriveApi): Observable<[BlockNumber[], (Option<P
           // this should simply be api.query.scheduler.agenda.multi,
           // however we have had cases on Darwinia where the indices have moved around after an
           // upgrade, which results in invalid on-chain data
-          combineLatest(blockNumbers.map((blockNumber) =>
-            // this does create an issue since it discards all at that block
-            api.query.scheduler.agenda(blockNumber).pipe(catchError(() => of(null)))
-          ))
+          api.query.scheduler.agenda.multi(blockNumbers).pipe(
+            catchError(() => of(blockNumbers.map(() => [])))
+          )
         ])
-        : of<[BlockNumber[], null[]]>([[], []]);
+        : of<[BlockNumber[], Option<PalletSchedulerScheduledV3 | Scheduled>[][]]>([[], []]);
     })
   );
 }

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

@@ -3,7 +3,7 @@
 
 import type { Observable } from 'rxjs';
 import type { u32, Vec } from '@polkadot/types';
-import type { AccountId, Balance, BlockNumber } from '@polkadot/types/interfaces';
+import type { AccountId32, Balance, BlockNumber } from '@polkadot/types/interfaces';
 import type { PalletElectionsPhragmenSeatHolder } from '@polkadot/types/lookup';
 import type { ITuple } from '@polkadot/types/types';
 import type { DeriveApi } from '../types';
@@ -14,31 +14,31 @@ import { combineLatest, map, of } from 'rxjs';
 import { memo } from '../util';
 
 // SeatHolder is current tuple is 2.x-era Substrate
-type Member = PalletElectionsPhragmenSeatHolder | ITuple<[AccountId, Balance]>;
+type Member = PalletElectionsPhragmenSeatHolder | ITuple<[AccountId32, Balance]>;
 
-type Candidate = AccountId | ITuple<[AccountId, Balance]>;
+type Candidate = AccountId32 | ITuple<[AccountId32, Balance]>;
 
 function isSeatHolder (value: Member): value is PalletElectionsPhragmenSeatHolder {
   return !Array.isArray(value);
 }
 
-function isCandidateTuple (value: Candidate): value is ITuple<[AccountId, Balance]> {
+function isCandidateTuple (value: Candidate): value is ITuple<[AccountId32, Balance]> {
   return Array.isArray(value);
 }
 
-function getAccountTuple (value: Member): [AccountId, Balance] {
+function getAccountTuple (value: Member): [AccountId32, Balance] {
   return isSeatHolder(value)
     ? [value.who, value.stake]
     : value;
 }
 
-function getCandidate (value: Candidate): AccountId {
+function getCandidate (value: Candidate): AccountId32 {
   return isCandidateTuple(value)
     ? value[0]
     : value;
 }
 
-function sortAccounts ([, balanceA]: [AccountId, Balance], [, balanceB]: [AccountId, Balance]): number {
+function sortAccounts ([, balanceA]: [AccountId32, Balance], [, balanceB]: [AccountId32, Balance]): number {
   return balanceB.cmp(balanceA);
 }
 
@@ -67,6 +67,24 @@ function getModules (api: DeriveApi): [string, string | null] {
   return [council, elections];
 }
 
+function queryAll (api: DeriveApi, council: string, elections: string): Observable<[AccountId32[], Candidate[], Member[], Member[]]> {
+  return api.queryMulti<[Vec<AccountId32>, Vec<Candidate>, Vec<Member>, Vec<Member>]>([
+    api.query[council as 'council'].members,
+    api.query[elections as 'phragmenElection'].candidates,
+    api.query[elections as 'phragmenElection'].members,
+    api.query[elections as 'phragmenElection'].runnersUp
+  ]);
+}
+
+function queryCouncil (api: DeriveApi, council: string): Observable<[AccountId32[], Candidate[], Member[], Member[]]> {
+  return combineLatest([
+    api.query[council as 'council'].members(),
+    of<Candidate[]>([]),
+    of<Member[]>([]),
+    of<Member[]>([])
+  ]);
+}
+
 /**
  * @name info
  * @returns An object containing the combined results of the storage queries for
@@ -86,18 +104,8 @@ export function info (instanceId: string, api: DeriveApi): () => Observable<Deri
 
     return (
       elections
-        ? api.queryMulti<[Vec<AccountId>, Vec<Candidate>, Vec<Member>, Vec<Member>]>([
-          api.query[council].members,
-          api.query[elections].candidates,
-          api.query[elections].members,
-          api.query[elections].runnersUp
-        ])
-        : combineLatest([
-          api.query[council].members<Vec<AccountId>>(),
-          of<Candidate[]>([]),
-          of<Member[]>([]),
-          of<Member[]>([])
-        ])
+        ? queryAll(api, council, elections)
+        : queryCouncil(api, council)
     ).pipe(
       map(([councilMembers, candidates, members, runnersUp]): DeriveElectionsInfo => ({
         ...getConstants(api, elections),
@@ -105,7 +113,7 @@ export function info (instanceId: string, api: DeriveApi): () => Observable<Deri
         candidates: candidates.map(getCandidate),
         members: members.length
           ? members.map(getAccountTuple).sort(sortAccounts)
-          : councilMembers.map((a): [AccountId, Balance] => [a, api.registry.createType('Balance')]),
+          : councilMembers.map((a): [AccountId32, Balance] => [a, api.registry.createType('Balance')]),
         runnersUp: runnersUp.map(getAccountTuple).sort(sortAccounts)
       }))
     );

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

@@ -15,7 +15,7 @@ import { ExactDerive } from '.';
 
 const testFunction = (api: ApiRx): any => {
   return <S extends keyof ExactDerive, M extends keyof (typeof api.derive[S])>(section: S, method: M, inputs: any[]): void => {
-    describe(`derive.${section}.${method}`, (): void => {
+    describe(`derive.${section}.${method as string}`, (): void => {
       it('should be a function', (): void => {
         expect(typeof api.derive[section][method]).toBe('function');
       });

packages/api-derive/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/api-derive', path: 'auto', type: 'auto', version: '8.5.1' };
+export const packageInfo = { name: '@polkadot/api-derive', path: 'auto', type: 'auto', version: '8.7.1' };

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

@@ -39,12 +39,14 @@ export function keysMulti (instanceId: string, api: DeriveApi): (stashIds: (Uint
           combineLatest([
             of(queuedKeys),
             api.consts.session?.dedupKeyPrefix
-              ? api.query.session.nextKeys.multi(stashIds.map((stashId) => [api.consts.session.dedupKeyPrefix, stashId]))
-              : api.query.session.nextKeys.multi(stashIds)
+              ? api.query.session.nextKeys.multi(stashIds.map((s) => [api.consts.session.dedupKeyPrefix, s]))
+              : combineLatest(stashIds.map((s) => api.query.session.nextKeys(s)))
           ])
         ),
         map(([queuedKeys, nextKeys]) =>
-          stashIds.map((stashId, index) => extractsIds(stashId, queuedKeys, nextKeys[index]))
+          stashIds.map((stashId, index) =>
+            extractsIds(stashId, queuedKeys, nextKeys[index])
+          )
         )
       )
       : of([])

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

@@ -2,12 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import type { QueryableStorageMultiArg } from '@polkadot/api-base/types';
 import type { EraIndex } from '@polkadot/types/interfaces';
-import type { PalletStakingExposure } from '@polkadot/types/lookup';
 import type { DeriveApi, DeriveOwnExposure } from '../types';
 
-import { map, of } from 'rxjs';
+import { combineLatest, map, of } from 'rxjs';
 
 import { firstMemo, memo } from '../util';
 import { erasHistoricApplyAccount } from './util';
@@ -16,12 +14,12 @@ export function _ownExposures (instanceId: string, api: DeriveApi): (accountId:
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   return memo(instanceId, (accountId: Uint8Array | string, eras: EraIndex[], _withActive: boolean): Observable<DeriveOwnExposure[]> =>
     eras.length
-      ? api.queryMulti<PalletStakingExposure[]>([
-        ...eras.map((e): QueryableStorageMultiArg<'rxjs'> => [api.query.staking.erasStakersClipped, [e, accountId]]),
-        ...eras.map((e): QueryableStorageMultiArg<'rxjs'> => [api.query.staking.erasStakers, [e, accountId]])
+      ? combineLatest([
+        combineLatest(eras.map((e) => api.query.staking.erasStakersClipped(e, accountId))),
+        combineLatest(eras.map((e) => api.query.staking.erasStakers(e, accountId)))
       ]).pipe(
-        map((all): DeriveOwnExposure[] =>
-          eras.map((era, index) => ({ clipped: all[index], era, exposure: all[eras.length + index] }))
+        map(([clp, exp]): DeriveOwnExposure[] =>
+          eras.map((era, index) => ({ clipped: clp[index], era, exposure: exp[index] }))
         )
       )
       : of([])

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

@@ -2,13 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import type { QueryableStorageMultiArg } from '@polkadot/api-base/types';
-import type { Option } from '@polkadot/types';
 import type { BalanceOf, EraIndex, Perbill } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
 import type { DeriveApi, DeriveStakerSlashes } from '../types';
 
-import { map, of } from 'rxjs';
+import { combineLatest, map, of } from 'rxjs';
 
 import { firstMemo, memo } from '../util';
 import { erasHistoricApplyAccount } from './util';
@@ -17,16 +15,16 @@ export function _ownSlashes (instanceId: string, api: DeriveApi): (accountId: Ui
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   return memo(instanceId, (accountId: Uint8Array | string, eras: EraIndex[], _withActive: boolean): Observable<DeriveStakerSlashes[]> =>
     eras.length
-      ? api.queryMulti<(Option<ITuple<[Perbill, BalanceOf]>> | Option<BalanceOf>)[]>([
-        ...eras.map((e): QueryableStorageMultiArg<'rxjs'> => [api.query.staking.validatorSlashInEra, [e, accountId]]),
-        ...eras.map((e): QueryableStorageMultiArg<'rxjs'> => [api.query.staking.nominatorSlashInEra, [e, accountId]])
+      ? combineLatest([
+        combineLatest(eras.map((e) => api.query.staking.validatorSlashInEra(e, accountId))),
+        combineLatest(eras.map((e) => api.query.staking.nominatorSlashInEra(e, accountId)))
       ]).pipe(
-        map((values): DeriveStakerSlashes[] =>
+        map(([vals, noms]): DeriveStakerSlashes[] =>
           eras.map((era, index) => ({
             era,
-            total: values[index].isSome
-              ? (values[index].unwrap() as ITuple<[Perbill, BalanceOf]>)[1]
-              : (values[index + eras.length].unwrapOrDefault() as BalanceOf)
+            total: vals[index].isSome
+              ? (vals[index].unwrap() as ITuple<[Perbill, BalanceOf]>)[1]
+              : (noms[index].unwrapOrDefault() as BalanceOf)
           }))
         )
       )

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

@@ -34,7 +34,7 @@ function getLedgers (api: DeriveApi, optIds: (Option<AccountId> | null)[], { wit
 
   return (
     ids.length
-      ? api.query.staking.ledger.multi(ids)
+      ? combineLatest(ids.map((s) => api.query.staking.ledger(s)))
       : of([])
   ).pipe(
     map((optLedgers): Option<PalletStakingStakingLedger>[] => {
@@ -57,19 +57,19 @@ function getStashInfo (api: DeriveApi, stashIds: AccountId[], activeEra: EraInde
 
   return combineLatest([
     withController || withLedger
-      ? api.query.staking.bonded.multi(stashIds)
+      ? combineLatest(stashIds.map((s) => api.query.staking.bonded(s)))
       : of(stashIds.map(() => null)),
     withNominations
-      ? api.query.staking.nominators.multi(stashIds)
+      ? combineLatest(stashIds.map((s) => api.query.staking.nominators(s)))
       : of(stashIds.map(() => emptyNoms)),
     withDestination
-      ? api.query.staking.payee.multi(stashIds)
+      ? combineLatest(stashIds.map((s) => api.query.staking.payee(s)))
       : of(stashIds.map(() => emptyRewa)),
     withPrefs
-      ? api.query.staking.validators.multi(stashIds)
+      ? combineLatest(stashIds.map((s) => api.query.staking.validators(s)))
       : of(stashIds.map(() => emptyPrefs)),
     withExposure
-      ? api.query.staking.erasStakers.multi(stashIds.map((stashId) => [activeEra, stashId]))
+      ? combineLatest(stashIds.map((s) => api.query.staking.erasStakers(activeEra, s)))
       : of(stashIds.map(() => emptyExpo))
   ]);
 }

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

@@ -9,7 +9,7 @@ import type { DeriveApi } from '../types';
 
 import { BehaviorSubject, combineLatest, map, of, switchMap, tap, toArray } from 'rxjs';
 
-import { arrayChunk, arrayFlatten } from '@polkadot/util';
+import { arrayChunk, arrayFlatten, nextTick } from '@polkadot/util';
 
 import { memo } from '../util';
 
@@ -28,13 +28,13 @@ function chunkEras <T> (eras: EraIndex[], fn: (eras: EraIndex[]) => Observable<T
   return subject.pipe(
     switchMap(fn),
     tap((): void => {
-      setTimeout((): void => {
+      nextTick((): void => {
         index++;
 
         index === chunked.length
           ? subject.complete()
           : subject.next(chunked[index]);
-      }, 0);
+      });
     }),
     toArray(),
     map(arrayFlatten)

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

@@ -23,15 +23,23 @@ function parseResult (api: DeriveApi, { allIds, allProposals, approvalIds, counc
   const approvals: DeriveTreasuryProposal[] = [];
   const proposals: DeriveTreasuryProposal[] = [];
   const councilTreasury = councilProposals.filter(({ proposal }) =>
-    api.tx.treasury.approveProposal.is(proposal) ||
-    api.tx.treasury.rejectProposal.is(proposal)
+    proposal && (
+      api.tx.treasury.approveProposal.is(proposal) ||
+      api.tx.treasury.rejectProposal.is(proposal)
+    )
   );
 
   allIds.forEach((id, index): void => {
     if (allProposals[index].isSome) {
       const council = councilTreasury
-        .filter(({ proposal }) => id.eq(proposal.args[0]))
-        .sort((a, b) => a.proposal.method.localeCompare(b.proposal.method));
+        .filter(({ proposal }) => proposal && id.eq(proposal.args[0]))
+        .sort((a, b) =>
+          a.proposal && b.proposal
+            ? a.proposal.method.localeCompare(b.proposal.method)
+            : a.proposal
+              ? -1
+              : 1
+        );
       const isApproval = approvalIds.some((approvalId) => approvalId.eq(id));
       const derived = { council, id, proposal: allProposals[index].unwrap() };
 

packages/api-derive/src/types.ts

@@ -40,7 +40,7 @@ export interface DeriveContractFees {
 
 export interface DeriveCollectiveProposal {
   hash: Hash;
-  proposal: Proposal;
+  proposal: Proposal | null;
   votes: Votes | null;
 }
 

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

@@ -7,3 +7,4 @@ export * from './approvalFlagsToBools';
 export * from './cache';
 export * from './cacheImpl';
 export * from './first';
+export * from './lazy';

packages/api/package.json

@@ -20,29 +20,29 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/api-augment": "8.5.1",
-    "@polkadot/api-base": "8.5.1",
-    "@polkadot/api-derive": "8.5.1",
-    "@polkadot/keyring": "^9.2.1",
-    "@polkadot/rpc-augment": "8.5.1",
-    "@polkadot/rpc-core": "8.5.1",
-    "@polkadot/rpc-provider": "8.5.1",
-    "@polkadot/types": "8.5.1",
-    "@polkadot/types-augment": "8.5.1",
-    "@polkadot/types-codec": "8.5.1",
-    "@polkadot/types-create": "8.5.1",
-    "@polkadot/types-known": "8.5.1",
-    "@polkadot/util": "^9.2.1",
-    "@polkadot/util-crypto": "^9.2.1",
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/api-augment": "8.7.1",
+    "@polkadot/api-base": "8.7.1",
+    "@polkadot/api-derive": "8.7.1",
+    "@polkadot/keyring": "^9.4.1",
+    "@polkadot/rpc-augment": "8.7.1",
+    "@polkadot/rpc-core": "8.7.1",
+    "@polkadot/rpc-provider": "8.7.1",
+    "@polkadot/types": "8.7.1",
+    "@polkadot/types-augment": "8.7.1",
+    "@polkadot/types-codec": "8.7.1",
+    "@polkadot/types-create": "8.7.1",
+    "@polkadot/types-known": "8.7.1",
+    "@polkadot/util": "^9.4.1",
+    "@polkadot/util-crypto": "^9.4.1",
     "eventemitter3": "^4.0.7",
     "rxjs": "^7.5.5"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "8.5.1",
-    "@polkadot/types-support": "8.5.1"
+    "@polkadot/api-augment": "8.7.1",
+    "@polkadot/types-support": "8.7.1"
   }
 }

packages/api/src/base/Decorate.ts

@@ -19,7 +19,7 @@ import { getAvailableDerives } from '@polkadot/api-derive';
 import { memo, RpcCore } from '@polkadot/rpc-core';
 import { WsProvider } from '@polkadot/rpc-provider';
 import { expandMetadata, Metadata, TypeRegistry, unwrapStorageType } from '@polkadot/types';
-import { arrayChunk, arrayFlatten, assert, assertReturn, BN, BN_ZERO, compactStripLength, lazyMethod, lazyMethods, logger, objectSpread, u8aToHex } from '@polkadot/util';
+import { arrayChunk, arrayFlatten, assert, assertReturn, BN, BN_ZERO, compactStripLength, lazyMethod, lazyMethods, logger, nextTick, objectSpread, u8aToHex } from '@polkadot/util';
 
 import { createSubmittable } from '../submittable';
 import { augmentObject } from '../util/augmentObject';
@@ -43,7 +43,8 @@ interface FullDecoration<ApiType extends ApiTypes> {
 
 // the max amount of keys/values that we will retrieve at once
 const PAGE_SIZE_K = 1000; // limit aligned with the 1k on the node (trie lookups are heavy)
-const PAGE_SIZE_V = 250; // limited since the data may be very large (e.g. misfiring elections)
+const PAGE_SIZE_V = 250; // limited since the data may be > 16MB (e.g. misfiring elections)
+const PAGE_SIZE_Q = 50; // queue of pending storage queries (mapped together, next tick)
 
 const l = logger('api/init');
 
@@ -58,6 +59,10 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
 
   #registry: Registry;
 
+  #storageGetQ: [[StorageEntry, ...unknown[]][], Observable<Codec[]>][] = [];
+
+  #storageSubQ: [[StorageEntry, ...unknown[]][], Observable<Codec[]>][] = [];
+
   // HACK Use BN import so decorateDerive works... yes, wtf.
   protected __phantom = new BN(0);
 
@@ -401,18 +406,35 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
   // only be called if supportMulti is true
   protected _decorateMulti<ApiType extends ApiTypes> (decorateMethod: DecorateMethod<ApiType>): QueryableStorageMulti<ApiType> {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-    return decorateMethod((calls: QueryableStorageMultiArg<ApiType>[]): Observable<Codec[]> =>
-      (this.hasSubscriptions
+    return decorateMethod((keys: QueryableStorageMultiArg<ApiType>[]): Observable<Codec[]> => {
+      const query = this.hasSubscriptions
         ? this._rpcCore.state.subscribeStorage
-        : this._rpcCore.state.queryStorageAt)(
-        calls.map((args: QueryableStorageMultiArg<ApiType>) =>
-          Array.isArray(args)
-            ? args[0].creator.meta.type.isPlain
-              ? [args[0].creator]
-              : args[0].creator.meta.type.asMap.hashers.length === 1
-                ? [args[0].creator, args.slice(1)]
-                : [args[0].creator, ...args.slice(1)]
-            : [args.creator])));
+        : this._rpcCore.state.queryStorageAt;
+
+      const calls = keys.map((args: QueryableStorageMultiArg<ApiType>): [StorageEntry, ...unknown[]] =>
+        Array.isArray(args)
+          ? args[0].creator.meta.type.isPlain
+            ? [args[0].creator]
+            : args[0].creator.meta.type.asMap.hashers.length === 1
+              ? [args[0].creator, args.slice(1)]
+              : [args[0].creator, ...args.slice(1)]
+          : [args.creator]
+      );
+
+      // NOTE Skipping
+      //
+      // // with a smaller number of keys we combine this into a queue
+      // // along with other ongoing queries
+      // if (calls.length <= PAGE_SIZE_Q) {
+      //   const queue = this.hasSubscriptions
+      //     ? this.#storageSubQ
+      //     : this.#storageGetQ;
+
+      //   return this._queuedStorage(calls, queue, query);
+      // }
+
+      return query(calls);
+    });
   }
 
   protected _decorateMultiAt<ApiType extends ApiTypes> (atApi: ApiDecoration<ApiType>, decorateMethod: DecorateMethod<ApiType>, blockHash: Uint8Array | string): QueryableStorageMulti<ApiType> {
@@ -633,18 +655,80 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
     return this._decorateFunctionMeta(creator as unknown as MetaDecoration, decorated) as unknown as QueryableStorageEntry<ApiType>;
   }
 
+  private _queuedStorage (calls: [StorageEntry, ...unknown[]][], queue: [[StorageEntry, ...unknown[]][], Observable<Codec[]>][], query: (calls: unknown[]) => Observable<Codec[]>): Observable<Codec[]> {
+    const count = calls.length;
+    let queueIdx = queue.length - 1;
+
+    if (queueIdx === -1 || !queue[queueIdx] || queue[queueIdx][0].length === PAGE_SIZE_Q || count >= PAGE_SIZE_Q) {
+      queueIdx++;
+
+      queue.push([[], from(
+        // Defer to the next tick - this aligns with nextTick in @polkadot/util,
+        // however since we return a value here, we don't re-use what is there
+        Promise
+          .resolve()
+          .then((): [StorageEntry, ...unknown[]][] => {
+            const [calls] = queue[queueIdx];
+
+            delete queue[queueIdx];
+
+            return calls;
+          })
+          .catch(() => [])
+      ).pipe(
+        switchMap((calls) =>
+          query(calls)
+        )
+      )]);
+    }
+
+    const valueIdx = queue[queueIdx][0].length;
+    const valueObs = queue[queueIdx][1];
+
+    for (let i = 0; i < count; i++) {
+      queue[queueIdx][0].push(calls[i]);
+    }
+
+    return valueObs.pipe(
+      map((values): Codec[] => {
+        if (valueIdx === 0 && values.length === count) {
+          return values;
+        } else if (count === 1) {
+          return [values[valueIdx]];
+        }
+
+        const result = new Array<Codec>(count);
+
+        for (let i = 0; i < count; i++) {
+          result[i] = values[valueIdx + i];
+        }
+
+        return result;
+      })
+    );
+  }
+
+  private _queuedStorageSingle (call: [StorageEntry, ...unknown[]], queue: [[StorageEntry, ...unknown[]][], Observable<Codec[]>][], query: (calls: unknown[]) => Observable<Codec[]>): Observable<Codec> {
+    return this._queuedStorage([call], queue, query).pipe(
+      map(([first]) => first)
+    );
+  }
+
   // Decorate the base storage call. In the case or rxjs or promise-without-callback (await)
   // we make a subscription, alternatively we push this through a single-shot query
   private _decorateStorageCall<ApiType extends ApiTypes> (creator: StorageEntry, decorateMethod: DecorateMethod<ApiType>): ReturnType<DecorateMethod<ApiType>> {
     return decorateMethod((...args: unknown[]): Observable<Codec> => {
-      return this.hasSubscriptions
-        ? this._rpcCore.state.subscribeStorage<[Codec]>([extractStorageArgs(this.#registry, creator, args)]).pipe(
-          map(([data]) => data) // extract first/only result from list
-        )
-        : this._rpcCore.state.getStorage(extractStorageArgs(this.#registry, creator, args));
+      const call = extractStorageArgs(this.#registry, creator, args);
+
+      if (!this.hasSubscriptions) {
+        return this._rpcCore.state.getStorage(call);
+      }
+
+      return this._queuedStorageSingle(call, this.#storageSubQ, this._rpcCore.state.subscribeStorage);
     }, {
       methodName: creator.method,
-      overrideNoSub: (...args: unknown[]) => this._rpcCore.state.getStorage(extractStorageArgs(this.#registry, creator, args))
+      overrideNoSub: (...args: unknown[]) =>
+        this._queuedStorageSingle(extractStorageArgs(this.#registry, creator, args), this.#storageGetQ, this._rpcCore.state.queryStorageAt)
     });
   }
 
@@ -667,15 +751,33 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
       return of([]);
     }
 
-    const queryCall = this.hasSubscriptions && !blockHash
+    const query = this.hasSubscriptions && !blockHash
       ? this._rpcCore.state.subscribeStorage
       : this._rpcCore.state.queryStorageAt;
 
+    // NOTE Skipping
+    //
+    // // Where we have a limited number of multi keys, we combine
+    // // this query with others that precedes it (same tick)
+    // if (!blockHash && keys.length <= PAGE_SIZE_Q) {
+    //   const queue = this.hasSubscriptions
+    //     ? this.#storageSubQ
+    //     : this.#storageGetQ;
+
+    //   return this._queuedStorage(keys, queue, query);
+    // }
+
+    if (keys.length <= PAGE_SIZE_V) {
+      return blockHash
+        ? query(keys, blockHash)
+        : query(keys);
+    }
+
     return combineLatest(
       arrayChunk(keys, PAGE_SIZE_V).map((k) =>
         blockHash
-          ? queryCall(k, blockHash)
-          : queryCall(k)
+          ? query(k, blockHash)
+          : query(k)
       )
     ).pipe(
       map(arrayFlatten)
@@ -696,11 +798,11 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
       switchMap(getKeysPaged),
       map((keys) => keys.map(setMeta)),
       tap((keys): void => {
-        setTimeout((): void => {
+        nextTick((): void => {
           keys.length === PAGE_SIZE_K
             ? startSubject.next(keys[PAGE_SIZE_K - 1].toHex())
             : startSubject.complete();
-        }, 0);
+        });
       }),
       toArray(), // toArray since we want to startSubject to be completed
       map(arrayFlatten)

packages/api/src/base/Getters.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { RpcInterface } from '@polkadot/rpc-core/types';
+import type { ProviderInterface } from '@polkadot/rpc-provider/types';
 import type { Text } from '@polkadot/types';
 import type { Hash, RuntimeVersion } from '@polkadot/types/interfaces';
 import type { Metadata } from '@polkadot/types/metadata';
@@ -188,6 +189,13 @@ export abstract class Getters<ApiType extends ApiTypes> extends Init<ApiType> im
     return assertResult(this._rx as Pick<ApiInterfaceRx, 'tx' | 'rpc' | 'query'>);
   }
 
+  /**
+   * @description Returns the underlying provider stats
+   */
+  public get stats (): ProviderInterface['stats'] | undefined {
+    return this._rpcCore.provider.stats;
+  }
+
   /**
    * @description The type of this API instance, either 'rxjs' or 'promise'
    */

packages/api/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/api', path: 'auto', type: 'auto', version: '8.5.1' };
+export const packageInfo = { name: '@polkadot/api', path: 'auto', type: 'auto', version: '8.7.1' };

packages/api/src/promise/decorateMethod.ts

@@ -7,7 +7,7 @@ import type { DecorateFn, DecorateMethodOptions, ObsInnerType, StorageEntryPromi
 
 import { catchError, EMPTY, Subscription, tap } from 'rxjs';
 
-import { assert, isFunction } from '@polkadot/util';
+import { assert, isFunction, nextTick } from '@polkadot/util';
 
 interface Tracker<T> {
   reject: (value: Error) => Observable<never>;
@@ -75,7 +75,8 @@ function decorateCall<M extends DecorateFn<CodecReturnType<M>>> (method: M, args
       )
       .subscribe((result): void => {
         tracker.resolve(result);
-        setTimeout(() => subscription.unsubscribe(), 0);
+
+        nextTick(() => subscription.unsubscribe());
       });
   });
 }
@@ -94,7 +95,7 @@ function decorateSubscribe<M extends DecorateFn<CodecReturnType<M>>> (method: M,
       )
       .subscribe((result): void => {
         // queue result (back of queue to clear current)
-        setTimeout(() => resultCb(result) as void, 0);
+        nextTick(() => resultCb(result));
       });
   });
 }

packages/rpc-augment/package.json

@@ -20,13 +20,13 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/rpc-core": "8.5.1",
-    "@polkadot/types": "8.5.1",
-    "@polkadot/types-codec": "8.5.1",
-    "@polkadot/util": "^9.2.1"
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/rpc-core": "8.7.1",
+    "@polkadot/types": "8.7.1",
+    "@polkadot/types-codec": "8.7.1",
+    "@polkadot/util": "^9.4.1"
   }
 }

packages/rpc-augment/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/rpc-augment', path: 'auto', type: 'auto', version: '8.5.1' };
+export const packageInfo = { name: '@polkadot/rpc-augment', path: 'auto', type: 'auto', version: '8.7.1' };

packages/rpc-core/package.json

@@ -20,18 +20,18 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/rpc-augment": "8.5.1",
-    "@polkadot/rpc-provider": "8.5.1",
-    "@polkadot/types": "8.5.1",
-    "@polkadot/util": "^9.2.1",
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/rpc-augment": "8.7.1",
+    "@polkadot/rpc-provider": "8.7.1",
+    "@polkadot/types": "8.7.1",
+    "@polkadot/util": "^9.4.1",
     "rxjs": "^7.5.5"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^9.2.1",
-    "@polkadot/rpc-augment": "8.5.1"
+    "@polkadot/keyring": "^9.4.1",
+    "@polkadot/rpc-augment": "8.7.1"
   }
 }

packages/rpc-core/src/bundle.ts

@@ -87,7 +87,7 @@ export class RpcCore {
   #getBlockRegistry?: (blockHash: Uint8Array) => Promise<{ registry: Registry }>;
   #getBlockHash?: (blockNumber: AnyNumber) => Promise<Uint8Array>;
 
-  readonly #storageCache = new Map<string, string | null>();
+  readonly #storageCache = new Map<string, Codec>();
 
   public readonly mapping = new Map<string, DefinitionRpcExt>();
 
@@ -418,28 +418,38 @@ export class RpcCore {
     }, []);
   }
 
-  private _formatStorageSetEntry (registry: Registry, blockHash: string, key: StorageKey, changes: [string, string | null][], witCache: boolean, entryIndex: number): Codec {
+  private _formatStorageSetEntry (registry: Registry, blockHash: string, key: StorageKey, changes: [string, string | null][], withCache: boolean, entryIndex: number): Codec {
     const hexKey = key.toHex();
     const found = changes.find(([key]) => key === hexKey);
+    const isNotFound = isUndefined(found);
 
     // if we don't find the value, this is our fallback
     //   - in the case of an array of values, fill the hole from the cache
     //   - if a single result value, don't fill - it is not an update hole
     //   - fallback to an empty option in all cases
-    const value = isUndefined(found)
-      ? (witCache && this.#storageCache.get(hexKey)) || null
+    if (isNotFound && withCache) {
+      const cached = this.#storageCache.get(hexKey);
+
+      if (cached) {
+        return cached;
+      }
+    }
+
+    const value = isNotFound
+      ? null
       : found[1];
     const isEmpty = isNull(value);
     const input = isEmpty || isTreatAsHex(key)
       ? value
       : u8aToU8a(value);
+    const codec = this._newType(registry, blockHash, key, input, isEmpty, entryIndex);
 
     // store the retrieved result - the only issue with this cache is that there is no
     // clearing of it, so very long running processes (not just a couple of hours, longer)
     // will increase memory beyond what is allowed.
-    this.#storageCache.set(hexKey, value);
+    this.#storageCache.set(hexKey, codec);
 
-    return this._newType(registry, blockHash, key, input, isEmpty, entryIndex);
+    return codec;
   }
 
   private _newType (registry: Registry, blockHash: Uint8Array | string | null | undefined, key: StorageKey, input: string | Uint8Array | null, isEmpty: boolean, entryIndex = -1): Codec {

packages/rpc-core/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/rpc-core', path: 'auto', type: 'auto', version: '8.5.1' };
+export const packageInfo = { name: '@polkadot/rpc-core', path: 'auto', type: 'auto', version: '8.7.1' };

packages/rpc-provider/package.json

@@ -20,21 +20,21 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/keyring": "^9.2.1",
-    "@polkadot/types": "8.5.1",
-    "@polkadot/types-support": "8.5.1",
-    "@polkadot/util": "^9.2.1",
-    "@polkadot/util-crypto": "^9.2.1",
-    "@polkadot/x-fetch": "^9.2.1",
-    "@polkadot/x-global": "^9.2.1",
-    "@polkadot/x-ws": "^9.2.1",
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/keyring": "^9.4.1",
+    "@polkadot/types": "8.7.1",
+    "@polkadot/types-support": "8.7.1",
+    "@polkadot/util": "^9.4.1",
+    "@polkadot/util-crypto": "^9.4.1",
+    "@polkadot/x-fetch": "^9.4.1",
+    "@polkadot/x-global": "^9.4.1",
+    "@polkadot/x-ws": "^9.4.1",
     "@substrate/connect": "0.7.5",
     "eventemitter3": "^4.0.7",
-    "mock-socket": "^9.1.3",
-    "nock": "^13.2.4"
+    "mock-socket": "^9.1.4",
+    "nock": "^13.2.6"
   }
 }

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

@@ -56,7 +56,7 @@ export class HttpProvider implements ProviderInterface {
     this.#headers = headers;
     this.#stats = {
       active: { requests: 0, subscriptions: 0 },
-      total: { bytesRecv: 0, bytesSent: 0, cached: 0, requests: 0, subscriptions: 0, timeout: 0 }
+      total: { bytesRecv: 0, bytesSent: 0, cached: 0, errors: 0, requests: 0, subscriptions: 0, timeout: 0 }
     };
   }
 
@@ -169,6 +169,7 @@ export class HttpProvider implements ProviderInterface {
       return decoded;
     } catch (e) {
       this.#stats.active.requests--;
+      this.#stats.total.errors++;
 
       throw e;
     }

packages/rpc-provider/src/lru.ts

@@ -1,10 +1,10 @@
 // Copyright 2017-2022 @polkadot/rpc-provider authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// Assuming all 1.5MB responses, we apply a default allowing for 576MB
+// Assuming all 1.5MB responses, we apply a default allowing for 192MB
 // cache space (depending on the historic queries this would vary, metadata
 // for Kusama/Polkadot/Substrate falls between 600-750K, 2x for estimate)
-const DEFAULT_CAPACITY = 384;
+const DEFAULT_CAPACITY = 128;
 
 class LRUNode {
   public readonly key: string;

packages/rpc-provider/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/rpc-provider', path: 'auto', type: 'auto', version: '8.5.1' };
+export const packageInfo = { name: '@polkadot/rpc-provider', path: 'auto', type: 'auto', version: '8.7.1' };

packages/rpc-provider/src/types.ts

@@ -71,6 +71,7 @@ export interface ProviderStats {
     bytesRecv: number;
     bytesSent: number;
     cached: number;
+    errors: number;
     requests: number;
     subscriptions: number;
     timeout: number;

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

@@ -137,7 +137,7 @@ export class WsProvider implements ProviderInterface {
     this.#websocket = null;
     this.#stats = {
       active: { requests: 0, subscriptions: 0 },
-      total: { bytesRecv: 0, bytesSent: 0, cached: 0, requests: 0, subscriptions: 0, timeout: 0 }
+      total: { bytesRecv: 0, bytesSent: 0, cached: 0, errors: 0, requests: 0, subscriptions: 0, timeout: 0 }
     };
     this.#timeout = timeout || DEFAULT_TIMEOUT_MS;
 
@@ -300,7 +300,7 @@ export class WsProvider implements ProviderInterface {
 
     const [id, body] = this.#coder.encodeJson(method, params);
     let resultPromise: Promise<T> | null = isCacheable
-      ? this.#callCache.get(body) as Promise<T>
+      ? this.#callCache.get(body)
       : null;
 
     if (!resultPromise) {
@@ -339,6 +339,8 @@ export class WsProvider implements ProviderInterface {
         this.#stats.total.bytesSent += body.length;
         this.#websocket.send(body);
       } catch (error) {
+        this.#stats.total.errors++;
+
         reject(error);
       }
     });
@@ -492,6 +494,8 @@ export class WsProvider implements ProviderInterface {
         }
       }
     } catch (error) {
+      this.#stats.total.errors++;
+
       handler.callback(error as Error, undefined);
     }
 
@@ -520,6 +524,8 @@ export class WsProvider implements ProviderInterface {
 
       handler.callback(null, result);
     } catch (error) {
+      this.#stats.total.errors++;
+
       handler.callback(error as Error, undefined);
     }
   };

packages/typegen/package.json

@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "main": "index.js",
   "bin": {
     "polkadot-types-chain-info": "./scripts/polkadot-types-chain-info.cjs",
@@ -30,20 +30,20 @@
     "polkadot-types-internal-metadata": "./scripts/polkadot-types-internal-metadata.cjs"
   },
   "dependencies": {
-    "@babel/core": "^7.18.0",
+    "@babel/core": "^7.18.2",
     "@babel/register": "^7.17.7",
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/api": "8.5.1",
-    "@polkadot/api-augment": "8.5.1",
-    "@polkadot/rpc-augment": "8.5.1",
-    "@polkadot/rpc-provider": "8.5.1",
-    "@polkadot/types": "8.5.1",
-    "@polkadot/types-augment": "8.5.1",
-    "@polkadot/types-codec": "8.5.1",
-    "@polkadot/types-create": "8.5.1",
-    "@polkadot/types-support": "8.5.1",
-    "@polkadot/util": "^9.2.1",
-    "@polkadot/x-ws": "^9.2.1",
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/api": "8.7.1",
+    "@polkadot/api-augment": "8.7.1",
+    "@polkadot/rpc-augment": "8.7.1",
+    "@polkadot/rpc-provider": "8.7.1",
+    "@polkadot/types": "8.7.1",
+    "@polkadot/types-augment": "8.7.1",
+    "@polkadot/types-codec": "8.7.1",
+    "@polkadot/types-create": "8.7.1",
+    "@polkadot/types-support": "8.7.1",
+    "@polkadot/util": "^9.4.1",
+    "@polkadot/x-ws": "^9.4.1",
     "handlebars": "^4.7.7",
     "websocket": "^1.0.34",
     "yargs": "^17.5.1"

packages/typegen/src/generate/tsDef.ts

@@ -50,7 +50,7 @@ function tsEnum (registry: Registry, definitions: Record<string, ModuleTypes>, {
   const keys = named.map((def): string => {
     const { info, lookupName, name = '', type } = def;
     const getter = stringPascalCase(name.replace(' ', '_'));
-    const isComplex = [TypeDefInfo.Option, TypeDefInfo.Result, TypeDefInfo.Struct, TypeDefInfo.Tuple, TypeDefInfo.Vec, TypeDefInfo.VecFixed].includes(info);
+    const isComplex = [TypeDefInfo.Option, TypeDefInfo.Range, TypeDefInfo.RangeInclusive, TypeDefInfo.Result, TypeDefInfo.Struct, TypeDefInfo.Tuple, TypeDefInfo.Vec, TypeDefInfo.VecFixed].includes(info);
     const asGetter = type === 'Null' || info === TypeDefInfo.DoNotConstruct
       ? ''
       : createGetter(definitions, `as${getter}`, lookupName || (isComplex ? formatType(registry, definitions, info === TypeDefInfo.Struct ? def : type, imports, false) : type), imports);
@@ -61,6 +61,8 @@ function tsEnum (registry: Registry, definitions: Record<string, ModuleTypes>, {
     switch (info) {
       case TypeDefInfo.Compact:
       case TypeDefInfo.Plain:
+      case TypeDefInfo.Range:
+      case TypeDefInfo.RangeInclusive:
       case TypeDefInfo.Result:
       case TypeDefInfo.Si:
       case TypeDefInfo.Struct:

packages/typegen/src/interfacesTs.ts

@@ -13,8 +13,8 @@ const BASE = 'packages/api-augment/src';
 const METAS = Object.entries({ kusama, polkadot, substrate }) as [string, HexString][];
 
 export function main (): void {
-  generateDefaultLookup();
   generateDefaultInterface();
+  generateDefaultLookup();
   generateDefaultRpc();
   generateDefaultTsDef();
 

packages/typegen/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/typegen', path: 'auto', type: 'auto', version: '8.5.1' };
+export const packageInfo = { name: '@polkadot/typegen', path: 'auto', type: 'auto', version: '8.7.1' };

packages/types-augment/package.json

@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/types": "8.5.1",
-    "@polkadot/types-codec": "8.5.1",
-    "@polkadot/util": "^9.2.1"
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/types": "8.7.1",
+    "@polkadot/types-codec": "8.7.1",
+    "@polkadot/util": "^9.4.1"
   }
 }

packages/types-augment/src/lookup/kusama.ts

@@ -11,7 +11,7 @@ export default {
     _enum: ['Any', 'NonTransfer', 'Governance', 'Staking', 'IdentityJudgement', 'CancelProxy', 'Auction', 'Society']
   },
   /**
-   * Lookup260: kusama_runtime::SessionKeys
+   * Lookup258: kusama_runtime::SessionKeys
    **/
   KusamaRuntimeSessionKeys: {
     grandpa: 'SpFinalityGrandpaAppPublic',
@@ -22,7 +22,7 @@ export default {
     authorityDiscovery: 'SpAuthorityDiscoveryAppPublic'
   },
   /**
-   * Lookup334: kusama_runtime::OriginCaller
+   * Lookup332: kusama_runtime::OriginCaller
    **/
   KusamaRuntimeOriginCaller: {
     _enum: {
@@ -129,7 +129,7 @@ export default {
     }
   },
   /**
-   * Lookup400: kusama_runtime::NposCompactSolution24
+   * Lookup398: kusama_runtime::NposCompactSolution24
    **/
   KusamaRuntimeNposCompactSolution24: {
     votes1: 'Vec<(Compact<u32>,Compact<u16>)>',
@@ -158,7 +158,7 @@ export default {
     votes24: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);23],Compact<u16>)>'
   },
   /**
-   * Lookup776: kusama_runtime::Runtime
+   * Lookup774: kusama_runtime::Runtime
    **/
   KusamaRuntimeRuntime: 'Null'
 };

packages/types-augment/src/lookup/polkadot.ts

@@ -1851,13 +1851,13 @@ export default {
     }
   },
   /**
-   * Lookup546: polkadot_runtime_common::claims::pallet::Error<T>
+   * Lookup544: polkadot_runtime_common::claims::pallet::Error<T>
    **/
   PolkadotRuntimeCommonClaimsPalletError: {
     _enum: ['InvalidEthereumSignature', 'SignerHasNoClaim', 'SenderHasNoClaim', 'PotUnderflow', 'InvalidStatement', 'VestedBalanceExists']
   },
   /**
-   * Lookup602: polkadot_runtime_parachains::configuration::HostConfiguration<BlockNumber>
+   * Lookup600: polkadot_runtime_parachains::configuration::HostConfiguration<BlockNumber>
    **/
   PolkadotRuntimeParachainsConfigurationHostConfiguration: {
     maxCodeSize: 'u32',
@@ -1905,20 +1905,20 @@ export default {
     minimumValidationUpgradeDelay: 'u32'
   },
   /**
-   * Lookup605: polkadot_runtime_parachains::configuration::pallet::Error<T>
+   * Lookup603: polkadot_runtime_parachains::configuration::pallet::Error<T>
    **/
   PolkadotRuntimeParachainsConfigurationPalletError: {
     _enum: ['InvalidNewValue']
   },
   /**
-   * Lookup608: polkadot_runtime_parachains::inclusion::AvailabilityBitfieldRecord<N>
+   * Lookup606: polkadot_runtime_parachains::inclusion::AvailabilityBitfieldRecord<N>
    **/
   PolkadotRuntimeParachainsInclusionAvailabilityBitfieldRecord: {
     bitfield: 'BitVec',
     submittedAt: 'u32'
   },
   /**
-   * Lookup609: polkadot_runtime_parachains::inclusion::CandidatePendingAvailability<primitive_types::H256, N>
+   * Lookup607: polkadot_runtime_parachains::inclusion::CandidatePendingAvailability<primitive_types::H256, N>
    **/
   PolkadotRuntimeParachainsInclusionCandidatePendingAvailability: {
     _alias: {
@@ -1934,13 +1934,13 @@ export default {
     backingGroup: 'u32'
   },
   /**
-   * Lookup610: polkadot_runtime_parachains::inclusion::pallet::Error<T>
+   * Lookup608: polkadot_runtime_parachains::inclusion::pallet::Error<T>
    **/
   PolkadotRuntimeParachainsInclusionPalletError: {
     _enum: ['UnsortedOrDuplicateValidatorIndices', 'UnsortedOrDuplicateDisputeStatementSet', 'UnsortedOrDuplicateBackedCandidates', 'UnexpectedRelayParent', 'WrongBitfieldSize', 'BitfieldAllZeros', 'BitfieldDuplicateOrUnordered', 'ValidatorIndexOutOfBounds', 'InvalidBitfieldSignature', 'UnscheduledCandidate', 'CandidateScheduledBeforeParaFree', 'WrongCollator', 'ScheduledOutOfOrder', 'HeadDataTooLarge', 'PrematureCodeUpgrade', 'NewCodeTooLarge', 'CandidateNotInParentContext', 'InvalidGroupIndex', 'InsufficientBacking', 'InvalidBacking', 'NotCollatorSigned', 'ValidationDataHashMismatch', 'IncorrectDownwardMessageHandling', 'InvalidUpwardMessages', 'HrmpWatermarkMishandling', 'InvalidOutboundHrmp', 'InvalidValidationCodeHash', 'ParaHeadMismatch', 'BitfieldReferencesFreedCore']
   },
   /**
-   * Lookup611: polkadot_primitives::v2::ScrapedOnChainVotes<primitive_types::H256>
+   * Lookup609: polkadot_primitives::v2::ScrapedOnChainVotes<primitive_types::H256>
    **/
   PolkadotPrimitivesV2ScrapedOnChainVotes: {
     session: 'u32',
@@ -1948,38 +1948,38 @@ export default {
     disputes: 'Vec<PolkadotPrimitivesV2DisputeStatementSet>'
   },
   /**
-   * Lookup616: polkadot_runtime_parachains::paras_inherent::pallet::Error<T>
+   * Lookup614: polkadot_runtime_parachains::paras_inherent::pallet::Error<T>
    **/
   PolkadotRuntimeParachainsParasInherentPalletError: {
     _enum: ['TooManyInclusionInherents', 'InvalidParentHeader', 'CandidateConcludedInvalid', 'InherentOverweight', 'DisputeStatementsUnsortedOrDuplicates', 'DisputeInvalid']
   },
   /**
-   * Lookup618: polkadot_runtime_parachains::scheduler::ParathreadClaimQueue
+   * Lookup616: polkadot_runtime_parachains::scheduler::ParathreadClaimQueue
    **/
   PolkadotRuntimeParachainsSchedulerParathreadClaimQueue: {
     queue: 'Vec<PolkadotRuntimeParachainsSchedulerQueuedParathread>',
     nextCoreOffset: 'u32'
   },
   /**
-   * Lookup620: polkadot_runtime_parachains::scheduler::QueuedParathread
+   * Lookup618: polkadot_runtime_parachains::scheduler::QueuedParathread
    **/
   PolkadotRuntimeParachainsSchedulerQueuedParathread: {
     claim: 'PolkadotPrimitivesV2ParathreadEntry',
     coreOffset: 'u32'
   },
   /**
-   * Lookup621: polkadot_primitives::v2::ParathreadEntry
+   * Lookup619: polkadot_primitives::v2::ParathreadEntry
    **/
   PolkadotPrimitivesV2ParathreadEntry: {
     claim: 'PolkadotPrimitivesV2ParathreadClaim',
     retries: 'u32'
   },
   /**
-   * Lookup622: polkadot_primitives::v2::ParathreadClaim
+   * Lookup620: polkadot_primitives::v2::ParathreadClaim
    **/
   PolkadotPrimitivesV2ParathreadClaim: '(u32,PolkadotPrimitivesV2CollatorAppPublic)',
   /**
-   * Lookup625: polkadot_primitives::v2::CoreOccupied
+   * Lookup623: polkadot_primitives::v2::CoreOccupied
    **/
   PolkadotPrimitivesV2CoreOccupied: {
     _enum: {
@@ -1988,7 +1988,7 @@ export default {
     }
   },
   /**
-   * Lookup628: polkadot_runtime_parachains::scheduler::CoreAssignment
+   * Lookup626: polkadot_runtime_parachains::scheduler::CoreAssignment
    **/
   PolkadotRuntimeParachainsSchedulerCoreAssignment: {
     core: 'u32',
@@ -1997,7 +1997,7 @@ export default {
     groupIdx: 'u32'
   },
   /**
-   * Lookup629: polkadot_runtime_parachains::scheduler::AssignmentKind
+   * Lookup627: polkadot_runtime_parachains::scheduler::AssignmentKind
    **/
   PolkadotRuntimeParachainsSchedulerAssignmentKind: {
     _enum: {
@@ -2006,7 +2006,7 @@ export default {
     }
   },
   /**
-   * Lookup630: polkadot_runtime_parachains::paras::PvfCheckActiveVoteState<BlockNumber>
+   * Lookup628: polkadot_runtime_parachains::paras::PvfCheckActiveVoteState<BlockNumber>
    **/
   PolkadotRuntimeParachainsParasPvfCheckActiveVoteState: {
     votesAccept: 'BitVec',
@@ -2016,7 +2016,7 @@ export default {
     causes: 'Vec<PolkadotRuntimeParachainsParasPvfCheckCause>'
   },
   /**
-   * Lookup632: polkadot_runtime_parachains::paras::PvfCheckCause<BlockNumber>
+   * Lookup630: polkadot_runtime_parachains::paras::PvfCheckCause<BlockNumber>
    **/
   PolkadotRuntimeParachainsParasPvfCheckCause: {
     _enum: {
@@ -2028,39 +2028,39 @@ export default {
     }
   },
   /**
-   * Lookup634: polkadot_runtime_parachains::paras::ParaLifecycle
+   * Lookup632: polkadot_runtime_parachains::paras::ParaLifecycle
    **/
   PolkadotRuntimeParachainsParasParaLifecycle: {
     _enum: ['Onboarding', 'Parathread', 'Parachain', 'UpgradingParathread', 'DowngradingParachain', 'OffboardingParathread', 'OffboardingParachain']
   },
   /**
-   * Lookup636: polkadot_runtime_parachains::paras::ParaPastCodeMeta<N>
+   * Lookup634: polkadot_runtime_parachains::paras::ParaPastCodeMeta<N>
    **/
   PolkadotRuntimeParachainsParasParaPastCodeMeta: {
     upgradeTimes: 'Vec<PolkadotRuntimeParachainsParasReplacementTimes>',
     lastPruned: 'Option<u32>'
   },
   /**
-   * Lookup638: polkadot_runtime_parachains::paras::ReplacementTimes<N>
+   * Lookup636: polkadot_runtime_parachains::paras::ReplacementTimes<N>
    **/
   PolkadotRuntimeParachainsParasReplacementTimes: {
     expectedAt: 'u32',
     activatedAt: 'u32'
   },
   /**
-   * Lookup640: polkadot_primitives::v2::UpgradeGoAhead
+   * Lookup638: polkadot_primitives::v2::UpgradeGoAhead
    **/
   PolkadotPrimitivesV2UpgradeGoAhead: {
     _enum: ['Abort', 'GoAhead']
   },
   /**
-   * Lookup641: polkadot_primitives::v2::UpgradeRestriction
+   * Lookup639: polkadot_primitives::v2::UpgradeRestriction
    **/
   PolkadotPrimitivesV2UpgradeRestriction: {
     _enum: ['Present']
   },
   /**
-   * Lookup642: polkadot_runtime_parachains::paras::ParaGenesisArgs
+   * Lookup640: polkadot_runtime_parachains::paras::ParaGenesisArgs
    **/
   PolkadotRuntimeParachainsParasParaGenesisArgs: {
     genesisHead: 'Bytes',
@@ -2068,13 +2068,13 @@ export default {
     parachain: 'bool'
   },
   /**
-   * Lookup643: polkadot_runtime_parachains::paras::pallet::Error<T>
+   * Lookup641: polkadot_runtime_parachains::paras::pallet::Error<T>
    **/
   PolkadotRuntimeParachainsParasPalletError: {
     _enum: ['NotRegistered', 'CannotOnboard', 'CannotOffboard', 'CannotUpgrade', 'CannotDowngrade', 'PvfCheckStatementStale', 'PvfCheckStatementFuture', 'PvfCheckValidatorIndexOutOfBounds', 'PvfCheckInvalidSignature', 'PvfCheckDoubleVote', 'PvfCheckSubjectInvalid', 'PvfCheckDisabled']
   },
   /**
-   * Lookup645: polkadot_runtime_parachains::initializer::BufferedSessionChange
+   * Lookup643: polkadot_runtime_parachains::initializer::BufferedSessionChange
    **/
   PolkadotRuntimeParachainsInitializerBufferedSessionChange: {
     validators: 'Vec<PolkadotPrimitivesV2ValidatorAppPublic>',
@@ -2082,20 +2082,20 @@ export default {
     sessionIndex: 'u32'
   },
   /**
-   * Lookup647: polkadot_core_primitives::InboundDownwardMessage<BlockNumber>
+   * Lookup645: polkadot_core_primitives::InboundDownwardMessage<BlockNumber>
    **/
   PolkadotCorePrimitivesInboundDownwardMessage: {
     sentAt: 'u32',
     msg: 'Bytes'
   },
   /**
-   * Lookup649: polkadot_runtime_parachains::ump::pallet::Error<T>
+   * Lookup647: polkadot_runtime_parachains::ump::pallet::Error<T>
    **/
   PolkadotRuntimeParachainsUmpPalletError: {
     _enum: ['UnknownMessageIndex', 'WeightOverLimit']
   },
   /**
-   * Lookup650: polkadot_runtime_parachains::hrmp::HrmpOpenChannelRequest
+   * Lookup648: polkadot_runtime_parachains::hrmp::HrmpOpenChannelRequest
    **/
   PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest: {
     confirmed: 'bool',
@@ -2106,7 +2106,7 @@ export default {
     maxTotalSize: 'u32'
   },
   /**
-   * Lookup652: polkadot_runtime_parachains::hrmp::HrmpChannel
+   * Lookup650: polkadot_runtime_parachains::hrmp::HrmpChannel
    **/
   PolkadotRuntimeParachainsHrmpHrmpChannel: {
     maxCapacity: 'u32',
@@ -2119,20 +2119,20 @@ export default {
     recipientDeposit: 'u128'
   },
   /**
-   * Lookup655: polkadot_core_primitives::InboundHrmpMessage<BlockNumber>
+   * Lookup653: polkadot_core_primitives::InboundHrmpMessage<BlockNumber>
    **/
   PolkadotCorePrimitivesInboundHrmpMessage: {
     sentAt: 'u32',
     data: 'Bytes'
   },
   /**
-   * Lookup658: polkadot_runtime_parachains::hrmp::pallet::Error<T>
+   * Lookup656: polkadot_runtime_parachains::hrmp::pallet::Error<T>
    **/
   PolkadotRuntimeParachainsHrmpPalletError: {
     _enum: ['OpenHrmpChannelToSelf', 'OpenHrmpChannelInvalidRecipient', 'OpenHrmpChannelZeroCapacity', 'OpenHrmpChannelCapacityExceedsLimit', 'OpenHrmpChannelZeroMessageSize', 'OpenHrmpChannelMessageSizeExceedsLimit', 'OpenHrmpChannelAlreadyExists', 'OpenHrmpChannelAlreadyRequested', 'OpenHrmpChannelLimitExceeded', 'AcceptHrmpChannelDoesntExist', 'AcceptHrmpChannelAlreadyConfirmed', 'AcceptHrmpChannelLimitExceeded', 'CloseHrmpChannelUnauthorized', 'CloseHrmpChannelDoesntExist', 'CloseHrmpChannelAlreadyUnderway', 'CancelHrmpOpenChannelUnauthorized', 'OpenHrmpChannelDoesntExist', 'OpenHrmpChannelAlreadyConfirmed', 'WrongWitness']
   },
   /**
-   * Lookup660: polkadot_primitives::v2::SessionInfo
+   * Lookup658: polkadot_primitives::v2::SessionInfo
    **/
   PolkadotPrimitivesV2SessionInfo: {
     activeValidatorIndices: 'Vec<u32>',
@@ -2150,7 +2150,7 @@ export default {
     neededApprovals: 'u32'
   },
   /**
-   * Lookup663: polkadot_primitives::v2::DisputeState<N>
+   * Lookup661: polkadot_primitives::v2::DisputeState<N>
    **/
   PolkadotPrimitivesV2DisputeState: {
     validatorsFor: 'BitVec',
@@ -2159,13 +2159,13 @@ export default {
     concludedAt: 'Option<u32>'
   },
   /**
-   * Lookup664: polkadot_runtime_parachains::disputes::pallet::Error<T>
+   * Lookup662: polkadot_runtime_parachains::disputes::pallet::Error<T>
    **/
   PolkadotRuntimeParachainsDisputesPalletError: {
     _enum: ['DuplicateDisputeStatementSets', 'AncientDisputeStatement', 'ValidatorIndexOutOfBounds', 'InvalidSignature', 'DuplicateStatement', 'PotentialSpam', 'SingleSidedDispute']
   },
   /**
-   * Lookup665: polkadot_runtime_common::paras_registrar::ParaInfo<sp_core::crypto::AccountId32, Balance>
+   * Lookup663: polkadot_runtime_common::paras_registrar::ParaInfo<sp_core::crypto::AccountId32, Balance>
    **/
   PolkadotRuntimeCommonParasRegistrarParaInfo: {
     manager: 'AccountId32',
@@ -2173,25 +2173,25 @@ export default {
     locked: 'bool'
   },
   /**
-   * Lookup666: polkadot_runtime_common::paras_registrar::pallet::Error<T>
+   * Lookup664: polkadot_runtime_common::paras_registrar::pallet::Error<T>
    **/
   PolkadotRuntimeCommonParasRegistrarPalletError: {
     _enum: ['NotRegistered', 'AlreadyRegistered', 'NotOwner', 'CodeTooLarge', 'HeadDataTooLarge', 'NotParachain', 'NotParathread', 'CannotDeregister', 'CannotDowngrade', 'CannotUpgrade', 'ParaLocked', 'NotReserved', 'EmptyCode', 'CannotSwap']
   },
   /**
-   * Lookup668: polkadot_runtime_common::slots::pallet::Error<T>
+   * Lookup666: polkadot_runtime_common::slots::pallet::Error<T>
    **/
   PolkadotRuntimeCommonSlotsPalletError: {
     _enum: ['ParaNotOnboarding', 'LeaseError']
   },
   /**
-   * Lookup673: polkadot_runtime_common::auctions::pallet::Error<T>
+   * Lookup671: polkadot_runtime_common::auctions::pallet::Error<T>
    **/
   PolkadotRuntimeCommonAuctionsPalletError: {
     _enum: ['AuctionInProgress', 'LeasePeriodInPast', 'ParaNotRegistered', 'NotCurrentAuction', 'NotAuction', 'AuctionEnded', 'AlreadyLeasedOut']
   },
   /**
-   * Lookup674: polkadot_runtime_common::crowdloan::FundInfo<sp_core::crypto::AccountId32, Balance, BlockNumber, LeasePeriod>
+   * Lookup672: polkadot_runtime_common::crowdloan::FundInfo<sp_core::crypto::AccountId32, Balance, BlockNumber, LeasePeriod>
    **/
   PolkadotRuntimeCommonCrowdloanFundInfo: {
     depositor: 'AccountId32',
@@ -2206,7 +2206,7 @@ export default {
     fundIndex: 'u32'
   },
   /**
-   * Lookup675: polkadot_runtime_common::crowdloan::LastContribution<BlockNumber>
+   * Lookup673: polkadot_runtime_common::crowdloan::LastContribution<BlockNumber>
    **/
   PolkadotRuntimeCommonCrowdloanLastContribution: {
     _enum: {
@@ -2216,13 +2216,13 @@ export default {
     }
   },
   /**
-   * Lookup676: polkadot_runtime_common::crowdloan::pallet::Error<T>
+   * Lookup674: polkadot_runtime_common::crowdloan::pallet::Error<T>
    **/
   PolkadotRuntimeCommonCrowdloanPalletError: {
     _enum: ['FirstPeriodInPast', 'FirstPeriodTooFarInFuture', 'LastPeriodBeforeFirstPeriod', 'LastPeriodTooFarInFuture', 'CannotEndInPast', 'EndTooFarInFuture', 'Overflow', 'ContributionTooSmall', 'InvalidParaId', 'CapExceeded', 'ContributionPeriodOver', 'InvalidOrigin', 'NotParachain', 'LeaseActive', 'BidOrLeaseActive', 'FundNotEnded', 'NoContributions', 'NotReadyToDissolve', 'InvalidSignature', 'MemoTooLarge', 'AlreadyInNewRaise', 'VrfDelayInProgress', 'NoLeasePeriod']
   },
   /**
-   * Lookup677: pallet_xcm::pallet::QueryStatus<BlockNumber>
+   * Lookup675: pallet_xcm::pallet::QueryStatus<BlockNumber>
    **/
   PalletXcmQueryStatus: {
     _enum: {
@@ -2242,7 +2242,7 @@ export default {
     }
   },
   /**
-   * Lookup680: xcm::VersionedResponse
+   * Lookup678: xcm::VersionedResponse
    **/
   XcmVersionedResponse: {
     _enum: {
@@ -2252,7 +2252,7 @@ export default {
     }
   },
   /**
-   * Lookup686: pallet_xcm::pallet::VersionMigrationStage
+   * Lookup684: pallet_xcm::pallet::VersionMigrationStage
    **/
   PalletXcmVersionMigrationStage: {
     _enum: {
@@ -2263,21 +2263,21 @@ export default {
     }
   },
   /**
-   * Lookup687: pallet_xcm::pallet::Error<T>
+   * Lookup685: pallet_xcm::pallet::Error<T>
    **/
   PalletXcmError: {
     _enum: ['Unreachable', 'SendFailure', 'Filtered', 'UnweighableMessage', 'DestinationNotInvertible', 'Empty', 'CannotReanchor', 'TooManyAssets', 'InvalidOrigin', 'BadVersion', 'BadLocation', 'NoSubscription', 'AlreadySubscribed']
   },
   /**
-   * Lookup698: pallet_transaction_payment::ChargeTransactionPayment<T>
+   * Lookup696: pallet_transaction_payment::ChargeTransactionPayment<T>
    **/
   PalletTransactionPaymentChargeTransactionPayment: 'Compact<u128>',
   /**
-   * Lookup699: polkadot_runtime_common::claims::PrevalidateAttests<T>
+   * Lookup697: polkadot_runtime_common::claims::PrevalidateAttests<T>
    **/
   PolkadotRuntimeCommonClaimsPrevalidateAttests: 'Null',
   /**
-   * Lookup700: polkadot_runtime::Runtime
+   * Lookup698: polkadot_runtime::Runtime
    **/
   PolkadotRuntimeRuntime: 'Null'
 };

packages/types-augment/src/lookup/types-kusama.ts

@@ -19,7 +19,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'Any' | 'NonTransfer' | 'Governance' | 'Staking' | 'IdentityJudgement' | 'CancelProxy' | 'Auction' | 'Society';
   }
 
-  /** @name KusamaRuntimeSessionKeys (260) */
+  /** @name KusamaRuntimeSessionKeys (258) */
   export interface KusamaRuntimeSessionKeys extends Struct {
     readonly grandpa: SpFinalityGrandpaAppPublic;
     readonly babe: SpConsensusBabeAppPublic;
@@ -29,7 +29,7 @@ declare module '@polkadot/types/lookup' {
     readonly authorityDiscovery: SpAuthorityDiscoveryAppPublic;
   }
 
-  /** @name KusamaRuntimeOriginCaller (334) */
+  /** @name KusamaRuntimeOriginCaller (332) */
   export interface KusamaRuntimeOriginCaller extends Enum {
     readonly isSystem: boolean;
     readonly asSystem: FrameSupportDispatchRawOrigin;
@@ -45,7 +45,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'System' | 'Void' | 'Council' | 'TechnicalCommittee' | 'ParachainsOrigin' | 'XcmPallet';
   }
 
-  /** @name KusamaRuntimeNposCompactSolution24 (400) */
+  /** @name KusamaRuntimeNposCompactSolution24 (398) */
   export interface KusamaRuntimeNposCompactSolution24 extends Struct {
     readonly votes1: Vec<ITuple<[Compact<u32>, Compact<u16>]>>;
     readonly votes2: Vec<ITuple<[Compact<u32>, ITuple<[Compact<u16>, Compact<PerU16>]>, Compact<u16>]>>;
@@ -73,7 +73,7 @@ declare module '@polkadot/types/lookup' {
     readonly votes24: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
   }
 
-  /** @name KusamaRuntimeRuntime (776) */
+  /** @name KusamaRuntimeRuntime (774) */
   export type KusamaRuntimeRuntime = Null;
 
 } // declare module

packages/types-augment/src/lookup/types-polkadot.ts

@@ -1809,7 +1809,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'Assets' | 'Version';
   }
 
-  /** @name PolkadotRuntimeCommonClaimsPalletError (546) */
+  /** @name PolkadotRuntimeCommonClaimsPalletError (544) */
   export interface PolkadotRuntimeCommonClaimsPalletError extends Enum {
     readonly isInvalidEthereumSignature: boolean;
     readonly isSignerHasNoClaim: boolean;
@@ -1820,7 +1820,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'InvalidEthereumSignature' | 'SignerHasNoClaim' | 'SenderHasNoClaim' | 'PotUnderflow' | 'InvalidStatement' | 'VestedBalanceExists';
   }
 
-  /** @name PolkadotRuntimeParachainsConfigurationHostConfiguration (602) */
+  /** @name PolkadotRuntimeParachainsConfigurationHostConfiguration (600) */
   export interface PolkadotRuntimeParachainsConfigurationHostConfiguration extends Struct {
     readonly maxCodeSize: u32;
     readonly maxHeadDataSize: u32;
@@ -1867,19 +1867,19 @@ declare module '@polkadot/types/lookup' {
     readonly minimumValidationUpgradeDelay: u32;
   }
 
-  /** @name PolkadotRuntimeParachainsConfigurationPalletError (605) */
+  /** @name PolkadotRuntimeParachainsConfigurationPalletError (603) */
   export interface PolkadotRuntimeParachainsConfigurationPalletError extends Enum {
     readonly isInvalidNewValue: boolean;
     readonly type: 'InvalidNewValue';
   }
 
-  /** @name PolkadotRuntimeParachainsInclusionAvailabilityBitfieldRecord (608) */
+  /** @name PolkadotRuntimeParachainsInclusionAvailabilityBitfieldRecord (606) */
   export interface PolkadotRuntimeParachainsInclusionAvailabilityBitfieldRecord extends Struct {
     readonly bitfield: BitVec;
     readonly submittedAt: u32;
   }
 
-  /** @name PolkadotRuntimeParachainsInclusionCandidatePendingAvailability (609) */
+  /** @name PolkadotRuntimeParachainsInclusionCandidatePendingAvailability (607) */
   export interface PolkadotRuntimeParachainsInclusionCandidatePendingAvailability extends Struct {
     readonly core: u32;
     readonly hash_: H256;
@@ -1891,7 +1891,7 @@ declare module '@polkadot/types/lookup' {
     readonly backingGroup: u32;
   }
 
-  /** @name PolkadotRuntimeParachainsInclusionPalletError (610) */
+  /** @name PolkadotRuntimeParachainsInclusionPalletError (608) */
   export interface PolkadotRuntimeParachainsInclusionPalletError extends Enum {
     readonly isUnsortedOrDuplicateValidatorIndices: boolean;
     readonly isUnsortedOrDuplicateDisputeStatementSet: boolean;
@@ -1925,14 +1925,14 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'UnsortedOrDuplicateValidatorIndices' | 'UnsortedOrDuplicateDisputeStatementSet' | 'UnsortedOrDuplicateBackedCandidates' | 'UnexpectedRelayParent' | 'WrongBitfieldSize' | 'BitfieldAllZeros' | 'BitfieldDuplicateOrUnordered' | 'ValidatorIndexOutOfBounds' | 'InvalidBitfieldSignature' | 'UnscheduledCandidate' | 'CandidateScheduledBeforeParaFree' | 'WrongCollator' | 'ScheduledOutOfOrder' | 'HeadDataTooLarge' | 'PrematureCodeUpgrade' | 'NewCodeTooLarge' | 'CandidateNotInParentContext' | 'InvalidGroupIndex' | 'InsufficientBacking' | 'InvalidBacking' | 'NotCollatorSigned' | 'ValidationDataHashMismatch' | 'IncorrectDownwardMessageHandling' | 'InvalidUpwardMessages' | 'HrmpWatermarkMishandling' | 'InvalidOutboundHrmp' | 'InvalidValidationCodeHash' | 'ParaHeadMismatch' | 'BitfieldReferencesFreedCore';
   }
 
-  /** @name PolkadotPrimitivesV2ScrapedOnChainVotes (611) */
+  /** @name PolkadotPrimitivesV2ScrapedOnChainVotes (609) */
   export interface PolkadotPrimitivesV2ScrapedOnChainVotes extends Struct {
     readonly session: u32;
     readonly backingValidatorsPerCandidate: Vec<ITuple<[PolkadotPrimitivesV2CandidateReceipt, Vec<ITuple<[u32, PolkadotPrimitivesV2ValidityAttestation]>>]>>;
     readonly disputes: Vec<PolkadotPrimitivesV2DisputeStatementSet>;
   }
 
-  /** @name PolkadotRuntimeParachainsParasInherentPalletError (616) */
+  /** @name PolkadotRuntimeParachainsParasInherentPalletError (614) */
   export interface PolkadotRuntimeParachainsParasInherentPalletError extends Enum {
     readonly isTooManyInclusionInherents: boolean;
     readonly isInvalidParentHeader: boolean;
@@ -1943,28 +1943,28 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'TooManyInclusionInherents' | 'InvalidParentHeader' | 'CandidateConcludedInvalid' | 'InherentOverweight' | 'DisputeStatementsUnsortedOrDuplicates' | 'DisputeInvalid';
   }
 
-  /** @name PolkadotRuntimeParachainsSchedulerParathreadClaimQueue (618) */
+  /** @name PolkadotRuntimeParachainsSchedulerParathreadClaimQueue (616) */
   export interface PolkadotRuntimeParachainsSchedulerParathreadClaimQueue extends Struct {
     readonly queue: Vec<PolkadotRuntimeParachainsSchedulerQueuedParathread>;
     readonly nextCoreOffset: u32;
   }
 
-  /** @name PolkadotRuntimeParachainsSchedulerQueuedParathread (620) */
+  /** @name PolkadotRuntimeParachainsSchedulerQueuedParathread (618) */
   export interface PolkadotRuntimeParachainsSchedulerQueuedParathread extends Struct {
     readonly claim: PolkadotPrimitivesV2ParathreadEntry;
     readonly coreOffset: u32;
   }
 
-  /** @name PolkadotPrimitivesV2ParathreadEntry (621) */
+  /** @name PolkadotPrimitivesV2ParathreadEntry (619) */
   export interface PolkadotPrimitivesV2ParathreadEntry extends Struct {
     readonly claim: PolkadotPrimitivesV2ParathreadClaim;
     readonly retries: u32;
   }
 
-  /** @name PolkadotPrimitivesV2ParathreadClaim (622) */
+  /** @name PolkadotPrimitivesV2ParathreadClaim (620) */
   export interface PolkadotPrimitivesV2ParathreadClaim extends ITuple<[u32, PolkadotPrimitivesV2CollatorAppPublic]> {}
 
-  /** @name PolkadotPrimitivesV2CoreOccupied (625) */
+  /** @name PolkadotPrimitivesV2CoreOccupied (623) */
   export interface PolkadotPrimitivesV2CoreOccupied extends Enum {
     readonly isParathread: boolean;
     readonly asParathread: PolkadotPrimitivesV2ParathreadEntry;
@@ -1972,7 +1972,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'Parathread' | 'Parachain';
   }
 
-  /** @name PolkadotRuntimeParachainsSchedulerCoreAssignment (628) */
+  /** @name PolkadotRuntimeParachainsSchedulerCoreAssignment (626) */
   export interface PolkadotRuntimeParachainsSchedulerCoreAssignment extends Struct {
     readonly core: u32;
     readonly paraId: u32;
@@ -1980,7 +1980,7 @@ declare module '@polkadot/types/lookup' {
     readonly groupIdx: u32;
   }
 
-  /** @name PolkadotRuntimeParachainsSchedulerAssignmentKind (629) */
+  /** @name PolkadotRuntimeParachainsSchedulerAssignmentKind (627) */
   export interface PolkadotRuntimeParachainsSchedulerAssignmentKind extends Enum {
     readonly isParachain: boolean;
     readonly isParathread: boolean;
@@ -1988,7 +1988,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'Parachain' | 'Parathread';
   }
 
-  /** @name PolkadotRuntimeParachainsParasPvfCheckActiveVoteState (630) */
+  /** @name PolkadotRuntimeParachainsParasPvfCheckActiveVoteState (628) */
   export interface PolkadotRuntimeParachainsParasPvfCheckActiveVoteState extends Struct {
     readonly votesAccept: BitVec;
     readonly votesReject: BitVec;
@@ -1997,7 +1997,7 @@ declare module '@polkadot/types/lookup' {
     readonly causes: Vec<PolkadotRuntimeParachainsParasPvfCheckCause>;
   }
 
-  /** @name PolkadotRuntimeParachainsParasPvfCheckCause (632) */
+  /** @name PolkadotRuntimeParachainsParasPvfCheckCause (630) */
   export interface PolkadotRuntimeParachainsParasPvfCheckCause extends Enum {
     readonly isOnboarding: boolean;
     readonly asOnboarding: u32;
@@ -2009,7 +2009,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'Onboarding' | 'Upgrade';
   }
 
-  /** @name PolkadotRuntimeParachainsParasParaLifecycle (634) */
+  /** @name PolkadotRuntimeParachainsParasParaLifecycle (632) */
   export interface PolkadotRuntimeParachainsParasParaLifecycle extends Enum {
     readonly isOnboarding: boolean;
     readonly isParathread: boolean;
@@ -2021,39 +2021,39 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'Onboarding' | 'Parathread' | 'Parachain' | 'UpgradingParathread' | 'DowngradingParachain' | 'OffboardingParathread' | 'OffboardingParachain';
   }
 
-  /** @name PolkadotRuntimeParachainsParasParaPastCodeMeta (636) */
+  /** @name PolkadotRuntimeParachainsParasParaPastCodeMeta (634) */
   export interface PolkadotRuntimeParachainsParasParaPastCodeMeta extends Struct {
     readonly upgradeTimes: Vec<PolkadotRuntimeParachainsParasReplacementTimes>;
     readonly lastPruned: Option<u32>;
   }
 
-  /** @name PolkadotRuntimeParachainsParasReplacementTimes (638) */
+  /** @name PolkadotRuntimeParachainsParasReplacementTimes (636) */
   export interface PolkadotRuntimeParachainsParasReplacementTimes extends Struct {
     readonly expectedAt: u32;
     readonly activatedAt: u32;
   }
 
-  /** @name PolkadotPrimitivesV2UpgradeGoAhead (640) */
+  /** @name PolkadotPrimitivesV2UpgradeGoAhead (638) */
   export interface PolkadotPrimitivesV2UpgradeGoAhead extends Enum {
     readonly isAbort: boolean;
     readonly isGoAhead: boolean;
     readonly type: 'Abort' | 'GoAhead';
   }
 
-  /** @name PolkadotPrimitivesV2UpgradeRestriction (641) */
+  /** @name PolkadotPrimitivesV2UpgradeRestriction (639) */
   export interface PolkadotPrimitivesV2UpgradeRestriction extends Enum {
     readonly isPresent: boolean;
     readonly type: 'Present';
   }
 
-  /** @name PolkadotRuntimeParachainsParasParaGenesisArgs (642) */
+  /** @name PolkadotRuntimeParachainsParasParaGenesisArgs (640) */
   export interface PolkadotRuntimeParachainsParasParaGenesisArgs extends Struct {
     readonly genesisHead: Bytes;
     readonly validationCode: Bytes;
     readonly parachain: bool;
   }
 
-  /** @name PolkadotRuntimeParachainsParasPalletError (643) */
+  /** @name PolkadotRuntimeParachainsParasPalletError (641) */
   export interface PolkadotRuntimeParachainsParasPalletError extends Enum {
     readonly isNotRegistered: boolean;
     readonly isCannotOnboard: boolean;
@@ -2070,27 +2070,27 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'NotRegistered' | 'CannotOnboard' | 'CannotOffboard' | 'CannotUpgrade' | 'CannotDowngrade' | 'PvfCheckStatementStale' | 'PvfCheckStatementFuture' | 'PvfCheckValidatorIndexOutOfBounds' | 'PvfCheckInvalidSignature' | 'PvfCheckDoubleVote' | 'PvfCheckSubjectInvalid' | 'PvfCheckDisabled';
   }
 
-  /** @name PolkadotRuntimeParachainsInitializerBufferedSessionChange (645) */
+  /** @name PolkadotRuntimeParachainsInitializerBufferedSessionChange (643) */
   export interface PolkadotRuntimeParachainsInitializerBufferedSessionChange extends Struct {
     readonly validators: Vec<PolkadotPrimitivesV2ValidatorAppPublic>;
     readonly queued: Vec<PolkadotPrimitivesV2ValidatorAppPublic>;
     readonly sessionIndex: u32;
   }
 
-  /** @name PolkadotCorePrimitivesInboundDownwardMessage (647) */
+  /** @name PolkadotCorePrimitivesInboundDownwardMessage (645) */
   export interface PolkadotCorePrimitivesInboundDownwardMessage extends Struct {
     readonly sentAt: u32;
     readonly msg: Bytes;
   }
 
-  /** @name PolkadotRuntimeParachainsUmpPalletError (649) */
+  /** @name PolkadotRuntimeParachainsUmpPalletError (647) */
   export interface PolkadotRuntimeParachainsUmpPalletError extends Enum {
     readonly isUnknownMessageIndex: boolean;
     readonly isWeightOverLimit: boolean;
     readonly type: 'UnknownMessageIndex' | 'WeightOverLimit';
   }
 
-  /** @name PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest (650) */
+  /** @name PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest (648) */
   export interface PolkadotRuntimeParachainsHrmpHrmpOpenChannelRequest extends Struct {
     readonly confirmed: bool;
     readonly age: u32;
@@ -2100,7 +2100,7 @@ declare module '@polkadot/types/lookup' {
     readonly maxTotalSize: u32;
   }
 
-  /** @name PolkadotRuntimeParachainsHrmpHrmpChannel (652) */
+  /** @name PolkadotRuntimeParachainsHrmpHrmpChannel (650) */
   export interface PolkadotRuntimeParachainsHrmpHrmpChannel extends Struct {
     readonly maxCapacity: u32;
     readonly maxTotalSize: u32;
@@ -2112,13 +2112,13 @@ declare module '@polkadot/types/lookup' {
     readonly recipientDeposit: u128;
   }
 
-  /** @name PolkadotCorePrimitivesInboundHrmpMessage (655) */
+  /** @name PolkadotCorePrimitivesInboundHrmpMessage (653) */
   export interface PolkadotCorePrimitivesInboundHrmpMessage extends Struct {
     readonly sentAt: u32;
     readonly data: Bytes;
   }
 
-  /** @name PolkadotRuntimeParachainsHrmpPalletError (658) */
+  /** @name PolkadotRuntimeParachainsHrmpPalletError (656) */
   export interface PolkadotRuntimeParachainsHrmpPalletError extends Enum {
     readonly isOpenHrmpChannelToSelf: boolean;
     readonly isOpenHrmpChannelInvalidRecipient: boolean;
@@ -2142,7 +2142,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'OpenHrmpChannelToSelf' | 'OpenHrmpChannelInvalidRecipient' | 'OpenHrmpChannelZeroCapacity' | 'OpenHrmpChannelCapacityExceedsLimit' | 'OpenHrmpChannelZeroMessageSize' | 'OpenHrmpChannelMessageSizeExceedsLimit' | 'OpenHrmpChannelAlreadyExists' | 'OpenHrmpChannelAlreadyRequested' | 'OpenHrmpChannelLimitExceeded' | 'AcceptHrmpChannelDoesntExist' | 'AcceptHrmpChannelAlreadyConfirmed' | 'AcceptHrmpChannelLimitExceeded' | 'CloseHrmpChannelUnauthorized' | 'CloseHrmpChannelDoesntExist' | 'CloseHrmpChannelAlreadyUnderway' | 'CancelHrmpOpenChannelUnauthorized' | 'OpenHrmpChannelDoesntExist' | 'OpenHrmpChannelAlreadyConfirmed' | 'WrongWitness';
   }
 
-  /** @name PolkadotPrimitivesV2SessionInfo (660) */
+  /** @name PolkadotPrimitivesV2SessionInfo (658) */
   export interface PolkadotPrimitivesV2SessionInfo extends Struct {
     readonly activeValidatorIndices: Vec<u32>;
     readonly randomSeed: U8aFixed;
@@ -2159,7 +2159,7 @@ declare module '@polkadot/types/lookup' {
     readonly neededApprovals: u32;
   }
 
-  /** @name PolkadotPrimitivesV2DisputeState (663) */
+  /** @name PolkadotPrimitivesV2DisputeState (661) */
   export interface PolkadotPrimitivesV2DisputeState extends Struct {
     readonly validatorsFor: BitVec;
     readonly validatorsAgainst: BitVec;
@@ -2167,7 +2167,7 @@ declare module '@polkadot/types/lookup' {
     readonly concludedAt: Option<u32>;
   }
 
-  /** @name PolkadotRuntimeParachainsDisputesPalletError (664) */
+  /** @name PolkadotRuntimeParachainsDisputesPalletError (662) */
   export interface PolkadotRuntimeParachainsDisputesPalletError extends Enum {
     readonly isDuplicateDisputeStatementSets: boolean;
     readonly isAncientDisputeStatement: boolean;
@@ -2179,14 +2179,14 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'DuplicateDisputeStatementSets' | 'AncientDisputeStatement' | 'ValidatorIndexOutOfBounds' | 'InvalidSignature' | 'DuplicateStatement' | 'PotentialSpam' | 'SingleSidedDispute';
   }
 
-  /** @name PolkadotRuntimeCommonParasRegistrarParaInfo (665) */
+  /** @name PolkadotRuntimeCommonParasRegistrarParaInfo (663) */
   export interface PolkadotRuntimeCommonParasRegistrarParaInfo extends Struct {
     readonly manager: AccountId32;
     readonly deposit: u128;
     readonly locked: bool;
   }
 
-  /** @name PolkadotRuntimeCommonParasRegistrarPalletError (666) */
+  /** @name PolkadotRuntimeCommonParasRegistrarPalletError (664) */
   export interface PolkadotRuntimeCommonParasRegistrarPalletError extends Enum {
     readonly isNotRegistered: boolean;
     readonly isAlreadyRegistered: boolean;
@@ -2205,14 +2205,14 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'NotRegistered' | 'AlreadyRegistered' | 'NotOwner' | 'CodeTooLarge' | 'HeadDataTooLarge' | 'NotParachain' | 'NotParathread' | 'CannotDeregister' | 'CannotDowngrade' | 'CannotUpgrade' | 'ParaLocked' | 'NotReserved' | 'EmptyCode' | 'CannotSwap';
   }
 
-  /** @name PolkadotRuntimeCommonSlotsPalletError (668) */
+  /** @name PolkadotRuntimeCommonSlotsPalletError (666) */
   export interface PolkadotRuntimeCommonSlotsPalletError extends Enum {
     readonly isParaNotOnboarding: boolean;
     readonly isLeaseError: boolean;
     readonly type: 'ParaNotOnboarding' | 'LeaseError';
   }
 
-  /** @name PolkadotRuntimeCommonAuctionsPalletError (673) */
+  /** @name PolkadotRuntimeCommonAuctionsPalletError (671) */
   export interface PolkadotRuntimeCommonAuctionsPalletError extends Enum {
     readonly isAuctionInProgress: boolean;
     readonly isLeasePeriodInPast: boolean;
@@ -2224,7 +2224,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'AuctionInProgress' | 'LeasePeriodInPast' | 'ParaNotRegistered' | 'NotCurrentAuction' | 'NotAuction' | 'AuctionEnded' | 'AlreadyLeasedOut';
   }
 
-  /** @name PolkadotRuntimeCommonCrowdloanFundInfo (674) */
+  /** @name PolkadotRuntimeCommonCrowdloanFundInfo (672) */
   export interface PolkadotRuntimeCommonCrowdloanFundInfo extends Struct {
     readonly depositor: AccountId32;
     readonly verifier: Option<SpRuntimeMultiSigner>;
@@ -2238,7 +2238,7 @@ declare module '@polkadot/types/lookup' {
     readonly fundIndex: u32;
   }
 
-  /** @name PolkadotRuntimeCommonCrowdloanLastContribution (675) */
+  /** @name PolkadotRuntimeCommonCrowdloanLastContribution (673) */
   export interface PolkadotRuntimeCommonCrowdloanLastContribution extends Enum {
     readonly isNever: boolean;
     readonly isPreEnding: boolean;
@@ -2248,7 +2248,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'Never' | 'PreEnding' | 'Ending';
   }
 
-  /** @name PolkadotRuntimeCommonCrowdloanPalletError (676) */
+  /** @name PolkadotRuntimeCommonCrowdloanPalletError (674) */
   export interface PolkadotRuntimeCommonCrowdloanPalletError extends Enum {
     readonly isFirstPeriodInPast: boolean;
     readonly isFirstPeriodTooFarInFuture: boolean;
@@ -2276,7 +2276,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'FirstPeriodInPast' | 'FirstPeriodTooFarInFuture' | 'LastPeriodBeforeFirstPeriod' | 'LastPeriodTooFarInFuture' | 'CannotEndInPast' | 'EndTooFarInFuture' | 'Overflow' | 'ContributionTooSmall' | 'InvalidParaId' | 'CapExceeded' | 'ContributionPeriodOver' | 'InvalidOrigin' | 'NotParachain' | 'LeaseActive' | 'BidOrLeaseActive' | 'FundNotEnded' | 'NoContributions' | 'NotReadyToDissolve' | 'InvalidSignature' | 'MemoTooLarge' | 'AlreadyInNewRaise' | 'VrfDelayInProgress' | 'NoLeasePeriod';
   }
 
-  /** @name PalletXcmQueryStatus (677) */
+  /** @name PalletXcmQueryStatus (675) */
   export interface PalletXcmQueryStatus extends Enum {
     readonly isPending: boolean;
     readonly asPending: {
@@ -2297,7 +2297,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'Pending' | 'VersionNotifier' | 'Ready';
   }
 
-  /** @name XcmVersionedResponse (680) */
+  /** @name XcmVersionedResponse (678) */
   export interface XcmVersionedResponse extends Enum {
     readonly isV0: boolean;
     readonly asV0: XcmV0Response;
@@ -2308,7 +2308,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'V0' | 'V1' | 'V2';
   }
 
-  /** @name PalletXcmVersionMigrationStage (686) */
+  /** @name PalletXcmVersionMigrationStage (684) */
   export interface PalletXcmVersionMigrationStage extends Enum {
     readonly isMigrateSupportedVersion: boolean;
     readonly isMigrateVersionNotifiers: boolean;
@@ -2318,7 +2318,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'MigrateSupportedVersion' | 'MigrateVersionNotifiers' | 'NotifyCurrentTargets' | 'MigrateAndNotifyOldTargets';
   }
 
-  /** @name PalletXcmError (687) */
+  /** @name PalletXcmError (685) */
   export interface PalletXcmError extends Enum {
     readonly isUnreachable: boolean;
     readonly isSendFailure: boolean;
@@ -2336,13 +2336,13 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'Unreachable' | 'SendFailure' | 'Filtered' | 'UnweighableMessage' | 'DestinationNotInvertible' | 'Empty' | 'CannotReanchor' | 'TooManyAssets' | 'InvalidOrigin' | 'BadVersion' | 'BadLocation' | 'NoSubscription' | 'AlreadySubscribed';
   }
 
-  /** @name PalletTransactionPaymentChargeTransactionPayment (698) */
+  /** @name PalletTransactionPaymentChargeTransactionPayment (696) */
   export interface PalletTransactionPaymentChargeTransactionPayment extends Compact<u128> {}
 
-  /** @name PolkadotRuntimeCommonClaimsPrevalidateAttests (699) */
+  /** @name PolkadotRuntimeCommonClaimsPrevalidateAttests (697) */
   export type PolkadotRuntimeCommonClaimsPrevalidateAttests = Null;
 
-  /** @name PolkadotRuntimeRuntime (700) */
+  /** @name PolkadotRuntimeRuntime (698) */
   export type PolkadotRuntimeRuntime = Null;
 
 } // declare module

packages/types-augment/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/types-augment', path: 'auto', type: 'auto', version: '8.5.1' };
+export const packageInfo = { name: '@polkadot/types-augment', path: 'auto', type: 'auto', version: '8.7.1' };

packages/types-augment/src/registry/interfaces.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 
 import type { Data, StorageKey } from '@polkadot/types';
-import type { BitVec, Bool, Bytes, I128, I16, I256, I32, I64, I8, Json, Null, Raw, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types-codec';
+import type { BitVec, Bool, Bytes, I128, I16, I256, I32, I64, I8, Json, Null, OptionBool, Raw, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types-codec';
 import type { AssetApproval, AssetApprovalKey, AssetBalance, AssetDestroyWitness, AssetDetails, AssetMetadata, TAssetBalance, TAssetDepositBalance } from '@polkadot/types/interfaces/assets';
 import type { BlockAttestations, IncludedBlocks, MoreAttestations } from '@polkadot/types/interfaces/attestations';
 import type { RawAuraPreDigest } from '@polkadot/types/interfaces/aura';
@@ -661,6 +661,7 @@ declare module '@polkadot/types/types/registry' {
     OpenTipTip: OpenTipTip;
     OpenTipTo225: OpenTipTo225;
     OperatingMode: OperatingMode;
+    OptionBool: OptionBool;
     Origin: Origin;
     OriginCaller: OriginCaller;
     OriginKindV0: OriginKindV0;

packages/types-codec/package.json

@@ -20,16 +20,16 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/util": "^9.2.1"
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/util": "^9.4.1"
   },
   "devDependencies": {
-    "@polkadot/types": "8.5.1",
-    "@polkadot/types-augment": "8.5.1",
-    "@polkadot/types-support": "8.5.1",
-    "@polkadot/util-crypto": "^9.2.1"
+    "@polkadot/types": "8.7.1",
+    "@polkadot/types-augment": "8.7.1",
+    "@polkadot/types-support": "8.7.1",
+    "@polkadot/util-crypto": "^9.4.1"
   }
 }

packages/types-codec/src/abstract/AbstractArray.ts

@@ -4,7 +4,7 @@
 import type { HexString } from '@polkadot/util/types';
 import type { AnyJson, Codec, Inspect, IU8a, IVec, Registry } from '../types';
 
-import { compactToU8a, u8aConcat, u8aToHex } from '@polkadot/util';
+import { compactToU8a, u8aConcatStrict, u8aToHex } from '@polkadot/util';
 
 import { compareArray } from '../utils/compareArray';
 
@@ -20,18 +20,10 @@ export abstract class AbstractArray<T extends Codec> extends Array<T> implements
 
   public createdAtHash?: IU8a;
 
-  readonly initialU8aLength?: number;
-
-  protected constructor (registry: Registry, values: T[], initialU8aLength?: number) {
-    super(values.length);
-
-    // explicitly set the values here - this removes the need for any extra allocations
-    for (let i = 0; i < values.length; i++) {
-      this[i] = values[i];
-    }
+  protected constructor (registry: Registry, length: number) {
+    super(length);
 
     this.registry = registry;
-    this.initialU8aLength = initialU8aLength;
   }
 
   /**
@@ -164,8 +156,8 @@ export abstract class AbstractArray<T extends Codec> extends Array<T> implements
     const encoded = this.toU8aInner();
 
     return isBare
-      ? u8aConcat(...encoded)
-      : u8aConcat(compactToU8a(this.length), ...encoded);
+      ? u8aConcatStrict(encoded)
+      : u8aConcatStrict([compactToU8a(this.length), ...encoded]);
   }
 
   public toU8aInner (isBare?: boolean): Uint8Array[] {

packages/types-codec/src/base/Compact.ts

@@ -9,6 +9,15 @@ import { compactFromU8a, compactToU8a, isU8a } from '@polkadot/util';
 
 import { typeToConstructor } from '../utils';
 
+interface Options<T> {
+  definition?: CodecClass<T>;
+  setDefinition?: (d: CodecClass<T>) => CodecClass<T>;
+}
+
+function noopSetDefinition <T> (d: CodecClass<T>): CodecClass<T> {
+  return d;
+}
+
 /**
  * @name Compact
  * @description
@@ -28,9 +37,9 @@ export class Compact<T extends INumber> implements ICompact<T> {
 
   readonly #raw: T;
 
-  constructor (registry: Registry, Type: CodecClass<T> | string, value: Compact<T> | AnyNumber = 0) {
+  constructor (registry: Registry, Type: CodecClass<T> | string, value: Compact<T> | AnyNumber = 0, { definition, setDefinition = noopSetDefinition }: Options<T> = {}) {
     this.registry = registry;
-    this.#Type = typeToConstructor(registry, Type);
+    this.#Type = definition || setDefinition(typeToConstructor(registry, Type));
 
     const [raw, decodedLength] = Compact.decodeCompact<T>(registry, this.#Type, value);
 
@@ -38,10 +47,16 @@ export class Compact<T extends INumber> implements ICompact<T> {
     this.#raw = raw;
   }
 
-  public static with<T extends INumber> (Type: CodecClass<T> | string): CodecClass<Compact<T>> {
-    return class extends Compact<T> {
-      constructor (registry: Registry, value?: Compact<T> | AnyNumber) {
-        super(registry, Type, value);
+  public static with<O extends INumber> (Type: CodecClass<O> | string): CodecClass<Compact<O>> {
+    let definition: CodecClass<O> | undefined;
+
+    // eslint-disable-next-line no-return-assign
+    const setDefinition = <T> (d: CodecClass<T>) =>
+      (definition = d as unknown as CodecClass<O>) as unknown as CodecClass<T>;
+
+    return class extends Compact<O> {
+      constructor (registry: Registry, value?: Compact<O> | AnyNumber) {
+        super(registry, Type, value, { definition, setDefinition });
       }
     };
   }

packages/types-codec/src/base/Enum.ts

@@ -4,7 +4,7 @@
 import type { HexString } from '@polkadot/util/types';
 import type { AnyJson, Codec, CodecClass, IEnum, Inspect, IU8a, Registry } from '../types';
 
-import { assert, isCodec, isHex, isNumber, isObject, isString, isU8a, isUndefined, objectProperties, stringCamelCase, stringify, stringPascalCase, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { assert, isCodec, isHex, isNumber, isObject, isString, isU8a, isUndefined, objectProperties, stringCamelCase, stringify, stringPascalCase, u8aConcatStrict, u8aToHex, u8aToU8a } from '@polkadot/util';
 
 import { mapToTypeMap, typesToMap } from '../utils';
 import { Null } from './Null';
@@ -14,6 +14,12 @@ export interface EnumCodecClass<T = Codec> {
   new(registry: Registry, value?: any, index?: number): T;
 }
 
+interface Definition {
+  def: TypesDef;
+  isBasic: boolean;
+  isIndexed: boolean;
+}
+
 interface EntryDef {
   Type: CodecClass;
   index: number;
@@ -26,6 +32,15 @@ interface Decoded {
   value: Codec;
 }
 
+interface Options {
+  definition?: Definition;
+  setDefinition?: (d: Definition) => Definition;
+}
+
+function noopSetDefinition (d: Definition): Definition {
+  return d;
+}
+
 function isRustEnum (def: Record<string, string | CodecClass> | Record<string, number>): def is Record<string, string | CodecClass> {
   const defValues = Object.values(def);
 
@@ -38,7 +53,7 @@ function isRustEnum (def: Record<string, string | CodecClass> | Record<string, n
   return true;
 }
 
-function extractDef (registry: Registry, _def: Record<string, string | CodecClass> | Record<string, number> | string[]): { def: TypesDef; isBasic: boolean; isIndexed: boolean } {
+function extractDef (registry: Registry, _def: Record<string, string | CodecClass> | Record<string, number> | string[]): Definition {
   const def: TypesDef = {};
   let isBasic: boolean;
   let isIndexed: boolean;
@@ -51,12 +66,10 @@ function extractDef (registry: Registry, _def: Record<string, string | CodecClas
     isBasic = true;
     isIndexed = false;
   } else if (isRustEnum(_def)) {
-    const entries = Object.entries(mapToTypeMap(registry, _def));
+    const [Types, keys] = mapToTypeMap(registry, _def);
 
-    for (let i = 0; i < entries.length; i++) {
-      const [key, Type] = entries[i];
-
-      def[key] = { Type, index: i };
+    for (let i = 0; i < keys.length; i++) {
+      def[keys[i]] = { Type: Types[i], index: i };
     }
 
     isBasic = !Object.values(def).some(({ Type }) => Type !== Null);
@@ -163,8 +176,8 @@ export class Enum implements IEnum {
 
   readonly #raw: Codec;
 
-  constructor (registry: Registry, Types: Record<string, string | CodecClass> | Record<string, number> | string[], value?: unknown, index?: number) {
-    const { def, isBasic, isIndexed } = extractDef(registry, Types);
+  constructor (registry: Registry, Types: Record<string, string | CodecClass> | Record<string, number> | string[], value?: unknown, index?: number, { definition, setDefinition = noopSetDefinition }: Options = {}) {
+    const { def, isBasic, isIndexed } = definition || setDefinition(extractDef(registry, Types));
 
     // shortcut isU8a as used in SCALE decoding
     const decoded = isU8a(value) && value.length && !isNumber(index)
@@ -198,9 +211,15 @@ export class Enum implements IEnum {
       isKeys[i] = `is${name}`;
     }
 
+    let definition: Definition | undefined;
+
+    // eslint-disable-next-line no-return-assign
+    const setDefinition = (d: Definition) =>
+      definition = d;
+
     return class extends Enum {
       constructor (registry: Registry, value?: unknown, index?: number) {
-        super(registry, Types, value, index);
+        super(registry, Types, value, index, { definition, setDefinition });
 
         objectProperties(this, isKeys, (_, i) => this.type === keys[i]);
         objectProperties(this, asKeys, (k, i): Codec => {
@@ -382,15 +401,14 @@ export class Enum implements IEnum {
         : this.defKeys;
     }
 
-    const typeMap = Object
-      .entries(this.#def)
-      .reduce((out: Record<string, CodecClass>, [key, { Type }]) => {
-        out[key] = Type;
+    const entries = Object.entries(this.#def);
 
-        return out;
-      }, {});
+    return typesToMap(this.registry, entries.reduce<[CodecClass[], string[]]>((out, [key, { Type }], i) => {
+      out[0][i] = Type;
+      out[1][i] = key;
 
-    return typesToMap(this.registry, typeMap);
+      return out;
+    }, [new Array<CodecClass>(entries.length), new Array<string>(entries.length)]));
   }
 
   /**
@@ -414,9 +432,11 @@ export class Enum implements IEnum {
    * @param isBare true when the value has none of the type-specific prefixes (internal)
    */
   public toU8a (isBare?: boolean): Uint8Array {
-    return u8aConcat(
-      new Uint8Array(isBare ? [] : [this.index]),
-      this.#raw.toU8a(isBare)
-    );
+    return isBare
+      ? this.#raw.toU8a(isBare)
+      : u8aConcatStrict([
+        new Uint8Array([this.index]),
+        this.#raw.toU8a(isBare)
+      ]);
   }
 }

packages/types-codec/src/base/Option.ts

@@ -9,6 +9,15 @@ import { assert, isCodec, isNull, isU8a, isUndefined, u8aToHex } from '@polkadot
 import { typeToConstructor } from '../utils';
 import { Null } from './Null';
 
+interface Options<T> {
+  definition?: CodecClass<T>;
+  setDefinition?: (d: CodecClass<T>) => CodecClass<T>;
+}
+
+function noopSetDefinition <T extends Codec> (d: CodecClass<T>): CodecClass<T> {
+  return d;
+}
+
 class None extends Null {
   /**
    * @description Returns the base runtime type name for this instance
@@ -60,8 +69,8 @@ export class Option<T extends Codec> implements IOption<T> {
 
   readonly #raw: T;
 
-  constructor (registry: Registry, typeName: CodecClass<T> | string, value?: unknown) {
-    const Type = typeToConstructor(registry, typeName);
+  constructor (registry: Registry, typeName: CodecClass<T> | string, value?: unknown, { definition, setDefinition = noopSetDefinition }: Options<T> = {}) {
+    const Type = definition || setDefinition(typeToConstructor(registry, typeName));
     const decoded = isU8a(value) && value.length && !isCodec(value)
       ? value[0] === 0
         ? new None(registry)
@@ -78,9 +87,17 @@ export class Option<T extends Codec> implements IOption<T> {
   }
 
   public static with<O extends Codec> (Type: CodecClass<O> | string): CodecClass<Option<O>> {
+    let definition: CodecClass<O> | undefined;
+
+    const setDefinition = <T> (d: CodecClass<T>): CodecClass<T> => {
+      definition = d as unknown as CodecClass<O>;
+
+      return d;
+    };
+
     return class extends Option<O> {
       constructor (registry: Registry, value?: unknown) {
-        super(registry, Type, value);
+        super(registry, Type, value, { definition, setDefinition });
       }
     };
   }
@@ -131,7 +148,7 @@ export class Option<T extends Codec> implements IOption<T> {
   /**
    * @description The actual value for the Option
    */
-  public get value (): Codec {
+  public get value (): T {
     return this.#raw;
   }
 

packages/types-codec/src/base/Tuple.ts

@@ -3,47 +3,49 @@
 
 import type { AnyTupleValue, Codec, CodecClass, Inspect, ITuple, Registry } from '../types';
 
-import { isFunction, isHex, isString, isU8a, stringify, u8aConcat, u8aToU8a } from '@polkadot/util';
+import { isFunction, isHex, isString, isU8a, stringify, u8aConcatStrict, u8aToU8a } from '@polkadot/util';
 
 import { AbstractArray } from '../abstract/AbstractArray';
 import { decodeU8a, mapToTypeMap, typeToConstructor } from '../utils';
 
-type TupleCodecClasss = CodecClass[] | {
-  [index: string]: CodecClass;
-};
-
 type TupleType = (CodecClass | string);
 
 type TupleTypes = TupleType[] | {
   [index: string]: CodecClass | string;
 };
 
+type Definition = [CodecClass[], string[]];
+
+interface Options {
+  definition?: Definition;
+  setDefinition?: (d: Definition) => Definition;
+}
+
+function noopSetDefinition (d: Definition): Definition {
+  return d;
+}
+
 /** @internal */
-function decodeTuple (registry: Registry, Classes: TupleCodecClasss, value?: Exclude<AnyTupleValue, Uint8Array>): [Codec[], number] {
+function decodeTuple (registry: Registry, result: Codec[], Classes: Definition, value?: Exclude<AnyTupleValue, Uint8Array>): [Codec[], number] {
   if (isU8a(value) || isHex(value)) {
-    return decodeU8a(registry, u8aToU8a(value), Classes);
+    return decodeU8a(registry, result, u8aToU8a(value), Classes);
   }
 
-  const Types: CodecClass[] = Array.isArray(Classes)
-    ? Classes
-    : Object.values(Classes);
+  const Types = Classes[0];
 
-  return [
-    Types.map((Type, index): Codec => {
-      try {
-        const entry = value?.[index];
+  for (let i = 0; i < Types.length; i++) {
+    try {
+      const entry = value?.[i];
 
-        if (entry instanceof Type) {
-          return entry;
-        }
+      result[i] = entry instanceof Types[i]
+        ? entry
+        : new Types[i](registry, entry);
+    } catch (error) {
+      throw new Error(`Tuple: failed on ${i}:: ${(error as Error).message}`);
+    }
+  }
 
-        return new Type(registry, entry);
-      } catch (error) {
-        throw new Error(`Tuple: failed on ${index}:: ${(error as Error).message}`);
-      }
-    }),
-    0
-  ];
+  return [result, 0];
 }
 
 /**
@@ -53,27 +55,39 @@ function decodeTuple (registry: Registry, Classes: TupleCodecClasss, value?: Exc
  * own type. It extends the base JS `Array` object.
  */
 export class Tuple extends AbstractArray<Codec> implements ITuple<Codec[]> {
-  #Types: TupleCodecClasss;
+  readonly initialU8aLength?: number;
 
-  constructor (registry: Registry, Types: TupleTypes | TupleType, value?: AnyTupleValue) {
-    const Classes = Array.isArray(Types)
-      ? Types.map((t) => typeToConstructor(registry, t))
-      : isFunction(Types) || isString(Types)
-        ? [typeToConstructor(registry, Types)]
-        : mapToTypeMap(registry, Types);
-    const [values, decodedLength] = isU8a(value)
-      ? decodeU8a(registry, value, Classes)
-      : decodeTuple(registry, Classes, value);
+  #Types: Definition;
 
-    super(registry, values, decodedLength);
+  constructor (registry: Registry, Types: TupleTypes | TupleType, value?: AnyTupleValue, { definition, setDefinition = noopSetDefinition }: Options = {}) {
+    const Classes = definition || setDefinition(
+      Array.isArray(Types)
+        ? [Types.map((t) => typeToConstructor(registry, t)), []]
+        : isFunction(Types) || isString(Types)
+          ? [[typeToConstructor(registry, Types)], []]
+          : mapToTypeMap(registry, Types)
+    );
 
+    super(registry, Classes[0].length);
+
+    const [, decodedLength] = isU8a(value)
+      ? decodeU8a(registry, this, value, Classes, false)
+      : decodeTuple(registry, this, Classes, value);
+
+    this.initialU8aLength = decodedLength;
     this.#Types = Classes;
   }
 
   public static with (Types: TupleTypes | TupleType): CodecClass<Tuple> {
+    let definition: Definition | undefined;
+
+    // eslint-disable-next-line no-return-assign
+    const setDefinition = (d: Definition) =>
+      definition = d;
+
     return class extends Tuple {
       constructor (registry: Registry, value?: AnyTupleValue) {
-        super(registry, Types, value);
+        super(registry, Types, value, { definition, setDefinition });
       }
     };
   }
@@ -95,9 +109,9 @@ export class Tuple extends AbstractArray<Codec> implements ITuple<Codec[]> {
    * @description The types definition of the tuple
    */
   public get Types (): string[] {
-    return Array.isArray(this.#Types)
-      ? this.#Types.map((T) => new T(this.registry).toRawType())
-      : Object.keys(this.#Types);
+    return this.#Types[1].length
+      ? this.#Types[1]
+      : this.#Types[0].map((T) => new T(this.registry).toRawType());
   }
 
   /**
@@ -113,11 +127,7 @@ export class Tuple extends AbstractArray<Codec> implements ITuple<Codec[]> {
    * @description Returns the base runtime type name for this instance
    */
   public toRawType (): string {
-    const types = (
-      Array.isArray(this.#Types)
-        ? this.#Types
-        : Object.values(this.#Types)
-    ).map((T) =>
+    const types = this.#Types[0].map((T) =>
       this.registry.getClassName(T) || new T(this.registry).toRawType()
     );
 
@@ -137,6 +147,6 @@ export class Tuple extends AbstractArray<Codec> implements ITuple<Codec[]> {
    * @param isBare true when the value has none of the type-specific prefixes (internal)
    */
   public override toU8a (isBare?: boolean): Uint8Array {
-    return u8aConcat(...this.toU8aInner(isBare));
+    return u8aConcatStrict(this.toU8aInner(isBare));
   }
 }

packages/types-codec/src/base/Vec.ts

@@ -4,7 +4,7 @@
 import type { HexString } from '@polkadot/util/types';
 import type { Codec, CodecClass, Registry } from '../types';
 
-import { assert, compactFromU8a, logger, u8aToU8a } from '@polkadot/util';
+import { assert, compactFromU8aLim, isU8a, logger, u8aToU8a } from '@polkadot/util';
 
 import { AbstractArray } from '../abstract/AbstractArray';
 import { decodeU8aVec, typeToConstructor } from '../utils';
@@ -13,11 +13,33 @@ const MAX_LENGTH = 64 * 1024;
 
 const l = logger('Vec');
 
-export function decodeVec<T extends Codec> (registry: Registry, Type: CodecClass<T>, value: Uint8Array | HexString | unknown[], length = -1): [T[], number, number] {
-  if (Array.isArray(value)) {
-    const result = new Array<T>(value.length);
+interface Options<T> {
+  definition?: CodecClass<T>;
+  setDefinition?: (d: CodecClass<T>) => CodecClass<T>;
+}
 
-    for (let i = 0; i < value.length; i++) {
+function noopSetDefinition <T extends Codec> (d: CodecClass<T>): CodecClass<T> {
+  return d;
+}
+
+function decodeVecLength (value: Uint8Array | HexString | unknown[]): [Uint8Array | unknown[], number, number] {
+  if (Array.isArray(value)) {
+    return [value, value.length, 0];
+  }
+
+  const u8a = u8aToU8a(value);
+  const [startAt, length] = compactFromU8aLim(u8a);
+
+  assert(length <= MAX_LENGTH, () => `Vec length ${length.toString()} exceeds ${MAX_LENGTH}`);
+
+  return [u8a, length, startAt];
+}
+
+export function decodeVec<T extends Codec> (registry: Registry, result: T[], value: Uint8Array | HexString | unknown[], startAt: number, Type: CodecClass<T>): [number, number] {
+  if (Array.isArray(value)) {
+    const count = result.length;
+
+    for (let i = 0; i < count; i++) {
       const entry = value[i];
 
       try {
@@ -31,22 +53,10 @@ export function decodeVec<T extends Codec> (registry: Registry, Type: CodecClass
       }
     }
 
-    return [result, 0, 0];
+    return [0, 0];
   }
 
-  const u8a = u8aToU8a(value);
-  let offset = 0;
-
-  if (length === -1) {
-    const [_offset, _length] = compactFromU8a(u8a);
-
-    assert(_length.lten(MAX_LENGTH), () => `Vec length ${_length.toString()} exceeds ${MAX_LENGTH}`);
-
-    length = _length.toNumber();
-    offset = _offset;
-  }
-
-  return decodeU8aVec(registry, u8a, offset, Type, length);
+  return decodeU8aVec(registry, result, u8aToU8a(value), startAt, Type);
 }
 
 /**
@@ -57,21 +67,34 @@ export function decodeVec<T extends Codec> (registry: Registry, Type: CodecClass
  * specific encoding/decoding on top of the base type.
  */
 export class Vec<T extends Codec> extends AbstractArray<T> {
+  readonly initialU8aLength?: number;
+
   #Type: CodecClass<T>;
 
-  constructor (registry: Registry, Type: CodecClass<T> | string, value: Uint8Array | HexString | unknown[] = []) {
-    const Clazz = typeToConstructor<T>(registry, Type);
-    const [values, decodedLength] = decodeVec(registry, Clazz, value);
+  constructor (registry: Registry, Type: CodecClass<T> | string, value: Uint8Array | HexString | unknown[] = [], { definition, setDefinition = noopSetDefinition }: Options<T> = {}) {
+    const [decodeFrom, length, startAt] = decodeVecLength(value);
 
-    super(registry, values, decodedLength);
+    super(registry, length);
 
-    this.#Type = Clazz;
+    this.#Type = definition || setDefinition(typeToConstructor<T>(registry, Type));
+
+    const [decodedLength] = isU8a(decodeFrom)
+      ? decodeU8aVec(registry, this, decodeFrom, startAt, this.#Type)
+      : decodeVec(registry, this, decodeFrom, startAt, this.#Type);
+
+    this.initialU8aLength = decodedLength;
   }
 
   public static with<O extends Codec> (Type: CodecClass<O> | string): CodecClass<Vec<O>> {
+    let definition: CodecClass<O> | undefined;
+
+    // eslint-disable-next-line no-return-assign
+    const setDefinition = <T> (d: CodecClass<T>) =>
+      (definition = d as unknown as CodecClass<O>) as unknown as CodecClass<T>;
+
     return class extends Vec<O> {
       constructor (registry: Registry, value?: any[]) {
-        super(registry, Type, value);
+        super(registry, Type, value, { definition, setDefinition });
       }
     };
   }

packages/types-codec/src/base/VecFixed.ts

@@ -4,23 +4,19 @@
 import type { HexString } from '@polkadot/util/types';
 import type { Codec, CodecClass, Inspect, Registry } from '../types';
 
-import { assert, isU8a, u8aConcat } from '@polkadot/util';
+import { isU8a, u8aConcatStrict } from '@polkadot/util';
 
 import { AbstractArray } from '../abstract/AbstractArray';
 import { decodeU8aVec, typeToConstructor } from '../utils';
 import { decodeVec } from './Vec';
 
-/** @internal */
-function decodeVecFixed<T extends Codec> (registry: Registry, value: HexString | unknown[], Type: CodecClass<T>, length: number): [T[], number, number] {
-  const [values, decodedLength, decodedLengthNoOffset] = decodeVec(registry, Type, value, length);
+interface Options<T> {
+  definition?: CodecClass<T>;
+  setDefinition?: (d: CodecClass<T>) => CodecClass<T>;
+}
 
-  while (values.length < length) {
-    values.push(new Type(registry));
-  }
-
-  assert(values.length === length, () => `Expected a length of exactly ${length} entries`);
-
-  return [values, decodedLength, decodedLengthNoOffset];
+function noopSetDefinition <T extends Codec> (d: CodecClass<T>): CodecClass<T> {
+  return d;
 }
 
 /**
@@ -29,23 +25,32 @@ function decodeVecFixed<T extends Codec> (registry: Registry, value: HexString |
  * This manages codec arrays of a fixed length
  */
 export class VecFixed<T extends Codec> extends AbstractArray<T> {
+  readonly initialU8aLength?: number;
+
   #Type: CodecClass<T>;
 
-  constructor (registry: Registry, Type: CodecClass<T> | string, length: number, value: Uint8Array | HexString | unknown[] = [] as unknown[]) {
-    const Clazz = typeToConstructor<T>(registry, Type);
-    const [values,, decodedLengthNoOffset] = isU8a(value)
-      ? decodeU8aVec(registry, value, 0, Clazz, length)
-      : decodeVecFixed(registry, value, Clazz, length);
+  constructor (registry: Registry, Type: CodecClass<T> | string, length: number, value: Uint8Array | HexString | unknown[] = [] as unknown[], { definition, setDefinition = noopSetDefinition }: Options<T> = {}) {
+    super(registry, length);
 
-    super(registry, values, decodedLengthNoOffset);
+    this.#Type = definition || setDefinition(typeToConstructor<T>(registry, Type));
 
-    this.#Type = Clazz;
+    const [, decodedLengthNoOffset] = isU8a(value)
+      ? decodeU8aVec(registry, this, value, 0, this.#Type)
+      : decodeVec(registry, this, value, 0, this.#Type);
+
+    this.initialU8aLength = decodedLengthNoOffset;
   }
 
   public static with<O extends Codec> (Type: CodecClass<O> | string, length: number): CodecClass<VecFixed<O>> {
+    let definition: CodecClass<O> | undefined;
+
+    // eslint-disable-next-line no-return-assign
+    const setDefinition = <T> (d: CodecClass<T>) =>
+      (definition = d as unknown as CodecClass<O>) as unknown as CodecClass<T>;
+
     return class extends VecFixed<O> {
       constructor (registry: Registry, value?: any[]) {
-        super(registry, Type, length, value);
+        super(registry, Type, length, value, { definition, setDefinition });
       }
     };
   }
@@ -85,7 +90,7 @@ export class VecFixed<T extends Codec> extends AbstractArray<T> {
     const encoded = this.toU8aInner();
 
     return encoded.length
-      ? u8aConcat(...encoded)
+      ? u8aConcatStrict(encoded)
       : new Uint8Array([]);
   }
 

packages/types-codec/src/extended/BTreeSet.ts

@@ -4,7 +4,7 @@
 import type { HexString } from '@polkadot/util/types';
 import type { AnyJson, Codec, CodecClass, Inspect, ISet, IU8a, Registry } from '../types';
 
-import { compactFromU8a, compactToU8a, isHex, isU8a, logger, stringify, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { compactFromU8aLim, compactToU8a, isHex, isU8a, logger, stringify, u8aConcatStrict, u8aToHex, u8aToU8a } from '@polkadot/util';
 
 import { compareSet, decodeU8aVec, sortSet, typeToConstructor } from '../utils';
 
@@ -13,11 +13,12 @@ const l = logger('BTreeSet');
 /** @internal */
 function decodeSetFromU8a<V extends Codec> (registry: Registry, ValClass: CodecClass<V>, u8a: Uint8Array): [CodecClass<V>, Set<V>, number] {
   const output = new Set<V>();
-  const [offset, length] = compactFromU8a(u8a);
-  const [values, decodedLength] = decodeU8aVec(registry, u8a, offset, ValClass, length.toNumber());
+  const [offset, count] = compactFromU8aLim(u8a);
+  const result = new Array<V>(count);
+  const [decodedLength] = decodeU8aVec(registry, result, u8a, offset, ValClass);
 
-  for (let i = 0; i < values.length; i++) {
-    output.add(values[i]);
+  for (let i = 0; i < count; i++) {
+    output.add(result[i] as unknown as V);
   }
 
   return [ValClass, output, decodedLength];
@@ -214,6 +215,6 @@ export class BTreeSet<V extends Codec = Codec> extends Set<V> implements ISet<V>
       encoded.push(v.toU8a(isBare));
     }
 
-    return u8aConcat(...encoded);
+    return u8aConcatStrict(encoded);
   }
 }

packages/types-codec/src/extended/BitVec.ts

@@ -3,7 +3,7 @@
 
 import type { AnyU8a, Inspect, Registry } from '../types';
 
-import { assert, compactFromU8a, compactToU8a, isString, u8aConcat, u8aToU8a } from '@polkadot/util';
+import { assert, compactFromU8aLim, compactToU8a, isString, u8aConcatStrict, u8aToU8a } from '@polkadot/util';
 
 import { Raw } from '../native/Raw';
 
@@ -14,12 +14,12 @@ function decodeBitVecU8a (value?: Uint8Array): [number, Uint8Array] {
   }
 
   // handle all other Uint8Array inputs, these do have a length prefix which is the number of bits encoded
-  const [offset, length] = compactFromU8a(value);
-  const total = offset + Math.ceil(length.toNumber() / 8);
+  const [offset, length] = compactFromU8aLim(value);
+  const total = offset + Math.ceil(length / 8);
 
   assert(total <= value.length, () => `BitVec: required length less than remainder, expected at least ${total}, found ${value.length}`);
 
-  return [length.toNumber(), value.subarray(offset, total)];
+  return [length, value.subarray(offset, total)];
 }
 
 /** @internal */
@@ -96,6 +96,6 @@ export class BitVec extends Raw {
 
     return isBare
       ? bitVec
-      : u8aConcat(compactToU8a(this.#decodedLength), bitVec);
+      : u8aConcatStrict([compactToU8a(this.#decodedLength), bitVec]);
   }
 }

packages/types-codec/src/extended/Bytes.ts

@@ -3,7 +3,7 @@
 
 import type { AnyU8a, Inspect, Registry } from '../types';
 
-import { assert, compactAddLength, compactFromU8a, compactToU8a, isCodec, isString, isU8a, u8aToU8a } from '@polkadot/util';
+import { assert, compactAddLength, compactFromU8aLim, compactToU8a, isCodec, isString, isU8a, u8aToU8a } from '@polkadot/util';
 
 import { Raw } from '../native/Raw';
 
@@ -17,10 +17,10 @@ function decodeBytesU8a (value: Uint8Array): [Uint8Array, number] {
   }
 
   // handle all other Uint8Array inputs, these do have a length prefix
-  const [offset, length] = compactFromU8a(value);
-  const total = offset + length.toNumber();
+  const [offset, length] = compactFromU8aLim(value);
+  const total = offset + length;
 
-  assert(length.lten(MAX_LENGTH), () => `Bytes length ${length.toString()} exceeds ${MAX_LENGTH}`);
+  assert(length <= MAX_LENGTH, () => `Bytes length ${length.toString()} exceeds ${MAX_LENGTH}`);
   assert(total <= value.length, () => `Bytes: required length less than remainder, expected at least ${total}, found ${value.length}`);
 
   return [value.subarray(offset, total), total];
@@ -54,13 +54,15 @@ export class Bytes extends Raw {
   /**
    * @description Returns a breakdown of the hex encoding for this Codec
    */
-  override inspect (): Inspect {
+  override inspect (isBare?: boolean): Inspect {
     const clength = compactToU8a(this.length);
 
     return {
-      outer: this.length
-        ? [clength, super.toU8a()]
-        : [clength]
+      outer: isBare
+        ? [super.toU8a()]
+        : this.length
+          ? [clength, super.toU8a()]
+          : [clength]
     };
   }
 

packages/types-codec/src/extended/Map.ts

@@ -4,7 +4,7 @@
 import type { HexString } from '@polkadot/util/types';
 import type { AnyJson, Codec, CodecClass, IMap, Inspect, IU8a, Registry } from '../types';
 
-import { compactFromU8a, compactToU8a, isHex, isObject, isU8a, logger, stringify, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { compactFromU8aLim, compactToU8a, isHex, isObject, isU8a, logger, stringify, u8aConcatStrict, u8aToHex, u8aToU8a } from '@polkadot/util';
 
 import { AbstractArray } from '../abstract/AbstractArray';
 import { Enum } from '../base/Enum';
@@ -16,15 +16,14 @@ const l = logger('Map');
 /** @internal */
 function decodeMapFromU8a<K extends Codec, V extends Codec> (registry: Registry, KeyClass: CodecClass<K>, ValClass: CodecClass<V>, u8a: Uint8Array): [CodecClass<K>, CodecClass<V>, Map<K, V>, number] {
   const output = new Map<K, V>();
-  const [offset, length] = compactFromU8a(u8a);
-  const count = length.toNumber();
+  const [offset, count] = compactFromU8aLim(u8a);
   const types = [];
 
   for (let i = 0; i < count; i++) {
     types.push(KeyClass, ValClass);
   }
 
-  const [values, decodedLength] = decodeU8a(registry, u8a.subarray(offset), types);
+  const [values, decodedLength] = decodeU8a(registry, new Array(types.length), u8a.subarray(offset), [types, []]);
 
   for (let i = 0; i < values.length; i += 2) {
     output.set(values[i] as K, values[i + 1] as V);
@@ -231,6 +230,6 @@ export class CodecMap<K extends Codec = Codec, V extends Codec = Codec> extends
       encoded.push(k.toU8a(isBare), v.toU8a(isBare));
     }
 
-    return u8aConcat(...encoded);
+    return u8aConcatStrict(encoded);
   }
 }

packages/types-codec/src/extended/OptionBool.spec.ts

@@ -0,0 +1,47 @@
+// Copyright 2017-2022 @polkadot/types-codec authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { TypeRegistry } from '@polkadot/types';
+import { OptionBool } from '@polkadot/types-codec';
+
+describe('OptionBool', (): void => {
+  const registry = new TypeRegistry();
+
+  describe('decodes', (): void => {
+    it('decodes none', (): void => {
+      expect(new OptionBool(registry).toJSON()).toEqual(null);
+    });
+
+    it('decodes true', (): void => {
+      expect(new OptionBool(registry, true).toJSON()).toEqual(true);
+    });
+
+    it('decodes false', (): void => {
+      expect(new OptionBool(registry, false).toJSON()).toEqual(false);
+    });
+  });
+
+  describe('encodes', (): void => {
+    it('encodes none', (): void => {
+      expect(new OptionBool(registry).toU8a()).toEqual(new Uint8Array([0]));
+    });
+
+    it('encodes true', (): void => {
+      expect(new OptionBool(registry, true).toU8a()).toEqual(new Uint8Array([1]));
+    });
+
+    it('encodes false', (): void => {
+      expect(new OptionBool(registry, false).toU8a()).toEqual(new Uint8Array([2]));
+    });
+  });
+
+  it('has a sane toRawType representation', (): void => {
+    expect(new OptionBool(registry).toRawType()).toEqual('Option<bool>');
+  });
+
+  it('has a sane inspect', (): void => {
+    expect(new OptionBool(registry, true).inspect()).toEqual({
+      outer: [new Uint8Array([1])]
+    });
+  });
+});

packages/types-codec/src/extended/OptionBool.ts

@@ -0,0 +1,98 @@
+// Copyright 2017-2022 @polkadot/types-codec authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { HexString } from '@polkadot/util/types';
+import type { AnyBool, Inspect, Registry } from '../types';
+
+import { isHex, isU8a, u8aToU8a } from '@polkadot/util';
+
+import { Option } from '../base/Option';
+import { bool as Bool } from '../native/Bool';
+
+function decodeU8a (registry: Registry, value: Uint8Array): null | Bool {
+  // Encoded as -
+  //  - 0 = None
+  //  - 1 = True
+  //  - 2 = False
+  return value[0] === 0
+    ? null
+    : new Bool(registry, value[0] === 1);
+}
+
+/**
+ * @name OptionBool
+ * @description A specific implementation of Option<bool> than allows for single-byte encoding
+ */
+export class OptionBool extends Option<Bool> {
+  constructor (registry: Registry, value?: Option<Bool> | AnyBool | Uint8Array | HexString | null) {
+    super(
+      registry,
+      Bool,
+      isU8a(value) || isHex(value)
+        ? decodeU8a(registry, u8aToU8a(value))
+        : value
+    );
+  }
+
+  /**
+   * @description The length of the value when encoded as a Uint8Array
+   */
+  public override get encodedLength (): number {
+    return 1;
+  }
+
+  /**
+   * @description The length of the initial encoded value (Only available when constructed from a Uint8Array)
+   */
+  public override get initialU8aLength (): number {
+    return 1;
+  }
+
+  /**
+   * @description Checks if the value is an empty value (always false)
+   */
+  public get isFalse (): boolean {
+    return this.isSome
+      ? !this.value.valueOf()
+      : false;
+  }
+
+  /**
+   * @description Checks if the value is an empty value (always false)
+   */
+  public get isTrue (): boolean {
+    return this.isSome
+      ? this.value.valueOf()
+      : false;
+  }
+
+  /**
+   * @description Returns a breakdown of the hex encoding for this Codec
+   */
+  override inspect (): Inspect {
+    return { outer: [this.toU8a()] };
+  }
+
+  /**
+   * @description Returns the base runtime type name for this instance
+   */
+  public override toRawType (isBare?: boolean): string {
+    return isBare
+      ? 'bool'
+      : 'Option<bool>';
+  }
+
+  /**
+   * @description Encodes the value as a Uint8Array as per the SCALE specifications
+   * @param isBare true when the value has none of the type-specific prefixes (internal)
+   */
+  public override toU8a (isBare?: boolean): Uint8Array {
+    if (isBare) {
+      return super.toU8a(true);
+    }
+
+    return this.isSome
+      ? new Uint8Array([this.isTrue ? 1 : 2])
+      : new Uint8Array([0]);
+  }
+}

packages/types-codec/src/extended/index.ts

@@ -8,6 +8,7 @@ export { Bytes } from './Bytes';
 export { HashMap } from './HashMap';
 export { Linkage } from './Linkage';
 export { CodecMap, CodecMap as Map } from './Map';
+export { OptionBool } from './OptionBool';
 export { Range } from './Range';
 export { RangeInclusive } from './RangeInclusive';
 export { Type } from './Type';

packages/types-codec/src/native/Bool.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { HexString } from '@polkadot/util/types';
-import type { Codec, Inspect, IU8a, Registry } from '../types';
+import type { AnyBool, Codec, Inspect, IU8a, Registry } from '../types';
 
 import { isU8a, u8aToHex } from '@polkadot/util';
 
@@ -17,8 +17,7 @@ export class bool extends Boolean implements Codec {
 
   public createdAtHash?: IU8a;
 
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  constructor (registry: Registry, value: bool | Boolean | Uint8Array | boolean | number = false) {
+  constructor (registry: Registry, value: bool | AnyBool | Uint8Array | number = false) {
     super(
       isU8a(value)
         ? value[0] === 1

packages/types-codec/src/native/Struct.ts

@@ -2,30 +2,40 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { HexString } from '@polkadot/util/types';
-import type { AnyJson, BareOpts, Codec, CodecClass, CodecClassDef, Inspect, IStruct, IU8a, Registry } from '../types';
+import type { AnyJson, BareOpts, Codec, CodecClass, Inspect, IStruct, IU8a, Registry } from '../types';
 
-import { assert, isBoolean, isFunction, isHex, isObject, isU8a, isUndefined, objectProperties, stringCamelCase, stringify, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { assert, isBoolean, isFunction, isHex, isObject, isU8a, isUndefined, objectProperties, stringCamelCase, stringify, u8aConcatStrict, u8aToHex, u8aToU8a } from '@polkadot/util';
 
 import { compareMap, decodeU8a, mapToTypeMap, typesToMap } from '../utils';
 
 type TypesDef<T = Codec> = Record<string, string | CodecClass<T>>;
 
+type Definition = [CodecClass[], string[]];
+
+interface Options {
+  definition?: Definition;
+  setDefinition?: (d: Definition) => Definition;
+}
+
+function noopSetDefinition (d: Definition): Definition {
+  return d;
+}
+
 /** @internal */
-function decodeStructFromObject (registry: Registry, Types: CodecClassDef, value: any, jsonMap: Map<string, string>): [Iterable<[string, Codec]>, number] {
+function decodeStructFromObject (registry: Registry, [Types, keys]: Definition, value: any, jsonMap: Map<string, string>): [Iterable<[string, Codec]>, number] {
   let jsonObj: Record<string, unknown> | undefined;
-  const inputKeys = Object.keys(Types);
   const typeofArray = Array.isArray(value);
   const typeofMap = value instanceof Map;
 
   assert(typeofArray || typeofMap || isObject(value), () => `Struct: Cannot decode value ${stringify(value)} (typeof ${typeof value}), expected an input object, map or array`);
-  assert(!typeofArray || value.length === inputKeys.length, () => `Struct: Unable to map ${stringify(value)} array to object with known keys ${inputKeys.join(', ')}`);
+  assert(!typeofArray || value.length === keys.length, () => `Struct: Unable to map ${stringify(value)} array to object with known keys ${keys.join(', ')}`);
 
-  const raw = new Array<[string, Codec]>(inputKeys.length);
+  const raw = new Array<[string, Codec]>(keys.length);
 
-  for (let i = 0; i < inputKeys.length; i++) {
-    const key = inputKeys[i];
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
     const jsonKey = jsonMap.get(key) || key;
-    const Type = Types[key];
+    const Type = Types[i];
     let assign: unknown;
 
     try {
@@ -98,17 +108,15 @@ export class Struct<
 
   readonly #jsonMap: Map<keyof S, string>;
 
-  readonly #Types: CodecClassDef;
+  readonly #Types: Definition;
 
-  constructor (registry: Registry, Types: S, value?: V | Map<unknown, unknown> | unknown[] | HexString | null, jsonMap = new Map<string, string>()) {
-    const typeMap = mapToTypeMap(registry, Types);
-    const [decoded, decodedLength] = isU8a(value)
-      ? decodeU8a<Codec, [string, Codec]>(registry, value, typeMap, true)
-      : isHex(value)
-        ? decodeU8a<Codec, [string, Codec]>(registry, u8aToU8a(value), typeMap, true)
-        : value instanceof Struct
-          ? [value as Iterable<[string, Codec]>, 0]
-          : decodeStructFromObject(registry, typeMap, value || {}, jsonMap);
+  constructor (registry: Registry, Types: S, value?: V | Map<unknown, unknown> | unknown[] | HexString | null, jsonMap = new Map<string, string>(), { definition, setDefinition = noopSetDefinition }: Options = {}) {
+    const typeMap = definition || setDefinition(mapToTypeMap(registry, Types));
+    const [decoded, decodedLength] = isU8a(value) || isHex(value)
+      ? decodeU8a<Codec, [string, Codec]>(registry, new Array(typeMap[0].length), u8aToU8a(value), typeMap, true)
+      : value instanceof Struct
+        ? [value as Iterable<[string, Codec]>, 0]
+        : decodeStructFromObject(registry, typeMap, value || {}, jsonMap);
 
     super(decoded);
 
@@ -121,9 +129,15 @@ export class Struct<
   public static with<S extends TypesDef> (Types: S, jsonMap?: Map<string, string>): CodecClass<Struct<S>> {
     const keys = Object.keys(Types);
 
+    let definition: Definition | undefined;
+
+    // eslint-disable-next-line no-return-assign
+    const setDefinition = (d: Definition) =>
+      definition = d;
+
     return class extends Struct<S> {
       constructor (registry: Registry, value?: unknown) {
-        super(registry, Types, value as HexString, jsonMap);
+        super(registry, Types, value as HexString, jsonMap, { definition, setDefinition });
 
         objectProperties(this, keys, (k) => this.get(k));
       }
@@ -134,7 +148,7 @@ export class Struct<
    * @description The available keys for this struct
    */
   public get defKeys (): string[] {
-    return Object.keys(this.#Types);
+    return this.#Types[1];
   }
 
   public getT <T> (key: string): T {
@@ -159,12 +173,10 @@ export class Struct<
    */
   public get Type (): E {
     const result: Record<string, string> = {};
-    const defs = Object.entries(this.#Types);
+    const [Types, keys] = this.#Types;
 
-    for (let i = 0; i < defs.length; i++) {
-      const [key, Type] = defs[i];
-
-      result[key] = new Type(this.registry).toRawType();
+    for (let i = 0; i < keys.length; i++) {
+      result[keys[i]] = new Types[i](this.registry).toRawType();
     }
 
     return result as E;
@@ -219,12 +231,16 @@ export class Struct<
   /**
    * @description Returns a breakdown of the hex encoding for this Codec
    */
-  inspect (): Inspect {
+  inspect (isBare?: BareOpts): Inspect {
     const inner = new Array<Inspect>();
 
     for (const [k, v] of this.entries()) {
       inner.push({
-        ...v.inspect(),
+        ...v.inspect(
+          !isBare || isBoolean(isBare)
+            ? isBare
+            : isBare[k]
+        ),
         name: stringCamelCase(k as string)
       });
     }
@@ -309,6 +325,6 @@ export class Struct<
       }
     }
 
-    return u8aConcat(...encoded);
+    return u8aConcatStrict(encoded);
   }
 }

packages/types-codec/src/native/Text.ts

@@ -2,16 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { HexString } from '@polkadot/util/types';
-import type { AnyU8a, Inspect, IText, IU8a, Registry } from '../types';
+import type { AnyString, AnyU8a, Inspect, IText, IU8a, Registry } from '../types';
 
-import { assert, compactAddLength, compactFromU8a, compactToU8a, hexToU8a, isHex, isString, isU8a, stringToU8a, u8aToHex, u8aToString } from '@polkadot/util';
+import { assert, compactAddLength, compactFromU8aLim, compactToU8a, hexToU8a, isHex, isString, isU8a, stringToU8a, u8aToHex, u8aToString } from '@polkadot/util';
 
 import { Raw } from './Raw';
 
 const MAX_LENGTH = 128 * 1024;
 
 /** @internal */
-function decodeText (value?: null | Text | string | AnyU8a | { toString: () => string }): [string, number] {
+function decodeText (value?: null | AnyString | AnyU8a | { toString: () => string }): [string, number] {
   if (isU8a(value)) {
     if (!value.length) {
       return ['', 0];
@@ -23,10 +23,10 @@ function decodeText (value?: null | Text | string | AnyU8a | { toString: () => s
       return [u8aToString(value), 0];
     }
 
-    const [offset, length] = compactFromU8a(value);
-    const total = offset + length.toNumber();
+    const [offset, length] = compactFromU8aLim(value);
+    const total = offset + length;
 
-    assert(length.lten(MAX_LENGTH), () => `Text: length ${length.toString()} exceeds ${MAX_LENGTH}`);
+    assert(length <= MAX_LENGTH, () => `Text: length ${length.toString()} exceeds ${MAX_LENGTH}`);
     assert(total <= value.length, () => `Text: required length less than remainder, expected at least ${total}, found ${value.length}`);
 
     return [u8aToString(value.subarray(offset, total)), total];
@@ -54,7 +54,7 @@ export class Text extends String implements IText {
 
   #override: string | null = null;
 
-  constructor (registry: Registry, value?: null | Text | string | AnyU8a | { toString: () => string }) {
+  constructor (registry: Registry, value?: null | AnyString | AnyU8a | { toString: () => string }) {
     const [str, decodedLength] = decodeText(value);
 
     super(str);

packages/types-codec/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/types-codec', path: 'auto', type: 'auto', version: '8.5.1' };
+export const packageInfo = { name: '@polkadot/types-codec', path: 'auto', type: 'auto', version: '8.7.1' };

packages/types-codec/src/types/codec.ts

@@ -60,7 +60,7 @@ export interface Codec {
   /**
    * @description Returns a breakdown of the hex encoding for this Codec
    */
-  inspect (): Inspect;
+  inspect (isBare?: BareOpts): Inspect;
 
   /**
    * @description Returns a hex string representation of the value. isLe returns a LE (number-only) representation
@@ -105,8 +105,6 @@ export interface CodecClass<T = Codec> {
   new(registry: Registry, ...args: any[]): T;
 }
 
-export type CodecClassDef<T = Codec> = Record<string, CodecClass<T>>;
-
 export type CodecTo = 'toHex' | 'toJSON' | 'toString' | 'toU8a';
 
 export type ArgsDef = Record<string, CodecClass | string>;

packages/types-codec/src/types/helpers.ts

@@ -10,7 +10,11 @@ export type AnyFunction = (...args: any[]) => any;
 
 export type AnyNumber = BN | bigint | Uint8Array | number | string;
 
-export type AnyString = string | string;
+// eslint-disable-next-line @typescript-eslint/ban-types
+export type AnyString = String | string;
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+export type AnyBool = Boolean | boolean;
 
 export type AnyTuple = Codec[];
 

packages/types-codec/src/utils/decodeU8a.ts

@@ -25,22 +25,18 @@ function getRawType (registry: Registry, Type: CodecClass): string | null {
  * @param result - The result array (will be returned with values pushed)
  * @param types - The array of CodecClass to decode the U8a against.
  */
-export function decodeU8a <T extends Codec = Codec, E = T> (registry: Registry, u8a: Uint8Array, types: CodecClass[] | { [index: string]: CodecClass }, withZip?: boolean): [E[], number] {
-  const [Types, keys]: [CodecClass[], string[]] = Array.isArray(types)
-    ? [types, []]
-    : [Object.values(types), Object.keys(types)];
-
-  const result = new Array<E>(Types.length);
+export function decodeU8a <T extends Codec = Codec, E = T> (registry: Registry, result: unknown[], u8a: Uint8Array, [Types, keys]: [CodecClass[], string[]], withZip?: boolean): [E[], number] {
+  const count = result.length;
   let offset = 0;
 
-  for (let i = 0; i < Types.length; i++) {
+  for (let i = 0; i < count; i++) {
     try {
       const value = new Types[i](registry, u8a.subarray(offset));
 
       offset += value.initialU8aLength || value.encodedLength;
       result[i] = withZip
-        ? [keys[i], value] as unknown as E
-        : value as unknown as E;
+        ? [keys[i], value]
+        : value;
     } catch (error) {
       throw new Error(formatFailure(
         error as Error,
@@ -51,14 +47,14 @@ export function decodeU8a <T extends Codec = Codec, E = T> (registry: Registry,
     }
   }
 
-  return [result, offset];
+  return [result as E[], offset];
 }
 
 // Split from decodeU8a since this is specialized to 1 instance ... yes duplication, but
 // since we have to do less checks (and these are intensive anyway), much faster
-export function decodeU8aVec <T extends Codec = Codec> (registry: Registry, u8a: Uint8Array, start: number, Type: CodecClass<T>, count: number): [T[], number, number] {
-  const result = new Array<T>(count);
-  let offset = start;
+export function decodeU8aVec <T extends Codec = Codec> (registry: Registry, result: unknown[], u8a: Uint8Array, startAt: number, Type: CodecClass<T>): [number, number] {
+  const count = result.length;
+  let offset = startAt;
 
   for (let i = 0; i < count; i++) {
     try {
@@ -75,5 +71,5 @@ export function decodeU8aVec <T extends Codec = Codec> (registry: Registry, u8a:
     }
   }
 
-  return [result, offset, offset - start];
+  return [offset, offset - startAt];
 }

packages/types-codec/src/utils/mapToTypeMap.ts

@@ -8,12 +8,14 @@ import { typeToConstructor } from './typeToConstructor';
 /**
  * @description takes an input map of the form `{ [string]: string | CodecClass }` and returns a map of `{ [string]: CodecClass }`
  */
-export function mapToTypeMap (registry: Registry, input: Record<string, string | CodecClass>): Record<string, CodecClass> {
+export function mapToTypeMap (registry: Registry, input: Record<string, string | CodecClass>): [CodecClass[], string[]] {
   const entries = Object.entries(input);
-  const output: Record<string, CodecClass> = {};
+  const count = entries.length;
+  const output: [CodecClass[], string[]] = [new Array<CodecClass>(count), new Array<string>(count)];
 
   for (let i = 0; i < entries.length; i++) {
-    output[entries[i][0]] = typeToConstructor(registry, entries[i][1]);
+    output[1][i] = entries[i][0];
+    output[0][i] = typeToConstructor(registry, entries[i][1]);
   }
 
   return output;

packages/types-codec/src/utils/sanitize.ts

@@ -45,9 +45,17 @@ const mappings: Mapper[] = [
   // flattens tuples with one value, `(AccountId)` -> `AccountId`
   flattenSingleTuple(),
   // converts ::Type to Type, <T as Trait<I>>::Proposal -> Proposal
-  removeColons()
+  removeColons(),
+  // remove all trailing spaces - this should always be the last
+  trim()
 ];
 
+// given a string, trim it
+export function trim (): Mapper {
+  return (value: string): string =>
+    value.trim();
+}
+
 // given a starting index, find the closing >
 export function findClosing (value: string, start: number): number {
   let depth = 0;
@@ -257,10 +265,11 @@ const sanitizeMap = new Map<string, string>();
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 export function sanitize (value: String | string, options?: SanitizeOptions): string {
-  let result = value.toString();
+  const startValue = value.toString();
+  let result = startValue;
 
   if (!options) {
-    const memoized = sanitizeMap.get(result);
+    const memoized = sanitizeMap.get(startValue);
 
     if (memoized) {
       return memoized;
@@ -271,10 +280,8 @@ export function sanitize (value: String | string, options?: SanitizeOptions): st
     result = mappings[i](result, options);
   }
 
-  result = result.trim();
-
   if (!options) {
-    sanitizeMap.set(value.toString(), result);
+    sanitizeMap.set(startValue, result);
   }
 
   return result;

packages/types-codec/src/utils/typesToMap.ts

@@ -3,14 +3,11 @@
 
 import type { CodecClass, Registry } from '../types';
 
-export function typesToMap (registry: Registry, Types: Record<string, CodecClass>): Record<string, string> {
-  const entries = Object.entries(Types);
+export function typesToMap (registry: Registry, [Types, keys]: [CodecClass[], string[]]): Record<string, string> {
   const result: Record<string, string> = {};
 
-  for (let i = 0; i < entries.length; i++) {
-    const [key, Type] = entries[i];
-
-    result[key] = registry.getClassName(Type) || new Type(registry).toRawType();
+  for (let i = 0; i < keys.length; i++) {
+    result[keys[i]] = registry.getClassName(Types[i]) || new Types[i](registry).toRawType();
   }
 
   return result;

packages/types-create/package.json

@@ -20,14 +20,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/types-codec": "8.5.1",
-    "@polkadot/util": "^9.2.1"
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/types-codec": "8.7.1",
+    "@polkadot/util": "^9.4.1"
   },
   "devDependencies": {
-    "@polkadot/types": "8.5.1"
+    "@polkadot/types": "8.7.1"
   }
 }

packages/types-create/src/create/class.ts

@@ -115,8 +115,16 @@ const infoMapping: Record<TypeDefInfo, (registry: Registry, value: TypeDef) => C
   [TypeDefInfo.Null]: (registry: Registry, _: TypeDef): CodecClass<Codec> =>
     Null,
 
-  [TypeDefInfo.Option]: (registry: Registry, value: TypeDef): CodecClass<Codec> =>
-    createWithSub(Option, value),
+  [TypeDefInfo.Option]: (registry: Registry, value: TypeDef): CodecClass<Codec> => {
+    assert(value.sub && !Array.isArray(value.sub), 'Expected type information for Option');
+
+    // NOTE This is opt-in (unhandled), not by default
+    // if (value.sub.type === 'bool') {
+    //   return OptionBool;
+    // }
+
+    return createWithSub(Option, value);
+  },
 
   [TypeDefInfo.Plain]: (registry: Registry, value: TypeDef): CodecClass<Codec> =>
     registry.getOrUnknown(value.type),
@@ -208,10 +216,15 @@ export function getTypeClass<T extends Codec = Codec> (registry: Registry, typeD
 }
 
 export function createClassUnsafe<T extends Codec = Codec, K extends string = string> (registry: Registry, type: K): CodecClass<T> {
-  return getTypeClass(
-    registry,
-    registry.isLookupType(type)
-      ? registry.lookup.getTypeDef(type)
-      : getTypeDef(type)
+  return (
+    // just retrieve via name, no creation via typeDef
+    registry.getUnsafe(type) ||
+    // we don't have an existing type, create the class via typeDef
+    getTypeClass(
+      registry,
+      registry.isLookupType(type)
+        ? registry.lookup.getTypeDef(type)
+        : getTypeDef(type)
+    )
   );
 }

packages/types-create/src/create/type.ts

@@ -32,13 +32,11 @@ function checkInstance (created: Codec, matcher: Uint8Array): void {
   assert(isOk, () => `${rawType}:: Decoded input doesn't match input, received ${u8aToHex(matcher, 512)} (${matcher.length} bytes), created ${u8aToHex(u8a, 512)} (${u8a.length} bytes)`);
 }
 
-function checkPedantic (created: Codec, [value]: unknown[], isPedantic = false): void {
-  if (isPedantic) {
-    if (isU8a(value)) {
-      checkInstance(created, value);
-    } else if (isHex(value)) {
-      checkInstance(created, u8aToU8a(value));
-    }
+function checkPedantic (created: Codec, [value]: unknown[]): void {
+  if (isU8a(value)) {
+    checkInstance(created, value);
+  } else if (isHex(value)) {
+    checkInstance(created, u8aToU8a(value));
   }
 }
 
@@ -47,7 +45,7 @@ function checkPedantic (created: Codec, [value]: unknown[], isPedantic = false):
 function initType<T extends Codec> (registry: Registry, Type: CodecClass, params: unknown[] = [], { blockHash, isOptional, isPedantic }: CreateOptions = {}): T {
   const created = new (isOptional ? Option.with(Type) : Type)(registry, ...params);
 
-  checkPedantic(created, params, isPedantic);
+  isPedantic && checkPedantic(created, params);
 
   if (blockHash) {
     created.createdAtHash = createTypeUnsafe<IU8a>(registry, 'Hash', [blockHash]);

packages/types-create/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/types-create', path: 'auto', type: 'auto', version: '8.5.1' };
+export const packageInfo = { name: '@polkadot/types-create', path: 'auto', type: 'auto', version: '8.7.1' };

packages/types-known/package.json

@@ -20,14 +20,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.5.1",
+  "version": "8.7.1",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@polkadot/networks": "^9.2.1",
-    "@polkadot/types": "8.5.1",
-    "@polkadot/types-codec": "8.5.1",
-    "@polkadot/types-create": "8.5.1",
-    "@polkadot/util": "^9.2.1"
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/networks": "^9.4.1",
+    "@polkadot/types": "8.7.1",
+    "@polkadot/types-codec": "8.7.1",
+    "@polkadot/types-create": "8.7.1",
+    "@polkadot/util": "^9.4.1"
   }
 }

packages/types-known/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/types-known', path: 'auto', type: 'auto', version: '8.5.1' };
+export const packageInfo = { name: '@polkadot/types-known', path: 'auto', type: 'auto', version: '8.7.1' };

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

@@ -96,7 +96,21 @@ const versioned: OverrideVersionedType[] = [
     })
   },
   {
-    minmax: [1046, 1054],
+    minmax: [1046, 1050],
+    types: objectSpread({}, sharedTypes, addrAccountIdTypes, {
+      CompactAssignments: 'CompactAssignmentsTo257',
+      DispatchInfo: 'DispatchInfoTo244',
+      Heartbeat: 'HeartbeatTo244',
+      Multiplier: 'Fixed64',
+      OpenTip: 'OpenTipTo225',
+      RefCount: 'RefCountTo259',
+      ReferendumInfo: 'ReferendumInfoTo239',
+      StakingLedger: 'StakingLedgerTo223',
+      Weight: 'u32'
+    })
+  },
+  {
+    minmax: [1051, 1054],
     types: objectSpread({}, sharedTypes, addrAccountIdTypes, {
       CompactAssignments: 'CompactAssignmentsTo257',
       DispatchInfo: 'DispatchInfoTo244',

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

@@ -16,7 +16,7 @@ const upgrades: ChainUpgradesRaw = [
   [7812476, 9040], [8010981, 9050], [8073833, 9070], [8555825, 9080], [8945245, 9090],
   [9611377, 9100], [9625129, 9111], [9866422, 9122], [10403784, 9130], [10960765, 9150],
   [11006614, 9151], [11404482, 9160], [11601803, 9170], [12008022, 9180], [12405451, 9190],
-  [12665416, 9200]
+  [12665416, 9200], [12909508, 9220]
 ];
 
 export default upgrades;