[CI Skip] release/stable 6.4.2

skip-checks: true

.123trigger

@@ -1,11 +1,14 @@
-32
+39
+
 1.4.2
 1.6.2
 1.11.2
 1.12.2
 1.17.2
 1.31.2
+
 2.8.2
+
 3.2.2
 3.2.3
 3.3.2
@@ -17,6 +20,7 @@
 3.9.2
 3.9.3
 3.10.2
+
 4.0.2
 4.0.3
 4.6.2
@@ -24,3 +28,16 @@
 4.9.2
 4.11.2
 4.16.2
+
+5.3.2
+5.5.2
+5.8.2
+5.8.3
+
+6.0.2
+6.0.3
+6.0.4
+6.0.5
+6.1.2
+
+6.4.2

.yarnrc.yml

@@ -10,4 +10,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
     spec: "@yarnpkg/plugin-version"
 
-yarnPath: .yarn/releases/yarn-3.0.0-rc.2.cjs
+yarnPath: .yarn/releases/yarn-3.0.1.cjs

CHANGELOG.md

@@ -1,5 +1,299 @@
 # CHANGELOG
 
+## 6.4.2 Oct 18, 2021
+
+Upgrade priority: Low. Recommended for Westmint runtime 500+
+
+Changes:
+
+- Ensure `SignerPayload` correctly serializes `Option` with `None`
+- Add Ethereum `BlockV{0, 1, 2}` types, aligning with latest Frontier
+- Additional tests for metadata serialization/de-serialization
+
+
+## 6.4.1 Oct 17, 2021
+
+Upgrade priority: Low. Recommended for Kusama & Polkadot runtime 9110+
+
+Changes:
+
+- Adjust Statemint known types for version 4+
+- Adjust balance derives to return multiple vesting schedules
+- Adjust crowdloan derives to use paged key retrieval
+- Ensure account indices (derived) are `Accountindex` types
+- Adjust metadata v14 to include top-level type field from metadata
+- Filter metadata v14 unused enum fields in TS generation
+- Adjust derives to use more metadata v14 types on returns
+- Add Kusama & Polkadot upgrade blocks for 9100/9110
+- Align contract usage with latrest `PortableRegistry` (remove old-generation)
+- Adjust contracts `InstantiateReturnValue` type (no rent projection after 267)
+- Adjust for eslint v8 checks
+- Don't run any online tests on CI by default (uncontrolled external dependencies)
+
+
+## 6.3.1 Oct 9, 2021
+
+Upgrade priority: Low. Recommended for Kusama & Polkadot runtime 9100+
+
+Changes:
+
+- Mark `api.query.*.*.at` as deprecated (use `api.at`)
+- Expose `queryMulti`, `findError` and `findCall` on `api.at`
+- Optimize parallel metadata retrieval/decoration
+- Rework derive `.at` to ensure no additional metadata calls
+- Adjust Xcm types for Kusama, Polkadot, Westend (V1 & V2 usage)
+- Fix Xcm Fungibility type
+- Add upgrade blocks for Westend
+- Prepare for v14 metadata swap in Kusama/Polkadot (9110 runtime)
+- Adjust metadata wilcard path matching (event extraction)
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 6.2.1 Oct 4, 2021
+
+Upgrade priority: Low. Maintenance updates.
+
+Contributed:
+
+- Cater for new asset fee payment extension (Thanks to https://github.com/apopiak)
+
+Changes:
+
+- Extend error messages for malformed `queryMulti` inputs
+- Correctly handle non-map queries passed to `queryMulti` in map form
+- Use new metadata v14 lookup type in derive results
+- Adjust definitions to infer TS types in `.multi` queries
+- Fix TS lookup enum generation with nested Option & Tuple
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 6.1.2 Sep 29, 2021
+
+Upgrade priority: Low. Recommended for 6.x users using historic queries.
+
+Changes:
+
+- Fix `.at` queries/decoration for pre-V13 metadata
+- Added `BridgeMessageId` & `SpecVersion` types for bridges
+- Added `WrapperOpaque` encoding/decoding (as per latest Substrate)
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 6.1.1 Sep 27, 2021
+
+Upgrade priority: Low. Minor maintenance changes from the 6.0.x versions.
+
+Contributed:
+
+- Adjust bridges `OutboundLaneData` type (Thanks to https://github.com/HackFisher)
+- Fix README 404 (Thanks to https://github.com/nblogist)
+
+Changes:
+
+- Add `childstate_getStorageEntries` RPC
+- Allow for scale-info v0 -> v1 conversion
+
+
+## 6.0.5 Sep 20, 2021
+
+Upgrade priority: Low. Recommended for all users on 6.0.4 using `api.query.*.*.at` calls
+
+Changes:
+
+- Revert cross-registry (now-inactive) change introduced in 6.0.3
+- Ensure `Option` is correctly imported for TS query generation
+
+
+## 6.0.4 Sep 20, 2021
+
+Upgrade priority: Low. Recommended for all users on 6.0.3 using `api.query.*.*.at` calls
+
+Changes:
+
+- `api.query.<module>.<method>.at` will now use `at.at(<hash>)`
+- Use and expose `metadata/util/getSiName` to get human type names
+
+
+## 6.0.3 Sep 19, 2021
+
+Upgrade priority: Low. Recommended for all users on 6.0.2 using `api.query.*.*.at` calls
+
+Changes:
+
+- Fix `api.query.<module>.<method>.at` queries
+- Adjust typegen formatting for metadata documentation
+
+
+## 6.0.2 Sep 18, 2021
+
+Upgrade priority: Low. Recommended for all users on 6.0.1, especially those using `api.query.substrate.*` calls
+
+Changes:
+
+- Fix `api.query.substrate.*` key generation
+
+
+## 6.0.1 Sep 18, 2021
+
+Upgrade priority: Low. Recommended for users of the latest Substrate/Polkadot with Metadata v14.
+
+- **Important** The Metadata v14 change allows the metadata to expose the chain types. This has been a major overhaul of the metadata handling, hence the major version bump.
+
+Contributed:
+
+- Allow for `.clone` on Http provider (Thanks to https://github.com/ianhe8x)
+
+Changes:
+
+- Allow for Metadata v14 parsing & usage
+- Align `DigestItem` to latest Substrate
+- Adjust Kusama `IdentityInfo` type for historic versions
+- All `null` values in bundles min/max
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 5.9.1 Sep 13, 2021
+
+Upgrade priority: Low. Recommended for chains using Xcm.
+
+Contributed:
+
+- Adjust Centrifuge `ProxyType` (Thanks to https://github.com/branan)
+
+Changes:
+
+- Additional types for parachain Disputes
+- Adjust Xcm Error enum types
+- Add Polkadot 9090 upgrade block
+- Decoding enhancements with narrowing checks for TS
+
+
+## 5.8.3 Sep 6, 2021
+
+Upgrade priority: Low.
+
+Changes:
+
+- Adjust Statemint, Rococo and Westend Xcm overrides
+
+
+## 5.8.2 Sep 6, 2021
+
+Upgrade priority: Low.
+
+Contributed:
+
+- Correct Xcm V1 `MultiLocation` definitions (Thanks to https://github.com/apopiak)
+
+Changes:
+
+- Adjust Kusama Xcm overrides
+
+
+## 5.8.1 Sep 6, 2021
+
+Upgrade priority: Low.
+
+Changes:
+
+- Add `Auction` to Kusama `ProxyType` definition
+- Adjust Xcm definitions with latest v1 & v2 types
+- Support for `scale-info` 1.0 `Range` mapping
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 5.7.1 Aug 29, 2021
+
+Upgrade priority: Low.
+
+Changes:
+
+- Optimize `Vec` construction (no re-create on new arrays)
+- Adjust output for enums in `toHuman`
+- Adjust aliases for new parachain module locations
+- Support for versioned xcm types (Polkadot master)
+- Add support for `Range` in `PortableRegistry` (used in Metadata 14)
+- Adjust balances derive for non-existent instances
+- Ensure Statemint (current) defaults to xcm v0
+- Add Kusama 9090 upgrade block
+
+
+## 5.6.1 Aug 23, 2021
+
+Upgrade priority: Low. Recommended for users of Xcm, preparing for Kusama/Westend 9100
+
+Contributed:
+
+- Support 0...N-1 args on `keys/entries` (Thanks to https://github.com/hamidra)
+
+Changes:
+
+- Updated XCM types, `AssetId`, `MultiAssets`, `MultiAssetV1`, `AssetInstanceV1`, `XcmOrderV1`
+- Rename `Null` entry in `MultiLocation` to `Here` (Xcm V1)
+- Westend 9090 upgrade block
+- Bump static Substrate, Kusama & Polkadot metadata
+
+
+## 5.5.2 Aug 19, 2021
+
+Upgrade priority: Medium. Contains fixes for parachain types, affecting historic block retrieval on Kusama.
+
+Changes:
+
+- Adjust `ValidDisputeStatementKind` enum to latest version
+- Only enable API health keepalive on connections supporting subscriptions
+
+
+## 5.5.1 Aug 15, 2021
+
+Upgrade priority: Low. Recommended for users of TS (`createType` and `bigint` adjustments)
+
+Contributed:
+
+- Add `Range` & `RangeInclusive` types (Thanks to https://github.com/c410-f3r)
+- Always use TS `bigint` type (Thanks to https://github.com/ntduan)
+
+Changes:
+
+- Loosen pedantic check not to fail on all-empty values
+- Extend `createType` auto-TS decoration for `BreeMap`, `BTreeSet`, `HashMap`, `Range`
+- Add Polkadot 9080 upgrade block
+
+
+## 5.4.1 Aug 9, 2021
+
+Upgrade priority: Low. Recommended for potential users of NMap.
+
+- **Important** The `ClassOf` alias for `createClass` has been removed, use `createClass` (with new generics) directly
+
+Contributed:
+
+- Enable `.keys()/.entries()` on NMap (Thanks to https://github.com/hamidra)
+
+Changes:
+
+- `createType<T = Codec>('...': K)` now returns `Codec` when `K` is not known
+- `createType` does basic TypeScript type matching on the input type
+- Handle `BitSequence` in `PortableRegistry`
+- Ensure API `isConnected` is set before connect/disconnect events are fired
+- Move all static test support files into `@polkadot/types-support`
+- Align static Metadata with latest Substrate, Polkadot & Kusama
+- Adjust v14 Metadata definitions to latest version
+
+
+## 5.3.2 Aug 3, 2021
+
+Upgrade priority: Low. Recommended for users of bridges.
+
+Contributed:
+
+- Add missing bridges types (Thanks to https://github.com/tomusdrw)
+
+Changes:
+
+- Align static metadata with latest Substrate
+
+
 ## 5.3.1 Aug 2, 2021
 
 Upgrade priority: Low. Recommended for users of `api.at(...)` interfaces

jest.config.cjs

@@ -12,21 +12,9 @@ module.exports = {
     '@polkadot/metadata(.*)$': '<rootDir>/packages/metadata/src/$1',
     '@polkadot/rpc-(core|provider)(.*)$': '<rootDir>/packages/rpc-$1/src/$2',
     '@polkadot/typegen(.*)$': '<rootDir>/packages/typegen/src/$1',
-    '@polkadot/types-known(.*)$': '<rootDir>/packages/types-known/src/$1',
+    '@polkadot/types-(known|support)(.*)$': '<rootDir>/packages/types-$1/src/$2',
     // eslint-disable-next-line sort-keys
     '@polkadot/types(.*)$': '<rootDir>/packages/types/src/$1'
   },
-  modulePathIgnorePatterns: [
-    '<rootDir>/packages/api/build',
-    '<rootDir>/packages/api-contract/build',
-    '<rootDir>/packages/api-derive/build',
-    '<rootDir>/packages/metadata/build',
-    '<rootDir>/packages/rpc-core/build',
-    '<rootDir>/packages/rpc-provider/build',
-    '<rootDir>/packages/typegen/build',
-    '<rootDir>/packages/types/build',
-    '<rootDir>/packages/types-known/build'
-  ],
-  testTimeout: 30000,
-  transformIgnorePatterns: ['/node_modules/(?!@polkadot|@babel/runtime/helpers/esm/)']
+  testTimeout: 30000
 };

package.json

@@ -8,7 +8,7 @@
     "packages/*"
   ],
   "resolutions": {
-    "typescript": "^4.3.5"
+    "typescript": "^4.4.4"
   },
   "scripts": {
     "build": "yarn build:interfaces && polkadot-dev-build-ts",
@@ -26,14 +26,15 @@
     "test:watch": "polkadot-dev-run-test --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.14.8",
-    "@babel/register": "^7.14.5",
-    "@babel/runtime": "^7.14.8",
-    "@polkadot/dev": "^0.62.57",
-    "@polkadot/ts": "^0.4.4",
+    "@babel/core": "^7.15.8",
+    "@babel/register": "^7.15.3",
+    "@babel/runtime": "^7.15.4",
+    "@polkadot/dev": "^0.63.3",
+    "@polkadot/ts": "^0.4.9",
     "@polkadot/typegen": "workspace:packages/typegen",
-    "@types/jest": "^26.0.24",
+    "@types/jest": "^27.0.2",
     "copyfiles": "^2.4.1"
   },
-  "version": "5.3.1"
+  "version": "6.4.2",
+  "packageManager": "yarn@3.0.1"
 }

packages/api-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "5.3.1",
+  "version": "6.4.2",
   "type": "module",
   "description": "Interfaces for interacting with contracts and contract ABIs",
   "main": "index.js",
@@ -19,10 +19,10 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme",
   "dependencies": {
-    "@babel/runtime": "^7.14.8",
-    "@polkadot/api": "5.3.1",
-    "@polkadot/types": "5.3.1",
-    "@polkadot/util": "^7.1.1",
-    "rxjs": "^7.2.0"
+    "@babel/runtime": "^7.15.4",
+    "@polkadot/api": "6.4.2",
+    "@polkadot/types": "6.4.2",
+    "@polkadot/util": "^7.5.1",
+    "rxjs": "^7.4.0"
   }
 }

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

@@ -1,52 +0,0 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { blake2AsHex } from '@polkadot/util-crypto';
-
-import abis from '../test/contracts';
-import { Abi } from '.';
-
-interface JSONAbi {
-  source: {
-    compiler: string,
-    hash: string,
-    language: string,
-    wasm: string
-  },
-  spec: {
-    messages: {
-      name: string[] | string
-    }[]
-  }
-}
-
-describe('Abi', (): void => {
-  Object.entries(abis).forEach(([abiName, abi]) => {
-    it(`initializes from a contract ABI (${abiName})`, (): void => {
-      try {
-        const messageIds = (abi as JSONAbi).spec.messages.map(({ name }) => Array.isArray(name) ? name[0] : name);
-        const inkAbi = new Abi(abis[abiName]);
-
-        expect(inkAbi.messages.map(({ identifier }) => identifier)).toEqual(messageIds);
-      } catch (error) {
-        console.error(error);
-
-        throw error;
-      }
-    });
-  });
-
-  it('has the correct hash for the source', (): void => {
-    const bundle = abis.ink_flipperBundle as JSONAbi;
-    const abi = new Abi(bundle as any);
-
-    // manual
-    expect(bundle.source.hash).toEqual(blake2AsHex(bundle.source.wasm));
-
-    // the Codec hash
-    expect(bundle.source.hash).toEqual(abi.project.source.wasm.hash.toHex());
-
-    // the hash as per the actual Abi
-    expect(bundle.source.hash).toEqual(abi.project.source.wasmHash.toHex());
-  });
-});

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

@@ -0,0 +1,102 @@
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { AnyJson, Registry } from '@polkadot/types/types';
+
+import fs from 'fs';
+import path from 'path';
+
+import { TypeDefInfo } from '@polkadot/types/types';
+import { blake2AsHex } from '@polkadot/util-crypto';
+
+import abis from '../../test/contracts';
+import { Abi } from '.';
+
+interface SpecDef {
+  messages: {
+    name: string[] | string
+  }[]
+}
+
+interface JSONAbi {
+  source: {
+    compiler: string,
+    hash: string,
+    language: string,
+    wasm: string
+  },
+  spec: SpecDef;
+  V1: {
+    spec: SpecDef;
+  }
+}
+
+function stringifyInfo (key: string, value: unknown): unknown {
+  return key === 'info'
+    ? TypeDefInfo[value as number]
+    : value;
+}
+
+function stringifyJson (registry: Registry): string {
+  const defs = registry.lookup.types.map(({ id }) =>
+    registry.lookup.getTypeDef(id)
+  );
+
+  return JSON.stringify(defs, stringifyInfo, 2);
+}
+
+describe('Abi', (): void => {
+  describe('ABI', (): void => {
+    Object.entries(abis).forEach(([abiName, abi]: [string, JSONAbi]) => {
+      it(`initializes from a contract ABI (${abiName})`, (): void => {
+        try {
+          const messageIds = (abi.V1 ? abi.V1 : abi).spec.messages.map(({ name }) => Array.isArray(name) ? name[0] : name);
+          const inkAbi = new Abi(abis[abiName] as AnyJson);
+
+          expect(inkAbi.messages.map(({ identifier }) => identifier)).toEqual(messageIds);
+        } catch (error) {
+          console.error(error);
+
+          throw error;
+        }
+      });
+    });
+  });
+
+  describe('TypeDef', (): void => {
+    Object.keys(abis).forEach((abiName) => {
+      it(`initializes from a contract ABI (${abiName})`, (): void => {
+        const abi = new Abi(abis[abiName] as AnyJson);
+        const json = stringifyJson(abi.registry);
+        const cmpPath = path.join(__dirname, `../../test/compare/${abiName}.test.json`);
+
+        try {
+          // eslint-disable-next-line @typescript-eslint/no-var-requires
+          expect(JSON.parse(json)).toEqual(require(cmpPath));
+        } catch (error) {
+          if (process.env.GITHUB_REPOSITORY) {
+            console.error(json);
+
+            throw error;
+          }
+
+          fs.writeFileSync(cmpPath, json, { flag: 'w' });
+        }
+      });
+    });
+  });
+
+  it('has the correct hash for the source', (): void => {
+    const bundle = abis.ink_v0_flipperBundle as JSONAbi;
+    const abi = new Abi(bundle as unknown as AnyJson);
+
+    // manual
+    expect(bundle.source.hash).toEqual(blake2AsHex(bundle.source.wasm));
+
+    // the Codec hash
+    expect(bundle.source.hash).toEqual(abi.info.source.wasm.hash.toHex());
+
+    // the hash as per the actual Abi
+    expect(bundle.source.hash).toEqual(abi.info.source.wasmHash.toHex());
+  });
+});

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

@@ -2,16 +2,29 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Bytes } from '@polkadot/types';
-import type { ChainProperties, ContractConstructorSpec, ContractEventSpec, ContractMessageParamSpec, ContractMessageSpec, ContractProject } from '@polkadot/types/interfaces';
-import type { AnyJson, Codec, CodecArg } from '@polkadot/types/types';
-import type { AbiConstructor, AbiEvent, AbiMessage, AbiParam, DecodedEvent, DecodedMessage } from './types';
+import type { ChainProperties, ContractConstructorSpec, ContractEventSpec, ContractMessageParamSpec, ContractMessageSpec, ContractMetadataLatest, ContractProjectInfo } from '@polkadot/types/interfaces';
+import type { AnyJson, Codec, Registry } from '@polkadot/types/types';
+import type { AbiConstructor, AbiEvent, AbiMessage, AbiParam, DecodedEvent, DecodedMessage } from '../types';
 
+import { TypeDefInfo, TypeRegistry } from '@polkadot/types';
 import { assert, assertReturn, compactAddLength, compactStripLength, isNumber, isObject, isString, logger, stringCamelCase, stringify, u8aConcat, u8aToHex } from '@polkadot/util';
 
-import { MetaRegistry } from './MetaRegistry';
+import { toLatest } from './toLatest';
+
+interface V0AbiJson {
+  metadataVersion: string;
+  spec: {
+    constructors: unknown[];
+    events: unknown[];
+    messages: unknown[];
+  };
+  types: unknown[];
+}
 
 const l = logger('Abi');
 
+const PRIMITIVE_ALWAYS = ['AccountId', 'AccountIndex', 'Address', 'Balance'];
+
 function findMessage <T extends AbiMessage> (list: T[], messageOrId: T | string | number): T {
   const message = isNumber(messageOrId)
     ? list[messageOrId]
@@ -22,51 +35,71 @@ function findMessage <T extends AbiMessage> (list: T[], messageOrId: T | string
   return assertReturn(message, () => `Attempted to call an invalid contract interface, ${stringify(messageOrId)}`);
 }
 
+function parseJson (json: AnyJson, chainProperties?: ChainProperties): [AnyJson, Registry, ContractMetadataLatest, ContractProjectInfo] {
+  const registry = new TypeRegistry();
+  const info = registry.createType('ContractProjectInfo', json);
+  const metadata = registry.createType('ContractMetadata', isString((json as unknown as V0AbiJson).metadataVersion)
+    ? { V0: json }
+    : { V1: (json as Record<string, AnyJson>).V1 }
+  );
+  const latest = metadata.isV0
+    ? toLatest(registry, metadata.asV0)
+    : metadata.asV1;
+  const lookup = registry.createType('PortableRegistry', { types: latest.types });
+
+  // attach the lookup to the registry - now the types are known
+  registry.setLookup(lookup);
+
+  if (chainProperties) {
+    registry.setChainProperties(chainProperties);
+  }
+
+  // warm-up the actual type, pre-use
+  lookup.types.forEach(({ id }) =>
+    lookup.getTypeDef(id)
+  );
+
+  return [json, registry, latest, info];
+}
+
 export class Abi {
-  readonly #events: AbiEvent[];
+  public readonly events: AbiEvent[];
 
   public readonly constructors: AbiConstructor[];
 
+  public readonly info: ContractProjectInfo;
+
   public readonly json: AnyJson;
 
   public readonly messages: AbiMessage[];
 
-  public readonly project: ContractProject;
+  public readonly metadata: ContractMetadataLatest;
 
-  public readonly registry: MetaRegistry;
+  public readonly registry: Registry;
 
   constructor (abiJson: AnyJson, chainProperties?: ChainProperties) {
-    const json = isString(abiJson)
-      ? JSON.parse(abiJson) as AnyJson
-      : abiJson;
-
-    assert(isObject(json) && !Array.isArray(json) && json.metadataVersion && isObject(json.spec) && !Array.isArray(json.spec) && Array.isArray(json.spec.constructors) && Array.isArray(json.spec.messages), 'Invalid JSON ABI structure supplied, expected a recent metadata version');
-
-    this.json = json;
-    this.registry = new MetaRegistry(json.metadataVersion as string, chainProperties);
-    this.project = this.registry.createType('ContractProject', json);
-
-    this.registry.setMetaTypes(this.project.types);
-
-    this.project.types.forEach((_, index) =>
-      this.registry.getMetaTypeDef({ type: this.registry.createType('Si0LookupTypeId', index + this.registry.typeOffset) })
+    [this.json, this.registry, this.metadata, this.info] = parseJson(
+      isString(abiJson)
+        ? JSON.parse(abiJson) as AnyJson
+        : abiJson,
+      chainProperties
     );
-    this.constructors = this.project.spec.constructors.map((spec: ContractConstructorSpec, index) =>
+    this.constructors = this.metadata.spec.constructors.map((spec: ContractConstructorSpec, index) =>
       this.#createMessage(spec, index, {
         isConstructor: true
       })
     );
-    this.#events = this.project.spec.events.map((spec: ContractEventSpec, index) =>
+    this.events = this.metadata.spec.events.map((spec: ContractEventSpec, index) =>
       this.#createEvent(spec, index)
     );
-    this.messages = this.project.spec.messages.map((spec: ContractMessageSpec, index): AbiMessage => {
+    this.messages = this.metadata.spec.messages.map((spec: ContractMessageSpec, index): AbiMessage => {
       const typeSpec = spec.returnType.unwrapOr(null);
 
       return this.#createMessage(spec, index, {
         isMutating: spec.mutates.isTrue,
         isPayable: spec.payable.isTrue,
         returnType: typeSpec
-          ? this.registry.getMetaTypeDef(typeSpec)
+          ? this.registry.lookup.getTypeDef(typeSpec.type)
           : null
       });
     });
@@ -77,7 +110,7 @@ export class Abi {
    */
   public decodeEvent (data: Bytes | Uint8Array): DecodedEvent {
     const index = data[0];
-    const event = this.#events[index];
+    const event = this.events[index];
 
     assert(event, () => `Unable to find event with index ${index}`);
 
@@ -107,13 +140,32 @@ export class Abi {
   }
 
   #createArgs = (args: ContractMessageParamSpec[], spec: unknown): AbiParam[] => {
-    return args.map((arg, index): AbiParam => {
+    return args.map(({ name, type }, index): AbiParam => {
       try {
-        assert(isObject(arg.type), 'Invalid type definition found');
+        assert(isObject(type), 'Invalid type definition found');
+
+        const displayName = type.displayName.length
+          ? type.displayName[type.displayName.length - 1].toString()
+          : undefined;
+        const camelName = stringCamelCase(name);
+
+        if (displayName && PRIMITIVE_ALWAYS.includes(displayName)) {
+          return {
+            name: camelName,
+            type: {
+              info: TypeDefInfo.Plain,
+              type: displayName
+            }
+          };
+        }
+
+        const typeDef = this.registry.lookup.getTypeDef(type.type);
 
         return {
-          name: stringCamelCase(arg.name),
-          type: this.registry.getMetaTypeDef(arg.type)
+          name: camelName,
+          type: displayName && !typeDef.type.startsWith(displayName)
+            ? { displayName, ...typeDef }
+            : typeDef
         };
       } catch (error) {
         l.error(`Error expanding argument ${index} in ${stringify(spec)}`);
@@ -121,7 +173,7 @@ export class Abi {
         throw error;
       }
     });
-  }
+  };
 
   #createEvent = (spec: ContractEventSpec, index: number): AbiEvent => {
     const args = this.#createArgs(spec.args, spec);
@@ -137,7 +189,7 @@ export class Abi {
     };
 
     return event;
-  }
+  };
 
   #createMessage = (spec: ContractMessageSpec | ContractConstructorSpec, index: number, add: Partial<AbiMessage> = {}): AbiMessage => {
     const args = this.#createArgs(spec.args, spec);
@@ -154,26 +206,26 @@ export class Abi {
       index,
       method: stringCamelCase(identifier),
       selector: spec.selector,
-      toU8a: (params: CodecArg[]) =>
+      toU8a: (params: unknown[]) =>
         this.#encodeArgs(spec, args, params)
     };
 
     return message;
-  }
+  };
 
   #decodeArgs = (args: AbiParam[], data: Uint8Array): Codec[] => {
     // for decoding we expect the input to be just the arg data, no selectors
     // no length added (this allows use with events as well)
     let offset = 0;
 
-    return args.map(({ type }): Codec => {
-      const value = this.registry.createType(type.type as 'Text', data.subarray(offset));
+    return args.map(({ type: { lookupName, type } }): Codec => {
+      const value = this.registry.createType(lookupName || type, data.subarray(offset));
 
       offset += value.encodedLength;
 
       return value;
     });
-  }
+  };
 
   #decodeMessage = (type: 'constructor' | 'message', list: AbiMessage[], data: Uint8Array): DecodedMessage => {
     const [, trimmed] = compactStripLength(data);
@@ -183,16 +235,18 @@ export class Abi {
     assert(message, `Unable to find ${type} with selector ${u8aToHex(selector)}`);
 
     return message.fromU8a(trimmed.subarray(4));
-  }
+  };
 
-  #encodeArgs = ({ name, selector }: ContractMessageSpec | ContractConstructorSpec, args: AbiParam[], data: CodecArg[]): Uint8Array => {
+  #encodeArgs = ({ name, selector }: ContractMessageSpec | ContractConstructorSpec, args: AbiParam[], data: unknown[]): Uint8Array => {
     assert(data.length === args.length, () => `Expected ${args.length} arguments to contract message '${name.toString()}', found ${data.length}`);
 
     return compactAddLength(
       u8aConcat(
         this.registry.createType('ContractSelector', selector).toU8a(),
-        ...args.map(({ type }, index) => this.registry.createType(type.type as 'Text', data[index]).toU8a())
+        ...args.map(({ type: { lookupName, type } }, index) =>
+          this.registry.createType(lookupName || type, data[index]).toU8a()
+        )
       )
     );
-  }
+  };
 }

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

@@ -0,0 +1,14 @@
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { ContractMetadataLatest, ContractMetadataV0 } from '@polkadot/types/interfaces';
+import type { Registry } from '@polkadot/types/types';
+
+import { convertSiV0toV1 } from '@polkadot/types/generic/PortableRegistry';
+
+export function toLatest (registry: Registry, v0: ContractMetadataV0): ContractMetadataLatest {
+  return registry.createType('ContractMetadataLatest', {
+    ...v0,
+    types: convertSiV0toV1(registry, v0.types)
+  });
+}

packages/api-contract/src/MetaRegistry.spec.ts

@@ -1,35 +0,0 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import fs from 'fs';
-import path from 'path';
-
-import abis from '../test/contracts';
-import { Abi } from '.';
-
-describe('MetaRegistry', (): void => {
-  Object.keys(abis).forEach((abiName) => {
-    it(`initializes from a contract ABI (${abiName})`, (): void => {
-      const abi = new Abi(abis[abiName]);
-
-      try {
-        const cmpPath = path.join(__dirname, `../test/compare/${abiName}.test.json`);
-
-        if (!fs.existsSync(cmpPath)) {
-          fs.writeFileSync(cmpPath, JSON.stringify(abi.registry.metaTypeDefs, null, 2), { flag: 'w' });
-        }
-
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        expect(abi.registry.metaTypeDefs).toEqual(require(cmpPath));
-      } catch (error) {
-        console.error(JSON.stringify(abi.registry.metaTypeDefs));
-
-        throw error;
-      }
-    });
-  });
-
-  it('stores base project as JSON', (): void => {
-    expect(new Abi(abis.ink_dns).json).toEqual(abis.ink_dns);
-  });
-});

packages/api-contract/src/MetaRegistry.ts

@@ -1,252 +0,0 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import type { ChainProperties, ContractDisplayName, Si0Field, Si0LookupTypeId, Si0Type, Si0TypeDefArray, Si0TypeDefSequence, Si0TypeDefTuple, Si0TypeDefVariant, Si0Variant } from '@polkadot/types/interfaces';
-import type { InterfaceTypes, TypeDef } from '@polkadot/types/types';
-
-import { TypeDefInfo, TypeRegistry, withTypeString } from '@polkadot/types';
-import { assert, isUndefined } from '@polkadot/util';
-
-interface PartialTypeSpec {
-  readonly type: Si0LookupTypeId;
-  readonly displayName?: ContractDisplayName;
-}
-
-// convert the offset into project-specific, index-1
-export function getRegistryOffset (id: Si0LookupTypeId, typeOffset: number): number {
-  return id.toNumber() - typeOffset;
-}
-
-const PRIMITIVE_ALIAS: Record<string, keyof InterfaceTypes> = {
-  Char: 'u32', // Rust char is 4-bytes
-  Str: 'Text'
-};
-
-const PRIMITIVE_ALWAYS = ['AccountId', 'AccountIndex', 'Address', 'Balance'];
-
-// TODO Replace usages with PortableRegistry
-export class MetaRegistry extends TypeRegistry {
-  public readonly metaTypeDefs: TypeDef[] = [];
-
-  public readonly typeOffset;
-
-  #siTypes: Si0Type[] = [];
-
-  constructor (metadataVersion: string, chainProperties?: ChainProperties) {
-    super();
-
-    const [major, minor] = metadataVersion.split('.').map((n) => parseInt(n, 10));
-
-    // type indexes are 1-based pre 0.7 and 0-based post
-    this.typeOffset = (major === 0 && minor < 7) ? 1 : 0;
-
-    if (chainProperties) {
-      this.setChainProperties(chainProperties);
-    }
-  }
-
-  public setMetaTypes (metaTypes: Si0Type[]): void {
-    this.#siTypes = metaTypes;
-  }
-
-  public getMetaTypeDef (typeSpec: PartialTypeSpec): TypeDef {
-    const offset = getRegistryOffset(typeSpec.type, this.typeOffset);
-    let typeDef = this.metaTypeDefs[offset];
-
-    if (!typeDef) {
-      typeDef = this.#extract(this.#getMetaType(typeSpec.type), typeSpec.type);
-
-      this.metaTypeDefs[offset] = typeDef;
-    }
-
-    if (typeSpec.displayName && typeSpec.displayName.length) {
-      const displayName = typeSpec.displayName[typeSpec.displayName.length - 1].toString();
-
-      if (!typeDef.type.startsWith(displayName)) {
-        typeDef = {
-          ...typeDef,
-          displayName,
-          type: PRIMITIVE_ALWAYS.includes(displayName)
-            ? displayName
-            : typeDef.type
-        };
-      }
-    }
-
-    // Here we protect against the following cases
-    //   - No displayName present, these are generally known primitives
-    //   - displayName === type, these generate circular references
-    //   - displayName Option & type Option<...something...>
-    if (typeDef.displayName && !this.hasType(typeDef.displayName) && !(typeDef.type === typeDef.displayName || typeDef.type.startsWith(`${typeDef.displayName}<`))) {
-      this.register({ [typeDef.displayName]: typeDef.type });
-    }
-
-    return typeDef;
-  }
-
-  #getMetaType = (id: Si0LookupTypeId): Si0Type => {
-    const type = this.#siTypes[getRegistryOffset(id, this.typeOffset)];
-
-    assert(!isUndefined(type), () => `getMetaType:: Unable to find ${id.toNumber()} in type values`);
-
-    return this.createType('Si0Type', type);
-  }
-
-  #extract = (type: Si0Type, id: Si0LookupTypeId): TypeDef => {
-    const path = [...type.path];
-    const isPrimitivePath = !!path.length && (
-      (path.length > 2 && path[0].eq('ink_env') && path[1].eq('types')) ||
-      PRIMITIVE_ALWAYS.includes(path[path.length - 1].toString())
-    );
-    let typeDef: Omit<TypeDef, 'type'>;
-
-    if (isPrimitivePath) {
-      typeDef = this.#extractPrimitivePath(type);
-    } else if (type.def.isPrimitive) {
-      typeDef = this.#extractPrimitive(type);
-    } else if (type.def.isComposite) {
-      typeDef = this.#extractFields(type.def.asComposite.fields);
-    } else if (type.def.isVariant) {
-      typeDef = this.#extractVariant(type.def.asVariant, id);
-    } else if (type.def.isArray) {
-      typeDef = this.#extractArray(type.def.asArray);
-    } else if (type.def.isSequence) {
-      typeDef = this.#extractSequence(type.def.asSequence, id);
-    } else if (type.def.isTuple) {
-      typeDef = this.#extractTuple(type.def.asTuple);
-    } else {
-      throw new Error(`Invalid ink! type at index ${id.toString()}`);
-    }
-
-    const displayName = path.pop()?.toString();
-
-    return withTypeString(this, {
-      ...(displayName
-        ? { displayName }
-        : {}
-      ),
-      ...(path.length > 1
-        ? { namespace: path.map((s) => s.toString()).join('::') }
-        : {}
-      ),
-      ...(type.params.length > 0
-        ? { sub: type.params.map((type) => this.getMetaTypeDef({ type })) }
-        : {}
-      ),
-      ...typeDef
-    });
-  }
-
-  #extractArray = ({ len: length, type }: Si0TypeDefArray): Omit<TypeDef, 'type'> => {
-    assert(!length || length.toNumber() <= 256, 'MetaRegistry: Only support for [Type; <length>], where length <= 256');
-
-    return {
-      info: TypeDefInfo.VecFixed,
-      length: length.toNumber(),
-      sub: this.getMetaTypeDef({ type })
-    };
-  }
-
-  #extractFields = (fields: Si0Field[]): Omit<TypeDef, 'type'> => {
-    const [isStruct, isTuple] = fields.reduce(([isAllNamed, isAllUnnamed], { name }) => ([
-      isAllNamed && name.isSome,
-      isAllUnnamed && name.isNone
-    ]),
-    [true, true]);
-
-    assert(isTuple || isStruct, 'Invalid fields type detected, expected either Tuple or Struct');
-
-    const sub = fields.map(({ name, type }) => ({
-      ...this.getMetaTypeDef({ type }),
-      ...(name.isSome
-        ? { name: name.unwrap().toString() }
-        : {}
-      )
-    }));
-
-    return isTuple && sub.length === 1
-      ? sub[0]
-      : {
-        // check for tuple first (no fields may be available)
-        info: isTuple
-          ? TypeDefInfo.Tuple
-          : TypeDefInfo.Struct,
-        sub
-      };
-  }
-
-  #extractPrimitive = (type: Si0Type): TypeDef => {
-    const typeStr = type.def.asPrimitive.type.toString();
-
-    return {
-      info: TypeDefInfo.Plain,
-      type: PRIMITIVE_ALIAS[typeStr] || typeStr.toLowerCase()
-    };
-  }
-
-  #extractPrimitivePath = (type: Si0Type): TypeDef => {
-    return {
-      info: TypeDefInfo.Plain,
-      type: type.path[type.path.length - 1].toString()
-    };
-  }
-
-  #extractSequence = ({ type }: Si0TypeDefSequence, id: Si0LookupTypeId): Omit<TypeDef, 'type'> => {
-    assert(!!type, () => `ContractRegistry: Invalid sequence type found at id ${id.toString()}`);
-
-    return {
-      info: TypeDefInfo.Vec,
-      sub: this.getMetaTypeDef({ type })
-    };
-  }
-
-  #extractTuple = (ids: Si0TypeDefTuple): Omit<TypeDef, 'type'> => {
-    return ids.length === 1
-      ? this.getMetaTypeDef({ type: ids[0] })
-      : {
-        info: TypeDefInfo.Tuple,
-        sub: ids.map((type) => this.getMetaTypeDef({ type }))
-      };
-  }
-
-  #extractVariant = ({ variants }: Si0TypeDefVariant, id: Si0LookupTypeId): Omit<TypeDef, 'type'> => {
-    const { params, path } = this.#getMetaType(id);
-    const specialVariant = path[0].toString();
-
-    return specialVariant === 'Option'
-      ? {
-        info: TypeDefInfo.Option,
-        sub: this.getMetaTypeDef({ type: params[0] })
-      }
-      : specialVariant === 'Result'
-        ? {
-          info: TypeDefInfo.Result,
-          sub: params.map((type, index) => ({
-            name: ['Ok', 'Error'][index],
-            ...this.getMetaTypeDef({ type })
-          }))
-        }
-        : {
-          info: TypeDefInfo.Enum,
-          sub: this.#extractVariantSub(variants)
-        };
-  }
-
-  #extractVariantSub = (variants: Si0Variant[]): TypeDef[] => {
-    return variants.every(({ fields }) => fields.length === 0)
-      ? variants.map(({ discriminant, name }) => ({
-        ...(
-          discriminant.isSome
-            ? { ext: { discriminant: discriminant.unwrap().toNumber() } }
-            : {}
-        ),
-        info: TypeDefInfo.Plain,
-        name: name.toString(),
-        type: 'Null'
-      }))
-      : variants.map(({ fields, name }) => withTypeString(this, {
-        ...this.#extractFields(fields),
-        name: name.toString()
-      }));
-  }
-}

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

