[CI Skip] release/stable 7.5.1

skip-checks: true

.123trigger

@@ -1,11 +1,14 @@
-32
+39
+
 1.4.2
 1.6.2
 1.11.2
 1.12.2
 1.17.2
 1.31.2
+
 2.8.2
+
 3.2.2
 3.2.3
 3.3.2
@@ -17,6 +20,7 @@
 3.9.2
 3.9.3
 3.10.2
+
 4.0.2
 4.0.3
 4.6.2
@@ -27,4 +31,20 @@
 
 5.3.2
 5.5.2
-5.8.2
+5.8.2
+5.8.3
+
+6.0.2
+6.0.3
+6.0.4
+6.0.5
+6.1.2
+
+6.4.2
+6.5.2
+6.7.2
+6.9.2
+6.10.2
+6.10.3
+
+7.0.2

.codeclimate.yml

@@ -1,3 +1,17 @@
+checks:
+  argument-count:
+    config:
+      threshold: 5
+  method-complexity:
+    config:
+      threshold: 7
+  method-count:
+    config:
+      threshold: 25
+  method-lines:
+    config:
+      threshold: 30
+
 exclude_patterns:
 - "**/*.spec.js"
 - "**/*.spec.ts"
@@ -5,7 +19,8 @@ exclude_patterns:
 - "**/*.test.ts"
 - "docs/**/*.js"
 - "docs/**/*.ts"
-- "packages/api/src/augment/"
+- "packages/*-augment/"
+- "packages/*-augment-*/"
 - "packages/typegen/scripts"
 - "packages/typegen/src"
 - "packages/types/src/interfaces/"

.eslintrc.js

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

.github/workflows/lock.yml

@@ -2,7 +2,7 @@ name: 'Lock Threads'
 
 on:
   schedule:
-    - cron: '30 1/2 * * *'
+    - cron: '10 1/3 * * *'
 
 jobs:
   lock:

.github/workflows/push-master.yml

@@ -15,6 +15,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
       with:
+        fetch-depth: 0
         token: ${{ secrets.GH_PAT }}
     - name: ${{ matrix.step }}
       env:

.github/workflows/stale.yml

@@ -1,7 +1,7 @@
 name: 'Close stale issues and PRs'
 on:
   schedule:
-    - cron: '30 2/2 * * *'
+    - cron: '55 1/3 * * *'
 
 jobs:
   stale:

.gitignore

@@ -21,6 +21,7 @@ tmp/
 cc-test-reporter
 lerna-debug.log*
 npm-debug.log*
+package-lock.json
+tsconfig*buildinfo
 yarn-debug.log*
 yarn-error.log*
-package-lock.json

.mailmap

@@ -0,0 +1,3 @@
+Jaco <jacogr@gmail.com>
+github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> <action@github.com>
+github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Github Actions <action@github.com>

.prettierrc.cjs

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

.yarnrc.yml

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

CHANGELOG.md

@@ -1,7 +1,476 @@
 # CHANGELOG
 
