[CI Skip] release/stable 3.7.2

skip-checks: true

.123trigger

@@ -4,4 +4,13 @@
 1.11.2
 1.12.2
 1.17.2
-1.31.2
+1.31.2
+2.8.2
+3.2.2
+3.2.3
+
+3.3.2
+3.6.2
+3.6.3
+3.6.4
+3.7.2

.babelrc.js

@@ -1,4 +0,0 @@
-// Copyright 2017-2020 @polkadot/api authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-module.exports = require('./babel.config.js');

.eslintignore

@@ -1,5 +0,0 @@
-.eslintrc.js
-**/build/*
-**/coverage/*
-**/node_modules/*
-docs/examples/promise/90_typegen/*

.eslintrc.js

@@ -1,10 +1,19 @@
-// Copyright 2017-2020 @polkadot/api authors & contributors
+// Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const base = require('@polkadot/dev/config/eslint');
+const base = require('@polkadot/dev/config/eslint.cjs');
 
 module.exports = {
   ...base,
+  ignorePatterns: [
+    '.eslintrc.js',
+    '.github/**',
+    '.vscode/**',
+    '.yarn/**',
+    '**/build/*',
+    '**/coverage/*',
+    '**/node_modules/*'
+  ],
   parserOptions: {
     ...base.parserOptions,
     project: [

.github/workflows/pr-any.yml

@@ -9,7 +9,7 @@ jobs:
     name: ${{ matrix.step }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: ${{ matrix.step }}
       run: |
         yarn install --immutable | grep -v 'YN0013'

.github/workflows/push-master.yml

@@ -13,7 +13,7 @@ jobs:
     if: "! startsWith(github.event.head_commit.message, '[CI Skip]') && github.repository == 'polkadot-js/api'"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       with:
         token: ${{ secrets.GH_PAT }}
     - name: ${{ matrix.step }}

.nvmrc

@@ -1 +1 @@
-10
+12

.yarnrc.yml

@@ -9,7 +9,5 @@ plugins:
     spec: "@yarnpkg/plugin-interactive-tools"
   - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
     spec: "@yarnpkg/plugin-version"
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
 
-yarnPath: .yarn/releases/yarn-2.2.2.cjs
+yarnPath: .yarn/releases/yarn-2.4.0.cjs

CHANGELOG.md

@@ -1,8 +1,326 @@
 # CHANGELOG
 
+## 3.7.2 Feb 2, 2021
+
+Changes:
+
+- Adjusted the `Keys` type for the 28 runtime on Kusama, Polkadot & Westend
+
+
+## 3.7.1 Feb 1, 2021
+
+Upgrade priority: Low. However recommended for current Substrate master, Polkadot and Rococo users and those wishing to support the upcoming Polkadot 28 runtime with the new `MultiAddress`.
+
+- **Breaking change** As indicated in the 3.5.1 release notes, the `Address`/`LookupSource` defaults have now been adjusted for `MultiAddress`. If your chain does not use these types, explicitly add the correct `Address`/`LookupSource` types. This new extensible format is mean to cater for all address types into the future, removing a lot of discrepancies between chains.
+
+Contributed:
+
+- Extraction of the block author on Moonbeam (Thanks to https://github.com/joelamouche)
+- Cleanup logs with HTTP providers, no subs (Thanks to https://github.com/Tbaut)
+
+Changes:
+
+- Allow `.slice` operator on the `Vec` type
+- Apply `MultiAddress` as a default
+- Adds support for the upcoming Polkadot 28 and Kusama 2028 runtimes
+- Add checkpoint for Kusama 2027 upgrade
+- Update all parachain types (as per latest Rococo)
+- Correctly use relay blockNumber in parachain validation data
+- remove information log for capabilities detection (creates confusion)
+- Remove explicit references to `global`, use the `x-global` detection
+- Remove explicit `module` in `package.json` (exports map available)
+
+
+## 3.6.1 Jan 24, 2020
+
+Upgrade priority: Medium if not already on at least 3.3.1. The next upgrade of Kusama/Polkadot requires it.
+
+- **Breaking change** To support chains with multiple tokens, such as bridges, the `ChainProperties` type now returns an array of tokens and decimals (instead of singular values) in the `token{Decimals, Symbol}` getters. Additionally, this means that the `registry` interfaces has been changes, to `registry.chainDecimals: number[]` and `registry.chainTokens: string[]`. Where used the `[0]` index will return the first value if only interested in a single, for a straight conversion.
+
+Changes:
+
+- Allow for the detection of on-chain capabilities as available (e.g. `AccountData`, `ValidatorPrefs`)
+- Cater for multiple tokens and decimals in the chain the chain `system.properties` (as per the chain specification)
+- Add a `instances: { [key]: [module1, module2] }` definition in teh bundle types, allowing for multiple instances (e.g. Balances)
+- Adjust the `api-derive` for balances to retrieve values via `instances` as well as across multiple modules
+- Ensure all types are registered for all metadata typegen steps
+- Add `rpc.payment.queryFeeDetails` RPC endpoint
+- Update types & metadata to latest Substrate
+- Move the `@polkadot/x-rxjs` package into the common repo
+- Allow doc generation for errors/events (markdown outputs)
+
+
+## 3.5.1 Jan 18, 2020
+
+Upgrade priority: Low. Recommended for parachain developers.
+
+- **Important** The default for Substrate on the Address types are `MultiAddress`. It is recommended that chains add explicit definitions for `Address` and `LookupSource` in their types, instead of relying on the API-defaults. A future update will swap the API defaults to align with Substrate.
+- **Important** Like the above changes in Substrate, the `AccountInfo` structure has also changed. It is recommended that chain developers explicitly add `AccountInfo: 'AccountInfoWithRefCount'` for the version with `refCount` on and `AccountInfoWithProviders` for the latest Substrate version. As per the above, the API defaults will be changed to align with Substrate.
+
+Contributed:
+
+- Apply correct TypeScript type for `toBigInt()` (Thanks to https://github.com/ianhe8x)
+- Expand type definitions for storage key tuples (Thanks to https://github.com/monitz87)
+- Adjust bounty derive to cater for non-council chains (Thanks to https://github.com/ekowalsk)
+
+Changes:
+
+- Remove recursion in vector/struct U8a stream decoding
+- Availability of staking made optional in session length calcs (era does require it)
+- Updates to parachain types, ensuring it has coverage for all the latest
+- Update all Rococo types to the latest (session keys, session reports, parachain indexes)
+- Update known upgrade checkpoints fo WestEnd
+- Add types of the lottery module in Substrate
+- Add and extend types for the crowdloan module in Polkadot
+- Adjust node-template to default to `MultiAddress` on specVersion >= 100
+
+
+## 3.4.1 Jan 11, 2020
+
+Upgrade priority: Low. Fixes for parachain types, `.entries()` (with no values) and `event.is(...)` checks, users of these interfaces will have benefit.
+
+- **Breaking change** The `derive.chain.{getBlock, subscribeNewBlocks}` now return `SignedBlockExtended`, all with the actual extrinsics and events mapped. Users of the latter interface should take note.
+
+Contributed:
+
+- Fix `SessionKeys{6-9}` definitions (Thanks to https://github.com/icodezjb)
+- Support `Vec<(a, b)>` in enums (Thanks to https://github.com/monitz87)
+- Add motions to bounty derive (Thanks to https://github.com/ekowalsk)
+
+Changes:
+
+- `derive.chain.getBlock()` now maps events to extrinsics via `.extrinsics` getter
+- Ensure dispatchInfo is extracted on failed extrinsics (`getBlock` derive)
+- Allow specification of additional signed extrinsic via API options
+- Add missing parachain types, `ParaGenesisArgs`
+- Correct `EthTransaction` type (as per the correct cargo crate)
+- Update with latest contract types for Substrate master
+- Update alias mapping for asset palette (including Substrate starting defaults)
+- Allow `.entries()` call where 0 keys are present
+- Fix `.is` on events not checking the correct index
+- Construction of `i*` types ow correctly checks for max positive/negative
+
+
+## 3.3.1 Jan 4, 2021
+
+Upgrade priority: Low. Recommended for users of frontier evm module with additional types.
+
+Contributed:
+
+- Expand bounty derives (Thanks to https://github.com/ekowalsk)
+- Adjust known-types (Thanks to https://github.com/mikiquantum)
+
+Changes:
+
+- Parallelize the API-init RPC calls for faster overall startup
+- Add `ExitReason` types for the frontier evm module
+- Adjust checks for indexed/non-indexed module checks (metadata decoration)
+- Apply module aliases on constants (aligning with events, extrinsics)
+- Allow for use of `system.ss58Prefix` as exposed (current Substrate master)
+- Correct use of api-contract `blockWeights.maxBlock` in estimation
+- Build metadata docs & interfaces with section aliases
+- Update to latest Substrate master metadata in tests
+
+
+## 3.2.1 Dec 27, 2020
+
+Upgrade priority: Low. Recommended for users of parachains.
+
+Contributed:
+
+- Adjust metadata `.asV12` type signature (Thanks to https://github.com/yjhmelody)
+
+Changes:
+
+- Add `api.{errors, events, query, tx}.<section>.<name>.is(...)`
+- Remove support for staking pre Substrate 2.0
+- Add all frontier types & RPCs
+- Support `AccountInfo` with new provider/consumer refCount structure
+- Additional Cumulus parachain types
+- Consistently format number JSON based on bitLength
+- Cleanup metadata -> api dependencies
+- Update `@polkadot/util` to 5.2.1
+
+
+## 3.1.1 Dec 20, 2020
+
+Upgrade priority: Low. Recommended for users of parachains.
+
+Contributed:
+
+- Additional parachain types (Thanks to https://github.com/joelamouche)
+- Support for multi queries with `HttpProvider` (Thanks to https://github.com/ianhe8x)
+- Configurable error logging with `createTypeUnsafe` (Thanks to https://github.com/dvdplm)
+
+Changes:
+
+- Adjust core type creation, removing storage duplication
+- Update parachain types to support Rococo v1
+- Adjust bounties derive to cater for new Substrate namespaces (& move to bounties)
+- Mark `detectPackage` as known side-effect
+- Add `detectPackage` to `@polkadot/metadata` (a number of requests on this)
+- Adjust x-rxjs wrapper to expose all methods, incl. Node.js esm fixes
+- Update to latest Substrate static metadata
+- Update `@polkadot/util` to 5.1.1
+
+
+## 3.0.1 Dec 14, 2020
+
+Upgrade priority: Low. Recommended for the next Kusama/Polkadot upgrades due to additional types and those following chains following Substrate master closely.
+
+**Important** While this package contains no external interface changes, it now compiles and ships both cjs and esm modules. This means that modern bundlers will have more information for tree-shaking available. Additionally when using Node with `.mjs` extensions, the esm version imports will be used on recent Node versions. Adding an export map, as here, may have some impacts so a major semver bump is advised. There may be (small) dragons hiding in the dark corners...
+
+Contributed:
+
+- Injection of derives via typesBundle (Thanks to https://github.com/pr0fedt)
+- Added derives for bounties (Thanks to https://github.com/krzysztof-jelski)
+
+Changes:
+
+- Build and expose both cjs and esm via exports map
+- Inject RPC definitions for typesBundle, allowing per-spec configuration
+- Added `query.<section>.<method>.sizeAt(hash, [...params])` for all storage
+- Add new Substrate consumed Weight types
+- Expand `SessionKeys<n>` definitions (up to 9)
+- Cleanup circular `Type` <-> `Text` definitions
+- Cleanup circular `Metadata` <-> `TypeRegistry` imports
+- Update `@polkadot/util` to 5.0.1
+
+
+## 2.10.1 Dec 7, 2020
+
+Upgrade priority: Low. Recommended when following Substrate master and/or parachains development, contains the latest types for both.
+
+- **Breaking change** If using the `staking.query` derive, you now need to pass flags as to which values to retrieve
+
+Changes:
+
+- Ensure that maximum era is limited to `consts.system.blockHashCount` (don't overflow on very low blocktimes)
+- Apply current Polkadot master parachain types
+- Apply current Substrate master asset types
+- Add `system_{addLogFilter, resetLogFilter}` RPCs
+- Adjust tests for latest Substrate metadata
+- Adjust staking derives to be more performant (flags indicate which query values to retrieve)
+- Add account derive to cater for the availability of identities
+- Use `import type` in all cases
+
+
+## 2.9.1 Nov 30, 2020
+
+Upgrade priority: Low. No major changes when on at least 2.8.2. Users encouraged to upgrade to at least that patch.
+
+- **Breaking change** The API will now not attempt to queue calls made while not connected and send on connection. Rather when making a call and the RPC node is not connected, an error will be thrown.
+
+Contributed:
+
+- Add typegen capability for custom RPCs (Thanks to https://github.com/holygits)
+
+Changes:
+
+- Remove rpc-core send queue, only allow sends while connected
+- Adjust staking derive for `electedInfo` to contain details of current validators
+- Extract identity-only derive from `accounts.info` for simpler reusability
+- Add types for Substrate master node (to allow for consistent swapping to `MultiAddress`)
+- Adjust `Bytes` with `.slice` to be consistent for `Uint8array` extensions (already released in 2.8.2 as a bugfix)
+
+
+## 2.8.1 Nov 23, 2020
+
+Upgrade priority: Low. Recommended if using Substrate master with new `MultiAddress`.
+
+Contributed:
+
+- Export `derive.chain.getBlock` (Thanks to https://github.com/lovesh)
+
+Changes:
+
+- Expand `MultiAddress` construction with multi type detection
+- Rename `GenericLookupSource` to `IndicesLookupSource` (internal use)
+- Cleanup list retrievals with `Raw` data results for undecodable entries
+- Export actual version via `RegistryMetadata`
+- Dedupe bn.js (one version shared between dependencies)
+
+
+## 2.7.1 Nov 16, 2020
+
+Upgrade priority: Medium. Recommended for users of Polkadot/Kusama and api-contract users.
+
+Changes:
+
+- Allow for `ExtrinsicSignature` overrides (defaults to `MultiSignature`)
+- Update api-contract `Blueprint` to allow for optional salt (auto if not provided)
+- Support for ink! `.contract` files (in addition to ABI `.json`)
+- Fix contract event decoding with pass-through of raw `Bytes`
+- Fix support for enum encoding in api-contract
+- Support new contract `Schedule` type as per Substrate
+- Update Kusama/Polkadot known upgrade blocks
+- Adjust typegen generated `@polkadot/types` imports
+- Adjust internal `@polkadot/types` imports/exports (overall bundle sizes)
+
+
+## 2.6.1 Nov 9, 2020
+
+Upgrade priority: Low. Should be done alongside an update to `@polkadot/util` to 4.0
+
+Changes:
+
+- Adjust auto-gas to contract RPC call to 5 * 10 ^ 12 (align with Rust)
+- Adjust derive `AccountId` check to take Ethereum-compatible chains into account
+- Fallback for chains with invalid council proposal data in derives
+- Bump static v12 Metadata (tests) to latest Substrate version
+- Bump `@polkadot/{util,util-crypto}` to 4.0 (optimized WASM layers)
+
+
+## 2.5.1 Nov 2, 2020
+
+Upgrade priority: Low. Recommended for `api-contract` developers.
+
+- **Breaking change** Substrate changed the `ContractExecResult` from `api.rpc.contracts.call`. The API does have pass-through support for both old and new variants via the `Contract` interface, however it means the structure has changed to accommodate the new Substrate structure. Refer to the [docs for the latest interface](https://polkadot.js.org/docs/api-contract/start/contract.read) (including `isSuccess/isError` -> `isOk/isErr`, and the availability of the `gasConsumed`)
+
+Contributed:
+
+- Dedup similar types on generation (Thanks to https://github.com/monitz87)
+
+Changes:
+
+- `Contract` execution will now return contract events decoded in the result
+- Add `.dryRun` on extrinsics (alongside `.paymentInfo` usage)
+- Add `system_syncState` and `syncstate_genSyncSpec` RPCs
+- Enhance error reporting, `Call` indicates explicit call as found
+- Adjust internal metadata decoration and use as exposed from `@types/metadata`
+- Expand Rococo known types to cater for v1 (specVersion 10)
+- `registry.hash` now returns an `H256` object (as opposed to raw Uint8Array)
+- Use utility logger in all relevant error messages (consistency in logging)
+- Add `derive.council.proposal(<hash>)` for retrieval of a single (expanded) proposal
+- Correctly and transparently format type generation types (allowing for nested variants)
+
+
+## 2.4.1 Oct 26, 2020
+
+Upgrade priority: Low. No breaking changes, however it does move `api-contract` forward with additional features.
+
+Contributed:
+
+- Add support for both `{i,u}256` types on contracts (Thanks to https://github.com/seanyoung)
+
+Changes:
+
+- Add `.keysAt` & `.entriesAt` to query maps at a specific blockHash
+- Adjust ordering of type injection, any `types: { ... }` definitions not have precedence
+- Correctly format Tuples in both RPC and const definitions as part of type generation
+- Add node-template to known types (tracking inside API), remove warnings for the spec
+- Add initial implementation for new Substrate `MultiAddress` type
+- Add `api.derive.chain.subscribeNewBlocks` for full block retrievals
+- Contracts identifiers to `.{exec, read}('name', ...)` now matches on both snake_case and camelCase (consistency)
+- Cleanup contracts serialization for messages to allow both to and from
+- Add deserialization of contract events against the ABI
+- Adjust contracts metadata parsing to be future-proof with type retrievals
+- Add tests for Solang into contracts, re-organize layout per type
+
+
 ## 2.3.1 Oct 19, 2020
 
-Upgrade priority: Low. Recommended for `api-contracts` developers and those using large messages via Node.js WS.
+Upgrade priority: Low. Recommended for `api-contract` developers and those using large messages via Node.js WS.
 
 Contributed:
 

README.md

@@ -28,19 +28,3 @@ The API is split up into a number of internal packages -
 Type definitions for interfaces as exposed by Polkadot & Substrate clients -
 
 - [@polkadot/types](packages/types/) Codecs for all Polkadot and Substrate primitives
-
-## development
-
-Contributions are welcome!
-
-To start off, this repo (along with others in the [@polkadot](https://github.com/polkadot-js/) family) uses yarn workspaces to organise the code. As such, after cloning, its dependencies _should_ be installed via `yarn`, not via npm; the latter will result in broken dependencies.
-
-To get started -
-
-1. Clone the repo locally, via `git clone https://github.com/polkadot-js/api <optional local path>`
-2. Ensure that you have a recent version of Node.js, for development purposes [Node 10](https://nodejs.org/en/) is recommended.
-3. Ensure that you have a recent version of Yarn, for development purposes [Yarn >=1.10.1](https://yarnpkg.com/docs/install) is required.
-4. Install the dependencies by running `yarn`
-5. Build the everything via `yarn run build`
-6. You can also launch the API Docs, via `yarn vuepress dev docs`
-7. Access the docs via [http://localhost:8080](http://localhost:8080)

babel.config.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2020 @polkadot/api authors & contributors
+// Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-module.exports = require('@polkadot/dev/config/babel');
+module.exports = require('@polkadot/dev/config/babel-config-cjs.cjs');

copy-to-apps.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017-2020 @polkadot/api authors & contributors
-# SPDX-License-Identifier: Apache-2.0
-
-function copy_folder () {
-  SRC="packages/$1/build"
-  DST="../apps/node_modules/@polkadot/$1"
-
-  echo "** Copying $SRC to $DST"
-
-  rm -rf $DST
-  cp -r $SRC $DST
-}
-
-yarn polkadot-dev-build-ts
-
-copy_folder "api"
-copy_folder "api-contract"
-copy_folder "api-derive"
-copy_folder "metadata"
-copy_folder "rpc-core"
-copy_folder "rpc-provider"
-copy_folder "types"
-copy_folder "types-known"
-copy_folder "typegen"

copy-to-test.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017-2020 @polkadot/api authors & contributors
-# SPDX-License-Identifier: Apache-2.0
-
-function copy_folder () {
-  SRC="packages/$1/build"
-  DST="../test/js-test/node_modules/@polkadot/$1"
-
-  echo "** Copying $SRC to $DST"
-
-  rm -rf $DST
-  cp -r $SRC $DST
-}
-
-yarn polkadot-dev-build-ts
-
-copy_folder "api"
-copy_folder "api-contract"
-copy_folder "api-derive"
-copy_folder "metadata"
-copy_folder "rpc-core"
-copy_folder "rpc-provider"
-copy_folder "types"
-copy_folder "types-known"
-copy_folder "typegen"

docker-compose.yml

@@ -1,102 +0,0 @@
-# Docker compose file to run Polkadot-JS API e2e test files on supported versions of Polkadot and Substrate
-# 
-# Setup:
-# Builds 5 containers with different supported versions of Substrate and Polkadot.
-# Runs Polkadot-JS API Tests 
-#
-# Before you can run this script, you need to install Docker and 'Docker Compose' on your machine.
-# Please follow the steps described here (including the prerequisites): https://docs.docker.com/compose/install/
-#
-# Usage:
-# 1. BUILD: Run `docker-compose pull && docker-compose up -d` to pull the latest docker imaged and run docker-compose in detached mode. This will run the substrate and polkadot containers in the background.
-# 2. INFO: Run `docker ps` to get a list of Docker containers running in the background including their mapped ports on localhost
-# 3. TEST: Run `docker-compose logs -f js-api-tests` to run the API tests and print the logs
-# 4. QUIT: Run `docker-compose down` to stop and remove all running containers.
-#
-# Provided Endpoints for localhost:
-#   - Substrate Master: ws://127.0.0.1:9945/
-#   - Substrate 1.0: ws://127.0.0.1:9946/
-#   - Substrate 2.0: ws://127.0.0.1:9947/
-#   - Polkadot Master: ws://127.0.0.1:9948/
-#   - Polkadot Alexander: ws://127.0.0.1:9949/
-# 
-# Find more Docker images of Substrate https://hub.docker.com/r/parity/substrate/tags
-# Find more Docker images of Polkadot https://hub.docker.com/r/parity/polkadot/tags
-
-
-version: "3.7"
-services:
-  substrate-master:
-    image: parity/substrate:latest
-    ports:
-      - "9945:9944"
-      - "9935:9933"
-    networks:
-      - internet
-    command:
-      - "--dev"
-      - "--ws-external"
-      - "--rpc-external"
-    
-  substrate-1.0:
-    image: parity/substrate:v1.0.0
-    ports:
-      - "9946:9944"
-      - "9936:9933"
-    networks:
-      - internet
-    command:
-      - "--dev"
-      - "--ws-external"
-      - "--rpc-external"
-
-  substrate-2.0:
-    image: parity/substrate:2.0.0-b65c315a1
-    ports:
-      - "9947:9944"
-      - "9937:9933"
-    networks:
-      - internet
-    command:
-      - "--dev"
-      - "--ws-external"
-      - "--rpc-external"
-  
-  polkadot-master:
-    image: parity/polkadot:latest
-    ports:
-      - "9948:9944"
-      - "9938:9933"
-    networks:
-      - internet
-    command:
-      - "--dev"
-      - "--ws-external"
-      - "--rpc-external"
-
-  polkadot-alexander:
-      image: parity/polkadot:v0.4.4
-      ports:
-        - "9949:9944"
-        - "9939:9933"
-      networks:
-        - internet
-      command:
-        - "--dev"
-        - "--ws-external"
-        - "--rpc-external"
-
-  # This is the container running the API tests
-  js-api-tests:
-    image: node:11
-    volumes: 
-      - ./:/polkadot-js/api
-    working_dir: /polkadot-js/api
-    network_mode: host
-    tty: true
-    environment: 
-      - TERM=xterm-256color`
-    command: bash -c "NODE_ENV=abc /usr/local/bin/yarn && /usr/local/bin/yarn test:all"
-
-networks:
-  internet:

docs/404.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="initial-scale=0.5, maximum-scale=1">
+    <meta http-equiv="refresh" content="0;URL='https://polkadot.js.org/docs/api/'" />
+    <title>Redirecting to https://polkadot.js.org/docs/api/</title>
+  </head>
+  <body>
+    Redirecting to <a href="https://polkadot.js.org/docs/api/">https://polkadot.js.org/docs/api/</a>
+  </body>
+</html>

docs/index.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="initial-scale=0.5, maximum-scale=1">
+    <meta http-equiv="refresh" content="0;URL='https://polkadot.js.org/docs/api/'" />
+    <title>Redirecting to https://polkadot.js.org/docs/api/</title>
+  </head>
+  <body>
+    Redirecting to <a href="https://polkadot.js.org/docs/api/">https://polkadot.js.org/docs/api/</a>
+  </body>
+</html>

jest.config.js

@@ -1,29 +1,30 @@
-// Copyright 2017-2020 @polkadot/api authors & contributors
+// Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const config = require('@polkadot/dev/config/jest');
+const config = require('@polkadot/dev/config/jest.cjs');
 
 module.exports = Object.assign({}, config, {
   moduleNameMapper: {
-    '@polkadot/api-contract(.*)$': '<rootDir>/packages/api-contract/src/$1',
-    '@polkadot/api-derive(.*)$': '<rootDir>/packages/api-derive/src/$1',
+    '@polkadot/api-(contract|derive)(.*)$': '<rootDir>/packages/api-$1/src/$2',
     // eslint-disable-next-line sort-keys
     '@polkadot/api(.*)$': '<rootDir>/packages/api/src/$1',
     '@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',
     // eslint-disable-next-line sort-keys
     '@polkadot/types(.*)$': '<rootDir>/packages/types/src/$1'
   },
   modulePathIgnorePatterns: [
     '<rootDir>/packages/api/build',
-    '<rootDir>/packages/api-derive/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'
   ],
-  resolver: './jest.resolver.js'
+  resolver: '@polkadot/dev/config/jest-resolver.cjs'
 });

jest.resolver.js

@@ -1,12 +0,0 @@
-// Copyright 2017-2020 @polkadot/api authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-const path = require('path');
-
-module.exports = function resolver (file, config) {
-  if (file.includes('package.json')) {
-    return path.join(config.basedir.replace('/src', '/'), file);
-  }
-
-  return config.defaultResolver(file, config);
-};

package.json

@@ -3,15 +3,16 @@
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "license": "Apache-2",
   "private": true,
+  "type": "commonjs",
   "workspaces": [
     "packages/*"
   ],
   "resolutions": {
-    "babel-core": "^7.0.0-bridge.0",
-    "typescript": "^4.0.3"
+    "typescript": "^4.1.3"
   },
   "scripts": {
-    "build": "yarn build:interfaces && polkadot-dev-build-ts && (cd packages/typegen && copyfiles scripts/* build)",
+    "build": "yarn build:interfaces && polkadot-dev-build-ts",
+    "build:extra": "(cd packages/typegen && copyfiles scripts/* build)",
     "build:interfaces": "polkadot-types-internal-interfaces",
     "build:release": "polkadot-ci-ghact-build",
     "docs:metadata": "polkadot-types-internal-metadata",
@@ -24,14 +25,14 @@
     "test:watch": "polkadot-dev-run-test --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.3",
-    "@babel/register": "^7.12.1",
-    "@babel/runtime": "^7.12.1",
-    "@polkadot/dev": "^0.58.3",
-    "@polkadot/ts": "^0.3.49",
+    "@babel/core": "^7.12.10",
+    "@babel/register": "^7.12.10",
+    "@babel/runtime": "^7.12.5",
+    "@polkadot/dev": "^0.61.24",
+    "@polkadot/ts": "^0.3.59",
     "@polkadot/typegen": "workspace:packages/typegen",
-    "@types/jest": "^26.0.14",
-    "copyfiles": "^2.4.0"
+    "@types/jest": "^26.0.20",
+    "copyfiles": "^2.4.1"
   },
-  "version": "2.3.1"
+  "version": "3.7.2"
 }

packages/api-contract/package.json

@@ -1,37 +1,22 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "2.3.1",
+  "version": "3.7.2",
   "description": "Interfaces for interacting with contracts and contract ABIs",
   "main": "index.js",
-  "keywords": [
-    "Polkadot",
-    "ABI"
-  ],
+  "sideEffects": false,
   "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [
-    "Jaco Greeff <jacogr@gmail.com>"
-  ],
+  "maintainers": [],
   "contributors": [],
   "license": "Apache-2.0",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/polkadot-js/api.git"
-  },
-  "bugs": {
-    "url": "https://github.com/polkadot-js/api/issues"
-  },
+  "repository": "github:polkadot-js/api",
+  "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.12.1",
-    "@polkadot/api": "2.3.1",
-    "@polkadot/rpc-core": "2.3.1",
-    "@polkadot/types": "2.3.1",
-    "@polkadot/util": "^3.6.1",
-    "bn.js": "^5.1.3",
-    "rxjs": "^6.6.3"
+    "@babel/runtime": "^7.12.5",
+    "@polkadot/api": "3.7.2",
+    "@polkadot/types": "3.7.2",
+    "@polkadot/util": "^5.5.1",
+    "@polkadot/x-rxjs": "^5.5.1",
+    "bn.js": "^4.11.9"
   }
 }

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

@@ -1,90 +1,30 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import Abi from './Abi';
+import abis from '../test/contracts';
+import { Abi } from '.';
 
-import * as testContracts from '../test/contracts';
-
-const abis: Record<string, any> = { ...testContracts };
-
-function compareInterface (name: string, messageIds: string[]): void {
-  try {
-    const inkAbi = new Abi(abis[name]);
-
-    expect(inkAbi.messages.map(({ identifier }) => identifier)).toEqual(messageIds);
-  } catch (error) {
-    console.error(error);
-
-    throw error;
+interface JSONAbi {
+  spec: {
+    messages: {
+      name: string[] | string
+    }[]
   }
 }
 
 describe('Abi', (): void => {
-  describe('construction', (): void => {
-    it('initializes from a contract ABI (flipper)', (): void => {
-      compareInterface('flipper', ['flip', 'get']);
-    });
+  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]);
 
-    it('initializes from a contract ABI (incrementer)', (): void => {
-      compareInterface('incrementer', ['inc', 'get']);
-    });
+        expect(inkAbi.messages.map(({ identifier }) => identifier)).toEqual(messageIds);
+      } catch (error) {
+        console.error(error);
 
-    it('initializes from a contract ABI (erc20)', (): void => {
-      compareInterface('erc20', [
-        'total_supply',
-        'balance_of',
-        'allowance',
-        'transfer',
-        'approve',
-        'transfer_from'
-      ]);
-    });
-
-    it('initializes from a contract ABI (delegator)', (): void => {
-      compareInterface('delegator', [
-        'get',
-        'change',
-        'switch'
-      ]);
-    });
-
-    it('initializes from a contract ABI (dns)', (): void => {
-      compareInterface('dns', [
-        'register',
-        'set_address',
-        'transfer',
-        'get_address'
-      ]);
-    });
-
-    it('initializes from a contract ABI (erc721)', (): void => {
-      compareInterface('erc721', [
-        'balance_of',
-        'owner_of',
-        'get_approved',
-        'is_approved_for_all',
-        'set_approval_for_all',
-        'approve',
-        'transfer',
-        'transfer_from',
-        'mint',
-        'burn'
-      ]);
-    });
-
-    it('initializes from a contract ABI (multisig_plain)', (): void => {
-      compareInterface('multisigPlain', [
-        'add_owner',
-        'remove_owner',
-        'replace_owner',
-        'change_requirement',
-        'submit_transaction',
-        'cancel_transaction',
-        'confirm_transaction',
-        'revoke_confirmation',
-        'invoke_transaction',
-        'eval_transaction'
-      ]);
+        throw error;
+      }
     });
   });
 });

packages/api-contract/src/Abi.ts

@@ -1,27 +1,32 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AnyJson } from '@polkadot/types/types';
-import { ChainProperties, ContractConstructorSpec, ContractMessageSpec, ContractProject } from '@polkadot/types/interfaces';
-import { AbiConstructor, AbiMessage, AbiMessageParam } from './types';
+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 { assert, isNumber, isObject, isString, stringCamelCase } from '@polkadot/util';
+import { assert, assertReturn, compactAddLength, compactStripLength, isNumber, isObject, isString, logger, stringCamelCase, u8aConcat, u8aToHex } from '@polkadot/util';
 
-import MetaRegistry from './MetaRegistry';
+import { MetaRegistry } from './MetaRegistry';
+
+const EMPTY_U8A = new Uint8Array();
+
+const l = logger('Abi');
 
 function findMessage <T extends AbiMessage> (list: T[], messageOrId: T | string | number): T {
   const message = isNumber(messageOrId)
     ? list[messageOrId]
     : isString(messageOrId)
-      ? list.find(({ identifier }: T) => identifier === messageOrId.toString())
+      ? list.find(({ identifier }) => [identifier, stringCamelCase(identifier)].includes(messageOrId.toString()))
       : messageOrId;
 
-  assert(message, `Attempted to call an invalid contract interface, ${JSON.stringify(messageOrId)}`);
-
-  return message;
+  return assertReturn(message, `Attempted to call an invalid contract interface, ${JSON.stringify(messageOrId)}`);
 }
 
-export default class Abi {
+export class Abi {
+  readonly #events: AbiEvent[];
+
   public readonly constructors: AbiConstructor[];
 
   public readonly json: AnyJson;
@@ -45,25 +50,56 @@ export default class Abi {
 
     this.registry.setMetaTypes(this.project.types);
 
-    this.project.types.forEach((_, index) => this.registry.getMetaTypeDef(this.registry.createType('SiLookupTypeId', index + 1)));
+    this.project.types.forEach((_, index) =>
+      this.registry.getMetaTypeDef({ type: this.registry.createType('SiLookupTypeId', index + 1) })
+    );
     this.constructors = this.project.spec.constructors.map((spec: ContractConstructorSpec, index) =>
-      this.#createBase(spec, index, {
+      this.#createMessage(spec, index, {
         isConstructor: true
       })
     );
+    this.#events = this.project.spec.events.map((spec: ContractEventSpec, index) =>
+      this.#createEvent(spec, index)
+    );
     this.messages = this.project.spec.messages.map((spec: ContractMessageSpec, index): AbiMessage => {
       const typeSpec = spec.returnType.unwrapOr(null);
 
-      return this.#createBase(spec, index, {
+      return this.#createMessage(spec, index, {
         isMutating: spec.mutates.isTrue,
         isPayable: spec.payable.isTrue,
         returnType: typeSpec
-          ? this.registry.getMetaTypeDef(typeSpec.type)
+          ? this.registry.getMetaTypeDef(typeSpec)
           : null
       });
     });
   }
 
+  /**
+   * Warning: Unstable API, bound to change
+   */
+  public decodeEvent (data: Bytes | Uint8Array): DecodedEvent {
+    const index = data[0];
+    const event = this.#events[index];
+
+    assert(event, `Unable to find event with index ${index}`);
+
+    return event.fromU8a(data.subarray(1));
+  }
+
+  /**
+   * Warning: Unstable API, bound to change
+   */
+  public decodeConstructor (data: Uint8Array): DecodedMessage {
+    return this.#decodeMessage('message', this.constructors, data);
+  }
+
+  /**
+   * Warning: Unstable API, bound to change
+   */
+  public decodeMessage (data: Uint8Array): DecodedMessage {
+    return this.#decodeMessage('message', this.messages, data);
+  }
+
   public findConstructor (constructorOrId: AbiConstructor | string | number): AbiConstructor {
     return findMessage(this.constructors, constructorOrId);
   }