@@ -14,8 +14,6 @@ export abstract class Base<ApiType extends ApiTypes> {
 
   public readonly api: ApiBase<ApiType>;
 
-  public readonly registry: Registry;
-
   protected readonly _decorateMethod: DecorateMethod<ApiType>;
 
   constructor (api: ApiBase<ApiType>, abi: AnyJson | Abi, decorateMethod: DecorateMethod<ApiType>) {
@@ -23,10 +21,13 @@ export abstract class Base<ApiType extends ApiTypes> {
       ? abi
       : new Abi(abi, api.registry.getChainProperties());
     this.api = api;
-    this.registry = this.abi.registry;
     this._decorateMethod = decorateMethod;
 
     assert(!!(api && api.isConnected && api.tx && api.tx.contracts && Object.keys(api.tx.contracts).length), 'Your API has not been initialized correctly and it not decorated with the runtime interfaces for contracts as retrieved from the on-chain runtime');
     assert(isFunction(api.tx.contracts.instantiateWithCode), 'You need to connect to a chain with a runtime with a V3 contracts module. The runtime does not expose api.tx.contracts.instantiateWithCode');
   }
+
+  public get registry (): Registry {
+    return this.api.registry;
+  }
 }

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

@@ -4,7 +4,7 @@
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import type { AccountId, EventRecord, Hash } from '@polkadot/types/interfaces';
-import type { AnyJson, CodecArg, ISubmittableResult } from '@polkadot/types/types';
+import type { AnyJson, ISubmittableResult } from '@polkadot/types/types';
 import type { AbiConstructor, BlueprintOptions } from '../types';
 import type { MapConstructorExec } from './types';
 
@@ -52,7 +52,7 @@ export class Blueprint<ApiType extends ApiTypes> extends Base<ApiType> {
     return this.#tx;
   }
 
-  #deploy = (constructorOrId: AbiConstructor | string | number, { gasLimit = BN_ZERO, salt, value = BN_ZERO }: BlueprintOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType, BlueprintSubmittableResult<ApiType>> => {
+  #deploy = (constructorOrId: AbiConstructor | string | number, { gasLimit = BN_ZERO, salt, value = BN_ZERO }: BlueprintOptions, params: unknown[]): SubmittableExtrinsic<ApiType, BlueprintSubmittableResult<ApiType>> => {
     return this.api.tx.contracts
       .instantiate(
         value,
@@ -66,5 +66,5 @@ export class Blueprint<ApiType extends ApiTypes> extends Base<ApiType> {
           new Contract<ApiType>(this.api, this.abi, record.event.data[1] as AccountId, this._decorateMethod)
         ))
       );
-  }
+  };
 }

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

@@ -1,28 +1,37 @@
 // Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { AnyJson } from '@polkadot/types/types';
+
 import fs from 'fs';
 import path from 'path';
 
 import { decorateMethodPromise } from '@polkadot/api';
 
-import contractFlipper from '../../test/contracts/ink/flipper.contract.json';
-import abiFlipper from '../../test/contracts/ink/flipper.json';
+import v0contractFlipper from '../../test/contracts/ink/v0/flipper.contract.json';
+import v0abiFlipper from '../../test/contracts/ink/v0/flipper.json';
+import v1contractFlipper from '../../test/contracts/ink/v1/flipper.contract.json';
 import { Code } from './Code';
 import { mockApi } from './mock';
 