+## 7.5.1 Jan 23, 2022
+
+Upgrade priority: Low. Recommended for users of the latest contract pallet and ink! versions.
+
+Contributed:
+
+- Add additional namespaced contract tests (Thanks to https://github.com/VargSupercolony)
+
+Changes:
+
+- Adjust `Registry` consistency, augment extensions
+- Add `.multi` support on `api.at(...).<section>.<method>`
+- Add support for ink! metadata V3 with payable constructors
+- Cleanup ink! metadata parsing, allowing for easier extension
+- Expose `contract.{query, tx}.<method>.meta`, aligning with API
+- Fix storage metadata, aligning method with decorated name
+- Adjust typegen, only using exportInterface
+- Added Kusama/Polkadot 9151 upgrade block (known types)
+- Update to latest Substrate, Kusama & Polkadot static metadata
+
+
+## 7.4.1 Jan 15, 2022
+
+Upgrade priority: Medium. Required for all chains using `Range` and `RangeInclusive` types. Also includes better error handling for number conversions.
+
+Changes:
+
+- Asserts for invalid number format inputs (MAX_SAFE_INTEGER, float)
+- Ensure `Range/RangeInclusive` variant check does not fail on encoding
+- Ensure non-option calls in api-contract are marked as `@deprecated`
+- Added Kusama 9150 upgrade block (known types)
+- Update `@polkadot/util` to 8.3.2
+
+
+## 7.3.1 Jan 9, 2022
+
+Upgrade priority: Low. Maintenance upgrade, tracking the latest `@polkadot` libraries.
+
+Changes:
+
+- Extend support for `WrapperKeepOpaque` with internal decoding (allowed to fail)
+- Adjust max-entries in historic provider LRU
+- Update to latest Substrate/Polkadot/Kusama metadata
+- Update `@polkadot/util` to 8.3.1
+- Update package paths under ESM
+
+
+## 7.2.1 Jan 3, 2022
+
+Upgrade priority: Low. Recommended for users generating TS chain-specific augmentations.
+
+Changes:
+
+- Convert contract `ReturnFlags` to set (as opposed to bare `u32`)
+- Adjust chain-specific augmentation to not auto-add RPC imports
+- Ensure package path is availble under ESM & CJS
+
+
+## 7.1.1 Dec 26, 2021
+
+Upgrade priority: Low. Recommended for users of contracts form Substrate master & Polkador/Kusama TS app developers where specific chain augmentation would be helpful.
+
+Contributed:
+
+- Expose `storageDepositLimit` on contract options (Thanks to https://github.com/kwingram25)
+
+Changes:
+
+- Expose `@polkadot/api-augment/{kusama, polkadot, substrate}` for specific augmentations (The bare `@polkadot/api-augment` is equivalent to `/substrate`, keeping the existing behavior)
+- Expose `@polkadot/types-augment/{lookup, registry}` variants (The bare `@polkadot/types-augment` applies both)
+- Expose `txHash` on submittable results, e.g. `tx.signAndSend(..., ({ txHash }) => ...)`
+- Align casing for TS & exposed queries (adjusts for `ALLCAPS` entries)
+- Additional tests for `Option` codec (explicit in expectations)
+- Update to latest Substrate, Kusama & Polkadot static metadata
+
+
+## 7.0.2 Dec 21, 2021
+
+Upgrade priority: Low. Recommended for applications where collective derives with aliasses are being used.
+
+Changes:
+
+- Fix alias module mapping in collective derives
+- Update `dispathchQueue` derive to align with latest Substrate
+- Update to latest Substrate metadata
+
+
+## 7.0.1 Dec 20, 2021
+
+Upgrade priority: Low. Recommended for TS users with their own non-Polkadot/Kusama chains.
+
+- **Breaking changes** For TS users the default API augmentation is now optional. This means that the API, for TypeScript, is not decorated by default with the Substrate types and encpoints. TS users should add a singular `import '@polkadot/api-augment';` in their code to restore old behavior. A full writeup of the rationale and other options can be found [in the FAQ](https://polkadot.js.org/docs/api/FAQ#since-upgrading-to-the-7x-series-typescript-augmentation-is-missing)
+
+- **Breaking change** To cater for the above, chain-specific interfaces generated with older versions may not be compatible with the current version of the API. Additionally, TS interfaces generated with this version of the API is not compatible with older API versions.
+
+Contributed:
+
+- Add contracts storage deposit support (Thanks to https://github.com/statictype)
+- Do not throw error on socket closes (Thanks to https://github.com/xcaptain)
+
+Changes:
+
+- Split `@polkadot/types-{codec, create}` packages from `types`
+- Extract `@polkadot/{api, rpc, types}-augment` (now optional, TS-user applied)
+- Rework build steps to use TS project references
+- Add Polkadot 9140 upgrade block
+- Update to latest Substrate, Kusama & Polkadot static metadata
+
+
+## 6.12.1 Dec 13, 2021
+
+Upgrade priority: Low. Recommended for users of contracts on the current Substrate master version and TS users who generate metadata v14 interfaces.
+
+Changes:
+
+- Add support for contracts V2 ABI metadata
+- `CheckNonZeroSender` signed extension support
+- Remove old-style capabilities detection (unneeded with metadata v14+)
+- Generated TS Enum interfaces now expose the `type` (with allowed values)
+- Split local & package imports in generated TS interfaces
+- Add Kusama 9130 upgrade block
+- Internal maintainability cleanups
+
+
+## 6.11.1 Dec 5, 2021
+
+Upgrade priority: Low. Maintenance upgrade, tracking the latest `@polkadot` libraries.
+
+Changes:
+
+- Align `state_traceBlock` RPC with Substrate
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 6.10.3 Nov 30, 2021
+
+Upgrade priority: Medium. Recommended for 6.10.x users
+
+Changes:
+
+- Fix ss58Prefix extraction
+
+
+## 6.10.2 Nov 30, 2021
+
+Upgrade priority: Low. Aligns TS augmentation and decoration with older behavior for ALL_CAPS identifiers.
+
+Changes:
+
+- Adjust augmentation interface consistency with top-level declarations
+- Update `@polkadot/util` to 8.0.4 with adjusted `stringCamelCase`
+
+
+## 6.10.1 Nov 29, 2021
+
+Upgrade priority: Low. Recommended for users of `HttpProvider` and for chains generating types using TS augmentation.
+
+Changes:
+
+- Fix for HttpProvider init (RPC sections with only subscriptions)
+- Re-order imports in lookup type augmentation interfaces
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 6.9.2 Nov 22, 2021
+
+Upgrade priority: Medium. Pulls in `@polkadot/util-crypto` fix for TS projects.
+
+Changes:
+
+- Update `@polkadot/util-crypto` with TS compilation work-around
+
+
+## 6.9.1 Nov 21, 2021
+
+Upgrade priority: Medium. Recommended for metadata v14 parachains. For TS users, the package now support TypeScript 4.5.2 and allows extraction of user types from metadata v14.
+
+Contributed:
+
+- Lookup TS generation for all metadata v14 chains (Thanks to https://github.com/savudani8)
+- Update `BeefySignedCommitment` type (Thanks to https://github.com/czl1378)
+
+Changes:
+
+- Adjust runtime `*::{Call, Event}` matching for metadata v14
+- Adjust derive decoration with (optional) known methods
+- Expose `*{Call, Event, Error}` TS types for metadata v14
+- Align Option `.toJSON` output with Substrate input
+- Optimize Enum, Struct, Option & Number decoding paths
+- Ajust PascalCase conversions with function from util
+- Prepare pre-v13 types for optional injection
+- Adjustments for TS 4.5.2 support (flatten type infers)
+
+
+## 6.8.1 Nov 11, 2021
+
+Upgrade priority: Low. Recommended for chains with non-MultiSignature variants where `paymentInfo` is required.
+
+Changes:
+
+- Adjust `paymentInfo` signatures to cater for non-MultiSignature variants
+- Remove `::generic::` from names & namespaces under metadata v14
+- Add Polkadot 9122 upgrade block
+- Cleanup Polkadot/Kusama/Westend/Rococo known types (>= v14 metadata)
+- Internal `decorateMethod{Promise, Rx}` renamed to `to{Promise, Rx}Method`
+- Add RPC provider-level LRU for historic requests
+- Add optional known runtime version param to internal `rx.queryAt`
+
+
+## 6.7.2 Nov 9, 2021
+
+Upgrade priority: Low. Recommended for chains on metadata v14 with non-default `Address` implementations.
+
+Changes:
+
+- Detect `AccountId` & `Address` types via `SpRuntime*` definitions
+- Adjust api-derive call ordering when using `.queryAt`
+
+
+## 6.7.1 Nov 7, 2021
+
+Upgrade priority: Low. Internal maintenance updates, focussed on internal optimizations.
+
+Changelog:
+
+- Optimize Extrinsic & block handling (Thanks to https://github.com/nazar-pc)
+- Add `account::AccountId20` mapping (Thanks to https://github.com/joelamouche)
+
+Changes:
+
+- Use new-gen `voteLockingPeriod` in democracy derives (as available)
+- Dynamically inject getters for `Extrinsic` payloads
+- Optimize caching for complex constructed type classes per registry
+- Convert metadata, rpc and api to use lazy decoration
+- Split u8a decoding paths for `Vec` (different from general path)
+- Keep track of initial u8a decoded length inside base Codecs
+- Extract multi property assignments for `Struct`, `Set`, `Json` & `Enum`
+- Move `PortableRegistry` location inside `@polkadot/types/metadata`
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 6.6.1 Nov 1, 2021
+
+Upgrade priority: Low. Internal maintenance updates.
+
+Changes:
+
+- Fix construction for `palletVersion` keys with correct prefix
+- Add Polkadot `EthereumAddress` as a known `PortableRegistry` override
+- De-dupe `PortableRegistry` namespace splitting operations
+- Optimize internal `AbstractArray` & `Struct` u8a decoding
+- Shortcut `Struct` construction from `Struct` instance
+- Use internal `lookupName` in `createClass` (allows deeply recursive lookups)
+- Codec `toHex()` will now correctly return the TS `HexString` type
+- Update known upgrade blocks for Westend & Kusama
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 6.5.2 Oct 26, 2021
+
+Upgrade priority: Low. Recommended for users with `.at` queries on unknown blocks.
+
+Changes:
+
+- Adjust `toHuman` on `Call` to return names & (not only) values
+- Allow for optional known `RuntimeVersion` to short-circuit `api.at`
+- Ensure `Struct` decodes fully on `null` input (equivalent to `undefined` & `{}`)
+
+
+## 6.5.1 Oct 24, 2021
+
+Upgrade priority: Low. Internal maintenance upgrades.
+
+Contributed:
+
+- Add `Auction` to Polkadot pre-0.9.11 `ProxyType` (Thanks to https://github.com/wirednkod)
+
+Changes:
+
+- Ecah module now exposes the Substrate-added `palletVersion` storage item
+- Adjust Websocket `maxReceivedFrameSize` under Node
+- `TypeDef` structures now contain the `typeName` from metadata v14 on fields
+- Fix browser bundle imports for xcm-mapping (move to `types-known`)
+- Expose all extracted type names in `PortableRegistry`
+- Adjust `toJSON` (Ascii) output detection on `Raw`
+- Adjust `api.rpc.*.*.raw(..args)` return to the actual over-the-wire JSON result
+- Remove `api.rpc.*.*.json(..args)` since it now overlaps with new `.raw`
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 6.4.2 Oct 18, 2021
+
+Upgrade priority: Low. Recommended for Westmint runtime 500+
+
+Changes:
+
+- Ensure `SignerPayload` correctly serializes `Option` with `None`
+- Add Ethereum `BlockV{0, 1, 2}` types, aligning with latest Frontier
+- Additional tests for metadata serialization/de-serialization
+
+
+## 6.4.1 Oct 17, 2021
+
+Upgrade priority: Low. Recommended for Kusama & Polkadot runtime 9110+
+
+Changes:
+
+- Adjust Statemint known types for version 4+
+- Adjust balance derives to return multiple vesting schedules
+- Adjust crowdloan derives to use paged key retrieval
+- Ensure account indices (derived) are `Accountindex` types
+- Adjust metadata v14 to include top-level type field from metadata
+- Filter metadata v14 unused enum fields in TS generation
+- Adjust derives to use more metadata v14 types on returns
+- Add Kusama & Polkadot upgrade blocks for 9100/9110
+- Align contract usage with latrest `PortableRegistry` (remove old-generation)
+- Adjust contracts `InstantiateReturnValue` type (no rent projection after 267)
+- Adjust for eslint v8 checks
+- Don't run any online tests on CI by default (uncontrolled external dependencies)
+
+
+## 6.3.1 Oct 9, 2021
+
+Upgrade priority: Low. Recommended for Kusama & Polkadot runtime 9100+
+
+Changes:
+
+- Mark `api.query.*.*.at` as deprecated (use `api.at`)
+- Expose `queryMulti`, `findError` and `findCall` on `api.at`
+- Optimize parallel metadata retrieval/decoration
+- Rework derive `.at` to ensure no additional metadata calls
+- Adjust Xcm types for Kusama, Polkadot, Westend (V1 & V2 usage)
+- Fix Xcm Fungibility type
+- Add upgrade blocks for Westend
+- Prepare for v14 metadata swap in Kusama/Polkadot (9110 runtime)
+- Adjust metadata wilcard path matching (event extraction)
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 6.2.1 Oct 4, 2021
+
+Upgrade priority: Low. Maintenance updates.
+
+Contributed:
+
+- Cater for new asset fee payment extension (Thanks to https://github.com/apopiak)
+
+Changes:
+
+- Extend error messages for malformed `queryMulti` inputs
+- Correctly handle non-map queries passed to `queryMulti` in map form
+- Use new metadata v14 lookup type in derive results
+- Adjust definitions to infer TS types in `.multi` queries
+- Fix TS lookup enum generation with nested Option & Tuple
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 6.1.2 Sep 29, 2021
+
+Upgrade priority: Low. Recommended for 6.x users using historic queries.
+
+Changes:
+
+- Fix `.at` queries/decoration for pre-V13 metadata
+- Added `BridgeMessageId` & `SpecVersion` types for bridges
+- Added `WrapperOpaque` encoding/decoding (as per latest Substrate)
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 6.1.1 Sep 27, 2021
+
+Upgrade priority: Low. Minor maintenance changes from the 6.0.x versions.
+
+Contributed:
+
+- Adjust bridges `OutboundLaneData` type (Thanks to https://github.com/HackFisher)
+- Fix README 404 (Thanks to https://github.com/nblogist)
+
+Changes:
+
+- Add `childstate_getStorageEntries` RPC
+- Allow for scale-info v0 -> v1 conversion
+
+
+## 6.0.5 Sep 20, 2021
+
+Upgrade priority: Low. Recommended for all users on 6.0.4 using `api.query.*.*.at` calls
+
+Changes:
+
+- Revert cross-registry (now-inactive) change introduced in 6.0.3
+- Ensure `Option` is correctly imported for TS query generation
+
+
+## 6.0.4 Sep 20, 2021
+
+Upgrade priority: Low. Recommended for all users on 6.0.3 using `api.query.*.*.at` calls
+
+Changes:
+
+- `api.query.<module>.<method>.at` will now use `at.at(<hash>)`
+- Use and expose `metadata/util/getSiName` to get human type names
+
+
+## 6.0.3 Sep 19, 2021
+
+Upgrade priority: Low. Recommended for all users on 6.0.2 using `api.query.*.*.at` calls
+
+Changes:
+
+- Fix `api.query.<module>.<method>.at` queries
+- Adjust typegen formatting for metadata documentation
+
+
+## 6.0.2 Sep 18, 2021
+
+Upgrade priority: Low. Recommended for all users on 6.0.1, especially those using `api.query.substrate.*` calls
+
+Changes:
+
+- Fix `api.query.substrate.*` key generation
+
+
+## 6.0.1 Sep 18, 2021
+
+Upgrade priority: Low. Recommended for users of the latest Substrate/Polkadot with Metadata v14.
+
+- **Important** The Metadata v14 change allows the metadata to expose the chain types. This has been a major overhaul of the metadata handling, hence the major version bump.
+
+Contributed:
+
+- Allow for `.clone` on Http provider (Thanks to https://github.com/ianhe8x)
+
+Changes:
+
+- Allow for Metadata v14 parsing & usage
+- Align `DigestItem` to latest Substrate
+- Adjust Kusama `IdentityInfo` type for historic versions
+- All `null` values in bundles min/max
+- Bump static metadata for latest Substrate, Polkadot & Kusama
+
+
+## 5.9.1 Sep 13, 2021
+
+Upgrade priority: Low. Recommended for chains using Xcm.
+
+Contributed:
+
+- Adjust Centrifuge `ProxyType` (Thanks to https://github.com/branan)
+
+Changes:
+
+- Additional types for parachain Disputes
+- Adjust Xcm Error enum types
+- Add Polkadot 9090 upgrade block
+- Decoding enhancements with narrowing checks for TS
+
+
+## 5.8.3 Sep 6, 2021
+
+Upgrade priority: Low.
+
+Changes:
+
+- Adjust Statemint, Rococo and Westend Xcm overrides
+
+
 ## 5.8.2 Sep 6, 2021
 
+Upgrade priority: Low.
+
 Contributed:
 
 - Correct Xcm V1 `MultiLocation` definitions (Thanks to https://github.com/apopiak)

CONTRIBUTORS

@@ -0,0 +1,92 @@
+    2782	Jaco                          	7.5.1 (#4492)
+      83	Amaury Martiny                	StatementKind: Regular and Saft (#2303)
+      36	Keith Ingram                  	Storage deposit limit changes (#4370)
+      35	Stefanie Doll                 	Updated child storage parameters (#1709)
+      20	Luke Schoen                   	fix: Fixes TypeError: Cannot read property 'vesting' of undefined (#1970)
+      15	Jeremías Díaz                 	feat(types): add correct tuple type to storage key (#3054)
+      15	Xiliang Chen                  	add Authority origin (#3645)
+      11	Ian He                        	HttpProvider support clone() (#3949)
+      10	Axel Chalon                   	Make Enum/Tuple constructor use value directly if instance (#1954)
+       5	Chevdor                       	Fix metadata package link (#3458)
+       5	Jake Naviasky                 	Fixing approvalFlagsToBools. (#1250)
+       4	Alex Wang                     	fix issue that creates duplicate providers (#983)
+       4	Alexander Popiak              	Add asset id in signing (#4009)
+       4	Joshy Orndorff                	spelling; efect -> effect (#2295)
+       4	Nantian                       	fix bigint type (#3869)
+       4	Thibaut Sardan                	no subscription for http (#3127)
+       3	Alex D                        	Use derive customAccount and customLocks for balance overrides (#3248)
+       3	André Silva                   	add support for ValidationCodeHash (#3640)
+       3	Antoine Estienne              	Adapted to display moonbeam author (#3108)
+       3	Arjan Zijderveld              	Added `Emergency` to `ElectionPhase` (#3707)
+       3	Ewa Kowalska                  	Handle no council for bounties proposals (#3062)
+       3	hamidra                       	add support for n key entries for NMaps (#3886)
+       3	Hamza Tokuchi                 	more typos (#2532)
+       3	Julien Eluard                 	Fixed typos about module balances (#1402)
+       3	KarishmaBothara               	Backward compatibility thing (#3511)
+       3	Miguel Hervas                 	Adding RT4 Types (#3007)
+       3	Shawn Tabrizi                 	Add `isReadyOrError` when connecting to API (#2577)
+       3	YJ                            	feat: Vote interface as U8a (#1061)
+       2	Alexander Krupenkin           	Add [u8; 33] type width for U8aFixed type (#2391)
+       2	Branan Riley                  	Add proxy type for Centrifuge (#3940)
+       2	Caio                          	Add `Range` and `RangeInclusive` types (#3791)
+       2	Jakub Pánik                   	All heads subscription (#1899)
+       2	James Lefrère                 	Add `.eq()` usage to docs and fix docs typos (#1405)
+       2	Keith Yeung                   	Allow keyPrefix to accept an additional argument for double maps (#2230)
+       2	Nikos Kontakis                	Add auction in shared types (#4085)
+       2	Paweł Nguyen                  	Fix a minor typo in cookbook blocks docs (#2294)
+       2	sung wu                       	Update tx.md (#2485)
+       2	Veliko                        	Abi constructor takes different parameters (#3347)
+       2	Wei Tang                      	Use /usr/bin/env bash instead of /bin/bash (#2053)
+       2	扩散性百万甜面包                      	Typo, deocrateMethod -> decorateMethod (#1594)
+       1	Andreea Eftene                	Add storage deposit support (#4304)
+       1	Brad Larson                   	[NEW] Support for custom headers with providers (#2423)
+       1	chriswmercer                  	little readme tweak (#279)
+       1	codingsh                      	#2182 - add: search for docs (#2232)
+       1	Dan Forbes                    	Add WeightToFeeCoefficient type (#2296)
+       1	Daniel Maricic                	Fixed typo in README (#2402)
+       1	Daniel Savu                   	fix: Generate custom type definitions (#4224)
+       1	David                         	Don't log full error (#2952)
+       1	Denis Tsai                    	realign AccountKey20Junction to polkadot xcm's Junction enum (#3770)
+       1	djuanito.eth                  	Update fees to current constants (#2320)
+       1	Drew Stone                    	Update evm definitions to include vicinity (#2279)
+       1	Dylan Galea                   	Updated users of the polkadot-js/api (#2027)
+       1	flex                          	Change BeefySignedCommitment signatures type to EcdsaSignature (#4204)
+       1	Furqan A                      	fix: fixed 404 to the docs from the api readme (#3985)
+       1	Gerben van de Wiel            	Adding some extra notes on changes in the specname (#2329)
+       1	HackFisher                    	fix OutboundLaneData types (#3992)
+       1	Hoani Bryson                  	Multiple Endpoint support for WsProvider (#2234)
+       1	Hyungsuk Kang                 	Update fees.ts (#1014)
+       1	icodezjb                      	Update SessionKeys (#3035)
+       1	iiiiiiii                      	Make unknownTypes externally accessible (#3263)
+       1	JesseAbram                    	added 07 Example showing how to make a transfer with allowed block permissions folder in docs (#1062)
+       1	Joey                          	don't throw error at `onSocketClose` (#4363)
+       1	Jordan                        	Allow typegen for custom RPCs (#2876)
+       1	JQQQ                          	Allow rpc expose definition/ metadata (#3488)
+       1	Kian Paimani                  	Update definitions.ts (#2514)
+       1	Krzysztof Jelski              	Derive for bounties and descriptions (#2925)
+       1	Lae                           	Make sure awaiting on an api object won't stuck forever on error (#1763)
+       1	Lezek123                      	BTreeSet and BTreeMap - encoding and serialization fixes (#3789)
+       1	Lovesh Harchandani            	Fix name of "getBlock" in package "api-derive" and export it in "index.ts" (#2857)
+       1	Mario Neises                  	fix usage with typescript (#405)
+       1	Mario Pino                    	Add PolkaStats to API users (#1593)
+       1	Mark Robert Henderson         	Update warnings.ts to have the latest URLs (#2720)
+       1	Matej Nemček                  	added Kodadot to @polkadot/api users section (#2220)
+       1	Mokhtar Naamani               	Disable websocket outgoing message fragmentation for w3cwebsocket (#2738)
+       1	Nazar Mokrynskyi              	Performance tweaks (#4143)
+       1	Nikhil Ranjan                 	add vestingPerBlock and vestingEndBlock in DeriveBalancesAll when doing calcBalances (#2563)
+       1	Nikolay Volf                  	Fix typo (#1730)
+       1	Oleksandr Mykhailenko         	Add more complex namespaced contracts & test cases for them (#4472)
+       1	Paul M Fox                    	Basic BTreeMaps codec support (#1474)
+       1	philipstanislaus              	Update types for centrifuge chain v1.2.0 (#2424)
+       1	qiuhao                        	update DeriveCustom type (#2581)
+       1	Rocco Musolino                	remove broken link (#2671)
+       1	satellitex                    	Add BTreeSet<V> Codec (#1639)
+       1	satellitex                    	Add traits replace rules. for invalid cases `::<type>` and `<type>::`. (#885)
+       1	Satyam Agrawal                	update as per the 0.97.0-beta.38 release (#1617)
+       1	Sean Young                    	Solang requires u256 and i256 types (#2752)
+       1	Sergei Pepyakin               	INK! -> ink! (#1347)
+       1	WoeOm                         	adapt Darwinia, Crab Network types (#3498)
+       1	Xat_MassacrE                  	Fix packages/types/src/codec/utils/encodeTypes.ts encodeSubTypes bug (#1544)
+       1	yjh                           	fix MetadataVersioned.asV12 (#2983)
+       1	Yuri                          	fixes #3693 Fix uniques return types (#3694)
+       1	Zeke Mostov                   	fix: Allow sudo for polkadot indexed proxy enum (#3286)

babel.config.cjs

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

jest.config.cjs

@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/api authors & contributors
+// Copyright 2017-2022 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const config = require('@polkadot/dev/config/jest.cjs');
@@ -6,13 +6,12 @@ const config = require('@polkadot/dev/config/jest.cjs');
 module.exports = {
   ...config,
   moduleNameMapper: {
-    '@polkadot/api-(contract|derive)(.*)$': '<rootDir>/packages/api-$1/src/$2',
+    '@polkadot/api-(augment|base|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/rpc-(augment|core|provider)(.*)$': '<rootDir>/packages/rpc-$1/src/$2',
     '@polkadot/typegen(.*)$': '<rootDir>/packages/typegen/src/$1',
-    '@polkadot/types-(known|support)(.*)$': '<rootDir>/packages/types-$1/src/$2',
+    '@polkadot/types-(augment|codec|create|known|support)(.*)$': '<rootDir>/packages/types-$1/src/$2',
     // eslint-disable-next-line sort-keys
     '@polkadot/types(.*)$': '<rootDir>/packages/types/src/$1'
   },

package.json

@@ -1,40 +1,45 @@
 {
-  "repository": "https://github.com/polkadot-js/api",
   "author": "Jaco Greeff <jacogr@gmail.com>",
+  "bugs": "https://github.com/polkadot-js/api/issues",
+  "homepage": "https://github.com/polkadot-js/api#readme",
   "license": "Apache-2",
+  "packageManager": "yarn@3.0.1",
   "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/polkadot-js/api.git"
+  },
+  "sideEffects": false,
   "type": "commonjs",
+  "version": "7.5.1",
   "workspaces": [
     "packages/*"
   ],
-  "resolutions": {
-    "typescript": "^4.4.2"
-  },
   "scripts": {
     "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",
     "build:rollup": "polkadot-exec-rollup --config",
-    "docs:metadata": "polkadot-types-internal-metadata",
     "chain:info": "polkadot-types-chain-info",
-    "lint": "polkadot-dev-run-lint",
     "clean": "polkadot-dev-clean-build",
+    "docs:metadata": "polkadot-types-internal-metadata",
+    "lint": "polkadot-dev-run-lint",
     "postinstall": "polkadot-dev-yarn-only",
     "test": "polkadot-dev-run-test --coverage --forceExit --runInBand --testPathIgnorePatterns e2e",
     "test:one": "polkadot-dev-run-test --detectOpenHandles --forceExit",
     "test:watch": "polkadot-dev-run-test --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.5",
-    "@babel/register": "^7.15.3",
-    "@babel/runtime": "^7.15.4",
-    "@polkadot/dev": "^0.62.66",
-    "@polkadot/ts": "^0.4.7",
+    "@babel/core": "^7.16.12",
+    "@babel/register": "^7.16.9",
+    "@babel/runtime": "^7.16.7",
+    "@polkadot/dev": "^0.65.43",
     "@polkadot/typegen": "workspace:packages/typegen",
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^27.4.0",
     "copyfiles": "^2.4.1"
   },
-  "version": "5.8.2",
-  "packageManager": "yarn@3.0.1"
+  "resolutions": {
+    "typescript": "^4.5.5"
+  }
 }

packages/api-augment/LICENSE

@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                    http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have made,
+  use, offer to sell, sell, import, and otherwise transfer the Work,
+  where such license applies only to those patent claims licensable
+  by such Contributor that are necessarily infringed by their
+  Contribution(s) alone or by combination of their Contribution(s)
+  with the Work to which such Contribution(s) was submitted. If You
+  institute patent litigation against any entity (including a
+  cross-claim or counterclaim in a lawsuit) alleging that the Work
+  or a Contribution incorporated within the Work constitutes direct
+  or contributory patent infringement, then any patent licenses
+  granted to You under this License for that Work shall terminate
+  as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+  Work or Derivative Works thereof in any medium, with or without
+  modifications, and in Source or Object form, provided that You
+  meet the following conditions:
+
+  (a) You must give any other recipients of the Work or
+      Derivative Works a copy of this License; and
+
+  (b) You must cause any modified files to carry prominent notices
+      stating that You changed the files; and
+
+  (c) You must retain, in the Source form of any Derivative Works
+      that You distribute, all copyright, patent, trademark, and
+      attribution notices from the Source form of the Work,
+      excluding those notices that do not pertain to any part of
+      the Derivative Works; and
+
+  (d) If the Work includes a "NOTICE" text file as part of its
+      distribution, then any Derivative Works that You distribute must
+      include a readable copy of the attribution notices contained
+      within such NOTICE file, excluding those notices that do not
+      pertain to any part of the Derivative Works, in at least one
+      of the following places: within a NOTICE text file distributed
+      as part of the Derivative Works; within the Source form or
+      documentation, if provided along with the Derivative Works; or,
+      within a display generated by the Derivative Works, if and
+      wherever such third-party notices normally appear. The contents
+      of the NOTICE file are for informational purposes only and
+      do not modify the License. You may add Your own attribution
+      notices within Derivative Works that You distribute, alongside
+      or as an addendum to the NOTICE text from the Work, provided
+      that such additional attribution notices cannot be construed
+      as modifying the License.
+
+  You may add Your own copyright statement to Your modifications and
+  may provide additional or different license terms and conditions
+  for use, reproduction, or distribution of Your modifications, or
+  for any such Derivative Works as a whole, provided Your use,
+  reproduction, and distribution of the Work otherwise complies with
+  the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+  any Contribution intentionally submitted for inclusion in the Work
+  by You to the Licensor shall be under the terms and conditions of
+  this License, without any additional terms or conditions.
+  Notwithstanding the above, nothing herein shall supersede or modify
+  the terms of any separate license agreement you may have executed
+  with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+  names, trademarks, service marks, or product names of the Licensor,
+  except as required for reasonable and customary use in describing the
+  origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+  agreed to in writing, Licensor provides the Work (and each
+  Contributor provides its Contributions) on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  implied, including, without limitation, any warranties or conditions
+  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+  PARTICULAR PURPOSE. You are solely responsible for determining the
+  appropriateness of using or redistributing the Work and assume any
+  risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+  whether in tort (including negligence), contract, or otherwise,
+  unless required by applicable law (such as deliberate and grossly
+  negligent acts) or agreed to in writing, shall any Contributor be
+  liable to You for damages, including any direct, indirect, special,
+  incidental, or consequential damages of any character arising as a
+  result of this License or out of the use or inability to use the
+  Work (including but not limited to damages for loss of goodwill,
+  work stoppage, computer failure or malfunction, or any and all
+  other commercial damages or losses), even if such Contributor
+  has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+  the Work or Derivative Works thereof, You may choose to offer,
+  and charge a fee for, acceptance of support, warranty, indemnity,
+  or other liability obligations and/or rights consistent with this
+  License. However, in accepting such obligations, You may act only
+  on Your own behalf and on Your sole responsibility, not on behalf
+  of any other Contributor, and only if You agree to indemnify,
+  defend, and hold each Contributor harmless for any liability
+  incurred by, or claims asserted against, such Contributor by reason
+  of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+  To apply the Apache License to your work, attach the following
+  boilerplate notice, with the fields enclosed by brackets "[]"
+  replaced with your own identifying information. (Don't include
+  the brackets!)  The text should be enclosed in the appropriate
+  comment syntax for the file format. We also recommend that a
+  file or class name and description of purpose be included on the
+  same "printed page" as the copyright notice for easier
+  identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

packages/api-augment/README.md

@@ -0,0 +1,3 @@
+# @polkadot/api-augment
+
+Generated augmentation.

packages/api-augment/package.json

@@ -0,0 +1,34 @@
+{
+  "author": "Jaco Greeff <jacogr@gmail.com>",
+  "bugs": "https://github.com/polkadot-js/api/issues",
+  "contributors": [],
+  "description": "API generated augmentation",
+  "engines": {
+    "node": ">=14.0.0"
+  },
+  "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-augment#readme",
+  "license": "Apache-2.0",
+  "maintainers": [],
+  "name": "@polkadot/api-augment",
+  "repository": {
+    "directory": "packages/api-augment",
+    "type": "git",
+    "url": "https://github.com/polkadot-js/api.git"
+  },
+  "sideEffects": [
+    "./detectPackage.js",
+    "./detectPackage.cjs"
+  ],
+  "type": "module",
+  "version": "7.5.1",
+  "main": "index.js",
+  "dependencies": {
+    "@babel/runtime": "^7.16.7",
+    "@polkadot/api-base": "7.5.1",
+    "@polkadot/rpc-augment": "7.5.1",
+    "@polkadot/types": "7.5.1",
+    "@polkadot/types-augment": "7.5.1",
+    "@polkadot/types-codec": "7.5.1",
+    "@polkadot/util": "^8.3.3"
+  }
+}

packages/api-augment/src/base.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2022 @polkadot/api-augment authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// for the API, we decorate not only the endpoints, but all types
+import '@polkadot/rpc-augment';
+import '@polkadot/types-augment';

packages/api-augment/src/bundle.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2022 @polkadot/api-augment authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import './substrate';
+
+export { packageInfo } from './packageInfo';

packages/api-augment/src/detectOther.ts

@@ -0,0 +1,8 @@
+// Copyright 2017-2022 @polkadot/api-augment authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { packageInfo as baseInfo } from '@polkadot/api-base/packageInfo';
+import { packageInfo as typesInfo } from '@polkadot/types/packageInfo';
+import { packageInfo as codecInfo } from '@polkadot/types-codec/packageInfo';
+
+export default [baseInfo, typesInfo, codecInfo];

packages/api-augment/src/detectPackage.ts

@@ -0,0 +1,11 @@
+// Copyright 2017-2022 @polkadot/api-augment authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Do not edit, auto-generated by @polkadot/dev
+
+import { detectPackage } from '@polkadot/util';
+
+import others from './detectOther';
+import { packageInfo } from './packageInfo';
+
+detectPackage(packageInfo, null, others);

packages/api-augment/src/index.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2022 @polkadot/api-augment authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import './detectPackage';
+
+export * from './bundle';

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

@@ -1,42 +1,27 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
-import type { Vec, bool, u16, u32, u64 } from '@polkadot/types';
-import type { Codec } from '@polkadot/types/types';
-import type { Schedule } from '@polkadot/types/interfaces/contracts';
-import type { Balance, BalanceOf, BlockNumber, LockIdentifier, Moment, PalletId, Perbill, Percent, Permill, RuntimeDbWeight, TransactionPriority, Weight } from '@polkadot/types/interfaces/runtime';
-import type { SessionIndex } from '@polkadot/types/interfaces/session';
-import type { EraIndex } from '@polkadot/types/interfaces/staking';
-import type { RuntimeVersion } from '@polkadot/types/interfaces/state';
-import type { WeightToFeeCoefficient } from '@polkadot/types/interfaces/support';
-import type { BlockLength, BlockWeights } from '@polkadot/types/interfaces/system';
-import type { DepositBalanceOf } from '@polkadot/types/interfaces/uniques';
-import type { ApiTypes } from '@polkadot/api/types';
+import type { ApiTypes } from '@polkadot/api-base/types';
+import type { Bytes, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
+import type { Codec } from '@polkadot/types-codec/types';
+import type { Perbill, Percent, Permill } from '@polkadot/types/interfaces/runtime';
+import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
 
-declare module '@polkadot/api/types/consts' {
-  export interface AugmentedConsts<ApiType> {
-    assets: {
+declare module '@polkadot/api-base/types/consts' {
+  export interface AugmentedConsts<ApiType extends ApiTypes> {
+    auctions: {
       /**
-       * The amount of funds that must be reserved when creating a new approval.
+       * The number of blocks over which an auction may be retroactively ended.
        **/
-      approvalDeposit: DepositBalanceOf & AugmentedConst<ApiType>;
+      endingPeriod: u32 & AugmentedConst<ApiType>;
+      leasePeriodsPerSlot: u32 & AugmentedConst<ApiType>;
       /**
-       * The basic amount of funds that must be reserved for an asset.
+       * The length of each sample to take during the ending period.
+       * 
+       * `EndingPeriod` / `SampleLength` = Total # of Samples
        **/
-      assetDeposit: DepositBalanceOf & AugmentedConst<ApiType>;
-      /**
-       * The basic amount of funds that must be reserved when adding metadata to your asset.
-       **/
-      metadataDepositBase: DepositBalanceOf & AugmentedConst<ApiType>;
-      /**
-       * The additional funds that must be reserved for the number of bytes you store in your
-       * metadata.
-       **/
-      metadataDepositPerByte: DepositBalanceOf & AugmentedConst<ApiType>;
-      /**
-       * The maximum length of a name or symbol stored on-chain.
-       **/
-      stringLimit: u32 & AugmentedConst<ApiType>;
+      sampleLength: u32 & AugmentedConst<ApiType>;
+      slotRangeCount: u32 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -48,7 +33,7 @@ declare module '@polkadot/api/types/consts' {
        * This means that we will deal with uncle-parents that are
        * `UncleGenerations + 1` before `now`.
        **/
-      uncleGenerations: BlockNumber & AugmentedConst<ApiType>;
+      uncleGenerations: u32 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -68,7 +53,63 @@ declare module '@polkadot/api/types/consts' {
        * duration and the security parameter `c` (where `1 - c` represents
        * the probability of a slot being empty).
        **/
-      expectedBlockTime: Moment & AugmentedConst<ApiType>;
+      expectedBlockTime: u64 & AugmentedConst<ApiType>;
+      /**
+       * Max number of authorities allowed
+       **/
+      maxAuthorities: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    bagsList: {
+      /**
+       * The list of thresholds separating the various bags.
+       * 
+       * Ids are separated into unsorted bags according to their vote weight. This specifies the
+       * thresholds separating the bags. An id's bag is the largest bag for which the id's weight
+       * is less than or equal to its upper threshold.
+       * 
+       * When ids are iterated, higher bags are iterated completely before lower bags. This means
+       * that iteration is _semi-sorted_: ids of higher weight tend to come before ids of lower
+       * weight, but peer ids within a particular bag are sorted in insertion order.
+       * 
+       * # Expressing the constant
+       * 
+       * This constant must be sorted in strictly increasing order. Duplicate items are not
+       * permitted.
+       * 
+       * There is an implied upper limit of `VoteWeight::MAX`; that value does not need to be
+       * specified within the bag. For any two threshold lists, if one ends with
+       * `VoteWeight::MAX`, the other one does not, and they are otherwise equal, the two lists
+       * will behave identically.
+       * 
+       * # Calculation
+       * 
+       * It is recommended to generate the set of thresholds in a geometric series, such that
+       * there exists some constant ratio such that `threshold[k + 1] == (threshold[k] *
+       * constant_ratio).max(threshold[k] + 1)` for all `k`.
+       * 
+       * The helpers in the `/utils/frame/generate-bags` module can simplify this calculation.
+       * 
+       * # Examples
+       * 
+       * - If `BagThresholds::get().is_empty()`, then all ids are put into the same bag, and
+       * iteration is strictly in insertion order.
+       * - If `BagThresholds::get().len() == 64`, and the thresholds are determined according to
+       * the procedure given above, then the constant ratio is equal to 2.
+       * - If `BagThresholds::get().len() == 200`, and the thresholds are determined according to
+       * the procedure given above, then the constant ratio is approximately equal to 1.248.
+       * - If the threshold list begins `[1, 2, 3, ...]`, then an id with weight 0 or 1 will fall
+       * into bag 0, an id with weight 2 will fall into bag 1, etc.
+       * 
+       * # Migration
+       * 
+       * In the event that this list ever changes, a copy of the old bags list must be retained.
+       * With that `List::migrate` can be called, which will perform the appropriate migration.
+       **/
+      bagThresholds: Vec<u64> & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -78,7 +119,7 @@ declare module '@polkadot/api/types/consts' {
       /**
        * The minimum amount required to keep an account open.
        **/
-      existentialDeposit: Balance & AugmentedConst<ApiType>;
+      existentialDeposit: u128 & AugmentedConst<ApiType>;
       /**
        * The maximum number of locks that should exist on an account.
        * Not strictly enforced, but used for weight estimation.
@@ -95,31 +136,34 @@ declare module '@polkadot/api/types/consts' {
     };
     bounties: {
       /**
-       * Percentage of the curator fee that will be reserved upfront as deposit for bounty curator.
+       * Percentage of the curator fee that will be reserved upfront as deposit for bounty
+       * curator.
        **/
       bountyCuratorDeposit: Permill & AugmentedConst<ApiType>;
       /**
        * The amount held on deposit for placing a bounty proposal.
        **/
-      bountyDepositBase: BalanceOf & AugmentedConst<ApiType>;
+      bountyDepositBase: u128 & AugmentedConst<ApiType>;
       /**
        * The delay period for which a bounty beneficiary need to wait before claim the payout.
        **/
-      bountyDepositPayoutDelay: BlockNumber & AugmentedConst<ApiType>;
+      bountyDepositPayoutDelay: u32 & AugmentedConst<ApiType>;
       /**
        * Bounty duration in blocks.
        **/
-      bountyUpdatePeriod: BlockNumber & AugmentedConst<ApiType>;
+      bountyUpdatePeriod: u32 & AugmentedConst<ApiType>;
       /**
        * Minimum value for a bounty.
        **/
-      bountyValueMinimum: BalanceOf & AugmentedConst<ApiType>;
+      bountyValueMinimum: u128 & AugmentedConst<ApiType>;
       /**
-       * The amount held on deposit per byte within bounty description.
+       * The amount held on deposit per byte within the tip report reason or bounty description.
        **/
-      dataDepositPerByte: BalanceOf & AugmentedConst<ApiType>;
+      dataDepositPerByte: u128 & AugmentedConst<ApiType>;
       /**
        * Maximum acceptable reason length.
+       * 
+       * Benchmarks depend on this value, be sure to update weights file when changing this value
        **/
       maximumReasonLength: u32 & AugmentedConst<ApiType>;
       /**
@@ -127,70 +171,27 @@ declare module '@polkadot/api/types/consts' {
        **/
       [key: string]: Codec;
     };
-    contracts: {
+    claims: {
+      prefix: Bytes & AugmentedConst<ApiType>;
       /**
-       * The maximum number of tries that can be queued for deletion.
+       * Generic const
        **/
-      deletionQueueDepth: u32 & AugmentedConst<ApiType>;
+      [key: string]: Codec;
+    };
+    crowdloan: {
       /**
-       * The maximum amount of weight that can be consumed per block for lazy trie removal.
+       * The minimum amount that may be contributed into a crowdloan. Should almost certainly be at
+       * least `ExistentialDeposit`.
        **/
-      deletionWeightLimit: Weight & AugmentedConst<ApiType>;
+      minContribution: u128 & AugmentedConst<ApiType>;
       /**
-       * The balance every contract needs to deposit to stay alive indefinitely.
-       * 
-       * This is different from the [`Self::TombstoneDeposit`] because this only needs to be
-       * deposited while the contract is alive. Costs for additional storage are added to
-       * this base cost.
-       * 
-       * This is a simple way to ensure that contracts with empty storage eventually get deleted
-       * by making them pay rent. This creates an incentive to remove them early in order to save
-       * rent.
+       * `PalletId` for the crowdloan pallet. An appropriate value could be `PalletId(*b"py/cfund")`
        **/
-      depositPerContract: BalanceOf & AugmentedConst<ApiType>;
+      palletId: FrameSupportPalletId & AugmentedConst<ApiType>;
       /**
-       * The balance a contract needs to deposit per storage byte to stay alive indefinitely.
-       * 
-       * Let's suppose the deposit is 1,000 BU (balance units)/byte and the rent is 1
-       * BU/byte/day, then a contract with 1,000,000 BU that uses 1,000 bytes of storage would
-       * pay no rent. But if the balance reduced to 500,000 BU and the storage stayed the same at
-       * 1,000, then it would pay 500 BU/day.
+       * Max number of storage keys to remove per extrinsic call.
        **/
-      depositPerStorageByte: BalanceOf & AugmentedConst<ApiType>;
-      /**
-       * The balance a contract needs to deposit per storage item to stay alive indefinitely.
-       * 
-       * It works the same as [`Self::DepositPerStorageByte`] but for storage items.
-       **/
-      depositPerStorageItem: BalanceOf & AugmentedConst<ApiType>;
-      /**
-       * The fraction of the deposit that should be used as rent per block.
-       * 
-       * When a contract hasn't enough balance deposited to stay alive indefinitely it needs
-       * to pay per block for the storage it consumes that is not covered by the deposit.
-       * This determines how high this rent payment is per block as a fraction of the deposit.
-       **/
-      rentFraction: Perbill & AugmentedConst<ApiType>;
-      /**
-       * Cost schedule and limits.
-       **/
-      schedule: Schedule & AugmentedConst<ApiType>;
-      /**
-       * Number of block delay an extrinsic claim surcharge has.
-       * 
-       * When claim surcharge is called by an extrinsic the rent is checked
-       * for current_block - delay
-       **/
-      signedClaimHandicap: BlockNumber & AugmentedConst<ApiType>;
-      /**
-       * Reward that is received by the party whose touch has led
-       * to removal of a contract.
-       **/
-      surchargeReward: BalanceOf & AugmentedConst<ApiType>;
-      /**
-       * The minimum amount required to generate a tombstone.
-       **/
-      tombstoneDeposit: BalanceOf & AugmentedConst<ApiType>;
+      removeKeysLimit: u32 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -200,7 +201,7 @@ declare module '@polkadot/api/types/consts' {
       /**
        * Period in blocks where an external proposal may not be re-submitted after being vetoed.
        **/
-      cooloffPeriod: BlockNumber & AugmentedConst<ApiType>;
+      cooloffPeriod: u32 & AugmentedConst<ApiType>;
       /**
        * The period between a proposal being approved and enacted.
        * 
@@ -208,11 +209,11 @@ declare module '@polkadot/api/types/consts' {
        * voting stakers have an opportunity to remove themselves from the system in the case
        * where they are on the losing side of a vote.
        **/
-      enactmentPeriod: BlockNumber & AugmentedConst<ApiType>;
+      enactmentPeriod: u32 & AugmentedConst<ApiType>;
       /**
        * Minimum voting period allowed for a fast-track referendum.
        **/
-      fastTrackVotingPeriod: BlockNumber & AugmentedConst<ApiType>;
+      fastTrackVotingPeriod: u32 & AugmentedConst<ApiType>;
       /**
        * Indicator for whether an emergency origin is even allowed to happen. Some chains may
        * want to set this permanently to `false`, others may want to condition it on things such
@@ -222,7 +223,7 @@ declare module '@polkadot/api/types/consts' {
       /**
        * How often (in blocks) new public referenda are launched.
        **/
-      launchPeriod: BlockNumber & AugmentedConst<ApiType>;
+      launchPeriod: u32 & AugmentedConst<ApiType>;
       /**
        * The maximum number of public proposals that can exist at any time.
        **/
@@ -237,33 +238,28 @@ declare module '@polkadot/api/types/consts' {
       /**
        * The minimum amount to be used as a deposit for a public referendum proposal.
        **/
-      minimumDeposit: BalanceOf & AugmentedConst<ApiType>;
+      minimumDeposit: u128 & AugmentedConst<ApiType>;
       /**
        * The amount of balance that must be deposited per byte of preimage stored.
        **/
-      preimageByteDeposit: BalanceOf & AugmentedConst<ApiType>;
+      preimageByteDeposit: u128 & AugmentedConst<ApiType>;
       /**
        * The minimum period of vote locking.
        * 
        * It should be no shorter than enactment period to ensure that in the case of an approval,
        * those successful voters are locked into the consequences that their votes entail.
        **/
-      voteLockingPeriod: BlockNumber & AugmentedConst<ApiType>;
+      voteLockingPeriod: u32 & AugmentedConst<ApiType>;
       /**
        * How often (in blocks) to check for new votes.
        **/
-      votingPeriod: BlockNumber & AugmentedConst<ApiType>;
+      votingPeriod: u32 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
       [key: string]: Codec;
     };
     electionProviderMultiPhase: {
-      /**
-       * Maximum number of iteration of balancing that will be executed in the embedded miner of
-       * the pallet.
-       **/
-      minerMaxIterations: u32 & AugmentedConst<ApiType>;
       /**
        * Maximum length (bytes) that the mined solution should consume.
        * 
@@ -277,30 +273,30 @@ declare module '@polkadot/api/types/consts' {
        * The miner will ensure that the total weight of the unsigned solution will not exceed
        * this value, based on [`WeightInfo::submit_unsigned`].
        **/
-      minerMaxWeight: Weight & AugmentedConst<ApiType>;
+      minerMaxWeight: u64 & AugmentedConst<ApiType>;
       /**
        * The priority of the unsigned transaction submitted in the unsigned-phase
        **/
-      minerTxPriority: TransactionPriority & AugmentedConst<ApiType>;
+      minerTxPriority: u64 & AugmentedConst<ApiType>;
       /**
        * The repeat threshold of the offchain worker.
        * 
        * For example, if it is 5, that means that at least 5 blocks will elapse between attempts
        * to submit the worker's solution.
        **/
-      offchainRepeat: BlockNumber & AugmentedConst<ApiType>;
+      offchainRepeat: u32 & AugmentedConst<ApiType>;
       /**
        * Base deposit for a signed solution.
        **/
-      signedDepositBase: BalanceOf & AugmentedConst<ApiType>;
+      signedDepositBase: u128 & AugmentedConst<ApiType>;
       /**
        * Per-byte deposit for a signed solution.
        **/
-      signedDepositByte: BalanceOf & AugmentedConst<ApiType>;
+      signedDepositByte: u128 & AugmentedConst<ApiType>;
       /**
        * Per-weight deposit for a signed solution.
        **/
-      signedDepositWeight: BalanceOf & AugmentedConst<ApiType>;
+      signedDepositWeight: u128 & AugmentedConst<ApiType>;
       /**
        * Maximum number of signed submissions that can be queued.
        * 
@@ -316,15 +312,15 @@ declare module '@polkadot/api/types/consts' {
        * 
        * This should probably be similar to [`Config::MinerMaxWeight`].
        **/
-      signedMaxWeight: Weight & AugmentedConst<ApiType>;
+      signedMaxWeight: u64 & AugmentedConst<ApiType>;
       /**
        * Duration of the signed phase.
        **/
-      signedPhase: BlockNumber & AugmentedConst<ApiType>;
+      signedPhase: u32 & AugmentedConst<ApiType>;
       /**
        * Base reward for a signed solution
        **/
-      signedRewardBase: BalanceOf & AugmentedConst<ApiType>;
+      signedRewardBase: u128 & AugmentedConst<ApiType>;
       /**
        * The minimum amount of improvement to the solution score that defines a solution as
        * "better" (in any phase).
@@ -333,46 +329,16 @@ declare module '@polkadot/api/types/consts' {
       /**
        * Duration of the unsigned phase.
        **/
-      unsignedPhase: BlockNumber & AugmentedConst<ApiType>;
+      unsignedPhase: u32 & AugmentedConst<ApiType>;
       /**
-       * Generic const
-       **/
-      [key: string]: Codec;
-    };
-    elections: {
-      /**
-       * How much should be locked up in order to submit one's candidacy.
-       **/
-      candidacyBond: BalanceOf & AugmentedConst<ApiType>;
-      /**
-       * Number of members to elect.
-       **/
-      desiredMembers: u32 & AugmentedConst<ApiType>;
-      /**
-       * Number of runners_up to keep.
-       **/
-      desiredRunnersUp: u32 & AugmentedConst<ApiType>;
-      /**
-       * Identifier for the elections-phragmen pallet's lock
-       **/
-      palletId: LockIdentifier & AugmentedConst<ApiType>;
-      /**
-       * How long each seat is kept. This defines the next block number at which an election
-       * round will happen. If set to zero, no elections are ever triggered and the module will
-       * be in passive mode.
-       **/
-      termDuration: BlockNumber & AugmentedConst<ApiType>;
-      /**
-       * Base deposit associated with voting.
+       * The maximum number of voters to put in the snapshot. At the moment, snapshots are only
+       * over a single block, but once multi-block elections are introduced they will take place
+       * over multiple blocks.
        * 
-       * This should be sensibly high to economically ensure the pallet cannot be attacked by
-       * creating a gigantic number of votes.
+       * Also, note the data type: If the voters are represented by a `u32` in `type
+       * CompactSolution`, the same `u32` is used here to ensure bounds are respected.
        **/
-      votingBondBase: BalanceOf & AugmentedConst<ApiType>;
-      /**
-       * The amount of bond that need to be locked for each vote (32 bytes).
-       **/
-      votingBondFactor: BalanceOf & AugmentedConst<ApiType>;
+      voterSnapshotPerBlock: u32 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -385,11 +351,6 @@ declare module '@polkadot/api/types/consts' {
        * Must be no greater than `MaxQueueLen`.
        **/
       fifoQueueLen: u32 & AugmentedConst<ApiType>;
-      /**
-       * The issuance to ignore. This is subtracted from the `Currency`'s `total_issuance` to get
-       * the issuance by which we inflate or deflate the gilt.
-       **/
-      ignoredIssuance: BalanceOf & AugmentedConst<ApiType>;
       /**
        * The number of blocks between consecutive attempts to issue more gilts in an effort to
        * get to the target amount to be frozen.
@@ -397,7 +358,7 @@ declare module '@polkadot/api/types/consts' {
        * A larger value results in fewer storage hits each block, but a slower period to get to
        * the target.
        **/
-      intakePeriod: BlockNumber & AugmentedConst<ApiType>;
+      intakePeriod: u32 & AugmentedConst<ApiType>;
       /**
        * The maximum amount of bids that can be turned into issued gilts each block. A larger
        * value here means less of the block available for transactions should there be a glut of
@@ -416,12 +377,12 @@ declare module '@polkadot/api/types/consts' {
        * It should be at least big enough to ensure that there is no possible storage spam attack
        * or queue-filling attack.
        **/
-      minFreeze: BalanceOf & AugmentedConst<ApiType>;
+      minFreeze: u128 & AugmentedConst<ApiType>;
       /**
        * The base period for the duration queues. This is the common multiple across all
        * supported freezing durations that can be bid upon.
        **/
-      period: BlockNumber & AugmentedConst<ApiType>;
+      period: u32 & AugmentedConst<ApiType>;
       /**
        * Number of duration queues in total. This sets the maximum duration supported, which is
        * this value multiplied by `Period`.
@@ -432,15 +393,25 @@ declare module '@polkadot/api/types/consts' {
        **/
       [key: string]: Codec;
     };
+    grandpa: {
+      /**
+       * Max Authorities in use
+       **/
+      maxAuthorities: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
     identity: {
       /**
        * The amount held on deposit for a registered identity
        **/
-      basicDeposit: BalanceOf & AugmentedConst<ApiType>;
+      basicDeposit: u128 & AugmentedConst<ApiType>;
       /**
        * The amount held on deposit per additional field for a registered identity.
        **/
-      fieldDeposit: BalanceOf & AugmentedConst<ApiType>;
+      fieldDeposit: u128 & AugmentedConst<ApiType>;
       /**
        * Maximum number of additional fields that may be stored in an ID. Needed to bound the I/O
        * required to access an identity, but can be pretty high.
@@ -460,7 +431,7 @@ declare module '@polkadot/api/types/consts' {
        * that one storage item's value will increase by the size of an account ID, and there will
        * be another trie item whose value is the size of an account ID plus 32 bytes.
        **/
-      subAccountDeposit: BalanceOf & AugmentedConst<ApiType>;
+      subAccountDeposit: u128 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -473,7 +444,7 @@ declare module '@polkadot/api/types/consts' {
        * This is exposed so that it can be tuned for particular runtime, when
        * multiple pallets send unsigned transactions.
        **/
-      unsignedPriority: TransactionPriority & AugmentedConst<ApiType>;
+      unsignedPriority: u64 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -483,27 +454,7 @@ declare module '@polkadot/api/types/consts' {
       /**
        * The deposit needed for reserving an index.
        **/
-      deposit: BalanceOf & AugmentedConst<ApiType>;
-      /**
-       * Generic const
-       **/
-      [key: string]: Codec;
-    };
-    lottery: {
-      /**
-       * The max number of calls available in a single lottery.
-       **/
-      maxCalls: u32 & AugmentedConst<ApiType>;
-      /**
-       * Number of time we should try to generate a random number that has no modulo bias.
-       * The larger this number, the more potential computation is used for picking the winner,
-       * but also the more likely that the chosen winner is done fairly.
-       **/
-      maxGenerateRandom: u32 & AugmentedConst<ApiType>;
-      /**
-       * The Lottery's pallet id
-       **/
-      palletId: PalletId & AugmentedConst<ApiType>;
+      deposit: u128 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -518,13 +469,13 @@ declare module '@polkadot/api/types/consts' {
        * `4 + sizeof((BlockNumber, Balance, AccountId))` bytes and whose key size is
        * `32 + sizeof(AccountId)` bytes.
        **/
-      depositBase: BalanceOf & AugmentedConst<ApiType>;
+      depositBase: u128 & AugmentedConst<ApiType>;
       /**
        * The amount of currency needed per unit threshold when creating a multisig execution.
        * 
        * This is held for adding 32 bytes more into a pre-existing storage value.
        **/
-      depositFactor: BalanceOf & AugmentedConst<ApiType>;
+      depositFactor: u128 & AugmentedConst<ApiType>;
       /**
        * The maximum amount of signatories allowed in the multisig.
        **/
@@ -534,6 +485,52 @@ declare module '@polkadot/api/types/consts' {
        **/
       [key: string]: Codec;
     };
+    paras: {
+      unsignedPriority: u64 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    phragmenElection: {
+      /**
+       * How much should be locked up in order to submit one's candidacy.
+       **/
+      candidacyBond: u128 & AugmentedConst<ApiType>;
+      /**
+       * Number of members to elect.
+       **/
+      desiredMembers: u32 & AugmentedConst<ApiType>;
+      /**
+       * Number of runners_up to keep.
+       **/
+      desiredRunnersUp: u32 & AugmentedConst<ApiType>;
+      /**
+       * Identifier for the elections-phragmen pallet's lock
+       **/
+      palletId: U8aFixed & AugmentedConst<ApiType>;
+      /**
+       * How long each seat is kept. This defines the next block number at which an election
+       * round will happen. If set to zero, no elections are ever triggered and the module will
+       * be in passive mode.
+       **/
+      termDuration: u32 & AugmentedConst<ApiType>;
+      /**
+       * Base deposit associated with voting.
+       * 
+       * This should be sensibly high to economically ensure the pallet cannot be attacked by
+       * creating a gigantic number of votes.
+       **/
+      votingBondBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of bond that need to be locked for each vote (32 bytes).
+       **/
+      votingBondFactor: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
     proxy: {
       /**
        * The base amount of currency needed to reserve for creating an announcement.
@@ -541,14 +538,14 @@ declare module '@polkadot/api/types/consts' {
        * This is held when a new storage item holding a `Balance` is created (typically 16
        * bytes).
        **/
-      announcementDepositBase: BalanceOf & AugmentedConst<ApiType>;
+      announcementDepositBase: u128 & AugmentedConst<ApiType>;
       /**
        * The amount of currency needed per announcement made.
        * 
        * This is held for adding an `AccountId`, `Hash` and `BlockNumber` (typically 68 bytes)
        * into a pre-existing storage value.
        **/
-      announcementDepositFactor: BalanceOf & AugmentedConst<ApiType>;
+      announcementDepositFactor: u128 & AugmentedConst<ApiType>;
       /**
        * The maximum amount of time-delayed announcements that are allowed to be pending.
        **/
@@ -563,7 +560,7 @@ declare module '@polkadot/api/types/consts' {
        * This is held for an additional storage item whose value size is
        * `sizeof(Balance)` bytes and whose key size is `sizeof(AccountId)` bytes.
        **/
-      proxyDepositBase: BalanceOf & AugmentedConst<ApiType>;
+      proxyDepositBase: u128 & AugmentedConst<ApiType>;
       /**
        * The amount of currency needed per proxy added.
        * 
@@ -571,7 +568,7 @@ declare module '@polkadot/api/types/consts' {
        * pre-existing storage value. Thus, when configuring `ProxyDepositFactor` one should take
        * into account `32 + proxy_type.encode().len()` bytes of data.
        **/
-      proxyDepositFactor: BalanceOf & AugmentedConst<ApiType>;
+      proxyDepositFactor: u128 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -584,7 +581,7 @@ declare module '@polkadot/api/types/consts' {
        * This is held for an additional storage item whose value size is
        * `2 + sizeof(BlockNumber, Balance)` bytes.
        **/
-      configDepositBase: BalanceOf & AugmentedConst<ApiType>;
+      configDepositBase: u128 & AugmentedConst<ApiType>;
       /**
        * The amount of currency needed per additional user when creating a recovery
        * configuration.
@@ -592,7 +589,7 @@ declare module '@polkadot/api/types/consts' {
        * This is held for adding `sizeof(AccountId)` bytes more into a pre-existing storage
        * value.
        **/
-      friendDepositFactor: BalanceOf & AugmentedConst<ApiType>;
+      friendDepositFactor: u128 & AugmentedConst<ApiType>;
       /**
        * The maximum amount of friends allowed in a recovery configuration.
        **/
@@ -606,7 +603,22 @@ declare module '@polkadot/api/types/consts' {
        * `sizeof(BlockNumber, Balance + T * AccountId)` bytes. Where T is a configurable
        * threshold.
        **/
-      recoveryDeposit: BalanceOf & AugmentedConst<ApiType>;
+      recoveryDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    registrar: {
+      /**
+       * The deposit to be paid per byte stored on chain.
+       **/
+      dataDepositPerByte: u128 & AugmentedConst<ApiType>;
+      /**
+       * The deposit to be paid to run a parathread.
+       * This should include the cost for storing the genesis head and validation code.
+       **/
+      paraDeposit: u128 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -617,7 +629,7 @@ declare module '@polkadot/api/types/consts' {
        * The maximum weight that may be scheduled per block for any dispatchables of less
        * priority than `schedule::HARD_DEADLINE`.
        **/
-      maximumWeight: Weight & AugmentedConst<ApiType>;
+      maximumWeight: u64 & AugmentedConst<ApiType>;
       /**
        * The maximum number of scheduled calls in the queue for a single block.
        * Not strictly enforced, but used for weight estimation.
@@ -628,41 +640,59 @@ declare module '@polkadot/api/types/consts' {
        **/
       [key: string]: Codec;
     };
+    slots: {
+      /**
+       * The number of blocks to offset each lease period by.
+       **/
+      leaseOffset: u32 & AugmentedConst<ApiType>;
+      /**
+       * The number of blocks over which a single period lasts.
+       **/
+      leasePeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
     society: {
       /**
        * The minimum amount of a deposit required for a bid to be made.
        **/
-      candidateDeposit: BalanceOf & AugmentedConst<ApiType>;
+      candidateDeposit: u128 & AugmentedConst<ApiType>;
       /**
        * The number of blocks between membership challenges.
        **/
-      challengePeriod: BlockNumber & AugmentedConst<ApiType>;
+      challengePeriod: u32 & AugmentedConst<ApiType>;
       /**
-       * Maximum candidate intake per round.
+       * The maximum number of candidates that we accept per round.
        **/
       maxCandidateIntake: u32 & AugmentedConst<ApiType>;
       /**
-       * The number of times a member may vote the wrong way (or not at all, when they are a skeptic)
-       * before they become suspended.
+       * The maximum duration of the payout lock.
+       **/
+      maxLockDuration: u32 & AugmentedConst<ApiType>;
+      /**
+       * The number of times a member may vote the wrong way (or not at all, when they are a
+       * skeptic) before they become suspended.
        **/
       maxStrikes: u32 & AugmentedConst<ApiType>;
       /**
-       * The societies's module id
+       * The societies's pallet id
        **/
-      palletId: PalletId & AugmentedConst<ApiType>;
+      palletId: FrameSupportPalletId & AugmentedConst<ApiType>;
       /**
        * The amount of incentive paid within each period. Doesn't include VoterTip.
        **/
-      periodSpend: BalanceOf & AugmentedConst<ApiType>;
+      periodSpend: u128 & AugmentedConst<ApiType>;
       /**
        * The number of blocks between candidate/membership rotation periods.
        **/
-      rotationPeriod: BlockNumber & AugmentedConst<ApiType>;
+      rotationPeriod: u32 & AugmentedConst<ApiType>;
       /**
        * The amount of the unpaid reward that gets deducted in the case that either a skeptic
        * doesn't vote or someone votes in the wrong way.
        **/
-      wrongSideDeduction: BalanceOf & AugmentedConst<ApiType>;
+      wrongSideDeduction: u128 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -672,7 +702,7 @@ declare module '@polkadot/api/types/consts' {
       /**
        * Number of eras that staked funds must remain bonded for.
        **/
-      bondingDuration: EraIndex & AugmentedConst<ApiType>;
+      bondingDuration: u32 & AugmentedConst<ApiType>;
       maxNominations: u32 & AugmentedConst<ApiType>;
       /**
        * The maximum number of nominators rewarded for each validator.
@@ -684,14 +714,14 @@ declare module '@polkadot/api/types/consts' {
       /**
        * Number of sessions per era.
        **/
-      sessionsPerEra: SessionIndex & AugmentedConst<ApiType>;
+      sessionsPerEra: u32 & AugmentedConst<ApiType>;
       /**
        * Number of eras that slashes are deferred by, after computation.
        * 
        * This should be less than the bonding duration. Set to 0 if slashes
        * should be applied immediately, without opportunity for intervention.
        **/
-      slashDeferDuration: EraIndex & AugmentedConst<ApiType>;
+      slashDeferDuration: u32 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -701,19 +731,19 @@ declare module '@polkadot/api/types/consts' {
       /**
        * Maximum number of block number to block hash mappings to keep (oldest pruned first).
        **/
-      blockHashCount: BlockNumber & AugmentedConst<ApiType>;
+      blockHashCount: u32 & AugmentedConst<ApiType>;
       /**
        * The maximum length of a block (in bytes).
        **/
-      blockLength: BlockLength & AugmentedConst<ApiType>;
+      blockLength: FrameSystemLimitsBlockLength & AugmentedConst<ApiType>;
       /**
        * Block & extrinsics weights: base values and limits.
        **/
-      blockWeights: BlockWeights & AugmentedConst<ApiType>;
+      blockWeights: FrameSystemLimitsBlockWeights & AugmentedConst<ApiType>;
       /**
        * The weight of runtime database operations the runtime can invoke.
        **/
-      dbWeight: RuntimeDbWeight & AugmentedConst<ApiType>;
+      dbWeight: FrameSupportWeightsRuntimeDbWeight & AugmentedConst<ApiType>;
       /**
        * The designated SS85 prefix of this chain.
        * 
@@ -725,7 +755,7 @@ declare module '@polkadot/api/types/consts' {
       /**
        * Get the chain's current version.
        **/
-      version: RuntimeVersion & AugmentedConst<ApiType>;
+      version: SpVersionRuntimeVersion & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -738,7 +768,7 @@ declare module '@polkadot/api/types/consts' {
        * generally work with this to determine a sensible block time. e.g. For Aura, it will be
        * double this period on default settings.
        **/
-      minimumPeriod: Moment & AugmentedConst<ApiType>;
+      minimumPeriod: u64 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -746,39 +776,65 @@ declare module '@polkadot/api/types/consts' {
     };
     tips: {
       /**
-       * The amount held on deposit per byte within the tip report reason.
+       * The amount held on deposit per byte within the tip report reason or bounty description.
        **/
-      dataDepositPerByte: BalanceOf & AugmentedConst<ApiType>;
+      dataDepositPerByte: u128 & AugmentedConst<ApiType>;
       /**
        * Maximum acceptable reason length.
+       * 
+       * Benchmarks depend on this value, be sure to update weights file when changing this value
        **/
       maximumReasonLength: u32 & AugmentedConst<ApiType>;
       /**
        * The period for which a tip remains open after is has achieved threshold tippers.
        **/
-      tipCountdown: BlockNumber & AugmentedConst<ApiType>;
+      tipCountdown: u32 & AugmentedConst<ApiType>;
       /**
-       * The amount of the final tip which goes to the original reporter of the tip.
+       * The percent of the final tip which goes to the original reporter of the tip.
        **/
       tipFindersFee: Percent & AugmentedConst<ApiType>;
       /**
        * The amount held on deposit for placing a tip report.
        **/
-      tipReportDepositBase: BalanceOf & AugmentedConst<ApiType>;
+      tipReportDepositBase: u128 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
       [key: string]: Codec;
     };
     transactionPayment: {
+      /**
+       * A fee mulitplier for `Operational` extrinsics to compute "virtual tip" to boost their
+       * `priority`
+       * 
+       * This value is multipled by the `final_fee` to obtain a "virtual tip" that is later
+       * added to a tip component in regular `priority` calculations.
+       * It means that a `Normal` transaction can front-run a similarly-sized `Operational`
+       * extrinsic (with no tip), by including a tip value greater than the virtual tip.
+       * 
+       * ```rust,ignore
+       * // For `Normal`
+       * let priority = priority_calc(tip);
+       * 
+       * // For `Operational`
+       * let virtual_tip = (inclusion_fee + tip) * OperationalFeeMultiplier;
+       * let priority = priority_calc(tip + virtual_tip);
+       * ```
+       * 
+       * Note that since we use `final_fee` the multiplier applies also to the regular `tip`
+       * sent with the transaction. So, not only does the transaction get a priority bump based
+       * on the `inclusion_fee`, but we also amplify the impact of tips applied to `Operational`
+       * transactions.
+       **/
+      operationalFeeMultiplier: u8 & AugmentedConst<ApiType>;
       /**
        * The fee to be paid for making a transaction; the per-byte portion.
        **/
-      transactionByteFee: BalanceOf & AugmentedConst<ApiType>;
+      transactionByteFee: u128 & AugmentedConst<ApiType>;
       /**
        * The polynomial that is applied in order to derive fee from weight.
        **/
-      weightToFee: Vec<WeightToFeeCoefficient> & AugmentedConst<ApiType>;
+      weightToFee: Vec<FrameSupportWeightsWeightToFeeCoefficient> & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -796,7 +852,7 @@ declare module '@polkadot/api/types/consts' {
       /**
        * The treasury's pallet id, used for deriving its sovereign account ID.
        **/
-      palletId: PalletId & AugmentedConst<ApiType>;
+      palletId: FrameSupportPalletId & AugmentedConst<ApiType>;
       /**
        * Fraction of a proposal's value that should be bonded in order to place the proposal.
        * An accepted proposal gets these back. A rejected proposal does not.
@@ -805,50 +861,11 @@ declare module '@polkadot/api/types/consts' {
       /**
        * Minimum amount of funds that should be placed in a deposit for making a proposal.
        **/
-      proposalBondMinimum: BalanceOf & AugmentedConst<ApiType>;
+      proposalBondMinimum: u128 & AugmentedConst<ApiType>;
       /**
        * Period between successive spends.
        **/
-      spendPeriod: BlockNumber & AugmentedConst<ApiType>;
-      /**
-       * Generic const
-       **/
-      [key: string]: Codec;
-    };
-    uniques: {
-      /**
-       * The basic amount of funds that must be reserved when adding an attribute to an asset.
-       **/
-      attributeDepositBase: DepositBalanceOf & AugmentedConst<ApiType>;
-      /**
-       * The basic amount of funds that must be reserved for an asset class.
-       **/
-      classDeposit: DepositBalanceOf & AugmentedConst<ApiType>;
-      /**
-       * The additional funds that must be reserved for the number of bytes store in metadata,
-       * either "normal" metadata or attribute metadata.
-       **/
-      depositPerByte: DepositBalanceOf & AugmentedConst<ApiType>;
-      /**
-       * The basic amount of funds that must be reserved for an asset instance.
-       **/
-      instanceDeposit: DepositBalanceOf & AugmentedConst<ApiType>;
-      /**
-       * The maximum length of an attribute key.
-       **/
-      keyLimit: u32 & AugmentedConst<ApiType>;
-      /**
-       * The basic amount of funds that must be reserved when adding metadata to your asset.
-       **/
-      metadataDepositBase: DepositBalanceOf & AugmentedConst<ApiType>;
-      /**
-       * The maximum length of data stored on-chain.
-       **/
-      stringLimit: u32 & AugmentedConst<ApiType>;
-      /**
-       * The maximum length of an attribute value.
-       **/
-      valueLimit: u32 & AugmentedConst<ApiType>;
+      spendPeriod: u32 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -869,15 +886,11 @@ declare module '@polkadot/api/types/consts' {
       /**
        * The minimum amount transferred to call `vested_transfer`.
        **/
-      minVestedTransfer: BalanceOf & AugmentedConst<ApiType>;
+      minVestedTransfer: u128 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
       [key: string]: Codec;
     };
-  }
-
-  export interface QueryableConsts<ApiType extends ApiTypes> extends AugmentedConsts<ApiType> {
-    [key: string]: QueryableModuleConsts;
-  }
-}
+  } // AugmentedConsts
+} // declare module

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

@@ -1,9 +1,9 @@
-// Copyright 2017-2021 @polkadot/api authors & contributors
+// Copyright 2017-2022 @polkadot/api-augment authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import '../base';
 import './consts';
 import './errors';
 import './events';
 import './query';
-import './rpc';
 import './tx';

packages/api-augment/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2022 @polkadot/api-augment authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Do not edit, auto-generated by @polkadot/dev
+
+export const packageInfo = { name: '@polkadot/api-augment', path: 'auto', type: 'auto', version: '7.5.1' };

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

@@ -0,0 +1,768 @@
+// Auto-generated via `yarn polkadot-types-from-chain`, do not edit
+/* eslint-disable */
+
+import type { ApiTypes } from '@polkadot/api-base/types';
+import type { Bytes, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
+import type { Codec } from '@polkadot/types-codec/types';
+import type { Perbill, Percent, Permill } from '@polkadot/types/interfaces/runtime';
+import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
+
+declare module '@polkadot/api-base/types/consts' {
+  export interface AugmentedConsts<ApiType extends ApiTypes> {
+    auctions: {
+      /**
+       * The number of blocks over which an auction may be retroactively ended.
+       **/
+      endingPeriod: u32 & AugmentedConst<ApiType>;
+      leasePeriodsPerSlot: u32 & AugmentedConst<ApiType>;
+      /**
+       * The length of each sample to take during the ending period.
+       * 
+       * `EndingPeriod` / `SampleLength` = Total # of Samples
+       **/
+      sampleLength: u32 & AugmentedConst<ApiType>;
+      slotRangeCount: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    authorship: {
+      /**
+       * The number of blocks back we should accept uncles.
+       * This means that we will deal with uncle-parents that are
+       * `UncleGenerations + 1` before `now`.
+       **/
+      uncleGenerations: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    babe: {
+      /**
+       * The amount of time, in slots, that each epoch should last.
+       * NOTE: Currently it is not possible to change the epoch duration after
+       * the chain has started. Attempting to do so will brick block production.
+       **/
+      epochDuration: u64 & AugmentedConst<ApiType>;
+      /**
+       * The expected average block time at which BABE should be creating
+       * blocks. Since BABE is probabilistic it is not trivial to figure out
+       * what the expected average block time should be based on the slot
+       * duration and the security parameter `c` (where `1 - c` represents
+       * the probability of a slot being empty).
+       **/
+      expectedBlockTime: u64 & AugmentedConst<ApiType>;
+      /**
+       * Max number of authorities allowed
+       **/
+      maxAuthorities: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    bagsList: {
+      /**
+       * The list of thresholds separating the various bags.
+       * 
+       * Ids are separated into unsorted bags according to their vote weight. This specifies the
+       * thresholds separating the bags. An id's bag is the largest bag for which the id's weight
+       * is less than or equal to its upper threshold.
+       * 
+       * When ids are iterated, higher bags are iterated completely before lower bags. This means
+       * that iteration is _semi-sorted_: ids of higher weight tend to come before ids of lower
+       * weight, but peer ids within a particular bag are sorted in insertion order.
+       * 
+       * # Expressing the constant
+       * 
+       * This constant must be sorted in strictly increasing order. Duplicate items are not
+       * permitted.
+       * 
+       * There is an implied upper limit of `VoteWeight::MAX`; that value does not need to be
+       * specified within the bag. For any two threshold lists, if one ends with
+       * `VoteWeight::MAX`, the other one does not, and they are otherwise equal, the two lists
+       * will behave identically.
+       * 
+       * # Calculation
+       * 
+       * It is recommended to generate the set of thresholds in a geometric series, such that
+       * there exists some constant ratio such that `threshold[k + 1] == (threshold[k] *
+       * constant_ratio).max(threshold[k] + 1)` for all `k`.
+       * 
+       * The helpers in the `/utils/frame/generate-bags` module can simplify this calculation.
+       * 
+       * # Examples
+       * 
+       * - If `BagThresholds::get().is_empty()`, then all ids are put into the same bag, and
+       * iteration is strictly in insertion order.
+       * - If `BagThresholds::get().len() == 64`, and the thresholds are determined according to
+       * the procedure given above, then the constant ratio is equal to 2.
+       * - If `BagThresholds::get().len() == 200`, and the thresholds are determined according to
+       * the procedure given above, then the constant ratio is approximately equal to 1.248.
+       * - If the threshold list begins `[1, 2, 3, ...]`, then an id with weight 0 or 1 will fall
+       * into bag 0, an id with weight 2 will fall into bag 1, etc.
+       * 
+       * # Migration
+       * 
+       * In the event that this list ever changes, a copy of the old bags list must be retained.
+       * With that `List::migrate` can be called, which will perform the appropriate migration.
+       **/
+      bagThresholds: Vec<u64> & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    balances: {
+      /**
+       * The minimum amount required to keep an account open.
+       **/
+      existentialDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of locks that should exist on an account.
+       * Not strictly enforced, but used for weight estimation.
+       **/
+      maxLocks: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of named reserves that can exist on an account.
+       **/
+      maxReserves: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    bounties: {
+      /**
+       * Percentage of the curator fee that will be reserved upfront as deposit for bounty
+       * curator.
+       **/
+      bountyCuratorDeposit: Permill & AugmentedConst<ApiType>;
+      /**
+       * The amount held on deposit for placing a bounty proposal.
+       **/
+      bountyDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The delay period for which a bounty beneficiary need to wait before claim the payout.
+       **/
+      bountyDepositPayoutDelay: u32 & AugmentedConst<ApiType>;
+      /**
+       * Bounty duration in blocks.
+       **/
+      bountyUpdatePeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * Minimum value for a bounty.
+       **/
+      bountyValueMinimum: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount held on deposit per byte within the tip report reason or bounty description.
+       **/
+      dataDepositPerByte: u128 & AugmentedConst<ApiType>;
+      /**
+       * Maximum acceptable reason length.
+       * 
+       * Benchmarks depend on this value, be sure to update weights file when changing this value
+       **/
+      maximumReasonLength: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    claims: {
+      prefix: Bytes & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    crowdloan: {
+      /**
+       * The minimum amount that may be contributed into a crowdloan. Should almost certainly be at
+       * least `ExistentialDeposit`.
+       **/
+      minContribution: u128 & AugmentedConst<ApiType>;
+      /**
+       * `PalletId` for the crowdloan pallet. An appropriate value could be `PalletId(*b"py/cfund")`
+       **/
+      palletId: FrameSupportPalletId & AugmentedConst<ApiType>;
+      /**
+       * Max number of storage keys to remove per extrinsic call.
+       **/
+      removeKeysLimit: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    democracy: {
+      /**
+       * Period in blocks where an external proposal may not be re-submitted after being vetoed.
+       **/
+      cooloffPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * The period between a proposal being approved and enacted.
+       * 
+       * It should generally be a little more than the unstake period to ensure that
+       * voting stakers have an opportunity to remove themselves from the system in the case
+       * where they are on the losing side of a vote.
+       **/
+      enactmentPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * Minimum voting period allowed for a fast-track referendum.
+       **/
+      fastTrackVotingPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * Indicator for whether an emergency origin is even allowed to happen. Some chains may
+       * want to set this permanently to `false`, others may want to condition it on things such
+       * as an upgrade having happened recently.
+       **/
+      instantAllowed: bool & AugmentedConst<ApiType>;
+      /**
+       * How often (in blocks) new public referenda are launched.
+       **/
+      launchPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of public proposals that can exist at any time.
+       **/
+      maxProposals: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of votes for an account.
+       * 
+       * Also used to compute weight, an overly big value can
+       * lead to extrinsic with very big weight: see `delegate` for instance.
+       **/
+      maxVotes: u32 & AugmentedConst<ApiType>;
+      /**
+       * The minimum amount to be used as a deposit for a public referendum proposal.
+       **/
+      minimumDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of balance that must be deposited per byte of preimage stored.
+       **/
+      preimageByteDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The minimum period of vote locking.
+       * 
+       * It should be no shorter than enactment period to ensure that in the case of an approval,
+       * those successful voters are locked into the consequences that their votes entail.
+       **/
+      voteLockingPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * How often (in blocks) to check for new votes.
+       **/
+      votingPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    electionProviderMultiPhase: {
+      /**
+       * Maximum length (bytes) that the mined solution should consume.
+       * 
+       * The miner will ensure that the total length of the unsigned solution will not exceed
+       * this value.
+       **/
+      minerMaxLength: u32 & AugmentedConst<ApiType>;
+      /**
+       * Maximum weight that the miner should consume.
+       * 
+       * The miner will ensure that the total weight of the unsigned solution will not exceed
+       * this value, based on [`WeightInfo::submit_unsigned`].
+       **/
+      minerMaxWeight: u64 & AugmentedConst<ApiType>;
+      /**
+       * The priority of the unsigned transaction submitted in the unsigned-phase
+       **/
+      minerTxPriority: u64 & AugmentedConst<ApiType>;
+      /**
+       * The repeat threshold of the offchain worker.
+       * 
+       * For example, if it is 5, that means that at least 5 blocks will elapse between attempts
+       * to submit the worker's solution.
+       **/
+      offchainRepeat: u32 & AugmentedConst<ApiType>;
+      /**
+       * Base deposit for a signed solution.
+       **/
+      signedDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * Per-byte deposit for a signed solution.
+       **/
+      signedDepositByte: u128 & AugmentedConst<ApiType>;
+      /**
+       * Per-weight deposit for a signed solution.
+       **/
+      signedDepositWeight: u128 & AugmentedConst<ApiType>;
+      /**
+       * Maximum number of signed submissions that can be queued.
+       * 
+       * It is best to avoid adjusting this during an election, as it impacts downstream data
+       * structures. In particular, `SignedSubmissionIndices<T>` is bounded on this value. If you
+       * update this value during an election, you _must_ ensure that
+       * `SignedSubmissionIndices.len()` is less than or equal to the new value. Otherwise,
+       * attempts to submit new solutions may cause a runtime panic.
+       **/
+      signedMaxSubmissions: u32 & AugmentedConst<ApiType>;
+      /**
+       * Maximum weight of a signed solution.
+       * 
+       * This should probably be similar to [`Config::MinerMaxWeight`].
+       **/
+      signedMaxWeight: u64 & AugmentedConst<ApiType>;
+      /**
+       * Duration of the signed phase.
+       **/
+      signedPhase: u32 & AugmentedConst<ApiType>;
+      /**
+       * Base reward for a signed solution
+       **/
+      signedRewardBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The minimum amount of improvement to the solution score that defines a solution as
+       * "better" (in any phase).
+       **/
+      solutionImprovementThreshold: Perbill & AugmentedConst<ApiType>;
+      /**
+       * Duration of the unsigned phase.
+       **/
+      unsignedPhase: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of voters to put in the snapshot. At the moment, snapshots are only
+       * over a single block, but once multi-block elections are introduced they will take place
+       * over multiple blocks.
+       * 
+       * Also, note the data type: If the voters are represented by a `u32` in `type
+       * CompactSolution`, the same `u32` is used here to ensure bounds are respected.
+       **/
+      voterSnapshotPerBlock: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    grandpa: {
+      /**
+       * Max Authorities in use
+       **/
+      maxAuthorities: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    identity: {
+      /**
+       * The amount held on deposit for a registered identity
+       **/
+      basicDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount held on deposit per additional field for a registered identity.
+       **/
+      fieldDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * Maximum number of additional fields that may be stored in an ID. Needed to bound the I/O
+       * required to access an identity, but can be pretty high.
+       **/
+      maxAdditionalFields: u32 & AugmentedConst<ApiType>;
+      /**
+       * Maxmimum number of registrars allowed in the system. Needed to bound the complexity
+       * of, e.g., updating judgements.
+       **/
+      maxRegistrars: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of sub-accounts allowed per identified account.
+       **/
+      maxSubAccounts: u32 & AugmentedConst<ApiType>;
+      /**
+       * The amount held on deposit for a registered subaccount. This should account for the fact
+       * that one storage item's value will increase by the size of an account ID, and there will
+       * be another trie item whose value is the size of an account ID plus 32 bytes.
+       **/
+      subAccountDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    imOnline: {
+      /**
+       * A configuration for base priority of unsigned transactions.
+       * 
+       * This is exposed so that it can be tuned for particular runtime, when
+       * multiple pallets send unsigned transactions.
+       **/
+      unsignedPriority: u64 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    indices: {
+      /**
+       * The deposit needed for reserving an index.
+       **/
+      deposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    multisig: {
+      /**
+       * The base amount of currency needed to reserve for creating a multisig execution or to
+       * store a dispatch call for later.
+       * 
+       * This is held for an additional storage item whose value size is
+       * `4 + sizeof((BlockNumber, Balance, AccountId))` bytes and whose key size is
+       * `32 + sizeof(AccountId)` bytes.
+       **/
+      depositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of currency needed per unit threshold when creating a multisig execution.
+       * 
+       * This is held for adding 32 bytes more into a pre-existing storage value.
+       **/
+      depositFactor: u128 & AugmentedConst<ApiType>;
+      /**
+       * The maximum amount of signatories allowed in the multisig.
+       **/
+      maxSignatories: u16 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    paras: {
+      unsignedPriority: u64 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    phragmenElection: {
+      /**
+       * How much should be locked up in order to submit one's candidacy.
+       **/
+      candidacyBond: u128 & AugmentedConst<ApiType>;
+      /**
+       * Number of members to elect.
+       **/
+      desiredMembers: u32 & AugmentedConst<ApiType>;
+      /**
+       * Number of runners_up to keep.
+       **/
+      desiredRunnersUp: u32 & AugmentedConst<ApiType>;
+      /**
+       * Identifier for the elections-phragmen pallet's lock
+       **/
+      palletId: U8aFixed & AugmentedConst<ApiType>;
+      /**
+       * How long each seat is kept. This defines the next block number at which an election
+       * round will happen. If set to zero, no elections are ever triggered and the module will
+       * be in passive mode.
+       **/
+      termDuration: u32 & AugmentedConst<ApiType>;
+      /**
+       * Base deposit associated with voting.
+       * 
+       * This should be sensibly high to economically ensure the pallet cannot be attacked by
+       * creating a gigantic number of votes.
+       **/
+      votingBondBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of bond that need to be locked for each vote (32 bytes).
+       **/
+      votingBondFactor: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    proxy: {
+      /**
+       * The base amount of currency needed to reserve for creating an announcement.
+       * 
+       * This is held when a new storage item holding a `Balance` is created (typically 16
+       * bytes).
+       **/
+      announcementDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of currency needed per announcement made.
+       * 
+       * This is held for adding an `AccountId`, `Hash` and `BlockNumber` (typically 68 bytes)
+       * into a pre-existing storage value.
+       **/
+      announcementDepositFactor: u128 & AugmentedConst<ApiType>;
+      /**
+       * The maximum amount of time-delayed announcements that are allowed to be pending.
+       **/
+      maxPending: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum amount of proxies allowed for a single account.
+       **/
+      maxProxies: u32 & AugmentedConst<ApiType>;
+      /**
+       * The base amount of currency needed to reserve for creating a proxy.
+       * 
+       * This is held for an additional storage item whose value size is
+       * `sizeof(Balance)` bytes and whose key size is `sizeof(AccountId)` bytes.
+       **/
+      proxyDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of currency needed per proxy added.
+       * 
+       * This is held for adding 32 bytes plus an instance of `ProxyType` more into a
+       * pre-existing storage value. Thus, when configuring `ProxyDepositFactor` one should take
+       * into account `32 + proxy_type.encode().len()` bytes of data.
+       **/
+      proxyDepositFactor: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    registrar: {
+      /**
+       * The deposit to be paid per byte stored on chain.
+       **/
+      dataDepositPerByte: u128 & AugmentedConst<ApiType>;
+      /**
+       * The deposit to be paid to run a parathread.
+       * This should include the cost for storing the genesis head and validation code.
+       **/
+      paraDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    scheduler: {
+      /**
+       * The maximum weight that may be scheduled per block for any dispatchables of less
+       * priority than `schedule::HARD_DEADLINE`.
+       **/
+      maximumWeight: u64 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of scheduled calls in the queue for a single block.
+       * Not strictly enforced, but used for weight estimation.
+       **/
+      maxScheduledPerBlock: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    slots: {
+      /**
+       * The number of blocks to offset each lease period by.
+       **/
+      leaseOffset: u32 & AugmentedConst<ApiType>;
+      /**
+       * The number of blocks over which a single period lasts.
+       **/
+      leasePeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    staking: {
+      /**
+       * Number of eras that staked funds must remain bonded for.
+       **/
+      bondingDuration: u32 & AugmentedConst<ApiType>;
+      maxNominations: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of nominators rewarded for each validator.
+       * 
+       * For each validator only the `$MaxNominatorRewardedPerValidator` biggest stakers can
+       * claim their reward. This used to limit the i/o cost for the nominator payout.
+       **/
+      maxNominatorRewardedPerValidator: u32 & AugmentedConst<ApiType>;
+      /**
+       * Number of sessions per era.
+       **/
+      sessionsPerEra: u32 & AugmentedConst<ApiType>;
+      /**
+       * Number of eras that slashes are deferred by, after computation.
+       * 
+       * This should be less than the bonding duration. Set to 0 if slashes
+       * should be applied immediately, without opportunity for intervention.
+       **/
+      slashDeferDuration: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    system: {
+      /**
+       * Maximum number of block number to block hash mappings to keep (oldest pruned first).
+       **/
+      blockHashCount: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum length of a block (in bytes).
+       **/
+      blockLength: FrameSystemLimitsBlockLength & AugmentedConst<ApiType>;
+      /**
+       * Block & extrinsics weights: base values and limits.
+       **/
+      blockWeights: FrameSystemLimitsBlockWeights & AugmentedConst<ApiType>;
+      /**
+       * The weight of runtime database operations the runtime can invoke.
+       **/
+      dbWeight: FrameSupportWeightsRuntimeDbWeight & AugmentedConst<ApiType>;
+      /**
+       * The designated SS85 prefix of this chain.
+       * 
+       * This replaces the "ss58Format" property declared in the chain spec. Reason is
+       * that the runtime should know about the prefix in order to make use of it as
+       * an identifier of the chain.
+       **/
+      ss58Prefix: u16 & AugmentedConst<ApiType>;
+      /**
+       * Get the chain's current version.
+       **/
+      version: SpVersionRuntimeVersion & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    timestamp: {
+      /**
+       * The minimum period between blocks. Beware that this is different to the *expected*
+       * period that the block production apparatus provides. Your chosen consensus system will
+       * generally work with this to determine a sensible block time. e.g. For Aura, it will be
+       * double this period on default settings.
+       **/
+      minimumPeriod: u64 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    tips: {
+      /**
+       * The amount held on deposit per byte within the tip report reason or bounty description.
+       **/
+      dataDepositPerByte: u128 & AugmentedConst<ApiType>;
+      /**
+       * Maximum acceptable reason length.
+       * 
+       * Benchmarks depend on this value, be sure to update weights file when changing this value
+       **/
+      maximumReasonLength: u32 & AugmentedConst<ApiType>;
+      /**
+       * The period for which a tip remains open after is has achieved threshold tippers.
+       **/
+      tipCountdown: u32 & AugmentedConst<ApiType>;
+      /**
+       * The percent of the final tip which goes to the original reporter of the tip.
+       **/
+      tipFindersFee: Percent & AugmentedConst<ApiType>;
+      /**
+       * The amount held on deposit for placing a tip report.
+       **/
+      tipReportDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    transactionPayment: {
+      /**
+       * A fee mulitplier for `Operational` extrinsics to compute "virtual tip" to boost their
+       * `priority`
+       * 
+       * This value is multipled by the `final_fee` to obtain a "virtual tip" that is later
+       * added to a tip component in regular `priority` calculations.
+       * It means that a `Normal` transaction can front-run a similarly-sized `Operational`
+       * extrinsic (with no tip), by including a tip value greater than the virtual tip.
+       * 
+       * ```rust,ignore
+       * // For `Normal`
+       * let priority = priority_calc(tip);
+       * 
+       * // For `Operational`
+       * let virtual_tip = (inclusion_fee + tip) * OperationalFeeMultiplier;
+       * let priority = priority_calc(tip + virtual_tip);
+       * ```
+       * 
+       * Note that since we use `final_fee` the multiplier applies also to the regular `tip`
+       * sent with the transaction. So, not only does the transaction get a priority bump based
+       * on the `inclusion_fee`, but we also amplify the impact of tips applied to `Operational`
+       * transactions.
+       **/
+      operationalFeeMultiplier: u8 & AugmentedConst<ApiType>;
+      /**
+       * The fee to be paid for making a transaction; the per-byte portion.
+       **/
+      transactionByteFee: u128 & AugmentedConst<ApiType>;
+      /**
+       * The polynomial that is applied in order to derive fee from weight.
+       **/
+      weightToFee: Vec<FrameSupportWeightsWeightToFeeCoefficient> & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    treasury: {
+      /**
+       * Percentage of spare funds (if any) that are burnt per spend period.
+       **/
+      burn: Permill & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of approvals that can wait in the spending queue.
+       **/
+      maxApprovals: u32 & AugmentedConst<ApiType>;
+      /**
+       * The treasury's pallet id, used for deriving its sovereign account ID.
+       **/
+      palletId: FrameSupportPalletId & AugmentedConst<ApiType>;
+      /**
+       * Fraction of a proposal's value that should be bonded in order to place the proposal.
+       * An accepted proposal gets these back. A rejected proposal does not.
+       **/
+      proposalBond: Permill & AugmentedConst<ApiType>;
+      /**
+       * Minimum amount of funds that should be placed in a deposit for making a proposal.
+       **/
+      proposalBondMinimum: u128 & AugmentedConst<ApiType>;
+      /**
+       * Period between successive spends.
+       **/
+      spendPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    utility: {
+      /**
+       * The limit on the number of batched calls.
+       **/
+      batchedCallsLimit: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    vesting: {
+      maxVestingSchedules: u32 & AugmentedConst<ApiType>;
+      /**
+       * The minimum amount transferred to call `vested_transfer`.
+       **/
+      minVestedTransfer: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+  } // AugmentedConsts
+} // declare module

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

@@ -0,0 +1,9 @@
+// Copyright 2017-2022 @polkadot/api-augment authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import '../base';
+import './consts';
+import './errors';
+import './events';
+import './query';
+import './tx';

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

@@ -0,0 +1,979 @@
+// Auto-generated via `yarn polkadot-types-from-chain`, do not edit
+/* eslint-disable */
+
+import type { ApiTypes } from '@polkadot/api-base/types';
+import type { U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
+import type { Codec } from '@polkadot/types-codec/types';
+import type { Perbill, Percent, Permill } from '@polkadot/types/interfaces/runtime';
+import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, PalletContractsSchedule, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
+
+declare module '@polkadot/api-base/types/consts' {
+  export interface AugmentedConsts<ApiType extends ApiTypes> {
+    assets: {
+      /**
+       * The amount of funds that must be reserved when creating a new approval.
+       **/
+      approvalDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of funds that must be reserved for a non-provider asset account to be
+       * maintained.
+       **/
+      assetAccountDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The basic amount of funds that must be reserved for an asset.
+       **/
+      assetDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The basic amount of funds that must be reserved when adding metadata to your asset.
+       **/
+      metadataDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The additional funds that must be reserved for the number of bytes you store in your
+       * metadata.
+       **/
+      metadataDepositPerByte: u128 & AugmentedConst<ApiType>;
+      /**
+       * The maximum length of a name or symbol stored on-chain.
+       **/
+      stringLimit: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    authorship: {
+      /**
+       * The number of blocks back we should accept uncles.
+       * This means that we will deal with uncle-parents that are
+       * `UncleGenerations + 1` before `now`.
+       **/
+      uncleGenerations: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    babe: {
+      /**
+       * The amount of time, in slots, that each epoch should last.
+       * NOTE: Currently it is not possible to change the epoch duration after
+       * the chain has started. Attempting to do so will brick block production.
+       **/
+      epochDuration: u64 & AugmentedConst<ApiType>;
+      /**
+       * The expected average block time at which BABE should be creating
+       * blocks. Since BABE is probabilistic it is not trivial to figure out
+       * what the expected average block time should be based on the slot
+       * duration and the security parameter `c` (where `1 - c` represents
+       * the probability of a slot being empty).
+       **/
+      expectedBlockTime: u64 & AugmentedConst<ApiType>;
+      /**
+       * Max number of authorities allowed
+       **/
+      maxAuthorities: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    bagsList: {
+      /**
+       * The list of thresholds separating the various bags.
+       * 
+       * Ids are separated into unsorted bags according to their vote weight. This specifies the
+       * thresholds separating the bags. An id's bag is the largest bag for which the id's weight
+       * is less than or equal to its upper threshold.
+       * 
+       * When ids are iterated, higher bags are iterated completely before lower bags. This means
+       * that iteration is _semi-sorted_: ids of higher weight tend to come before ids of lower
+       * weight, but peer ids within a particular bag are sorted in insertion order.
+       * 
+       * # Expressing the constant
+       * 
+       * This constant must be sorted in strictly increasing order. Duplicate items are not
+       * permitted.
+       * 
+       * There is an implied upper limit of `VoteWeight::MAX`; that value does not need to be
+       * specified within the bag. For any two threshold lists, if one ends with
+       * `VoteWeight::MAX`, the other one does not, and they are otherwise equal, the two lists
+       * will behave identically.
+       * 
+       * # Calculation
+       * 
+       * It is recommended to generate the set of thresholds in a geometric series, such that
+       * there exists some constant ratio such that `threshold[k + 1] == (threshold[k] *
+       * constant_ratio).max(threshold[k] + 1)` for all `k`.
+       * 
+       * The helpers in the `/utils/frame/generate-bags` module can simplify this calculation.
+       * 
+       * # Examples
+       * 
+       * - If `BagThresholds::get().is_empty()`, then all ids are put into the same bag, and
+       * iteration is strictly in insertion order.
+       * - If `BagThresholds::get().len() == 64`, and the thresholds are determined according to
+       * the procedure given above, then the constant ratio is equal to 2.
+       * - If `BagThresholds::get().len() == 200`, and the thresholds are determined according to
+       * the procedure given above, then the constant ratio is approximately equal to 1.248.
+       * - If the threshold list begins `[1, 2, 3, ...]`, then an id with weight 0 or 1 will fall
+       * into bag 0, an id with weight 2 will fall into bag 1, etc.
+       * 
+       * # Migration
+       * 
+       * In the event that this list ever changes, a copy of the old bags list must be retained.
+       * With that `List::migrate` can be called, which will perform the appropriate migration.
+       **/
+      bagThresholds: Vec<u64> & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    balances: {
+      /**
+       * The minimum amount required to keep an account open.
+       **/
+      existentialDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of locks that should exist on an account.
+       * Not strictly enforced, but used for weight estimation.
+       **/
+      maxLocks: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of named reserves that can exist on an account.
+       **/
+      maxReserves: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    bounties: {
+      /**
+       * Percentage of the curator fee that will be reserved upfront as deposit for bounty
+       * curator.
+       **/
+      bountyCuratorDeposit: Permill & AugmentedConst<ApiType>;
+      /**
+       * The amount held on deposit for placing a bounty proposal.
+       **/
+      bountyDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The delay period for which a bounty beneficiary need to wait before claim the payout.
+       **/
+      bountyDepositPayoutDelay: u32 & AugmentedConst<ApiType>;
+      /**
+       * Bounty duration in blocks.
+       **/
+      bountyUpdatePeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * Minimum value for a bounty.
+       **/
+      bountyValueMinimum: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount held on deposit per byte within the tip report reason or bounty description.
+       **/
+      dataDepositPerByte: u128 & AugmentedConst<ApiType>;
+      /**
+       * Maximum acceptable reason length.
+       * 
+       * Benchmarks depend on this value, be sure to update weights file when changing this value
+       **/
+      maximumReasonLength: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    childBounties: {
+      /**
+       * Percentage of child-bounty value to be reserved as curator deposit
+       * when curator fee is zero.
+       **/
+      childBountyCuratorDepositBase: Permill & AugmentedConst<ApiType>;
+      /**
+       * Minimum value for a child-bounty.
+       **/
+      childBountyValueMinimum: u128 & AugmentedConst<ApiType>;
+      /**
+       * Maximum number of child-bounties that can be added to a parent bounty.
+       **/
+      maxActiveChildBountyCount: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    contracts: {
+      /**
+       * The maximum number of contracts that can be pending for deletion.
+       * 
+       * When a contract is deleted by calling `seal_terminate` it becomes inaccessible
+       * immediately, but the deletion of the storage items it has accumulated is performed
+       * later. The contract is put into the deletion queue. This defines how many
+       * contracts can be queued up at the same time. If that limit is reached `seal_terminate`
+       * will fail. The action must be retried in a later block in that case.
+       * 
+       * The reasons for limiting the queue depth are:
+       * 
+       * 1. The queue is in storage in order to be persistent between blocks. We want to limit
+       * the amount of storage that can be consumed.
+       * 2. The queue is stored in a vector and needs to be decoded as a whole when reading
+       * it at the end of each block. Longer queues take more weight to decode and hence
+       * limit the amount of items that can be deleted per block.
+       **/
+      deletionQueueDepth: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum amount of weight that can be consumed per block for lazy trie removal.
+       * 
+       * The amount of weight that is dedicated per block to work on the deletion queue. Larger
+       * values allow more trie keys to be deleted in each block but reduce the amount of
+       * weight that is left for transactions. See [`Self::DeletionQueueDepth`] for more
+       * information about the deletion queue.
+       **/
+      deletionWeightLimit: u64 & AugmentedConst<ApiType>;
+      /**
+       * The amount of balance a caller has to pay for each byte of storage.
+       * 
+       * # Note
+       * 
+       * Changing this value for an existing chain might need a storage migration.
+       **/
+      depositPerByte: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of balance a caller has to pay for each storage item.
+       * 
+       * # Note
+       * 
+       * Changing this value for an existing chain might need a storage migration.
+       **/
+      depositPerItem: u128 & AugmentedConst<ApiType>;
+      /**
+       * Cost schedule and limits.
+       **/
+      schedule: PalletContractsSchedule & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    democracy: {
+      /**
+       * Period in blocks where an external proposal may not be re-submitted after being vetoed.
+       **/
+      cooloffPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * The period between a proposal being approved and enacted.
+       * 
+       * It should generally be a little more than the unstake period to ensure that
+       * voting stakers have an opportunity to remove themselves from the system in the case
+       * where they are on the losing side of a vote.
+       **/
+      enactmentPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * Minimum voting period allowed for a fast-track referendum.
+       **/
+      fastTrackVotingPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * Indicator for whether an emergency origin is even allowed to happen. Some chains may
+       * want to set this permanently to `false`, others may want to condition it on things such
+       * as an upgrade having happened recently.
+       **/
+      instantAllowed: bool & AugmentedConst<ApiType>;
+      /**
+       * How often (in blocks) new public referenda are launched.
+       **/
+      launchPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of public proposals that can exist at any time.
+       **/
+      maxProposals: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of votes for an account.
+       * 
+       * Also used to compute weight, an overly big value can
+       * lead to extrinsic with very big weight: see `delegate` for instance.
+       **/
+      maxVotes: u32 & AugmentedConst<ApiType>;
+      /**
+       * The minimum amount to be used as a deposit for a public referendum proposal.
+       **/
+      minimumDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of balance that must be deposited per byte of preimage stored.
+       **/
+      preimageByteDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The minimum period of vote locking.
+       * 
+       * It should be no shorter than enactment period to ensure that in the case of an approval,
+       * those successful voters are locked into the consequences that their votes entail.
+       **/
+      voteLockingPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * How often (in blocks) to check for new votes.
+       **/
+      votingPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    electionProviderMultiPhase: {
+      /**
+       * Maximum length (bytes) that the mined solution should consume.
+       * 
+       * The miner will ensure that the total length of the unsigned solution will not exceed
+       * this value.
+       **/
+      minerMaxLength: u32 & AugmentedConst<ApiType>;
+      /**
+       * Maximum weight that the miner should consume.
+       * 
+       * The miner will ensure that the total weight of the unsigned solution will not exceed
+       * this value, based on [`WeightInfo::submit_unsigned`].
+       **/
+      minerMaxWeight: u64 & AugmentedConst<ApiType>;
+      /**
+       * The priority of the unsigned transaction submitted in the unsigned-phase
+       **/
+      minerTxPriority: u64 & AugmentedConst<ApiType>;
+      /**
+       * The repeat threshold of the offchain worker.
+       * 
+       * For example, if it is 5, that means that at least 5 blocks will elapse between attempts
+       * to submit the worker's solution.
+       **/
+      offchainRepeat: u32 & AugmentedConst<ApiType>;
+      /**
+       * Base deposit for a signed solution.
+       **/
+      signedDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * Per-byte deposit for a signed solution.
+       **/
+      signedDepositByte: u128 & AugmentedConst<ApiType>;
+      /**
+       * Per-weight deposit for a signed solution.
+       **/
+      signedDepositWeight: u128 & AugmentedConst<ApiType>;
+      /**
+       * Maximum number of signed submissions that can be queued.
+       * 
+       * It is best to avoid adjusting this during an election, as it impacts downstream data
+       * structures. In particular, `SignedSubmissionIndices<T>` is bounded on this value. If you
+       * update this value during an election, you _must_ ensure that
+       * `SignedSubmissionIndices.len()` is less than or equal to the new value. Otherwise,
+       * attempts to submit new solutions may cause a runtime panic.
+       **/
+      signedMaxSubmissions: u32 & AugmentedConst<ApiType>;
+      /**
+       * Maximum weight of a signed solution.
+       * 
+       * This should probably be similar to [`Config::MinerMaxWeight`].
+       **/
+      signedMaxWeight: u64 & AugmentedConst<ApiType>;
+      /**
+       * Duration of the signed phase.
+       **/
+      signedPhase: u32 & AugmentedConst<ApiType>;
+      /**
+       * Base reward for a signed solution
+       **/
+      signedRewardBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The minimum amount of improvement to the solution score that defines a solution as
+       * "better" (in any phase).
+       **/
+      solutionImprovementThreshold: Perbill & AugmentedConst<ApiType>;
+      /**
+       * Duration of the unsigned phase.
+       **/
+      unsignedPhase: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of voters to put in the snapshot. At the moment, snapshots are only
+       * over a single block, but once multi-block elections are introduced they will take place
+       * over multiple blocks.
+       * 
+       * Also, note the data type: If the voters are represented by a `u32` in `type
+       * CompactSolution`, the same `u32` is used here to ensure bounds are respected.
+       **/
+      voterSnapshotPerBlock: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    elections: {
+      /**
+       * How much should be locked up in order to submit one's candidacy.
+       **/
+      candidacyBond: u128 & AugmentedConst<ApiType>;
+      /**
+       * Number of members to elect.
+       **/
+      desiredMembers: u32 & AugmentedConst<ApiType>;
+      /**
+       * Number of runners_up to keep.
+       **/
+      desiredRunnersUp: u32 & AugmentedConst<ApiType>;
+      /**
+       * Identifier for the elections-phragmen pallet's lock
+       **/
+      palletId: U8aFixed & AugmentedConst<ApiType>;
+      /**
+       * How long each seat is kept. This defines the next block number at which an election
+       * round will happen. If set to zero, no elections are ever triggered and the module will
+       * be in passive mode.
+       **/
+      termDuration: u32 & AugmentedConst<ApiType>;
+      /**
+       * Base deposit associated with voting.
+       * 
+       * This should be sensibly high to economically ensure the pallet cannot be attacked by
+       * creating a gigantic number of votes.
+       **/
+      votingBondBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of bond that need to be locked for each vote (32 bytes).
+       **/
+      votingBondFactor: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    gilt: {
+      /**
+       * Portion of the queue which is free from ordering and just a FIFO.
+       * 
+       * Must be no greater than `MaxQueueLen`.
+       **/
+      fifoQueueLen: u32 & AugmentedConst<ApiType>;
+      /**
+       * The number of blocks between consecutive attempts to issue more gilts in an effort to
+       * get to the target amount to be frozen.
+       * 
+       * A larger value results in fewer storage hits each block, but a slower period to get to
+       * the target.
+       **/
+      intakePeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum amount of bids that can be turned into issued gilts each block. A larger
+       * value here means less of the block available for transactions should there be a glut of
+       * bids to make into gilts to reach the target.
+       **/
+      maxIntakeBids: u32 & AugmentedConst<ApiType>;
+      /**
+       * Maximum number of items that may be in each duration queue.
+       **/
+      maxQueueLen: u32 & AugmentedConst<ApiType>;
+      /**
+       * The minimum amount of funds that may be offered to freeze for a gilt. Note that this
+       * does not actually limit the amount which may be frozen in a gilt since gilts may be
+       * split up in order to satisfy the desired amount of funds under gilts.
+       * 
+       * It should be at least big enough to ensure that there is no possible storage spam attack
+       * or queue-filling attack.
+       **/
+      minFreeze: u128 & AugmentedConst<ApiType>;
+      /**
+       * The base period for the duration queues. This is the common multiple across all
+       * supported freezing durations that can be bid upon.
+       **/
+      period: u32 & AugmentedConst<ApiType>;
+      /**
+       * Number of duration queues in total. This sets the maximum duration supported, which is
+       * this value multiplied by `Period`.
+       **/
+      queueCount: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    grandpa: {
+      /**
+       * Max Authorities in use
+       **/
+      maxAuthorities: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    identity: {
+      /**
+       * The amount held on deposit for a registered identity
+       **/
+      basicDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount held on deposit per additional field for a registered identity.
+       **/
+      fieldDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * Maximum number of additional fields that may be stored in an ID. Needed to bound the I/O
+       * required to access an identity, but can be pretty high.
+       **/
+      maxAdditionalFields: u32 & AugmentedConst<ApiType>;
+      /**
+       * Maxmimum number of registrars allowed in the system. Needed to bound the complexity
+       * of, e.g., updating judgements.
+       **/
+      maxRegistrars: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of sub-accounts allowed per identified account.
+       **/
+      maxSubAccounts: u32 & AugmentedConst<ApiType>;
+      /**
+       * The amount held on deposit for a registered subaccount. This should account for the fact
+       * that one storage item's value will increase by the size of an account ID, and there will
+       * be another trie item whose value is the size of an account ID plus 32 bytes.
+       **/
+      subAccountDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    imOnline: {
+      /**
+       * A configuration for base priority of unsigned transactions.
+       * 
+       * This is exposed so that it can be tuned for particular runtime, when
+       * multiple pallets send unsigned transactions.
+       **/
+      unsignedPriority: u64 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    indices: {
+      /**
+       * The deposit needed for reserving an index.
+       **/
+      deposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    lottery: {
+      /**
+       * The max number of calls available in a single lottery.
+       **/
+      maxCalls: u32 & AugmentedConst<ApiType>;
+      /**
+       * Number of time we should try to generate a random number that has no modulo bias.
+       * The larger this number, the more potential computation is used for picking the winner,
+       * but also the more likely that the chosen winner is done fairly.
+       **/
+      maxGenerateRandom: u32 & AugmentedConst<ApiType>;
+      /**
+       * The Lottery's pallet id
+       **/
+      palletId: FrameSupportPalletId & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    multisig: {
+      /**
+       * The base amount of currency needed to reserve for creating a multisig execution or to
+       * store a dispatch call for later.
+       * 
+       * This is held for an additional storage item whose value size is
+       * `4 + sizeof((BlockNumber, Balance, AccountId))` bytes and whose key size is
+       * `32 + sizeof(AccountId)` bytes.
+       **/
+      depositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of currency needed per unit threshold when creating a multisig execution.
+       * 
+       * This is held for adding 32 bytes more into a pre-existing storage value.
+       **/
+      depositFactor: u128 & AugmentedConst<ApiType>;
+      /**
+       * The maximum amount of signatories allowed in the multisig.
+       **/
+      maxSignatories: u16 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    proxy: {
+      /**
+       * The base amount of currency needed to reserve for creating an announcement.
+       * 
+       * This is held when a new storage item holding a `Balance` is created (typically 16
+       * bytes).
+       **/
+      announcementDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of currency needed per announcement made.
+       * 
+       * This is held for adding an `AccountId`, `Hash` and `BlockNumber` (typically 68 bytes)
+       * into a pre-existing storage value.
+       **/
+      announcementDepositFactor: u128 & AugmentedConst<ApiType>;
+      /**
+       * The maximum amount of time-delayed announcements that are allowed to be pending.
+       **/
+      maxPending: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum amount of proxies allowed for a single account.
+       **/
+      maxProxies: u32 & AugmentedConst<ApiType>;
+      /**
+       * The base amount of currency needed to reserve for creating a proxy.
+       * 
+       * This is held for an additional storage item whose value size is
+       * `sizeof(Balance)` bytes and whose key size is `sizeof(AccountId)` bytes.
+       **/
+      proxyDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of currency needed per proxy added.
+       * 
+       * This is held for adding 32 bytes plus an instance of `ProxyType` more into a
+       * pre-existing storage value. Thus, when configuring `ProxyDepositFactor` one should take
+       * into account `32 + proxy_type.encode().len()` bytes of data.
+       **/
+      proxyDepositFactor: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    recovery: {
+      /**
+       * The base amount of currency needed to reserve for creating a recovery configuration.
+       * 
+       * This is held for an additional storage item whose value size is
+       * `2 + sizeof(BlockNumber, Balance)` bytes.
+       **/
+      configDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The amount of currency needed per additional user when creating a recovery
+       * configuration.
+       * 
+       * This is held for adding `sizeof(AccountId)` bytes more into a pre-existing storage
+       * value.
+       **/
+      friendDepositFactor: u128 & AugmentedConst<ApiType>;
+      /**
+       * The maximum amount of friends allowed in a recovery configuration.
+       **/
+      maxFriends: u16 & AugmentedConst<ApiType>;
+      /**
+       * The base amount of currency needed to reserve for starting a recovery.
+       * 
+       * This is primarily held for deterring malicious recovery attempts, and should
+       * have a value large enough that a bad actor would choose not to place this
+       * deposit. It also acts to fund additional storage item whose value size is
+       * `sizeof(BlockNumber, Balance + T * AccountId)` bytes. Where T is a configurable
+       * threshold.
+       **/
+      recoveryDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    scheduler: {
+      /**
+       * The maximum weight that may be scheduled per block for any dispatchables of less
+       * priority than `schedule::HARD_DEADLINE`.
+       **/
+      maximumWeight: u64 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of scheduled calls in the queue for a single block.
+       * Not strictly enforced, but used for weight estimation.
+       **/
+      maxScheduledPerBlock: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    society: {
+      /**
+       * The minimum amount of a deposit required for a bid to be made.
+       **/
+      candidateDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The number of blocks between membership challenges.
+       **/
+      challengePeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of candidates that we accept per round.
+       **/
+      maxCandidateIntake: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum duration of the payout lock.
+       **/
+      maxLockDuration: u32 & AugmentedConst<ApiType>;
+      /**
+       * The number of times a member may vote the wrong way (or not at all, when they are a
+       * skeptic) before they become suspended.
+       **/
+      maxStrikes: u32 & AugmentedConst<ApiType>;
+      /**
+       * The societies's pallet id
+       **/
+      palletId: FrameSupportPalletId & AugmentedConst<ApiType>;
+      /**
+       * The amount of incentive paid within each period. Doesn't include VoterTip.
+       **/
+      periodSpend: u128 & AugmentedConst<ApiType>;
+      /**
+       * The number of blocks between candidate/membership rotation periods.
+       **/
+      rotationPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * The amount of the unpaid reward that gets deducted in the case that either a skeptic
+       * doesn't vote or someone votes in the wrong way.
+       **/
+      wrongSideDeduction: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    staking: {
+      /**
+       * Number of eras that staked funds must remain bonded for.
+       **/
+      bondingDuration: u32 & AugmentedConst<ApiType>;
+      maxNominations: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of nominators rewarded for each validator.
+       * 
+       * For each validator only the `$MaxNominatorRewardedPerValidator` biggest stakers can
+       * claim their reward. This used to limit the i/o cost for the nominator payout.
+       **/
+      maxNominatorRewardedPerValidator: u32 & AugmentedConst<ApiType>;
+      /**
+       * Number of sessions per era.
+       **/
+      sessionsPerEra: u32 & AugmentedConst<ApiType>;
+      /**
+       * Number of eras that slashes are deferred by, after computation.
+       * 
+       * This should be less than the bonding duration. Set to 0 if slashes
+       * should be applied immediately, without opportunity for intervention.
+       **/
+      slashDeferDuration: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    system: {
+      /**
+       * Maximum number of block number to block hash mappings to keep (oldest pruned first).
+       **/
+      blockHashCount: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum length of a block (in bytes).
+       **/
+      blockLength: FrameSystemLimitsBlockLength & AugmentedConst<ApiType>;
+      /**
+       * Block & extrinsics weights: base values and limits.
+       **/
+      blockWeights: FrameSystemLimitsBlockWeights & AugmentedConst<ApiType>;
+      /**
+       * The weight of runtime database operations the runtime can invoke.
+       **/
+      dbWeight: FrameSupportWeightsRuntimeDbWeight & AugmentedConst<ApiType>;
+      /**
+       * The designated SS85 prefix of this chain.
+       * 
+       * This replaces the "ss58Format" property declared in the chain spec. Reason is
+       * that the runtime should know about the prefix in order to make use of it as
+       * an identifier of the chain.
+       **/
+      ss58Prefix: u16 & AugmentedConst<ApiType>;
+      /**
+       * Get the chain's current version.
+       **/
+      version: SpVersionRuntimeVersion & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    timestamp: {
+      /**
+       * The minimum period between blocks. Beware that this is different to the *expected*
+       * period that the block production apparatus provides. Your chosen consensus system will
+       * generally work with this to determine a sensible block time. e.g. For Aura, it will be
+       * double this period on default settings.
+       **/
+      minimumPeriod: u64 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    tips: {
+      /**
+       * The amount held on deposit per byte within the tip report reason or bounty description.
+       **/
+      dataDepositPerByte: u128 & AugmentedConst<ApiType>;
+      /**
+       * Maximum acceptable reason length.
+       * 
+       * Benchmarks depend on this value, be sure to update weights file when changing this value
+       **/
+      maximumReasonLength: u32 & AugmentedConst<ApiType>;
+      /**
+       * The period for which a tip remains open after is has achieved threshold tippers.
+       **/
+      tipCountdown: u32 & AugmentedConst<ApiType>;
+      /**
+       * The percent of the final tip which goes to the original reporter of the tip.
+       **/
+      tipFindersFee: Percent & AugmentedConst<ApiType>;
+      /**
+       * The amount held on deposit for placing a tip report.
+       **/
+      tipReportDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    transactionPayment: {
+      /**
+       * A fee mulitplier for `Operational` extrinsics to compute "virtual tip" to boost their
+       * `priority`
+       * 
+       * This value is multipled by the `final_fee` to obtain a "virtual tip" that is later
+       * added to a tip component in regular `priority` calculations.
+       * It means that a `Normal` transaction can front-run a similarly-sized `Operational`
+       * extrinsic (with no tip), by including a tip value greater than the virtual tip.
+       * 
+       * ```rust,ignore
+       * // For `Normal`
+       * let priority = priority_calc(tip);
+       * 
+       * // For `Operational`
+       * let virtual_tip = (inclusion_fee + tip) * OperationalFeeMultiplier;
+       * let priority = priority_calc(tip + virtual_tip);
+       * ```
+       * 
+       * Note that since we use `final_fee` the multiplier applies also to the regular `tip`
+       * sent with the transaction. So, not only does the transaction get a priority bump based
+       * on the `inclusion_fee`, but we also amplify the impact of tips applied to `Operational`
+       * transactions.
+       **/
+      operationalFeeMultiplier: u8 & AugmentedConst<ApiType>;
+      /**
+       * The fee to be paid for making a transaction; the per-byte portion.
+       **/
+      transactionByteFee: u128 & AugmentedConst<ApiType>;
+      /**
+       * The polynomial that is applied in order to derive fee from weight.
+       **/
+      weightToFee: Vec<FrameSupportWeightsWeightToFeeCoefficient> & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    treasury: {
+      /**
+       * Percentage of spare funds (if any) that are burnt per spend period.
+       **/
+      burn: Permill & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of approvals that can wait in the spending queue.
+       **/
+      maxApprovals: u32 & AugmentedConst<ApiType>;
+      /**
+       * The treasury's pallet id, used for deriving its sovereign account ID.
+       **/
+      palletId: FrameSupportPalletId & AugmentedConst<ApiType>;
+      /**
+       * Fraction of a proposal's value that should be bonded in order to place the proposal.
+       * An accepted proposal gets these back. A rejected proposal does not.
+       **/
+      proposalBond: Permill & AugmentedConst<ApiType>;
+      /**
+       * Minimum amount of funds that should be placed in a deposit for making a proposal.
+       **/
+      proposalBondMinimum: u128 & AugmentedConst<ApiType>;
+      /**
+       * Period between successive spends.
+       **/
+      spendPeriod: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    uniques: {
+      /**
+       * The basic amount of funds that must be reserved when adding an attribute to an asset.
+       **/
+      attributeDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The basic amount of funds that must be reserved for an asset class.
+       **/
+      classDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The additional funds that must be reserved for the number of bytes store in metadata,
+       * either "normal" metadata or attribute metadata.
+       **/
+      depositPerByte: u128 & AugmentedConst<ApiType>;
+      /**
+       * The basic amount of funds that must be reserved for an asset instance.
+       **/
+      instanceDeposit: u128 & AugmentedConst<ApiType>;
+      /**
+       * The maximum length of an attribute key.
+       **/
+      keyLimit: u32 & AugmentedConst<ApiType>;
+      /**
+       * The basic amount of funds that must be reserved when adding metadata to your asset.
+       **/
+      metadataDepositBase: u128 & AugmentedConst<ApiType>;
+      /**
+       * The maximum length of data stored on-chain.
+       **/
+      stringLimit: u32 & AugmentedConst<ApiType>;
+      /**
+       * The maximum length of an attribute value.
+       **/
+      valueLimit: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    utility: {
+      /**
+       * The limit on the number of batched calls.
+       **/
+      batchedCallsLimit: u32 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+    vesting: {
+      maxVestingSchedules: u32 & AugmentedConst<ApiType>;
+      /**
+       * The minimum amount transferred to call `vested_transfer`.
+       **/
+      minVestedTransfer: u128 & AugmentedConst<ApiType>;
+      /**
+       * Generic const
+       **/
+      [key: string]: Codec;
+    };
+  } // AugmentedConsts
+} // declare module

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

@@ -1,11 +1,15 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
-import type { ApiTypes } from '@polkadot/api/types';
+import type { ApiTypes } from '@polkadot/api-base/types';
 
-declare module '@polkadot/api/types/errors' {
-  export interface AugmentedErrors<ApiType> {
+declare module '@polkadot/api-base/types/errors' {
+  export interface AugmentedErrors<ApiType extends ApiTypes> {
     assets: {
+      /**
+       * The asset-account already exists.
+       **/
+      AlreadyExists: AugmentedError<ApiType>;
       /**
        * Invalid metadata given.
        **/
@@ -18,10 +22,6 @@ declare module '@polkadot/api/types/errors' {
        * Account balance must be greater than or equal to the transfer amount.
        **/
       BalanceLow: AugmentedError<ApiType>;
-      /**
-       * Balance should be non-zero.
-       **/
-      BalanceZero: AugmentedError<ApiType>;
       /**
        * The origin account is frozen.
        **/
@@ -34,13 +34,22 @@ declare module '@polkadot/api/types/errors' {
        * Minimum balance should be non-zero.
        **/
       MinBalanceZero: AugmentedError<ApiType>;
+      /**
+       * The account to alter does not exist.
+       **/
+      NoAccount: AugmentedError<ApiType>;
+      /**
+       * The asset-account doesn't have an associated deposit.
+       **/
+      NoDeposit: AugmentedError<ApiType>;
       /**
        * The signing account has no permission to do the operation.
        **/
       NoPermission: AugmentedError<ApiType>;
       /**
-       * No provider reference exists to allow a non-zero balance of a non-self-sufficient
-       * asset.
+       * Unable to increment the consumer reference counters on the account. Either no provider
+       * reference exists to allow a non-zero balance of a non-self-sufficient asset, or the
+       * maximum number of consumers has been reached.
        **/
       NoProvider: AugmentedError<ApiType>;
       /**
@@ -51,6 +60,10 @@ declare module '@polkadot/api/types/errors' {
        * The given asset ID is unknown.
        **/
       Unknown: AugmentedError<ApiType>;
+      /**
+       * The operation would result in funds being burned.
+       **/
+      WouldBurn: AugmentedError<ApiType>;
       /**
        * The source account would not survive the transfer and it needs to stay alive.
        **/
@@ -112,6 +125,24 @@ declare module '@polkadot/api/types/errors' {
        **/
       [key: string]: AugmentedError<ApiType>;
     };
+    bagsList: {
+      /**
+       * Id not found in list.
+       **/
+      IdNotFound: AugmentedError<ApiType>;
+      /**
+       * An Id does not have a greater vote weight than another Id.
+       **/
+      NotHeavier: AugmentedError<ApiType>;
+      /**
+       * Attempted to place node in front of a node in another bag.
+       **/
+      NotInSameBag: AugmentedError<ApiType>;
+      /**
+       * Generic error
+       **/
+      [key: string]: AugmentedError<ApiType>;
+    };
     balances: {
       /**
        * Beneficiary account must pre-exist
@@ -151,6 +182,10 @@ declare module '@polkadot/api/types/errors' {
       [key: string]: AugmentedError<ApiType>;
     };
     bounties: {
+      /**
+       * The bounty cannot be closed because it has active child-bounties.
+       **/
+      HasActiveChildBounty: AugmentedError<ApiType>;
       /**
        * Proposer's balance is too low.
        **/
@@ -193,41 +228,55 @@ declare module '@polkadot/api/types/errors' {
        **/
       [key: string]: AugmentedError<ApiType>;
     };
+    childBounties: {
+      /**
+       * The bounty balance is not enough to add new child-bounty.
+       **/
+      InsufficientBountyBalance: AugmentedError<ApiType>;
+      /**
+       * The parent bounty is not in active state.
+       **/
+      ParentBountyNotActive: AugmentedError<ApiType>;
+      /**
+       * Number of child-bounties exceeds limit `MaxActiveChildBountyCount`.
+       **/
+      TooManyChildBounties: AugmentedError<ApiType>;
+      /**
+       * Generic error
+       **/
+      [key: string]: AugmentedError<ApiType>;
+    };
     contracts: {
       /**
-       * Performing the requested transfer would have brought the contract below
-       * the subsistence threshold. No transfer is allowed to do this in order to allow
-       * for a tombstone to be created. Use `seal_terminate` to remove a contract without
-       * leaving a tombstone behind.
+       * Code removal was denied because the code is still in use by at least one contract.
        **/
-      BelowSubsistenceThreshold: AugmentedError<ApiType>;
+      CodeInUse: AugmentedError<ApiType>;
       /**
        * No code could be found at the supplied code hash.
        **/
       CodeNotFound: AugmentedError<ApiType>;
+      /**
+       * The contract's code was found to be invalid during validation or instrumentation.
+       * A more detailed error can be found on the node console if debug messages are enabled
+       * or in the debug buffer which is returned to RPC clients.
+       **/
+      CodeRejected: AugmentedError<ApiType>;
       /**
        * The code supplied to `instantiate_with_code` exceeds the limit specified in the
        * current schedule.
        **/
       CodeTooLarge: AugmentedError<ApiType>;
-      /**
-       * A tombstone exist at the specified address.
-       * 
-       * Tombstone cannot be called. Anyone can use `seal_restore_to` in order to revive
-       * the contract, though.
-       **/
-      ContractIsTombstone: AugmentedError<ApiType>;
-      /**
-       * A contract could not be evicted because it has enough balance to pay rent.
-       * 
-       * This can be returned from [`Pallet::claim_surcharge`] because the target
-       * contract has enough balance to pay for its rent.
-       **/
-      ContractNotEvictable: AugmentedError<ApiType>;
       /**
        * No contract was found at the specified address.
        **/
       ContractNotFound: AugmentedError<ApiType>;
+      /**
+       * The contract ran to completion but decided to revert its storage changes.
+       * Please note that this error is only returned from extrinsics. When called directly
+       * or via RPC an `Ok` will be returned. In this case the caller needs to inspect the flags
+       * to determine whether a reversion has taken place.
+       **/
+      ContractReverted: AugmentedError<ApiType>;
       /**
        * Contract trapped during execution.
        **/
@@ -243,7 +292,7 @@ declare module '@polkadot/api/types/errors' {
       /**
        * Removal of a contract failed because the deletion queue is full.
        * 
-       * This can happen when either calling [`Pallet::claim_surcharge`] or `seal_terminate`.
+       * This can happen when calling `seal_terminate`.
        * The queue is filled by deleting contracts and emptied by a fixed amount each block.
        * Trying again during another block is the only way to resolve this issue.
        **/
@@ -260,40 +309,15 @@ declare module '@polkadot/api/types/errors' {
        * `seal_call` forwarded this contracts input. It therefore is no longer available.
        **/
       InputForwarded: AugmentedError<ApiType>;
-      /**
-       * An origin TrieId written in the current block.
-       **/
-      InvalidContractOrigin: AugmentedError<ApiType>;
-      /**
-       * Cannot restore to nonexisting or alive contract.
-       **/
-      InvalidDestinationContract: AugmentedError<ApiType>;
       /**
        * A new schedule must have a greater version than the current one.
        **/
       InvalidScheduleVersion: AugmentedError<ApiType>;
-      /**
-       * Cannot restore from nonexisting or tombstone contract.
-       **/
-      InvalidSourceContract: AugmentedError<ApiType>;
-      /**
-       * An origin must be signed or inherent and auxiliary sender only provided on inherent.
-       **/
-      InvalidSurchargeClaim: AugmentedError<ApiType>;
-      /**
-       * Tombstones don't match.
-       **/
-      InvalidTombstone: AugmentedError<ApiType>;
       /**
        * Performing a call was denied because the calling depth reached the limit
        * of what is specified in the schedule.
        **/
       MaxCallDepthReached: AugmentedError<ApiType>;
-      /**
-       * The newly created contract is below the subsistence threshold after executing
-       * its contructor. No contracts are allowed to exist below that threshold.
-       **/
-      NewContractNotFunded: AugmentedError<ApiType>;
       /**
        * The chain does not provide a chain extension. Calling the chain extension results
        * in this error. Note that this usually  shouldn't happen as deploying such contracts
@@ -321,30 +345,22 @@ declare module '@polkadot/api/types/errors' {
        **/
       ReentranceDenied: AugmentedError<ApiType>;
       /**
-       * The called contract does not have enough balance to pay for its storage.
-       * 
-       * The contract ran out of balance and is therefore eligible for eviction into a
-       * tombstone. Anyone can evict the contract by submitting a `claim_surcharge`
-       * extrinsic. Alternatively, a plain balance transfer can be used in order to
-       * increase the contracts funds so that it can be called again.
+       * More storage was created than allowed by the storage deposit limit.
        **/
-      RentNotPaid: AugmentedError<ApiType>;
+      StorageDepositLimitExhausted: AugmentedError<ApiType>;
       /**
-       * A storage modification exhausted the 32bit type that holds the storage size.
-       * 
-       * This can either happen when the accumulated storage in bytes is too large or
-       * when number of storage items is too large.
+       * Origin doesn't have enough balance to pay the required storage deposits.
        **/
-      StorageExhausted: AugmentedError<ApiType>;
+      StorageDepositNotEnoughFunds: AugmentedError<ApiType>;
       /**
        * A contract self destructed in its constructor.
        * 
-       * This can be triggered by a call to `seal_terminate` or `seal_restore_to`.
+       * This can be triggered by a call to `seal_terminate`.
        **/
       TerminatedInConstructor: AugmentedError<ApiType>;
       /**
        * Termination of a contract is not allowed while the contract is already
-       * on the call stack. Can be triggered by `seal_terminate` or `seal_restore_to.
+       * on the call stack. Can be triggered by `seal_terminate`.
        **/
       TerminatedWhileReentrant: AugmentedError<ApiType>;
       /**
@@ -352,9 +368,8 @@ declare module '@polkadot/api/types/errors' {
        **/
       TooManyTopics: AugmentedError<ApiType>;
       /**
-       * Performing the requested transfer failed for a reason originating in the
-       * chosen currency implementation of the runtime. Most probably the balance is
-       * too low or locks are placed on it.
+       * Performing the requested transfer failed. Probably because there isn't enough
+       * free balance in the sender's account.
        **/
       TransferFailed: AugmentedError<ApiType>;
       /**
@@ -936,6 +951,36 @@ declare module '@polkadot/api/types/errors' {
        **/
       [key: string]: AugmentedError<ApiType>;
     };
+    preimage: {
+      /**
+       * Preimage has already been noted on-chain.
+       **/
+      AlreadyNoted: AugmentedError<ApiType>;
+      /**
+       * The user is not authorized to perform this action.
+       **/
+      NotAuthorized: AugmentedError<ApiType>;
+      /**
+       * The preimage cannot be removed since it has not yet been noted.
+       **/
+      NotNoted: AugmentedError<ApiType>;
+      /**
+       * The preimage request cannot be removed since no outstanding requests exist.
+       **/
+      NotRequested: AugmentedError<ApiType>;
+      /**
+       * A preimage may not be removed when there are outstanding requests.
+       **/
+      Requested: AugmentedError<ApiType>;
+      /**
+       * Preimage is too large to store on-chain.
+       **/
+      TooLarge: AugmentedError<ApiType>;
+      /**
+       * Generic error
+       **/
+      [key: string]: AugmentedError<ApiType>;
+    };
     proxy: {
       /**
        * Account is already a proxy.
@@ -1195,6 +1240,10 @@ declare module '@polkadot/api/types/errors' {
        * The user has enough bond and thus cannot be chilled forcefully by an external person.
        **/
       CannotChillOther: AugmentedError<ApiType>;
+      /**
+       * Commission is too low. Must be at least `MinCommission`.
+       **/
+      CommissionTooLow: AugmentedError<ApiType>;
       /**
        * Duplicate index.
        **/
@@ -1216,7 +1265,9 @@ declare module '@polkadot/api/types/errors' {
        **/
       IncorrectSlashingSpans: AugmentedError<ApiType>;
       /**
-       * Can not bond with value less than minimum required.
+       * Cannot have a validator or nominator role, with value less than the minimum defined by
+       * governance (see `MinValidatorBond` and `MinNominatorBond`). If unbonding is the
+       * intention, `chill` first to remove one's role as validator/nominator.
        **/
       InsufficientBond: AugmentedError<ApiType>;
       /**
@@ -1281,6 +1332,10 @@ declare module '@polkadot/api/types/errors' {
       [key: string]: AugmentedError<ApiType>;
     };
     system: {
+      /**
+       * The origin filter prevent the call to be dispatched.
+       **/
+      CallFiltered: AugmentedError<ApiType>;
       /**
        * Failed to extract the runtime version from the new runtime.
        * 
@@ -1559,9 +1614,5 @@ declare module '@polkadot/api/types/errors' {
        **/
       [key: string]: AugmentedError<ApiType>;
     };
-  }
-
-  export interface DecoratedErrors<ApiType extends ApiTypes> extends AugmentedErrors<ApiType> {
-    [key: string]: ModuleErrors<ApiType>;
-  }
-}
+  } // AugmentedErrors
+} // declare module

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

@@ -0,0 +1,9 @@
+// Copyright 2017-2022 @polkadot/api-augment authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import '../base';
+import './consts';
+import './errors';
+import './events';
+import './query';
+import './tx';

packages/api-augment/tsconfig.build.json

@@ -0,0 +1,19 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src"
+  },
+  "exclude": [
+    "**/kusama/*.ts",
+    "**/polkadot/*.ts"
+  ],
+  "references": [
+    { "path": "../api-base/tsconfig.build.json" },
+    { "path": "../rpc-augment/tsconfig.build.json" },
+    { "path": "../types/tsconfig.build.json" },
+    { "path": "../types-codec/tsconfig.build.json" },
+    { "path": "../types-augment/tsconfig.build.json" }
+  ]
+}

packages/api-augment/tsconfig.kusama.json

@@ -0,0 +1,19 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src"
+  },
+  "include": [
+    "**/base.ts",
+    "**/kusama/*.ts"
+  ],
+  "references": [
+    { "path": "../api-base/tsconfig.build.json" },
+    { "path": "../rpc-augment/tsconfig.build.json" },
+    { "path": "../types/tsconfig.build.json" },
+    { "path": "../types-codec/tsconfig.build.json" },
+    { "path": "../types-augment/tsconfig.build.json" }
+  ]
+}

packages/api-augment/tsconfig.polkadot.json

@@ -0,0 +1,19 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src"
+  },
+  "include": [
+    "**/base.ts",
+    "**/polkadot/*.ts"
+  ],
+  "references": [
+    { "path": "../api-base/tsconfig.build.json" },
+    { "path": "../rpc-augment/tsconfig.build.json" },
+    { "path": "../types/tsconfig.build.json" },
+    { "path": "../types-codec/tsconfig.build.json" },
+    { "path": "../types-augment/tsconfig.build.json" }
+  ]
+}

packages/api-base/LICENSE

@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                    http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have made,
+  use, offer to sell, sell, import, and otherwise transfer the Work,
+  where such license applies only to those patent claims licensable
+  by such Contributor that are necessarily infringed by their
+  Contribution(s) alone or by combination of their Contribution(s)
+  with the Work to which such Contribution(s) was submitted. If You
+  institute patent litigation against any entity (including a
+  cross-claim or counterclaim in a lawsuit) alleging that the Work
+  or a Contribution incorporated within the Work constitutes direct
+  or contributory patent infringement, then any patent licenses
+  granted to You under this License for that Work shall terminate
+  as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+  Work or Derivative Works thereof in any medium, with or without
+  modifications, and in Source or Object form, provided that You
+  meet the following conditions:
+
+  (a) You must give any other recipients of the Work or
+      Derivative Works a copy of this License; and
+
+  (b) You must cause any modified files to carry prominent notices
+      stating that You changed the files; and
+
+  (c) You must retain, in the Source form of any Derivative Works
+      that You distribute, all copyright, patent, trademark, and
+      attribution notices from the Source form of the Work,
+      excluding those notices that do not pertain to any part of
+      the Derivative Works; and
+
+  (d) If the Work includes a "NOTICE" text file as part of its
+      distribution, then any Derivative Works that You distribute must
+      include a readable copy of the attribution notices contained
+      within such NOTICE file, excluding those notices that do not
+      pertain to any part of the Derivative Works, in at least one
+      of the following places: within a NOTICE text file distributed
+      as part of the Derivative Works; within the Source form or
+      documentation, if provided along with the Derivative Works; or,
+      within a display generated by the Derivative Works, if and
+      wherever such third-party notices normally appear. The contents
+      of the NOTICE file are for informational purposes only and
+      do not modify the License. You may add Your own attribution
+      notices within Derivative Works that You distribute, alongside
+      or as an addendum to the NOTICE text from the Work, provided
+      that such additional attribution notices cannot be construed
+      as modifying the License.
+
+  You may add Your own copyright statement to Your modifications and
+  may provide additional or different license terms and conditions
+  for use, reproduction, or distribution of Your modifications, or
+  for any such Derivative Works as a whole, provided Your use,
+  reproduction, and distribution of the Work otherwise complies with
+  the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+  any Contribution intentionally submitted for inclusion in the Work
+  by You to the Licensor shall be under the terms and conditions of
+  this License, without any additional terms or conditions.
+  Notwithstanding the above, nothing herein shall supersede or modify
+  the terms of any separate license agreement you may have executed
+  with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+  names, trademarks, service marks, or product names of the Licensor,
+  except as required for reasonable and customary use in describing the
+  origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+  agreed to in writing, Licensor provides the Work (and each
+  Contributor provides its Contributions) on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  implied, including, without limitation, any warranties or conditions
+  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+  PARTICULAR PURPOSE. You are solely responsible for determining the
+  appropriateness of using or redistributing the Work and assume any
+  risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+  whether in tort (including negligence), contract, or otherwise,
+  unless required by applicable law (such as deliberate and grossly
+  negligent acts) or agreed to in writing, shall any Contributor be
+  liable to You for damages, including any direct, indirect, special,
+  incidental, or consequential damages of any character arising as a
+  result of this License or out of the use or inability to use the
+  Work (including but not limited to damages for loss of goodwill,
+  work stoppage, computer failure or malfunction, or any and all
+  other commercial damages or losses), even if such Contributor
+  has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+  the Work or Derivative Works thereof, You may choose to offer,
+  and charge a fee for, acceptance of support, warranty, indemnity,
+  or other liability obligations and/or rights consistent with this
+  License. However, in accepting such obligations, You may act only
+  on Your own behalf and on Your sole responsibility, not on behalf
+  of any other Contributor, and only if You agree to indemnify,
+  defend, and hold each Contributor harmless for any liability
+  incurred by, or claims asserted against, such Contributor by reason
+  of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+  To apply the Apache License to your work, attach the following
+  boilerplate notice, with the fields enclosed by brackets "[]"
+  replaced with your own identifying information. (Don't include
+  the brackets!)  The text should be enclosed in the appropriate
+  comment syntax for the file format. We also recommend that a
+  file or class name and description of purpose be included on the
+  same "printed page" as the copyright notice for easier
+  identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

packages/api-base/README.md

@@ -0,0 +1,3 @@
+# @polkadot/api-base
+
+API Base interfaces

packages/api-base/package.json

@@ -0,0 +1,32 @@
+{
+  "author": "Jaco Greeff <jacogr@gmail.com>",
+  "bugs": "https://github.com/polkadot-js/api/issues",
+  "contributors": [],
+  "description": "Interfaces for interacting with contracts and contract ABIs",
+  "engines": {
+    "node": ">=14.0.0"
+  },
+  "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-base#readme",
+  "license": "Apache-2.0",
+  "maintainers": [],
+  "name": "@polkadot/api-base",
+  "repository": {
+    "directory": "packages/api-base",
+    "type": "git",
+    "url": "https://github.com/polkadot-js/api.git"
+  },
+  "sideEffects": [
+    "./detectPackage.js",
+    "./detectPackage.cjs"
+  ],
+  "type": "module",
+  "version": "7.5.1",
+  "main": "index.js",
+  "dependencies": {
+    "@babel/runtime": "^7.16.7",
+    "@polkadot/rpc-core": "7.5.1",
+    "@polkadot/types": "7.5.1",
+    "@polkadot/util": "^8.3.3",
+    "rxjs": "^7.5.2"
+  }
+}

packages/api-base/src/bundle.ts

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

packages/api-base/src/detectOther.ts

@@ -0,0 +1,7 @@
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { packageInfo as rpcInfo } from '@polkadot/rpc-core/packageInfo';
+import { packageInfo as typesInfo } from '@polkadot/types/packageInfo';
+
+export default [rpcInfo, typesInfo];

packages/api-base/src/detectPackage.ts

@@ -0,0 +1,11 @@
+// Copyright 2017-2022 @polkadot/api-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Do not edit, auto-generated by @polkadot/dev
+
+import { detectPackage } from '@polkadot/util';
+
+import others from './detectOther';
+import { packageInfo } from './packageInfo';
+
+detectPackage(packageInfo, null, others);

packages/api-base/src/index.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import './detectPackage';
+
+export * from './bundle';

packages/api-base/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2022 @polkadot/api-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Do not edit, auto-generated by @polkadot/dev
+
+export const packageInfo = { name: '@polkadot/api-base', path: 'auto', type: 'auto', version: '7.5.1' };

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

@@ -0,0 +1,26 @@
+// Copyright 2017-2022 @polkadot/api-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { DecoratedRpc, QueryableConsts, QueryableStorage, QueryableStorageMulti, SubmittableExtrinsics } from '@polkadot/api-base/types';
+import type { RpcInterface } from '@polkadot/rpc-core/types';
+import type { Metadata } from '@polkadot/types';
+import type { Hash, RuntimeVersion } from '@polkadot/types/interfaces';
+import type { Registry, Signer } from '@polkadot/types/types';
+
+// A smaller interface of ApiRx, used in derive and in SubmittableExtrinsic
+export interface ApiInterfaceRx {
+  consts: QueryableConsts<'rxjs'>;
+  extrinsicType: number;
+  genesisHash?: Hash;
+  hasSubscriptions: boolean;
+  registry: Registry;
+  runtimeMetadata: Metadata;
+  runtimeVersion: RuntimeVersion;
+  query: QueryableStorage<'rxjs'>;
+  queryAt: (blockHash: Uint8Array | string, knownVersion?: RuntimeVersion) => Observable<QueryableStorage<'rxjs'>>;
+  queryMulti: QueryableStorageMulti<'rxjs'>;
+  rpc: DecoratedRpc<'rxjs', RpcInterface>;
+  tx: SubmittableExtrinsics<'rxjs'>;
+  signer?: Signer;
+}

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

@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/api authors & contributors
+// Copyright 2017-2022 @polkadot/api-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
@@ -17,10 +17,15 @@ export type VoidFn = () => void;
 
 export type UnsubscribePromise = Promise<VoidFn>;
 
-// FIXME The day TS has higher-kinded types, we can remove this hardcoded stuff
-export type PromiseOrObs<ApiType extends ApiTypes, T> = ApiType extends 'rxjs'
-  ? Observable<T>
-  : Promise<T>;
+export type PromiseOrObs<ApiType extends ApiTypes, T> =
+  ApiType extends 'rxjs'
+    ? Observable<T>
+    : Promise<T>;
+
+export type MethodResult<ApiType extends ApiTypes, F extends AnyFunction> =
+  ApiType extends 'rxjs'
+    ? RxResult<F>
+    : PromiseResult<F>;
 
 // Here are the return types of these parts of the api:
 // - api.query.*.*: no exact typings
@@ -39,15 +44,9 @@ export interface PromiseResult<F extends AnyFunction> {
   (...args: Parameters<F>): Promise<ObsInnerType<ReturnType<F>>>;
   (...args: Push<Parameters<F>, Callback<ObsInnerType<ReturnType<F>>>>): UnsubscribePromise;
   <T extends Codec | Codec[]>(...args: Parameters<F>): Promise<T>;
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   <T extends Codec | Codec[]>(...args: Push<Parameters<F>, Callback<T>>): UnsubscribePromise;
 }
 
-// FIXME The day TS has higher-kinded types, we can remove this hardcoded stuff
-export type MethodResult<ApiType extends ApiTypes, F extends AnyFunction> = ApiType extends 'rxjs'
-  ? RxResult<F>
-  : PromiseResult<F>;
-
 // In the abstract `decorateMethod` in Base.ts, we can also pass in some meta-
 // information. This describes it.
 export interface DecorateMethodOptions {
@@ -64,4 +63,5 @@ export interface PaginationOptions<A = unknown> {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-export type DecorateMethod<ApiType extends ApiTypes> = <Method extends (...args: any[]) => Observable<any>>(method: Method, options?: DecorateMethodOptions) => any;
+export type DecorateMethod<ApiType extends ApiTypes, T = any> =
+  <M extends (...args: any[]) => Observable<any>>(method: M, options?: DecorateMethodOptions) => T;

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

@@ -0,0 +1,25 @@
+// Copyright 2017-2022 @polkadot/api-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { PalletConstantMetadataLatest } from '@polkadot/types/interfaces';
+import type { Codec } from '@polkadot/types/types';
+import type { ApiTypes } from './base';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-empty-interface
+export interface AugmentedConsts<ApiType extends ApiTypes> {
+  // augmented
+}
+
+export interface QueryableConsts<ApiType extends ApiTypes> extends AugmentedConsts<ApiType> {
+  // when non-augmented, we need to at least have Codec results
+  [key: string]: QueryableModuleConsts;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export interface AugmentedConst<ApiType extends ApiTypes> {
+  meta: PalletConstantMetadataLatest;
+}
+
+export interface QueryableModuleConsts {
+  [key: string]: Codec;
+}

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

@@ -0,0 +1,8 @@
+// Copyright 2017-2022 @polkadot/api-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+
+type DeriveCreator = (instanceId: string, api: unknown) => (...args: unknown[]) => Observable<any>;
+
+export type DeriveCustom = Record<string, Record<string, DeriveCreator>>;

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

@@ -0,0 +1,22 @@
+// Copyright 2017-2022 @polkadot/api-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { IsError } from '@polkadot/types/metadata/decorate/types';
+import type { ApiTypes } from './base';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-empty-interface
+export interface AugmentedErrors<ApiType extends ApiTypes> {
+  // augmented
+}
+
+export interface DecoratedErrors<ApiType extends ApiTypes> extends AugmentedErrors<ApiType> {
+  // when non-augmented, we need to at least have Codec results
+  [key: string]: ModuleErrors<ApiType>;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export type AugmentedError<ApiType extends ApiTypes> = IsError;
+
+export interface ModuleErrors<ApiType extends ApiTypes> {
+  [key: string]: AugmentedError<ApiType>;
+}

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

@@ -0,0 +1,23 @@
+// Copyright 2017-2022 @polkadot/api-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { IsEvent } from '@polkadot/types/metadata/decorate/types';
+import type { AnyTuple } from '@polkadot/types/types';
+import type { ApiTypes } from './base';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-empty-interface
+export interface AugmentedEvents<ApiType extends ApiTypes> {
+  // augmented
+}
+
+export interface DecoratedEvents<ApiType extends ApiTypes> extends AugmentedEvents<ApiType> {
+  // when non-augmented, we need to at least have Codec results
+  [key: string]: ModuleEvents<ApiType>;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export type AugmentedEvent<ApiType extends ApiTypes, T extends AnyTuple = AnyTuple> = IsEvent<T>;
+
+export interface ModuleEvents<ApiType extends ApiTypes> {
+  [key: string]: AugmentedEvent<ApiType, AnyTuple>;
+}

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

@@ -0,0 +1,15 @@
+// Copyright 2017-2022 @polkadot/api authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// These are augmented, do an augmentation export
+export * from '@polkadot/api-base/types/consts';
+export * from '@polkadot/api-base/types/errors';
+export * from '@polkadot/api-base/types/events';
+export * from '@polkadot/api-base/types/storage';
+export * from '@polkadot/api-base/types/submittable';
+
+// normal exports
+export * from './api';
+export * from './base';
+export * from './derive';
+export * from './rpc';

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

@@ -0,0 +1,34 @@
+// Copyright 2017-2022 @polkadot/api-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { AnyFunction, Callback, DefinitionRpc } from '@polkadot/types/types';
+
+import { ApiTypes, PromiseResult, Push, RxResult, UnsubscribePromise } from './base';
+
+export type { AugmentedRpc } from '@polkadot/rpc-core/types';
+
+export interface RxRpcResult<F extends AnyFunction> extends RxResult<F> {
+  raw <T> (...args: Parameters<F>): Observable<T>;
+  meta: DefinitionRpc;
+}
+
+export interface PromiseRpcResult<F extends AnyFunction> extends PromiseResult<F> {
+  raw <T> (...args: Parameters<F>): Promise<T>;
+  raw <T> (...args: Push<Parameters<F>, Callback<T>>): UnsubscribePromise;
+  meta: DefinitionRpc;
+}
+
+export type RpcMethodResult<ApiType extends ApiTypes, F extends AnyFunction> = ApiType extends 'rxjs'
+  ? RxRpcResult<F>
+  : PromiseRpcResult<F>;
+
+export type DecoratedRpcSection<ApiType extends ApiTypes, Section> = {
+  [M in keyof Section]: Section[M] extends AnyFunction
+    ? RpcMethodResult<ApiType, Section[M]>
+    : never
+}
+
+export type DecoratedRpc<ApiType extends ApiTypes, AllSections> = {
+  [S in keyof AllSections]: DecoratedRpcSection<ApiType, AllSections[S]>
+}

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

@@ -0,0 +1,137 @@
+// Copyright 2017-2022 @polkadot/api-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { StorageKey, u64 } from '@polkadot/types';
+import type { Hash } from '@polkadot/types/interfaces';
+import type { StorageEntry } from '@polkadot/types/primitive/types';
+import type { AnyFunction, AnyTuple, Callback, Codec, IStorageKey } from '@polkadot/types/types';
+import type { ApiTypes, DropLast, MethodResult, ObsInnerType, PaginationOptions, PromiseOrObs, UnsubscribePromise } from './base';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-empty-interface
+export interface AugmentedQueries<ApiType extends ApiTypes> {
+  // augmented
+}
+
+export interface QueryableStorage<ApiType extends ApiTypes> extends AugmentedQueries<ApiType> {
+  // when non-augmented, we need to at least have Codec results
+  [key: string]: QueryableModuleStorage<ApiType>;
+}
+
+export interface QueryableStorageAt<ApiType extends ApiTypes> extends AugmentedQueries<ApiType> {
+  [key: string]: QueryableModuleStorageAt<ApiType>;
+}
+
+type AsCodec<R extends Codec | any> = R extends Codec
+  ? R
+  : Codec;
+
+type ReturnCodec<F extends AnyFunction> = AsCodec<ObsInnerType<ReturnType<F>>>;
+
+interface StorageEntryObservableMulti<R extends Codec = Codec> {
+  <T extends Codec = R>(args: (unknown[] | unknown)[]): Observable<T[]>;
+}
+
+interface StorageEntryPromiseMulti<R extends Codec = Codec> {
+  <T extends Codec = R>(args: (unknown[] | unknown)[]): Promise<T[]>;
+  <T extends Codec = R>(args: (unknown[] | unknown)[], callback: Callback<T[]>): UnsubscribePromise;
+}
+
+export interface StorageEntryPromiseOverloads {
+  (arg1?: unknown, arg2?: unknown, arg3?: unknown): Promise<Codec>;
+  <T extends Codec>(arg1?: unknown, arg2?: unknown, arg3?: unknown): Promise<T>;
+  <T extends Codec>(callback: Callback<T>): UnsubscribePromise;
+  <T extends Codec>(arg: unknown, callback: Callback<T>): UnsubscribePromise;
+  <T extends Codec>(arg1: unknown, arg2: unknown, callback: Callback<T>): UnsubscribePromise;
+  <T extends Codec>(arg1: unknown, arg2: unknown, arg3: unknown, callback: Callback<T>): UnsubscribePromise;
+}
+
+export interface StorageEntryPromiseOverloadsAt {
+  (arg1?: unknown, arg2?: unknown, arg3?: unknown): Promise<Codec>;
+  <T extends Codec>(arg1?: unknown, arg2?: unknown, arg3?: unknown): Promise<T>;
+}
+
+// This is the most generic typings we can have for a storage entry function
+export type GenericStorageEntryFunction = (...args: unknown[]) => Observable<Codec>
+
+export type QueryableStorageEntry<ApiType extends ApiTypes, A extends AnyTuple = AnyTuple> =
+  ApiType extends 'rxjs'
+    ? AugmentedQuery<'rxjs', GenericStorageEntryFunction, A>
+    : AugmentedQuery<'promise', GenericStorageEntryFunction, A> & StorageEntryPromiseOverloads;
+
+export type QueryableStorageEntryAt<ApiType extends ApiTypes, A extends AnyTuple = AnyTuple> =
+  ApiType extends 'rxjs'
+    ? AugmentedQueryAt<'rxjs', GenericStorageEntryFunction, A>
+    : AugmentedQueryAt<'promise', GenericStorageEntryFunction, A> & StorageEntryPromiseOverloadsAt;
+
+export interface StorageEntryBase<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> extends StorageEntryBaseAt<ApiType, F, A> {
+  /**
+   * @deprecated Use api.at(<blockHash>)
+   */
+  at: <T extends Codec | any = ReturnCodec<F>>(hash: Hash | Uint8Array | string, ...args: Parameters<F>) => PromiseOrObs<ApiType, T>;
+  creator: StorageEntry;
+  /**
+   * @deprecated Use api.at(<blockHash>)
+   */
+  entriesAt: <T extends Codec | any = ReturnCodec<F>, K extends AnyTuple = A>(hash: Hash | Uint8Array | string, ...args: DropLast<Parameters<F>>) => PromiseOrObs<ApiType, [StorageKey<K>, T][]>;
+  entriesPaged: <T extends Codec | any = ReturnCodec<F>, K extends AnyTuple = A>(opts: PaginationOptions<Parameters<F>[0]>) => PromiseOrObs<ApiType, [StorageKey<K>, T][]>;
+  /**
+   * @deprecated Use api.at(<blockHash>)
+   */
+  keysAt: <K extends AnyTuple = A> (hash: Hash | Uint8Array | string, ...args: DropLast<Parameters<F>>) => PromiseOrObs<ApiType, StorageKey<K>[]>;
+  keysPaged: <K extends AnyTuple = A> (opts: PaginationOptions<Parameters<F>[0]>) => PromiseOrObs<ApiType, StorageKey<K>[]>;
+  /**
+   * @deprecated The underlying RPC this been marked unsafe and is generally not exposed
+   */
+  range: <T extends Codec | any = ReturnCodec<F>>([from, to]: [Hash | Uint8Array | string, Hash | Uint8Array | string | undefined] | [Hash | Uint8Array | string], ...args: Parameters<F>) => PromiseOrObs<ApiType, [Hash, T][]>;
+  /**
+   * @deprecated Use api.at(<blockHash>)
+   */
+  sizeAt: (hash: Hash | Uint8Array | string, ...args: Parameters<F>) => PromiseOrObs<ApiType, u64>;
+  multi: ApiType extends 'rxjs'
+    ? StorageEntryObservableMulti<ReturnCodec<F>>
+    : StorageEntryPromiseMulti<ReturnCodec<F>>;
+}
+
+export interface StorageEntryBaseAt<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> {
+  entries: <T extends Codec | any = ReturnCodec<F>, K extends AnyTuple = A>(...args: DropLast<Parameters<F>>) => PromiseOrObs<ApiType, [StorageKey<K>, T][]>;
+  hash: (...args: Parameters<F>) => PromiseOrObs<ApiType, Hash>;
+  is: (key: IStorageKey<AnyTuple>) => key is IStorageKey<A>;
+  key: (...args: Parameters<F>) => string;
+  keyPrefix: (...args: DropLast<Parameters<F>>) => string;
+  keys: <K extends AnyTuple = A> (...args: DropLast<Parameters<F>>) => PromiseOrObs<ApiType, StorageKey<K>[]>;
+  size: (...args: Parameters<F>) => PromiseOrObs<ApiType, u64>;
+}
+
+export interface QueryableModuleStorage<ApiType extends ApiTypes> {
+  [key: string]: QueryableStorageEntry<ApiType, AnyTuple>;
+}
+
+export interface QueryableModuleStorageAt<ApiType extends ApiTypes> {
+  [key: string]: QueryableStorageEntryAt<ApiType, AnyTuple>;
+}
+
+export type QueryableStorageMultiArg<ApiType extends ApiTypes> =
+  QueryableStorageEntry<ApiType> |
+  [QueryableStorageEntry<ApiType>, ...unknown[]];
+
+export interface QueryableStorageMultiBase<ApiType extends ApiTypes> {
+  <T extends Codec[]>(calls: QueryableStorageMultiArg<ApiType>[]): Observable<T>;
+}
+
+export interface QueryableStorageMultiPromise<ApiType extends ApiTypes> {
+  <T extends Codec[]>(calls: QueryableStorageMultiArg<ApiType>[], callback: Callback<T>): UnsubscribePromise;
+  <T extends Codec[]>(calls: QueryableStorageMultiArg<ApiType>[]): Promise<T>;
+}
+
+export type QueryableStorageMulti<ApiType extends ApiTypes> =
+  ApiType extends 'rxjs'
+    ? QueryableStorageMultiBase<ApiType>
+    : QueryableStorageMultiPromise<ApiType>;
+
+export type AugmentedQuery<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> = MethodResult<ApiType, F> & StorageEntryBase<ApiType, F, A>;
+
+export type AugmentedQueryAt<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> = MethodResult<ApiType, F> & StorageEntryBaseAt<ApiType, F, A>;
+
+// backwards compatibility-only
+export type AugmentedQueryDoubleMap<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> = AugmentedQuery<ApiType, F, A>;

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

@@ -0,0 +1,94 @@
+// Copyright 2017-2022 @polkadot/api-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { AccountId, Address, ApplyExtrinsicResult, Call, DispatchError, DispatchInfo, EventRecord, Extrinsic, ExtrinsicStatus, Hash, RuntimeDispatchInfo } from '@polkadot/types/interfaces';
+import type { AnyFunction, AnyNumber, AnyTuple, Callback, CallBase, Codec, IExtrinsicEra, IKeyringPair, ISubmittableResult, Signer } from '@polkadot/types/types';
+import type { ApiTypes, PromiseOrObs } from './base';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/no-empty-interface
+export interface AugmentedSubmittables<ApiType extends ApiTypes> {
+  // augmented
+}
+
+export interface SubmittableExtrinsics<ApiType extends ApiTypes> extends AugmentedSubmittables<ApiType> {
+  (extrinsic: Call | Extrinsic | Uint8Array | string): SubmittableExtrinsic<ApiType>;
+  // when non-augmented, we need to at least have Codec results
+  [key: string]: SubmittableModuleExtrinsics<ApiType>;
+}
+
+export type AddressOrPair = IKeyringPair | string | AccountId | Address;
+
+export type AugmentedSubmittable<T extends AnyFunction, A extends AnyTuple = AnyTuple> = T & CallBase<A>;
+
+export interface SignerOptions {
+  blockHash: Uint8Array | string;
+  era?: IExtrinsicEra | number;
+  nonce: AnyNumber | Codec;
+  signer?: Signer;
+  tip?: AnyNumber;
+  assetId?: AnyNumber;
+}
+
+export type SubmittableDryRunResult<ApiType extends ApiTypes> =
+  ApiType extends 'rxjs'
+    ? Observable<ApplyExtrinsicResult>
+    : Promise<ApplyExtrinsicResult>;
+
+export interface SubmittableExtrinsicFunction<ApiType extends ApiTypes, A extends AnyTuple = AnyTuple> extends CallBase<A> {
+  (...params: any[]): SubmittableExtrinsic<ApiType>;
+}
+
+export interface SubmittableModuleExtrinsics<ApiType extends ApiTypes> {
+  // only with is<Type> augmentation
+  [key: string]: SubmittableExtrinsicFunction<ApiType>;
+}
+
+export type SubmittablePaymentResult<ApiType extends ApiTypes> =
+  ApiType extends 'rxjs'
+    ? Observable<RuntimeDispatchInfo>
+    : Promise<RuntimeDispatchInfo>;
+
+export type SubmittableResultResult<ApiType extends ApiTypes, R extends ISubmittableResult = ISubmittableResult> =
+  ApiType extends 'rxjs'
+    ? Observable<R>
+    : Promise<Hash>;
+
+export type SubmittableResultSubscription<ApiType extends ApiTypes, R extends ISubmittableResult = ISubmittableResult> =
+  ApiType extends 'rxjs'
+    ? Observable<R>
+    : Promise<() => void>;
+
+export interface SubmittableResultValue {
+  dispatchError?: DispatchError;
+  dispatchInfo?: DispatchInfo;
+  events?: EventRecord[];
+  internalError?: Error;
+  status: ExtrinsicStatus;
+  txHash: Hash;
+}
+
+export interface SubmittableExtrinsic<ApiType extends ApiTypes, R extends ISubmittableResult = ISubmittableResult> extends Extrinsic {
+  dryRun (account: AddressOrPair, options?: Partial<SignerOptions>): SubmittableDryRunResult<ApiType>;
+
+  paymentInfo (account: AddressOrPair, options?: Partial<SignerOptions>): SubmittablePaymentResult<ApiType>;
+
+  send (): SubmittableResultResult<ApiType>;
+
+  send (statusCb: Callback<R>): SubmittableResultSubscription<ApiType, R>;
+
+  /**
+   * @deprecated
+   */
+  sign (account: IKeyringPair, _options?: Partial<SignerOptions>): this;
+
+  signAsync (account: AddressOrPair, _options?: Partial<SignerOptions>): PromiseOrObs<ApiType, this>;
+
+  signAndSend (account: AddressOrPair, options?: Partial<SignerOptions>): SubmittableResultResult<ApiType, R>;
+
+  signAndSend (account: AddressOrPair, statusCb: Callback<R>): SubmittableResultSubscription<ApiType>;
+
+  signAndSend (account: AddressOrPair, options: Partial<SignerOptions>, statusCb?: Callback<R>): SubmittableResultSubscription<ApiType, R>;
+
+  withResultTransform (transform: (input: ISubmittableResult) => ISubmittableResult): this;
+}

packages/api-base/tsconfig.build.json

@@ -0,0 +1,12 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src"
+  },
+  "references": [
+    { "path": "../rpc-core/tsconfig.build.json" },
+    { "path": "../types/tsconfig.build.json" }
+  ]
+}

packages/api-contract/package.json

@@ -1,28 +1,39 @@
 {
-  "name": "@polkadot/api-contract",
-  "version": "5.8.2",
-  "type": "module",
+  "author": "Jaco Greeff <jacogr@gmail.com>",
+  "bugs": "https://github.com/polkadot-js/api/issues",
+  "contributors": [],
   "description": "Interfaces for interacting with contracts and contract ABIs",
-  "main": "index.js",
+  "engines": {
+    "node": ">=14.0.0"
+  },
+  "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme",
+  "license": "Apache-2.0",
+  "maintainers": [],
+  "name": "@polkadot/api-contract",
+  "repository": {
+    "directory": "packages/api-contract",
+    "type": "git",
+    "url": "https://github.com/polkadot-js/api.git"
+  },
   "sideEffects": [
     "./detectPackage.js",
     "./detectPackage.cjs"
   ],
-  "engines": {
-    "node": ">=14.0.0"
-  },
-  "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [],
-  "contributors": [],
-  "license": "Apache-2.0",
-  "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",
+  "type": "module",
+  "version": "7.5.1",
+  "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.15.4",
-    "@polkadot/api": "5.8.2",
-    "@polkadot/types": "5.8.2",
-    "@polkadot/util": "^7.3.1",
-    "rxjs": "^7.3.0"
+    "@babel/runtime": "^7.16.7",
+    "@polkadot/api": "7.5.1",
+    "@polkadot/types": "7.5.1",
+    "@polkadot/types-codec": "7.5.1",
+    "@polkadot/types-create": "7.5.1",
+    "@polkadot/util": "^8.3.3",
+    "@polkadot/util-crypto": "^8.3.3",
+    "rxjs": "^7.5.2"
+  },
+  "devDependencies": {
+    "@polkadot/api-augment": "7.5.1",
+    "@polkadot/keyring": "^8.3.3"
   }
 }

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

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

packages/api-contract/src/Abi.ts

@@ -1,198 +0,0 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import type { Bytes } from '@polkadot/types';
-import type { ChainProperties, ContractConstructorSpec, ContractEventSpec, ContractMessageParamSpec, ContractMessageSpec, ContractProject } from '@polkadot/types/interfaces';
-import type { AnyJson, Codec } from '@polkadot/types/types';
-import type { AbiConstructor, AbiEvent, AbiMessage, AbiParam, DecodedEvent, DecodedMessage } from './types';
-
-import { assert, assertReturn, compactAddLength, compactStripLength, isNumber, isObject, isString, logger, stringCamelCase, stringify, u8aConcat, u8aToHex } from '@polkadot/util';
-
-import { MetaRegistry } from './MetaRegistry';
-
-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 }) => [identifier, stringCamelCase(identifier)].includes(messageOrId.toString()))
-      : messageOrId;
-
-  return assertReturn(message, () => `Attempted to call an invalid contract interface, ${stringify(messageOrId)}`);
-}
-
-export class Abi {
-  readonly #events: AbiEvent[];
-
-  public readonly constructors: AbiConstructor[];
-
-  public readonly json: AnyJson;
-
-  public readonly messages: AbiMessage[];
-
-  public readonly project: ContractProject;
-
-  public readonly registry: MetaRegistry;
-
-  constructor (abiJson: AnyJson, chainProperties?: ChainProperties) {
-    const json = isString(abiJson)
-      ? JSON.parse(abiJson) as AnyJson
-      : abiJson;
-
-    assert(isObject(json) && !Array.isArray(json) && json.metadataVersion && isObject(json.spec) && !Array.isArray(json.spec) && Array.isArray(json.spec.constructors) && Array.isArray(json.spec.messages), 'Invalid JSON ABI structure supplied, expected a recent metadata version');
-
-    this.json = json;
-    this.registry = new MetaRegistry(json.metadataVersion as string, chainProperties);
-    this.project = this.registry.createType('ContractProject', json);
-
-    this.registry.setMetaTypes(this.project.types);
-
-    this.project.types.forEach((_, index) =>
-      this.registry.getMetaTypeDef({ type: this.registry.createType('Si0LookupTypeId', index + this.registry.typeOffset) })
-    );
-    this.constructors = this.project.spec.constructors.map((spec: ContractConstructorSpec, 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.#createMessage(spec, index, {
-        isMutating: spec.mutates.isTrue,
-        isPayable: spec.payable.isTrue,
-        returnType: typeSpec
-          ? 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);
-  }
-
-  public findMessage (messageOrId: AbiMessage | string | number): AbiMessage {
-    return findMessage(this.messages, messageOrId);
-  }
-
-  #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),
-          type: this.registry.getMetaTypeDef(arg.type)
-        };
-      } catch (error) {
-        l.error(`Error expanding argument ${index} in ${stringify(spec)}`);
-
-        throw error;
-      }
-    });
-  }
-
-  #createEvent = (spec: ContractEventSpec, index: number): AbiEvent => {
-    const args = this.#createArgs(spec.args, spec);
-    const event = {
-      args,
-      docs: spec.docs.map((d) => d.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 identifier = spec.name.toString();
-    const message = {
-      ...add,
-      args,
-      docs: spec.docs.map((d) => d.toString()),
-      fromU8a: (data: Uint8Array): DecodedMessage => ({
-        args: this.#decodeArgs(args, data),
-        message
-      }),
-      identifier,
-      index,
-      method: stringCamelCase(identifier),
-      selector: spec.selector,
-      toU8a: (params: unknown[]) =>
-        this.#encodeArgs(spec, args, params)
-    };
-
-    return message;
-  }
-
-  #decodeArgs = (args: AbiParam[], data: Uint8Array): Codec[] => {
-    // for decoding we expect the input to be just the arg data, no selectors
-    // no length added (this allows use with events as well)
-    let offset = 0;
-
-    return args.map(({ type }): Codec => {
-      const value = this.registry.createType(type.type as 'Text', data.subarray(offset));
-
-      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: unknown[]): Uint8Array => {
-    assert(data.length === args.length, () => `Expected ${args.length} arguments to contract message '${name.toString()}', found ${data.length}`);
-
-    return compactAddLength(
-      u8aConcat(
-        this.registry.createType('ContractSelector', selector).toU8a(),
-        ...args.map(({ type }, index) => this.registry.createType(type.type as 'Text', data[index]).toU8a())
-      )
-    );
-  }
-}

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

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

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

@@ -0,0 +1,253 @@
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Bytes } from '@polkadot/types';
+import type { ChainProperties, ContractConstructorSpecLatest, ContractEventSpecLatest, ContractMessageParamSpecLatest, ContractMessageSpecLatest, ContractMetadata, ContractMetadataLatest, ContractProjectInfo } from '@polkadot/types/interfaces';
+import type { Codec, Registry } from '@polkadot/types/types';
+import type { AbiConstructor, AbiEvent, AbiMessage, AbiParam, DecodedEvent, DecodedMessage } from '../types';
+
+import { TypeRegistry } from '@polkadot/types';
+import { TypeDefInfo } from '@polkadot/types-create';
+import { assert, assertReturn, compactAddLength, compactStripLength, isNumber, isObject, isString, logger, stringCamelCase, stringify, u8aConcat, u8aToHex } from '@polkadot/util';
+
+import { convertVersions, enumVersions } from './toLatest';
+
+const l = logger('Abi');
+
+const PRIMITIVE_ALWAYS = ['AccountId', 'AccountIndex', 'Address', 'Balance'];
+
+function findMessage <T extends AbiMessage> (list: T[], messageOrId: T | string | number): T {
+  const message = isNumber(messageOrId)
+    ? list[messageOrId]
+    : isString(messageOrId)
+      ? list.find(({ identifier }) => [identifier, stringCamelCase(identifier)].includes(messageOrId.toString()))
+      : messageOrId;
+
+  return assertReturn(message, () => `Attempted to call an invalid contract interface, ${stringify(messageOrId)}`);
+}
+
+function getLatestMeta (registry: Registry, json: Record<string, unknown>): ContractMetadataLatest {
+  const vx = enumVersions.find((v) => isObject(json[v]));
+  const metadata = registry.createType('ContractMetadata',
+    vx
+      ? { [vx]: json[vx] }
+      : { V0: json }
+  ) as unknown as ContractMetadata;
+  const converter = convertVersions.find(([v]) => metadata[`is${v}`]);
+
+  assert(converter, () => `Unable to convert ABI with version ${metadata.type} to latest`);
+
+  return converter[1](registry, metadata[`as${converter[0]}`]);
+}
+
+function parseJson (json: Record<string, unknown>, chainProperties?: ChainProperties): [Record<string, unknown>, Registry, ContractMetadataLatest, ContractProjectInfo] {
+  const registry = new TypeRegistry();
+  const info = registry.createType('ContractProjectInfo', json) as unknown as ContractProjectInfo;
+  const latest = getLatestMeta(registry, json);
+  const lookup = registry.createType('PortableRegistry', { types: latest.types });
+
+  // attach the lookup to the registry - now the types are known
+  registry.setLookup(lookup);
+
+  if (chainProperties) {
+    registry.setChainProperties(chainProperties);
+  }
+
+  // warm-up the actual type, pre-use
+  lookup.types.forEach(({ id }) =>
+    lookup.getTypeDef(id)
+  );
+
+  return [json, registry, latest, info];
+}
+
+export class Abi {
+  public readonly events: AbiEvent[];
+
+  public readonly constructors: AbiConstructor[];
+
+  public readonly info: ContractProjectInfo;
+
+  public readonly json: Record<string, unknown>;
+
+  public readonly messages: AbiMessage[];
+
+  public readonly metadata: ContractMetadataLatest;
+
+  public readonly registry: Registry;
+
+  constructor (abiJson: Record<string, unknown> | string, chainProperties?: ChainProperties) {
+    [this.json, this.registry, this.metadata, this.info] = parseJson(
+      isString(abiJson)
+        ? JSON.parse(abiJson) as Record<string, unknown>
+        : abiJson,
+      chainProperties
+    );
+    this.constructors = this.metadata.spec.constructors.map((spec: ContractConstructorSpecLatest, index) =>
+      this.#createMessage(spec, index, {
+        isConstructor: true,
+        isPayable: spec.payable.isTrue
+      })
+    );
+    this.events = this.metadata.spec.events.map((spec: ContractEventSpecLatest, index) =>
+      this.#createEvent(spec, index)
+    );
+    this.messages = this.metadata.spec.messages.map((spec: ContractMessageSpecLatest, index): AbiMessage => {
+      const typeSpec = spec.returnType.unwrapOr(null);
+
+      return this.#createMessage(spec, index, {
+        isMutating: spec.mutates.isTrue,
+        isPayable: spec.payable.isTrue,
+        returnType: typeSpec
+          ? this.registry.lookup.getTypeDef(typeSpec.type)
+          : 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);
+  }
+
+  public findMessage (messageOrId: AbiMessage | string | number): AbiMessage {
+    return findMessage(this.messages, messageOrId);
+  }
+
+  #createArgs = (args: ContractMessageParamSpecLatest[], spec: unknown): AbiParam[] => {
+    return args.map(({ label, type }, index): AbiParam => {
+      try {
+        assert(isObject(type), 'Invalid type definition found');
+
+        const displayName = type.displayName.length
+          ? type.displayName[type.displayName.length - 1].toString()
+          : undefined;
+        const camelName = stringCamelCase(label);
+
+        if (displayName && PRIMITIVE_ALWAYS.includes(displayName)) {
+          return {
+            name: camelName,
+            type: {
+              info: TypeDefInfo.Plain,
+              type: displayName
+            }
+          };
+        }
+
+        const typeDef = this.registry.lookup.getTypeDef(type.type);
+
+        return {
+          name: camelName,
+          type: displayName && !typeDef.type.startsWith(displayName)
+            ? { displayName, ...typeDef }
+            : typeDef
+        };
+      } catch (error) {
+        l.error(`Error expanding argument ${index} in ${stringify(spec)}`);
+
+        throw error;
+      }
+    });
+  };
+
+  #createEvent = (spec: ContractEventSpecLatest, index: number): AbiEvent => {
+    const args = this.#createArgs(spec.args, spec);
+    const event = {
+      args,
+      docs: spec.docs.map((d) => d.toString()),
+      fromU8a: (data: Uint8Array): DecodedEvent => ({
+        args: this.#decodeArgs(args, data),
+        event
+      }),
+      identifier: spec.label.toString(),
+      index
+    };
+
+    return event;
+  };
+
+  #createMessage = (spec: ContractMessageSpecLatest | ContractConstructorSpecLatest, index: number, add: Partial<AbiMessage> = {}): AbiMessage => {
+    const args = this.#createArgs(spec.args, spec);
+    const identifier = spec.label.toString();
+    const message = {
+      ...add,
+      args,
+      docs: spec.docs.map((d) => d.toString()),
+      fromU8a: (data: Uint8Array): DecodedMessage => ({
+        args: this.#decodeArgs(args, data),
+        message
+      }),
+      identifier,
+      index,
+      method: stringCamelCase(identifier),
+      path: identifier.split('::').map((s) => stringCamelCase(s)),
+      selector: spec.selector,
+      toU8a: (params: unknown[]) =>
+        this.#encodeArgs(spec, args, params)
+    };
+
+    return message;
+  };
+
+  #decodeArgs = (args: AbiParam[], data: Uint8Array): Codec[] => {
+    // for decoding we expect the input to be just the arg data, no selectors
+    // no length added (this allows use with events as well)
+    let offset = 0;
+
+    return args.map(({ type: { lookupName, type } }): Codec => {
+      const value = this.registry.createType(lookupName || type, data.subarray(offset));
+
+      offset += value.encodedLength;
+
+      return value;
+    });
+  };
+
+  #decodeMessage = (type: 'constructor' | 'message', list: AbiMessage[], data: Uint8Array): DecodedMessage => {
+    const [, trimmed] = compactStripLength(data);
+    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 = ({ label, selector }: ContractMessageSpecLatest | ContractConstructorSpecLatest, args: AbiParam[], data: unknown[]): Uint8Array => {
+    assert(data.length === args.length, () => `Expected ${args.length} arguments to contract message '${label.toString()}', found ${data.length}`);
+
+    return compactAddLength(
+      u8aConcat(
+        this.registry.createType('ContractSelector', selector).toU8a(),
+        ...args.map(({ type: { lookupName, type } }, index) =>
+          this.registry.createType(lookupName || type, data[index]).toU8a()
+        )
+      )
+    );
+  };
+}

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

@@ -0,0 +1,122 @@
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { v0ToLatest, v1ToLatest, v2ToLatest, v3ToLatest } from '@polkadot/api-contract/Abi/toLatest';
+import { TypeRegistry } from '@polkadot/types';
+
+import abis from '../test/contracts';
+
+describe('v0ToLatest', (): void => {
+  const registry = new TypeRegistry();
+  const contract = registry.createType('ContractMetadata', { V0: abis.ink_v0_erc20 });
+  const latest = v0ToLatest(registry, contract.asV0);
+
+  it('has the correct constructors', (): void => {
+    expect(
+      latest.spec.constructors.map(({ label }) => label.toString())
+    ).toEqual(['new']);
+  });
+
+  it('has the correct messages', (): void => {
+    expect(
+      latest.spec.messages.map(({ label }) => label.toString())
+    ).toEqual(['total_supply', 'balance_of', 'allowance', 'transfer', 'approve', 'transfer_from']);
+  });
+
+  it('has the correct events', (): void => {
+    expect(
+      latest.spec.events.map(({ label }) => label.toString())
+    ).toEqual(['Transfer', 'Approval']);
+  });
+
+  it('has the correct constructor arguments', (): void => {
+    expect(
+      latest.spec.constructors[0].args.map(({ label }) => label.toString())
+    ).toEqual(['initial_supply']);
+  });
+
+  it('has the correct message arguments', (): void => {
+    expect(
+      latest.spec.messages[1].args.map(({ label }) => label.toString())
+    ).toEqual(['owner']);
+  });
+
+  it('has the correct event arguments', (): void => {
+    expect(
+      latest.spec.events[0].args.map(({ label }) => label.toString())
+    ).toEqual(['from', 'to', 'value']);
+  });
+});
+
+describe('v1ToLatest', (): void => {
+  const registry = new TypeRegistry();
+  const contract = registry.createType('ContractMetadata', { V1: abis.ink_v1_flipper.V1 });
+  const latest = v1ToLatest(registry, contract.asV1);
+
+  it('has the correct constructors', (): void => {
+    expect(
+      latest.spec.constructors.map(({ label }) => label.toString())
+    ).toEqual(['new', 'default']);
+  });
+
+  it('has the correct messages', (): void => {
+    expect(
+      latest.spec.messages.map(({ label }) => label.toString())
+    ).toEqual(['flip', 'get']);
+  });
+
+  it('has the correct messages with namespaced method name', (): void => {
+    const contract = registry.createType('ContractMetadata', { V1: abis.ink_v1_psp22.V1 });
+    const latest = v1ToLatest(registry, contract.asV1);
+
+    expect(
+      latest.spec.messages.map(({ label }) => label.toString())
+    ).toEqual([
+      'PSP22Metadata::token_name', 'PSP22Metadata::token_symbol', 'PSP22Metadata::token_decimals', 'PSP22Mintable::mint', 'PSP22::decrease_allowance', 'PSP22::transfer', 'PSP22::approve', 'PSP22::allowance', 'PSP22::transfer_from', 'PSP22::balance_of', 'PSP22::increase_allowance', 'PSP22::total_supply', 'pause', 'unpause'
+    ]);
+  });
+
+  it('has the correct constructor arguments', (): void => {
+    expect(
+      latest.spec.constructors[0].args.map(({ label }) => label.toString())
+    ).toEqual(['init_value']);
+  });
+});
+
+describe('v2ToLatest', (): void => {
+  const registry = new TypeRegistry();
+  const contract = registry.createType('ContractMetadata', { V2: abis.ink_v2_flipper.V2 });
+  const latest = v2ToLatest(registry, contract.asV2);
+
+  it('has the correct constructor flag', (): void => {
+    expect(
+      latest.spec.constructors[0].payable.isTrue
+    ).toEqual(true);
+  });
+});
+
+describe('v3ToLatest', (): void => {
+  const registry = new TypeRegistry();
+  const contract = registry.createType('ContractMetadata', { V3: abis.ink_v3_flipper.V3 });
+  const latest = v3ToLatest(registry, contract.asV3);
+
+  it('has the correct constructor flags', (): void => {
+    expect(
+      latest.spec.constructors[0].payable.isTrue
+    ).toEqual(false);
+    expect(
+      latest.spec.constructors[1].payable.isTrue
+    ).toEqual(true);
+  });
+
+  it('has the correct messages', (): void => {
+    const contract = registry.createType('ContractMetadata', { V3: abis.ink_v3_traitErc20.V3 });
+    const latest = v3ToLatest(registry, contract.asV3);
+
+    expect(
+      latest.spec.messages.map(({ label }) => label.toString())
+    ).toEqual([
+      'BaseErc20::total_supply', 'BaseErc20::balance_of', 'BaseErc20::allowance', 'BaseErc20::transfer', 'BaseErc20::approve', 'BaseErc20::transfer_from'
+    ]);
+  });
+});

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

@@ -0,0 +1,38 @@
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { ContractMetadataLatest, ContractMetadataV3 } from '@polkadot/types/interfaces';
+import type { Registry } from '@polkadot/types/types';
+
+import { v0ToV1 } from './toV1';
+import { v1ToV2 } from './toV2';
+import { v2ToV3 } from './toV3';
+
+type Versions = 'V3' | 'V2' | 'V1' | 'V0';
+
+type Converter = (registry: Registry, vx: any) => ContractMetadataLatest;
+
+// Helper to convert metadata from one step to the next
+function createConverter <I, O> (next: (registry: Registry, input: O) => ContractMetadataLatest, step: (registry: Registry, input: I) => O): (registry: Registry, input: I) => ContractMetadataLatest {
+  return (registry: Registry, input: I): ContractMetadataLatest =>
+    next(registry, step(registry, input));
+}
+
+export function v3ToLatest (registry: Registry, v3: ContractMetadataV3): ContractMetadataLatest {
+  return v3;
+}
+
+export const v2ToLatest = createConverter(v3ToLatest, v2ToV3);
+export const v1ToLatest = createConverter(v2ToLatest, v1ToV2);
+export const v0ToLatest = createConverter(v1ToLatest, v0ToV1);
+
+// The versions where an enum is used, aka V0 is missing
+// (Order from newest, i.e. we expect more on newest vs oldest)
+export const enumVersions = ['V3', 'V2', 'V1'];
+
+export const convertVersions: [Versions, Converter][] = [
+  ['V3', v3ToLatest],
+  ['V2', v2ToLatest],
+  ['V1', v1ToLatest],
+  ['V0', v0ToLatest]
+];

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

@@ -0,0 +1,31 @@
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { ContractMetadataV0, ContractMetadataV1 } from '@polkadot/types/interfaces';
+import type { Registry } from '@polkadot/types/types';
+
+import { convertSiV0toV1 } from '@polkadot/types';
+import { objectSpread } from '@polkadot/util';
+
+interface Named {
+  name: unknown;
+}
+
+function v0ToV1Names (all: Named[]): unknown[] {
+  return all.map((e) =>
+    objectSpread({}, e, {
+      name: Array.isArray(e.name)
+        ? e.name
+        : [e.name]
+    }));
+}
+
+export function v0ToV1 (registry: Registry, v0: ContractMetadataV0): ContractMetadataV1 {
+  return registry.createType('ContractMetadataV1', objectSpread({}, v0, {
+    spec: objectSpread({}, v0.spec, {
+      constructors: v0ToV1Names(v0.spec.constructors),
+      messages: v0ToV1Names(v0.spec.messages)
+    }),
+    types: convertSiV0toV1(registry, v0.types)
+  }));
+}

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

@@ -0,0 +1,58 @@
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Text } from '@polkadot/types';
+import type { ContractConstructorSpecV0, ContractEventSpecV0, ContractMessageSpecV0, ContractMetadataV1, ContractMetadataV2 } from '@polkadot/types/interfaces';
+import type { Registry } from '@polkadot/types/types';
+
+import { objectSpread } from '@polkadot/util';
+
+type WithArgs = keyof typeof ARG_TYPES;
+
+interface NamedEntry {
+  name: Text | Text[];
+}
+
+type GetArgsType<T extends WithArgs> = T extends 'ContractConstructorSpec'
+  ? ContractConstructorSpecV0
+  : T extends ContractEventSpecV0
+    ? ContractEventSpecV0
+    : ContractMessageSpecV0;
+
+interface ArgsEntry <T extends WithArgs> extends NamedEntry {
+  args: GetArgsType<T>['args'][0][];
+}
+
+const ARG_TYPES = {
+  ContractConstructorSpec: 'ContractMessageParamSpecV2',
+  ContractEventSpec: 'ContractEventParamSpecV2',
+  ContractMessageSpec: 'ContractMessageParamSpecV2'
+};
+
+function v1ToV2Label (entry: NamedEntry): { label: Text } {
+  return objectSpread({}, entry, {
+    label: Array.isArray(entry.name)
+      ? entry.name.join('::')
+      : entry.name
+  });
+}
+
+function v1ToV2Labels <T extends WithArgs> (registry: Registry, outType: T, all: ArgsEntry<T>[]): unknown[] {
+  return all.map((e) =>
+    registry.createType(`${outType}V2`, objectSpread(v1ToV2Label(e), {
+      args: e.args.map((a) =>
+        registry.createType(ARG_TYPES[outType], v1ToV2Label(a))
+      )
+    }))
+  );
+}
+
+export function v1ToV2 (registry: Registry, v1: ContractMetadataV1): ContractMetadataV2 {
+  return registry.createType('ContractMetadataV2', objectSpread({}, v1, {
+    spec: objectSpread({}, v1.spec, {
+      constructors: v1ToV2Labels(registry, 'ContractConstructorSpec', v1.spec.constructors),
+      events: v1ToV2Labels(registry, 'ContractEventSpec', v1.spec.events),
+      messages: v1ToV2Labels(registry, 'ContractMessageSpec', v1.spec.messages)
+    })
+  }));
+}

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

@@ -0,0 +1,18 @@
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { ContractMetadataV2, ContractMetadataV3 } from '@polkadot/types/interfaces';
+import type { Registry } from '@polkadot/types/types';
+
+import { objectSpread } from '@polkadot/util';
+
+export function v2ToV3 (registry: Registry, v2: ContractMetadataV2): ContractMetadataV3 {
+  return registry.createType('ContractMetadataV3', objectSpread({}, v2, {
+    spec: objectSpread({}, v2.spec, {
+      constructors: v2.spec.constructors.map((c) =>
+        // V3 introduces the payable flag on constructors, for <V3, it is always true
+        registry.createType('ContractConstructorSpecV3', objectSpread({}, c, { payable: true }))
+      )
+    })
+  }));
+}

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

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

packages/api-contract/src/MetaRegistry.ts

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

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

@@ -1,8 +1,8 @@
-// Copyright 2017-2021 @polkadot/api authors & contributors
+// Copyright 2017-2022 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
-import type { AnyJson, Registry } from '@polkadot/types/types';
+import type { Registry } from '@polkadot/types/types';
 
 import { ApiBase } from '@polkadot/api/base';
 import { assert, isFunction } from '@polkadot/util';
@@ -14,19 +14,22 @@ export abstract class Base<ApiType extends ApiTypes> {
 
   public readonly api: ApiBase<ApiType>;
 
-  public readonly registry: Registry;
-
   protected readonly _decorateMethod: DecorateMethod<ApiType>;
 
-  constructor (api: ApiBase<ApiType>, abi: AnyJson | Abi, decorateMethod: DecorateMethod<ApiType>) {
+  constructor (api: ApiBase<ApiType>, abi: string | Record<string, unknown> | Abi, decorateMethod: DecorateMethod<ApiType>) {
     this.abi = abi instanceof Abi
       ? abi
       : new Abi(abi, api.registry.getChainProperties());
     this.api = api;
-    this.registry = this.abi.registry;
+
     this._decorateMethod = decorateMethod;
 
-    assert(!!(api && api.isConnected && api.tx && api.tx.contracts && Object.keys(api.tx.contracts).length), 'Your API has not been initialized correctly and it not decorated with the runtime interfaces for contracts as retrieved from the on-chain runtime');
+    assert(!!(api && api.isConnected && api.tx), 'Your API has not been initialized correctly and is not connected to a chain');
+    assert(!!(api.tx.contracts && Object.keys(api.tx.contracts).length), 'You need to connect to a chain with a runtime that supports contracts');
     assert(isFunction(api.tx.contracts.instantiateWithCode), 'You need to connect to a chain with a runtime with a V3 contracts module. The runtime does not expose api.tx.contracts.instantiateWithCode');
   }
+
+  public get registry (): Registry {
+    return this.api.registry;
+  }
 }

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

@@ -1,10 +1,10 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 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, ISubmittableResult } from '@polkadot/types/types';
+import type { ISubmittableResult } from '@polkadot/types/types';
 import type { AbiConstructor, BlueprintOptions } from '../types';
 import type { MapConstructorExec } from './types';
 
@@ -18,6 +18,10 @@ import { Base } from './Base';
 import { Contract } from './Contract';
 import { createBluePrintTx, encodeSalt } from './util';
 
+export interface BlueprintConstructor<ApiType extends ApiTypes> {
+  new(api: ApiBase<ApiType>, abi: string | Record<string, unknown> | Abi, codeHash: string | Hash | Uint8Array): Blueprint<ApiType>;
+}
+
 export class BlueprintSubmittableResult<ApiType extends ApiTypes> extends SubmittableResult {
   public readonly contract?: Contract<ApiType>;
 
@@ -36,14 +40,14 @@ export class Blueprint<ApiType extends ApiTypes> extends Base<ApiType> {
 
   readonly #tx: MapConstructorExec<ApiType> = {};
 
-  constructor (api: ApiBase<ApiType>, abi: AnyJson | Abi, codeHash: string | Hash | Uint8Array, decorateMethod: DecorateMethod<ApiType>) {
+  constructor (api: ApiBase<ApiType>, abi: string | Record<string, unknown> | Abi, codeHash: string | Hash | Uint8Array, decorateMethod: DecorateMethod<ApiType>) {
     super(api, abi, decorateMethod);
 
     this.codeHash = this.registry.createType('Hash', codeHash);
 
     this.abi.constructors.forEach((c): void => {
       if (isUndefined(this.#tx[c.method])) {
-        this.#tx[c.method] = createBluePrintTx((o, p) => this.#deploy(c, o, p));
+        this.#tx[c.method] = createBluePrintTx(c, (o, p) => this.#deploy(c, o, p));
       }
     });
   }
@@ -52,19 +56,30 @@ export class Blueprint<ApiType extends ApiTypes> extends Base<ApiType> {
     return this.#tx;
   }
 
-  #deploy = (constructorOrId: AbiConstructor | string | number, { gasLimit = BN_ZERO, salt, value = BN_ZERO }: BlueprintOptions, params: unknown[]): SubmittableExtrinsic<ApiType, BlueprintSubmittableResult<ApiType>> => {
-    return this.api.tx.contracts
-      .instantiate(
-        value,
-        gasLimit,
-        this.codeHash,
-        this.abi.findConstructor(constructorOrId).toU8a(params),
-        encodeSalt(salt)
-      )
-      .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 = BN_ZERO, salt, storageDepositLimit = null, value = BN_ZERO }: BlueprintOptions, params: unknown[]): SubmittableExtrinsic<ApiType, BlueprintSubmittableResult<ApiType>> => {
+    const hasStorageDeposit = this.api.tx.contracts.instantiate.meta.args.length === 6;
+    const encParams = this.abi.findConstructor(constructorOrId).toU8a(params);
+    const encSalt = encodeSalt(salt);
+    const tx = hasStorageDeposit
+      ? this.api.tx.contracts.instantiate(value, gasLimit, storageDepositLimit, this.codeHash, encParams, encSalt)
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore old style without storage deposit
+      : this.api.tx.contracts.instantiate(value, gasLimit, this.codeHash, encParams, encSalt);
+
+    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)
+      ))
+    );
+  };
+}
+
+export function extendBlueprint <ApiType extends ApiTypes> (type: ApiType, decorateMethod: DecorateMethod<ApiType>): BlueprintConstructor<ApiType> {
+  return class extends Blueprint<ApiType> {
+    static __BlueprintType = type;
+
+    constructor (api: ApiBase<ApiType>, abi: string | Record<string, unknown> | Abi, codeHash: string | Hash | Uint8Array) {
+      super(api, abi, codeHash, decorateMethod);
+    }
+  };
 }

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

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

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

@@ -1,10 +1,11 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
-import type { EventRecord } from '@polkadot/types/interfaces';
-import type { AnyJson, ISubmittableResult } from '@polkadot/types/types';
+import type { AccountId, EventRecord } from '@polkadot/types/interfaces';
+import type { ISubmittableResult } from '@polkadot/types/types';
+import type { Codec } from '@polkadot/types-codec/types';
 import type { AbiConstructor, BlueprintOptions } from '../types';
 import type { MapConstructorExec } from './types';
 
@@ -19,6 +20,10 @@ import { Blueprint } from './Blueprint';
 import { Contract } from './Contract';
 import { createBluePrintTx, encodeSalt } from './util';
 
+export interface CodeConstructor<ApiType extends ApiTypes> {
+  new(api: ApiBase<ApiType>, abi: string | Record<string, unknown> | Abi, wasm: Uint8Array | string | Buffer | null | undefined): Code<ApiType>;
+}
+
 export class CodeSubmittableResult<ApiType extends ApiTypes> extends SubmittableResult {
   public readonly blueprint?: Blueprint<ApiType>;
   public readonly contract?: Contract<ApiType>;
@@ -36,18 +41,18 @@ export class Code<ApiType extends ApiTypes> extends Base<ApiType> {
 
   readonly #tx: MapConstructorExec<ApiType> = {};
 
-  constructor (api: ApiBase<ApiType>, abi: AnyJson | Abi, wasm: Uint8Array | string | Buffer | null | undefined, decorateMethod: DecorateMethod<ApiType>) {
+  constructor (api: ApiBase<ApiType>, abi: string | Record<string, unknown> | Abi, wasm: Uint8Array | string | Buffer | null | undefined, decorateMethod: DecorateMethod<ApiType>) {
     super(api, abi, decorateMethod);
 
-    this.code = isWasm(this.abi.project.source.wasm)
-      ? this.abi.project.source.wasm
+    this.code = isWasm(this.abi.info.source.wasm)
+      ? this.abi.info.source.wasm
       : u8aToU8a(wasm);
 
     assert(isWasm(this.code), 'No WASM code provided');
 
     this.abi.constructors.forEach((c): void => {
       if (isUndefined(this.#tx[c.method])) {
-        this.#tx[c.method] = createBluePrintTx((o, p) => this.#instantiate(c, o, p));
+        this.#tx[c.method] = createBluePrintTx(c, (o, p) => this.#instantiate(c, o, p));
       }
     });
   }
@@ -56,25 +61,37 @@ export class Code<ApiType extends ApiTypes> extends Base<ApiType> {
     return this.#tx;
   }
 
-  #instantiate = (constructorOrId: AbiConstructor | string | number, { gasLimit = BN_ZERO, salt, value = BN_ZERO }: BlueprintOptions, params: unknown[]): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> => {
-    return this.api.tx.contracts
-      .instantiateWithCode(
-        value,
-        gasLimit,
-        compactAddLength(this.code),
-        this.abi.findConstructor(constructorOrId).toU8a(params),
-        encodeSalt(salt)
-      )
-      .withResultTransform((result: ISubmittableResult) =>
-        new CodeSubmittableResult(result, ...(applyOnEvent(result, ['CodeStored', 'Instantiated'], (records: EventRecord[]) =>
-          records.reduce<[Blueprint<ApiType>?, Contract<ApiType>?]>(([blueprint, contract], { event }) =>
-            this.api.events.contracts.Instantiated.is(event)
-              ? [blueprint, new Contract<ApiType>(this.api, this.abi, event.data[1], this._decorateMethod)]
-              : this.api.events.contracts.CodeStored.is(event)
-                ? [new Blueprint<ApiType>(this.api, this.abi, event.data[0], this._decorateMethod), contract]
-                : [blueprint, contract],
-          [])
-        ) || []))
-      );
-  }
+  #instantiate = (constructorOrId: AbiConstructor | string | number, { gasLimit = BN_ZERO, salt, storageDepositLimit = null, value = BN_ZERO }: BlueprintOptions, params: unknown[]): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> => {
+    const hasStorageDeposit = this.api.tx.contracts.instantiateWithCode.meta.args.length === 6;
+    const encCode = compactAddLength(this.code);
+    const encParams = this.abi.findConstructor(constructorOrId).toU8a(params);
+    const encSalt = encodeSalt(salt);
+    const tx = hasStorageDeposit
+      ? this.api.tx.contracts.instantiateWithCode(value, gasLimit, storageDepositLimit, encCode, encParams, encSalt)
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore old style without storage deposit
+      : this.api.tx.contracts.instantiateWithCode(value, gasLimit, encCode, encParams, encSalt);
+
+    return tx.withResultTransform((result: ISubmittableResult) =>
+      new CodeSubmittableResult(result, ...(applyOnEvent(result, ['CodeStored', 'Instantiated'], (records: EventRecord[]) =>
+        records.reduce<[Blueprint<ApiType>?, Contract<ApiType>?]>(([blueprint, contract], { event }) =>
+          this.api.events.contracts.Instantiated.is(event)
+            ? [blueprint, new Contract<ApiType>(this.api, this.abi, (event as unknown as { data: [Codec, AccountId] }).data[1], this._decorateMethod)]
+            : this.api.events.contracts.CodeStored.is(event)
+              ? [new Blueprint<ApiType>(this.api, this.abi, (event as unknown as { data: [AccountId] }).data[0], this._decorateMethod), contract]
+              : [blueprint, contract],
+        [])
+      ) || []))
+    );
+  };
+}
+
+export function extendCode <ApiType extends ApiTypes> (type: ApiType, decorateMethod: DecorateMethod<ApiType>): CodeConstructor<ApiType> {
+  return class extends Code<ApiType> {
+    static __CodeType = type;
+
+    constructor (api: ApiBase<ApiType>, abi: string | Record<string, unknown> | Abi, wasm: Uint8Array | string | Buffer | null | undefined) {
+      super(api, abi, wasm, decorateMethod);
+    }
+  };
 }

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

@@ -1,11 +1,11 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import type { Bytes } from '@polkadot/types';
-import type { AccountId, EventRecord, Weight } from '@polkadot/types/interfaces';
-import type { AnyJson, ISubmittableResult } from '@polkadot/types/types';
+import type { AccountId, ContractExecResult, EventRecord, Weight } from '@polkadot/types/interfaces';
+import type { ISubmittableResult } from '@polkadot/types/types';
 import type { AbiMessage, ContractCallOutcome, ContractOptions, DecodedEvent } from '../types';
 import type { ContractCallResult, ContractCallSend, ContractQuery, ContractTx, MapMessageQuery, MapMessageTx } from './types';
 
@@ -13,12 +13,16 @@ import { map } from 'rxjs';
 
 import { SubmittableResult } from '@polkadot/api';
 import { ApiBase } from '@polkadot/api/base';
-import { createTypeUnsafe } from '@polkadot/types';
 import { assert, BN, BN_HUNDRED, BN_ONE, BN_ZERO, bnToBn, isFunction, isUndefined, logger } from '@polkadot/util';
 
 import { Abi } from '../Abi';
 import { applyOnEvent, extractOptions, isOptions } from '../util';
 import { Base } from './Base';
+import { withMeta } from './util';
+
+export interface ContractConstructor<ApiType extends ApiTypes> {
+  new(api: ApiBase<ApiType>, abi: string | Record<string, unknown> | Abi, address: string | AccountId): Contract<ApiType>;
+}
 
 // As per Rust, 5 * GAS_PER_SEC
 const MAX_CALL_GAS = new BN(5_000_000_000_000).isub(BN_ONE);
@@ -26,18 +30,20 @@ const ERROR_NO_CALL = 'Your node does not expose the contracts.call RPC. This is
 
 const l = logger('Contract');
 
-function createQuery <ApiType extends ApiTypes> (fn: (origin: string | AccountId | Uint8Array, options: ContractOptions, params: unknown[]) => ContractCallResult<ApiType, ContractCallOutcome>): ContractQuery<ApiType> {
-  return (origin: string | AccountId | Uint8Array, options: bigint | string | number | BN | ContractOptions, ...params: unknown[]): ContractCallResult<ApiType, ContractCallOutcome> =>
+function createQuery <ApiType extends ApiTypes> (meta: AbiMessage, fn: (origin: string | AccountId | Uint8Array, options: ContractOptions, params: unknown[]) => ContractCallResult<ApiType, ContractCallOutcome>): ContractQuery<ApiType> {
+  return withMeta(meta, (origin: string | AccountId | Uint8Array, options: bigint | string | number | BN | ContractOptions, ...params: unknown[]): ContractCallResult<ApiType, ContractCallOutcome> =>
     isOptions(options)
       ? fn(origin, options, params)
-      : fn(origin, ...extractOptions(options, params));
+      : fn(origin, ...extractOptions<ContractOptions>(options, params))
+  );
 }
 
-function createTx <ApiType extends ApiTypes> (fn: (options: ContractOptions, params: unknown[]) => SubmittableExtrinsic<ApiType>): ContractTx<ApiType> {
-  return (options: bigint | string | number | BN | ContractOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType> =>
+function createTx <ApiType extends ApiTypes> (meta: AbiMessage, fn: (options: ContractOptions, params: unknown[]) => SubmittableExtrinsic<ApiType>): ContractTx<ApiType> {
+  return withMeta(meta, (options: bigint | string | number | BN | ContractOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType> =>
     isOptions(options)
       ? fn(options, params)
-      : fn(...extractOptions(options, params));
+      : fn(...extractOptions<ContractOptions>(options, params))
+  );
 }
 
 export class ContractSubmittableResult extends SubmittableResult {
@@ -60,18 +66,18 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
 
   readonly #tx: MapMessageTx<ApiType> = {};
 
-  constructor (api: ApiBase<ApiType>, abi: AnyJson | Abi, address: string | AccountId, decorateMethod: DecorateMethod<ApiType>) {
+  constructor (api: ApiBase<ApiType>, abi: string | Record<string, unknown> | Abi, address: string | AccountId, decorateMethod: DecorateMethod<ApiType>) {
     super(api, abi, decorateMethod);
 
     this.address = this.registry.createType('AccountId', address);
 
     this.abi.messages.forEach((m): void => {
       if (isUndefined(this.#tx[m.method])) {
-        this.#tx[m.method] = createTx((o, p) => this.#exec(m, o, p));
+        this.#tx[m.method] = createTx(m, (o, p) => this.#exec(m, o, p));
       }
 
       if (isUndefined(this.#query[m.method])) {
-        this.#query[m.method] = createQuery((f, o, p) => this.#read(m, o, p).send(f));
+        this.#query[m.method] = createQuery(m, (f, o, p) => this.#read(m, o, p).send(f));
       }
     });
   }
@@ -97,68 +103,79 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
       ? isCall
         ? MAX_CALL_GAS
         : (this.api.consts.system.blockWeights
-          ? this.api.consts.system.blockWeights.maxBlock
+          ? (this.api.consts.system.blockWeights as unknown as { maxBlock: Weight }).maxBlock
           : this.api.consts.system.maximumBlockWeight as Weight
         ).muln(64).div(BN_HUNDRED)
       : gasLimit;
-  }
+  };
 
-  #exec = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, value = BN_ZERO }: ContractOptions, params: unknown[]): SubmittableExtrinsic<ApiType> => {
-    return this.api.tx.contracts
-      .call(
-        this.address,
-        value,
-        this.#getGas(gasLimit),
-        this.abi.findMessage(messageOrId).toU8a(params)
-      )
-      .withResultTransform((result: ISubmittableResult) =>
-        // ContractEmitted is the current generation, ContractExecution is the previous generation
-        new ContractSubmittableResult(result, applyOnEvent(result, ['ContractEmitted', '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}`);
+  #exec = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, storageDepositLimit = null, value = BN_ZERO }: ContractOptions, params: unknown[]): SubmittableExtrinsic<ApiType> => {
+    const hasStorageDeposit = this.api.tx.contracts.call.meta.args.length === 5;
+    const gas = this.#getGas(gasLimit);
+    const encParams = this.abi.findMessage(messageOrId).toU8a(params);
+    const tx = hasStorageDeposit
+      ? this.api.tx.contracts.call(this.address, value, gas, storageDepositLimit, encParams)
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore old style without storage deposit
+      : this.api.tx.contracts.call(this.address, value, gas, encParams);
 
-                return null;
-              }
-            })
-            .filter((decoded): decoded is DecodedEvent => !!decoded)
-        ))
-      );
-  }
+    return tx.withResultTransform((result: ISubmittableResult) =>
+    // ContractEmitted is the current generation, ContractExecution is the previous generation
+      new ContractSubmittableResult(result, applyOnEvent(result, ['ContractEmitted', '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}`);
 
-  #read = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, value = BN_ZERO }: ContractOptions, params: unknown[]): ContractCallSend<ApiType> => {
+              return null;
+            }
+          })
+          .filter((decoded): decoded is DecodedEvent => !!decoded)
+      ))
+    );
+  };
+
+  #read = (messageOrId: AbiMessage | string | number, { gasLimit = BN_ZERO, storageDepositLimit = null, value = BN_ZERO }: ContractOptions, params: unknown[]): 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) =>
-        this.api.rx.rpc.contracts
-          .call({
-            dest: this.address,
-            gasLimit: this.#getGas(gasLimit, true),
-            inputData: message.toU8a(params),
-            origin,
-            value
-          })
-          .pipe(
-            map(({ debugMessage, gasConsumed, gasRequired, result }): ContractCallOutcome => ({
-              debugMessage,
-              gasConsumed,
-              gasRequired: gasRequired && !gasRequired.isZero()
-                ? gasRequired
-                : gasConsumed,
-              output: result.isOk && message.returnType
-                ? createTypeUnsafe(this.registry, message.returnType.type, [result.asOk.data.toU8a(true)], { isPedantic: true })
-                : null,
-              result
-            }))
-          )
-      )
+      send: this._decorateMethod((origin: string | AccountId | Uint8Array) => {
+        const hasStorageDeposit = this.api.tx.contracts.call.meta.args.length === 5;
+        const inputData = message.toU8a(params);
+        const rpc = hasStorageDeposit
+          ? this.api.rx.rpc.contracts.call({ dest: this.address, gasLimit: this.#getGas(gasLimit, true), inputData, origin, storageDepositLimit, value })
+          : this.api.rx.rpc.contracts.call({ dest: this.address, gasLimit: this.#getGas(gasLimit, true), inputData, origin, value });
+
+        const mapFn = ({ debugMessage, gasConsumed, gasRequired, result, storageDeposit }: ContractExecResult): ContractCallOutcome => ({
+          debugMessage,
+          gasConsumed,
+          gasRequired: gasRequired && !gasRequired.isZero()
+            ? gasRequired
+            : gasConsumed,
+          output: result.isOk && message.returnType
+            ? this.abi.registry.createTypeUnsafe(message.returnType.lookupName || message.returnType.type, [result.asOk.data.toU8a(true)], { isPedantic: true })
+            : null,
+          result,
+          storageDeposit
+        });
+
+        return rpc.pipe(map(mapFn));
+      })
     };
-  }
+  };
+}
+
+export function extendContract <ApiType extends ApiTypes> (type: ApiType, decorateMethod: DecorateMethod<ApiType>): ContractConstructor<ApiType> {
+  return class extends Contract<ApiType> {
+    static __ContractType = type;
+
+    constructor (api: ApiBase<ApiType>, abi: string | Record<string, unknown> | Abi, address: string | AccountId) {
+      super(api, abi, address, decorateMethod);
+    }
+  };
 }

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

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

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

@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import { ApiBase } from '@polkadot/api/base';

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

@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
@@ -8,23 +8,31 @@ import type { AccountId } from '@polkadot/types/interfaces';
 import type { BN } from '@polkadot/util';
 import type { AbiMessage, BlueprintOptions, ContractCallOutcome, ContractOptions } from '../types';
 
-export interface BlueprintDeploy<ApiType extends ApiTypes> {
+export interface MessageMeta {
+  readonly meta: AbiMessage;
+}
+
+export interface BlueprintDeploy<ApiType extends ApiTypes> extends MessageMeta {
   (options: BlueprintOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType>;
+  // @deprecated Use options form (to be dropped in a major update)
   (value: bigint | string | number | BN, gasLimit: bigint | string | number | BN, ...params: unknown[]): SubmittableExtrinsic<ApiType>;
 }
 
-export interface ContractQuery<ApiType extends ApiTypes> {
+export interface ContractQuery<ApiType extends ApiTypes> extends MessageMeta {
   (origin: AccountId | string | Uint8Array, options: ContractOptions, ...params: unknown[]): ContractCallResult<ApiType, ContractCallOutcome>;
+  // @deprecated Use options form (to be dropped in a major update)
   (origin: AccountId | string | Uint8Array, value: bigint | BN | string | number, gasLimit: bigint | BN | string | number, ...params: unknown[]): ContractCallResult<ApiType, ContractCallOutcome>;
 }
 
-export interface ContractTx<ApiType extends ApiTypes> {
+export interface ContractTx<ApiType extends ApiTypes> extends MessageMeta {
   (options: ContractOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType>;
+  // @deprecated Use options form (to be dropped in a major update)
   (value: bigint | BN | string | number, gasLimit: bigint | BN | string | number, ...params: unknown[]): SubmittableExtrinsic<ApiType>;
 }
 
 export interface ContractGeneric<O, T> {
   (messageOrId: AbiMessage | string | number, options: O, ...params: unknown[]): T;
+  // @deprecated Use options form (to be dropped in a major update)
   (messageOrId: AbiMessage | string | number, value: bigint | BN | string | number, gasLimit: bigint | BN | string | number, ...params: unknown[]): T;
 }
 

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

@@ -1,11 +1,11 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { SubmittableResult } from '@polkadot/api';
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes } from '@polkadot/api/types';
 import type { BN } from '@polkadot/util';
-import type { AbiConstructor, BlueprintOptions } from '../types';
+import type { AbiConstructor, AbiMessage, BlueprintOptions } from '../types';
 import type { BlueprintDeploy, ContractGeneric } from './types';
 
 import { Bytes } from '@polkadot/types';
@@ -16,18 +16,25 @@ import { extractOptions, isOptions } from '../util';
 
 export const EMPTY_SALT = new Uint8Array();
 
-export function createBluePrintTx <ApiType extends ApiTypes, R extends SubmittableResult> (fn: (options: BlueprintOptions, params: unknown[]) => SubmittableExtrinsic<ApiType, R>): BlueprintDeploy<ApiType> {
-  return (options: bigint | string | number | BN | BlueprintOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType, R> =>
+export function withMeta <T extends { meta: AbiMessage }> (meta: AbiMessage, creator: Omit<T, 'meta'>): T {
+  (creator as T).meta = meta;
+
+  return creator as T;
+}
+
+export function createBluePrintTx <ApiType extends ApiTypes, R extends SubmittableResult> (meta: AbiMessage, fn: (options: BlueprintOptions, params: unknown[]) => SubmittableExtrinsic<ApiType, R>): BlueprintDeploy<ApiType> {
+  return withMeta(meta, (options: bigint | string | number | BN | BlueprintOptions, ...params: unknown[]): SubmittableExtrinsic<ApiType, R> =>
     isOptions(options)
       ? fn(options, params)
-      : fn(...extractOptions(options, params));
+      : fn(...extractOptions<BlueprintOptions>(options, params))
+  );
 }
 
 export function createBluePrintWithId <T> (fn: (constructorOrId: AbiConstructor | string | number, options: BlueprintOptions, params: unknown[]) => T): ContractGeneric<BlueprintOptions, T> {
   return (constructorOrId: AbiConstructor | string | number, options: bigint | string | number | BN | BlueprintOptions, ...params: unknown[]): T =>
     isOptions(options)
       ? fn(constructorOrId, options, params)
-      : fn(constructorOrId, ...extractOptions(options, params));
+      : fn(constructorOrId, ...extractOptions<BlueprintOptions>(options, params));
 }
 
 export function encodeSalt (salt: Uint8Array | string | null = randomAsU8a()): Uint8Array {

packages/api-contract/src/bundle.ts

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

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

@@ -1,16 +1,18 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // Simple non-runnable checks to test type definitions in the editor itself
 
+import '@polkadot/api-augment';
+
 import { ApiPromise } from '@polkadot/api';
+import { BlueprintPromise, ContractPromise } from '@polkadot/api-contract';
 import { createTestPairs, TestKeyringMap } from '@polkadot/keyring/testingPairs';
 
-import abiIncrementer from '../test/contracts/ink/incrementer.json';
-import { BlueprintPromise, ContractPromise } from '.';
+import abiIncrementer from './test/contracts/ink/v0/incrementer.json';
 
 async function checkBlueprint (api: ApiPromise, pairs: TestKeyringMap): Promise<void> {
-  const blueprint = new BlueprintPromise(api, abiIncrementer, '0x1234');
+  const blueprint = new BlueprintPromise(api, abiIncrementer as Record<string, unknown>, '0x1234');
 
   // new style
   await blueprint.tx.new({ gasLimit: 456, salt: '0x1234', value: 123 }, 42).signAndSend(pairs.bob);
@@ -21,7 +23,7 @@ async function checkBlueprint (api: ApiPromise, pairs: TestKeyringMap): Promise<
 }
 
 async function checkContract (api: ApiPromise, pairs: TestKeyringMap): Promise<void> {
-  const contract = new ContractPromise(api, abiIncrementer, '0x1234');
+  const contract = new ContractPromise(api, abiIncrementer as Record<string, unknown>, '0x1234');
 
   // queries
   await contract.query.get(pairs.alice.address, {});

packages/api-contract/src/detectOther.ts

@@ -0,0 +1,7 @@
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { packageInfo as apiInfo } from '@polkadot/api/packageInfo';
+import { packageInfo as typesInfo } from '@polkadot/types/packageInfo';
+
+export default [apiInfo, typesInfo];

packages/api-contract/src/detectPackage.ts

@@ -1,10 +1,11 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { packageInfo as apiInfo } from '@polkadot/api/packageInfo';
-import { packageInfo as typesInfo } from '@polkadot/types/packageInfo';
+// Do not edit, auto-generated by @polkadot/dev
+
 import { detectPackage } from '@polkadot/util';
 
+import others from './detectOther';
 import { packageInfo } from './packageInfo';
 
-detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [apiInfo, typesInfo]);
+detectPackage(packageInfo, null, others);

packages/api-contract/src/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import './detectPackage';

packages/api-contract/src/packageInfo.ts

@@ -1,6 +1,6 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// Auto-generated by @polkadot/dev, do not edit
+// Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/api-contract', version: '5.8.2' };
+export const packageInfo = { name: '@polkadot/api-contract', path: 'auto', type: 'auto', version: '7.5.1' };

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

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

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

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

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

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

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

@@ -1,6 +1,27 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export { Blueprint } from './Blueprint';
-export { Code } from './Code';
-export { Contract } from './Contract';
+import type { AccountId, Hash } from '@polkadot/types/interfaces';
+
+import { ApiPromise, toPromiseMethod } from '@polkadot/api';
+
+import { Abi } from '../Abi';
+import { Blueprint, Code, Contract } from '../base';
+
+export class BlueprintPromise extends Blueprint<'promise'> {
+  constructor (api: ApiPromise, abi: string | Record<string, unknown> | Abi, codeHash: string | Hash) {
+    super(api, abi, codeHash, toPromiseMethod);
+  }
+}
+
+export class CodePromise extends Code<'promise'> {
+  constructor (api: ApiPromise, abi: string | Record<string, unknown> | Abi, wasm: Uint8Array | string | Buffer | null | undefined) {
+    super(api, abi, wasm, toPromiseMethod);
+  }
+}
+
+export class ContractPromise extends Contract<'promise'> {
+  constructor (api: ApiPromise, abi: string | Record<string, unknown> | Abi, address: string | AccountId) {
+    super(api, abi, address, toPromiseMethod);
+  }
+}

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

@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// Copyright 2017-2022 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { BlueprintSubmittableResult as BaseBlueprintSubmittableResult, CodeSubmittableResult as BaseCodeSubmittableResult } from '../base';