@@ -72,30 +108,92 @@ export default class Abi {
     return findMessage(this.messages, messageOrId);
   }
 
-  #createBase = (spec: ContractMessageSpec | ContractConstructorSpec, index: number, add: Partial<AbiMessage> = {}): AbiMessage => {
-    const identifier = spec.name.toString();
-    const args = spec.args.map((arg, index): AbiMessageParam => {
+  #createArgs = (args: ContractMessageParamSpec[], spec: unknown): AbiParam[] => {
+    return args.map((arg, index): AbiParam => {
       try {
         assert(isObject(arg.type), 'Invalid type definition found');
 
         return {
-          name: stringCamelCase(arg.name.toString()),
-          type: this.registry.getMetaTypeDef(arg.type.type)
+          name: stringCamelCase(arg.name),
+          type: this.registry.getMetaTypeDef(arg.type)
         };
       } catch (error) {
-        console.error(`Error expanding argument ${index} in ${JSON.stringify(spec)}`);
+        l.error(`Error expanding argument ${index} in ${JSON.stringify(spec)}`);
 
         throw error;
       }
     });
+  }
 
-    return {
+  #createEvent = (spec: ContractEventSpec, index: number): AbiEvent => {
+    const args = this.#createArgs(spec.args, spec);
+    const event = {
+      args,
+      docs: spec.docs.map((doc) => doc.toString()),
+      fromU8a: (data: Uint8Array): DecodedEvent => ({
+        args: this.#decodeArgs(args, data),
+        event
+      }),
+      identifier: spec.name.toString(),
+      index
+    };
+
+    return event;
+  }
+
+  #createMessage = (spec: ContractMessageSpec | ContractConstructorSpec, index: number, add: Partial<AbiMessage> = {}): AbiMessage => {
+    const args = this.#createArgs(spec.args, spec);
+    const message = {
       ...add,
       args,
       docs: spec.docs.map((doc) => doc.toString()),
-      identifier,
+      fromU8a: (data: Uint8Array): DecodedMessage => ({
+        args: this.#decodeArgs(args, data),
+        message
+      }),
+      identifier: spec.name.toString(),
       index,
-      selector: spec.selector
+      selector: spec.selector,
+      toU8a: (params: CodecArg[], additional?: Uint8Array) =>
+        this.#encodeArgs(spec, args, params, additional)
     };
+
+    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));
+
+      offset += value.encodedLength;
+
+      return value;
+    });
+  }
+
+  #decodeMessage = (type: 'constructor' | 'message', list: AbiMessage[], data: Uint8Array): DecodedMessage => {
+    const [, trimmed] = compactStripLength(data);
+    const selector = trimmed.subarray(0, 4);
+    const message = list.find((m) => m.selector.eq(selector));
+
+    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[], additional = EMPTY_U8A): 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()),
+        additional
+      )
+    );
   }
 }

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