-const wasmFlipper = fs.readFileSync(path.join(__dirname, '../../test/contracts/ink/flipper.wasm'));
+const v0wasmFlipper = fs.readFileSync(path.join(__dirname, '../../test/contracts/ink/v0/flipper.wasm'));
 
 describe('Code', (): void => {
   it('can construct with an individual ABI/WASM combo', (): void => {
     expect(
-      () => new Code(mockApi, abiFlipper, wasmFlipper, decorateMethodPromise)
+      () => new Code(mockApi, v0abiFlipper as AnyJson, v0wasmFlipper, decorateMethodPromise)
     ).not.toThrow();
   });
 
-  it('can construct with an .contract ABI', (): void => {
+  it('can construct with an .contract ABI (v0)', (): void => {
     expect(
-      () => new Code(mockApi, contractFlipper, null, decorateMethodPromise)
+      () => new Code(mockApi, v0contractFlipper as AnyJson, null, decorateMethodPromise)
+    ).not.toThrow();
+  });
+
+  it.only('can construct with an .contract ABI (v1)', (): void => {
+    expect(
+      () => new Code(mockApi, v1contractFlipper as AnyJson, null, decorateMethodPromise)
     ).not.toThrow();
   });
 });

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

@@ -4,7 +4,7 @@
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import type { EventRecord } from '@polkadot/types/interfaces';
-import type { AnyJson, CodecArg, ISubmittableResult } from '@polkadot/types/types';
+import type { AnyJson, ISubmittableResult } from '@polkadot/types/types';
 import type { AbiConstructor, BlueprintOptions } from '../types';
 import type { MapConstructorExec } from './types';
 
@@ -39,8 +39,8 @@ export class Code<ApiType extends ApiTypes> extends Base<ApiType> {
   constructor (api: ApiBase<ApiType>, abi: AnyJson | Abi, wasm: Uint8Array | string | Buffer | null | undefined, decorateMethod: DecorateMethod<ApiType>) {
     super(api, abi, decorateMethod);
 
-    this.code = isWasm(this.abi.project.source.wasm)
-      ? this.abi.project.source.wasm
+    this.code = isWasm(this.abi.info.source.wasm)
+      ? this.abi.info.source.wasm
       : u8aToU8a(wasm);
 
     assert(isWasm(this.code), 'No WASM code provided');
@@ -56,7 +56,7 @@ export class Code<ApiType extends ApiTypes> extends Base<ApiType> {
     return this.#tx;
   }
 
-  #instantiate = (constructorOrId: AbiConstructor | string | number, { gasLimit = BN_ZERO, salt, value = BN_ZERO }: BlueprintOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> => {
+  #instantiate = (constructorOrId: AbiConstructor | string | number, { gasLimit = BN_ZERO, salt, value = BN_ZERO }: BlueprintOptions, params: unknown[]): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> => {
     return this.api.tx.contracts
       .instantiateWithCode(
         value,
@@ -76,5 +76,5 @@ export class Code<ApiType extends ApiTypes> extends Base<ApiType> {
           [])
         ) || []))
       );
-  }
+  };
 }

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

@@ -5,7 +5,7 @@ import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import type { Bytes } from '@polkadot/types';
 import type { AccountId, EventRecord, Weight } from '@polkadot/types/interfaces';
-import type { AnyJson, CodecArg, ISubmittableResult } from '@polkadot/types/types';
+import type { AnyJson, ISubmittableResult } from '@polkadot/types/types';
 import type { AbiMessage, ContractCallOutcome, ContractOptions, DecodedEvent } from '../types';
 import type { ContractCallResult, ContractCallSend, ContractQuery, ContractTx, MapMessageQuery, MapMessageTx } from './types';
 
@@ -13,7 +13,6 @@ import { map } from 'rxjs';
 
 import { SubmittableResult } from '@polkadot/api';
 import { ApiBase } from '@polkadot/api/base';
-import { createTypeUnsafe } from '@polkadot/types';
 import { assert, BN, BN_HUNDRED, BN_ONE, BN_ZERO, bnToBn, isFunction, isUndefined, logger } from '@polkadot/util';
 
 import { Abi } from '../Abi';
@@ -26,15 +25,15 @@ const ERROR_NO_CALL = 'Your node does not expose the contracts.call RPC. This is
 
 const l = logger('Contract');
 
-function createQuery <ApiType extends ApiTypes> (fn: (origin: string | AccountId | Uint8Array, options: ContractOptions, params: CodecArg[]) => ContractCallResult<ApiType, ContractCallOutcome>): ContractQuery<ApiType> {
-  return (origin: string | AccountId | Uint8Array, options: BigInt | string | number | BN | ContractOptions, ...params: CodecArg[]): ContractCallResult<ApiType, ContractCallOutcome> =>
+function createQuery <ApiType extends ApiTypes> (fn: (origin: string | AccountId | Uint8Array, options: ContractOptions, params: unknown[]) => ContractCallResult<ApiType, ContractCallOutcome>): ContractQuery<ApiType> {
+  return (origin: string | AccountId | Uint8Array, options: bigint | string | number | BN | ContractOptions, ...params: unknown[]): ContractCallResult<ApiType, ContractCallOutcome> =>
     isOptions(options)
       ? fn(origin, options, params)
       : fn(origin, ...extractOptions(options, params));
 }
 
-function createTx <ApiType extends ApiTypes> (fn: (options: ContractOptions, params: CodecArg[]) => SubmittableExtrinsic<ApiType>): ContractTx<ApiType> {
-  return (options: BigInt | string | number | BN | ContractOptions, ...params: CodecArg[]): SubmittableExtrinsic<ApiType> =>
+function createTx <ApiType extends ApiTypes> (fn: (options: ContractOptions, params: unknown[]) => SubmittableExtrinsic<ApiType>): ContractTx<ApiType> {
+  return (options: bigint | string | number | BN | ContractOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType> =>
     isOptions(options)
       ? fn(options, params)
       : fn(...extractOptions(options, params));
@@ -90,7 +89,7 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
     return this.#tx;
   }
 
-  #getGas = (_gasLimit: BigInt | BN | string | number, isCall = false): BN => {
+  #getGas = (_gasLimit: bigint | BN | string | number, isCall = false): BN => {
     const gasLimit = bnToBn(_gasLimit);
 
     return gasLimit.lte(BN_ZERO)
@@ -101,9 +100,9 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
           : this.api.consts.system.maximumBlockWeight as Weight
         ).muln(64).div(BN_HUNDRED)
       : gasLimit;
-  }
+  };
 
-  #exec = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, value = BN_ZERO }: ContractOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType> => {
+  #exec = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, value = BN_ZERO }: ContractOptions, params: unknown[]): SubmittableExtrinsic<ApiType> => {
     return this.api.tx.contracts
       .call(
         this.address,
@@ -127,9 +126,9 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
             .filter((decoded): decoded is DecodedEvent => !!decoded)
         ))
       );
-  }
+  };
 
-  #read = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, value = BN_ZERO }: ContractOptions, params: CodecArg[]): ContractCallSend<ApiType> => {
+  #read = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, value = BN_ZERO }: ContractOptions, params: unknown[]): ContractCallSend<ApiType> => {
     assert(this.hasRpcContractsCall, ERROR_NO_CALL);
 
     const message = this.abi.findMessage(messageOrId);
@@ -153,12 +152,12 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
                 ? gasRequired
                 : gasConsumed,
               output: result.isOk && message.returnType
-                ? createTypeUnsafe(this.registry, message.returnType.type, [result.asOk.data.toU8a(true)], { isPedantic: true })
+                ? this.abi.registry.createTypeUnsafe(message.returnType.lookupName || message.returnType.type, [result.asOk.data.toU8a(true)], { isPedantic: true })
                 : null,
               result
             }))
           )
       )
     };
-  }
+  };
 }

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

@@ -5,28 +5,27 @@ import type { Observable } from 'rxjs';
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes, ObsInnerType } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { CodecArg } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
 import type { AbiMessage, BlueprintOptions, ContractCallOutcome, ContractOptions } from '../types';
 
 export interface BlueprintDeploy<ApiType extends ApiTypes> {
-  (options: BlueprintOptions, ...params: CodecArg[]): SubmittableExtrinsic<ApiType>;
-  (value: BigInt | string | number | BN, gasLimit: BigInt | string | number | BN, ...params: CodecArg[]): SubmittableExtrinsic<ApiType>;
+  (options: BlueprintOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType>;
+  (value: bigint | string | number | BN, gasLimit: bigint | string | number | BN, ...params: unknown[]): SubmittableExtrinsic<ApiType>;
 }
 
 export interface ContractQuery<ApiType extends ApiTypes> {
-  (origin: AccountId | string | Uint8Array, options: ContractOptions, ...params: CodecArg[]): ContractCallResult<ApiType, ContractCallOutcome>;
-  (origin: AccountId | string | Uint8Array, value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, ...params: CodecArg[]): ContractCallResult<ApiType, ContractCallOutcome>;
+  (origin: AccountId | string | Uint8Array, options: ContractOptions, ...params: unknown[]): ContractCallResult<ApiType, ContractCallOutcome>;
+  (origin: AccountId | string | Uint8Array, value: bigint | BN | string | number, gasLimit: bigint | BN | string | number, ...params: unknown[]): ContractCallResult<ApiType, ContractCallOutcome>;
 }
 
 export interface ContractTx<ApiType extends ApiTypes> {
-  (options: ContractOptions, ...params: CodecArg[]): SubmittableExtrinsic<ApiType>;
-  (value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, ...params: CodecArg[]): SubmittableExtrinsic<ApiType>;
+  (options: ContractOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType>;
+  (value: bigint | BN | string | number, gasLimit: bigint | BN | string | number, ...params: unknown[]): SubmittableExtrinsic<ApiType>;
 }
 
 export interface ContractGeneric<O, T> {
-  (messageOrId: AbiMessage | string | number, options: O, ...params: CodecArg[]): T;
-  (messageOrId: AbiMessage | string | number, value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, ...params: CodecArg[]): T;
+  (messageOrId: AbiMessage | string | number, options: O, ...params: unknown[]): T;
+  (messageOrId: AbiMessage | string | number, value: bigint | BN | string | number, gasLimit: bigint | BN | string | number, ...params: unknown[]): T;
 }
 
 export type ContractCallResult<ApiType extends ApiTypes, T> = ApiType extends 'rxjs'

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

@@ -4,7 +4,6 @@
 import type { SubmittableResult } from '@polkadot/api';
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes } from '@polkadot/api/types';
-import type { CodecArg } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
 import type { AbiConstructor, BlueprintOptions } from '../types';
 import type { BlueprintDeploy, ContractGeneric } from './types';
@@ -17,15 +16,15 @@ import { extractOptions, isOptions } from '../util';
 
 export const EMPTY_SALT = new Uint8Array();
 
-export function createBluePrintTx <ApiType extends ApiTypes, R extends SubmittableResult> (fn: (options: BlueprintOptions, params: CodecArg[]) => SubmittableExtrinsic<ApiType, R>): BlueprintDeploy<ApiType> {
-  return (options: BigInt | string | number | BN | BlueprintOptions, ...params: CodecArg[]): SubmittableExtrinsic<ApiType, R> =>
+export function createBluePrintTx <ApiType extends ApiTypes, R extends SubmittableResult> (fn: (options: BlueprintOptions, params: unknown[]) => SubmittableExtrinsic<ApiType, R>): BlueprintDeploy<ApiType> {
+  return (options: bigint | string | number | BN | BlueprintOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType, R> =>
     isOptions(options)
       ? fn(options, params)
       : fn(...extractOptions(options, params));
 }
 
-export function createBluePrintWithId <T> (fn: (constructorOrId: AbiConstructor | string | number, options: BlueprintOptions, params: CodecArg[]) => T): ContractGeneric<BlueprintOptions, T> {
-  return (constructorOrId: AbiConstructor | string | number, options: BigInt | string | number | BN | BlueprintOptions, ...params: CodecArg[]): T =>
+export function createBluePrintWithId <T> (fn: (constructorOrId: AbiConstructor | string | number, options: BlueprintOptions, params: unknown[]) => T): ContractGeneric<BlueprintOptions, T> {
+  return (constructorOrId: AbiConstructor | string | number, options: bigint | string | number | BN | BlueprintOptions, ...params: unknown[]): T =>
     isOptions(options)
       ? fn(constructorOrId, options, params)
       : fn(constructorOrId, ...extractOptions(options, params));

packages/api-contract/src/checkTypes.manual.ts

@@ -3,6 +3,8 @@
 
 // Simple non-runnable checks to test type definitions in the editor itself
 
+import type { AnyJson } from '@polkadot/types/types';
+
 import { ApiPromise } from '@polkadot/api';
 import { createTestPairs, TestKeyringMap } from '@polkadot/keyring/testingPairs';
 
@@ -10,7 +12,7 @@ import abiIncrementer from '../test/contracts/ink/incrementer.json';
 import { BlueprintPromise, ContractPromise } from '.';
 
 async function checkBlueprint (api: ApiPromise, pairs: TestKeyringMap): Promise<void> {
-  const blueprint = new BlueprintPromise(api, abiIncrementer, '0x1234');
+  const blueprint = new BlueprintPromise(api, abiIncrementer as AnyJson, '0x1234');
 
   // new style
   await blueprint.tx.new({ gasLimit: 456, salt: '0x1234', value: 123 }, 42).signAndSend(pairs.bob);
@@ -21,7 +23,7 @@ async function checkBlueprint (api: ApiPromise, pairs: TestKeyringMap): Promise<
 }
 
 async function checkContract (api: ApiPromise, pairs: TestKeyringMap): Promise<void> {
-  const contract = new ContractPromise(api, abiIncrementer, '0x1234');
+  const contract = new ContractPromise(api, abiIncrementer as AnyJson, '0x1234');
 
   // queries
   await contract.query.get(pairs.alice.address, {});

packages/api-contract/src/packageInfo.ts

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

packages/api-contract/src/types.ts

@@ -5,7 +5,7 @@ import type { ApiBase } from '@polkadot/api/base';
 import type { ApiTypes } from '@polkadot/api/types';
 import type { Text, u64 } from '@polkadot/types';
 import type { ContractExecResultResult, ContractSelector } from '@polkadot/types/interfaces';
-import type { Codec, CodecArg, TypeDef } from '@polkadot/types/types';
+import type { Codec, TypeDef } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
 import type { Abi } from '.';
 
@@ -42,7 +42,7 @@ export interface AbiMessage {
   method: string;
   returnType?: TypeDef | null;
   selector: ContractSelector;
-  toU8a: (params: CodecArg[]) => Uint8Array;
+  toU8a: (params: unknown[]) => Uint8Array;
 }
 
 export type AbiConstructor = AbiMessage;
@@ -71,12 +71,12 @@ export interface DecodedMessage {
 }
 
 export interface BlueprintOptions {
-  gasLimit?: BigInt | string | number | BN;
+  gasLimit?: bigint | string | number | BN;
   salt?: Uint8Array | string | null;
-  value?: BigInt | string | number | BN;
+  value?: bigint | string | number | BN;
 }
 
 export interface ContractOptions {
-  gasLimit?: BigInt | BN | string | number;
-  value?: BigInt | BN | string | number;
+  gasLimit?: bigint | BN | string | number;
+  value?: bigint | BN | string | number;
 }

packages/api-contract/src/util.ts

@@ -3,7 +3,6 @@
 
 import type { SubmittableResult } from '@polkadot/api';
 import type { EventRecord } from '@polkadot/types/interfaces';
-import type { CodecArg } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
 import type { BlueprintOptions, ContractOptions } from './types';
 
@@ -25,11 +24,11 @@ export function applyOnEvent <T> (result: SubmittableResult, types: ContractEven
   return undefined;
 }
 
-export function isOptions <T> (options: BigInt | string | number | BN | T): options is T {
+export function isOptions <T> (options: bigint | string | number | BN | T): options is T {
   return !(isBn(options) || isBigInt(options) || isNumber(options) || isString(options));
 }
 
-export function extractOptions <T extends TOptions> (value: BigInt | string | number | BN, params: CodecArg[]): [T, CodecArg[]] {
+export function extractOptions <T extends TOptions> (value: bigint | string | number | BN, params: unknown[]): [T, unknown[]] {
   const gasLimit = params.shift() as BN;
 
   return [{ gasLimit, value } as T, params];

packages/api-contract/test/compare/ink_delegator.test.json

@@ -1,31 +0,0 @@
-[
-  {
-    "displayName": "AccountId",
-    "namespace": "ink_env::types",
-    "info": 6,
-    "type": "AccountId"
-  },
-  {
-    "info": 12,
-    "length": 32,
-    "sub": {
-      "info": 6,
-      "type": "u8"
-    },
-    "type": "[u8;32]"
-  },
-  {
-    "info": 6,
-    "type": "u8"
-  },
-  {
-    "info": 6,
-    "type": "i32"
-  },
-  {
-    "displayName": "Hash",
-    "namespace": "ink_env::types",
-    "info": 6,
-    "type": "Hash"
-  }
-]

packages/api-contract/test/compare/ink_dns.test.json

@@ -1,204 +0,0 @@
-[
-  {
-    "displayName": "Header",
-    "namespace": "ink_storage::collections::stash",
-    "info": 9,
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "last_vacant"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "len"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "len_entries"
-      }
-    ],
-    "type": "{\"last_vacant\":\"u32\",\"len\":\"u32\",\"len_entries\":\"u32\"}"
-  },
-  {
-    "info": 6,
-    "type": "u32"
-  },
-  {
-    "displayName": "Entry",
-    "namespace": "ink_storage::collections::stash",
-    "sub": [
-      {
-        "displayName": "VacantEntry",
-        "namespace": "ink_storage::collections::stash",
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "next"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "prev"
-          }
-        ],
-        "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
-        "name": "Vacant"
-      },
-      {
-        "displayName": "Hash",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "Hash",
-        "name": "Occupied"
-      }
-    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"Hash\"}}"
-  },
-  {
-    "displayName": "Hash",
-    "namespace": "ink_env::types",
-    "info": 6,
-    "type": "Hash"
-  },
-  {
-    "info": 12,
-    "length": 32,
-    "sub": {
-      "info": 6,
-      "type": "u8"
-    },
-    "type": "[u8;32]"
-  },
-  {
-    "info": 6,
-    "type": "u8"
-  },
-  {
-    "displayName": "VacantEntry",
-    "namespace": "ink_storage::collections::stash",
-    "info": 9,
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "next"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "prev"
-      }
-    ],
-    "type": "{\"next\":\"u32\",\"prev\":\"u32\"}"
-  },
-  {
-    "displayName": "ValueEntry",
-    "namespace": "ink_storage::collections::hashmap",
-    "sub": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId",
-        "name": "value"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "key_index"
-      }
-    ],
-    "info": 9,
-    "type": "{\"value\":\"AccountId\",\"key_index\":\"u32\"}"
-  },
-  {
-    "displayName": "AccountId",
-    "namespace": "ink_env::types",
-    "info": 6,
-    "type": "AccountId"
-  },
-  {
-    "displayName": "Result",
-    "sub": [
-      {
-        "name": "Ok",
-        "info": 10,
-        "sub": [],
-        "type": "()"
-      },
-      {
-        "name": "Error",
-        "displayName": "Error",
-        "namespace": "dns::dns",
-        "info": 3,
-        "sub": [
-          {
-            "ext": {
-              "discriminant": 0
-            },
-            "info": 6,
-            "name": "NameAlreadyExists",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 1
-            },
-            "info": 6,
-            "name": "CallerIsNotOwner",
-            "type": "Null"
-          }
-        ],
-        "type": "{\"_enum\":[\"NameAlreadyExists\",\"CallerIsNotOwner\"]}"
-      }
-    ],
-    "info": 7,
-    "type": "Result<(), Error>"
-  },
-  {
-    "info": 10,
-    "sub": [],
-    "type": "()"
-  },
-  {
-    "displayName": "Error",
-    "namespace": "dns::dns",
-    "info": 3,
-    "sub": [
-      {
-        "ext": {
-          "discriminant": 0
-        },
-        "info": 6,
-        "name": "NameAlreadyExists",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 1
-        },
-        "info": 6,
-        "name": "CallerIsNotOwner",
-        "type": "Null"
-      }
-    ],
-    "type": "{\"_enum\":[\"NameAlreadyExists\",\"CallerIsNotOwner\"]}"
-  },
-  {
-    "displayName": "Option",
-    "sub": {
-      "displayName": "AccountId",
-      "namespace": "ink_env::types",
-      "info": 6,
-      "type": "AccountId"
-    },
-    "info": 5,
-    "type": "Option<AccountId>"
-  }
-]

packages/api-contract/test/compare/ink_erc20.test.json

@@ -1,201 +0,0 @@
-[
-  {
-    "info": 6,
-    "type": "u128"
-  },
-  {
-    "displayName": "Header",
-    "namespace": "ink_storage::collections::stash",
-    "info": 9,
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "last_vacant"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "len"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "len_entries"
-      }
-    ],
-    "type": "{\"last_vacant\":\"u32\",\"len\":\"u32\",\"len_entries\":\"u32\"}"
-  },
-  {
-    "info": 6,
-    "type": "u32"
-  },
-  {
-    "displayName": "Entry",
-    "namespace": "ink_storage::collections::stash",
-    "sub": [
-      {
-        "displayName": "VacantEntry",
-        "namespace": "ink_storage::collections::stash",
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "next"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "prev"
-          }
-        ],
-        "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
-        "name": "Vacant"
-      },
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId",
-        "name": "Occupied"
-      }
-    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"AccountId\"}}"
-  },
-  {
-    "displayName": "AccountId",
-    "namespace": "ink_env::types",
-    "info": 6,
-    "type": "AccountId"
-  },
-  {
-    "info": 12,
-    "length": 32,
-    "sub": {
-      "info": 6,
-      "type": "u8"
-    },
-    "type": "[u8;32]"
-  },
-  {
-    "info": 6,
-    "type": "u8"
-  },
-  {
-    "displayName": "VacantEntry",
-    "namespace": "ink_storage::collections::stash",
-    "info": 9,
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "next"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "prev"
-      }
-    ],
-    "type": "{\"next\":\"u32\",\"prev\":\"u32\"}"
-  },
-  {
-    "displayName": "ValueEntry",
-    "namespace": "ink_storage::collections::hashmap",
-    "sub": [
-      {
-        "info": 6,
-        "type": "u128",
-        "name": "value"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "key_index"
-      }
-    ],
-    "info": 9,
-    "type": "{\"value\":\"u128\",\"key_index\":\"u32\"}"
-  },
-  {
-    "displayName": "Entry",
-    "namespace": "ink_storage::collections::stash",
-    "sub": [
-      {
-        "displayName": "VacantEntry",
-        "namespace": "ink_storage::collections::stash",
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "next"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "prev"
-          }
-        ],
-        "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
-        "name": "Vacant"
-      },
-      {
-        "info": 10,
-        "sub": [
-          {
-            "displayName": "AccountId",
-            "namespace": "ink_env::types",
-            "info": 6,
-            "type": "AccountId"
-          },
-          {
-            "displayName": "AccountId",
-            "namespace": "ink_env::types",
-            "info": 6,
-            "type": "AccountId"
-          }
-        ],
-        "type": "(AccountId,AccountId)",
-        "name": "Occupied"
-      }
-    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(AccountId,AccountId)\"}}"
-  },
-  {
-    "info": 10,
-    "sub": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      },
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "type": "(AccountId,AccountId)"
-  },
-  {
-    "info": 6,
-    "type": "bool"
-  },
-  {
-    "displayName": "Option",
-    "sub": {
-      "displayName": "AccountId",
-      "namespace": "ink_env::types",
-      "info": 6,
-      "type": "AccountId"
-    },
-    "info": 5,
-    "type": "Option<AccountId>"
-  }
-]

