[CI Skip] release/stable 16.2.2

skip-checks: true

CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## 16.2.2 Jun 17, 2025
+
+Changes:
+
+- feat(types-codec): Add maximum depth limit in decodeU8a functions ([#6168](https://github.com/polkadot-js/api/pull/6168))
+- bump polkadotjs/common to 13.5.2 ([#6170](https://github.com/polkadot-js/api/pull/6170))
+
+## 16.2.1 Jun 10, 2025
+
+Contributed:
+
+-  feat(api-contract): add support for ink! v6 and pallet-revive compatibility ([#6158](https://github.com/polkadot-js/api/pull/6158))
+
+
 ## 16.1.2 Jun 4, 2025
 
 Changes:

CONTRIBUTORS

@@ -1,7 +1,7 @@
     3512	Jaco                          	Bump deps (#5785)
      164	Tarik Gul                     	Upgrade polkadot/common to 13.5.1 (#6150)
       83	Amaury Martiny                	StatementKind: Regular and Saft (#2303)
-      39	Valentin Fernandez            	16.1.2 (#6165)
+      42	Valentin Fernandez            	16.2.2 (#6171)
       37	Keith Ingram                  	Update contract types and rpc (#4541)
       35	Stefanie Doll                 	Updated child storage parameters (#1709)
       20	Luke Schoen                   	fix: Fixes TypeError: Cannot read property 'vesting' of undefined (#1970)
@@ -35,6 +35,7 @@
        3	Josep M Sobrepere             	docs: improve rpc-provider README (#4719)
        3	KarishmaBothara               	Backward compatibility thing (#3511)
        3	Miguel Hervas                 	Adding RT4 Types (#3007)
+       3	rajk93                        	feat(types-codec): Add maximum depth limit in `decodeU8a` functions (#6168)
        3	Shawn Tabrizi                 	Add `isReadyOrError` when connecting to API (#2577)
        3	YJ                            	feat: Vote interface as U8a (#1061)
        2	Alexander Krupenkin           	Add [u8; 33] type width for U8aFixed type (#2391)
@@ -50,7 +51,6 @@
        2	MOZGIII                       	Follow-up fix after #4665 (#4666)
        2	Paweł Nguyen                  	Fix a minor typo in cookbook blocks docs (#2294)
        2	peetzweg/                     	feat: ink! v5 (#5791)
-       2	rajk93                        	fix: correct BitVec length calculation from bytes to bits in codec (#6152)
        2	rob thijssen                  	nimbus author mapping correction (#5590)
        2	sung wu                       	Update tx.md (#2485)
        2	Veliko                        	Abi constructor takes different parameters (#3347)
@@ -60,6 +60,7 @@
        2	扩散性百万甜面包                      	Typo, deocrateMethod -> decorateMethod (#1594)
        1	Alan Sapede                   	Adds Eth feeHistory & maxPriorityFeePerGas rpc (#4956)
        1	Aleš Ferlan                   	fix: use H160 for address in getTransactionCount (#5472)
+       1	Alex Bean                     	feat(api-contract): add support for ink! v6 and pallet-revive compatibility (#6158)
        1	Alisher A. Khassanov          	Add `offchain_localStorageClear` RPC method (#6070)
        1	Brad Larson                   	[NEW] Support for custom headers with providers (#2423)
        1	Btwiuse Arch                  	Add side effect check workaround (#4994) (#5009)

package.json

@@ -14,10 +14,10 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "versions": {
-    "git": "16.1.2",
+    "git": "16.2.2",
-    "npm": "16.1.2"
+    "npm": "16.2.2"
   },
   "workspaces": [
     "packages/*"
@@ -40,7 +40,7 @@
     "test:one": "polkadot-dev-run-test --env node"
   },
   "devDependencies": {
-    "@polkadot/dev": "^0.83.2",
+    "@polkadot/dev": "^0.83.3",
     "@polkadot/typegen": "workspace:packages/typegen",
     "@types/node": "^22.10.5"
   },

packages/api-augment/package.json

@@ -18,15 +18,15 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/api-base": "16.1.2",
+    "@polkadot/api-base": "16.2.2",
-    "@polkadot/rpc-augment": "16.1.2",
+    "@polkadot/rpc-augment": "16.2.2",
-    "@polkadot/types": "16.1.2",
+    "@polkadot/types": "16.2.2",
-    "@polkadot/types-augment": "16.1.2",
+    "@polkadot/types-augment": "16.2.2",
-    "@polkadot/types-codec": "16.1.2",
+    "@polkadot/types-codec": "16.2.2",
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
     "tslib": "^2.8.1"
   }
 }

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: '16.1.2' };
+export const packageInfo = { name: '@polkadot/api-augment', path: 'auto', type: 'auto', version: '16.2.2' };

packages/api-base/package.json

@@ -18,12 +18,12 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/rpc-core": "16.1.2",
+    "@polkadot/rpc-core": "16.2.2",
-    "@polkadot/types": "16.1.2",
+    "@polkadot/types": "16.2.2",
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
     "rxjs": "^7.8.1",
     "tslib": "^2.8.1"
   }

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: '16.1.2' };
+export const packageInfo = { name: '@polkadot/api-base', path: 'auto', type: 'auto', version: '16.2.2' };

packages/api-contract/package.json

@@ -18,22 +18,22 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/api": "16.1.2",
+    "@polkadot/api": "16.2.2",
-    "@polkadot/api-augment": "16.1.2",
+    "@polkadot/api-augment": "16.2.2",
-    "@polkadot/types": "16.1.2",
+    "@polkadot/types": "16.2.2",
-    "@polkadot/types-codec": "16.1.2",
+    "@polkadot/types-codec": "16.2.2",
-    "@polkadot/types-create": "16.1.2",
+    "@polkadot/types-create": "16.2.2",
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
-    "@polkadot/util-crypto": "^13.5.1",
+    "@polkadot/util-crypto": "^13.5.2",
     "rxjs": "^7.8.1",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "16.1.2",
+    "@polkadot/api-augment": "16.2.2",
-    "@polkadot/keyring": "^13.5.1",
+    "@polkadot/keyring": "^13.5.2",
-    "@polkadot/types-support": "16.1.2"
+    "@polkadot/types-support": "16.2.2"
   }
 }

packages/api-contract/src/Abi/index.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Bytes, Vec } from '@polkadot/types';
-import type { ChainProperties, ContractConstructorSpecLatest, ContractEventParamSpecLatest, ContractMessageParamSpecLatest, ContractMessageSpecLatest, ContractMetadata, ContractMetadataV4, ContractMetadataV5, ContractProjectInfo, ContractTypeSpec, EventRecord } from '@polkadot/types/interfaces';
+import type { ChainProperties, ContractConstructorSpecLatest, ContractEventParamSpecLatest, ContractMessageParamSpecLatest, ContractMessageSpecLatest, ContractMetadata, ContractMetadataV4, ContractMetadataV5, ContractMetadataV6, ContractProjectInfo, ContractTypeSpec, EventRecord } from '@polkadot/types/interfaces';
 import type { Codec, Registry, TypeDef } from '@polkadot/types/types';
 import type { AbiConstructor, AbiEvent, AbiEventParam, AbiMessage, AbiMessageParam, AbiParam, DecodedEvent, DecodedMessage } from '../types.js';
 
@@ -19,12 +19,12 @@ interface AbiJson {
 }
 
 type EventOf<M> = M extends {spec: { events: Vec<infer E>}} ? E : never
-export type ContractMetadataSupported = ContractMetadataV4 | ContractMetadataV5;
+export type ContractMetadataSupported = ContractMetadataV4 | ContractMetadataV5 | ContractMetadataV6;
 type ContractEventSupported = EventOf<ContractMetadataSupported>;
 
 const l = logger('Abi');
 
-const PRIMITIVE_ALWAYS = ['AccountId', 'AccountIndex', 'Address', 'Balance'];
+const PRIMITIVE_ALWAYS = ['AccountId', 'AccountId20', 'AccountIndex', 'Address', 'Balance'];
 
 function findMessage <T extends AbiMessage> (list: T[], messageOrId: T | string | number): T {
   const message = isNumber(messageOrId)
@@ -66,9 +66,28 @@ function getMetadata (registry: Registry, json: AbiJson): ContractMetadataSuppor
   return upgradedMetadata;
 }
 
-function parseJson (json: Record<string, unknown>, chainProperties?: ChainProperties): [Record<string, unknown>, Registry, ContractMetadataSupported, ContractProjectInfo] {
+function isRevive (json: Record<string, unknown>): boolean {
+  const source = json['source'];
+  const version = json['version'];
+
+  const hasContractBinary =
+    typeof source === 'object' &&
+    source !== null &&
+    'contract_binary' in source;
+
+  const hasVersion =
+    typeof version === 'number' && version >= 6;
+
+  return hasContractBinary || hasVersion;
+}
+
+function parseJson (json: Record<string, unknown>, chainProperties?: ChainProperties): [Record<string, unknown>, Registry, ContractMetadataSupported, ContractProjectInfo, boolean] {
   const registry = new TypeRegistry();
-  const info = registry.createType('ContractProjectInfo', json) as unknown as ContractProjectInfo;
+
+  const revive = isRevive(json);
+  const typeName = revive ? 'ContractReviveProjectInfo' : 'ContractProjectInfo';
+
+  const info = registry.createType(typeName, json) as unknown as ContractProjectInfo;
   const metadata = getMetadata(registry, json as unknown as AbiJson);
   const lookup = registry.createType('PortableRegistry', { types: metadata.types }, true);
 
@@ -84,7 +103,7 @@ function parseJson (json: Record<string, unknown>, chainProperties?: ChainProper
     lookup.getTypeDef(id)
   );
 
-  return [json, registry, metadata, info];
+  return [json, registry, metadata, info, revive];
 }
 
 /**
@@ -112,9 +131,10 @@ export class Abi {
   readonly metadata: ContractMetadataSupported;
   readonly registry: Registry;
   readonly environment = new Map<string, TypeDef | Codec>();
+  readonly isRevive: boolean;
 
   constructor (abiJson: Record<string, unknown> | string, chainProperties?: ChainProperties) {
-    [this.json, this.registry, this.metadata, this.info] = parseJson(
+    [this.json, this.registry, this.metadata, this.info, this.isRevive] = parseJson(
       isString(abiJson)
         ? JSON.parse(abiJson) as Record<string, unknown>
         : abiJson,

packages/api-contract/src/Abi/toLatestCompatible.spec.ts

@@ -6,7 +6,7 @@
 import { TypeRegistry } from '@polkadot/types';
 
 import abis from '../test/contracts/index.js';
-import { v0ToLatestCompatible, v1ToLatestCompatible, v2ToLatestCompatible, v3ToLatestCompatible, v4ToLatestCompatible, v5ToLatestCompatible } from './toLatestCompatible.js';
+import { v0ToLatestCompatible, v1ToLatestCompatible, v2ToLatestCompatible, v3ToLatestCompatible, v4ToLatestCompatible, v5ToLatestCompatible, v6ToLatestCompatible } from './toLatestCompatible.js';
 
 describe('v0ToLatestCompatible', (): void => {
   const registry = new TypeRegistry();
@@ -191,3 +191,29 @@ describe('v5ToLatestCompatible', (): void => {
     expect(latest.version.toString()).toEqual('5');
   });
 });
+
+describe('v6ToLatestCompatible', (): void => {
+  const registry = new TypeRegistry();
+  const contract = registry.createType('ContractMetadata', { V6: abis['ink_v6_erc20Metadata'] });
+  const latest = v6ToLatestCompatible(registry, contract.asV6);
+
+  it('has the correct messages', (): void => {
+    expect(
+      latest.spec.messages.map(({ label }) => label.toString())
+    ).toEqual(['total_supply', 'balance_of', 'allowance', 'transfer', 'approve', 'transfer_from']);
+  });
+
+  it('has H160 as the type of balance_of argument', (): void => {
+    const arg = latest.spec.messages.find(
+      (m) => m.label.toString() === 'balance_of'
+    )?.args[0];
+
+    const name = arg?.type.displayName?.[0]?.toString();
+
+    expect(name).toBe('H160');
+  });
+
+  it('has the latest compatible version number', (): void => {
+    expect(latest.version.toString()).toEqual('6');
+  });
+});

packages/api-contract/src/Abi/toLatestCompatible.ts

@@ -1,7 +1,7 @@
 // Copyright 2017-2025 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { ContractMetadataV4, ContractMetadataV5 } from '@polkadot/types/interfaces';
+import type { ContractMetadataV4, ContractMetadataV5, ContractMetadataV6 } from '@polkadot/types/interfaces';
 import type { Registry } from '@polkadot/types/types';
 import type { ContractMetadataSupported } from './index.js';
 
@@ -12,7 +12,7 @@ import { v3ToV4 } from './toV4.js';
 
 // The versions where an enum is used, aka V0 is missing
 // (Order from newest, i.e. we expect more on newest vs oldest)
-export const enumVersions = ['V5', 'V4', 'V3', 'V2', 'V1'] as const;
+export const enumVersions = ['V6', 'V5', 'V4', 'V3', 'V2', 'V1'] as const;
 
 type Versions = typeof enumVersions[number] | 'V0';
 
@@ -24,6 +24,10 @@ function createConverter <I, O> (next: (registry: Registry, input: O) => Contrac
     next(registry, step(registry, input));
 }
 
+export function v6ToLatestCompatible (_registry: Registry, v6: ContractMetadataV6): ContractMetadataV6 {
+  return v6;
+}
+
 export function v5ToLatestCompatible (_registry: Registry, v5: ContractMetadataV5): ContractMetadataV5 {
   return v5;
 }
@@ -38,6 +42,7 @@ export const v1ToLatestCompatible = /*#__PURE__*/ createConverter(v2ToLatestComp
 export const v0ToLatestCompatible = /*#__PURE__*/ createConverter(v1ToLatestCompatible, v0ToV1);
 
 export const convertVersions: [Versions, Converter][] = [
+  ['V6', v6ToLatestCompatible],
   ['V5', v5ToLatestCompatible],
   ['V4', v4ToLatestCompatible],
   ['V3', v3ToLatestCompatible],

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

@@ -16,14 +16,11 @@ export abstract class Base<ApiType extends ApiTypes> {
 
   protected readonly _decorateMethod: DecorateMethod<ApiType>;
   protected readonly _isWeightV1: boolean;
+  protected readonly _isRevive: boolean;
 
   constructor (api: ApiBase<ApiType>, abi: string | Record<string, unknown> | Abi, decorateMethod: DecorateMethod<ApiType>) {
     if (!api || !api.isConnected || !api.tx) {
       throw new Error('Your API has not been initialized correctly and is not connected to a chain');
-    } else if (!api.tx.contracts || !isFunction(api.tx.contracts.instantiateWithCode) || api.tx.contracts.instantiateWithCode.meta.args.length !== 6) {
-      throw new Error('The runtime does not expose api.tx.contracts.instantiateWithCode with storageDepositLimit');
-    } else if (!api.call.contractsApi || !isFunction(api.call.contractsApi.call)) {
-      throw new Error('Your runtime does not expose the api.call.contractsApi.call runtime interfaces');
     }
 
     this.abi = abi instanceof Abi
@@ -32,6 +29,21 @@ export abstract class Base<ApiType extends ApiTypes> {
     this.api = api;
     this._decorateMethod = decorateMethod;
     this._isWeightV1 = !api.registry.createType<WeightV2>('Weight').proofSize;
+    this._isRevive = this.abi.isRevive;
+
+    if (this._isRevive) {
+      if (!api.tx.revive || !isFunction(api.tx.revive.instantiateWithCode) || api.tx.revive.instantiateWithCode.meta.args.length !== 6) {
+        throw new Error('The runtime does not expose api.tx.revive.instantiateWithCode with storageDepositLimit');
+      } else if (!api.call.reviveApi || !isFunction(api.call.reviveApi.call)) {
+        throw new Error('Your runtime does not expose the api.call.reviveApi.call runtime interfaces');
+      }
+    } else {
+      if (!api.tx.contracts || !isFunction(api.tx.contracts.instantiateWithCode) || api.tx.contracts.instantiateWithCode.meta.args.length !== 6) {
+        throw new Error('The runtime does not expose api.tx.contracts.instantiateWithCode with storageDepositLimit');
+      } else if (!api.call.contractsApi || !isFunction(api.call.contractsApi.call)) {
+        throw new Error('Your runtime does not expose the api.call.contractsApi.call runtime interfaces');
+      }
+    }
   }
 
   public get registry (): Registry {

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

@@ -55,7 +55,11 @@ export class Blueprint<ApiType extends ApiTypes> extends Base<ApiType> {
   }
 
   #deploy = (constructorOrId: AbiConstructor | string | number, { gasLimit = BN_ZERO, salt, storageDepositLimit = null, value = BN_ZERO }: BlueprintOptions, params: unknown[]): SubmittableExtrinsic<ApiType, BlueprintSubmittableResult<ApiType>> => {
-    return this.api.tx.contracts.instantiate(
+    const palletTx = this._isRevive
+      ? this.api.tx.revive
+      : this.api.tx.contracts;
+
+    return palletTx.instantiate(
       value,
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore jiggle v1 weights, metadata points to latest
@@ -67,9 +71,23 @@ export class Blueprint<ApiType extends ApiTypes> extends Base<ApiType> {
       this.abi.findConstructor(constructorOrId).toU8a(params),
       encodeSalt(salt)
     ).withResultTransform((result: ISubmittableResult) =>
-      new BlueprintSubmittableResult(result, applyOnEvent(result, ['Instantiated'], ([record]: EventRecord[]) =>
+      new BlueprintSubmittableResult(result,
-        new Contract<ApiType>(this.api, this.abi, record.event.data[1] as AccountId, this._decorateMethod)
+        this._isRevive
-      ))
+          ? (
+            (result.status.isInBlock || result.status.isFinalized)
+              ? new Contract<ApiType>(
+                this.api,
+                this.abi,
+                // your fixed address for revive deployments
+                this.registry.createType('AccountId', '0x'),
+                this._decorateMethod
+              )
+              : undefined
+          )
+          : applyOnEvent(result, ['Instantiated'], ([record]: EventRecord[]) =>
+            new Contract<ApiType>(this.api, this.abi, record.event.data[1] as AccountId, this._decorateMethod)
+          )
+      )
     );
   };
 }

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

@@ -10,8 +10,9 @@ import { toPromiseMethod } from '@polkadot/api';
 import v0contractFlipper from '../test/contracts/ink/v0/flipper.contract.json' assert { type: 'json' };
 import v0abiFlipper from '../test/contracts/ink/v0/flipper.json' assert { type: 'json' };
 import v1contractFlipper from '../test/contracts/ink/v1/flipper.contract.json' assert { type: 'json' };
+import v6contractErc20 from '../test/contracts/ink/v6/erc20.contract.json' assert { type: 'json' };
 import { Code } from './Code.js';
-import { mockApi } from './mock.js';
+import { mockApi, mockReviveApi } from './mock.js';
 
 const v0wasmFlipper = fs.readFileSync(new URL('../test/contracts/ink/v0/flipper.wasm', import.meta.url), 'utf-8');
 
@@ -33,4 +34,14 @@ describe('Code', (): void => {
       () => new Code(mockApi, v1contractFlipper as Record<string, unknown>, null, toPromiseMethod)
     ).not.toThrow();
   });
+
+  it('can construct a revive compatible contract (v6)', (): void => {
+    expect(
+      () => new Code(mockApi, v6contractErc20 as Record<string, unknown>, null, toPromiseMethod)
+    ).toThrow('The runtime does not expose api.tx.revive.instantiateWithCode with storageDepositLimit');
+
+    expect(
+      () => new Code(mockReviveApi, v6contractErc20 as Record<string, unknown>, null, toPromiseMethod)
+    ).not.toThrow();
+  });
 });

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

@@ -68,7 +68,30 @@ export class Code<ApiType extends ApiTypes> extends Base<ApiType> {
   }
 
   #instantiate = (constructorOrId: AbiConstructor | string | number, { gasLimit = BN_ZERO, salt, storageDepositLimit = null, value = BN_ZERO }: BlueprintOptions, params: unknown[]): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> => {
-    return this.api.tx.contracts.instantiateWithCode(
+    const palletTx = this._isRevive ? this.api.tx.revive : this.api.tx.contracts;
+
+    if (this._isRevive) {
+      return palletTx.instantiateWithCode(
+        value,
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore jiggle v1 weights, metadata points to latest
+        this._isWeightV1
+          ? convertWeight(gasLimit).v1Weight
+          : convertWeight(gasLimit).v2Weight,
+        storageDepositLimit,
+        compactAddLength(this.code),
+        this.abi.findConstructor(constructorOrId).toU8a(params),
+        encodeSalt(salt)
+      ).withResultTransform((result: ISubmittableResult) =>
+        new CodeSubmittableResult(
+          result,
+          new Blueprint<ApiType>(this.api, this.abi, this.abi.info.source.hash, this._decorateMethod),
+          new Contract<ApiType>(this.api, this.abi, '0x', this._decorateMethod)
+        )
+      );
+    }
+
+    return palletTx.instantiateWithCode(
       value,
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore jiggle v1 weights, metadata points to latest

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

@@ -4,7 +4,7 @@
 import type { ApiBase } from '@polkadot/api/base';
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
-import type { AccountId, ContractExecResult, EventRecord, Weight, WeightV2 } from '@polkadot/types/interfaces';
+import type { AccountId, AccountId20, ContractExecResult, EventRecord, Weight, WeightV2 } from '@polkadot/types/interfaces';
 import type { ISubmittableResult } from '@polkadot/types/types';
 import type { Abi } from '../Abi/index.js';
 import type { AbiMessage, ContractCallOutcome, ContractOptions, DecodedEvent, WeightAll } from '../types.js';
@@ -52,15 +52,15 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
   /**
    * @description The on-chain address for this contract
    */
-  readonly address: AccountId;
+  readonly address: AccountId | AccountId20;
 
   readonly #query: MapMessageQuery<ApiType> = {};
   readonly #tx: MapMessageTx<ApiType> = {};
 
-  constructor (api: ApiBase<ApiType>, abi: string | Record<string, unknown> | Abi, address: string | AccountId, decorateMethod: DecorateMethod<ApiType>) {
+  constructor (api: ApiBase<ApiType>, abi: string | Record<string, unknown> | Abi, address: string | AccountId | AccountId20, decorateMethod: DecorateMethod<ApiType>) {
     super(api, abi, decorateMethod);
 
-    this.address = this.registry.createType('AccountId', address);
+    this.address = this.registry.createType(this._isRevive ? 'AccountId20' : 'AccountId', address);
 
     this.abi.messages.forEach((m): void => {
       if (isUndefined(this.#tx[m.method])) {
@@ -100,7 +100,9 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
   };
 
   #exec = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, storageDepositLimit = null, value = BN_ZERO }: ContractOptions, params: unknown[]): SubmittableExtrinsic<ApiType> => {
-    return this.api.tx.contracts.call(
+    const palletTx = this._isRevive ? this.api.tx.revive : this.api.tx.contracts;
+
+    return palletTx.call(
       this.address,
       value,
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -134,7 +136,9 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
     return {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       send: this._decorateMethod((origin: string | AccountId | Uint8Array) =>
-        this.api.rx.call.contractsApi.call<ContractExecResult>(
+        (this._isRevive
+          ? this.api.rx.call.reviveApi.call
+          : this.api.rx.call.contractsApi.call)<ContractExecResult>(
           origin,
           this.address,
           value,

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

@@ -29,3 +29,20 @@ export const mockApi = {
     }
   }
 } as unknown as ApiBase<'promise'>;
+
+export const mockReviveApi = {
+  call: {
+    reviveApi: {
+      call: (): never => {
+        throw new Error('mock');
+      }
+    }
+  },
+  isConnected: true,
+  registry,
+  tx: {
+    revive: {
+      instantiateWithCode
+    }
+  }
+} as unknown as ApiBase<'promise'>;

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: '16.1.2' };
+export const packageInfo = { name: '@polkadot/api-contract', path: 'auto', type: 'auto', version: '16.2.2' };

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { ApiPromise } from '@polkadot/api';
-import type { AccountId, Hash } from '@polkadot/types/interfaces';
+import type { AccountId, AccountId20, Hash } from '@polkadot/types/interfaces';
 import type { Abi } from '../Abi/index.js';
 
 import { toPromiseMethod } from '@polkadot/api';
@@ -22,7 +22,7 @@ export class CodePromise extends Code<'promise'> {
 }
 
 export class ContractPromise extends Contract<'promise'> {
-  constructor (api: ApiPromise, abi: string | Record<string, unknown> | Abi, address: string | AccountId) {
+  constructor (api: ApiPromise, abi: string | Record<string, unknown> | Abi, address: string | AccountId | AccountId20) {
     super(api, abi, address, toPromiseMethod);
   }
 }

packages/api-contract/src/test/compare/ink_v6_erc20Contract.test.json

@@ -0,0 +1,418 @@
+[
+  {
+    "info": "Plain",
+    "lookupIndex": 0,
+    "type": "U256",
+    "docs": [],
+    "namespace": "primitive_types::U256",
+    "lookupNameRoot": "PrimitiveTypesU256"
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 1,
+    "type": "[u64;4]",
+    "docs": [],
+    "namespace": "",
+    "length": 4,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 2,
+      "type": "u64",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 2,
+    "type": "u64",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 3,
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage::lazy::mapping::Mapping"
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 4,
+    "type": "H160",
+    "docs": [],
+    "namespace": "primitive_types::H160",
+    "lookupNameRoot": "PrimitiveTypesH160"
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 5,
+    "type": "[u8;20]",
+    "docs": [],
+    "namespace": "",
+    "length": 20,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 6,
+      "type": "u8",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 6,
+    "type": "u8",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 7,
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage_traits::impls::ResolverKey"
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 8,
+    "lookupName": "InkStorageTraitsImplsAutoKey",
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage_traits::impls::AutoKey"
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 9,
+    "lookupName": "InkStorageTraitsImplsManualKey",
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage_traits::impls::ManualKey"
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 10,
+    "type": "Null",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 11,
+    "lookupName": "InkStorageLazyMapping",
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage::lazy::mapping::Mapping"
+  },
+  {
+    "info": "Tuple",
+    "lookupIndex": 12,
+    "type": "(H160,H160)",
+    "docs": [],
+    "namespace": "",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 4,
+        "type": "H160",
+        "docs": [],
+        "namespace": "primitive_types::H160",
+        "lookupNameRoot": "PrimitiveTypesH160"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 4,
+        "type": "H160",
+        "docs": [],
+        "namespace": "primitive_types::H160",
+        "lookupNameRoot": "PrimitiveTypesH160"
+      }
+    ]
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 13,
+    "lookupName": "InkStorageTraitsImplsResolverKey",
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage_traits::impls::ResolverKey"
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 14,
+    "lookupName": "InkStorageTraitsImplsManualKey",
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage_traits::impls::ManualKey"
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 15,
+    "lookupName": "Erc20",
+    "type": "{\"totalSupply\":\"U256\",\"balances\":\"Null\",\"allowances\":\"InkStorageLazyMapping\"}",
+    "docs": [],
+    "namespace": "erc20::erc20::Erc20",
+    "sub": [
+      {
+        "docs": [],
+        "name": "totalSupply",
+        "info": "Plain",
+        "lookupIndex": 0,
+        "type": "U256",
+        "namespace": "primitive_types::U256",
+        "lookupNameRoot": "PrimitiveTypesU256",
+        "typeName": ""
+      },
+      {
+        "docs": [],
+        "name": "balances",
+        "info": "Null",
+        "lookupIndex": 3,
+        "type": "Null",
+        "namespace": "ink_storage::lazy::mapping::Mapping",
+        "typeName": ""
+      },
+      {
+        "docs": [],
+        "name": "allowances",
+        "info": "Null",
+        "lookupIndex": 11,
+        "lookupName": "InkStorageLazyMapping",
+        "type": "Null",
+        "namespace": "ink_storage::lazy::mapping::Mapping",
+        "typeName": ""
+      }
+    ]
+  },
+  {
+    "info": "Result",
+    "lookupIndex": 16,
+    "type": "Result<Null, InkPrimitivesLangError>",
+    "docs": [],
+    "namespace": "Result",
+    "sub": [
+      {
+        "name": "Ok",
+        "info": "Null",
+        "lookupIndex": 10,
+        "type": "Null",
+        "docs": [],
+        "namespace": ""
+      },
+      {
+        "name": "Error",
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 17,
+        "lookupName": "InkPrimitivesLangError",
+        "type": "Lookup17"
+      }
+    ]
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 17,
+    "lookupName": "InkPrimitivesLangError",
+    "type": "{\"_enum\":[\"__Unused0\",\"CouldNotReadInput\"]}",
+    "docs": [],
+    "namespace": "ink_primitives::LangError",
+    "sub": [
+      {
+        "index": 0,
+        "info": "Null",
+        "name": "__Unused0",
+        "type": "Null"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 1,
+        "name": "CouldNotReadInput"
+      }
+    ]
+  },
+  {
+    "info": "Result",
+    "lookupIndex": 18,
+    "type": "Result<U256, InkPrimitivesLangError>",
+    "docs": [],
+    "namespace": "Result",
+    "sub": [
+      {
+        "name": "Ok",
+        "info": "Plain",
+        "lookupIndex": 0,
+        "type": "U256",
+        "docs": [],
+        "namespace": "primitive_types::U256",
+        "lookupNameRoot": "PrimitiveTypesU256"
+      },
+      {
+        "name": "Error",
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 17,
+        "lookupName": "InkPrimitivesLangError",
+        "type": "Lookup17"
+      }
+    ]
+  },
+  {
+    "info": "Result",
+    "lookupIndex": 19,
+    "type": "Result<Result<Null, Erc20Error>, InkPrimitivesLangError>",
+    "docs": [],
+    "namespace": "Result",
+    "sub": [
+      {
+        "name": "Ok",
+        "info": "Result",
+        "lookupIndex": 20,
+        "type": "Result<Null, Erc20Error>",
+        "docs": [],
+        "namespace": "Result",
+        "sub": [
+          {
+            "name": "Ok",
+            "info": "Null",
+            "lookupIndex": 10,
+            "type": "Null",
+            "docs": [],
+            "namespace": ""
+          },
+          {
+            "name": "Error",
+            "docs": [],
+            "info": "Si",
+            "lookupIndex": 21,
+            "lookupName": "Erc20Error",
+            "type": "Lookup21"
+          }
+        ]
+      },
+      {
+        "name": "Error",
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 17,
+        "lookupName": "InkPrimitivesLangError",
+        "type": "Lookup17"
+      }
+    ]
+  },
+  {
+    "info": "Result",
+    "lookupIndex": 20,
+    "type": "Result<Null, Erc20Error>",
+    "docs": [],
+    "namespace": "Result",
+    "sub": [
+      {
+        "name": "Ok",
+        "info": "Null",
+        "lookupIndex": 10,
+        "type": "Null",
+        "docs": [],
+        "namespace": ""
+      },
+      {
+        "name": "Error",
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 21,
+        "lookupName": "Erc20Error",
+        "type": "Lookup21"
+      }
+    ]
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 21,
+    "lookupName": "Erc20Error",
+    "type": "{\"_enum\":[\"InsufficientBalance\",\"InsufficientAllowance\"]}",
+    "docs": [],
+    "namespace": "erc20::erc20::Error",
+    "sub": [
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 0,
+        "name": "InsufficientBalance"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 1,
+        "name": "InsufficientAllowance"
+      }
+    ]
+  },
+  {
+    "info": "Option",
+    "lookupIndex": 22,
+    "type": "Option<H160>",
+    "docs": [],
+    "namespace": "Option",
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 4,
+      "type": "H160",
+      "docs": [],
+      "namespace": "primitive_types::H160",
+      "lookupNameRoot": "PrimitiveTypesH160"
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 23,
+    "type": "AccountId",
+    "docs": [],
+    "namespace": "ink_primitives::types::AccountId",
+    "lookupNameRoot": "InkPrimitivesAccountId"
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 24,
+    "type": "[u8;32]",
+    "docs": [],
+    "namespace": "",
+    "length": 32,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 6,
+      "type": "u8",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 25,
+    "type": "u128",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 26,
+    "type": "Hash",
+    "docs": [],
+    "namespace": "ink_primitives::types::Hash",
+    "lookupNameRoot": "InkPrimitivesHash"
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 27,
+    "type": "u32",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 28,
+    "type": "NoChainExtension",
+    "docs": [],
+    "namespace": "ink_primitives::types::NoChainExtension",
+    "lookupNameRoot": "InkPrimitivesNoChainExtension"
+  }
+]

packages/api-contract/src/test/compare/ink_v6_erc20Metadata.test.json

@@ -0,0 +1,418 @@
+[
+  {
+    "info": "Plain",
+    "lookupIndex": 0,
+    "type": "U256",
+    "docs": [],
+    "namespace": "primitive_types::U256",
+    "lookupNameRoot": "PrimitiveTypesU256"
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 1,
+    "type": "[u64;4]",
+    "docs": [],
+    "namespace": "",
+    "length": 4,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 2,
+      "type": "u64",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 2,
+    "type": "u64",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 3,
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage::lazy::mapping::Mapping"
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 4,
+    "type": "H160",
+    "docs": [],
+    "namespace": "primitive_types::H160",
+    "lookupNameRoot": "PrimitiveTypesH160"
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 5,
+    "type": "[u8;20]",
+    "docs": [],
+    "namespace": "",
+    "length": 20,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 6,
+      "type": "u8",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 6,
+    "type": "u8",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 7,
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage_traits::impls::ResolverKey"
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 8,
+    "lookupName": "InkStorageTraitsImplsAutoKey",
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage_traits::impls::AutoKey"
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 9,
+    "lookupName": "InkStorageTraitsImplsManualKey",
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage_traits::impls::ManualKey"
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 10,
+    "type": "Null",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 11,
+    "lookupName": "InkStorageLazyMapping",
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage::lazy::mapping::Mapping"
+  },
+  {
+    "info": "Tuple",
+    "lookupIndex": 12,
+    "type": "(H160,H160)",
+    "docs": [],
+    "namespace": "",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 4,
+        "type": "H160",
+        "docs": [],
+        "namespace": "primitive_types::H160",
+        "lookupNameRoot": "PrimitiveTypesH160"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 4,
+        "type": "H160",
+        "docs": [],
+        "namespace": "primitive_types::H160",
+        "lookupNameRoot": "PrimitiveTypesH160"
+      }
+    ]
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 13,
+    "lookupName": "InkStorageTraitsImplsResolverKey",
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage_traits::impls::ResolverKey"
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 14,
+    "lookupName": "InkStorageTraitsImplsManualKey",
+    "type": "Null",
+    "docs": [],
+    "namespace": "ink_storage_traits::impls::ManualKey"
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 15,
+    "lookupName": "Erc20",
+    "type": "{\"totalSupply\":\"U256\",\"balances\":\"Null\",\"allowances\":\"InkStorageLazyMapping\"}",
+    "docs": [],
+    "namespace": "erc20::erc20::Erc20",
+    "sub": [
+      {
+        "docs": [],
+        "name": "totalSupply",
+        "info": "Plain",
+        "lookupIndex": 0,
+        "type": "U256",
+        "namespace": "primitive_types::U256",
+        "lookupNameRoot": "PrimitiveTypesU256",
+        "typeName": ""
+      },
+      {
+        "docs": [],
+        "name": "balances",
+        "info": "Null",
+        "lookupIndex": 3,
+        "type": "Null",
+        "namespace": "ink_storage::lazy::mapping::Mapping",
+        "typeName": ""
+      },
+      {
+        "docs": [],
+        "name": "allowances",
+        "info": "Null",
+        "lookupIndex": 11,
+        "lookupName": "InkStorageLazyMapping",
+        "type": "Null",
+        "namespace": "ink_storage::lazy::mapping::Mapping",
+        "typeName": ""
+      }
+    ]
+  },
+  {
+    "info": "Result",
+    "lookupIndex": 16,
+    "type": "Result<Null, InkPrimitivesLangError>",
+    "docs": [],
+    "namespace": "Result",
+    "sub": [
+      {
+        "name": "Ok",
+        "info": "Null",
+        "lookupIndex": 10,
+        "type": "Null",
+        "docs": [],
+        "namespace": ""
+      },
+      {
+        "name": "Error",
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 17,
+        "lookupName": "InkPrimitivesLangError",
+        "type": "Lookup17"
+      }
+    ]
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 17,
+    "lookupName": "InkPrimitivesLangError",
+    "type": "{\"_enum\":[\"__Unused0\",\"CouldNotReadInput\"]}",
+    "docs": [],
+    "namespace": "ink_primitives::LangError",
+    "sub": [
+      {
+        "index": 0,
+        "info": "Null",
+        "name": "__Unused0",
+        "type": "Null"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 1,
+        "name": "CouldNotReadInput"
+      }
+    ]
+  },
+  {
+    "info": "Result",
+    "lookupIndex": 18,
+    "type": "Result<U256, InkPrimitivesLangError>",
+    "docs": [],
+    "namespace": "Result",
+    "sub": [
+      {
+        "name": "Ok",
+        "info": "Plain",
+        "lookupIndex": 0,
+        "type": "U256",
+        "docs": [],
+        "namespace": "primitive_types::U256",
+        "lookupNameRoot": "PrimitiveTypesU256"
+      },
+      {
+        "name": "Error",
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 17,
+        "lookupName": "InkPrimitivesLangError",
+        "type": "Lookup17"
+      }
+    ]
+  },
+  {
+    "info": "Result",
+    "lookupIndex": 19,
+    "type": "Result<Result<Null, Erc20Error>, InkPrimitivesLangError>",
+    "docs": [],
+    "namespace": "Result",
+    "sub": [
+      {
+        "name": "Ok",
+        "info": "Result",
+        "lookupIndex": 20,
+        "type": "Result<Null, Erc20Error>",
+        "docs": [],
+        "namespace": "Result",
+        "sub": [
+          {
+            "name": "Ok",
+            "info": "Null",
+            "lookupIndex": 10,
+            "type": "Null",
+            "docs": [],
+            "namespace": ""
+          },
+          {
+            "name": "Error",
+            "docs": [],
+            "info": "Si",
+            "lookupIndex": 21,
+            "lookupName": "Erc20Error",
+            "type": "Lookup21"
+          }
+        ]
+      },
+      {
+        "name": "Error",
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 17,
+        "lookupName": "InkPrimitivesLangError",
+        "type": "Lookup17"
+      }
+    ]
+  },
+  {
+    "info": "Result",
+    "lookupIndex": 20,
+    "type": "Result<Null, Erc20Error>",
+    "docs": [],
+    "namespace": "Result",
+    "sub": [
+      {
+        "name": "Ok",
+        "info": "Null",
+        "lookupIndex": 10,
+        "type": "Null",
+        "docs": [],
+        "namespace": ""
+      },
+      {
+        "name": "Error",
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 21,
+        "lookupName": "Erc20Error",
+        "type": "Lookup21"
+      }
+    ]
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 21,
+    "lookupName": "Erc20Error",
+    "type": "{\"_enum\":[\"InsufficientBalance\",\"InsufficientAllowance\"]}",
+    "docs": [],
+    "namespace": "erc20::erc20::Error",
+    "sub": [
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 0,
+        "name": "InsufficientBalance"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 1,
+        "name": "InsufficientAllowance"
+      }
+    ]
+  },
+  {
+    "info": "Option",
+    "lookupIndex": 22,
+    "type": "Option<H160>",
+    "docs": [],
+    "namespace": "Option",
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 4,
+      "type": "H160",
+      "docs": [],
+      "namespace": "primitive_types::H160",
+      "lookupNameRoot": "PrimitiveTypesH160"
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 23,
+    "type": "AccountId",
+    "docs": [],
+    "namespace": "ink_primitives::types::AccountId",
+    "lookupNameRoot": "InkPrimitivesAccountId"
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 24,
+    "type": "[u8;32]",
+    "docs": [],
+    "namespace": "",
+    "length": 32,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 6,
+      "type": "u8",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 25,
+    "type": "u128",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 26,
+    "type": "Hash",
+    "docs": [],
+    "namespace": "ink_primitives::types::Hash",
+    "lookupNameRoot": "InkPrimitivesHash"
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 27,
+    "type": "u32",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 28,
+    "type": "NoChainExtension",
+    "docs": [],
+    "namespace": "ink_primitives::types::NoChainExtension",
+    "lookupNameRoot": "InkPrimitivesNoChainExtension"
+  }
+]

packages/api-contract/src/test/contracts/ink/index.ts

@@ -8,5 +8,6 @@ import * as v2 from './v2/index.js';
 import * as v3 from './v3/index.js';
 import * as v4 from './v4/index.js';
 import * as v5 from './v5/index.js';
+import * as v6 from './v6/index.js';
 
-export default createVersionedExport({ v0, v1, v2, v3, v4, v5 });
+export default createVersionedExport({ v0, v1, v2, v3, v4, v5, v6 });

packages/api-contract/src/test/contracts/ink/v6/index.ts

@@ -0,0 +1,5 @@
+// Copyright 2017-2025 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export { default as erc20Contract } from './erc20.contract.json' assert { type: 'json' };
+export { default as erc20Metadata } from './erc20.json' assert { type: 'json' };

packages/api-derive/package.json

@@ -18,25 +18,25 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/api": "16.1.2",
+    "@polkadot/api": "16.2.2",
-    "@polkadot/api-augment": "16.1.2",
+    "@polkadot/api-augment": "16.2.2",
-    "@polkadot/api-base": "16.1.2",
+    "@polkadot/api-base": "16.2.2",
-    "@polkadot/rpc-core": "16.1.2",
+    "@polkadot/rpc-core": "16.2.2",
-    "@polkadot/types": "16.1.2",
+    "@polkadot/types": "16.2.2",
-    "@polkadot/types-codec": "16.1.2",
+    "@polkadot/types-codec": "16.2.2",
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
-    "@polkadot/util-crypto": "^13.5.1",
+    "@polkadot/util-crypto": "^13.5.2",
     "rxjs": "^7.8.1",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@polkadot/api": "16.1.2",
+    "@polkadot/api": "16.2.2",
-    "@polkadot/api-augment": "16.1.2",
+    "@polkadot/api-augment": "16.2.2",
-    "@polkadot/rpc-augment": "16.1.2",
+    "@polkadot/rpc-augment": "16.2.2",
-    "@polkadot/rpc-provider": "16.1.2",
+    "@polkadot/rpc-provider": "16.2.2",
-    "@polkadot/types-support": "16.1.2"
+    "@polkadot/types-support": "16.2.2"
   }
 }

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: '16.1.2' };
+export const packageInfo = { name: '@polkadot/api-derive', path: 'auto', type: 'auto', version: '16.2.2' };

packages/api/package.json

@@ -18,29 +18,29 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/api-augment": "16.1.2",
+    "@polkadot/api-augment": "16.2.2",
-    "@polkadot/api-base": "16.1.2",
+    "@polkadot/api-base": "16.2.2",
-    "@polkadot/api-derive": "16.1.2",
+    "@polkadot/api-derive": "16.2.2",
-    "@polkadot/keyring": "^13.5.1",
+    "@polkadot/keyring": "^13.5.2",
-    "@polkadot/rpc-augment": "16.1.2",
+    "@polkadot/rpc-augment": "16.2.2",
-    "@polkadot/rpc-core": "16.1.2",
+    "@polkadot/rpc-core": "16.2.2",
-    "@polkadot/rpc-provider": "16.1.2",
+    "@polkadot/rpc-provider": "16.2.2",
-    "@polkadot/types": "16.1.2",
+    "@polkadot/types": "16.2.2",
-    "@polkadot/types-augment": "16.1.2",
+    "@polkadot/types-augment": "16.2.2",
-    "@polkadot/types-codec": "16.1.2",
+    "@polkadot/types-codec": "16.2.2",
-    "@polkadot/types-create": "16.1.2",
+    "@polkadot/types-create": "16.2.2",
-    "@polkadot/types-known": "16.1.2",
+    "@polkadot/types-known": "16.2.2",
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
-    "@polkadot/util-crypto": "^13.5.1",
+    "@polkadot/util-crypto": "^13.5.2",
     "eventemitter3": "^5.0.1",
     "rxjs": "^7.8.1",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "16.1.2",
+    "@polkadot/api-augment": "16.2.2",
-    "@polkadot/types-support": "16.1.2"
+    "@polkadot/types-support": "16.2.2"
   }
 }

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: '16.1.2' };
+export const packageInfo = { name: '@polkadot/api', path: 'auto', type: 'auto', version: '16.2.2' };

packages/rpc-augment/package.json

@@ -18,13 +18,13 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/rpc-core": "16.1.2",
+    "@polkadot/rpc-core": "16.2.2",
-    "@polkadot/types": "16.1.2",
+    "@polkadot/types": "16.2.2",
-    "@polkadot/types-codec": "16.1.2",
+    "@polkadot/types-codec": "16.2.2",
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
     "tslib": "^2.8.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: '16.1.2' };
+export const packageInfo = { name: '@polkadot/rpc-augment', path: 'auto', type: 'auto', version: '16.2.2' };

packages/rpc-core/package.json

@@ -18,18 +18,18 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/rpc-augment": "16.1.2",
+    "@polkadot/rpc-augment": "16.2.2",
-    "@polkadot/rpc-provider": "16.1.2",
+    "@polkadot/rpc-provider": "16.2.2",
-    "@polkadot/types": "16.1.2",
+    "@polkadot/types": "16.2.2",
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
     "rxjs": "^7.8.1",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^13.5.1",
+    "@polkadot/keyring": "^13.5.2",
-    "@polkadot/rpc-augment": "16.1.2"
+    "@polkadot/rpc-augment": "16.2.2"
   }
 }

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: '16.1.2' };
+export const packageInfo = { name: '@polkadot/rpc-core', path: 'auto', type: 'auto', version: '16.2.2' };

packages/rpc-provider/package.json

@@ -18,17 +18,17 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/keyring": "^13.5.1",
+    "@polkadot/keyring": "^13.5.2",
-    "@polkadot/types": "16.1.2",
+    "@polkadot/types": "16.2.2",
-    "@polkadot/types-support": "16.1.2",
+    "@polkadot/types-support": "16.2.2",
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
-    "@polkadot/util-crypto": "^13.5.1",
+    "@polkadot/util-crypto": "^13.5.2",
-    "@polkadot/x-fetch": "^13.5.1",
+    "@polkadot/x-fetch": "^13.5.2",
-    "@polkadot/x-global": "^13.5.1",
+    "@polkadot/x-global": "^13.5.2",
-    "@polkadot/x-ws": "^13.5.1",
+    "@polkadot/x-ws": "^13.5.2",
     "eventemitter3": "^5.0.1",
     "mock-socket": "^9.3.1",
     "nock": "^13.5.5",

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: '16.1.2' };
+export const packageInfo = { name: '@polkadot/rpc-provider', path: 'auto', type: 'auto', version: '16.2.2' };

packages/typegen/package.json

@@ -18,7 +18,7 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "bin": {
     "polkadot-types-chain-info": "./scripts/polkadot-types-chain-info.mjs",
@@ -28,19 +28,19 @@
     "polkadot-types-internal-metadata": "./scripts/polkadot-types-internal-metadata.mjs"
   },
   "dependencies": {
-    "@polkadot/api": "16.1.2",
+    "@polkadot/api": "16.2.2",
-    "@polkadot/api-augment": "16.1.2",
+    "@polkadot/api-augment": "16.2.2",
-    "@polkadot/api-derive": "16.1.2",
+    "@polkadot/api-derive": "16.2.2",
-    "@polkadot/rpc-augment": "16.1.2",
+    "@polkadot/rpc-augment": "16.2.2",
-    "@polkadot/rpc-provider": "16.1.2",
+    "@polkadot/rpc-provider": "16.2.2",
-    "@polkadot/types": "16.1.2",
+    "@polkadot/types": "16.2.2",
-    "@polkadot/types-augment": "16.1.2",
+    "@polkadot/types-augment": "16.2.2",
-    "@polkadot/types-codec": "16.1.2",
+    "@polkadot/types-codec": "16.2.2",
-    "@polkadot/types-create": "16.1.2",
+    "@polkadot/types-create": "16.2.2",
-    "@polkadot/types-support": "16.1.2",
+    "@polkadot/types-support": "16.2.2",
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
-    "@polkadot/util-crypto": "^13.5.1",
+    "@polkadot/util-crypto": "^13.5.2",
-    "@polkadot/x-ws": "^13.5.1",
+    "@polkadot/x-ws": "^13.5.2",
     "comment-parser": "^1.4.1",
     "handlebars": "^4.7.8",
     "tslib": "^2.8.1",

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: '16.1.2' };
+export const packageInfo = { name: '@polkadot/typegen', path: 'auto', type: 'auto', version: '16.2.2' };

packages/types-augment/package.json

@@ -18,12 +18,12 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/types": "16.1.2",
+    "@polkadot/types": "16.2.2",
-    "@polkadot/types-codec": "16.1.2",
+    "@polkadot/types-codec": "16.2.2",
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
     "tslib": "^2.8.1"
   }
 }

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: '16.1.2' };
+export const packageInfo = { name: '@polkadot/types-augment', path: 'auto', type: 'auto', version: '16.2.2' };

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

@@ -25,7 +25,7 @@ import type { StatementKind } from '@polkadot/types/interfaces/claims';
 import type { CollectiveOrigin, MemberCount, ProposalIndex, Votes, VotesTo230 } from '@polkadot/types/interfaces/collective';
 import type { AuthorityId, RawVRFOutput } from '@polkadot/types/interfaces/consensus';
 import type { AliveContractInfo, CodeHash, CodeSource, CodeUploadRequest, CodeUploadResult, CodeUploadResultValue, ContractCallFlags, ContractCallRequest, ContractExecResult, ContractExecResultOk, ContractExecResultResult, ContractExecResultSuccessTo255, ContractExecResultSuccessTo260, ContractExecResultTo255, ContractExecResultTo260, ContractExecResultTo267, ContractExecResultU64, ContractInfo, ContractInstantiateResult, ContractInstantiateResultTo267, ContractInstantiateResultTo299, ContractInstantiateResultU64, ContractReturnFlags, ContractStorageKey, DeletedContract, ExecReturnValue, Gas, HostFnWeights, HostFnWeightsTo264, InstantiateRequest, InstantiateRequestV1, InstantiateRequestV2, InstantiateReturnValue, InstantiateReturnValueOk, InstantiateReturnValueTo267, InstructionWeights, Limits, LimitsTo264, PrefabWasmModule, RentProjection, Schedule, ScheduleTo212, ScheduleTo258, ScheduleTo264, SeedOf, StorageDeposit, TombstoneContractInfo, TrieId } from '@polkadot/types/interfaces/contracts';
-import type { ContractConstructorSpecLatest, ContractConstructorSpecV0, ContractConstructorSpecV1, ContractConstructorSpecV2, ContractConstructorSpecV3, ContractConstructorSpecV4, ContractContractSpecV0, ContractContractSpecV1, ContractContractSpecV2, ContractContractSpecV3, ContractContractSpecV4, ContractContractSpecV5, ContractCryptoHasher, ContractDiscriminant, ContractDisplayName, ContractEnvironmentV4, ContractEventParamSpecLatest, ContractEventParamSpecV0, ContractEventParamSpecV2, ContractEventSpecLatest, ContractEventSpecV0, ContractEventSpecV1, ContractEventSpecV2, ContractEventSpecV3, ContractLayoutArray, ContractLayoutCell, ContractLayoutEnum, ContractLayoutHash, ContractLayoutHashingStrategy, ContractLayoutKey, ContractLayoutStruct, ContractLayoutStructField, ContractMessageParamSpecLatest, ContractMessageParamSpecV0, ContractMessageParamSpecV2, ContractMessageSpecLatest, ContractMessageSpecV0, ContractMessageSpecV1, ContractMessageSpecV2, ContractMessageSpecV3, ContractMetadata, ContractMetadataLatest, ContractMetadataV0, ContractMetadataV1, ContractMetadataV2, ContractMetadataV3, ContractMetadataV4, ContractMetadataV5, ContractProject, ContractProjectContract, ContractProjectInfo, ContractProjectSource, ContractProjectV0, ContractSelector, ContractStorageLayout, ContractTypeSpec } from '@polkadot/types/interfaces/contractsAbi';
+import type { ContractConstructorSpecLatest, ContractConstructorSpecV0, ContractConstructorSpecV1, ContractConstructorSpecV2, ContractConstructorSpecV3, ContractConstructorSpecV4, ContractContractSpecV0, ContractContractSpecV1, ContractContractSpecV2, ContractContractSpecV3, ContractContractSpecV4, ContractContractSpecV5, ContractContractSpecV6, ContractCryptoHasher, ContractDiscriminant, ContractDisplayName, ContractEnvironmentV4, ContractEventParamSpecLatest, ContractEventParamSpecV0, ContractEventParamSpecV2, ContractEventSpecLatest, ContractEventSpecV0, ContractEventSpecV1, ContractEventSpecV2, ContractEventSpecV3, ContractLayoutArray, ContractLayoutCell, ContractLayoutEnum, ContractLayoutHash, ContractLayoutHashingStrategy, ContractLayoutKey, ContractLayoutStruct, ContractLayoutStructField, ContractMessageParamSpecLatest, ContractMessageParamSpecV0, ContractMessageParamSpecV2, ContractMessageSpecLatest, ContractMessageSpecV0, ContractMessageSpecV1, ContractMessageSpecV2, ContractMessageSpecV3, ContractMetadata, ContractMetadataLatest, ContractMetadataV0, ContractMetadataV1, ContractMetadataV2, ContractMetadataV3, ContractMetadataV4, ContractMetadataV5, ContractMetadataV6, ContractProject, ContractProjectContract, ContractProjectInfo, ContractProjectSource, ContractProjectV0, ContractReviveProjectInfo, ContractReviveProjectSource, ContractSelector, ContractStorageLayout, ContractTypeSpec } from '@polkadot/types/interfaces/contractsAbi';
 import type { FundIndex, FundInfo, LastContribution, TrieIndex } from '@polkadot/types/interfaces/crowdloan';
 import type { CollationInfo, CollationInfoV1, ConfigData, MessageId, OverweightIndex, PageCounter, PageIndexData } from '@polkadot/types/interfaces/cumulus';
 import type { AccountVote, AccountVoteSplit, AccountVoteStandard, Conviction, Delegations, PreimageStatus, PreimageStatusAvailable, PriorLock, PropIndex, Proposal, ProxyState, ReferendumIndex, ReferendumInfo, ReferendumInfoFinished, ReferendumInfoTo239, ReferendumStatus, Tally, Voting, VotingDelegating, VotingDirect, VotingDirectVote } from '@polkadot/types/interfaces/democracy';
@@ -285,6 +285,7 @@ declare module '@polkadot/types/types/registry' {
     ContractContractSpecV3: ContractContractSpecV3;
     ContractContractSpecV4: ContractContractSpecV4;
     ContractContractSpecV5: ContractContractSpecV5;
+    ContractContractSpecV6: ContractContractSpecV6;
     ContractCryptoHasher: ContractCryptoHasher;
     ContractDiscriminant: ContractDiscriminant;
     ContractDisplayName: ContractDisplayName;
@@ -335,12 +336,15 @@ declare module '@polkadot/types/types/registry' {
     ContractMetadataV3: ContractMetadataV3;
     ContractMetadataV4: ContractMetadataV4;
     ContractMetadataV5: ContractMetadataV5;
+    ContractMetadataV6: ContractMetadataV6;
     ContractProject: ContractProject;
     ContractProjectContract: ContractProjectContract;
     ContractProjectInfo: ContractProjectInfo;
     ContractProjectSource: ContractProjectSource;
     ContractProjectV0: ContractProjectV0;
     ContractReturnFlags: ContractReturnFlags;
+    ContractReviveProjectInfo: ContractReviveProjectInfo;
+    ContractReviveProjectSource: ContractReviveProjectSource;
     ContractSelector: ContractSelector;
     ContractStorageKey: ContractStorageKey;
     ContractStorageLayout: ContractStorageLayout;

packages/types-codec/package.json

@@ -18,17 +18,17 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
-    "@polkadot/x-bigint": "^13.5.1",
+    "@polkadot/x-bigint": "^13.5.2",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@polkadot/types": "16.1.2",
+    "@polkadot/types": "16.2.2",
-    "@polkadot/types-augment": "16.1.2",
+    "@polkadot/types-augment": "16.2.2",
-    "@polkadot/types-support": "16.1.2",
+    "@polkadot/types-support": "16.2.2",
-    "@polkadot/util-crypto": "^13.5.1"
+    "@polkadot/util-crypto": "^13.5.2"
   }
 }

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: '16.1.2' };
+export const packageInfo = { name: '@polkadot/types-codec', path: 'auto', type: 'auto', version: '16.2.2' };

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

@@ -5,6 +5,15 @@ import type { Codec, CodecClass, Registry } from '../types/index.js';
 
 import { u8aToHex } from '@polkadot/util';
 
+const MAX_DEPTH = 1024;
+
+/** @internal */
+function isComplexType (Type: CodecClass): boolean {
+  const typeName = Type.name?.toLowerCase() || '';
+
+  return ['enum', 'hashmap', 'linkage', 'null', 'option', 'range', 'rangeinclusive', 'result', 'struct', 'tuple', 'vec', 'vecfixed'].includes(typeName);
+}
+
 /** @internal */
 function formatFailure (registry: Registry, fn: 'decodeU8a' | 'decodeU8aStruct' | 'decodeU8aVec', _result: unknown[], { message }: Error, u8a: Uint8Array, i: number, count: number, Type: CodecClass, key?: string): string {
   let type = '';
@@ -63,6 +72,10 @@ export function decodeU8aStruct (registry: Registry, result: [string, Codec][],
   let offset = 0;
   let i = 0;
 
+  if (count > MAX_DEPTH && isComplexType(Types[i])) {
+    throw new Error(`decodeU8aStruct: Maximum depth exceeded, received ${count} elements, limit ${MAX_DEPTH}`);
+  }
+
   try {
     while (i < count) {
       const value = new Types[i](registry, u8a.subarray(offset));
@@ -86,6 +99,11 @@ export function decodeU8aStruct (registry: Registry, result: [string, Codec][],
  */
 export function decodeU8aVec <T extends Codec = Codec> (registry: Registry, result: unknown[], u8a: Uint8Array, startAt: number, Type: CodecClass<T>): [number, number] {
   const count = result.length;
+
+  if (count > MAX_DEPTH && isComplexType(Type)) {
+    throw new Error(`decodeU8aVec: Maximum depth exceeded, received ${count} elements, limit ${MAX_DEPTH}`);
+  }
+
   let offset = startAt;
   let i = 0;
 

packages/types-create/package.json

@@ -18,14 +18,14 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/types-codec": "16.1.2",
+    "@polkadot/types-codec": "16.2.2",
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@polkadot/types": "16.1.2"
+    "@polkadot/types": "16.2.2"
   }
 }

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: '16.1.2' };
+export const packageInfo = { name: '@polkadot/types-create', path: 'auto', type: 'auto', version: '16.2.2' };

packages/types-known/package.json

@@ -18,17 +18,17 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/networks": "^13.5.1",
+    "@polkadot/networks": "^13.5.2",
-    "@polkadot/types": "16.1.2",
+    "@polkadot/types": "16.2.2",
-    "@polkadot/types-codec": "16.1.2",
+    "@polkadot/types-codec": "16.2.2",
-    "@polkadot/types-create": "16.1.2",
+    "@polkadot/types-create": "16.2.2",
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@polkadot/api": "16.1.2"
+    "@polkadot/api": "16.2.2"
   }
 }

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: '16.1.2' };
+export const packageInfo = { name: '@polkadot/types-known', path: 'auto', type: 'auto', version: '16.2.2' };

packages/types-support/package.json

@@ -18,10 +18,10 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
     "tslib": "^2.8.1"
   }
 }

packages/types-support/src/packageInfo.ts

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

packages/types/package.json

@@ -18,20 +18,20 @@
     "./packageDetect.cjs"
   ],
   "type": "module",
-  "version": "16.1.2",
+  "version": "16.2.2",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/keyring": "^13.5.1",
+    "@polkadot/keyring": "^13.5.2",
-    "@polkadot/types-augment": "16.1.2",
+    "@polkadot/types-augment": "16.2.2",
-    "@polkadot/types-codec": "16.1.2",
+    "@polkadot/types-codec": "16.2.2",
-    "@polkadot/types-create": "16.1.2",
+    "@polkadot/types-create": "16.2.2",
-    "@polkadot/util": "^13.5.1",
+    "@polkadot/util": "^13.5.2",
-    "@polkadot/util-crypto": "^13.5.1",
+    "@polkadot/util-crypto": "^13.5.2",
     "rxjs": "^7.8.1",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^13.5.1",
+    "@polkadot/keyring": "^13.5.2",
-    "@polkadot/types-support": "16.1.2"
+    "@polkadot/types-support": "16.2.2"
   }
 }

packages/types/src/interfaces/contractsAbi/definitions.ts

@@ -127,6 +127,13 @@ const spec = {
     docs: 'Vec<Text>',
     environment: 'ContractEnvironmentV4'
   },
+  ContractContractSpecV6: {
+    constructors: 'Vec<ContractConstructorSpecV4>',
+    messages: 'Vec<ContractMessageSpecV3>',
+    events: 'Vec<ContractEventSpecV3>',
+    docs: 'Vec<Text>',
+    environment: 'ContractEnvironmentV4'
+  },
 
   ContractDisplayName: 'SiPath',
   ContractEventParamSpecV0: {
@@ -221,7 +228,7 @@ const latest = {
   ContractEventParamSpecLatest: 'ContractEventParamSpecV2',
   ContractMessageParamSpecLatest: 'ContractMessageParamSpecV2',
   ContractMessageSpecLatest: 'ContractMessageSpecV3',
-  ContractMetadataLatest: 'ContractMetadataV5'
+  ContractMetadataLatest: 'ContractMetadataV6'
 };
 
 export default {
@@ -234,6 +241,10 @@ export default {
       source: 'ContractProjectSource',
       contract: 'ContractProjectContract'
     },
+    ContractReviveProjectInfo: {
+      source: 'ContractReviveProjectSource',
+      contract: 'ContractProjectContract'
+    },
     ContractMetadataV0: {
       metadataVersion: 'Text',
       types: 'Vec<Si0Type>',
@@ -261,6 +272,11 @@ export default {
       spec: 'ContractContractSpecV5',
       version: 'u64'
     },
+    ContractMetadataV6: {
+      types: 'Vec<PortableType>',
+      spec: 'ContractContractSpecV6',
+      version: 'u64'
+    },
     ContractMetadata: {
       _enum: {
         V0: 'ContractMetadataV0',
@@ -268,7 +284,8 @@ export default {
         V2: 'ContractMetadataV2',
         V3: 'ContractMetadataV3',
         V4: 'ContractMetadataV4',
-        V5: 'ContractMetadataV5'
+        V5: 'ContractMetadataV5',
+        V6: 'ContractMetadataV6'
       }
     },
     ContractProjectV0: {
@@ -301,6 +318,16 @@ export default {
       compiler: 'Text',
       wasm: 'Raw'
     },
+    ContractReviveProjectSource: {
+      _alias: {
+        wasmHash: 'hash',
+        wasm: 'contract_binary'
+      },
+      wasmHash: '[u8; 32]',
+      language: 'Text',
+      compiler: 'Text',
+      wasm: 'Raw'
+    },
     ContractEnvironmentV4: {
       _alias: {
         hashType: 'hash'

packages/types/src/interfaces/contractsAbi/types.ts

@@ -103,6 +103,15 @@ export interface ContractContractSpecV5 extends Struct {
   readonly environment: ContractEnvironmentV4;
 }
 
+/** @name ContractContractSpecV6 */
+export interface ContractContractSpecV6 extends Struct {
+  readonly constructors: Vec<ContractConstructorSpecV4>;
+  readonly messages: Vec<ContractMessageSpecV3>;
+  readonly events: Vec<ContractEventSpecV3>;
+  readonly docs: Vec<Text>;
+  readonly environment: ContractEnvironmentV4;
+}
+
 /** @name ContractCryptoHasher */
 export interface ContractCryptoHasher extends Enum {
   readonly isBlake2x256: boolean;
@@ -304,11 +313,13 @@ export interface ContractMetadata extends Enum {
   readonly asV4: ContractMetadataV4;
   readonly isV5: boolean;
   readonly asV5: ContractMetadataV5;
-  readonly type: 'V0' | 'V1' | 'V2' | 'V3' | 'V4' | 'V5';
+  readonly isV6: boolean;
+  readonly asV6: ContractMetadataV6;
+  readonly type: 'V0' | 'V1' | 'V2' | 'V3' | 'V4' | 'V5' | 'V6';
 }
 
 /** @name ContractMetadataLatest */
-export interface ContractMetadataLatest extends ContractMetadataV5 {}
+export interface ContractMetadataLatest extends ContractMetadataV6 {}
 
 /** @name ContractMetadataV0 */
 export interface ContractMetadataV0 extends Struct {
@@ -349,6 +360,13 @@ export interface ContractMetadataV5 extends Struct {
   readonly version: u64;
 }
 
+/** @name ContractMetadataV6 */
+export interface ContractMetadataV6 extends Struct {
+  readonly types: Vec<PortableType>;
+  readonly spec: ContractContractSpecV6;
+  readonly version: u64;
+}
+
 /** @name ContractProject */
 export interface ContractProject extends ITuple<[ContractProjectInfo, ContractMetadata]> {}
 
@@ -387,6 +405,20 @@ export interface ContractProjectV0 extends Struct {
   readonly spec: ContractContractSpecV0;
 }
 
+/** @name ContractReviveProjectInfo */
+export interface ContractReviveProjectInfo extends Struct {
+  readonly source: ContractReviveProjectSource;
+  readonly contract: ContractProjectContract;
+}
+
+/** @name ContractReviveProjectSource */
+export interface ContractReviveProjectSource extends Struct {
+  readonly wasmHash: U8aFixed;
+  readonly language: Text;
+  readonly compiler: Text;
+  readonly wasm: Raw;
+}
+
 /** @name ContractSelector */
 export interface ContractSelector extends U8aFixed {}
 

packages/types/src/packageInfo.ts

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

yarn.lock

@@ -447,27 +447,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/api-augment@npm:16.1.2, @polkadot/api-augment@workspace:packages/api-augment":
+"@polkadot/api-augment@npm:16.2.2, @polkadot/api-augment@workspace:packages/api-augment":
   version: 0.0.0-use.local
   resolution: "@polkadot/api-augment@workspace:packages/api-augment"
   dependencies:
-    "@polkadot/api-base": "npm:16.1.2"
+    "@polkadot/api-base": "npm:16.2.2"
-    "@polkadot/rpc-augment": "npm:16.1.2"
+    "@polkadot/rpc-augment": "npm:16.2.2"
-    "@polkadot/types": "npm:16.1.2"
+    "@polkadot/types": "npm:16.2.2"
-    "@polkadot/types-augment": "npm:16.1.2"
+    "@polkadot/types-augment": "npm:16.2.2"
-    "@polkadot/types-codec": "npm:16.1.2"
+    "@polkadot/types-codec": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
     tslib: "npm:^2.8.1"
   languageName: unknown
   linkType: soft
 
-"@polkadot/api-base@npm:16.1.2, @polkadot/api-base@workspace:packages/api-base":
+"@polkadot/api-base@npm:16.2.2, @polkadot/api-base@workspace:packages/api-base":
   version: 0.0.0-use.local
   resolution: "@polkadot/api-base@workspace:packages/api-base"
   dependencies:
-    "@polkadot/rpc-core": "npm:16.1.2"
+    "@polkadot/rpc-core": "npm:16.2.2"
-    "@polkadot/types": "npm:16.1.2"
+    "@polkadot/types": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
     rxjs: "npm:^7.8.1"
     tslib: "npm:^2.8.1"
   languageName: unknown
@@ -477,93 +477,93 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@polkadot/api-contract@workspace:packages/api-contract"
   dependencies:
-    "@polkadot/api": "npm:16.1.2"
+    "@polkadot/api": "npm:16.2.2"
-    "@polkadot/api-augment": "npm:16.1.2"
+    "@polkadot/api-augment": "npm:16.2.2"
-    "@polkadot/keyring": "npm:^13.5.1"
+    "@polkadot/keyring": "npm:^13.5.2"
-    "@polkadot/types": "npm:16.1.2"
+    "@polkadot/types": "npm:16.2.2"
-    "@polkadot/types-codec": "npm:16.1.2"
+    "@polkadot/types-codec": "npm:16.2.2"
-    "@polkadot/types-create": "npm:16.1.2"
+    "@polkadot/types-create": "npm:16.2.2"
-    "@polkadot/types-support": "npm:16.1.2"
+    "@polkadot/types-support": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
-    "@polkadot/util-crypto": "npm:^13.5.1"
+    "@polkadot/util-crypto": "npm:^13.5.2"
     rxjs: "npm:^7.8.1"
     tslib: "npm:^2.8.1"
   languageName: unknown
   linkType: soft
 
-"@polkadot/api-derive@npm:16.1.2, @polkadot/api-derive@workspace:packages/api-derive":
+"@polkadot/api-derive@npm:16.2.2, @polkadot/api-derive@workspace:packages/api-derive":
   version: 0.0.0-use.local
   resolution: "@polkadot/api-derive@workspace:packages/api-derive"
   dependencies:
-    "@polkadot/api": "npm:16.1.2"
+    "@polkadot/api": "npm:16.2.2"
-    "@polkadot/api-augment": "npm:16.1.2"
+    "@polkadot/api-augment": "npm:16.2.2"
-    "@polkadot/api-base": "npm:16.1.2"
+    "@polkadot/api-base": "npm:16.2.2"
-    "@polkadot/rpc-augment": "npm:16.1.2"
+    "@polkadot/rpc-augment": "npm:16.2.2"
-    "@polkadot/rpc-core": "npm:16.1.2"
+    "@polkadot/rpc-core": "npm:16.2.2"
-    "@polkadot/rpc-provider": "npm:16.1.2"
+    "@polkadot/rpc-provider": "npm:16.2.2"
-    "@polkadot/types": "npm:16.1.2"
+    "@polkadot/types": "npm:16.2.2"
-    "@polkadot/types-codec": "npm:16.1.2"
+    "@polkadot/types-codec": "npm:16.2.2"
-    "@polkadot/types-support": "npm:16.1.2"
+    "@polkadot/types-support": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
-    "@polkadot/util-crypto": "npm:^13.5.1"
+    "@polkadot/util-crypto": "npm:^13.5.2"
     rxjs: "npm:^7.8.1"
     tslib: "npm:^2.8.1"
   languageName: unknown
   linkType: soft
 
-"@polkadot/api@npm:16.1.2, @polkadot/api@workspace:packages/api":
+"@polkadot/api@npm:16.2.2, @polkadot/api@workspace:packages/api":
   version: 0.0.0-use.local
   resolution: "@polkadot/api@workspace:packages/api"
   dependencies:
-    "@polkadot/api-augment": "npm:16.1.2"
+    "@polkadot/api-augment": "npm:16.2.2"
-    "@polkadot/api-base": "npm:16.1.2"
+    "@polkadot/api-base": "npm:16.2.2"
-    "@polkadot/api-derive": "npm:16.1.2"
+    "@polkadot/api-derive": "npm:16.2.2"
-    "@polkadot/keyring": "npm:^13.5.1"
+    "@polkadot/keyring": "npm:^13.5.2"
-    "@polkadot/rpc-augment": "npm:16.1.2"
+    "@polkadot/rpc-augment": "npm:16.2.2"
-    "@polkadot/rpc-core": "npm:16.1.2"
+    "@polkadot/rpc-core": "npm:16.2.2"
-    "@polkadot/rpc-provider": "npm:16.1.2"
+    "@polkadot/rpc-provider": "npm:16.2.2"
-    "@polkadot/types": "npm:16.1.2"
+    "@polkadot/types": "npm:16.2.2"
-    "@polkadot/types-augment": "npm:16.1.2"
+    "@polkadot/types-augment": "npm:16.2.2"
-    "@polkadot/types-codec": "npm:16.1.2"
+    "@polkadot/types-codec": "npm:16.2.2"
-    "@polkadot/types-create": "npm:16.1.2"
+    "@polkadot/types-create": "npm:16.2.2"
-    "@polkadot/types-known": "npm:16.1.2"
+    "@polkadot/types-known": "npm:16.2.2"
-    "@polkadot/types-support": "npm:16.1.2"
+    "@polkadot/types-support": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
-    "@polkadot/util-crypto": "npm:^13.5.1"
+    "@polkadot/util-crypto": "npm:^13.5.2"
     eventemitter3: "npm:^5.0.1"
     rxjs: "npm:^7.8.1"
     tslib: "npm:^2.8.1"
   languageName: unknown
   linkType: soft
 
-"@polkadot/dev-test@npm:^0.83.2":
+"@polkadot/dev-test@npm:^0.83.3":
-  version: 0.83.2
+  version: 0.83.3
-  resolution: "@polkadot/dev-test@npm:0.83.2"
+  resolution: "@polkadot/dev-test@npm:0.83.3"
   dependencies:
     jsdom: "npm:^24.0.0"
     tslib: "npm:^2.7.0"
-  checksum: 10/afe60165272a09d5c9f08e3aec0015621350dc7394ee8ff121d5803c576c7601b176b753716203abba4a81a142b529da066fe4c73f39387b018bdde69fef7a10
+  checksum: 10/c03e0c5c5c5d22394c63948b35157b97f8f734a6a8403c89990c55b2657f2b284996aef8613815b2b576b271a126244d7f0a2c9ddece438c5799f273be2e1c69
   languageName: node
   linkType: hard
 
-"@polkadot/dev-ts@npm:^0.83.2":
+"@polkadot/dev-ts@npm:^0.83.3":
-  version: 0.83.2
+  version: 0.83.3
-  resolution: "@polkadot/dev-ts@npm:0.83.2"
+  resolution: "@polkadot/dev-ts@npm:0.83.3"
   dependencies:
     json5: "npm:^2.2.3"
     tslib: "npm:^2.7.0"
     typescript: "npm:^5.5.4"
-  checksum: 10/abca4df87a0682285bf5e5644ab8522820d53e0dffc124bfe540b7fccc55532057d1912629584bb04648e855e110896b36e55536d53556a166fc3d33bcc27b39
+  checksum: 10/a2ddc4dba934758cc24f02e8acbfa5a5f5295ad874f42c1bea8548a6dfa97c882b127a279001831caedc8d474becb905286847e0f64e8efe7063b6bac4830112
   languageName: node
   linkType: hard
 
-"@polkadot/dev@npm:^0.83.2":
+"@polkadot/dev@npm:^0.83.3":
-  version: 0.83.2
+  version: 0.83.3
-  resolution: "@polkadot/dev@npm:0.83.2"
+  resolution: "@polkadot/dev@npm:0.83.3"
   dependencies:
     "@eslint/js": "npm:^8.56.0"
-    "@polkadot/dev-test": "npm:^0.83.2"
+    "@polkadot/dev-test": "npm:^0.83.3"
-    "@polkadot/dev-ts": "npm:^0.83.2"
+    "@polkadot/dev-ts": "npm:^0.83.3"
     "@rollup/plugin-alias": "npm:^5.1.1"
     "@rollup/plugin-commonjs": "npm:^25.0.8"
     "@rollup/plugin-dynamic-import-vars": "npm:^2.1.5"
@@ -628,73 +628,73 @@ __metadata:
     polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs
     polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs
     polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs
-  checksum: 10/42a67e0f2401fc13bdffff86398958e326613461eaa294fb5b435037d636b94cbbbce81b1fadbdf3c0553798d3bc5df43ef6af2250f75e312f01e52b665eddfe
+  checksum: 10/f34171f4776f0ade59e750e6c43db56fccc800e5c5c2e7796299e83072534257fa5e7478b8159a4b265e96d36c9fe380d56326c21cdbdf51dda3221c269601be
   languageName: node
   linkType: hard
 
-"@polkadot/keyring@npm:^13.5.1":
+"@polkadot/keyring@npm:^13.5.2":
-  version: 13.5.1
+  version: 13.5.2
-  resolution: "@polkadot/keyring@npm:13.5.1"
+  resolution: "@polkadot/keyring@npm:13.5.2"
   dependencies:
-    "@polkadot/util": "npm:13.5.1"
+    "@polkadot/util": "npm:13.5.2"
-    "@polkadot/util-crypto": "npm:13.5.1"
+    "@polkadot/util-crypto": "npm:13.5.2"
     tslib: "npm:^2.8.0"
   peerDependencies:
-    "@polkadot/util": 13.5.1
+    "@polkadot/util": 13.5.2
-    "@polkadot/util-crypto": 13.5.1
+    "@polkadot/util-crypto": 13.5.2
-  checksum: 10/e040c077ff1227ec7d4b911e60fc2588144dc31a775c301c56fa6b0b9e7e74cfd9fec4b51f1340bb3c3e0b322e217d4759176a35f7fda500a5776dde279fab86
+  checksum: 10/f1a8a3fd93d0c3ecac19f2b99e358baecc4ef2f17b510765a889098e51156819c83fe4ad3eb1f84cd350a16f8b9a17e357bff89482834ccf00b31fce8a457c23
   languageName: node
   linkType: hard
 
-"@polkadot/networks@npm:13.5.1, @polkadot/networks@npm:^13.5.1":
+"@polkadot/networks@npm:13.5.2, @polkadot/networks@npm:^13.5.2":
-  version: 13.5.1
+  version: 13.5.2
-  resolution: "@polkadot/networks@npm:13.5.1"
+  resolution: "@polkadot/networks@npm:13.5.2"
   dependencies:
-    "@polkadot/util": "npm:13.5.1"
+    "@polkadot/util": "npm:13.5.2"
     "@substrate/ss58-registry": "npm:^1.51.0"
     tslib: "npm:^2.8.0"
-  checksum: 10/836835ffcf58027cb450f17400c733eb84272cb7de0b1a86f72a0c1b1bb35ea3c628f8dd418e185f163ff0963ec931f41618b9405088a1d6fe2fbf5e5ab09709
+  checksum: 10/5a5147d657bfded3f3d6af24603c07fcf32affdc84a7e7ec183b306da32a75f1ce2af8ac4cff6b2b9f9b6ff5f8895bb3ee2c2eac1d994b305785631a3973637e
   languageName: node
   linkType: hard
 
-"@polkadot/rpc-augment@npm:16.1.2, @polkadot/rpc-augment@workspace:packages/rpc-augment":
+"@polkadot/rpc-augment@npm:16.2.2, @polkadot/rpc-augment@workspace:packages/rpc-augment":
   version: 0.0.0-use.local
   resolution: "@polkadot/rpc-augment@workspace:packages/rpc-augment"
   dependencies:
-    "@polkadot/rpc-core": "npm:16.1.2"
+    "@polkadot/rpc-core": "npm:16.2.2"
-    "@polkadot/types": "npm:16.1.2"
+    "@polkadot/types": "npm:16.2.2"
-    "@polkadot/types-codec": "npm:16.1.2"
+    "@polkadot/types-codec": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
     tslib: "npm:^2.8.1"
   languageName: unknown
   linkType: soft
 
-"@polkadot/rpc-core@npm:16.1.2, @polkadot/rpc-core@workspace:packages/rpc-core":
+"@polkadot/rpc-core@npm:16.2.2, @polkadot/rpc-core@workspace:packages/rpc-core":
   version: 0.0.0-use.local
   resolution: "@polkadot/rpc-core@workspace:packages/rpc-core"
   dependencies:
-    "@polkadot/keyring": "npm:^13.5.1"
+    "@polkadot/keyring": "npm:^13.5.2"
-    "@polkadot/rpc-augment": "npm:16.1.2"
+    "@polkadot/rpc-augment": "npm:16.2.2"
-    "@polkadot/rpc-provider": "npm:16.1.2"
+    "@polkadot/rpc-provider": "npm:16.2.2"
-    "@polkadot/types": "npm:16.1.2"
+    "@polkadot/types": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
     rxjs: "npm:^7.8.1"
     tslib: "npm:^2.8.1"
   languageName: unknown
   linkType: soft
 
-"@polkadot/rpc-provider@npm:16.1.2, @polkadot/rpc-provider@workspace:packages/rpc-provider":
+"@polkadot/rpc-provider@npm:16.2.2, @polkadot/rpc-provider@workspace:packages/rpc-provider":
   version: 0.0.0-use.local
   resolution: "@polkadot/rpc-provider@workspace:packages/rpc-provider"
   dependencies:
-    "@polkadot/keyring": "npm:^13.5.1"
+    "@polkadot/keyring": "npm:^13.5.2"
-    "@polkadot/types": "npm:16.1.2"
+    "@polkadot/types": "npm:16.2.2"
-    "@polkadot/types-support": "npm:16.1.2"
+    "@polkadot/types-support": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
-    "@polkadot/util-crypto": "npm:^13.5.1"
+    "@polkadot/util-crypto": "npm:^13.5.2"
-    "@polkadot/x-fetch": "npm:^13.5.1"
+    "@polkadot/x-fetch": "npm:^13.5.2"
-    "@polkadot/x-global": "npm:^13.5.1"
+    "@polkadot/x-global": "npm:^13.5.2"
-    "@polkadot/x-ws": "npm:^13.5.1"
+    "@polkadot/x-ws": "npm:^13.5.2"
     "@substrate/connect": "npm:0.8.11"
     eventemitter3: "npm:^5.0.1"
     mock-socket: "npm:^9.3.1"
@@ -710,19 +710,19 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@polkadot/typegen@workspace:packages/typegen"
   dependencies:
-    "@polkadot/api": "npm:16.1.2"
+    "@polkadot/api": "npm:16.2.2"
-    "@polkadot/api-augment": "npm:16.1.2"
+    "@polkadot/api-augment": "npm:16.2.2"
-    "@polkadot/api-derive": "npm:16.1.2"
+    "@polkadot/api-derive": "npm:16.2.2"
-    "@polkadot/rpc-augment": "npm:16.1.2"
+    "@polkadot/rpc-augment": "npm:16.2.2"
-    "@polkadot/rpc-provider": "npm:16.1.2"
+    "@polkadot/rpc-provider": "npm:16.2.2"
-    "@polkadot/types": "npm:16.1.2"
+    "@polkadot/types": "npm:16.2.2"
-    "@polkadot/types-augment": "npm:16.1.2"
+    "@polkadot/types-augment": "npm:16.2.2"
-    "@polkadot/types-codec": "npm:16.1.2"
+    "@polkadot/types-codec": "npm:16.2.2"
-    "@polkadot/types-create": "npm:16.1.2"
+    "@polkadot/types-create": "npm:16.2.2"
-    "@polkadot/types-support": "npm:16.1.2"
+    "@polkadot/types-support": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
-    "@polkadot/util-crypto": "npm:^13.5.1"
+    "@polkadot/util-crypto": "npm:^13.5.2"
-    "@polkadot/x-ws": "npm:^13.5.1"
+    "@polkadot/x-ws": "npm:^13.5.2"
     "@types/yargs": "npm:^17.0.33"
     comment-parser: "npm:^1.4.1"
     handlebars: "npm:^4.7.8"
@@ -737,113 +737,113 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-augment@npm:16.1.2, @polkadot/types-augment@workspace:packages/types-augment":
+"@polkadot/types-augment@npm:16.2.2, @polkadot/types-augment@workspace:packages/types-augment":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-augment@workspace:packages/types-augment"
   dependencies:
-    "@polkadot/types": "npm:16.1.2"
+    "@polkadot/types": "npm:16.2.2"
-    "@polkadot/types-codec": "npm:16.1.2"
+    "@polkadot/types-codec": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
     tslib: "npm:^2.8.1"
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-codec@npm:16.1.2, @polkadot/types-codec@workspace:packages/types-codec":
+"@polkadot/types-codec@npm:16.2.2, @polkadot/types-codec@workspace:packages/types-codec":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-codec@workspace:packages/types-codec"
   dependencies:
-    "@polkadot/types": "npm:16.1.2"
+    "@polkadot/types": "npm:16.2.2"
-    "@polkadot/types-augment": "npm:16.1.2"
+    "@polkadot/types-augment": "npm:16.2.2"
-    "@polkadot/types-support": "npm:16.1.2"
+    "@polkadot/types-support": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
-    "@polkadot/util-crypto": "npm:^13.5.1"
+    "@polkadot/util-crypto": "npm:^13.5.2"
-    "@polkadot/x-bigint": "npm:^13.5.1"
+    "@polkadot/x-bigint": "npm:^13.5.2"
     tslib: "npm:^2.8.1"
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-create@npm:16.1.2, @polkadot/types-create@workspace:packages/types-create":
+"@polkadot/types-create@npm:16.2.2, @polkadot/types-create@workspace:packages/types-create":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-create@workspace:packages/types-create"
   dependencies:
-    "@polkadot/types": "npm:16.1.2"
+    "@polkadot/types": "npm:16.2.2"
-    "@polkadot/types-codec": "npm:16.1.2"
+    "@polkadot/types-codec": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
     tslib: "npm:^2.8.1"
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-known@npm:16.1.2, @polkadot/types-known@workspace:packages/types-known":
+"@polkadot/types-known@npm:16.2.2, @polkadot/types-known@workspace:packages/types-known":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-known@workspace:packages/types-known"
   dependencies:
-    "@polkadot/api": "npm:16.1.2"
+    "@polkadot/api": "npm:16.2.2"
-    "@polkadot/networks": "npm:^13.5.1"
+    "@polkadot/networks": "npm:^13.5.2"
-    "@polkadot/types": "npm:16.1.2"
+    "@polkadot/types": "npm:16.2.2"
-    "@polkadot/types-codec": "npm:16.1.2"
+    "@polkadot/types-codec": "npm:16.2.2"
-    "@polkadot/types-create": "npm:16.1.2"
+    "@polkadot/types-create": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
     tslib: "npm:^2.8.1"
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-support@npm:16.1.2, @polkadot/types-support@workspace:packages/types-support":
+"@polkadot/types-support@npm:16.2.2, @polkadot/types-support@workspace:packages/types-support":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-support@workspace:packages/types-support"
   dependencies:
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
     tslib: "npm:^2.8.1"
   languageName: unknown
   linkType: soft
 
-"@polkadot/types@npm:16.1.2, @polkadot/types@workspace:packages/types":
+"@polkadot/types@npm:16.2.2, @polkadot/types@workspace:packages/types":
   version: 0.0.0-use.local
   resolution: "@polkadot/types@workspace:packages/types"
   dependencies:
-    "@polkadot/keyring": "npm:^13.5.1"
+    "@polkadot/keyring": "npm:^13.5.2"
-    "@polkadot/types-augment": "npm:16.1.2"
+    "@polkadot/types-augment": "npm:16.2.2"
-    "@polkadot/types-codec": "npm:16.1.2"
+    "@polkadot/types-codec": "npm:16.2.2"
-    "@polkadot/types-create": "npm:16.1.2"
+    "@polkadot/types-create": "npm:16.2.2"
-    "@polkadot/types-support": "npm:16.1.2"
+    "@polkadot/types-support": "npm:16.2.2"
-    "@polkadot/util": "npm:^13.5.1"
+    "@polkadot/util": "npm:^13.5.2"
-    "@polkadot/util-crypto": "npm:^13.5.1"
+    "@polkadot/util-crypto": "npm:^13.5.2"
     rxjs: "npm:^7.8.1"
     tslib: "npm:^2.8.1"
   languageName: unknown
   linkType: soft
 
-"@polkadot/util-crypto@npm:13.5.1, @polkadot/util-crypto@npm:^13.5.1":
+"@polkadot/util-crypto@npm:13.5.2, @polkadot/util-crypto@npm:^13.5.2":
-  version: 13.5.1
+  version: 13.5.2
-  resolution: "@polkadot/util-crypto@npm:13.5.1"
+  resolution: "@polkadot/util-crypto@npm:13.5.2"
   dependencies:
     "@noble/curves": "npm:^1.3.0"
     "@noble/hashes": "npm:^1.3.3"
-    "@polkadot/networks": "npm:13.5.1"
+    "@polkadot/networks": "npm:13.5.2"
-    "@polkadot/util": "npm:13.5.1"
+    "@polkadot/util": "npm:13.5.2"
     "@polkadot/wasm-crypto": "npm:^7.4.1"
     "@polkadot/wasm-util": "npm:^7.4.1"
-    "@polkadot/x-bigint": "npm:13.5.1"
+    "@polkadot/x-bigint": "npm:13.5.2"
-    "@polkadot/x-randomvalues": "npm:13.5.1"
+    "@polkadot/x-randomvalues": "npm:13.5.2"
     "@scure/base": "npm:^1.1.7"
     tslib: "npm:^2.8.0"
   peerDependencies:
-    "@polkadot/util": 13.5.1
+    "@polkadot/util": 13.5.2
-  checksum: 10/280a8fb838e8ee30da92a73c5c578977c2d0d823dd03143ebdd3a0a9dc276649a6476a1cbf0200140ed116146b7202c7cd5c0be58271e12326d4aff4a42788e4
+  checksum: 10/1082ba9e772ea3299df11b025aea74eb72ca27f892b2a1b09a8a7b5ece87e5b1274723bc0cf5e2f441f7fb4f17ef11f164dfd49c25ea0fd86b7004d39425dff5
   languageName: node
   linkType: hard
 
-"@polkadot/util@npm:13.5.1, @polkadot/util@npm:^13.5.1":
+"@polkadot/util@npm:13.5.2, @polkadot/util@npm:^13.5.2":
-  version: 13.5.1
+  version: 13.5.2
-  resolution: "@polkadot/util@npm:13.5.1"
+  resolution: "@polkadot/util@npm:13.5.2"
   dependencies:
-    "@polkadot/x-bigint": "npm:13.5.1"
+    "@polkadot/x-bigint": "npm:13.5.2"
-    "@polkadot/x-global": "npm:13.5.1"
+    "@polkadot/x-global": "npm:13.5.2"
-    "@polkadot/x-textdecoder": "npm:13.5.1"
+    "@polkadot/x-textdecoder": "npm:13.5.2"
-    "@polkadot/x-textencoder": "npm:13.5.1"
+    "@polkadot/x-textencoder": "npm:13.5.2"
     "@types/bn.js": "npm:^5.1.6"
     bn.js: "npm:^5.2.1"
     tslib: "npm:^2.8.0"
-  checksum: 10/26b7c564012afec2c877dbf265021883335a28f369c84d59eeaf6bba72a9fd4e70d259cf24619332e9c44fc55093d9f51ec212a7d48fcae92e962f42f4310d6f
+  checksum: 10/7fc4f59a6420ab74aac426eae32577a67947dd6cc215d9b011edde6f078f2a426284888353d6740b2e4dd4768a92e0b82acc6f10549e4c6d7857e4d3099662de
   languageName: node
   linkType: hard
 
@@ -927,77 +927,77 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/x-bigint@npm:13.5.1, @polkadot/x-bigint@npm:^13.5.1":
+"@polkadot/x-bigint@npm:13.5.2, @polkadot/x-bigint@npm:^13.5.2":
-  version: 13.5.1
+  version: 13.5.2
-  resolution: "@polkadot/x-bigint@npm:13.5.1"
+  resolution: "@polkadot/x-bigint@npm:13.5.2"
   dependencies:
-    "@polkadot/x-global": "npm:13.5.1"
+    "@polkadot/x-global": "npm:13.5.2"
     tslib: "npm:^2.8.0"
-  checksum: 10/726bc63bc9a51dbfc21de3913ac546c296ca82b05a78014a9de7268a22c4db85552c6143ab058e0bf3e92defaa36a7d7a803a3deb6607e5928f408ee245dc55e
+  checksum: 10/1fdd3baa0e92f6917088ce7c89584d21bc0a54255f1f948ac0c2f35b4e653439a20f2c83ef0fbb049169d96871eead61f76324241cb092253afd15476075b307
   languageName: node
   linkType: hard
 
-"@polkadot/x-fetch@npm:^13.5.1":
+"@polkadot/x-fetch@npm:^13.5.2":
-  version: 13.5.1
+  version: 13.5.2
-  resolution: "@polkadot/x-fetch@npm:13.5.1"
+  resolution: "@polkadot/x-fetch@npm:13.5.2"
   dependencies:
-    "@polkadot/x-global": "npm:13.5.1"
+    "@polkadot/x-global": "npm:13.5.2"
     node-fetch: "npm:^3.3.2"
     tslib: "npm:^2.8.0"
-  checksum: 10/f6b25c63c7d01b18b814c75bd5af2b614c26b127730902a0c2f385ded9d990037873ad6118e64692d071a5a20a11a2dcee2a80fbe105f5391f128f7153685267
+  checksum: 10/073886f45431b1c27e2ca9d8d32e81aa94383d990aa93638ec7e7ce0f0940ea556c373395776eee4302654cf40a69099f7de16f80fc5f6239e19fd6375d32b8d
   languageName: node
   linkType: hard
 
-"@polkadot/x-global@npm:13.5.1, @polkadot/x-global@npm:^13.5.1":
+"@polkadot/x-global@npm:13.5.2, @polkadot/x-global@npm:^13.5.2":
-  version: 13.5.1
+  version: 13.5.2
-  resolution: "@polkadot/x-global@npm:13.5.1"
+  resolution: "@polkadot/x-global@npm:13.5.2"
   dependencies:
     tslib: "npm:^2.8.0"
-  checksum: 10/6db58bbed5c6506c2f6d542cd836b242750a01d93e30fb6f19543a43ca7573a96813df44344df5d9ec938a913e2ddb8af0258f51770d3aa9f9bcbb896d8e5d1b
+  checksum: 10/619ae3952d8595f3c666030fa3880b68002a4d8706cd5fed3ef21d41c3e4ab4c1d08d2e31a92a7eee3950e82ef374c97f9713c381209ae769021b286a29312df
   languageName: node
   linkType: hard
 
-"@polkadot/x-randomvalues@npm:13.5.1":
+"@polkadot/x-randomvalues@npm:13.5.2":
-  version: 13.5.1
+  version: 13.5.2
-  resolution: "@polkadot/x-randomvalues@npm:13.5.1"
+  resolution: "@polkadot/x-randomvalues@npm:13.5.2"
   dependencies:
-    "@polkadot/x-global": "npm:13.5.1"
+    "@polkadot/x-global": "npm:13.5.2"
     tslib: "npm:^2.8.0"
   peerDependencies:
-    "@polkadot/util": 13.5.1
+    "@polkadot/util": 13.5.2
     "@polkadot/wasm-util": "*"
-  checksum: 10/cadd8c7f9e7acf219c7cdc45bd3e7473e2da5577919936eb1721a297bfaeb45498e3f651200b9333aab95666d09671f915c8ac262924a922c23520ae494acf72
+  checksum: 10/fb191738d3cad4141057c2e1561a1463a22bfaa7e4c925a52d51d9c4c68853433fa0cf82bf1d1c97916ddd74402073c0bbc0e3978dc9cc48d5b31101673b1656
   languageName: node
   linkType: hard
 
-"@polkadot/x-textdecoder@npm:13.5.1":
+"@polkadot/x-textdecoder@npm:13.5.2":
-  version: 13.5.1
+  version: 13.5.2
-  resolution: "@polkadot/x-textdecoder@npm:13.5.1"
+  resolution: "@polkadot/x-textdecoder@npm:13.5.2"
   dependencies:
-    "@polkadot/x-global": "npm:13.5.1"
+    "@polkadot/x-global": "npm:13.5.2"
     tslib: "npm:^2.8.0"
-  checksum: 10/705b3f3b3c757cf2f7077e71f6c765c088e6636e5580408a8f95bf9b2e17c59bfa0846d89ba423131422a0bbb381fe0eff13cd7ac3d366272ebe269876789a52
+  checksum: 10/fd463a2ddb86244a5d4bfb43b51f4038afea8c697a8bc0dd3910b85fa7579e40f708471670241abc950b4d8093d3340ba9c2b8691acd4f64442d46f80807dbe1
   languageName: node
   linkType: hard
 
-"@polkadot/x-textencoder@npm:13.5.1":
+"@polkadot/x-textencoder@npm:13.5.2":
-  version: 13.5.1
+  version: 13.5.2
-  resolution: "@polkadot/x-textencoder@npm:13.5.1"
+  resolution: "@polkadot/x-textencoder@npm:13.5.2"
   dependencies:
-    "@polkadot/x-global": "npm:13.5.1"
+    "@polkadot/x-global": "npm:13.5.2"
     tslib: "npm:^2.8.0"
-  checksum: 10/d5309785674a034e21717236f7f2a438da77d29c514c9cfae8517c8db690e1cff55820cfbac6f2307c9e1d4dc2c4e24ad01f915b585823af5ee73737441d1766
+  checksum: 10/48052703a18486a3d07d3a12875fce8b25dbf51ecf5996886d62fe08eee3ff190b73fa3ea39eb847a0a25e58815044e7689ee02f856d95641c301fadf29bddd5
   languageName: node
   linkType: hard
 
-"@polkadot/x-ws@npm:^13.5.1":
+"@polkadot/x-ws@npm:^13.5.2":
-  version: 13.5.1
+  version: 13.5.2
-  resolution: "@polkadot/x-ws@npm:13.5.1"
+  resolution: "@polkadot/x-ws@npm:13.5.2"
   dependencies:
-    "@polkadot/x-global": "npm:13.5.1"
+    "@polkadot/x-global": "npm:13.5.2"
     tslib: "npm:^2.8.0"
     ws: "npm:^8.18.0"
-  checksum: 10/7c4f5d9178efb663b03303053f2e83bec2fc87ad29306116237549eb004d8f64a945570da966ddab99657db6499fc6056c51daf11dff62095a701c9fb231eb2a
+  checksum: 10/eb1a8af0f17d80a861e5b0142f0d2f092a49eadd09f1c9ec471c22c1e9f690b51e3edea110dcf1240649eaf71805b39c9f68812bba3e3450db59a94d8e96cd7b
   languageName: node
   linkType: hard
 
@@ -7951,7 +7951,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
-    "@polkadot/dev": "npm:^0.83.2"
+    "@polkadot/dev": "npm:^0.83.3"
     "@polkadot/typegen": "workspace:packages/typegen"
     "@types/node": "npm:^22.10.5"
   languageName: unknown