@@ -1,70 +1,35 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import fs from 'fs';
 import path from 'path';
 
-import Abi from './Abi';
-
-import * as testContracts from '../test/contracts';
-import * as userContracts from '../test/contracts/user';
-
-const abis: Record<string, any> = { ...testContracts };
-const userAbis: Record<string, any> = { ...userContracts };
-
-function compareTypes (name: string): void {
-  const abi = new Abi(abis[name] || userAbis[name]);
-
-  try {
-    const cmpPath = path.join(__dirname, `../test/compare/${name}.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;
-  }
-}
+import abis from '../test/contracts';
+import { Abi } from '.';
 
 describe('MetaRegistry', (): void => {
-  describe('types', (): void => {
-    it('initializes from a contract ABI (flipper)', (): void => {
-      compareTypes('flipper');
-    });
+  Object.keys(abis).forEach((abiName) => {
+    it(`initializes from a contract ABI (${abiName})`, (): void => {
+      const abi = new Abi(abis[abiName]);
 
-    it('initializes from a contract ABI (incrementer)', (): void => {
-      compareTypes('incrementer');
-    });
+      try {
+        const cmpPath = path.join(__dirname, `../test/compare/${abiName}.test.json`);
 
-    it('initializes from a contract ABI (erc20)', (): void => {
-      compareTypes('erc20');
-    });
+        if (!fs.existsSync(cmpPath)) {
+          fs.writeFileSync(cmpPath, JSON.stringify(abi.registry.metaTypeDefs, null, 2), { flag: 'w' });
+        }
 
-    it('initializes from a contract ABI (dns)', (): void => {
-      compareTypes('dns');
-    });
+        // 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));
 
-    it('initializes from a contract ABI (erc721)', (): void => {
-      compareTypes('erc721');
-    });
-
-    it('initializes from a contract ABI (multisig_plain)', (): void => {
-      compareTypes('multisigPlain');
-    });
-  });
-
-  describe('user ABIs', (): void => {
-    it('initializes from a contract ABI (withString)', (): void => {
-      compareTypes('withString');
+        throw error;
+      }
     });
   });
 
   it('stores base project as JSON', (): void => {
-    expect(new Abi(abis.dns).json).toEqual(abis.dns);
+    expect(new Abi(abis.ink_dns).json).toEqual(abis.ink_dns);
   });
 });

packages/api-contract/src/MetaRegistry.ts

@@ -1,11 +1,17 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ChainProperties, SiField, SiLookupTypeId, SiType, SiTypeDefArray, SiTypeDefVariant, SiTypeDefSequence, SiTypeDefTuple, SiVariant } from '@polkadot/types/interfaces';
-import { InterfaceTypes, TypeDef, TypeDefInfo } from '@polkadot/types/types';
+import type { ChainProperties, ContractDisplayName, SiField, SiLookupTypeId, SiType, SiTypeDefArray, SiTypeDefSequence, SiTypeDefTuple, SiTypeDefVariant, SiVariant } from '@polkadot/types/interfaces';
+import type { InterfaceTypes, TypeDef } from '@polkadot/types/types';
 
+import { TypeRegistry, withTypeString } from '@polkadot/types/create';
+import { TypeDefInfo } from '@polkadot/types/types';
 import { assert, isUndefined } from '@polkadot/util';
-import { TypeRegistry, withTypeString } from '@polkadot/types';
+
+interface PartialTypeSpec {
+  readonly type: SiLookupTypeId;
+  readonly displayName?: ContractDisplayName;
+}
 
 // convert the offset into project-specific, index-1
 export function getRegistryOffset (id: SiLookupTypeId): number {
@@ -17,7 +23,9 @@ const PRIMITIVE_ALIAS: Record<string, keyof InterfaceTypes> = {
   Str: 'Text'
 };
 
-export default class MetaRegistry extends TypeRegistry {
+const PRIMITIVE_ALWAYS = ['AccountId', 'AccountIndex', 'Address', 'Balance'];
+
+export class MetaRegistry extends TypeRegistry {
   public readonly metaTypeDefs: TypeDef[] = [];
 
   #siTypes: SiType[] = [];
@@ -34,24 +42,38 @@ export default class MetaRegistry extends TypeRegistry {
     this.#siTypes = metaTypes;
   }
 
-  public getMetaTypeDef (id: SiLookupTypeId): TypeDef {
-    const offset = getRegistryOffset(id);
+  public getMetaTypeDef (typeSpec: PartialTypeSpec): TypeDef {
+    const offset = getRegistryOffset(typeSpec.type);
     let typeDef = this.metaTypeDefs[offset];
 
     if (!typeDef) {
-      typeDef = this.#extract(this.#getMetaType(id), id);
+      typeDef = this.#extract(this.#getMetaType(typeSpec.type), typeSpec.type);
 
       this.metaTypeDefs[offset] = typeDef;
+    }
 
-      // 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 && !(typeDef.type === typeDef.displayName || typeDef.type.startsWith(`${typeDef.displayName}<`))) {
-        this.register({ [typeDef.displayName]: typeDef.type });
+    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;
   }
 
@@ -65,10 +87,10 @@ export default class MetaRegistry extends TypeRegistry {
 
   #extract = (type: SiType, id: SiLookupTypeId): TypeDef => {
     const path = [...type.path];
+    const pathFinal = path.length ? path[path.length - 1].toString() : '';
     let typeDef: Omit<TypeDef, 'type'>;
 
-    // TODO solang?
-    if (type.path.join('::').startsWith('ink_env::types::')) {
+    if (type.path.join('::').startsWith('ink_env::types::') || PRIMITIVE_ALWAYS.includes(pathFinal)) {
       typeDef = this.#extractPrimitivePath(type);
     } else if (type.def.isPrimitive) {
       typeDef = this.#extractPrimitive(type);
@@ -98,7 +120,7 @@ export default class MetaRegistry extends TypeRegistry {
         : {}
       ),
       ...(type.params.length > 0
-        ? { params: type.params.map((id) => this.getMetaTypeDef(id)) }
+        ? { sub: type.params.map((type) => this.getMetaTypeDef({ type })) }
         : {}
       ),
       ...typeDef
@@ -111,7 +133,7 @@ export default class MetaRegistry extends TypeRegistry {
     return {
       info: TypeDefInfo.VecFixed,
       length: length.toNumber(),
-      sub: this.getMetaTypeDef(type)
+      sub: this.getMetaTypeDef({ type })
     };
   }
 
@@ -135,7 +157,7 @@ export default class MetaRegistry extends TypeRegistry {
 
     const sub = fields.map(({ name, type }) => {
       return {
-        ...this.getMetaTypeDef(type),
+        ...this.getMetaTypeDef({ type }),
         ...(name.isSome ? { name: name.unwrap().toString() } : {})
       };
     });
@@ -166,16 +188,16 @@ export default class MetaRegistry extends TypeRegistry {
 
     return {
       info: TypeDefInfo.Vec,
-      sub: this.getMetaTypeDef(type)
+      sub: this.getMetaTypeDef({ type })
     };
   }
 
   #extractTuple = (ids: SiTypeDefTuple): Omit<TypeDef, 'type'> => {
     return ids.length === 1
-      ? this.getMetaTypeDef(ids[0])
+      ? this.getMetaTypeDef({ type: ids[0] })
       : {
         info: TypeDefInfo.Tuple,
-        sub: ids.map((id) => this.getMetaTypeDef(id))
+        sub: ids.map((type) => this.getMetaTypeDef({ type }))
       };
   }
 
@@ -186,14 +208,14 @@ export default class MetaRegistry extends TypeRegistry {
     if (specialVariant === 'Option') {
       return {
         info: TypeDefInfo.Option,
-        sub: this.getMetaTypeDef(params[0])
+        sub: this.getMetaTypeDef({ type: params[0] })
       };
     } else if (specialVariant === 'Result') {
       return {
         info: TypeDefInfo.Result,
-        sub: params.map((param, index) => ({
+        sub: params.map((type, index) => ({
           name: ['Ok', 'Error'][index],
-          ...this.getMetaTypeDef(param)
+          ...this.getMetaTypeDef({ type })
         }))
       };
     }

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

@@ -1,15 +1,15 @@
-// Copyright 2017-2020 @polkadot/api authors & contributors
+// Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiTypes, DecorateMethod } from '@polkadot/api/types';
-import { AnyJson, Registry } from '@polkadot/types/types';
+import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
+import type { AnyJson, Registry } from '@polkadot/types/types';
 
-import ApiBase from '@polkadot/api/base';
+import { ApiBase } from '@polkadot/api/base';
 import { assert } from '@polkadot/util';
 
-import Abi from '../Abi';
+import { Abi } from '../Abi';
 
-export default abstract class Base<ApiType extends ApiTypes> {
+export abstract class Base<ApiType extends ApiTypes> {
   public readonly abi: Abi;
 
   public readonly api: ApiBase<ApiType>;

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

@@ -1,22 +1,49 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiTypes, DecorateMethod } from '@polkadot/api/types';
-import { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
-import { AccountId, EventRecord, Hash } from '@polkadot/types/interfaces';
-import { AnyJson, CodecArg, ISubmittableResult } from '@polkadot/types/types';
-import { AbiConstructor } from '../types';
-import { MapConstructorExec } from './types';
+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 { AbiConstructor, BlueprintOptions } from '../types';
+import type { BlueprintDeploy, ContractGeneric, MapConstructorExec } from './types';
 
 import BN from 'bn.js';
-import { SubmittableResult } from '@polkadot/api';
-import ApiBase from '@polkadot/api/base';
-import { isUndefined, stringCamelCase } from '@polkadot/util';
 
-import Abi from '../Abi';
-import { applyOnEvent, encodeMessage } from '../util';
-import Base from './Base';
-import Contract from './Contract';
+import { SubmittableResult } from '@polkadot/api';
+import { ApiBase } from '@polkadot/api/base';
+import { Bytes } from '@polkadot/types';
+import { compactAddLength, isUndefined, stringCamelCase, u8aToU8a } from '@polkadot/util';
+import { randomAsU8a } from '@polkadot/util-crypto';
+
+import { Abi } from '../Abi';
+import { applyOnEvent, extractOptions, isOptions } from '../util';
+import { Base } from './Base';
+import { Contract } from './Contract';
+
+const EMPTY_SALT = new Uint8Array();
+
+function createTx <ApiType extends ApiTypes> (fn: (options: BlueprintOptions, params: CodecArg[]) => SubmittableExtrinsic<ApiType, BlueprintSubmittableResult<ApiType>>): BlueprintDeploy<ApiType> {
+  return (options: BigInt | string | number | BN | BlueprintOptions, ...params: CodecArg[]): SubmittableExtrinsic<ApiType, BlueprintSubmittableResult<ApiType>> =>
+    isOptions(options)
+      ? fn(options, params)
+      : fn(...extractOptions(options, params));
+}
+
+function createWithId <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 =>
+    isOptions(options)
+      ? fn(constructorOrId, options, params)
+      : fn(constructorOrId, ...extractOptions(options, params));
+}
+
+function encodeSalt (salt: Uint8Array | string | null = randomAsU8a()) {
+  return salt instanceof Bytes
+    ? salt
+    : salt && salt.length
+      ? compactAddLength(u8aToU8a(salt))
+      : EMPTY_SALT;
+}
 
 export class BlueprintSubmittableResult<ApiType extends ApiTypes> extends SubmittableResult {
   public readonly contract?: Contract<ApiType>;
@@ -28,22 +55,31 @@ export class BlueprintSubmittableResult<ApiType extends ApiTypes> extends Submit
   }
 }
 
-export default class Blueprint<ApiType extends ApiTypes> extends Base<ApiType> {
+export class Blueprint<ApiType extends ApiTypes> extends Base<ApiType> {
+  /**
+   * @description The on-chain code hash for this blueprint
+   */
   public readonly codeHash: Hash;
 
+  /**
+   * @deprecated
+   * @description Deprecated. Use `.tx.<constructorName>`. Creates a contract in a non-deterministic way.
+   */
+  public readonly createContract: ContractGeneric<BlueprintOptions, SubmittableExtrinsic<ApiType, BlueprintSubmittableResult<ApiType>>>;
+
   readonly #tx: MapConstructorExec<ApiType> = {};
 
   constructor (api: ApiBase<ApiType>, abi: AnyJson | Abi, codeHash: string | Hash | Uint8Array, decorateMethod: DecorateMethod<ApiType>) {
     super(api, abi, decorateMethod);
 
     this.codeHash = this.registry.createType('Hash', codeHash);
+    this.createContract = createWithId(this.#deploy);
 
     this.abi.constructors.forEach((c): void => {
       const messageName = stringCamelCase(c.identifier);
 
       if (isUndefined(this.#tx[messageName])) {
-        this.#tx[messageName] = (endowment: BigInt | string | number | BN, gasLimit: BigInt | string | number | BN, ...params: CodecArg[]) =>
-          this.#deploy(c, endowment, gasLimit, params);
+        this.#tx[messageName] = createTx((o, p) => this.#deploy(c, o, p));
       }
     });
   }
@@ -52,17 +88,20 @@ export default class Blueprint<ApiType extends ApiTypes> extends Base<ApiType> {
     return this.#tx;
   }
 
-  #deploy = (constructorOrId: AbiConstructor | string| number, endowment: BigInt | string | number | BN, gasLimit: BigInt | string | number | BN, params: CodecArg[]): SubmittableExtrinsic<ApiType, BlueprintSubmittableResult<ApiType>> => {
-    return this.api.tx.contracts
-      .instantiate(endowment, gasLimit, this.codeHash, encodeMessage(this.registry, this.abi.findConstructor(constructorOrId), params))
-      .withResultTransform((result: ISubmittableResult) =>
-        new BlueprintSubmittableResult(result, applyOnEvent(result, 'Instantiated', (record: EventRecord) =>
-          new Contract<ApiType>(this.api, this.abi, record.event.data[1] as AccountId, this._decorateMethod)
-        ))
-      );
-  }
+  #deploy = (constructorOrId: AbiConstructor | string| number, { gasLimit = 0, salt, value = 0 }: BlueprintOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType, BlueprintSubmittableResult<ApiType>> => {
+    const encodedSalt = encodeSalt(salt);
+    const withSalt = this.api.tx.contracts.instantiate.meta.args.length === 5;
+    const encoded = this.abi.findConstructor(constructorOrId).toU8a(params, withSalt ? EMPTY_SALT : encodedSalt);
+    const tx = withSalt
+      ? this.api.tx.contracts.instantiate(value, gasLimit, this.codeHash, encoded, encodedSalt)
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore old style with salt included
+      : this.api.tx.contracts.instantiate(value, gasLimit, this.codeHash, encoded);
 
-  public createContract (constructorOrId: AbiConstructor | string| number, endowment: BigInt | string | number | BN, gasLimit: BigInt | string | number | BN, ...params: CodecArg[]): SubmittableExtrinsic<ApiType, BlueprintSubmittableResult<ApiType>> {
-    return this.#deploy(constructorOrId, endowment, gasLimit, params);
+    return tx.withResultTransform((result: ISubmittableResult) =>
+      new BlueprintSubmittableResult(result, applyOnEvent(result, 'Instantiated', ([record]: EventRecord[]) =>
+        new Contract<ApiType>(this.api, this.abi, record.event.data[1] as AccountId, this._decorateMethod)
+      ))
+    );
   }
 }

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

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

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

@@ -1,19 +1,19 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiTypes, DecorateMethod } from '@polkadot/api/types';
-import { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
-import { EventRecord, Hash } from '@polkadot/types/interfaces';
-import { AnyJson, ISubmittableResult } from '@polkadot/types/types';
+import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
+import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
+import type { EventRecord, Hash } from '@polkadot/types/interfaces';
+import type { AnyJson, ISubmittableResult } from '@polkadot/types/types';
 
 import { SubmittableResult } from '@polkadot/api';
-import ApiBase from '@polkadot/api/base';
-import { compactAddLength, u8aToU8a } from '@polkadot/util';
+import { ApiBase } from '@polkadot/api/base';
+import { assert, compactAddLength, isWasm, u8aToU8a } from '@polkadot/util';
 
-import Abi from '../Abi';
+import { Abi } from '../Abi';
 import { applyOnEvent } from '../util';
-import Base from './Base';
-import Blueprint from './Blueprint';
+import { Base } from './Base';
+import { Blueprint } from './Blueprint';
 
 export class CodeSubmittableResult<ApiType extends ApiTypes> extends SubmittableResult {
   public readonly blueprint?: Blueprint<ApiType>;
@@ -25,20 +25,27 @@ export class CodeSubmittableResult<ApiType extends ApiTypes> extends Submittable
   }
 }
 
-export default class Code<ApiType extends ApiTypes> extends Base<ApiType> {
+export class Code<ApiType extends ApiTypes> extends Base<ApiType> {
   public readonly code: Uint8Array;
 
-  constructor (api: ApiBase<ApiType>, abi: AnyJson | Abi, wasm: Uint8Array | string | Buffer, decorateMethod: DecorateMethod<ApiType>) {
+  constructor (api: ApiBase<ApiType>, abi: AnyJson | Abi, wasm: Uint8Array | string | Buffer | null | undefined, decorateMethod: DecorateMethod<ApiType>) {
     super(api, abi, decorateMethod);
 
-    this.code = u8aToU8a(wasm);
+    this.code = isWasm(this.abi.project.source.wasm)
+      ? this.abi.project.source.wasm
+      : u8aToU8a(wasm);
+
+    assert(isWasm(this.code), 'No WASM code provided');
   }
 
+  /**
+   * @description Deploy the code bundle, creating a Blueprint.
+   */
   public createBlueprint (): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> {
     return this.api.tx.contracts
       .putCode(compactAddLength(this.code))
       .withResultTransform((result: ISubmittableResult) =>
-        new CodeSubmittableResult(result, applyOnEvent(result, 'CodeStored', (record: EventRecord) =>
+        new CodeSubmittableResult(result, applyOnEvent(result, 'CodeStored', ([record]: EventRecord[]) =>
           new Blueprint<ApiType>(this.api, this.abi, record.event.data[0] as Hash, this._decorateMethod)
         ))
       );

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

@@ -1,47 +1,126 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiTypes, DecorateMethod } from '@polkadot/api/types';
-import { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
-import { AccountId, ContractExecResult } from '@polkadot/types/interfaces';
-import { AnyJson, CodecArg } from '@polkadot/types/types';
-import { AbiMessage, ContractCallOutcome } from '../types';
-import { ContractCallResult, ContractRead, MapMessageExec, MapMessageRead } from './types';
+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, ContractExecResult, EventRecord, Weight } from '@polkadot/types/interfaces';
+import type { AnyJson, CodecArg, ISubmittableResult, Registry } from '@polkadot/types/types';
+import type { AbiMessage, ContractCallOutcome, ContractOptions, DecodedEvent } from '../types';
+import type { ContractCallResult, ContractCallSend, ContractGeneric, ContractQuery, ContractTx, MapMessageQuery, MapMessageTx } from './types';
 
 import BN from 'bn.js';
-import { map } from 'rxjs/operators';
-import ApiBase from '@polkadot/api/base';
-import { assert, bnToBn, isFunction, isUndefined, stringCamelCase } from '@polkadot/util';
 
-import Abi from '../Abi';
-import { encodeMessage, formatData } from '../util';
-import Base from './Base';
+import { SubmittableResult } from '@polkadot/api';
+import { ApiBase } from '@polkadot/api/base';
+import { assert, bnToBn, isFunction, isUndefined, logger, stringCamelCase } from '@polkadot/util';
+import { map } from '@polkadot/x-rxjs/operators';
 
+import { Abi } from '../Abi';
+import { applyOnEvent, extractOptions, formatData, isOptions } from '../util';
+import { Base } from './Base';
+
+// As per Rust, 5 * GAS_PER_SEC
+const MAX_CALL_GAS = new BN(5_000_000_000_000).subn(1);
 const ERROR_NO_CALL = 'Your node does not expose the contracts.call RPC. This is most probably due to a runtime configuration.';
+const l = logger('Contract');
 
-export default class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
+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> =>
+    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> =>
+    isOptions(options)
+      ? fn(options, params)
+      : fn(...extractOptions(options, params));
+}
+
+function createWithId <T> (fn: (messageOrId: AbiMessage | string | number, options: ContractOptions, params: CodecArg[]) => T): ContractGeneric<ContractOptions, T> {
+  return (messageOrId: AbiMessage | string | number, options: BigInt | string | number | BN | ContractOptions, ...params: CodecArg[]): T =>
+    isOptions(options)
+      ? fn(messageOrId, options, params)
+      : fn(messageOrId, ...extractOptions(options, params));
+}
+
+export class ContractSubmittableResult extends SubmittableResult {
+  public readonly contractEvents?: DecodedEvent[];
+
+  constructor (result: ISubmittableResult, contractEvents?: DecodedEvent[]) {
+    super(result);
+
+    this.contractEvents = contractEvents;
+  }
+}
+
+// map from a JSON result to current-style ContractExecResult
+function mapExecResult (registry: Registry, json: Record<string, AnyJson>): ContractExecResult {
+  if (!Object.keys(json).some((key) => ['error', 'success'].includes(key))) {
+    return registry.createType('ContractExecResult', json);
+  }
+
+  const from = registry.createType('ContractExecResultTo260', json);
+
+  if (from.isSuccess) {
+    const s = from.asSuccess;
+
+    return registry.createType('ContractExecResult', {
+      gasConsumed: s.gasConsumed,
+      result: {
+        ok: {
+          data: s.data,
+          flags: s.flags
+        }
+      }
+    });
+  }
+
+  // in the old format error has no additional information,
+  // map it as-is with an "unknown" error
+  return registry.createType('ContractExecResult', { result: { err: { other: 'unknown' } } });
+}
+
+export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
+  /**
+   * @description The on-chain address for this contract
+   */
   public readonly address: AccountId;
 
-  readonly #tx: MapMessageExec<ApiType> = {};
+  /**
+   * @deprecated
+   * @description Deprecated. Use `.tx.<messageName>` to send a transaction.
+   */
+  public readonly exec: ContractGeneric<ContractOptions, SubmittableExtrinsic<ApiType>>;
 
-  readonly #query: MapMessageRead<ApiType> = {};
+  /**
+   * @deprecated
+   * @description Deprecated. Use `.tx.<messageName>` to send a transaction.
+   */
+  public readonly read: ContractGeneric<ContractOptions, ContractCallSend<ApiType>>;
+
+  readonly #query: MapMessageQuery<ApiType> = {};
+
+  readonly #tx: MapMessageTx<ApiType> = {};
 
   constructor (api: ApiBase<ApiType>, abi: AnyJson | Abi, address: string | AccountId, decorateMethod: DecorateMethod<ApiType>) {
     super(api, abi, decorateMethod);
 
     this.address = this.registry.createType('AccountId', address);
+    this.exec = createWithId(this.#exec);
+    this.read = createWithId(this.#read);
 
     this.abi.messages.forEach((m): void => {
       const messageName = stringCamelCase(m.identifier);
 
       if (isUndefined(this.#tx[messageName])) {
-        this.#tx[messageName] = (value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, ...params: CodecArg[]) =>
-          this.#exec(m, value, gasLimit, params);
+        this.#tx[messageName] = createTx((o, p) => this.#exec(m, o, p));
       }
 
       if (isUndefined(this.#query[messageName])) {
-        this.#query[messageName] = (origin: string | AccountId | Uint8Array, value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, ...params: CodecArg[]) =>
-          this.#read(m, value, gasLimit, params).send(origin);
+        this.#query[messageName] = createQuery((f, o, p) => this.#read(m, o, p).send(f));
       }
     });
   }
@@ -50,59 +129,76 @@ export default class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
     return isFunction(this.api.rx.rpc.contracts?.call);
   }
 
-  public get query (): MapMessageRead<ApiType> {
+  public get query (): MapMessageQuery<ApiType> {
     assert(this.hasRpcContractsCall, ERROR_NO_CALL);
 
     return this.#query;
   }
 
-  public get tx (): MapMessageExec<ApiType> {
+  public get tx (): MapMessageTx<ApiType> {
     return this.#tx;
   }
 
-  #getGas = (_gasLimit: BigInt | BN | string | number): BN => {
+  #getGas = (_gasLimit: BigInt | BN | string | number, isCall = false): BN => {
     const gasLimit = bnToBn(_gasLimit);
 
     return gasLimit.lten(0)
-      ? this.api.consts.system.maximumBlockWeight.muln(64).divn(100)
+      ? isCall
+        ? MAX_CALL_GAS
+        : (this.api.consts.system.blockWeights
+          ? this.api.consts.system.blockWeights.maxBlock
+          : this.api.consts.system.maximumBlockWeight as Weight
+        ).muln(64).divn(100)
       : gasLimit;
   }
 
-  #exec = (messageOrId: AbiMessage | string | number, value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, params: CodecArg[]): SubmittableExtrinsic<ApiType> => {
-    return this.api.tx.contracts.call(this.address, value, this.#getGas(gasLimit), encodeMessage(this.registry, this.abi.findMessage(messageOrId), params));
+  #exec = (messageOrId: AbiMessage | string | number, { gasLimit = 0, value = 0 }: ContractOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType> => {
+    return this.api.tx.contracts
+      .call(this.address, value, this.#getGas(gasLimit), this.abi.findMessage(messageOrId).toU8a(params))
+      .withResultTransform((result: ISubmittableResult) =>
+        new ContractSubmittableResult(result, applyOnEvent(result, 'ContractExecution', (records: EventRecord[]) =>
+          records
+            .map(({ event: { data: [, data] } }): DecodedEvent | null => {
+              try {
+                return this.abi.decodeEvent(data as Bytes);
+              } catch (error) {
+                l.error(`Unable to decode contract event: ${(error as Error).message}`);
+
+                return null;
+              }
+            })
+            .filter((decoded): decoded is DecodedEvent => !!decoded)
+        ))
+      );
   }
 
-  #read = (messageOrId: AbiMessage | string | number, value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, params: CodecArg[]): ContractRead<ApiType> => {
+  #read = (messageOrId: AbiMessage | string | number, { gasLimit = 0, value = 0 }: ContractOptions, params: CodecArg[]): ContractCallSend<ApiType> => {
     assert(this.hasRpcContractsCall, ERROR_NO_CALL);
 
     const message = this.abi.findMessage(messageOrId);
 
     return {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      send: this._decorateMethod((origin: string | AccountId | Uint8Array): ContractCallResult<'rpc'> =>
-        this.api.rx.rpc.contracts.call({
+      send: this._decorateMethod((origin: string | AccountId | Uint8Array) =>
+        this.api.rx.rpc.contracts.call.json({
           dest: this.address,
-          gasLimit: this.#getGas(gasLimit),
-          inputData: encodeMessage(this.registry, message, params),
+          gasLimit: this.#getGas(gasLimit, true),
+          inputData: message.toU8a(params),
           origin,
           value
-        }).pipe(
-          map((result: ContractExecResult): ContractCallOutcome => ({
-            output: result.isSuccess && message.returnType
-              ? formatData(this.registry, result.asSuccess.data, message.returnType)
+        }).pipe(map((json): ContractCallOutcome => {
+          const { debugMessage, gasConsumed, result } = mapExecResult(this.registry, json.toJSON());
+
+          return {
+            debugMessage,
+            gasConsumed,
+            output: result.isOk && message.returnType
+              ? formatData(this.registry, result.asOk.data, message.returnType)
               : null,
             result
-          }))
-        )
+          };
+        }))
       )
     };
   }
-
-  public exec (messageOrId: AbiMessage | string | number, value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, ...params: CodecArg[]): SubmittableExtrinsic<ApiType> {
-    return this.#exec(messageOrId, value, gasLimit, params);
-  }
-
-  public read (messageOrId: AbiMessage | string | number, value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, ...params: CodecArg[]): ContractRead<ApiType> {
-    return this.#read(messageOrId, value, gasLimit, params);
-  }
 }

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

@@ -1,6 +1,6 @@
-// Copyright 2017-2020 @polkadot/api authors & contributors
+// Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export { default as Blueprint, BlueprintSubmittableResult } from './Blueprint';
-export { default as Code, CodeSubmittableResult } from './Code';
-export { default as Contract } from './Contract';
+export { Blueprint, BlueprintSubmittableResult } from './Blueprint';
+export { Code, CodeSubmittableResult } from './Code';
+export { Contract } from './Contract';

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

@@ -0,0 +1,20 @@
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { ApiBase } from '@polkadot/api/base';
+import { TypeRegistry } from '@polkadot/types';
+
+const registry = new TypeRegistry();
+
+export const mockApi = {
+  registry,
+  rx: {
+    tx: {
+      contracts: {
+        putCode: (): never => {
+          throw new Error('mock');
+        }
+      }
+    }
+  }
+} as unknown as ApiBase<'promise'>;

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

@@ -1,38 +1,50 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { SubmittableResult } from '@polkadot/api';
-import { ApiTypes, ObsInnerType } from '@polkadot/api/types';
-import { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
-import { AccountId } from '@polkadot/types/interfaces';
-import { CodecArg } from '@polkadot/types/types';
-import { ContractCallOutcome } from '../types';
+import type BN from 'bn.js';
+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 { Observable } from '@polkadot/x-rxjs';
+import type { AbiMessage, BlueprintOptions, ContractCallOutcome, ContractOptions } from '../types';
 
-import BN from 'bn.js';
-import { Observable } from 'rxjs';
-
-type ContractCallTypes = 'tx' | 'rpc';
-
-type ContractCallResultSubscription<ApiType extends ApiTypes, CallType extends ContractCallTypes> = ApiType extends 'rxjs'
-  ? Observable<ContractCallResult<CallType>>
-  : Promise<ObsInnerType<ContractCallResult<CallType>>>;
-
-export interface ContractRead<ApiType extends ApiTypes> {
-  send (account: string | AccountId | Uint8Array): ContractCallResultSubscription<ApiType, 'rpc'>;
+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>;
 }
 
-export type ContractCallResult<CallType extends ContractCallTypes> = CallType extends 'rpc'
-  ? Observable<ContractCallOutcome>
-  : Observable<SubmittableResult>;
+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>;
+}
+
+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>;
+}
+
+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;
+}
+
+export type ContractCallResult<ApiType extends ApiTypes, T> = ApiType extends 'rxjs'
+  ? Observable<Observable<T>>
+  : Promise<ObsInnerType<Observable<T>>>;
+
+export interface ContractCallSend<ApiType extends ApiTypes> {
+  send (account: string | AccountId | Uint8Array): ContractCallResult<ApiType, ContractCallOutcome>;
+}
 
 export interface MapConstructorExec<ApiType extends ApiTypes> {
-  [message: string]: (endowment: BigInt | string | number | BN, gasLimit: BigInt | string | number | BN, ...params: CodecArg[]) => SubmittableExtrinsic<ApiType>;
+  [message: string]: BlueprintDeploy<ApiType>;
 }
 
-export interface MapMessageExec<ApiType extends ApiTypes> {
-  [message: string]: (value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, ...params: CodecArg[]) => SubmittableExtrinsic<ApiType>;
+export interface MapMessageTx<ApiType extends ApiTypes> {
+  [message: string]: ContractTx<ApiType>;
 }
 
-export interface MapMessageRead<ApiType extends ApiTypes> {
-  [message: string]: (origin: AccountId | string | Uint8Array, value: BigInt | BN | string | number, gasLimit: BigInt | BN | string | number, ...params: CodecArg[]) => ContractCallResultSubscription<ApiType, 'rpc'>;
+export interface MapMessageQuery<ApiType extends ApiTypes> {
+  [message: string]: ContractQuery<ApiType>;
 }

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

@@ -0,0 +1,51 @@
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Simple non-runnable checks to test type definitions in the editor itself
+
+import { ApiPromise } from '@polkadot/api';
+import { createTestPairs, TestKeyringMap } from '@polkadot/keyring/testingPairs';
+
+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');
+
+  // new style
+  await blueprint.tx.new({ gasLimit: 456, salt: '0x1234', value: 123 }, 42).signAndSend(pairs.bob);
+  await blueprint.tx.new({ gasLimit: 456, value: 123 }, 42).signAndSend(pairs.bob);
+
+  // old style
+  await blueprint.tx.new(123, 456, 42).signAndSend(pairs.bob);
+}
+
+async function checkContract (api: ApiPromise, pairs: TestKeyringMap): Promise<void> {
+  const contract = new ContractPromise(api, abiIncrementer, '0x1234');
+
+  // queries
+  await contract.query.get(pairs.alice.address, {});
+  await contract.query.get(pairs.alice.address, 0, 0);
+
+  // execute
+  await contract.tx.inc({ gasLimit: 1234 }, 123).signAndSend(pairs.eve);
+  await contract.tx.inc(123, 456, 69).signAndSend(pairs.eve);
+
+  // deprecated
+  await contract.read('get', {}).send(pairs.eve.address);
+  await contract.exec('inc', {}, 123).signAndSend(pairs.dave);
+}
+
+async function main (): Promise<void> {
+  const api = await ApiPromise.create();
+  const pairs = createTestPairs();
+
+  // eslint-disable-next-line @typescript-eslint/no-floating-promises
+  Promise.all([
+    checkBlueprint(api, pairs),
+    checkContract(api, pairs)
+  ]);
+}
+
+// eslint-disable-next-line @typescript-eslint/unbound-method
+main().catch(console.error);

packages/api-contract/src/index.ts

@@ -1,7 +1,7 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export { default as Abi } from './Abi';
+export { Abi } from './Abi';
 
 export { Blueprint as BlueprintRx, Code as CodeRx, Contract as ContractRx } from './rx';
 export { Blueprint as BlueprintPromise, Code as CodePromise, Contract as ContractPromise } from './promise';

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

@@ -1,16 +1,16 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { Hash } from '@polkadot/types/interfaces';
-import { AnyJson } from '@polkadot/types/types';
+import type { Hash } from '@polkadot/types/interfaces';
+import type { AnyJson } from '@polkadot/types/types';
 
 import { ApiPromise } from '@polkadot/api';
 import { decorateMethod } from '@polkadot/api/promise';
 
-import Abi from '../Abi';
-import BaseBlueprint from '../base/Blueprint';
+import { Abi } from '../Abi';
+import { Blueprint as BaseBlueprint } from '../base';
 
-export default class Blueprint extends BaseBlueprint<'promise'> {
+export class Blueprint extends BaseBlueprint<'promise'> {
   constructor (api: ApiPromise, abi: AnyJson | Abi, codeHash: string | Hash) {
     super(api, abi, codeHash, decorateMethod);
   }

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

@@ -1,15 +1,16 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiPromise } from '@polkadot/api';
+import type { ApiPromise } from '@polkadot/api';
+import type { AnyJson } from '@polkadot/types/types';
+
 import { decorateMethod } from '@polkadot/api/promise';
-import { AnyJson } from '@polkadot/types/types';
 
-import Abi from '../Abi';
-import BaseCode from '../base/Code';
+import { Abi } from '../Abi';
+import { Code as BaseCode } from '../base';
 
-export default class Code extends BaseCode<'promise'> {
-  constructor (api: ApiPromise, abi: AnyJson | Abi, wasm: Uint8Array | string | Buffer) {
+export class Code extends BaseCode<'promise'> {
+  constructor (api: ApiPromise, abi: AnyJson | Abi, wasm: Uint8Array | string | Buffer | null | undefined) {
     super(api, abi, wasm, decorateMethod);
   }
 }

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

@@ -1,16 +1,16 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId } from '@polkadot/types/interfaces';
-import { AnyJson } from '@polkadot/types/types';
+import type { AccountId } from '@polkadot/types/interfaces';
+import type { AnyJson } from '@polkadot/types/types';
 
 import { ApiPromise } from '@polkadot/api';
 import { decorateMethod } from '@polkadot/api/promise';
 
-import Abi from '../Abi';
-import BaseContract from '../base/Contract';
+import { Abi } from '../Abi';
+import { Contract as BaseContract } from '../base';
 
-export default class Contract extends BaseContract<'promise'> {
+export class Contract extends BaseContract<'promise'> {
   constructor (api: ApiPromise, abi: AnyJson | Abi, address: string | AccountId) {
     super(api, abi, address, decorateMethod);
   }

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

@@ -1,6 +1,6 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export { default as Blueprint } from './Blueprint';
-export { default as Code } from './Code';
-export { default as Contract } from './Contract';
+export { Blueprint } from './Blueprint';
+export { Code } from './Code';
+export { Contract } from './Contract';

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

@@ -1,7 +1,7 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { BlueprintSubmittableResult as BaseBlueprintSubmittableResult, CodeSubmittableResult as BaseCodeSubmittableResult } from '../base';
+import type { BlueprintSubmittableResult as BaseBlueprintSubmittableResult, CodeSubmittableResult as BaseCodeSubmittableResult } from '../base';
 
 export type BlueprintSubmittableResult = BaseBlueprintSubmittableResult<'promise'>;
 export type CodeSubmittableResult = BaseCodeSubmittableResult<'promise'>;

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

@@ -1,16 +1,16 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { Hash } from '@polkadot/types/interfaces';
-import { AnyJson } from '@polkadot/types/types';
+import type { Hash } from '@polkadot/types/interfaces';
+import type { AnyJson } from '@polkadot/types/types';
 
 import { ApiRx } from '@polkadot/api';
 import { decorateMethod } from '@polkadot/api/rx';
 
-import Abi from '../Abi';
-import BaseBlueprint from '../base/Blueprint';
+import { Abi } from '../Abi';
+import { Blueprint as BaseBlueprint } from '../base';
 
-export default class Blueprint extends BaseBlueprint<'rxjs'> {
+export class Blueprint extends BaseBlueprint<'rxjs'> {
   constructor (api: ApiRx, abi: AnyJson | Abi, codeHash: string | Hash) {
     super(api, abi, codeHash, decorateMethod);
   }

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

@@ -1,16 +1,16 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AnyJson } from '@polkadot/types/types';
+import type { ApiRx } from '@polkadot/api';
+import type { AnyJson } from '@polkadot/types/types';
 
-import { ApiRx } from '@polkadot/api';
 import { decorateMethod } from '@polkadot/api/rx';
 
-import Abi from '../Abi';
-import BaseCode from '../base/Code';
+import { Abi } from '../Abi';
+import { Code as BaseCode } from '../base';
 
-export default class Code extends BaseCode<'rxjs'> {
-  constructor (api: ApiRx, abi: AnyJson | Abi, wasm: Uint8Array | string | Buffer) {
+export class Code extends BaseCode<'rxjs'> {
+  constructor (api: ApiRx, abi: AnyJson | Abi, wasm: Uint8Array | string | Buffer | null | undefined) {
     super(api, abi, wasm, decorateMethod);
   }
 }

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

@@ -1,16 +1,16 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId } from '@polkadot/types/interfaces';
-import { AnyJson } from '@polkadot/types/types';
+import type { AccountId } from '@polkadot/types/interfaces';
+import type { AnyJson } from '@polkadot/types/types';
 
 import { ApiRx } from '@polkadot/api';
 import { decorateMethod } from '@polkadot/api/rx';
 
-import Abi from '../Abi';
-import BaseContract from '../base/Contract';
+import { Abi } from '../Abi';
+import { Contract as BaseContract } from '../base';
 
-export default class Contract extends BaseContract<'rxjs'> {
+export class Contract extends BaseContract<'rxjs'> {
   constructor (api: ApiRx, abi: AnyJson | Abi, address: string | AccountId) {
     super(api, abi, address, decorateMethod);
   }

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

@@ -1,6 +1,6 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export { default as Blueprint } from './Blueprint';
-export { default as Code } from './Code';
-export { default as Contract } from './Contract';
+export { Blueprint } from './Blueprint';
+export { Code } from './Code';
+export { Contract } from './Contract';

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

@@ -1,7 +1,7 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { BlueprintSubmittableResult as BaseBlueprintSubmittableResult, CodeSubmittableResult as BaseCodeSubmittableResult } from '../base';
+import type { BlueprintSubmittableResult as BaseBlueprintSubmittableResult, CodeSubmittableResult as BaseCodeSubmittableResult } from '../base';
 
 export type BlueprintSubmittableResult = BaseBlueprintSubmittableResult<'promise'>;
 export type CodeSubmittableResult = BaseCodeSubmittableResult<'promise'>;

packages/api-contract/src/types.ts

@@ -1,12 +1,13 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiTypes } from '@polkadot/api/types';
-import { ContractExecResult, ContractSelector } from '@polkadot/types/interfaces';
-import { Codec, TypeDef } from '@polkadot/types/types';
-
-import ApiBase from '@polkadot/api/base';
-import Abi from './Abi';
+import type BN from 'bn.js';
+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 { Abi } from '.';
 
 export interface ContractBase<ApiType extends ApiTypes> {
   readonly abi: Abi;
@@ -16,14 +17,23 @@ export interface ContractBase<ApiType extends ApiTypes> {
   messages: AbiMessage[];
 }
 
-export interface AbiMessageParam {
+export interface AbiParam {
   name: string;
   type: TypeDef;
 }
 
-export interface AbiMessage {
-  args: AbiMessageParam[];
+export interface AbiEvent {
+  args: AbiParam[];
   docs: string[];
+  fromU8a: (data: Uint8Array) => DecodedEvent;
+  identifier: string;
+  index: number;
+}
+
+export interface AbiMessage {
+  args: AbiParam[];
+  docs: string[];
+  fromU8a: (data: Uint8Array) => DecodedMessage;
   identifier: string;
   index: number;
   isConstructor?: boolean;
@@ -31,6 +41,7 @@ export interface AbiMessage {
   isPayable?: boolean;
   returnType?: TypeDef | null;
   selector: ContractSelector;
+  toU8a: (params: CodecArg[], additional?: Uint8Array) => Uint8Array;
 }
 
 export type AbiConstructor = AbiMessage;
@@ -41,6 +52,29 @@ export interface InterfaceContractCalls {
 }
 
 export interface ContractCallOutcome {
+  debugMessage: Text;
+  gasConsumed: u64;
   output: Codec | null;
-  result: ContractExecResult;
+  result: ContractExecResultResult;
+}
+
+export interface DecodedEvent {
+  args: Codec[];
+  event: AbiEvent;
+}
+
+export interface DecodedMessage {
+  args: Codec[];
+  message: AbiMessage;
+}
+
+export interface BlueprintOptions {
+  gasLimit?: BigInt | string | number | BN;
+  salt?: Uint8Array | string | null;
+  value?: BigInt | string | number | BN;
+}
+
+export interface ContractOptions {
+  gasLimit?: BigInt | BN | string | number;
+  value?: BigInt | BN | string | number;
 }

packages/api-contract/src/util.ts

@@ -1,46 +1,43 @@
-// Copyright 2017-2020 @polkadot/rpc-core authors & contributors
+// Copyright 2017-2021 @polkadot/rpc-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { SubmittableResult } from '@polkadot/api';
-import { EventRecord } from '@polkadot/types/interfaces';
-import { Codec, CodecArg, Registry, TypeDef } from '@polkadot/types/types';
-import { AbiConstructor, AbiMessage } from './types';
+import type { SubmittableResult } from '@polkadot/api';
+import type { Raw } from '@polkadot/types';
+import type { EventRecord } from '@polkadot/types/interfaces';
+import type { Codec, CodecArg, Registry, TypeDef } from '@polkadot/types/types';
+import type { BlueprintOptions, ContractOptions } from './types';
 
-import { Raw, createClass, createTypeUnsafe, encodeTypeDef } from '@polkadot/types';
+import BN from 'bn.js';
 
-import { assert, compactAddLength } from '@polkadot/util';
+import { createTypeUnsafe } from '@polkadot/types/create';
+import { isBigInt, isBn, isNumber, isString } from '@polkadot/util';
+
+type ContractEvents = 'CodeStored' | 'ContractExecution' | 'Instantiated';
+
+type TOptions = BlueprintOptions | ContractOptions;
 
 export function formatData (registry: Registry, data: Raw, { type }: TypeDef): Codec {
-  return createTypeUnsafe(registry, type, [data], true);
+  return createTypeUnsafe(registry, type, [data], { isPedantic: true });
 }
 
-export function applyOnEvent <T> (result: SubmittableResult, type: 'CodeStored' | 'Instantiated', fn: (record: EventRecord) => T): T | undefined {
+export function applyOnEvent <T> (result: SubmittableResult, type: ContractEvents, fn: (records: EventRecord[]) => T): T | undefined {
   if (result.isInBlock || result.isFinalized) {
-    const record = result.findRecord('contracts', type);
+    const records = result.filterRecords('contracts', type);
 
-    if (record) {
-      return fn(record);
+    if (records.length) {
+      return fn(records);
     }
   }
 
   return undefined;
 }
 
-export function encodeMessage (registry: Registry, message: AbiMessage | AbiConstructor, params: CodecArg[]): Uint8Array {
-  assert(message, 'Attempted to call an invalid contract message');
-  assert(params.length === message.args.length, `Expected ${message.args.length} arguments to contract message '${message.identifier}', found ${params.length}`);
-
-  const Clazz = createClass(registry, JSON.stringify(
-    message.args.reduce((r: Record<string, any>, { name, type }): Record<string, any> => {
-      r[name] = type.displayName || encodeTypeDef(type);
-
-      return r;
-    }, { __selector: 'ContractSelector' })
-  ));
-
-  return compactAddLength(new Clazz(registry, message.args.reduce((r: Record<string, CodecArg>, { name }, index): Record<string, CodecArg> => {
-    r[name] = params[index];
-
-    return r;
-  }, { __selector: message.selector })).toU8a());
+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[]] {
+  const gasLimit = params.shift() as BN;
+
+  return [{ gasLimit, value } as T, params];
 }

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

@@ -0,0 +1,31 @@
+[
+  {
+    "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

@@ -29,15 +29,6 @@
   {
     "displayName": "Entry",
     "namespace": "ink_storage::collections::stash",
-    "params": [
-      {
-        "displayName": "Hash",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "Hash"
-      }
-    ],
-    "info": 3,
     "sub": [
       {
         "displayName": "VacantEntry",
@@ -66,6 +57,7 @@
         "name": "Occupied"
       }
     ],
+    "info": 3,
     "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"Hash\"}}"
   },
   {
@@ -108,15 +100,6 @@
   {
     "displayName": "ValueEntry",
     "namespace": "ink_storage::collections::hashmap",
-    "params": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "info": 9,
     "sub": [
       {
         "displayName": "AccountId",
@@ -131,6 +114,7 @@
         "name": "key_index"
       }
     ],
+    "info": 9,
     "type": "{\"value\":\"AccountId\",\"key_index\":\"u32\"}"
   },
   {
@@ -141,38 +125,6 @@
   },
   {
     "displayName": "Result",
-    "params": [
-      {
-        "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\"] }"
-      }
-    ],
-    "info": 7,
     "sub": [
       {
         "name": "Ok",
@@ -203,9 +155,10 @@
             "type": "Null"
           }
         ],
-        "type": "{ _enum: [\"NameAlreadyExists\", \"CallerIsNotOwner\"] }"
+        "type": "{\"_enum\":[\"NameAlreadyExists\",\"CallerIsNotOwner\"]}"
       }
     ],
+    "info": 7,
     "type": "Result<(), Error>"
   },
   {
@@ -235,25 +188,17 @@
         "type": "Null"
       }
     ],
-    "type": "{ _enum: [\"NameAlreadyExists\", \"CallerIsNotOwner\"] }"
+    "type": "{\"_enum\":[\"NameAlreadyExists\",\"CallerIsNotOwner\"]}"
   },
   {
     "displayName": "Option",
-    "params": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "info": 5,
     "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

@@ -33,15 +33,6 @@
   {
     "displayName": "Entry",
     "namespace": "ink_storage::collections::stash",
-    "params": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "info": 3,
     "sub": [
       {
         "displayName": "VacantEntry",
@@ -70,6 +61,7 @@
         "name": "Occupied"
       }
     ],
+    "info": 3,
     "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"AccountId\"}}"
   },
   {
@@ -112,13 +104,6 @@
   {
     "displayName": "ValueEntry",
     "namespace": "ink_storage::collections::hashmap",
-    "params": [
-      {
-        "info": 6,
-        "type": "u128"
-      }
-    ],
-    "info": 9,
     "sub": [
       {
         "info": 6,
@@ -131,32 +116,12 @@
         "name": "key_index"
       }
     ],
+    "info": 9,
     "type": "{\"value\":\"u128\",\"key_index\":\"u32\"}"
   },
   {
     "displayName": "Entry",
     "namespace": "ink_storage::collections::stash",
-    "params": [
-      {
-        "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": 3,
     "sub": [
       {
         "displayName": "VacantEntry",
@@ -197,6 +162,7 @@
         "name": "Occupied"
       }
     ],
+    "info": 3,
     "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(AccountId, AccountId)\"}}"
   },
   {
@@ -223,21 +189,13 @@
   },
   {
     "displayName": "Option",
-    "params": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "info": 5,
     "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

@@ -29,13 +29,6 @@
   {
     "displayName": "Entry",
     "namespace": "ink_storage::collections::stash",
-    "params": [
-      {
-        "info": 6,
-        "type": "u32"
-      }
-    ],
-    "info": 3,
     "sub": [
       {
         "displayName": "VacantEntry",
@@ -62,6 +55,7 @@
         "name": "Occupied"
       }
     ],
+    "info": 3,
     "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"u32\"}}"
   },
   {
@@ -85,15 +79,6 @@
   {
     "displayName": "ValueEntry",
     "namespace": "ink_storage::collections::hashmap",
-    "params": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "info": 9,
     "sub": [
       {
         "displayName": "AccountId",
@@ -108,6 +93,7 @@
         "name": "key_index"
       }
     ],
+    "info": 9,
     "type": "{\"value\":\"AccountId\",\"key_index\":\"u32\"}"
   },
   {
@@ -132,15 +118,6 @@
   {
     "displayName": "Entry",
     "namespace": "ink_storage::collections::stash",
-    "params": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "info": 3,
     "sub": [
       {
         "displayName": "VacantEntry",
@@ -169,18 +146,12 @@
         "name": "Occupied"
       }
     ],
+    "info": 3,
     "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"AccountId\"}}"
   },
   {
     "displayName": "ValueEntry",
     "namespace": "ink_storage::collections::hashmap",
-    "params": [
-      {
-        "info": 6,
-        "type": "u32"
-      }
-    ],
-    "info": 9,
     "sub": [
       {
         "info": 6,
@@ -193,32 +164,12 @@
         "name": "key_index"
       }
     ],
+    "info": 9,
     "type": "{\"value\":\"u32\",\"key_index\":\"u32\"}"
   },
   {
     "displayName": "Entry",
     "namespace": "ink_storage::collections::stash",
-    "params": [
-      {
-        "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": 3,
     "sub": [
       {
         "displayName": "VacantEntry",
@@ -259,6 +210,7 @@
         "name": "Occupied"
       }
     ],
+    "info": 3,
     "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(AccountId, AccountId)\"}}"
   },
   {
@@ -282,13 +234,6 @@
   {
     "displayName": "ValueEntry",
     "namespace": "ink_storage::collections::hashmap",
-    "params": [
-      {
-        "info": 6,
-        "type": "bool"
-      }
-    ],
-    "info": 9,
     "sub": [
       {
         "info": 6,
@@ -301,6 +246,7 @@
         "name": "key_index"
       }
     ],
+    "info": 9,
     "type": "{\"value\":\"bool\",\"key_index\":\"u32\"}"
   },
   {
@@ -309,105 +255,17 @@
   },
   {
     "displayName": "Option",
-    "params": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "info": 5,
     "sub": {
       "displayName": "AccountId",
       "namespace": "ink_env::types",
       "info": 6,
       "type": "AccountId"
     },
+    "info": 5,
     "type": "Option<AccountId>"
   },
   {
     "displayName": "Result",
-    "params": [
-      {
-        "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\"] }"
-      }
-    ],
-    "info": 7,
     "sub": [
       {
         "name": "Ok",
@@ -486,9 +344,10 @@
             "type": "Null"
           }
         ],
-        "type": "{ _enum: [\"NotOwner\", \"NotApproved\", \"TokenExists\", \"TokenNotFound\", \"CannotInsert\", \"CannotRemove\", \"CannotFetchValue\", \"NotAllowed\"] }"
+        "type": "{\"_enum\":[\"NotOwner\",\"NotApproved\",\"TokenExists\",\"TokenNotFound\",\"CannotInsert\",\"CannotRemove\",\"CannotFetchValue\",\"NotAllowed\"]}"
       }
     ],
+    "info": 7,
     "type": "Result<(), Error>"
   },
   {
@@ -566,6 +425,6 @@
         "type": "Null"
       }
     ],
-    "type": "{ _enum: [\"NotOwner\", \"NotApproved\", \"TokenExists\", \"TokenNotFound\", \"CannotInsert\", \"CannotRemove\", \"CannotFetchValue\", \"NotAllowed\"] }"
+    "type": "{\"_enum\":[\"NotOwner\",\"NotApproved\",\"TokenExists\",\"TokenNotFound\",\"CannotInsert\",\"CannotRemove\",\"CannotFetchValue\",\"NotAllowed\"]}"
   }
 ]

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

@@ -29,25 +29,6 @@
   {
     "displayName": "Entry",
     "namespace": "ink_storage::collections::stash",
-    "params": [
-      {
-        "info": 10,
-        "sub": [
-          {
-            "info": 6,
-            "type": "u32"
-          },
-          {
-            "displayName": "AccountId",
-            "namespace": "ink_env::types",
-            "info": 6,
-            "type": "AccountId"
-          }
-        ],
-        "type": "(u32, AccountId)"
-      }
-    ],
-    "info": 3,
     "sub": [
       {
         "displayName": "VacantEntry",
@@ -86,6 +67,7 @@
         "name": "Occupied"
       }
     ],
+    "info": 3,
     "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(u32, AccountId)\"}}"
   },
   {
@@ -144,14 +126,6 @@
   {
     "displayName": "ValueEntry",
     "namespace": "ink_storage::collections::hashmap",
-    "params": [
-      {
-        "info": 10,
-        "sub": [],
-        "type": "()"
-      }
-    ],
-    "info": 9,
     "sub": [
       {
         "info": 10,
@@ -165,6 +139,7 @@
         "name": "key_index"
       }
     ],
+    "info": 9,
     "type": "{\"value\":\"()\",\"key_index\":\"u32\"}"
   },
   {
@@ -175,13 +150,6 @@
   {
     "displayName": "Entry",
     "namespace": "ink_storage::collections::stash",
-    "params": [
-      {
-        "info": 6,
-        "type": "u32"
-      }
-    ],
-    "info": 3,
     "sub": [
       {
         "displayName": "VacantEntry",
@@ -208,18 +176,12 @@
         "name": "Occupied"
       }
     ],
+    "info": 3,
     "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"u32\"}}"
   },
   {
     "displayName": "ValueEntry",
     "namespace": "ink_storage::collections::hashmap",
-    "params": [
-      {
-        "info": 6,
-        "type": "u32"
-      }
-    ],
-    "info": 9,
     "sub": [
       {
         "info": 6,
@@ -232,58 +194,12 @@
         "name": "key_index"
       }
     ],
+    "info": 9,
     "type": "{\"value\":\"u32\",\"key_index\":\"u32\"}"
   },
   {
     "displayName": "Entry",
     "namespace": "ink_storage::collections::stash",
-    "params": [
-      {
-        "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": 3,
     "sub": [
       {
         "displayName": "VacantEntry",
@@ -350,6 +266,7 @@
         "name": "Occupied"
       }
     ],
+    "info": 3,
     "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"Transaction\"}}"
   },
   {
@@ -424,15 +341,6 @@
   {
     "displayName": "Entry",
     "namespace": "ink_storage::collections::stash",
-    "params": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "info": 3,
     "sub": [
       {
         "displayName": "VacantEntry",
@@ -461,6 +369,7 @@
         "name": "Occupied"
       }
     ],
+    "info": 3,
     "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"AccountId\"}}"
   },
   {
@@ -523,19 +432,6 @@
   },
   {
     "displayName": "Result",
-    "params": [
-      {
-        "info": 10,
-        "sub": [],
-        "type": "()"
-      },
-      {
-        "info": 10,
-        "sub": [],
-        "type": "()"
-      }
-    ],
-    "info": 7,
     "sub": [
       {
         "name": "Ok",
@@ -550,26 +446,11 @@
         "type": "()"
       }
     ],
+    "info": 7,
     "type": "Result<(), ()>"
   },
   {
     "displayName": "Result",
-    "params": [
-      {
-        "info": 11,
-        "sub": {
-          "info": 6,
-          "type": "u8"
-        },
-        "type": "Vec<u8>"
-      },
-      {
-        "info": 10,
-        "sub": [],
-        "type": "()"
-      }
-    ],
-    "info": 7,
     "sub": [
       {
         "name": "Ok",
@@ -587,56 +468,15 @@
         "type": "()"
       }
     ],
+    "info": 7,
     "type": "Result<Vec<u8>, ()>"
   },
   {
     "displayName": "Result",
-    "params": [
-      {
-        "displayName": "Option",
-        "params": [
-          {
-            "info": 11,
-            "sub": {
-              "info": 6,
-              "type": "u8"
-            },
-            "type": "Vec<u8>"
-          }
-        ],
-        "info": 5,
-        "sub": {
-          "info": 11,
-          "sub": {
-            "info": 6,
-            "type": "u8"
-          },
-          "type": "Vec<u8>"
-        },
-        "type": "Option<Vec<u8>>"
-      },
-      {
-        "info": 10,
-        "sub": [],
-        "type": "()"
-      }
-    ],
-    "info": 7,
     "sub": [
       {
         "name": "Ok",
         "displayName": "Option",
-        "params": [
-          {
-            "info": 11,
-            "sub": {
-              "info": 6,
-              "type": "u8"
-            },
-            "type": "Vec<u8>"
-          }
-        ],
-        "info": 5,
         "sub": {
           "info": 11,
           "sub": {
@@ -645,6 +485,7 @@
           },
           "type": "Vec<u8>"
         },
+        "info": 5,
         "type": "Option<Vec<u8>>"
       },
       {
@@ -654,21 +495,11 @@
         "type": "()"
       }
     ],
+    "info": 7,
     "type": "Result<Option<Vec<u8>>, ()>"
   },
   {
     "displayName": "Option",
-    "params": [
-      {
-        "info": 11,
-        "sub": {
-          "info": 6,
-          "type": "u8"
-        },
-        "type": "Vec<u8>"
-      }
-    ],
-    "info": 5,
     "sub": {
       "info": 11,
       "sub": {
@@ -677,6 +508,7 @@
       },
       "type": "Vec<u8>"
     },
+    "info": 5,
     "type": "Option<Vec<u8>>"
   }
-]
+]

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

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

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

@@ -0,0 +1,28 @@
+[
+  {
+    "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

@@ -0,0 +1,422 @@
+[
+  {
+    "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_withString.test.json

@@ -33,15 +33,6 @@
   {
     "displayName": "Entry",
     "namespace": "ink_storage::collections::stash",
-    "params": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "info": 3,
     "sub": [
       {
         "displayName": "VacantEntry",
@@ -70,6 +61,7 @@
         "name": "Occupied"
       }
     ],
+    "info": 3,
     "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"AccountId\"}}"
   },
   {
@@ -112,13 +104,6 @@
   {
     "displayName": "ValueEntry",
     "namespace": "ink_storage::collections::hashmap",
-    "params": [
-      {
-        "info": 6,
-        "type": "u128"
-      }
-    ],
-    "info": 9,
     "sub": [
       {
         "info": 6,
@@ -131,32 +116,12 @@
         "name": "key_index"
       }
     ],
+    "info": 9,
     "type": "{\"value\":\"u128\",\"key_index\":\"u32\"}"
   },
   {
     "displayName": "Entry",
     "namespace": "ink_storage::collections::stash",
-    "params": [
-      {
-        "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": 3,
     "sub": [
       {
         "displayName": "VacantEntry",
@@ -197,6 +162,7 @@
         "name": "Occupied"
       }
     ],
+    "info": 3,
     "type": "{\"_enum\":{\"Vacant\":\"VacantEntry\",\"Occupied\":\"(AccountId, AccountId)\"}}"
   },
   {
@@ -227,21 +193,13 @@
   },
   {
     "displayName": "Option",
-    "params": [
-      {
-        "displayName": "AccountId",
-        "namespace": "ink_env::types",
-        "info": 6,
-        "type": "AccountId"
-      }
-    ],
-    "info": 5,
     "sub": {
       "displayName": "AccountId",
       "namespace": "ink_env::types",
       "info": 6,
       "type": "AccountId"
     },
+    "info": 5,
     "type": "Option<AccountId>"
   }
-]
+]

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

@@ -1,10 +1,21 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// 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 incrementer } from './incrementer.json';
-export { default as multisigPlain } from './multisig_plain.json';
+import * as ink from './ink';
+import * as solang from './solang';
+import * as user from './user';
+
+const all: Record<string, any> = {};
+
+function addExport (type: string, abis: Record<string, any>): void {
+  Object.keys(abis).forEach((key): void => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    all[`${type}_${key}`] = abis[key];
+  });
+}
+
+addExport('ink', ink);
+addExport('solang', solang);
+addExport('user', user);
+
+export default all;

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

@@ -0,0 +1,107 @@
+{
+  "metadataVersion": "0.1.0",
+  "source": {
+    "hash": "0x98086d5ccadd437459b812682380250f51a3034272cd1108e499acc0cafe9f42",
+    "language": "ink! 3.0.0-rc2",
+    "compiler": "rustc 1.49.0-nightly",
+    "wasm": "0x0061736d01000000012c0860027f7f0060037f7f7f0060017f017f60017f006000017f60037f7f7f017f60047f7f7f7f0060017f017e02880106057365616c30107365616c5f6765745f73746f726167650005057365616c30107365616c5f7365745f73746f726167650001057365616c30167365616c5f76616c75655f7472616e736665727265640000057365616c300a7365616c5f696e7075740000057365616c300b7365616c5f72657475726e000103656e76066d656d6f72790201021003121102020002000100070303060402040503010608017f01418080040b071102066465706c6f7900100463616c6c00120a8e1111c90101017f230041406a22012400200141206a200041186a290300370300200141186a200041106a290300370300200141106a200041086a2903003703002001420037032820012000290300370308200141086a1006200141808001360234200141a4800436023020014180800136023841a48004200141386a10002100200141306a20012802381007024002400240024020000e0401000002000b000b20012001290330370338200141386a100841ff017122004102470d01000b000b200141406b240020004100470b6001037e200029032021012000420137032020002001200029030022027c22013703002000200029030822032001200254ad7c22013703082000200029031022022001200354ad7c2201370310200020002903182001200254ad7c37031820000b4901037f230041106b22022400200028020421032000410036020420002802002104200041a48004360200200241086a200120042003100f20002002290308370200200241106a24000b4201027f230041106b22012400200141086a2000100b20012d0009210020012d00082102200141106a240041024101410220004101461b410020001b20024101711b0b8f0101017f230041406a22022400200241206a200141186a290300370300200241186a200141106a290300370300200241106a200141086a2903003703002002420037032820022001290300370308200241086a1006200241386a41808001360200200241a48004360234200241003602302002200241306a2000100a200228020020022802041001200241406b24000b9d0101037f230041106b22032400200141086a220428020021052004410036020020012802042104200141a48004360204200320023a000f2003410120042005100f024020032802044101460440200328020020032d000f3a000020014100360208200141a480043602042005450d0120012005417f6a3602082001200441016a3602042000410136020420002004360200200341106a24000f0b000b000b4801027f230041106b22022400200241003a000f024020012002410f6a4101101345044020022d000f21010c010b410121030b200020013a0001200020033a0000200241106a24000b890101027f230041106b22012400200142003c000c200142003e0208027f0340200241044604402001280208210241000c020b20012000100b20012d0000410171450440200141086a20026a20012d00013a00002001200241016a22023a000c0c010b0b200241ff01710440200141003a000c0b4100210241010b200141106a2400ad2002ad420886840b2201017f230041106b220124002001200036020c2001410c6a2802002d0000100e000b4601017f230041206b22012400200141186a41808001360200200141a4800436021420014100360210200141086a200141106a2000100a41002001280208200128020c1004000b2300410020014d0440200320014f044020002001360204200020023602000f0b000b000b15004100101141ff0171410274418080046a2802000bd80502057f017e230041306b220124000240027f024002402000044020014180800136020c200141a48004360208200141086a10142001200129030837031041012103200141106a100c2206a722054101710440410121020c030b200642ffffffffff1f832206422088a721002006421888a721042006421088a72102200541087641ff01712205411e470440200541c00147200041f3014772200241ff017141960147720d0241002102200441ff017141a501460d030c020b200041d60047200241ff017141dc0047720d014100210241002103200441ff017141a401470d010c020b20014180800136020c200141a48004360208200141086a101420012001290308370310410321020240200141106a100c2206a722044101710d00200642ffffffffff1f832206422088a721002006421888a721032006421088a7210202400240200441087641ff0171220441ea00470440200441d101472000412b4772200241ff017141830147720d02200341ff017141d100460d010c020b200041e20147200241ff0171413747720d0141022102200341ff01714112470d010c020b41032102200141106a100841ff017122004102460d01200041004721020c010b410321020b4106200241034622030d021a4106200220031b22024102460440200141286a4200370300200141206a4200370300200141186a4200370300200142003703104100200141106a100941080c030b200141286a4200370300200141206a4200370300200141186a4200370300200142003703102002410171200141106a100941080c020b41012102410121030b410620020d001a2003450d01200141286a4200370300200141206a4200370300200141186a420037030020014200370310200141106a1005410173200141106a100941080b200141306a24000f0b200141286a4200370300200141206a4200370300200141186a4200370300200142003703102001200141106a10053a0008200141086a100d000ba90102027f027e230041206b22002400200041808001360204200041a4800436020020004180800136021041a48004200041106a100220002000280210100720002000290300370308200041186a2201420037030020004200370310027f4101200041086a200041106a411010130d001a200129030021022000290310210341000b200220038450457245044041011011200041206a240041ff0171410274418080046a2802000f0b000b45000240200028020420024f047f2001200028020020021015200028020422012002490d012000200120026b3602042000200028020020026a36020041000541010b0f0b000b3301017f230041106b220124002001200028020436020c20002802002001410c6a10032000200128020c1007200141106a24000b2c01017f037f2002200346047f200005200020036a200120036a2d00003a0000200341016a21030c010b0b1a0b0b250100418080040b1d0100000002000000030000000400000005000000060000000700000008"
+  },
+  "contract": {
+    "name": "flipper",
+    "version": "3.0.0-rc2",
+    "authors": [
+      "Parity Technologies <admin@parity.io>"
+    ]
+  },
+  "spec": {
+    "constructors": [
+      {
+        "args": [
+          {
+            "name": "init_value",
+            "type": {
+              "displayName": [
+                "bool"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          " Creates a new flipper smart contract initialized with the given value."
+        ],
+        "name": [
+          "new"
+        ],
+        "selector": "0xd183512b"
+      },
+      {
+        "args": [],
+        "docs": [
+          " Creates a new flipper smart contract initialized to `false`."
+        ],
+        "name": [
+          "default"
+        ],
+        "selector": "0x6a3712e2"
+      }
+    ],
+    "docs": [],
+    "events": [],
+    "messages": [
+      {
+        "args": [],
+        "docs": [
+          " Flips the current value of the Flipper's bool."
+        ],
+        "mutates": true,
+        "name": [
+          "flip"
+        ],
+        "payable": false,
+        "returnType": null,
+        "selector": "0xc096a5f3"
+      },
+      {
+        "args": [],
+        "docs": [
+          " Returns the current value of the Flipper's bool."
+        ],
+        "mutates": false,
+        "name": [
+          "get"
+        ],
+        "payable": false,
+        "returnType": {
+          "displayName": [
+            "bool"
+          ],
+          "type": 1
+        },
+        "selector": "0x1e5ca456"
+      }
+    ]
+  },
+  "storage": {
+    "struct": {
+      "fields": [
+        {
+          "layout": {
+            "cell": {
+              "key": "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "ty": 1
+            }
+          },
+          "name": "value"
+        }
+      ]
+    }
+  },
+  "types": [
+    {
+      "def": {
+        "primitive": "bool"
+      }
+    }
+  ]
+}

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

@@ -0,0 +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 incrementer } from './incrementer.json';
+export { default as multisigPlain } from './multisig_plain.json';

packages/api-contract/test/contracts/solang/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/solang/ints256.json

@@ -0,0 +1,113 @@
+{
+  "contract": {
+    "authors": [
+      "Sean Young <sean@mess.org>"
+    ],
+    "description": "Test 256 bits types",
+    "name": "ints256",
+    "version": "0.0.1"
+  },
+  "metadataVersion": "0.1.0",
+  "source": {
+    "compiler": "solang 0.1.4",
+    "hash": "0xa85fb5c61a09d71dce84c15a8bd87e6f4eafac498a1aec3869e8cf7ea4389697",
+    "language": "Solidity 0.1.4"
+  },
+  "spec": {
+    "constructors": [
+      {
+        "args": [],
+        "docs": [
+          ""
+        ],
+        "name": "new",
+        "selector": "0x861731d5"
+      }
+    ],
+    "events": [],
+    "messages": [
+      {
+        "args": [
+          {
+            "name": "a",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          },
+          {
+            "name": "b",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          "Multiply two 256 bit values\n\n"
+        ],
+        "mutates": false,
+        "name": "multiply",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "u256"
+          ],
+          "type": 1
+        },
+        "selector": "0x165c4a16"
+      },
+      {
+        "args": [
+          {
+            "name": "a",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          },
+          {
+            "name": "b",
+            "type": {
+              "display_name": [
+                "u256"
+              ],
+              "type": 1
+            }
+          }
+        ],
+        "docs": [
+          "Add two 256 bit values\n\n"
+        ],
+        "mutates": false,
+        "name": "add",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "u256"
+          ],
+          "type": 1
+        },
+        "selector": "0x771602f7"
+      }
+    ]
+  },
+  "storage": {
+    "struct": {
+      "fields": []
+    }
+  },
+  "types": [
+    {
+      "def": {
+        "primitive": "u256"
+      }
+    }
+  ]
+}

packages/api-contract/test/contracts/solang/ints256.sol

@@ -0,0 +1,13 @@
+/// @title Test 256 bits types
+/// @author Sean Young <sean@mess.org>
+contract ints256 {
+	/// Multiply two 256 bit values
+	function multiply(uint256 a, uint256 b) public pure returns (uint256) {
+		return a * b;
+	}
+
+	/// Add two 256 bit values
+	function add(uint256 a, uint256 b) public pure returns (uint256) {
+		return a + b;
+	}
+}

packages/api-contract/test/contracts/user/assetTransfer.json

@@ -0,0 +1,299 @@
+{
+  "contract": {
+    "authors": [
+      "unknown"
+    ],
+    "name": "AssetTransfer",
+    "version": "0.0.1"
+  },
+  "metadataVersion": "0.1.0",
+  "source": {
+    "compiler": "solang 0.1.4",
+    "hash": "0x7d163f445bec3d33e90d0f60bda40acd42f2760dbc1b731616af70a6001e05c7",
+    "language": "Solidity 0.1.4"
+  },
+  "spec": {
+    "constructors": [
+      {
+        "args": [],
+        "docs": [
+          ""
+        ],
+        "name": "new",
+        "selector": "0x861731d5"
+      }
+    ],
+    "events": [
+      {
+        "args": [
+          {
+            "indexed": false,
+            "name": "_newUser",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 4
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "name": "successfulRegistration"
+      },
+      {
+        "args": [
+          {
+            "indexed": false,
+            "name": "sender",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 4
+            }
+          },
+          {
+            "indexed": false,
+            "name": "_hexAsset",
+            "type": {
+              "display_name": [
+                "String"
+              ],
+              "type": 5
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "name": "addedAsset"
+      },
+      {
+        "args": [
+          {
+            "indexed": false,
+            "name": "sender",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 4
+            }
+          },
+          {
+            "indexed": false,
+            "name": "receiver",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 4
+            }
+          },
+          {
+            "indexed": false,
+            "name": "hexOfAsset",
+            "type": {
+              "display_name": [
+                "String"
+              ],
+              "type": 5
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "name": "assetSent"
+      }
+    ],
+    "messages": [
+      {
+        "args": [
+          {
+            "name": "_user",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 4
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": false,
+        "name": "viewBalance",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "u256"
+          ],
+          "type": 1
+        },
+        "selector": "0xc1a13d1a"
+      },
+      {
+        "args": [
+          {
+            "name": "_assetHex",
+            "type": {
+              "display_name": [
+                "String"
+              ],
+              "type": 5
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": false,
+        "name": "findOwner",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "AccountId"
+          ],
+          "type": 4
+        },
+        "selector": "0x63560a8e"
+      },
+      {
+        "args": [
+          {
+            "name": "_hexAsset",
+            "type": {
+              "display_name": [
+                "String"
+              ],
+              "type": 5
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": true,
+        "name": "addAsset",
+        "payable": false,
+        "return_type": null,
+        "selector": "0xa7c6b52e"
+      },
+      {
+        "args": [],
+        "docs": [
+          ""
+        ],
+        "mutates": true,
+        "name": "receiveAsset",
+        "payable": false,
+        "return_type": {
+          "display_name": [
+            "String"
+          ],
+          "type": 5
+        },
+        "selector": "0xb2f3b5bc"
+      },
+      {
+        "args": [
+          {
+            "name": "_assetHex",
+            "type": {
+              "display_name": [
+                "String"
+              ],
+              "type": 5
+            }
+          },
+          {
+            "name": "_receiver",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 4
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": true,
+        "name": "sendAsset",
+        "payable": false,
+        "return_type": null,
+        "selector": "0xd6e5288f"
+      },
+      {
+        "args": [
+          {
+            "name": "_newUser",
+            "type": {
+              "display_name": [
+                "AccountId"
+              ],
+              "type": 4
+            }
+          }
+        ],
+        "docs": [
+          ""
+        ],
+        "mutates": true,
+        "name": "register",
+        "payable": false,
+        "return_type": null,
+        "selector": "0x4420e486"
+      }
+    ]
+  },
+  "storage": {
+    "struct": {
+      "fields": []
+    }
+  },
+  "types": [
+    {
+      "def": {
+        "primitive": "u256"
+      }
+    },
+    {
+      "def": {
+        "primitive": "u8"
+      }
+    },
+    {
+      "def": {
+        "array": {
+          "len": 32,
+          "type": 2
+        }
+      }
+    },
+    {
+      "def": {
+        "composite": {
+          "fields": [
+            {
+              "type": 3
+            }
+          ]
+        }
+      },
+      "path": [
+        "AccountId"
+      ]
+    },
+    {
+      "def": {
+        "primitive": "str"
+      }
+    }
+  ]
+}

packages/api-contract/test/contracts/user/enumExample.json

@@ -0,0 +1,528 @@
+{
+  "metadataVersion": "0.1.0",
+  "source": {
+    "hash": "0x1a37c380fe02fe3b670480dff1393b0401788955315d092e39fcc06047f1413c",
+    "language": "ink! 3.0.0-rc2",
+    "compiler": "rustc 1.49.0-nightly"
+  },
+  "contract": {
+    "name": "enum_example",
+    "version": "0.1.0",
+    "authors": [
+      "[your_name] <[your_email]>"
+    ]
+  },
+  "spec": {
+    "constructors": [
+      {
+        "args": [],
+        "docs": [],
+        "name": [
+          "new"
+        ],
+        "selector": "0xd183512b"
+      }
+    ],
+    "docs": [],
+    "events": [],
+    "messages": [
+      {
+        "args": [
+          {
+            "name": "variant",
+            "type": {
+              "displayName": [
+                "Variant"
+              ],
+              "type": 4
+            }
+          }
+        ],
+        "docs": [],
+        "mutates": true,
+        "name": [
+          "set_variant"
+        ],
+        "payable": false,
+        "returnType": null,
+        "selector": "0x4fa6b9cf"
+      },
+      {
+        "args": [],
+        "docs": [],
+        "mutates": false,
+        "name": [
+          "get_variant"
+        ],
+        "payable": false,
+        "returnType": {
+          "displayName": [
+            "Variant"
+          ],
+          "type": 4
+        },
+        "selector": "0x1d5962d1"
+      }
+    ]
+  },
+  "storage": {
+    "struct": {
+      "fields": [
+        {
+          "layout": {
+            "enum": {
+              "dispatchKey": "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "variants": {
+                "0": {
+                  "fields": []
+                },
+                "1": {
+                  "fields": [
+                    {
+                      "layout": {
+                        "enum": {
+                          "dispatchKey": "0x0100000000000000000000000000000000000000000000000000000000000000",
+                          "variants": {
+                            "0": {
+                              "fields": []
+                            },
+                            "1": {
+                              "fields": []
+                            },
+                            "2": {
+                              "fields": []
+                            },
+                            "3": {
+                              "fields": []
+                            },
+                            "4": {
+                              "fields": []
+                            },
+                            "5": {
+                              "fields": []
+                            },
+                            "6": {
+                              "fields": []
+                            }
+                          }
+                        }
+                      },
+                      "name": null
+                    }
+                  ]
+                },
+                "2": {
+                  "fields": [
+                    {
+                      "layout": {
+                        "enum": {
+                          "dispatchKey": "0x0100000000000000000000000000000000000000000000000000000000000000",
+                          "variants": {
+                            "0": {
+                              "fields": [
+                                {
+                                  "layout": {
+                                    "cell": {
+                                      "key": "0x0200000000000000000000000000000000000000000000000000000000000000",
+                                      "ty": 1
+                                    }
+                                  },
+                                  "name": null
+                                }
+                              ]
+                            },
+                            "1": {
+                              "fields": [
+                                {
+                                  "layout": {
+                                    "cell": {
+                                      "key": "0x0200000000000000000000000000000000000000000000000000000000000000",
+                                      "ty": 2
+                                    }
+                                  },
+                                  "name": null
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      },
+                      "name": null
+                    }
+                  ]
+                },
+                "3": {
+                  "fields": [
+                    {
+                      "layout": {
+                        "enum": {
+                          "dispatchKey": "0x0100000000000000000000000000000000000000000000000000000000000000",
+                          "variants": {
+                            "0": {
+                              "fields": [
+                                {
+                                  "layout": {
+                                    "cell": {
+                                      "key": "0x0200000000000000000000000000000000000000000000000000000000000000",
+                                      "ty": 1
+                                    }
+                                  },
+                                  "name": "value"
+                                }
+                              ]
+                            },
+                            "1": {
+                              "fields": [
+                                {
+                                  "layout": {
+                                    "cell": {
+                                      "key": "0x0200000000000000000000000000000000000000000000000000000000000000",
+                                      "ty": 2
+                                    }
+                                  },
+                                  "name": "value"
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      },
+                      "name": null
+                    }
+                  ]
+                },
+                "4": {
+                  "fields": [
+                    {
+                      "layout": {
+                        "enum": {
+                          "dispatchKey": "0x0100000000000000000000000000000000000000000000000000000000000000",
+                          "variants": {
+                            "0": {
+                              "fields": []
+                            },
+                            "1": {
+                              "fields": []
+                            },
+                            "2": {
+                              "fields": []
+                            },
+                            "3": {
+                              "fields": []
+                            },
+                            "4": {
+                              "fields": [
+                                {
+                                  "layout": {
+                                    "cell": {
+                                      "key": "0x0200000000000000000000000000000000000000000000000000000000000000",
+                                      "ty": 3
+                                    }
+                                  },
+                                  "name": "r"
+                                },
+                                {
+                                  "layout": {
+                                    "cell": {
+                                      "key": "0x0300000000000000000000000000000000000000000000000000000000000000",
+                                      "ty": 3
+                                    }
+                                  },
+                                  "name": "g"
+                                },
+                                {
+                                  "layout": {
+                                    "cell": {
+                                      "key": "0x0400000000000000000000000000000000000000000000000000000000000000",
+                                      "ty": 3
+                                    }
+                                  },
+                                  "name": "b"
+                                }
+                              ]
+                            },
+                            "5": {
+                              "fields": [
+                                {
+                                  "layout": {
+                                    "cell": {
+                                      "key": "0x0200000000000000000000000000000000000000000000000000000000000000",
+                                      "ty": 3
+                                    }
+                                  },
+                                  "name": "r"
+                                },
+                                {
+                                  "layout": {
+                                    "cell": {
+                                      "key": "0x0300000000000000000000000000000000000000000000000000000000000000",
+                                      "ty": 3
+                                    }
+                                  },
+                                  "name": "g"
+                                },
+                                {
+                                  "layout": {
+                                    "cell": {
+                                      "key": "0x0400000000000000000000000000000000000000000000000000000000000000",
+                                      "ty": 3
+                                    }
+                                  },
+                                  "name": "b"
+                                },
+                                {
+                                  "layout": {
+                                    "cell": {
+                                      "key": "0x0500000000000000000000000000000000000000000000000000000000000000",
+                                      "ty": 3
+                                    }
+                                  },
+                                  "name": "a"
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      },
+                      "name": null
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "name": "last"
+        }
+      ]
+    }
+  },
+  "types": [
+    {
+      "def": {
+        "primitive": "i32"
+      }
+    },
+    {
+      "def": {
+        "primitive": "u32"
+      }
+    },
+    {
+      "def": {
+        "primitive": "u8"
+      }
+    },
+    {
+      "def": {
+        "variant": {
+          "variants": [
+            {
+              "name": "None"
+            },
+            {
+              "fields": [
+                {
+                  "type": 5
+                }
+              ],
+              "name": "Weekday"
+            },
+            {
+              "fields": [
+                {
+                  "type": 6
+                }
+              ],
+              "name": "TupleMaybeSigned"
+            },
+            {
+              "fields": [
+                {
+                  "type": 7
+                }
+              ],
+              "name": "NamedMaybeSigned"
+            },
+            {
+              "fields": [
+                {
+                  "type": 8
+                }
+              ],
+              "name": "Color"
+            }
+          ]
+        }
+      },
+      "path": [
+        "enum_example",
+        "enum_example",
+        "Variant"
+      ]
+    },
+    {
+      "def": {
+        "variant": {
+          "variants": [
+            {
+              "discriminant": 0,
+              "name": "Monday"
+            },
+            {
+              "discriminant": 1,
+              "name": "Tuesday"
+            },
+            {
+              "discriminant": 2,
+              "name": "Wednesday"
+            },
+            {
+              "discriminant": 3,
+              "name": "Thursday"
+            },
+            {
+              "discriminant": 4,
+              "name": "Friday"
+            },
+            {
+              "discriminant": 5,
+              "name": "Saturday"
+            },
+            {
+              "discriminant": 6,
+              "name": "Sunday"
+            }
+          ]
+        }
+      },
+      "path": [
+        "enum_example",
+        "enum_example",
+        "Weekday"
+      ]
+    },
+    {
+      "def": {
+        "variant": {
+          "variants": [
+            {
+              "fields": [
+                {
+                  "type": 1
+                }
+              ],
+              "name": "Signed"
+            },
+            {
+              "fields": [
+                {
+                  "type": 2
+                }
+              ],
+              "name": "Unsigned"
+            }
+          ]
+        }
+      },
+      "path": [
+        "enum_example",
+        "enum_example",
+        "TupleMaybeSigned"
+      ]
+    },
+    {
+      "def": {
+        "variant": {
+          "variants": [
+            {
+              "fields": [
+                {
+                  "name": "value",
+                  "type": 1
+                }
+              ],
+              "name": "Signed"
+            },
+            {
+              "fields": [
+                {
+                  "name": "value",
+                  "type": 2
+                }
+              ],
+              "name": "Unsigned"
+            }
+          ]
+        }
+      },
+      "path": [
+        "enum_example",
+        "enum_example",
+        "NamedMaybeSigned"
+      ]
+    },
+    {
+      "def": {
+        "variant": {
+          "variants": [
+            {
+              "name": "Red"
+            },
+            {
+              "name": "Blue"
+            },
+            {
+              "name": "Green"
+            },
+            {
+              "name": "Yellow"
+            },
+            {
+              "fields": [
+                {
+                  "name": "r",
+                  "type": 3
+                },
+                {
+                  "name": "g",
+                  "type": 3
+                },
+                {
+                  "name": "b",
+                  "type": 3
+                }
+              ],
+              "name": "Rgb"
+            },
+            {
+              "fields": [
+                {
+                  "name": "r",
+                  "type": 3
+                },
+                {
+                  "name": "g",
+                  "type": 3
+                },
+                {
+                  "name": "b",
+                  "type": 3
+                },
+                {
+                  "name": "a",
+                  "type": 3
+                }
+              ],
+              "name": "Rgba"
+            }
+          ]
+        }
+      },
+      "path": [
+        "enum_example",
+        "enum_example",
+        "Color"
+      ]
+    }
+  ]
+}

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

@@ -1,4 +1,6 @@
-// Copyright 2017-2020 @polkadot/api-contract authors & contributors
+// 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';

packages/api-derive/package.json

@@ -1,44 +1,28 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "2.3.1",
+  "version": "3.7.2",
   "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
   "main": "index.js",
-  "keywords": [
-    "Polkadot",
-    "Promise",
-    "RxJs"
-  ],
+  "sideEffects": false,
   "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [
-    "Jaco Greeff <jacogr@gmail.com>"
-  ],
+  "maintainers": [],
   "contributors": [],
   "license": "Apache-2.0",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/polkadot-js/api.git"
-  },
-  "bugs": {
-    "url": "https://github.com/polkadot-js/api/issues"
-  },
+  "repository": "github:polkadot-js/api",
+  "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.12.1",
-    "@polkadot/api": "2.3.1",
-    "@polkadot/rpc-core": "2.3.1",
-    "@polkadot/rpc-provider": "2.3.1",
-    "@polkadot/types": "2.3.1",
-    "@polkadot/util": "^3.6.1",
-    "@polkadot/util-crypto": "^3.6.1",
-    "bn.js": "^5.1.3",
-    "memoizee": "^0.4.14",
-    "rxjs": "^6.6.3"
+    "@babel/runtime": "^7.12.5",
+    "@polkadot/api": "3.7.2",
+    "@polkadot/rpc-core": "3.7.2",
+    "@polkadot/types": "3.7.2",
+    "@polkadot/util": "^5.5.1",
+    "@polkadot/util-crypto": "^5.5.1",
+    "@polkadot/x-rxjs": "^5.5.1",
+    "bn.js": "^4.11.9"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^3.6.1"
+    "@polkadot/keyring": "^5.5.1",
+    "@polkadot/rpc-provider": "3.7.2"
   }
 }

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

@@ -1,13 +1,14 @@
-// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
+import type { Observable } from '@polkadot/x-rxjs';
 
-import { Observable, of } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { isU8a, assert } from '@polkadot/util';
+import { assertReturn, isU8a } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
+import { of } from '@polkadot/x-rxjs';
+import { map } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
@@ -16,18 +17,14 @@ function retrieve (api: ApiInterfaceRx, address: Address | AccountId | AccountIn
     ? address
     : decodeAddress((address || '').toString());
 
-  if (decoded.length === 32) {
+  if (decoded.length > 8) {
     return of(api.registry.createType('AccountId', decoded));
   }
 
   const accountIndex = api.registry.createType('AccountIndex', decoded);
 
   return api.derive.accounts.indexToId(accountIndex.toString()).pipe(
-    map((accountId) => {
-      assert(accountId, 'Unable to retrieve accountId');
-
-      return accountId;
-    })
+    map((accountId) => assertReturn(accountId, 'Unable to retrieve accountId'))
   );
 }
 

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

@@ -1,14 +1,15 @@
-// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, Address, Balance } from '@polkadot/types/interfaces';
-import { ITuple } from '@polkadot/types/types';
-import { DeriveAccountFlags } from '../types';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { Vec } from '@polkadot/types';
+import type { AccountId, Address, Balance } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
+import type { Observable } from '@polkadot/x-rxjs';
+import type { DeriveAccountFlags } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { Vec } from '@polkadot/types';
+import { combineLatest, of } from '@polkadot/x-rxjs';
+import { map } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
@@ -20,9 +21,17 @@ type FlagsIntermediate = [
   AccountId | undefined
 ];
 
-function isIncludedFn (accountId: AccountId | Address | string): (_: AccountId | Address |string) => boolean {
-  return function (id: AccountId | Address | string): boolean {
-    return id.toString() === accountId.toString();
+function parseFlags (address: AccountId | Address | string | null | undefined, [electionsMembers, councilMembers, technicalCommitteeMembers, societyMembers, sudoKey]: FlagsIntermediate): DeriveAccountFlags {
+  const isIncluded = (id: AccountId | Address | string) =>
+    address
+      ? id.toString() === address.toString()
+      : false;
+
+  return {
+    isCouncil: (electionsMembers?.map(([id]: ITuple<[AccountId, Balance]>) => id) || councilMembers || []).some(isIncluded),
+    isSociety: (societyMembers || []).some(isIncluded),
+    isSudo: sudoKey?.toString() === address?.toString(),
+    isTechCommittee: (technicalCommitteeMembers || []).some(isIncluded)
   };
 }
 
@@ -34,35 +43,24 @@ export function flags (instanceId: string, api: ApiInterfaceRx): (address?: Acco
   return memo(instanceId, (address?: AccountId | Address | string | null): Observable<DeriveAccountFlags> => {
     const councilSection = api.query.electionsPhragmen ? 'electionsPhragmen' : 'elections';
 
-    return (
-      combineLatest([
-        address && api.query[councilSection]?.members
-          ? api.query[councilSection].members()
-          : of(undefined),
-        address && api.query.council?.members
-          ? api.query.council.members()
-          : of([]),
-        address && api.query.technicalCommittee?.members
-          ? api.query.technicalCommittee.members()
-          : of([]),
-        address && api.query.society?.members
-          ? api.query.society.members()
-          : of([]),
-        address && api.query.sudo?.key
-          ? api.query.sudo.key()
-          : of(undefined)
-      ]) as Observable<FlagsIntermediate>
-    ).pipe(
-      map(([electionsMembers, councilMembers, technicalCommitteeMembers, societyMembers, sudoKey]): DeriveAccountFlags => {
-        const isIncluded = address ? isIncludedFn(address) : (): boolean => false;
-
-        return {
-          isCouncil: (electionsMembers?.map(([id]: ITuple<[AccountId, Balance]>) => id) || councilMembers || []).some(isIncluded),
-          isSociety: (societyMembers || []).some(isIncluded),
-          isSudo: sudoKey?.toString() === address?.toString(),
-          isTechCommittee: (technicalCommitteeMembers || []).some(isIncluded)
-        };
-      })
+    return combineLatest<FlagsIntermediate>([
+      address && api.query[councilSection]?.members
+        ? api.query[councilSection].members()
+        : of(undefined),
+      address && api.query.council?.members
+        ? api.query.council.members()
+        : of([]),
+      address && api.query.technicalCommittee?.members
+        ? api.query.technicalCommittee.members()
+        : of([]),
+      address && api.query.society?.members
+        ? api.query.society.members()
+        : of([]),
+      address && api.query.sudo?.key
+        ? api.query.sudo.key()
+        : of(undefined)
+    ]).pipe(
+      map((result) => parseFlags(address, result))
     );
   });
 }

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

@@ -1,25 +1,26 @@
-// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
-import { AccountIdAndIndex } from '../types';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
+import type { Observable } from '@polkadot/x-rxjs';
+import type { AccountIdAndIndex } from '../types';
 
-import { Observable, of } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
 import { isU8a } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
+import { of } from '@polkadot/x-rxjs';
+import { map } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
-function retrieve (api: ApiInterfaceRx, address: Address | AccountId | AccountIndex | string | null | undefined): Observable<AccountIdAndIndex> {
+function retrieve (api: ApiInterfaceRx, address: Address | AccountId | AccountIndex | Uint8Array | string | null | undefined): Observable<AccountIdAndIndex> {
   try {
     // yes, this can fail, don't care too much, catch will catch it
     const decoded = isU8a(address)
       ? address
       : decodeAddress((address || '').toString());
 
-    if (decoded.length === 32) {
+    if (decoded.length > 8) {
       const accountId = api.registry.createType('AccountId', decoded);
 
       return api.derive.accounts.idToIndex(accountId).pipe(
@@ -39,7 +40,7 @@ function retrieve (api: ApiInterfaceRx, address: Address | AccountId | AccountIn
 
 /**
  * @name idAndIndex
- * @param {(Address | AccountId | AccountIndex | string | null)} address - An accounts address in various formats.
+ * @param {(Address | AccountId | AccountIndex | Uint8Array | string | null)} address - An accounts address in various formats.
  * @description  An array containing the [[AccountId]] and [[AccountIndex]] as optional values.
  * @example
  * <BR>
@@ -50,7 +51,7 @@ function retrieve (api: ApiInterfaceRx, address: Address | AccountId | AccountIn
  * });
  * ```
  */
-export function idAndIndex (instanceId: string, api: ApiInterfaceRx): (address?: Address | AccountId | AccountIndex | string | null) => Observable<AccountIdAndIndex> {
-  return memo(instanceId, (address?: Address | AccountId | AccountIndex | string | null): Observable<AccountIdAndIndex> =>
+export function idAndIndex (instanceId: string, api: ApiInterfaceRx): (address?: Address | AccountId | AccountIndex | Uint8Array | string | null) => Observable<AccountIdAndIndex> {
+  return memo(instanceId, (address?: Address | AccountId | AccountIndex | Uint8Array | string | null): Observable<AccountIdAndIndex> =>
     retrieve(api, address));
 }

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

@@ -1,12 +1,12 @@
-// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountId, AccountIndex } from '@polkadot/types/interfaces';
-import { AccountIndexes } from '../types';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { AccountId, AccountIndex } from '@polkadot/types/interfaces';
+import type { Observable } from '@polkadot/x-rxjs';
+import type { AccountIndexes } from '../types';
 
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
+import { map } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 

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

@@ -0,0 +1,141 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+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 { ITuple } from '@polkadot/types/types';
+import type { Observable } from '@polkadot/x-rxjs';
+import type { DeriveAccountRegistration, DeriveHasIdentity } from '../types';
+
+import { isHex, u8aToString } from '@polkadot/util';
+import { combineLatest, of } from '@polkadot/x-rxjs';
+import { map, switchMap } from '@polkadot/x-rxjs/operators';
+
+import { memo } from '../util';
+
+const UNDEF_HEX = { toHex: () => undefined };
+
+function dataAsString (data: Data): string | undefined {
+  return data.isRaw
+    ? u8aToString(data.asRaw.toU8a(true))
+    : data.isNone
+      ? undefined
+      : data.toHex();
+}
+
+function extractOther (additional: IdentityInfoAdditional[]): Record<string, string> {
+  return additional.reduce((other: Record<string, string>, [_key, _value]): Record<string, string> => {
+    const key = dataAsString(_key);
+    const value = dataAsString(_value);
+
+    if (key && value) {
+      other[key] = value;
+    }
+
+    return other;
+  }, {});
+}
+
+function extractIdentity (identityOfOpt?: Option<Registration>, superOf?: [AccountId, Data]): DeriveAccountRegistration {
+  if (!identityOfOpt?.isSome) {
+    return { judgements: [] };
+  }
+
+  const { info, judgements } = identityOfOpt.unwrap();
+  const topDisplay = dataAsString(info.display);
+
+  return {
+    display: (superOf && dataAsString(superOf[1])) || topDisplay,
+    displayParent: superOf && topDisplay,
+    email: dataAsString(info.email),
+    image: dataAsString(info.image),
+    judgements,
+    legal: dataAsString(info.legal),
+    other: extractOther(info.additional),
+    parent: superOf && superOf[0],
+    pgp: info.pgpFingerprint.unwrapOr(UNDEF_HEX).toHex(),
+    riot: dataAsString(info.riot),
+    twitter: dataAsString(info.twitter),
+    web: dataAsString(info.web)
+  };
+}
+
+function getParent (api: ApiInterfaceRx, identityOfOpt: Option<Registration> | undefined, superOfOpt: Option<ITuple<[AccountId, Data]>> | undefined): Observable<[Option<Registration> | undefined, [AccountId, Data] | undefined]> {
+  if (identityOfOpt?.isSome) {
+    // this identity has something set
+    return of([identityOfOpt, undefined]);
+  } else if (superOfOpt?.isSome) {
+    const superOf = superOfOpt.unwrap();
+
+    // we have a super
+    return combineLatest([
+      api.query.identity.identityOf<Option<Registration>>(superOf[0]),
+      of(superOf)
+    ]);
+  }
+
+  // nothing of value returned
+  return of([undefined, undefined]);
+}
+
+function getBase (api: ApiInterfaceRx, accountId?: AccountId | Uint8Array | string): Observable<[Option<Registration> | undefined, Option<ITuple<[AccountId, Data]>> | undefined]> {
+  return accountId && api.query.identity?.identityOf
+    ? api.queryMulti<[Option<Registration>, Option<ITuple<[AccountId, Data]>>]>([
+      [api.query.identity.identityOf, accountId],
+      [api.query.identity.superOf, accountId]
+    ])
+    : of([undefined, undefined]);
+}
+
+/**
+ * @name identity
+ * @description Returns identity info for an account
+ */
+export function identity (instanceId: string, api: ApiInterfaceRx): (accountId?: AccountId | Uint8Array | string) => Observable<DeriveAccountRegistration> {
+  return memo(instanceId, (accountId?: AccountId | Uint8Array | string): Observable<DeriveAccountRegistration> =>
+    getBase(api, accountId).pipe(
+      switchMap(([identityOfOpt, superOfOpt]) => getParent(api, identityOfOpt, superOfOpt)),
+      map(([identityOfOpt, superOf]) => extractIdentity(identityOfOpt, superOf))
+    )
+  );
+}
+
+export function hasIdentity (instanceId: string, api: ApiInterfaceRx): (accountId: AccountId | Uint8Array | string) => Observable<DeriveHasIdentity> {
+  return memo(instanceId, (accountId: AccountId | Uint8Array | string): Observable<DeriveHasIdentity> =>
+    api.derive.accounts.hasIdentityMulti([accountId]).pipe(
+      map(([first]) => first)
+    )
+  );
+}
+
+export function hasIdentityMulti (instanceId: string, api: ApiInterfaceRx): (accountIds: (AccountId | Uint8Array | string)[]) => Observable<DeriveHasIdentity[]> {
+  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)
+      ]).pipe(
+        map(([identities, supers]) =>
+          identities.map((identityOfOpt, index): DeriveHasIdentity => {
+            const superOfOpt = supers[index];
+            const parentId = superOfOpt && superOfOpt.isSome
+              ? superOfOpt.unwrap()[0].toString()
+              : undefined;
+            let display: string | undefined;
+
+            if (identityOfOpt && identityOfOpt.isSome) {
+              const value = dataAsString(identityOfOpt.unwrap().info.display);
+
+              if (value && !isHex(value)) {
+                display = value;
+              }
+            }
+
+            return { display, hasIdentity: !!(display || parentId), parentId };
+          })
+        )
+      )
+      : of(accountIds.map(() => ({ hasIdentity: false })))
+  );
+}