packages/api-contract/test/compare/ink_erc721.test.json

@@ -1,430 +0,0 @@
-[
-  {
-    "displayName": "Header",
-    "namespace": "ink_storage::collections::stash",
-    "info": 9,
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "last_vacant"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "len"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "len_entries"
-      }
-    ],
-    "type": "{\"last_vacant\":\"u32\",\"len\":\"u32\",\"len_entries\":\"u32\"}"
-  },
-  {
-    "info": 6,
-    "type": "u32"
-  },
-  {
-    "displayName": "Entry",
-    "namespace": "ink_storage::collections::stash",
-    "sub": [
-      {
-        "displayName": "VacantEntry",
-        "namespace": "ink_storage::collections::stash",
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "next"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "prev"
-          }
-        ],
-        "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
-        "name": "Vacant"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "Occupied"
-      }
-    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"u32\"}}"
-  },
-  {
-    "displayName": "VacantEntry",
-    "namespace": "ink_storage::collections::stash",
-    "info": 9,
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "next"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "prev"
-      }
-    ],
-    "type": "{\"next\":\"u32\",\"prev\":\"u32\"}"
-  },
-  {
-    "displayName": "ValueEntry",
-    "namespace": "ink_storage::collections::hashmap",
-    "sub": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId",
-        "name": "value"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "key_index"
-      }
-    ],
-    "info": 9,
-    "type": "{\"value\":\"AccountId\",\"key_index\":\"u32\"}"
-  },
-  {
-    "displayName": "AccountId",
-    "namespace": "ink_env::types",
-    "info": 6,
-    "type": "AccountId"
-  },
-  {
-    "info": 12,
-    "length": 32,
-    "sub": {
-      "info": 6,
-      "type": "u8"
-    },
-    "type": "[u8;32]"
-  },
-  {
-    "info": 6,
-    "type": "u8"
-  },
-  {
-    "displayName": "Entry",
-    "namespace": "ink_storage::collections::stash",
-    "sub": [
-      {
-        "displayName": "VacantEntry",
-        "namespace": "ink_storage::collections::stash",
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "next"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "prev"
-          }
-        ],
-        "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
-        "name": "Vacant"
-      },
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId",
-        "name": "Occupied"
-      }
-    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"AccountId\"}}"
-  },
-  {
-    "displayName": "ValueEntry",
-    "namespace": "ink_storage::collections::hashmap",
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "value"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "key_index"
-      }
-    ],
-    "info": 9,
-    "type": "{\"value\":\"u32\",\"key_index\":\"u32\"}"
-  },
-  {
-    "displayName": "Entry",
-    "namespace": "ink_storage::collections::stash",
-    "sub": [
-      {
-        "displayName": "VacantEntry",
-        "namespace": "ink_storage::collections::stash",
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "next"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "prev"
-          }
-        ],
-        "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
-        "name": "Vacant"
-      },
-      {
-        "info": 10,
-        "sub": [
-          {
-            "displayName": "AccountId",
-            "namespace": "ink_env::types",
-            "info": 6,
-            "type": "AccountId"
-          },
-          {
-            "displayName": "AccountId",
-            "namespace": "ink_env::types",
-            "info": 6,
-            "type": "AccountId"
-          }
-        ],
-        "type": "(AccountId,AccountId)",
-        "name": "Occupied"
-      }
-    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(AccountId,AccountId)\"}}"
-  },
-  {
-    "info": 10,
-    "sub": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      },
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "type": "(AccountId,AccountId)"
-  },
-  {
-    "displayName": "ValueEntry",
-    "namespace": "ink_storage::collections::hashmap",
-    "sub": [
-      {
-        "info": 6,
-        "type": "bool",
-        "name": "value"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "key_index"
-      }
-    ],
-    "info": 9,
-    "type": "{\"value\":\"bool\",\"key_index\":\"u32\"}"
-  },
-  {
-    "info": 6,
-    "type": "bool"
-  },
-  {
-    "displayName": "Option",
-    "sub": {
-      "displayName": "AccountId",
-      "namespace": "ink_env::types",
-      "info": 6,
-      "type": "AccountId"
-    },
-    "info": 5,
-    "type": "Option<AccountId>"
-  },
-  {
-    "displayName": "Result",
-    "sub": [
-      {
-        "name": "Ok",
-        "info": 10,
-        "sub": [],
-        "type": "()"
-      },
-      {
-        "name": "Error",
-        "displayName": "Error",
-        "namespace": "erc721::erc721",
-        "info": 3,
-        "sub": [
-          {
-            "ext": {
-              "discriminant": 0
-            },
-            "info": 6,
-            "name": "NotOwner",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 1
-            },
-            "info": 6,
-            "name": "NotApproved",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 2
-            },
-            "info": 6,
-            "name": "TokenExists",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 3
-            },
-            "info": 6,
-            "name": "TokenNotFound",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 4
-            },
-            "info": 6,
-            "name": "CannotInsert",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 5
-            },
-            "info": 6,
-            "name": "CannotRemove",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 6
-            },
-            "info": 6,
-            "name": "CannotFetchValue",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 7
-            },
-            "info": 6,
-            "name": "NotAllowed",
-            "type": "Null"
-          }
-        ],
-        "type": "{\"_enum\":[\"NotOwner\",\"NotApproved\",\"TokenExists\",\"TokenNotFound\",\"CannotInsert\",\"CannotRemove\",\"CannotFetchValue\",\"NotAllowed\"]}"
-      }
-    ],
-    "info": 7,
-    "type": "Result<(), Error>"
-  },
-  {
-    "info": 10,
-    "sub": [],
-    "type": "()"
-  },
-  {
-    "displayName": "Error",
-    "namespace": "erc721::erc721",
-    "info": 3,
-    "sub": [
-      {
-        "ext": {
-          "discriminant": 0
-        },
-        "info": 6,
-        "name": "NotOwner",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 1
-        },
-        "info": 6,
-        "name": "NotApproved",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 2
-        },
-        "info": 6,
-        "name": "TokenExists",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 3
-        },
-        "info": 6,
-        "name": "TokenNotFound",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 4
-        },
-        "info": 6,
-        "name": "CannotInsert",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 5
-        },
-        "info": 6,
-        "name": "CannotRemove",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 6
-        },
-        "info": 6,
-        "name": "CannotFetchValue",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 7
-        },
-        "info": 6,
-        "name": "NotAllowed",
-        "type": "Null"
-      }
-    ],
-    "type": "{\"_enum\":[\"NotOwner\",\"NotApproved\",\"TokenExists\",\"TokenNotFound\",\"CannotInsert\",\"CannotRemove\",\"CannotFetchValue\",\"NotAllowed\"]}"
-  }
-]

packages/api-contract/test/compare/ink_flipper.test.json

@@ -1,6 +0,0 @@
-[
-  {
-    "info": 6,
-    "type": "bool"
-  }
-]

packages/api-contract/test/compare/ink_flipperBundle.test.json

@@ -1,6 +0,0 @@
-[
-  {
-    "info": 6,
-    "type": "bool"
-  }
-]

packages/api-contract/test/compare/ink_incrementer.test.json

@@ -1,6 +0,0 @@
-[
-  {
-    "info": 6,
-    "type": "i32"
-  }
-]

packages/api-contract/test/compare/ink_multisigPlain.test.json

@@ -1,514 +0,0 @@
-[
-  {
-    "displayName": "Header",
-    "namespace": "ink_storage::collections::stash",
-    "info": 9,
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "last_vacant"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "len"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "len_entries"
-      }
-    ],
-    "type": "{\"last_vacant\":\"u32\",\"len\":\"u32\",\"len_entries\":\"u32\"}"
-  },
-  {
-    "info": 6,
-    "type": "u32"
-  },
-  {
-    "displayName": "Entry",
-    "namespace": "ink_storage::collections::stash",
-    "sub": [
-      {
-        "displayName": "VacantEntry",
-        "namespace": "ink_storage::collections::stash",
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "next"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "prev"
-          }
-        ],
-        "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
-        "name": "Vacant"
-      },
-      {
-        "info": 10,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32"
-          },
-          {
-            "displayName": "AccountId",
-            "namespace": "ink_env::types",
-            "info": 6,
-            "type": "AccountId"
-          }
-        ],
-        "type": "(u32,AccountId)",
-        "name": "Occupied"
-      }
-    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(u32,AccountId)\"}}"
-  },
-  {
-    "info": 10,
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32"
-      },
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "type": "(u32,AccountId)"
-  },
-  {
-    "displayName": "AccountId",
-    "namespace": "ink_env::types",
-    "info": 6,
-    "type": "AccountId"
-  },
-  {
-    "info": 12,
-    "length": 32,
-    "sub": {
-      "info": 6,
-      "type": "u8"
-    },
-    "type": "[u8;32]"
-  },
-  {
-    "info": 6,
-    "type": "u8"
-  },
-  {
-    "displayName": "VacantEntry",
-    "namespace": "ink_storage::collections::stash",
-    "info": 9,
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "next"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "prev"
-      }
-    ],
-    "type": "{\"next\":\"u32\",\"prev\":\"u32\"}"
-  },
-  {
-    "displayName": "ValueEntry",
-    "namespace": "ink_storage::collections::hashmap",
-    "sub": [
-      {
-        "info": 10,
-        "sub": [],
-        "type": "()",
-        "name": "value"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "key_index"
-      }
-    ],
-    "info": 9,
-    "type": "{\"value\":\"()\",\"key_index\":\"u32\"}"
-  },
-  {
-    "info": 10,
-    "sub": [],
-    "type": "()"
-  },
-  {
-    "displayName": "Entry",
-    "namespace": "ink_storage::collections::stash",
-    "sub": [
-      {
-        "displayName": "VacantEntry",
-        "namespace": "ink_storage::collections::stash",
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "next"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "prev"
-          }
-        ],
-        "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
-        "name": "Vacant"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "Occupied"
-      }
-    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"u32\"}}"
-  },
-  {
-    "displayName": "ValueEntry",
-    "namespace": "ink_storage::collections::hashmap",
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "value"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "key_index"
-      }
-    ],
-    "info": 9,
-    "type": "{\"value\":\"u32\",\"key_index\":\"u32\"}"
-  },
-  {
-    "displayName": "Entry",
-    "namespace": "ink_storage::collections::stash",
-    "sub": [
-      {
-        "displayName": "VacantEntry",
-        "namespace": "ink_storage::collections::stash",
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "next"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "prev"
-          }
-        ],
-        "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
-        "name": "Vacant"
-      },
-      {
-        "displayName": "Transaction",
-        "namespace": "multisig_plain::multisig_plain",
-        "info": 9,
-        "sub": [
-          {
-            "displayName": "AccountId",
-            "namespace": "ink_env::types",
-            "info": 6,
-            "type": "AccountId",
-            "name": "callee"
-          },
-          {
-            "info": 12,
-            "length": 4,
-            "sub": {
-              "info": 6,
-              "type": "u8"
-            },
-            "type": "[u8;4]",
-            "name": "selector"
-          },
-          {
-            "info": 11,
-            "sub": {
-              "info": 6,
-              "type": "u8"
-            },
-            "type": "Vec<u8>",
-            "name": "input"
-          },
-          {
-            "info": 6,
-            "type": "u128",
-            "name": "transferred_value"
-          },
-          {
-            "info": 6,
-            "type": "u64",
-            "name": "gas_limit"
-          }
-        ],
-        "type": "{\"callee\":\"AccountId\",\"selector\":\"[u8;4]\",\"input\":\"Vec<u8>\",\"transferred_value\":\"u128\",\"gas_limit\":\"u64\"}",
-        "name": "Occupied"
-      }
-    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"Transaction\"}}"
-  },
-  {
-    "displayName": "Transaction",
-    "namespace": "multisig_plain::multisig_plain",
-    "info": 9,
-    "sub": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId",
-        "name": "callee"
-      },
-      {
-        "info": 12,
-        "length": 4,
-        "sub": {
-          "info": 6,
-          "type": "u8"
-        },
-        "type": "[u8;4]",
-        "name": "selector"
-      },
-      {
-        "info": 11,
-        "sub": {
-          "info": 6,
-          "type": "u8"
-        },
-        "type": "Vec<u8>",
-        "name": "input"
-      },
-      {
-        "info": 6,
-        "type": "u128",
-        "name": "transferred_value"
-      },
-      {
-        "info": 6,
-        "type": "u64",
-        "name": "gas_limit"
-      }
-    ],
-    "type": "{\"callee\":\"AccountId\",\"selector\":\"[u8;4]\",\"input\":\"Vec<u8>\",\"transferred_value\":\"u128\",\"gas_limit\":\"u64\"}"
-  },
-  {
-    "info": 12,
-    "length": 4,
-    "sub": {
-      "info": 6,
-      "type": "u8"
-    },
-    "type": "[u8;4]"
-  },
-  {
-    "info": 11,
-    "sub": {
-      "info": 6,
-      "type": "u8"
-    },
-    "type": "Vec<u8>"
-  },
-  {
-    "info": 6,
-    "type": "u128"
-  },
-  {
-    "info": 6,
-    "type": "u64"
-  },
-  {
-    "displayName": "Entry",
-    "namespace": "ink_storage::collections::stash",
-    "sub": [
-      {
-        "displayName": "VacantEntry",
-        "namespace": "ink_storage::collections::stash",
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "next"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "prev"
-          }
-        ],
-        "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
-        "name": "Vacant"
-      },
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId",
-        "name": "Occupied"
-      }
-    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"AccountId\"}}"
-  },
-  {
-    "info": 11,
-    "sub": {
-      "displayName": "AccountId",
-      "namespace": "ink_env::types",
-      "info": 6,
-      "type": "AccountId"
-    },
-    "type": "Vec<AccountId>"
-  },
-  {
-    "info": 10,
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32"
-      },
-      {
-        "displayName": "ConfirmationStatus",
-        "namespace": "multisig_plain::multisig_plain",
-        "info": 3,
-        "sub": [
-          {
-            "info": 10,
-            "sub": [],
-            "name": "Confirmed",
-            "type": "()"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "ConfirmationsNeeded"
-          }
-        ],
-        "type": "{\"_enum\":{\"Confirmed\":\"()\",\"ConfirmationsNeeded\":\"u32\"}}"
-      }
-    ],
-    "type": "(u32,ConfirmationStatus)"
-  },
-  {
-    "displayName": "ConfirmationStatus",
-    "namespace": "multisig_plain::multisig_plain",
-    "info": 3,
-    "sub": [
-      {
-        "info": 10,
-        "sub": [],
-        "name": "Confirmed",
-        "type": "()"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "ConfirmationsNeeded"
-      }
-    ],
-    "type": "{\"_enum\":{\"Confirmed\":\"()\",\"ConfirmationsNeeded\":\"u32\"}}"
-  },
-  {
-    "displayName": "Result",
-    "sub": [
-      {
-        "name": "Ok",
-        "info": 10,
-        "sub": [],
-        "type": "()"
-      },
-      {
-        "name": "Error",
-        "info": 10,
-        "sub": [],
-        "type": "()"
-      }
-    ],
-    "info": 7,
-    "type": "Result<(), ()>"
-  },
-  {
-    "displayName": "Result",
-    "sub": [
-      {
-        "name": "Ok",
-        "info": 11,
-        "sub": {
-          "info": 6,
-          "type": "u8"
-        },
-        "type": "Vec<u8>"
-      },
-      {
-        "name": "Error",
-        "info": 10,
-        "sub": [],
-        "type": "()"
-      }
-    ],
-    "info": 7,
-    "type": "Result<Vec<u8>, ()>"
-  },
-  {
-    "displayName": "Result",
-    "sub": [
-      {
-        "name": "Ok",
-        "displayName": "Option",
-        "sub": {
-          "info": 11,
-          "sub": {
-            "info": 6,
-            "type": "u8"
-          },
-          "type": "Vec<u8>"
-        },
-        "info": 5,
-        "type": "Option<Vec<u8>>"
-      },
-      {
-        "name": "Error",
-        "info": 10,
-        "sub": [],
-        "type": "()"
-      }
-    ],
-    "info": 7,
-    "type": "Result<Option<Vec<u8>>, ()>"
-  },
-  {
-    "displayName": "Option",
-    "sub": {
-      "info": 11,
-      "sub": {
-        "info": 6,
-        "type": "u8"
-      },
-      "type": "Vec<u8>"
-    },
-    "info": 5,
-    "type": "Option<Vec<u8>>"
-  }
-]

packages/api-contract/test/compare/ink_v0_delegator.test.json

@@ -0,0 +1,47 @@
+[
+  {
+    "info": "Plain",
+    "lookupIndex": 1,
+    "type": "AccountId",
+    "docs": [],
+    "namespace": "ink_env::types::AccountId",
+    "lookupNameRoot": "InkEnvAccountId"
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 2,
+    "type": "[u8;32]",
+    "docs": [],
+    "namespace": "",
+    "length": 32,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 3,
+      "type": "u8",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 3,
+    "type": "u8",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 4,
+    "type": "i32",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 5,
+    "type": "Hash",
+    "docs": [],
+    "namespace": "ink_env::types::Hash",
+    "lookupNameRoot": "InkEnvHash"
+  }
+]

packages/api-contract/test/compare/ink_v0_dns.test.json

@@ -0,0 +1,232 @@
+[
+  {
+    "info": "Struct",
+    "lookupIndex": 1,
+    "lookupName": "InkStorageCollectionsStashHeader",
+    "type": "{\"lastVacant\":\"u32\",\"len\":\"u32\",\"lenEntries\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Header",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "lastVacant"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "len"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "lenEntries"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 2,
+    "type": "u32",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 3,
+    "lookupName": "InkStorageCollectionsStashEntry",
+    "type": "{\"_enum\":{\"Vacant\":\"InkStorageCollectionsStashVacantEntry\",\"Occupied\":\"Hash\"}}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Entry",
+    "sub": [
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 7,
+        "lookupName": "InkStorageCollectionsStashVacantEntry",
+        "type": "Lookup7",
+        "index": 0,
+        "name": "Vacant"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 4,
+        "type": "Hash",
+        "docs": [],
+        "namespace": "ink_env::types::Hash",
+        "lookupNameRoot": "InkEnvHash",
+        "index": 1,
+        "name": "Occupied"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 4,
+    "type": "Hash",
+    "docs": [],
+    "namespace": "ink_env::types::Hash",
+    "lookupNameRoot": "InkEnvHash"
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 5,
+    "type": "[u8;32]",
+    "docs": [],
+    "namespace": "",
+    "length": 32,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 6,
+      "type": "u8",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 6,
+    "type": "u8",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 7,
+    "lookupName": "InkStorageCollectionsStashVacantEntry",
+    "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::VacantEntry",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "next"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "prev"
+      }
+    ]
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 8,
+    "lookupName": "InkStorageCollectionsHashmapValueEntry",
+    "type": "{\"value\":\"AccountId\",\"keyIndex\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::hashmap::ValueEntry",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 9,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId",
+        "name": "value"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "keyIndex"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 9,
+    "type": "AccountId",
+    "docs": [],
+    "namespace": "ink_env::types::AccountId",
+    "lookupNameRoot": "InkEnvAccountId"
+  },
+  {
+    "info": "Result",
+    "lookupIndex": 10,
+    "type": "Result<Null, DnsError>",
+    "docs": [],
+    "namespace": "Result",
+    "sub": [
+      {
+        "name": "Ok",
+        "info": "Null",
+        "lookupIndex": 11,
+        "type": "Null",
+        "docs": [],
+        "namespace": ""
+      },
+      {
+        "name": "Error",
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 12,
+        "lookupName": "DnsError",
+        "type": "Lookup12"
+      }
+    ]
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 11,
+    "type": "Null",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 12,
+    "lookupName": "DnsError",
+    "type": "{\"_enum\":[\"NameAlreadyExists\",\"CallerIsNotOwner\"]}",
+    "docs": [],
+    "namespace": "dns::dns::Error",
+    "sub": [
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 0,
+        "name": "NameAlreadyExists"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 1,
+        "name": "CallerIsNotOwner"
+      }
+    ]
+  },
+  {
+    "info": "Option",
+    "lookupIndex": 13,
+    "type": "Option<AccountId>",
+    "docs": [],
+    "namespace": "Option",
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 9,
+      "type": "AccountId",
+      "docs": [],
+      "namespace": "ink_env::types::AccountId",
+      "lookupNameRoot": "InkEnvAccountId"
+    }
+  }
+]

packages/api-contract/test/compare/ink_v0_erc20.test.json

@@ -0,0 +1,252 @@
+[
+  {
+    "info": "Plain",
+    "lookupIndex": 1,
+    "type": "u128",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 2,
+    "lookupName": "InkStorageCollectionsStashHeader",
+    "type": "{\"lastVacant\":\"u32\",\"len\":\"u32\",\"lenEntries\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Header",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 3,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "lastVacant"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 3,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "len"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 3,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "lenEntries"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 3,
+    "type": "u32",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 4,
+    "type": "{\"_enum\":{\"Vacant\":\"InkStorageCollectionsStashVacantEntry\",\"Occupied\":\"AccountId\"}}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Entry",
+    "sub": [
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 8,
+        "lookupName": "InkStorageCollectionsStashVacantEntry",
+        "type": "Lookup8",
+        "index": 0,
+        "name": "Vacant"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 5,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId",
+        "index": 1,
+        "name": "Occupied"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 5,
+    "type": "AccountId",
+    "docs": [],
+    "namespace": "ink_env::types::AccountId",
+    "lookupNameRoot": "InkEnvAccountId"
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 6,
+    "type": "[u8;32]",
+    "docs": [],
+    "namespace": "",
+    "length": 32,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 7,
+      "type": "u8",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 7,
+    "type": "u8",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 8,
+    "lookupName": "InkStorageCollectionsStashVacantEntry",
+    "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::VacantEntry",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 3,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "next"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 3,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "prev"
+      }
+    ]
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 9,
+    "lookupName": "InkStorageCollectionsHashmapValueEntry",
+    "type": "{\"value\":\"u128\",\"keyIndex\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::hashmap::ValueEntry",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 1,
+        "type": "u128",
+        "docs": [],
+        "namespace": "",
+        "name": "value"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 3,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "keyIndex"
+      }
+    ]
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 10,
+    "type": "{\"_enum\":{\"Vacant\":\"InkStorageCollectionsStashVacantEntry\",\"Occupied\":\"(AccountId,AccountId)\"}}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Entry",
+    "sub": [
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 8,
+        "lookupName": "InkStorageCollectionsStashVacantEntry",
+        "type": "Lookup8",
+        "index": 0,
+        "name": "Vacant"
+      },
+      {
+        "info": "Tuple",
+        "lookupIndex": 11,
+        "type": "(AccountId,AccountId)",
+        "docs": [],
+        "namespace": "",
+        "sub": [
+          {
+            "info": "Plain",
+            "lookupIndex": 5,
+            "type": "AccountId",
+            "docs": [],
+            "namespace": "ink_env::types::AccountId",
+            "lookupNameRoot": "InkEnvAccountId"
+          },
+          {
+            "info": "Plain",
+            "lookupIndex": 5,
+            "type": "AccountId",
+            "docs": [],
+            "namespace": "ink_env::types::AccountId",
+            "lookupNameRoot": "InkEnvAccountId"
+          }
+        ],
+        "index": 1,
+        "name": "Occupied"
+      }
+    ]
+  },
+  {
+    "info": "Tuple",
+    "lookupIndex": 11,
+    "type": "(AccountId,AccountId)",
+    "docs": [],
+    "namespace": "",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 5,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 5,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 12,
+    "type": "bool",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Option",
+    "lookupIndex": 13,
+    "type": "Option<AccountId>",
+    "docs": [],
+    "namespace": "Option",
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 5,
+      "type": "AccountId",
+      "docs": [],
+      "namespace": "ink_env::types::AccountId",
+      "lookupNameRoot": "InkEnvAccountId"
+    }
+  }
+]

packages/api-contract/test/compare/ink_v0_erc721.test.json

@@ -0,0 +1,412 @@
+[
+  {
+    "info": "Struct",
+    "lookupIndex": 1,
+    "lookupName": "InkStorageCollectionsStashHeader",
+    "type": "{\"lastVacant\":\"u32\",\"len\":\"u32\",\"lenEntries\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Header",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "lastVacant"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "len"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "lenEntries"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 2,
+    "type": "u32",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 3,
+    "type": "{\"_enum\":{\"Vacant\":\"InkStorageCollectionsStashVacantEntry\",\"Occupied\":\"u32\"}}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Entry",
+    "sub": [
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 4,
+        "lookupName": "InkStorageCollectionsStashVacantEntry",
+        "type": "Lookup4",
+        "index": 0,
+        "name": "Vacant"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "index": 1,
+        "name": "Occupied"
+      }
+    ]
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 4,
+    "lookupName": "InkStorageCollectionsStashVacantEntry",
+    "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::VacantEntry",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "next"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "prev"
+      }
+    ]
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 5,
+    "type": "{\"value\":\"AccountId\",\"keyIndex\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::hashmap::ValueEntry",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 6,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId",
+        "name": "value"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "keyIndex"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 6,
+    "type": "AccountId",
+    "docs": [],
+    "namespace": "ink_env::types::AccountId",
+    "lookupNameRoot": "InkEnvAccountId"
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 7,
+    "type": "[u8;32]",
+    "docs": [],
+    "namespace": "",
+    "length": 32,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 8,
+      "type": "u8",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 8,
+    "type": "u8",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 9,
+    "type": "{\"_enum\":{\"Vacant\":\"InkStorageCollectionsStashVacantEntry\",\"Occupied\":\"AccountId\"}}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Entry",
+    "sub": [
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 4,
+        "lookupName": "InkStorageCollectionsStashVacantEntry",
+        "type": "Lookup4",
+        "index": 0,
+        "name": "Vacant"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 6,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId",
+        "index": 1,
+        "name": "Occupied"
+      }
+    ]
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 10,
+    "type": "{\"value\":\"u32\",\"keyIndex\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::hashmap::ValueEntry",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "value"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "keyIndex"
+      }
+    ]
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 11,
+    "type": "{\"_enum\":{\"Vacant\":\"InkStorageCollectionsStashVacantEntry\",\"Occupied\":\"(AccountId,AccountId)\"}}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Entry",
+    "sub": [
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 4,
+        "lookupName": "InkStorageCollectionsStashVacantEntry",
+        "type": "Lookup4",
+        "index": 0,
+        "name": "Vacant"
+      },
+      {
+        "info": "Tuple",
+        "lookupIndex": 12,
+        "type": "(AccountId,AccountId)",
+        "docs": [],
+        "namespace": "",
+        "sub": [
+          {
+            "info": "Plain",
+            "lookupIndex": 6,
+            "type": "AccountId",
+            "docs": [],
+            "namespace": "ink_env::types::AccountId",
+            "lookupNameRoot": "InkEnvAccountId"
+          },
+          {
+            "info": "Plain",
+            "lookupIndex": 6,
+            "type": "AccountId",
+            "docs": [],
+            "namespace": "ink_env::types::AccountId",
+            "lookupNameRoot": "InkEnvAccountId"
+          }
+        ],
+        "index": 1,
+        "name": "Occupied"
+      }
+    ]
+  },
+  {
+    "info": "Tuple",
+    "lookupIndex": 12,
+    "type": "(AccountId,AccountId)",
+    "docs": [],
+    "namespace": "",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 6,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 6,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId"
+      }
+    ]
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 13,
+    "type": "{\"value\":\"bool\",\"keyIndex\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::hashmap::ValueEntry",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 14,
+        "type": "bool",
+        "docs": [],
+        "namespace": "",
+        "name": "value"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "keyIndex"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 14,
+    "type": "bool",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Option",
+    "lookupIndex": 15,
+    "type": "Option<AccountId>",
+    "docs": [],
+    "namespace": "Option",
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 6,
+      "type": "AccountId",
+      "docs": [],
+      "namespace": "ink_env::types::AccountId",
+      "lookupNameRoot": "InkEnvAccountId"
+    }
+  },
+  {
+    "info": "Result",
+    "lookupIndex": 16,
+    "type": "Result<Null, Erc721Error>",
+    "docs": [],
+    "namespace": "Result",
+    "sub": [
+      {
+        "name": "Ok",
+        "info": "Null",
+        "lookupIndex": 17,
+        "type": "Null",
+        "docs": [],
+        "namespace": ""
+      },
+      {
+        "name": "Error",
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 18,
+        "lookupName": "Erc721Error",
+        "type": "Lookup18"
+      }
+    ]
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 17,
+    "type": "Null",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 18,
+    "lookupName": "Erc721Error",
+    "type": "{\"_enum\":[\"NotOwner\",\"NotApproved\",\"TokenExists\",\"TokenNotFound\",\"CannotInsert\",\"CannotRemove\",\"CannotFetchValue\",\"NotAllowed\"]}",
+    "docs": [],
+    "namespace": "erc721::erc721::Error",
+    "sub": [
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 0,
+        "name": "NotOwner"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 1,
+        "name": "NotApproved"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 2,
+        "name": "TokenExists"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 3,
+        "name": "TokenNotFound"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 4,
+        "name": "CannotInsert"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 5,
+        "name": "CannotRemove"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 6,
+        "name": "CannotFetchValue"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 7,
+        "name": "NotAllowed"
+      }
+    ]
+  }
+]

packages/api-contract/test/compare/ink_v0_flipper.test.json

@@ -0,0 +1,9 @@
+[
+  {
+    "info": "Plain",
+    "lookupIndex": 1,
+    "type": "bool",
+    "docs": [],
+    "namespace": ""
+  }
+]

packages/api-contract/test/compare/ink_v0_flipperBundle.test.json

@@ -0,0 +1,9 @@
+[
+  {
+    "info": "Plain",
+    "lookupIndex": 1,
+    "type": "bool",
+    "docs": [],
+    "namespace": ""
+  }
+]

packages/api-contract/test/compare/ink_v0_incrementer.test.json

@@ -0,0 +1,9 @@
+[
+  {
+    "info": "Plain",
+    "lookupIndex": 1,
+    "type": "i32",
+    "docs": [],
+    "namespace": ""
+  }
+]

packages/api-contract/test/compare/ink_v0_multisigPlain.test.json

@@ -0,0 +1,560 @@
+[
+  {
+    "info": "Struct",
+    "lookupIndex": 1,
+    "lookupName": "InkStorageCollectionsStashHeader",
+    "type": "{\"lastVacant\":\"u32\",\"len\":\"u32\",\"lenEntries\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Header",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "lastVacant"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "len"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "lenEntries"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 2,
+    "type": "u32",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 3,
+    "type": "{\"_enum\":{\"Vacant\":\"InkStorageCollectionsStashVacantEntry\",\"Occupied\":\"(u32,AccountId)\"}}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Entry",
+    "sub": [
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 8,
+        "lookupName": "InkStorageCollectionsStashVacantEntry",
+        "type": "Lookup8",
+        "index": 0,
+        "name": "Vacant"
+      },
+      {
+        "info": "Tuple",
+        "lookupIndex": 4,
+        "type": "(u32,AccountId)",
+        "docs": [],
+        "namespace": "",
+        "sub": [
+          {
+            "info": "Plain",
+            "lookupIndex": 2,
+            "type": "u32",
+            "docs": [],
+            "namespace": ""
+          },
+          {
+            "info": "Plain",
+            "lookupIndex": 5,
+            "type": "AccountId",
+            "docs": [],
+            "namespace": "ink_env::types::AccountId",
+            "lookupNameRoot": "InkEnvAccountId"
+          }
+        ],
+        "index": 1,
+        "name": "Occupied"
+      }
+    ]
+  },
+  {
+    "info": "Tuple",
+    "lookupIndex": 4,
+    "type": "(u32,AccountId)",
+    "docs": [],
+    "namespace": "",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": ""
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 5,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 5,
+    "type": "AccountId",
+    "docs": [],
+    "namespace": "ink_env::types::AccountId",
+    "lookupNameRoot": "InkEnvAccountId"
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 6,
+    "type": "[u8;32]",
+    "docs": [],
+    "namespace": "",
+    "length": 32,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 7,
+      "type": "u8",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 7,
+    "type": "u8",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 8,
+    "lookupName": "InkStorageCollectionsStashVacantEntry",
+    "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::VacantEntry",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "next"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "prev"
+      }
+    ]
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 9,
+    "type": "{\"value\":\"Null\",\"keyIndex\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::hashmap::ValueEntry",
+    "sub": [
+      {
+        "info": "Null",
+        "lookupIndex": 10,
+        "type": "Null",
+        "docs": [],
+        "namespace": "",
+        "name": "value"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "keyIndex"
+      }
+    ]
+  },
+  {
+    "info": "Null",
+    "lookupIndex": 10,
+    "type": "Null",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 11,
+    "type": "{\"_enum\":{\"Vacant\":\"InkStorageCollectionsStashVacantEntry\",\"Occupied\":\"u32\"}}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Entry",
+    "sub": [
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 8,
+        "lookupName": "InkStorageCollectionsStashVacantEntry",
+        "type": "Lookup8",
+        "index": 0,
+        "name": "Vacant"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "index": 1,
+        "name": "Occupied"
+      }
+    ]
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 12,
+    "type": "{\"value\":\"u32\",\"keyIndex\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::hashmap::ValueEntry",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "value"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "keyIndex"
+      }
+    ]
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 13,
+    "type": "{\"_enum\":{\"Vacant\":\"InkStorageCollectionsStashVacantEntry\",\"Occupied\":\"MultisigPlainMultisigPlainTransaction\"}}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Entry",
+    "sub": [
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 8,
+        "lookupName": "InkStorageCollectionsStashVacantEntry",
+        "type": "Lookup8",
+        "index": 0,
+        "name": "Vacant"
+      },
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 14,
+        "lookupName": "MultisigPlainMultisigPlainTransaction",
+        "type": "Lookup14",
+        "index": 1,
+        "name": "Occupied"
+      }
+    ]
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 14,
+    "lookupName": "MultisigPlainMultisigPlainTransaction",
+    "type": "{\"callee\":\"AccountId\",\"selector\":\"[u8;4]\",\"input\":\"Bytes\",\"transferredValue\":\"u128\",\"gasLimit\":\"u64\"}",
+    "docs": [],
+    "namespace": "multisig_plain::multisig_plain::Transaction",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 5,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId",
+        "name": "callee"
+      },
+      {
+        "info": "VecFixed",
+        "lookupIndex": 15,
+        "type": "[u8;4]",
+        "docs": [],
+        "namespace": "",
+        "length": 4,
+        "sub": {
+          "info": "Plain",
+          "lookupIndex": 7,
+          "type": "u8",
+          "docs": [],
+          "namespace": ""
+        },
+        "name": "selector"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 16,
+        "type": "Bytes",
+        "docs": [],
+        "namespace": "",
+        "name": "input"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 17,
+        "type": "u128",
+        "docs": [],
+        "namespace": "",
+        "name": "transferredValue"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 18,
+        "type": "u64",
+        "docs": [],
+        "namespace": "",
+        "name": "gasLimit"
+      }
+    ]
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 15,
+    "type": "[u8;4]",
+    "docs": [],
+    "namespace": "",
+    "length": 4,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 7,
+      "type": "u8",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 16,
+    "type": "Bytes",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 17,
+    "type": "u128",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 18,
+    "type": "u64",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 19,
+    "type": "{\"_enum\":{\"Vacant\":\"InkStorageCollectionsStashVacantEntry\",\"Occupied\":\"AccountId\"}}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Entry",
+    "sub": [
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 8,
+        "lookupName": "InkStorageCollectionsStashVacantEntry",
+        "type": "Lookup8",
+        "index": 0,
+        "name": "Vacant"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 5,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId",
+        "index": 1,
+        "name": "Occupied"
+      }
+    ]
+  },
+  {
+    "info": "Vec",
+    "lookupIndex": 20,
+    "type": "Vec<AccountId>",
+    "docs": [],
+    "namespace": "",
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 5,
+      "type": "AccountId",
+      "docs": [],
+      "namespace": "ink_env::types::AccountId",
+      "lookupNameRoot": "InkEnvAccountId"
+    }
+  },
+  {
+    "info": "Tuple",
+    "lookupIndex": 21,
+    "type": "(u32,MultisigPlainMultisigPlainConfirmationStatus)",
+    "docs": [],
+    "namespace": "",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": ""
+      },
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 22,
+        "lookupName": "MultisigPlainMultisigPlainConfirmationStatus",
+        "type": "Lookup22"
+      }
+    ]
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 22,
+    "lookupName": "MultisigPlainMultisigPlainConfirmationStatus",
+    "type": "{\"_enum\":{\"Confirmed\":\"Null\",\"ConfirmationsNeeded\":\"u32\"}}",
+    "docs": [],
+    "namespace": "multisig_plain::multisig_plain::ConfirmationStatus",
+    "sub": [
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 0,
+        "name": "Confirmed"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "index": 1,
+        "name": "ConfirmationsNeeded"
+      }
+    ]
+  },
+  {
+    "info": "Result",
+    "lookupIndex": 23,
+    "type": "Result<Null, Null>",
+    "docs": [],
+    "namespace": "Result",
+    "sub": [
+      {
+        "name": "Ok",
+        "info": "Null",
+        "lookupIndex": 10,
+        "type": "Null",
+        "docs": [],
+        "namespace": ""
+      },
+      {
+        "name": "Error",
+        "info": "Null",
+        "lookupIndex": 10,
+        "type": "Null",
+        "docs": [],
+        "namespace": ""
+      }
+    ]
+  },
+  {
+    "info": "Result",
+    "lookupIndex": 24,
+    "type": "Result<Bytes, Null>",
+    "docs": [],
+    "namespace": "Result",
+    "sub": [
+      {
+        "name": "Ok",
+        "info": "Plain",
+        "lookupIndex": 16,
+        "type": "Bytes",
+        "docs": [],
+        "namespace": ""
+      },
+      {
+        "name": "Error",
+        "info": "Null",
+        "lookupIndex": 10,
+        "type": "Null",
+        "docs": [],
+        "namespace": ""
+      }
+    ]
+  },
+  {
+    "info": "Result",
+    "lookupIndex": 25,
+    "type": "Result<Option<Bytes>, Null>",
+    "docs": [],
+    "namespace": "Result",
+    "sub": [
+      {
+        "name": "Ok",
+        "info": "Option",
+        "lookupIndex": 26,
+        "type": "Option<Bytes>",
+        "docs": [],
+        "namespace": "Option",
+        "sub": {
+          "info": "Plain",
+          "lookupIndex": 16,
+          "type": "Bytes",
+          "docs": [],
+          "namespace": ""
+        }
+      },
+      {
+        "name": "Error",
+        "info": "Null",
+        "lookupIndex": 10,
+        "type": "Null",
+        "docs": [],
+        "namespace": ""
+      }
+    ]
+  },
+  {
+    "info": "Option",
+    "lookupIndex": 26,
+    "type": "Option<Bytes>",
+    "docs": [],
+    "namespace": "Option",
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 16,
+      "type": "Bytes",
+      "docs": [],
+      "namespace": ""
+    }
+  }
+]

packages/api-contract/test/compare/ink_v1_flipper.test.json

@@ -0,0 +1,9 @@
+[
+  {
+    "info": "Plain",
+    "lookupIndex": 0,
+    "type": "bool",
+    "docs": [],
+    "namespace": ""
+  }
+]

packages/api-contract/test/compare/solang_ints256.test.json

@@ -1,6 +0,0 @@
-[
-  {
-    "info": 6,
-    "type": "u256"
-  }
-]

packages/api-contract/test/compare/solang_v0_ints256.test.json

@@ -0,0 +1,9 @@
+[
+  {
+    "info": "Plain",
+    "lookupIndex": 1,
+    "type": "u256",
+    "docs": [],
+    "namespace": ""
+  }
+]

packages/api-contract/test/compare/user_assetTransfer.test.json

@@ -1,28 +0,0 @@
-[
-  {
-    "info": 6,
-    "type": "u256"
-  },
-  {
-    "info": 6,
-    "type": "u8"
-  },
-  {
-    "info": 12,
-    "length": 32,
-    "sub": {
-      "info": 6,
-      "type": "u8"
-    },
-    "type": "[u8;32]"
-  },
-  {
-    "displayName": "AccountId",
-    "info": 6,
-    "type": "AccountId"
-  },
-  {
-    "info": 6,
-    "type": "Text"
-  }
-]

packages/api-contract/test/compare/user_enumExample.test.json

@@ -1,422 +0,0 @@
-[
-  {
-    "info": 6,
-    "type": "i32"
-  },
-  {
-    "info": 6,
-    "type": "u32"
-  },
-  {
-    "info": 6,
-    "type": "u8"
-  },
-  {
-    "displayName": "Variant",
-    "namespace": "enum_example::enum_example",
-    "info": 3,
-    "sub": [
-      {
-        "info": 10,
-        "sub": [],
-        "name": "None",
-        "type": "()"
-      },
-      {
-        "displayName": "Weekday",
-        "namespace": "enum_example::enum_example",
-        "info": 3,
-        "sub": [
-          {
-            "ext": {
-              "discriminant": 0
-            },
-            "info": 6,
-            "name": "Monday",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 1
-            },
-            "info": 6,
-            "name": "Tuesday",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 2
-            },
-            "info": 6,
-            "name": "Wednesday",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 3
-            },
-            "info": 6,
-            "name": "Thursday",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 4
-            },
-            "info": 6,
-            "name": "Friday",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 5
-            },
-            "info": 6,
-            "name": "Saturday",
-            "type": "Null"
-          },
-          {
-            "ext": {
-              "discriminant": 6
-            },
-            "info": 6,
-            "name": "Sunday",
-            "type": "Null"
-          }
-        ],
-        "type": "{\"_enum\":[\"Monday\",\"Tuesday\",\"Wednesday\",\"Thursday\",\"Friday\",\"Saturday\",\"Sunday\"]}",
-        "name": "Weekday"
-      },
-      {
-        "displayName": "TupleMaybeSigned",
-        "namespace": "enum_example::enum_example",
-        "info": 3,
-        "sub": [
-          {
-            "info": 6,
-            "type": "i32",
-            "name": "Signed"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "Unsigned"
-          }
-        ],
-        "type": "{\"_enum\":{\"Signed\":\"i32\",\"Unsigned\":\"u32\"}}",
-        "name": "TupleMaybeSigned"
-      },
-      {
-        "displayName": "NamedMaybeSigned",
-        "namespace": "enum_example::enum_example",
-        "info": 3,
-        "sub": [
-          {
-            "info": 9,
-            "sub": [
-              {
-                "info": 6,
-                "type": "i32",
-                "name": "value"
-              }
-            ],
-            "name": "Signed",
-            "type": "{\"value\":\"i32\"}"
-          },
-          {
-            "info": 9,
-            "sub": [
-              {
-                "info": 6,
-                "type": "u32",
-                "name": "value"
-              }
-            ],
-            "name": "Unsigned",
-            "type": "{\"value\":\"u32\"}"
-          }
-        ],
-        "type": "{\"_enum\":{\"Signed\":\"{\\\"value\\\":\\\"i32\\\"}\",\"Unsigned\":\"{\\\"value\\\":\\\"u32\\\"}\"}}",
-        "name": "NamedMaybeSigned"
-      },
-      {
-        "displayName": "Color",
-        "namespace": "enum_example::enum_example",
-        "info": 3,
-        "sub": [
-          {
-            "info": 10,
-            "sub": [],
-            "name": "Red",
-            "type": "()"
-          },
-          {
-            "info": 10,
-            "sub": [],
-            "name": "Blue",
-            "type": "()"
-          },
-          {
-            "info": 10,
-            "sub": [],
-            "name": "Green",
-            "type": "()"
-          },
-          {
-            "info": 10,
-            "sub": [],
-            "name": "Yellow",
-            "type": "()"
-          },
-          {
-            "info": 9,
-            "sub": [
-              {
-                "info": 6,
-                "type": "u8",
-                "name": "r"
-              },
-              {
-                "info": 6,
-                "type": "u8",
-                "name": "g"
-              },
-              {
-                "info": 6,
-                "type": "u8",
-                "name": "b"
-              }
-            ],
-            "name": "Rgb",
-            "type": "{\"r\":\"u8\",\"g\":\"u8\",\"b\":\"u8\"}"
-          },
-          {
-            "info": 9,
-            "sub": [
-              {
-                "info": 6,
-                "type": "u8",
-                "name": "r"
-              },
-              {
-                "info": 6,
-                "type": "u8",
-                "name": "g"
-              },
-              {
-                "info": 6,
-                "type": "u8",
-                "name": "b"
-              },
-              {
-                "info": 6,
-                "type": "u8",
-                "name": "a"
-              }
-            ],
-            "name": "Rgba",
-            "type": "{\"r\":\"u8\",\"g\":\"u8\",\"b\":\"u8\",\"a\":\"u8\"}"
-          }
-        ],
-        "type": "{\"_enum\":{\"Red\":\"()\",\"Blue\":\"()\",\"Green\":\"()\",\"Yellow\":\"()\",\"Rgb\":\"{\\\"r\\\":\\\"u8\\\",\\\"g\\\":\\\"u8\\\",\\\"b\\\":\\\"u8\\\"}\",\"Rgba\":\"{\\\"r\\\":\\\"u8\\\",\\\"g\\\":\\\"u8\\\",\\\"b\\\":\\\"u8\\\",\\\"a\\\":\\\"u8\\\"}\"}}",
-        "name": "Color"
-      }
-    ],
-    "type": "{\"_enum\":{\"None\":\"()\",\"Weekday\":\"Weekday\",\"TupleMaybeSigned\":\"TupleMaybeSigned\",\"NamedMaybeSigned\":\"NamedMaybeSigned\",\"Color\":\"Color\"}}"
-  },
-  {
-    "displayName": "Weekday",
-    "namespace": "enum_example::enum_example",
-    "info": 3,
-    "sub": [
-      {
-        "ext": {
-          "discriminant": 0
-        },
-        "info": 6,
-        "name": "Monday",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 1
-        },
-        "info": 6,
-        "name": "Tuesday",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 2
-        },
-        "info": 6,
-        "name": "Wednesday",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 3
-        },
-        "info": 6,
-        "name": "Thursday",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 4
-        },
-        "info": 6,
-        "name": "Friday",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 5
-        },
-        "info": 6,
-        "name": "Saturday",
-        "type": "Null"
-      },
-      {
-        "ext": {
-          "discriminant": 6
-        },
-        "info": 6,
-        "name": "Sunday",
-        "type": "Null"
-      }
-    ],
-    "type": "{\"_enum\":[\"Monday\",\"Tuesday\",\"Wednesday\",\"Thursday\",\"Friday\",\"Saturday\",\"Sunday\"]}"
-  },
-  {
-    "displayName": "TupleMaybeSigned",
-    "namespace": "enum_example::enum_example",
-    "info": 3,
-    "sub": [
-      {
-        "info": 6,
-        "type": "i32",
-        "name": "Signed"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "Unsigned"
-      }
-    ],
-    "type": "{\"_enum\":{\"Signed\":\"i32\",\"Unsigned\":\"u32\"}}"
-  },
-  {
-    "displayName": "NamedMaybeSigned",
-    "namespace": "enum_example::enum_example",
-    "info": 3,
-    "sub": [
-      {
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "i32",
-            "name": "value"
-          }
-        ],
-        "name": "Signed",
-        "type": "{\"value\":\"i32\"}"
-      },
-      {
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "value"
-          }
-        ],
-        "name": "Unsigned",
-        "type": "{\"value\":\"u32\"}"
-      }
-    ],
-    "type": "{\"_enum\":{\"Signed\":\"{\\\"value\\\":\\\"i32\\\"}\",\"Unsigned\":\"{\\\"value\\\":\\\"u32\\\"}\"}}"
-  },
-  {
-    "displayName": "Color",
-    "namespace": "enum_example::enum_example",
-    "info": 3,
-    "sub": [
-      {
-        "info": 10,
-        "sub": [],
-        "name": "Red",
-        "type": "()"
-      },
-      {
-        "info": 10,
-        "sub": [],
-        "name": "Blue",
-        "type": "()"
-      },
-      {
-        "info": 10,
-        "sub": [],
-        "name": "Green",
-        "type": "()"
-      },
-      {
-        "info": 10,
-        "sub": [],
-        "name": "Yellow",
-        "type": "()"
-      },
-      {
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u8",
-            "name": "r"
-          },
-          {
-            "info": 6,
-            "type": "u8",
-            "name": "g"
-          },
-          {
-            "info": 6,
-            "type": "u8",
-            "name": "b"
-          }
-        ],
-        "name": "Rgb",
-        "type": "{\"r\":\"u8\",\"g\":\"u8\",\"b\":\"u8\"}"
-      },
-      {
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u8",
-            "name": "r"
-          },
-          {
-            "info": 6,
-            "type": "u8",
-            "name": "g"
-          },
-          {
-            "info": 6,
-            "type": "u8",
-            "name": "b"
-          },
-          {
-            "info": 6,
-            "type": "u8",
-            "name": "a"
-          }
-        ],
-        "name": "Rgba",
-        "type": "{\"r\":\"u8\",\"g\":\"u8\",\"b\":\"u8\",\"a\":\"u8\"}"
-      }
-    ],
-    "type": "{\"_enum\":{\"Red\":\"()\",\"Blue\":\"()\",\"Green\":\"()\",\"Yellow\":\"()\",\"Rgb\":\"{\\\"r\\\":\\\"u8\\\",\\\"g\\\":\\\"u8\\\",\\\"b\\\":\\\"u8\\\"}\",\"Rgba\":\"{\\\"r\\\":\\\"u8\\\",\\\"g\\\":\\\"u8\\\",\\\"b\\\":\\\"u8\\\",\\\"a\\\":\\\"u8\\\"}\"}}"
-  }
-]

packages/api-contract/test/compare/user_v0_assetTransfer.test.json

@@ -0,0 +1,54 @@
+[
+  {
+    "info": "Plain",
+    "lookupIndex": 1,
+    "type": "u256",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 2,
+    "type": "u8",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 3,
+    "type": "[u8;32]",
+    "docs": [],
+    "namespace": "",
+    "length": 32,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 2,
+      "type": "u8",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 4,
+    "lookupName": "AccountId",
+    "type": "[u8;32]",
+    "docs": [],
+    "namespace": "",
+    "length": 32,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 2,
+      "type": "u8",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 5,
+    "type": "Text",
+    "docs": [],
+    "namespace": ""
+  }
+]

packages/api-contract/test/compare/user_v0_enumExample.test.json

@@ -0,0 +1,303 @@
+[
+  {
+    "info": "Plain",
+    "lookupIndex": 1,
+    "type": "i32",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 2,
+    "type": "u32",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 3,
+    "type": "u8",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 4,
+    "lookupName": "EnumExampleEnumExampleVariant",
+    "type": "{\"_enum\":{\"None\":\"Null\",\"Weekday\":\"EnumExampleEnumExampleWeekday\",\"TupleMaybeSigned\":\"EnumExampleEnumExampleTupleMaybeSigned\",\"NamedMaybeSigned\":\"EnumExampleEnumExampleNamedMaybeSigned\",\"Color\":\"EnumExampleEnumExampleColor\"}}",
+    "docs": [],
+    "namespace": "enum_example::enum_example::Variant",
+    "sub": [
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 0,
+        "name": "None"
+      },
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 5,
+        "lookupName": "EnumExampleEnumExampleWeekday",
+        "type": "Lookup5",
+        "index": 1,
+        "name": "Weekday"
+      },
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 6,
+        "lookupName": "EnumExampleEnumExampleTupleMaybeSigned",
+        "type": "Lookup6",
+        "index": 2,
+        "name": "TupleMaybeSigned"
+      },
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 7,
+        "lookupName": "EnumExampleEnumExampleNamedMaybeSigned",
+        "type": "Lookup7",
+        "index": 3,
+        "name": "NamedMaybeSigned"
+      },
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 8,
+        "lookupName": "EnumExampleEnumExampleColor",
+        "type": "Lookup8",
+        "index": 4,
+        "name": "Color"
+      }
+    ]
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 5,
+    "lookupName": "EnumExampleEnumExampleWeekday",
+    "type": "{\"_enum\":[\"Monday\",\"Tuesday\",\"Wednesday\",\"Thursday\",\"Friday\",\"Saturday\",\"Sunday\"]}",
+    "docs": [],
+    "namespace": "enum_example::enum_example::Weekday",
+    "sub": [
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 0,
+        "name": "Monday"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 1,
+        "name": "Tuesday"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 2,
+        "name": "Wednesday"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 3,
+        "name": "Thursday"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 4,
+        "name": "Friday"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 5,
+        "name": "Saturday"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 6,
+        "name": "Sunday"
+      }
+    ]
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 6,
+    "lookupName": "EnumExampleEnumExampleTupleMaybeSigned",
+    "type": "{\"_enum\":{\"Signed\":\"i32\",\"Unsigned\":\"u32\"}}",
+    "docs": [],
+    "namespace": "enum_example::enum_example::TupleMaybeSigned",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 1,
+        "type": "i32",
+        "docs": [],
+        "namespace": "",
+        "index": 0,
+        "name": "Signed"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 2,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "index": 1,
+        "name": "Unsigned"
+      }
+    ]
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 7,
+    "lookupName": "EnumExampleEnumExampleNamedMaybeSigned",
+    "type": "{\"_enum\":{\"Signed\":\"{\\\"value\\\":\\\"i32\\\"}\",\"Unsigned\":\"{\\\"value\\\":\\\"u32\\\"}\"}}",
+    "docs": [],
+    "namespace": "enum_example::enum_example::NamedMaybeSigned",
+    "sub": [
+      {
+        "info": "Struct",
+        "sub": [
+          {
+            "info": "Plain",
+            "lookupIndex": 1,
+            "type": "i32",
+            "docs": [],
+            "namespace": "",
+            "name": "value"
+          }
+        ],
+        "type": "{\"value\":\"i32\"}",
+        "index": 0,
+        "name": "Signed"
+      },
+      {
+        "info": "Struct",
+        "sub": [
+          {
+            "info": "Plain",
+            "lookupIndex": 2,
+            "type": "u32",
+            "docs": [],
+            "namespace": "",
+            "name": "value"
+          }
+        ],
+        "type": "{\"value\":\"u32\"}",
+        "index": 1,
+        "name": "Unsigned"
+      }
+    ]
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 8,
+    "lookupName": "EnumExampleEnumExampleColor",
+    "type": "{\"_enum\":{\"Red\":\"Null\",\"Blue\":\"Null\",\"Green\":\"Null\",\"Yellow\":\"Null\",\"Rgb\":\"{\\\"r\\\":\\\"u8\\\",\\\"g\\\":\\\"u8\\\",\\\"b\\\":\\\"u8\\\"}\",\"Rgba\":\"{\\\"r\\\":\\\"u8\\\",\\\"g\\\":\\\"u8\\\",\\\"b\\\":\\\"u8\\\",\\\"a\\\":\\\"u8\\\"}\"}}",
+    "docs": [],
+    "namespace": "enum_example::enum_example::Color",
+    "sub": [
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 0,
+        "name": "Red"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 1,
+        "name": "Blue"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 2,
+        "name": "Green"
+      },
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 3,
+        "name": "Yellow"
+      },
+      {
+        "info": "Struct",
+        "sub": [
+          {
+            "info": "Plain",
+            "lookupIndex": 3,
+            "type": "u8",
+            "docs": [],
+            "namespace": "",
+            "name": "r"
+          },
+          {
+            "info": "Plain",
+            "lookupIndex": 3,
+            "type": "u8",
+            "docs": [],
+            "namespace": "",
+            "name": "g"
+          },
+          {
+            "info": "Plain",
+            "lookupIndex": 3,
+            "type": "u8",
+            "docs": [],
+            "namespace": "",
+            "name": "b"
+          }
+        ],
+        "type": "{\"r\":\"u8\",\"g\":\"u8\",\"b\":\"u8\"}",
+        "index": 4,
+        "name": "Rgb"
+      },
+      {
+        "info": "Struct",
+        "sub": [
+          {
+            "info": "Plain",
+            "lookupIndex": 3,
+            "type": "u8",
+            "docs": [],
+            "namespace": "",
+            "name": "r"
+          },
+          {
+            "info": "Plain",
+            "lookupIndex": 3,
+            "type": "u8",
+            "docs": [],
+            "namespace": "",
+            "name": "g"
+          },
+          {
+            "info": "Plain",
+            "lookupIndex": 3,
+            "type": "u8",
+            "docs": [],
+            "namespace": "",
+            "name": "b"
+          },
+          {
+            "info": "Plain",
+            "lookupIndex": 3,
+            "type": "u8",
+            "docs": [],
+            "namespace": "",
+            "name": "a"
+          }
+        ],
+        "type": "{\"r\":\"u8\",\"g\":\"u8\",\"b\":\"u8\",\"a\":\"u8\"}",
+        "index": 5,
+        "name": "Rgba"
+      }
+    ]
+  }
+]

packages/api-contract/test/compare/user_v0_recursive.test.json

@@ -0,0 +1,26 @@
+[
+  {
+    "info": "Enum",
+    "lookupIndex": 1,
+    "lookupName": "RecursiveMyEnum",
+    "type": "{\"_enum\":{\"A\":\"Null\",\"B\":\"RecursiveMyEnum\"}}",
+    "docs": [],
+    "namespace": "recursive::MyEnum",
+    "sub": [
+      {
+        "info": "Null",
+        "type": "Null",
+        "index": 0,
+        "name": "A"
+      },
+      {
+        "info": "Si",
+        "lookupIndex": 1,
+        "lookupName": "RecursiveMyEnum",
+        "type": "Lookup1",
+        "index": 1,
+        "name": "B"
+      }
+    ]
+  }
+]

packages/api-contract/test/compare/user_v0_withString.test.json

@@ -0,0 +1,259 @@
+[
+  {
+    "info": "Plain",
+    "lookupIndex": 1,
+    "type": "u128",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 2,
+    "lookupName": "InkStorageCollectionsStashHeader",
+    "type": "{\"lastVacant\":\"u32\",\"len\":\"u32\",\"lenEntries\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Header",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 3,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "lastVacant"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 3,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "len"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 3,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "lenEntries"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 3,
+    "type": "u32",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 4,
+    "type": "{\"_enum\":{\"Vacant\":\"InkStorageCollectionsStashVacantEntry\",\"Occupied\":\"AccountId\"}}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Entry",
+    "sub": [
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 8,
+        "lookupName": "InkStorageCollectionsStashVacantEntry",
+        "type": "Lookup8",
+        "index": 0,
+        "name": "Vacant"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 5,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId",
+        "index": 1,
+        "name": "Occupied"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 5,
+    "type": "AccountId",
+    "docs": [],
+    "namespace": "ink_env::types::AccountId",
+    "lookupNameRoot": "InkEnvAccountId"
+  },
+  {
+    "info": "VecFixed",
+    "lookupIndex": 6,
+    "type": "[u8;32]",
+    "docs": [],
+    "namespace": "",
+    "length": 32,
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 7,
+      "type": "u8",
+      "docs": [],
+      "namespace": ""
+    }
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 7,
+    "type": "u8",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 8,
+    "lookupName": "InkStorageCollectionsStashVacantEntry",
+    "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::VacantEntry",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 3,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "next"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 3,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "prev"
+      }
+    ]
+  },
+  {
+    "info": "Struct",
+    "lookupIndex": 9,
+    "lookupName": "InkStorageCollectionsHashmapValueEntry",
+    "type": "{\"value\":\"u128\",\"keyIndex\":\"u32\"}",
+    "docs": [],
+    "namespace": "ink_storage::collections::hashmap::ValueEntry",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 1,
+        "type": "u128",
+        "docs": [],
+        "namespace": "",
+        "name": "value"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 3,
+        "type": "u32",
+        "docs": [],
+        "namespace": "",
+        "name": "keyIndex"
+      }
+    ]
+  },
+  {
+    "info": "Enum",
+    "lookupIndex": 10,
+    "type": "{\"_enum\":{\"Vacant\":\"InkStorageCollectionsStashVacantEntry\",\"Occupied\":\"(AccountId,AccountId)\"}}",
+    "docs": [],
+    "namespace": "ink_storage::collections::stash::Entry",
+    "sub": [
+      {
+        "docs": [],
+        "info": "Si",
+        "lookupIndex": 8,
+        "lookupName": "InkStorageCollectionsStashVacantEntry",
+        "type": "Lookup8",
+        "index": 0,
+        "name": "Vacant"
+      },
+      {
+        "info": "Tuple",
+        "lookupIndex": 11,
+        "type": "(AccountId,AccountId)",
+        "docs": [],
+        "namespace": "",
+        "sub": [
+          {
+            "info": "Plain",
+            "lookupIndex": 5,
+            "type": "AccountId",
+            "docs": [],
+            "namespace": "ink_env::types::AccountId",
+            "lookupNameRoot": "InkEnvAccountId"
+          },
+          {
+            "info": "Plain",
+            "lookupIndex": 5,
+            "type": "AccountId",
+            "docs": [],
+            "namespace": "ink_env::types::AccountId",
+            "lookupNameRoot": "InkEnvAccountId"
+          }
+        ],
+        "index": 1,
+        "name": "Occupied"
+      }
+    ]
+  },
+  {
+    "info": "Tuple",
+    "lookupIndex": 11,
+    "type": "(AccountId,AccountId)",
+    "docs": [],
+    "namespace": "",
+    "sub": [
+      {
+        "info": "Plain",
+        "lookupIndex": 5,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId"
+      },
+      {
+        "info": "Plain",
+        "lookupIndex": 5,
+        "type": "AccountId",
+        "docs": [],
+        "namespace": "ink_env::types::AccountId",
+        "lookupNameRoot": "InkEnvAccountId"
+      }
+    ]
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 12,
+    "type": "Text",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Plain",
+    "lookupIndex": 13,
+    "type": "bool",
+    "docs": [],
+    "namespace": ""
+  },
+  {
+    "info": "Option",
+    "lookupIndex": 14,
+    "type": "Option<AccountId>",
+    "docs": [],
+    "namespace": "Option",
+    "sub": {
+      "info": "Plain",
+      "lookupIndex": 5,
+      "type": "AccountId",
+      "docs": [],
+      "namespace": "ink_env::types::AccountId",
+      "lookupNameRoot": "InkEnvAccountId"
+    }
+  }
+]

packages/api-contract/test/compare/user_withString.test.json

@@ -1,205 +0,0 @@
-[
-  {
-    "info": 6,
-    "type": "u128"
-  },
-  {
-    "displayName": "Header",
-    "namespace": "ink_storage::collections::stash",
-    "info": 9,
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "last_vacant"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "len"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "len_entries"
-      }
-    ],
-    "type": "{\"last_vacant\":\"u32\",\"len\":\"u32\",\"len_entries\":\"u32\"}"
-  },
-  {
-    "info": 6,
-    "type": "u32"
-  },
-  {
-    "displayName": "Entry",
-    "namespace": "ink_storage::collections::stash",
-    "sub": [
-      {
-        "displayName": "VacantEntry",
-        "namespace": "ink_storage::collections::stash",
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "next"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "prev"
-          }
-        ],
-        "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
-        "name": "Vacant"
-      },
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId",
-        "name": "Occupied"
-      }
-    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"AccountId\"}}"
-  },
-  {
-    "displayName": "AccountId",
-    "namespace": "ink_env::types",
-    "info": 6,
-    "type": "AccountId"
-  },
-  {
-    "info": 12,
-    "length": 32,
-    "sub": {
-      "info": 6,
-      "type": "u8"
-    },
-    "type": "[u8;32]"
-  },
-  {
-    "info": 6,
-    "type": "u8"
-  },
-  {
-    "displayName": "VacantEntry",
-    "namespace": "ink_storage::collections::stash",
-    "info": 9,
-    "sub": [
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "next"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "prev"
-      }
-    ],
-    "type": "{\"next\":\"u32\",\"prev\":\"u32\"}"
-  },
-  {
-    "displayName": "ValueEntry",
-    "namespace": "ink_storage::collections::hashmap",
-    "sub": [
-      {
-        "info": 6,
-        "type": "u128",
-        "name": "value"
-      },
-      {
-        "info": 6,
-        "type": "u32",
-        "name": "key_index"
-      }
-    ],
-    "info": 9,
-    "type": "{\"value\":\"u128\",\"key_index\":\"u32\"}"
-  },
-  {
-    "displayName": "Entry",
-    "namespace": "ink_storage::collections::stash",
-    "sub": [
-      {
-        "displayName": "VacantEntry",
-        "namespace": "ink_storage::collections::stash",
-        "info": 9,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "next"
-          },
-          {
-            "info": 6,
-            "type": "u32",
-            "name": "prev"
-          }
-        ],
-        "type": "{\"next\":\"u32\",\"prev\":\"u32\"}",
-        "name": "Vacant"
-      },
-      {
-        "info": 10,
-        "sub": [
-          {
-            "displayName": "AccountId",
-            "namespace": "ink_env::types",
-            "info": 6,
-            "type": "AccountId"
-          },
-          {
-            "displayName": "AccountId",
-            "namespace": "ink_env::types",
-            "info": 6,
-            "type": "AccountId"
-          }
-        ],
-        "type": "(AccountId,AccountId)",
-        "name": "Occupied"
-      }
-    ],
-    "info": 3,
-    "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(AccountId,AccountId)\"}}"
-  },
-  {
-    "info": 10,
-    "sub": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      },
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "type": "(AccountId,AccountId)"
-  },
-  {
-    "info": 6,
-    "type": "Text"
-  },
-  {
-    "info": 6,
-    "type": "bool"
-  },
-  {
-    "displayName": "Option",
-    "sub": {
-      "displayName": "AccountId",
-      "namespace": "ink_env::types",
-      "info": 6,
-      "type": "AccountId"
-    },
-    "info": 5,
-    "type": "Option<AccountId>"
-  }
-]

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

@@ -1,9 +1,9 @@
 // Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import * as ink from './ink';
-import * as solang from './solang';
-import * as user from './user';
+import ink from './ink';
+import solang from './solang';
+import user from './user';
 
 const all: Record<string, any> = {};
 

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

@@ -1,11 +1,10 @@
 // Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export { default as delegator } from './delegator.json';
-export { default as dns } from './dns.json';
-export { default as erc20 } from './erc20.json';
-export { default as erc721 } from './erc721.json';
-export { default as flipper } from './flipper.json';
-export { default as flipperBundle } from './flipper.contract.json';
-export { default as incrementer } from './incrementer.json';
-export { default as multisigPlain } from './multisig_plain.json';
+import { createVersionedExport } from '../util';
+import * as v0 from './v0';
+import * as v1 from './v1';
+
+const exp = createVersionedExport('v0', v0, {});
+
+export default createVersionedExport('v1', v1, exp);

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

@@ -0,0 +1,11 @@
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export { default as delegator } from './delegator.json';
+export { default as dns } from './dns.json';
+export { default as erc20 } from './erc20.json';
+export { default as erc721 } from './erc721.json';
+export { default as flipper } from './flipper.json';
+export { default as flipperBundle } from './flipper.contract.json';
+export { default as incrementer } from './incrementer.json';
+export { default as multisigPlain } from './multisig_plain.json';

packages/api-contract/test/contracts/ink/v1/flipper.contract.json

@@ -0,0 +1,111 @@
+{
+  "source": {
+    "hash": "0x7c5ff777929185b2350605e8f0163bfa25781097ad9ee2704c67021962720135",
+    "language": "ink! 3.0.0-rc5",
+    "compiler": "rustc 1.57.0-nightly",
+    "wasm": "0x0061736d01000000012b0860027f7f0060037f7f7f0060017f017f60000060037f7f7f017f60017f0060047f7f7f7f0060017f017e02880106057365616c30107365616c5f6765745f73746f726167650004057365616c30107365616c5f7365745f73746f726167650001057365616c30167365616c5f76616c75655f7472616e736665727265640000057365616c300a7365616c5f696e7075740000057365616c300b7365616c5f72657475726e000103656e76066d656d6f727902010210030e0d020002000100070603020304050608017f01418080040b071102066465706c6f79000d0463616c6c000f0ac60f0dc60101017f230041406a22012400200141206a200041186a290300370300200141186a200041106a290300370300200141106a200041086a2903003703002001420137032820012000290300370308200141808001360234200141808004360230200141808001360238200141086a41808004200141386a10002100200141306a2001280238100602400240024020000e0402000001000b000b000b20012001290330370338200141386a100741ff017122004102470440200141406b240020004100470f0b000b3101017f230041106b22022400200241086a200120002802002000280204100c20002002290308370200200241106a24000b4201027f230041106b22012400200141086a2000100a20012d0009210020012d00082102200141106a240041024101410220004101461b410020001b20024101711b0b8d0101017f230041406a22022400200241206a200141186a290300370300200241186a200141106a290300370300200241106a200141086a2903003703002002420137032820022001290300370308200241386a41808001360200200241808004360234200241003602302002200241306a20001009200241086a200228020020022802041001200241406b24000b9d0101037f230041106b22032400200141086a220428020021052004410036020020012802042104200141808004360204200320023a000f2003410120042005100c024020032802044101460440200328020020032d000f3a0000200141003602082001418080043602042005450d012001200541016b3602082001200441016a3602042000410136020420002004360200200341106a24000f0b000b000b3f01027f230041106b22022400200241003a000f200020012002410f6a410110102201047f41000520022d000f0b3a0001200020013a0000200241106a24000b900102027f017e230041106b220124002001420037030841042102027f02400340200241084604402001410436020820012903082203a741044f0d02000b20012000100a20012d0000410171450440200141086a20026a20012d00013a0000200241016a21020c010b0b4101210241000c010b410021022003422088a70b2100200141106a24002002ad2000ad420886840b1a00200120034d044020002001360204200020023602000f0b000b11004100100e41ff01714108470440000b0ba80602057f017e230041306b22012400027f02400240200045044020014180800136020c200141808004360208200141086a10112001200129030837031041032100200141106a100b2206a722034101710d02200642ffffffffff1f832206422088a721022006421888a721002006421088a721040240200341087641ff01712203419b01470440200341ed01460d010c030b200441ff017141ae0147200041ff0171419d014772200241de0047720d024103200141106a100741ff0171220020004102461b21000c030b200441ff017141cb0047200041ff0171419d0147720d01410221002002411b470d010c020b20014180800136020c200141808004360208200141086a101120012001290308370310410121020240200141106a100b2206a722054101710440410121000c010b200642ffffffffff1f832206422088a721042006421888a721002006421088a721030240200541087641ff01712205412f470440200541e30047200341ff0171413a4772200041ff017141a50147720d0141002100200441d100470d010c020b200341ff017141860147200041ff017141db0047720d004100210041002102200441d901460d010b41012100410121020b410620000d021a20020440200141286a4200370300200141206a4200370300200141186a420037030020014200370310200141106a1005410173200141106a100841080c030b200141286a4200370300200141206a4200370300200141186a4200370300200142003703102001200141106a10053a0008230041106b220024002000200141086a36020c2000410c6a2802002d00002101230041206b22002400200041186a4180800136020020004180800436021420004100360210200041086a200041106a2001100941002000280208200028020c1004000b410321000b4106200041034622020d001a4106200020021b22004102470440200141286a4200370300200141206a4200370300200141186a4200370300200142003703102000410171200141106a100841080c010b200141286a4200370300200141206a4200370300200141186a4200370300200142003703104100200141106a100841080b200141306a24000ba30102037f017e230041206b2200240020004180800136020420004180800436020020004180800136021041808004200041106a100220002000280210100620002000290300370308200041186a22014200370300200042003703100240200041086a200041106a411010102202047e4200052000290310210320012903000b20038450452002724504404101100e41ff01714108470d01200041206a24000f0b000b000b5701057f200028020422042002492205450440200028020022062107034020022003470440200120036a200320076a2d00003a0000200341016a21030c010b0b2000200420026b3602042000200220066a3602000b20050b3301017f230041106b220124002001200028020436020c20002802002001410c6a10032000200128020c1006200141106a24000b"
+  },
+  "contract": {
+    "name": "flipper",
+    "version": "3.0.0-rc5",
+    "authors": [
+      "Parity Technologies <admin@parity.io>"
+    ]
+  },
+  "V1": {
+    "spec": {
+      "constructors": [
+        {
+          "args": [
+            {
+              "name": "init_value",
+              "type": {
+                "displayName": [
+                  "bool"
+                ],
+                "type": 0
+              }
+            }
+          ],
+          "docs": [
+            "Creates a new flipper smart contract initialized with the given value."
+          ],
+          "name": [
+            "new"
+          ],
+          "selector": "0x9bae9d5e"
+        },
+        {
+          "args": [],
+          "docs": [
+            "Creates a new flipper smart contract initialized to `false`."
+          ],
+          "name": [
+            "default"
+          ],
+          "selector": "0xed4b9d1b"
+        }
+      ],
+      "docs": [],
+      "events": [],
+      "messages": [
+        {
+          "args": [],
+          "docs": [
+            " Flips the current value of the Flipper's boolean."
+          ],
+          "mutates": true,
+          "name": [
+            "flip"
+          ],
+          "payable": false,
+          "returnType": null,
+          "selector": "0x633aa551"
+        },
+        {
+          "args": [],
+          "docs": [
+            " Returns the current value of the Flipper's boolean."
+          ],
+          "mutates": false,
+          "name": [
+            "get"
+          ],
+          "payable": false,
+          "returnType": {
+            "displayName": [
+              "bool"
+            ],
+            "type": 0
+          },
+          "selector": "0x2f865bd9"
+        }
+      ]
+    },
+    "storage": {
+      "struct": {
+        "fields": [
+          {
+            "layout": {
+              "cell": {
+                "key": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "ty": 0
+              }
+            },
+            "name": "value"
+          }
+        ]
+      }
+    },
+    "types": [
+      {
+        "id": 0,
+        "type": {
+          "def": {
+            "primitive": "bool"
+          }
+        }
+      }
+    ]
+  }
+}

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

@@ -0,0 +1,4 @@
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export { default as flipper } from './flipper.contract.json';

packages/api-contract/test/contracts/solang/index.ts

@@ -1,4 +1,7 @@
 // Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export { default as ints256 } from './ints256.json';
+import { createVersionedExport } from '../util';
+import * as v0 from './v0';
+
+export default createVersionedExport('v0', v0, {});

packages/api-contract/test/contracts/solang/v0/index.ts

@@ -0,0 +1,4 @@
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export { default as ints256 } from './ints256.json';

packages/api-contract/test/contracts/user/index.ts

@@ -1,6 +1,7 @@
 // Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export { default as assetTransfer } from './assetTransfer.json';
-export { default as enumExample } from './enumExample.json';
-export { default as withString } from './withString.json';
+import { createVersionedExport } from '../util';
+import * as v0 from './v0';
+
+export default createVersionedExport('v0', v0, {});

packages/api-contract/test/contracts/user/v0/index.ts

@@ -0,0 +1,7 @@
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export { default as assetTransfer } from './assetTransfer.json';
+export { default as enumExample } from './enumExample.json';
+export { default as recursive } from './recursive.contract.json';
+export { default as withString } from './withString.json';

packages/api-contract/test/contracts/util.ts

@@ -0,0 +1,10 @@
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export function createVersionedExport (version: string, orig: Record<string, unknown>, exp: Record<string, unknown>): Record<string, unknown> {
+  Object.entries(orig).forEach(([name, json]): void => {
+    exp[`${version}_${name}`] = json;
+  });
+
+  return exp;
+}

packages/api-derive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "5.3.1",
+  "version": "6.4.2",
   "type": "module",
   "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
   "main": "index.js",
@@ -19,16 +19,16 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-derive#readme",
   "dependencies": {
-    "@babel/runtime": "^7.14.8",
-    "@polkadot/api": "5.3.1",
-    "@polkadot/rpc-core": "5.3.1",
-    "@polkadot/types": "5.3.1",
-    "@polkadot/util": "^7.1.1",
-    "@polkadot/util-crypto": "^7.1.1",
-    "rxjs": "^7.2.0"
+    "@babel/runtime": "^7.15.4",
+    "@polkadot/api": "6.4.2",
+    "@polkadot/rpc-core": "6.4.2",
+    "@polkadot/types": "6.4.2",
+    "@polkadot/util": "^7.5.1",
+    "@polkadot/util-crypto": "^7.5.1",
+    "rxjs": "^7.4.0"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^7.1.1",
-    "@polkadot/rpc-provider": "5.3.1"
+    "@polkadot/keyring": "^7.5.1",
+    "@polkadot/rpc-provider": "6.4.2"
   }
 }

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

@@ -4,7 +4,8 @@
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Data, Option } from '@polkadot/types';
-import type { AccountId, IdentityInfoAdditional, Registration } from '@polkadot/types/interfaces';
+import type { AccountId } from '@polkadot/types/interfaces';
+import type { PalletIdentityIdentityInfo, PalletIdentityRegistration } from '@polkadot/types/lookup';
 import type { ITuple } from '@polkadot/types/types';
 import type { DeriveAccountRegistration, DeriveHasIdentity } from '../types';
 
@@ -14,6 +15,8 @@ import { isHex, u8aToString } from '@polkadot/util';
 
 import { memo } from '../util';
 
+type IdentityInfoAdditional = PalletIdentityIdentityInfo['additional'][0];
+
 const UNDEF_HEX = { toHex: () => undefined };
 
 function dataAsString (data: Data): string | undefined {
@@ -37,7 +40,7 @@ function extractOther (additional: IdentityInfoAdditional[]): Record<string, str
   }, {});
 }
 
-function extractIdentity (identityOfOpt?: Option<Registration>, superOf?: [AccountId, Data]): DeriveAccountRegistration {
+function extractIdentity (identityOfOpt?: Option<PalletIdentityRegistration>, superOf?: [AccountId, Data]): DeriveAccountRegistration {
   if (!identityOfOpt?.isSome) {
     return { judgements: [] };
   }
@@ -61,7 +64,7 @@ function extractIdentity (identityOfOpt?: Option<Registration>, superOf?: [Accou
   };
 }
 
-function getParent (api: ApiInterfaceRx, identityOfOpt: Option<Registration> | undefined, superOfOpt: Option<ITuple<[AccountId, Data]>> | undefined): Observable<[Option<Registration> | undefined, [AccountId, Data] | undefined]> {
+function getParent (api: ApiInterfaceRx, identityOfOpt: Option<PalletIdentityRegistration> | undefined, superOfOpt: Option<ITuple<[AccountId, Data]>> | undefined): Observable<[Option<PalletIdentityRegistration> | undefined, [AccountId, Data] | undefined]> {
   if (identityOfOpt?.isSome) {
     // this identity has something set
     return of([identityOfOpt, undefined]);
@@ -70,7 +73,7 @@ function getParent (api: ApiInterfaceRx, identityOfOpt: Option<Registration> | u
 
     // we have a super
     return combineLatest([
-      api.query.identity.identityOf<Option<Registration>>(superOf[0]),
+      api.query.identity.identityOf(superOf[0]),
       of(superOf)
     ]);
   }
@@ -79,9 +82,9 @@ function getParent (api: ApiInterfaceRx, identityOfOpt: Option<Registration> | u
   return of([undefined, undefined]);
 }
 
-function getBase (api: ApiInterfaceRx, accountId?: AccountId | Uint8Array | string): Observable<[Option<Registration> | undefined, Option<ITuple<[AccountId, Data]>> | undefined]> {
+function getBase (api: ApiInterfaceRx, accountId?: AccountId | Uint8Array | string): Observable<[Option<PalletIdentityRegistration> | undefined, Option<ITuple<[AccountId, Data]>> | undefined]> {
   return accountId && api.query.identity?.identityOf
-    ? api.queryMulti<[Option<Registration>, Option<ITuple<[AccountId, Data]>>]>([
+    ? api.queryMulti<[Option<PalletIdentityRegistration>, Option<ITuple<[AccountId, Data]>>]>([
       [api.query.identity.identityOf, accountId],
       [api.query.identity.superOf, accountId]
     ])
@@ -113,8 +116,8 @@ export function hasIdentityMulti (instanceId: string, api: ApiInterfaceRx): (acc
   return memo(instanceId, (accountIds: (AccountId | Uint8Array | string)[]): Observable<DeriveHasIdentity[]> =>
     api.query.identity?.identityOf
       ? combineLatest([
-        api.query.identity.identityOf.multi<Option<Registration>>(accountIds),
-        api.query.identity.superOf.multi<Option<ITuple<[AccountId, Data]>>>(accountIds)
+        api.query.identity.identityOf.multi(accountIds),
+        api.query.identity.superOf.multi(accountIds)
       ]).pipe(
         map(([identities, supers]) =>
           identities.map((identityOfOpt, index): DeriveHasIdentity => {

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

@@ -16,7 +16,7 @@ function queryAccounts (api: ApiInterfaceRx): Observable<AccountIndexes> {
     map((entries): AccountIndexes =>
       entries.reduce((indexes: AccountIndexes, [key, idOpt]): AccountIndexes => {
         if (idOpt.isSome) {
-          indexes[idOpt.unwrap()[0].toString()] = key.args[0];
+          indexes[idOpt.unwrap()[0].toString()] = api.registry.createType('AccountIndex', key.args[0]);
         }
 
         return indexes;

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

@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import type { ApiInterfaceRx, QueryableStorageMultiArg } from '@polkadot/api/types';
+import type { ApiInterfaceRx, QueryableStorageEntry } from '@polkadot/api/types';
 import type { AccountData, AccountId, AccountIndex, AccountInfo, Address, Balance, Index } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
 import type { DeriveBalancesAccount, DeriveBalancesAccountData } from '../types';
 
 import { combineLatest, map, of, switchMap } from 'rxjs';
 
-import { assert, isFunction } from '@polkadot/util';
+import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';
 
@@ -39,15 +39,11 @@ function getBalance (api: ApiInterfaceRx, [freeBalance, reservedBalance, frozenF
   };
 }
 
-function calcBalances (api: ApiInterfaceRx, [accountId, [accountNonce, balances]]: [AccountId, Result]): DeriveBalancesAccount {
-  const primary = balances[0];
-
-  assert(primary, 'No balances retrieved for account');
-
+function calcBalances (api: ApiInterfaceRx, [accountId, [accountNonce, [primary, ...additional]]]: [AccountId, Result]): DeriveBalancesAccount {
   return {
     accountId,
     accountNonce,
-    additional: balances.filter((_, index) => index !== 0).map((b) => getBalance(api, b)),
+    additional: additional.map((b) => getBalance(api, b)),
     ...getBalance(api, primary)
   };
 }
@@ -66,34 +62,44 @@ function queryBalancesFree (api: ApiInterfaceRx, accountId: AccountId): Observab
   );
 }
 
-function querySystemNonce (api: ApiInterfaceRx, accountId: AccountId): Observable<Result> {
-  return api.query.system.accountNonce<Index>(accountId).pipe(
-    map((accountNonce): Result => [
-      accountNonce,
-      [[zeroBalance(api), zeroBalance(api), zeroBalance(api), zeroBalance(api)]]
-    ])
-  );
+function queryNonceOnly (api: ApiInterfaceRx, accountId: AccountId): Observable<Result> {
+  const fill = (nonce: Index): Result => [
+    nonce,
+    [[zeroBalance(api), zeroBalance(api), zeroBalance(api), zeroBalance(api)]]
+  ];
+
+  return isFunction(api.query.system.account)
+    ? api.query.system.account(accountId).pipe(
+      map(({ nonce }) => fill(nonce))
+    )
+    : isFunction(api.query.system.accountNonce)
+      ? api.query.system.accountNonce<Index>(accountId).pipe(
+        map((nonce) => fill(nonce))
+      )
+      : of(fill(api.registry.createType('Index')));
 }
 
 function queryBalancesAccount (api: ApiInterfaceRx, accountId: AccountId, modules: string[] = ['balances']): Observable<Result> {
-  const balances = modules.map(
-    (m): QueryableStorageMultiArg<'rxjs'> => [
-      (api.derive as DeriveCustomAccount)[m]?.customAccount || api.query[m].account,
-      accountId
-    ]
-  );
+  const balances = modules
+    .map((m): QueryableStorageEntry<'rxjs'> => (api.derive as DeriveCustomAccount)[m]?.customAccount || api.query[m]?.account)
+    .filter((q) => isFunction(q))
+    .map((q): [QueryableStorageEntry<'rxjs'>, AccountId] => [q, accountId]);
 
-  const extract = (data: AccountData[]) =>
-    data.map(({ feeFrozen, free, miscFrozen, reserved }): BalanceResult => [free, reserved, feeFrozen, miscFrozen]);
+  const extract = (nonce: Index, data: AccountData[]): Result => [
+    nonce,
+    data.map(({ feeFrozen, free, miscFrozen, reserved }): BalanceResult => [free, reserved, feeFrozen, miscFrozen])
+  ];
 
   // NOTE this is for the first case where we do have instances specified
-  return isFunction(api.query.system.account)
-    ? api.queryMulti<[AccountInfo, ...(AccountData[])]>([[api.query.system.account, accountId], ...balances]).pipe(
-      map(([{ nonce }, ...balances]): Result => [nonce, extract(balances)])
-    )
-    : api.queryMulti<[Index, ...(AccountData[])]>([[api.query.system.accountNonce, accountId], ...balances]).pipe(
-      map(([nonce, ...balances]): Result => [nonce, extract(balances)])
-    );
+  return balances.length
+    ? isFunction(api.query.system.account)
+      ? api.queryMulti<[AccountInfo, ...(AccountData[])]>([[api.query.system.account, accountId], ...balances]).pipe(
+        map(([{ nonce }, ...balances]) => extract(nonce, balances))
+      )
+      : api.queryMulti<[Index, ...(AccountData[])]>([[api.query.system.accountNonce, accountId], ...balances]).pipe(
+        map(([nonce, ...balances]) => extract(nonce, balances))
+      )
+    : queryNonceOnly(api, accountId);
 }
 
 function querySystemAccount (api: ApiInterfaceRx, accountId: AccountId): Observable<Result> {
@@ -140,10 +146,6 @@ function querySystemAccount (api: ApiInterfaceRx, accountId: AccountId): Observa
  */
 export function account (instanceId: string, api: ApiInterfaceRx): (address: AccountIndex | AccountId | Address | string) => Observable<DeriveBalancesAccount> {
   const balanceInstances = api.registry.getModuleInstances(api.runtimeVersion.specName.toString(), 'balances');
-  const empty: Result = [
-    api.registry.createType('Index'),
-    [[zeroBalance(api), zeroBalance(api), zeroBalance(api), zeroBalance(api)]]
-  ];
 
   return memo(instanceId, (address: AccountIndex | AccountId | Address | string): Observable<DeriveBalancesAccount> =>
     api.derive.accounts.accountId(address).pipe(
@@ -159,11 +161,12 @@ export function account (instanceId: string, api: ApiInterfaceRx): (address: Acc
                   ? queryBalancesAccount(api, accountId)
                   : isFunction(api.query.balances?.freeBalance)
                     ? queryBalancesFree(api, accountId)
-                    : isFunction(api.query.system?.accountNonce)
-                      ? querySystemNonce(api, accountId)
-                      : of(empty)
+                    : queryNonceOnly(api, accountId)
           ])
-          : of([api.registry.createType('AccountId'), empty])
+          : of([api.registry.createType('AccountId'), [
+            api.registry.createType('Index'),
+            [[zeroBalance(api), zeroBalance(api), zeroBalance(api), zeroBalance(api)]]
+          ]])
         )
       ),
       map((result): DeriveBalancesAccount => calcBalances(api, result))

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

@@ -4,24 +4,25 @@
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx, QueryableStorageMultiArg } from '@polkadot/api/types';
 import type { Option, Vec } from '@polkadot/types';
-import type { AccountId, AccountIndex, Address, Balance, BalanceLock, BalanceLockTo212, BlockNumber, VestingInfo, VestingSchedule } from '@polkadot/types/interfaces';
-import type { DeriveBalancesAccount, DeriveBalancesAccountData, DeriveBalancesAll, DeriveBalancesAllAccountData } from '../types';
+import type { AccountId, AccountIndex, Address, Balance, BalanceLockTo212, BlockNumber, VestingSchedule } from '@polkadot/types/interfaces';
+import type { PalletBalancesBalanceLock, PalletVestingVestingInfo } from '@polkadot/types/lookup';
+import type { DeriveBalancesAccount, DeriveBalancesAccountData, DeriveBalancesAll, DeriveBalancesAllAccountData, DeriveBalancesAllVesting } from '../types';
 
 import { combineLatest, map, of, switchMap } from 'rxjs';
 
-import { BN, bnMax, isFunction } from '@polkadot/util';
+import { BN, BN_ZERO, bnMax, bnMin, isFunction } from '@polkadot/util';
 
 import { memo } from '../util';
 
-type BalanceLocksEntry = Vec<BalanceLock | BalanceLockTo212>;
+type BalanceLocksEntry = Vec<PalletBalancesBalanceLock | BalanceLockTo212>;
 type BalanceLocks = BalanceLocksEntry[];
-type ResultBalance = [VestingInfo | null, ((BalanceLock | BalanceLockTo212)[])[]];
+type ResultBalance = [PalletVestingVestingInfo[] | null, ((PalletBalancesBalanceLock | BalanceLockTo212)[])[]];
 type Result = [DeriveBalancesAccount, BlockNumber, ResultBalance];
 
 interface AllLocked {
   allLocked: boolean,
   lockedBalance: Balance,
-  lockedBreakdown: (BalanceLock | BalanceLockTo212)[],
+  lockedBreakdown: (PalletBalancesBalanceLock | BalanceLockTo212)[],
   vestingLocked: Balance
 }
 
@@ -33,9 +34,9 @@ type DeriveCustomLocks = ApiInterfaceRx['derive'] & {
 
 const VESTING_ID = '0x76657374696e6720';
 
-function calcLocked (api: ApiInterfaceRx, bestNumber: BlockNumber, locks: (BalanceLock | BalanceLockTo212)[]): AllLocked {
+function calcLocked (api: ApiInterfaceRx, bestNumber: BlockNumber, locks: (PalletBalancesBalanceLock | BalanceLockTo212)[]): AllLocked {
   let lockedBalance = api.registry.createType('Balance');
-  let lockedBreakdown: (BalanceLock | BalanceLockTo212)[] = [];
+  let lockedBreakdown: (PalletBalancesBalanceLock | BalanceLockTo212)[] = [];
   let vestingLocked = api.registry.createType('Balance');
   let allLocked = false;
 
@@ -56,7 +57,7 @@ function calcLocked (api: ApiInterfaceRx, bestNumber: BlockNumber, locks: (Balan
   return { allLocked, lockedBalance, lockedBreakdown, vestingLocked };
 }
 
-function calcShared (api: ApiInterfaceRx, bestNumber: BlockNumber, data: DeriveBalancesAccountData, locks: (BalanceLock | BalanceLockTo212)[]): DeriveBalancesAllAccountData {
+function calcShared (api: ApiInterfaceRx, bestNumber: BlockNumber, data: DeriveBalancesAccountData, locks: (PalletBalancesBalanceLock | BalanceLockTo212)[]): DeriveBalancesAllAccountData {
   const { allLocked, lockedBalance, lockedBreakdown, vestingLocked } = calcLocked(api, bestNumber, locks);
 
   return {
@@ -68,34 +69,54 @@ function calcShared (api: ApiInterfaceRx, bestNumber: BlockNumber, data: DeriveB
   };
 }
 
-function calcBalances (api: ApiInterfaceRx, [data, bestNumber, [vesting, allLocks]]: Result): DeriveBalancesAll {
-  const shared = calcShared(api, bestNumber, data, allLocks[0]);
+function calcVesting (bestNumber: BlockNumber, shared: DeriveBalancesAllAccountData, _vesting: PalletVestingVestingInfo[] | null): DeriveBalancesAllVesting {
   // Calculate the vesting balances,
   //  - offset = balance locked at startingBlock
   //  - perBlock is the unlock amount
-  const { locked: vestingTotal, perBlock, startingBlock } = vesting || api.registry.createType('VestingInfo');
-  const isStarted = bestNumber.gt(startingBlock);
-  const vestedNow = isStarted ? perBlock.mul(bestNumber.sub(startingBlock)) : new BN(0);
-  const vestedBalance = vestedNow.gt(vestingTotal) ? vestingTotal : api.registry.createType('Balance', vestedNow);
-  const isVesting = isStarted && !shared.vestingLocked.isZero();
+  const vesting = _vesting || [];
+  const isVesting = !shared.vestingLocked.isZero();
+  const vestedBalances = vesting.map(({ locked, perBlock, startingBlock }) =>
+    bestNumber.gt(startingBlock)
+      ? bnMin(locked, perBlock.mul(bestNumber.sub(startingBlock)))
+      : BN_ZERO
+  );
+  const vestedBalance = vestedBalances.reduce<BN>((all, value) => all.iadd(value), new BN(0));
+  const vestingTotal = vesting.reduce<BN>((all, { locked }) => all.iadd(locked), new BN(0));
+
+  return {
+    isVesting,
+    vestedBalance,
+    vestedClaimable: isVesting ? shared.vestingLocked.sub(vestingTotal.sub(vestedBalance)) : BN_ZERO,
+    vesting: vesting
+      .map(({ locked, perBlock, startingBlock }, index) => ({
+        endBlock: locked.div(perBlock).iadd(startingBlock),
+        locked,
+        perBlock,
+        startingBlock,
+        vested: vestedBalances[index]
+      }))
+      .filter(({ locked }) => !locked.isZero()),
+    vestingTotal
+  };
+}
+
+function calcBalances (api: ApiInterfaceRx, [data, bestNumber, [vesting, allLocks]]: Result): DeriveBalancesAll {
+  const shared = calcShared(api, bestNumber, data, allLocks[0]);
 
   return {
     ...shared,
+    ...calcVesting(bestNumber, shared, vesting),
     accountId: data.accountId,
     accountNonce: data.accountNonce,
-    additional: allLocks.filter((_, index) => index !== 0).map((l, index) => calcShared(api, bestNumber, data.additional[index], l)),
-    isVesting,
-    vestedBalance,
-    vestedClaimable: api.registry.createType('Balance', isVesting ? shared.vestingLocked.sub(vestingTotal.sub(vestedBalance)) : 0),
-    vestingEndBlock: api.registry.createType('BlockNumber', isVesting ? vestingTotal.div(perBlock).add(startingBlock) : 0),
-    vestingPerBlock: perBlock,
-    vestingTotal
+    additional: allLocks
+      .filter((_, index) => index !== 0)
+      .map((l, index) => calcShared(api, bestNumber, data.additional[index], l))
   };
 }
 
 // old
 function queryOld (api: ApiInterfaceRx, accountId: AccountId): Observable<ResultBalance> {
-  return api.queryMulti<[Vec<BalanceLock>, Option<VestingSchedule>]>([
+  return api.queryMulti<[Vec<PalletBalancesBalanceLock>, Option<VestingSchedule>]>([
     [api.query.balances.locks, accountId],
     [api.query.balances.vesting, accountId]
   ]).pipe(
@@ -105,10 +126,15 @@ function queryOld (api: ApiInterfaceRx, accountId: AccountId): Observable<Result
       if (optVesting.isSome) {
         const { offset: locked, perBlock, startingBlock } = optVesting.unwrap();
 
-        vestingNew = api.registry.createType('VestingInfo', { locked, perBlock, startingBlock });
+        vestingNew = api.registry.createType<PalletVestingVestingInfo>('VestingInfo', { locked, perBlock, startingBlock });
       }
 
-      return [vestingNew, [locks]];
+      return [
+        vestingNew
+          ? [vestingNew]
+          : null,
+        [locks]
+      ];
     })
   );
 }
@@ -117,33 +143,34 @@ const isNonNullable = <T>(nullable: T): nullable is NonNullable<T> => !!nullable
 
 // current (balances, vesting)
 function queryCurrent (api: ApiInterfaceRx, accountId: AccountId, balanceInstances: string[] = ['balances']): Observable<ResultBalance> {
-  const lockCalls = balanceInstances.map(
-    (m): ApiInterfaceRx['query']['balances']['locks'] | undefined =>
-      (api.derive as DeriveCustomLocks)[m]?.customLocks || api.query[m as 'balances']?.locks
+  const calls = balanceInstances.map((m): ApiInterfaceRx['query']['balances']['locks'] | undefined =>
+    (api.derive as DeriveCustomLocks)[m]?.customLocks || api.query[m as 'balances']?.locks
   );
-
-  const lockEmpty = lockCalls.map((c) => !c);
-  const lockQueries = lockCalls.filter(isNonNullable).map((c): QueryableStorageMultiArg<'rxjs'> => [c, accountId]);
+  const lockEmpty = calls.map((c) => !c);
+  const queries = calls.filter(isNonNullable).map((c): QueryableStorageMultiArg<'rxjs'> => [c, accountId]);
 
   return (
     api.query.vesting?.vesting
-      ? api.queryMulti<[Option<VestingInfo>, ...BalanceLocks]>([
-        [api.query.vesting.vesting, accountId],
-        ...lockQueries
-      ])
+      ? api.queryMulti<[Option<PalletVestingVestingInfo> | Option<Vec<PalletVestingVestingInfo>>, ...BalanceLocks]>([[api.query.vesting.vesting, accountId], ...queries])
       // TODO We need to check module instances here as well, not only the balances module
-      : lockQueries.length
-        ? api.queryMulti<[...(Vec<BalanceLock>)[]]>(lockQueries).pipe(
-          map((locks): [Option<VestingInfo>, ...BalanceLocks] =>
-            [api.registry.createType('Option<VestingInfo>'), ...locks]
-          )
+      : queries.length
+        ? api.queryMulti<[...(Vec<PalletBalancesBalanceLock>)[]]>(queries).pipe(
+          map((r): [Option<PalletVestingVestingInfo>, ...BalanceLocks] => [api.registry.createType('Option<VestingInfo>'), ...r])
         )
-        : of([api.registry.createType('Option<VestingInfo>')] as [Option<VestingInfo>])
+        : of([api.registry.createType('Option<VestingInfo>')] as [Option<PalletVestingVestingInfo>])
   ).pipe(
-    map(([optVesting, ...locks]): ResultBalance => {
+    map(([opt, ...locks]): ResultBalance => {
       let offset = -1;
+      const vesting = opt.unwrapOr(null);
 
-      return [optVesting.unwrapOr(null), lockEmpty.map((e) => e ? api.registry.createType('Vec<BalanceLock>') : locks[++offset])];
+      return [
+        vesting
+          ? Array.isArray(vesting)
+            ? vesting
+            : [vesting]
+          : null,
+        lockEmpty.map((e) => e ? api.registry.createType<Vec<PalletBalancesBalanceLock>>('Vec<BalanceLock>') : locks[++offset])
+      ];
     })
   );
 }

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

@@ -0,0 +1,49 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { AccountId, Balance, BalanceLockTo212, Index } from '@polkadot/types/interfaces';
+import type { PalletBalancesBalanceLock } from '@polkadot/types/lookup';
+import type { BN } from '@polkadot/util';
+
+export interface DeriveBalancesAccountData {
+  freeBalance: Balance;
+  frozenFee: Balance;
+  frozenMisc: Balance;
+  reservedBalance: Balance;
+  votingBalance: Balance;
+}
+
+export interface DeriveBalancesAccount extends DeriveBalancesAccountData {
+  accountId: AccountId;
+  accountNonce: Index;
+  additional: DeriveBalancesAccountData[];
+}
+
+export interface DeriveBalancesAllAccountData extends DeriveBalancesAccountData {
+  availableBalance: Balance;
+  lockedBalance: Balance;
+  lockedBreakdown: (PalletBalancesBalanceLock | BalanceLockTo212)[];
+  vestingLocked: Balance;
+}
+
+export interface DeriveBalancesVesting {
+  startingBlock: BN;
+  endBlock: BN;
+  perBlock: BN;
+  locked: BN;
+  vested: BN;
+}
+
+export interface DeriveBalancesAllVesting {
+  isVesting: boolean;
+  vestedBalance: BN;
+  vestedClaimable: BN;
+  vesting: DeriveBalancesVesting[];
+  vestingTotal: BN;
+}
+
+export interface DeriveBalancesAll extends DeriveBalancesAccount, DeriveBalancesAllAccountData, DeriveBalancesAllVesting {
+  additional: DeriveBalancesAllAccountData[];
+}
+
+export type DeriveBalancesMap = Record<string, DeriveBalancesAll>;

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

@@ -4,7 +4,8 @@
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Bytes, Option } from '@polkadot/types';
-import type { Bounty, BountyIndex, ProposalIndex } from '@polkadot/types/interfaces';
+import type { BountyIndex, ProposalIndex } from '@polkadot/types/interfaces';
+import type { PalletBountiesBounty } from '@polkadot/types/lookup';
 import type { DeriveBounties, DeriveCollectiveProposal } from '../types';
 
 import { combineLatest, map, of, switchMap } from 'rxjs';
@@ -12,7 +13,7 @@ import { combineLatest, map, of, switchMap } from 'rxjs';
 import { memo } from '../util';
 import { filterBountiesProposals } from './helpers/filterBountyProposals';
 
-type Result = [Option<Bounty>[], Option<Bytes>[], BountyIndex[], DeriveCollectiveProposal[]];
+type Result = [Option<PalletBountiesBounty>[], Option<Bytes>[], BountyIndex[], DeriveCollectiveProposal[]];
 
 function parseResult ([maybeBounties, maybeDescriptions, ids, bountyProposals]: Result): DeriveBounties {
   const bounties: DeriveBounties = [];
@@ -53,8 +54,8 @@ export function bounties (instanceId: string, api: ApiInterfaceRx): () => Observ
         const ids = keys.map(({ args: [id] }) => id);
 
         return combineLatest([
-          bountyBase.bounties.multi<Option<Bounty>>(ids),
-          bountyBase.bountyDescriptions.multi<Option<Bytes>>(ids),
+          bountyBase.bounties.multi(ids),
+          bountyBase.bountyDescriptions.multi(ids),
           of(ids),
           of(filterBountiesProposals(api, proposals))
         ]);

packages/api-derive/src/chain/getBlock.ts

@@ -5,7 +5,7 @@ import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { SignedBlockExtended } from '../type/types';
 
-import { catchError, combineLatest, map, of } from 'rxjs';
+import { catchError, combineLatest, map, of, switchMap } from 'rxjs';
 
 import { createSignedBlockExtended } from '../type';
 import { memo } from '../util';
@@ -24,15 +24,18 @@ import { memo } from '../util';
  * ```
  */
 export function getBlock (instanceId: string, api: ApiInterfaceRx): (hash: Uint8Array | string) => Observable<SignedBlockExtended | undefined> {
-  return memo(instanceId, (hash: Uint8Array | string): Observable<SignedBlockExtended | undefined> =>
-    combineLatest([
-      api.rpc.chain.getBlock(hash),
-      api.query.system.events.at(hash),
-      api.query.session
-        ? api.query.session.validators.at(hash)
-        : of([])
-    ]).pipe(
-      map(([signedBlock, events, validators]): SignedBlockExtended =>
+  return memo(instanceId, (blockHash: Uint8Array | string): Observable<SignedBlockExtended | undefined> =>
+    api.queryAt(blockHash).pipe(
+      switchMap((queryAt) =>
+        combineLatest([
+          api.rpc.chain.getBlock(blockHash),
+          queryAt.system.events(),
+          queryAt.session
+            ? queryAt.session.validators()
+            : of([])
+        ])
+      ),
+      map(([signedBlock, events, validators]) =>
         createSignedBlockExtended(api.registry, signedBlock, events, validators)
       ),
       catchError((): Observable<undefined> =>

packages/api-derive/src/chain/getHeader.ts

@@ -3,9 +3,10 @@
 
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { AccountId } from '@polkadot/types/interfaces';
 import type { HeaderExtended } from '../type/types';
 
-import { catchError, combineLatest, map, of } from 'rxjs';
+import { catchError, combineLatest, map, of, switchMap } from 'rxjs';
 
 import { createHeaderExtended } from '../type';
 import { memo } from '../util';
@@ -26,13 +27,16 @@ import { memo } from '../util';
  */
 export function getHeader (instanceId: string, api: ApiInterfaceRx): (hash: Uint8Array | string) => Observable<HeaderExtended | undefined> {
   return memo(instanceId, (hash: Uint8Array | string): Observable<HeaderExtended | undefined> =>
-    combineLatest([
-      api.rpc.chain.getHeader(hash),
-      api.query.session
-        ? api.query.session.validators.at(hash)
-        : of([])
-    ]).pipe(
-      map(([header, validators]): HeaderExtended =>
+    api.queryAt(hash).pipe(
+      switchMap((queryAt) =>
+        combineLatest([
+          api.rpc.chain.getHeader(hash),
+          queryAt.session
+            ? queryAt.session.validators()
+            : of([] as AccountId[])
+        ])
+      ),
+      map(([header, validators]) =>
         createHeaderExtended(header.registry, header, validators)
       ),
       catchError((): Observable<undefined> =>

packages/api-derive/src/chain/subscribeNewBlocks.ts

@@ -3,9 +3,7 @@
 
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Vec } from '@polkadot/types';
-import type { EventRecord, SignedBlock } from '@polkadot/types/interfaces';
-import type { HeaderExtended, SignedBlockExtended } from '../type/types';
+import type { SignedBlockExtended } from '../type/types';
 
 import { combineLatest, map, of, switchMap } from 'rxjs';
 
@@ -19,16 +17,21 @@ import { memo } from '../util';
 export function subscribeNewBlocks (instanceId: string, api: ApiInterfaceRx): () => Observable<SignedBlockExtended> {
   return memo(instanceId, (): Observable<SignedBlockExtended> =>
     api.derive.chain.subscribeNewHeads().pipe(
-      switchMap((header): Observable<[SignedBlock, Vec<EventRecord>, HeaderExtended]> => {
+      switchMap((header) => {
         const blockHash = header.createdAtHash || header.hash;
 
-        return combineLatest(
-          api.rpc.chain.getBlock(blockHash),
-          api.query.system.events.at(blockHash),
-          of(header)
+        // we get the block first, setting up the registry
+        return api.queryAt(blockHash).pipe(
+          switchMap((queryAt) =>
+            combineLatest([
+              of(header),
+              api.rpc.chain.getBlock(blockHash),
+              queryAt.system.events()
+            ])
+          )
         );
       }),
-      map(([block, events, header]) =>
+      map(([header, block, events]) =>
         createSignedBlockExtended(block.registry, block, events, header.validators)
       )
     )