[CI Skip] release/stable 6.0.3

skip-checks: true

.123trigger

@@ -1,4 +1,4 @@
-32
+33
 1.4.2
 1.6.2
 1.11.2
@@ -27,4 +27,8 @@
 
 5.3.2
 5.5.2
-5.8.2
+5.8.2
+5.8.3
+
+6.0.2
+6.0.3

CHANGELOG.md

@@ -1,7 +1,72 @@
 # CHANGELOG
 
+## 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)

package.json

@@ -8,7 +8,7 @@
     "packages/*"
   ],
   "resolutions": {
-    "typescript": "^4.4.2"
+    "typescript": "^4.4.3"
   },
   "scripts": {
     "build": "yarn build:interfaces && polkadot-dev-build-ts",
@@ -29,12 +29,12 @@
     "@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",
+    "@polkadot/dev": "^0.62.67",
+    "@polkadot/ts": "^0.4.8",
     "@polkadot/typegen": "workspace:packages/typegen",
     "@types/jest": "^27.0.1",
     "copyfiles": "^2.4.1"
   },
-  "version": "5.8.2",
+  "version": "6.0.3",
   "packageManager": "yarn@3.0.1"
 }

packages/api-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "5.8.2",
+  "version": "6.0.3",
   "type": "module",
   "description": "Interfaces for interacting with contracts and contract ABIs",
   "main": "index.js",
@@ -20,9 +20,9 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@polkadot/api": "5.8.2",
-    "@polkadot/types": "5.8.2",
-    "@polkadot/util": "^7.3.1",
+    "@polkadot/api": "6.0.3",
+    "@polkadot/types": "6.0.3",
+    "@polkadot/util": "^7.4.1",
     "rxjs": "^7.3.0"
   }
 }

packages/api-contract/src/packageInfo.ts

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

packages/api-derive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "5.8.2",
+  "version": "6.0.3",
   "type": "module",
   "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
   "main": "index.js",
@@ -20,15 +20,15 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-derive#readme",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@polkadot/api": "5.8.2",
-    "@polkadot/rpc-core": "5.8.2",
-    "@polkadot/types": "5.8.2",
-    "@polkadot/util": "^7.3.1",
-    "@polkadot/util-crypto": "^7.3.1",
+    "@polkadot/api": "6.0.3",
+    "@polkadot/rpc-core": "6.0.3",
+    "@polkadot/types": "6.0.3",
+    "@polkadot/util": "^7.4.1",
+    "@polkadot/util-crypto": "^7.4.1",
     "rxjs": "^7.3.0"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^7.3.1",
-    "@polkadot/rpc-provider": "5.8.2"
+    "@polkadot/keyring": "^7.4.1",
+    "@polkadot/rpc-provider": "6.0.3"
   }
 }

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

@@ -78,7 +78,8 @@ describe('derive', (): void => {
         }
       },
       provider: new MockProvider(registry),
-      registry
+      registry,
+      throwOnConnect: true
     });
 
     beforeAll((done): void => {

packages/api-derive/src/packageInfo.ts

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

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api",
-  "version": "5.8.2",
+  "version": "6.0.3",
   "type": "module",
   "description": "Promise and RxJS wrappers around the Polkadot JS RPC",
   "main": "index.js",
@@ -20,14 +20,14 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api#readme",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@polkadot/api-derive": "5.8.2",
-    "@polkadot/keyring": "^7.3.1",
-    "@polkadot/rpc-core": "5.8.2",
-    "@polkadot/rpc-provider": "5.8.2",
-    "@polkadot/types": "5.8.2",
-    "@polkadot/types-known": "5.8.2",
-    "@polkadot/util": "^7.3.1",
-    "@polkadot/util-crypto": "^7.3.1",
+    "@polkadot/api-derive": "6.0.3",
+    "@polkadot/keyring": "^7.4.1",
+    "@polkadot/rpc-core": "6.0.3",
+    "@polkadot/rpc-provider": "6.0.3",
+    "@polkadot/types": "6.0.3",
+    "@polkadot/types-known": "6.0.3",
+    "@polkadot/util": "^7.4.1",
+    "@polkadot/util-crypto": "^7.4.1",
     "eventemitter3": "^4.0.7",
     "rxjs": "^7.3.0"
   }

packages/api/src/augment/consts.ts

@@ -1,17 +1,11 @@
 // 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 { U8aFixed, Vec, bool, u128, u16, u32, u64 } from '@polkadot/types';
+import type { Perbill, Percent, Permill } from '@polkadot/types/interfaces/runtime';
+import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, PalletContractsSchedule, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
+import type { Codec } from '@polkadot/types/types';
 
 declare module '@polkadot/api/types/consts' {
   export interface AugmentedConsts<ApiType> {
@@ -19,20 +13,20 @@ declare module '@polkadot/api/types/consts' {
       /**
        * The amount of funds that must be reserved when creating a new approval.
        **/
-      approvalDeposit: DepositBalanceOf & AugmentedConst<ApiType>;
+      approvalDeposit: u128 & AugmentedConst<ApiType>;
       /**
        * The basic amount of funds that must be reserved for an asset.
        **/
-      assetDeposit: DepositBalanceOf & AugmentedConst<ApiType>;
+      assetDeposit: u128 & AugmentedConst<ApiType>;
       /**
        * The basic amount of funds that must be reserved when adding metadata to your asset.
        **/
-      metadataDepositBase: DepositBalanceOf & AugmentedConst<ApiType>;
+      metadataDepositBase: u128 & AugmentedConst<ApiType>;
       /**
        * The additional funds that must be reserved for the number of bytes you store in your
        * metadata.
        **/
-      metadataDepositPerByte: DepositBalanceOf & AugmentedConst<ApiType>;
+      metadataDepositPerByte: u128 & AugmentedConst<ApiType>;
       /**
        * The maximum length of a name or symbol stored on-chain.
        **/
@@ -48,7 +42,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 +62,7 @@ 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>;
       /**
        * Generic const
        **/
@@ -78,7 +72,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.
@@ -101,23 +95,23 @@ declare module '@polkadot/api/types/consts' {
       /**
        * 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.
        **/
-      dataDepositPerByte: BalanceOf & AugmentedConst<ApiType>;
+      dataDepositPerByte: u128 & AugmentedConst<ApiType>;
       /**
        * Maximum acceptable reason length.
        **/
@@ -128,6 +122,13 @@ declare module '@polkadot/api/types/consts' {
       [key: string]: Codec;
     };
     contracts: {
+      /**
+       * The deposit that must be placed into the contract's account to instantiate it.
+       * This is in **addition** to the [`pallet_balances::Pallet::ExistenialDeposit`].
+       * The minimum balance for a contract's account can be queried using
+       * [`Pallet::subsistence_threshold`].
+       **/
+      contractDeposit: u128 & AugmentedConst<ApiType>;
       /**
        * The maximum number of tries that can be queued for deletion.
        **/
@@ -135,62 +136,11 @@ declare module '@polkadot/api/types/consts' {
       /**
        * The maximum amount of weight that can be consumed per block for lazy trie removal.
        **/
-      deletionWeightLimit: Weight & 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.
-       **/
-      depositPerContract: BalanceOf & 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.
-       **/
-      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>;
+      deletionWeightLimit: u64 & 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>;
+      schedule: PalletContractsSchedule & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -200,7 +150,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 +158,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 +172,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 +187,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 +222,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 +261,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,7 +278,7 @@ declare module '@polkadot/api/types/consts' {
       /**
        * Duration of the unsigned phase.
        **/
-      unsignedPhase: BlockNumber & AugmentedConst<ApiType>;
+      unsignedPhase: u32 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -343,7 +288,7 @@ declare module '@polkadot/api/types/consts' {
       /**
        * How much should be locked up in order to submit one's candidacy.
        **/
-      candidacyBond: BalanceOf & AugmentedConst<ApiType>;
+      candidacyBond: u128 & AugmentedConst<ApiType>;
       /**
        * Number of members to elect.
        **/
@@ -355,24 +300,24 @@ declare module '@polkadot/api/types/consts' {
       /**
        * Identifier for the elections-phragmen pallet's lock
        **/
-      palletId: LockIdentifier & AugmentedConst<ApiType>;
+      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: BlockNumber & AugmentedConst<ApiType>;
+      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: BalanceOf & AugmentedConst<ApiType>;
+      votingBondBase: u128 & AugmentedConst<ApiType>;
       /**
        * The amount of bond that need to be locked for each vote (32 bytes).
        **/
-      votingBondFactor: BalanceOf & AugmentedConst<ApiType>;
+      votingBondFactor: u128 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -389,7 +334,7 @@ declare module '@polkadot/api/types/consts' {
        * 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>;
+      ignoredIssuance: u128 & 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 +342,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 +361,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`.
@@ -436,11 +381,11 @@ declare module '@polkadot/api/types/consts' {
       /**
        * 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 +405,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 +418,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,7 +428,7 @@ declare module '@polkadot/api/types/consts' {
       /**
        * The deposit needed for reserving an index.
        **/
-      deposit: BalanceOf & AugmentedConst<ApiType>;
+      deposit: u128 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -503,7 +448,7 @@ declare module '@polkadot/api/types/consts' {
       /**
        * The Lottery's pallet id
        **/
-      palletId: PalletId & AugmentedConst<ApiType>;
+      palletId: FrameSupportPalletId & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -518,13 +463,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.
        **/
@@ -541,14 +486,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 +508,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 +516,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 +529,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 +537,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 +551,7 @@ 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
        **/
@@ -617,7 +562,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.
@@ -632,11 +577,11 @@ declare module '@polkadot/api/types/consts' {
       /**
        * 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.
        **/
@@ -649,20 +594,20 @@ declare module '@polkadot/api/types/consts' {
       /**
        * The societies's module 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 +617,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 +629,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 +646,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 +670,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 +683,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,9 +691,9 @@ 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.
        **/
@@ -756,15 +701,15 @@ declare module '@polkadot/api/types/consts' {
       /**
        * 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
        **/
@@ -774,11 +719,11 @@ declare module '@polkadot/api/types/consts' {
       /**
        * 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 +741,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,11 +750,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>;
+      spendPeriod: u32 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -819,20 +764,20 @@ declare module '@polkadot/api/types/consts' {
       /**
        * The basic amount of funds that must be reserved when adding an attribute to an asset.
        **/
-      attributeDepositBase: DepositBalanceOf & AugmentedConst<ApiType>;
+      attributeDepositBase: u128 & AugmentedConst<ApiType>;
       /**
        * The basic amount of funds that must be reserved for an asset class.
        **/
-      classDeposit: DepositBalanceOf & AugmentedConst<ApiType>;
+      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: DepositBalanceOf & AugmentedConst<ApiType>;
+      depositPerByte: u128 & AugmentedConst<ApiType>;
       /**
        * The basic amount of funds that must be reserved for an asset instance.
        **/
-      instanceDeposit: DepositBalanceOf & AugmentedConst<ApiType>;
+      instanceDeposit: u128 & AugmentedConst<ApiType>;
       /**
        * The maximum length of an attribute key.
        **/
@@ -840,7 +785,7 @@ declare module '@polkadot/api/types/consts' {
       /**
        * The basic amount of funds that must be reserved when adding metadata to your asset.
        **/
-      metadataDepositBase: DepositBalanceOf & AugmentedConst<ApiType>;
+      metadataDepositBase: u128 & AugmentedConst<ApiType>;
       /**
        * The maximum length of data stored on-chain.
        **/
@@ -869,7 +814,7 @@ declare module '@polkadot/api/types/consts' {
       /**
        * The minimum amount transferred to call `vested_transfer`.
        **/
-      minVestedTransfer: BalanceOf & AugmentedConst<ApiType>;
+      minVestedTransfer: u128 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/

packages/api/src/augment/errors.ts

@@ -196,9 +196,8 @@ declare module '@polkadot/api/types/errors' {
     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.
+       * the subsistence threshold. No transfer is allowed to do this. Use `seal_terminate`
+       * to recover a deposit.
        **/
       BelowSubsistenceThreshold: AugmentedError<ApiType>;
       /**
@@ -210,20 +209,6 @@ declare module '@polkadot/api/types/errors' {
        * 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.
        **/
@@ -243,7 +228,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,30 +245,10 @@ 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.
@@ -320,15 +285,6 @@ declare module '@polkadot/api/types/errors' {
        * A call tried to invoke a contract that is flagged as non-reentrant.
        **/
       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.
-       **/
-      RentNotPaid: AugmentedError<ApiType>;
       /**
        * A storage modification exhausted the 32bit type that holds the storage size.
        * 
@@ -339,12 +295,12 @@ declare module '@polkadot/api/types/errors' {
       /**
        * 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>;
       /**

packages/api/src/augment/index.ts

@@ -1,6 +1,7 @@
 // Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import '@polkadot/types/augment';
 import './consts';
 import './errors';
 import './events';

packages/api/src/augment/rpc.ts

@@ -2,7 +2,6 @@
 /* eslint-disable */
 
 import type { Bytes, HashMap, Json, Metadata, Null, Option, StorageKey, Text, U256, U64, Vec, bool, u32, u64 } from '@polkadot/types';
-import type { AnyNumber, Codec, IExtrinsic, Observable } from '@polkadot/types/types';
 import type { ExtrinsicOrHash, ExtrinsicStatus } from '@polkadot/types/interfaces/author';
 import type { EpochAuthorship } from '@polkadot/types/interfaces/babe';
 import type { BeefySignedCommitment } from '@polkadot/types/interfaces/beefy';
@@ -21,6 +20,7 @@ import type { RpcMethods } from '@polkadot/types/interfaces/rpc';
 import type { AccountId, BlockNumber, H160, H256, H64, Hash, Header, Index, Justification, KeyValue, SignedBlock, StorageData } from '@polkadot/types/interfaces/runtime';
 import type { ReadProof, RuntimeVersion, TraceBlockResponse } from '@polkadot/types/interfaces/state';
 import type { ApplyExtrinsicResult, ChainProperties, ChainType, Health, NetworkState, NodeRole, PeerInfo, SyncState } from '@polkadot/types/interfaces/system';
+import type { AnyNumber, Codec, IExtrinsic, Observable } from '@polkadot/types/types';
 
 declare module '@polkadot/rpc-core/types.jsonrpc' {
   export interface RpcInterface {

packages/api/src/base/Decorate.ts

@@ -358,10 +358,12 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
       (this.hasSubscriptions
         ? this._rpcCore.state.subscribeStorage
         : this._rpcCore.state.queryStorageAt)(
-        calls.map((arg: QueryableStorageMultiArg<ApiType>) =>
-          Array.isArray(arg)
-            ? [arg[0].creator, ...arg.slice(1)]
-            : [arg.creator])));
+        calls.map((args: QueryableStorageMultiArg<ApiType>) =>
+          Array.isArray(args)
+            ? args[0].creator.meta.type.asMap.hashers.length === 1
+              ? [args[0].creator, args.slice(1)]
+              : [args[0].creator, ...args.slice(1)]
+            : [args.creator])));
   }
 
   protected _decorateExtrinsics<ApiType extends ApiTypes> ({ tx }: DecoratedMeta, decorateMethod: DecorateMethod<ApiType>): SubmittableExtrinsics<ApiType> {
@@ -416,7 +418,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
 
   private _decorateStorageEntry<ApiType extends ApiTypes> (creator: StorageEntry, decorateMethod: DecorateMethod<ApiType>): QueryableStorageEntry<ApiType> {
     // get the storage arguments, with DoubleMap as an array entry, otherwise spread
-    const getArgs = (args: unknown[]): unknown[] => extractStorageArgs(this.#registry, creator, args);
+    const getArgs = (args: unknown[]) => extractStorageArgs(this.#registry, creator, args);
 
     // Disable this where it occurs for each field we are decorating
     /* eslint-disable @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment */
@@ -436,18 +438,10 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
       key.method === creator.method;
 
     decorated.key = (...args: unknown[]): string =>
-      u8aToHex(compactStripLength(creator(
-        creator.meta.type.isPlain
-          ? undefined
-          : creator.meta.type.isMap
-            ? args[0]
-            : creator.meta.type.isDoubleMap
-              ? [args[0], args[1]]
-              : args
-      ))[1]);
+      u8aToHex(compactStripLength(creator(...args))[1]);
 
-    decorated.keyPrefix = (...keys: unknown[]): string =>
-      u8aToHex(creator.keyPrefix(...keys));
+    decorated.keyPrefix = (...args: unknown[]): string =>
+      u8aToHex(creator.keyPrefix(...args));
 
     decorated.range = decorateMethod((range: [Hash, Hash?], ...args: unknown[]): Observable<[Hash, Codec][]> =>
       this._decorateStorageRange(decorated, args, range));
@@ -458,9 +452,8 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
     decorated.sizeAt = decorateMethod((hash: Hash | Uint8Array | string, ...args: unknown[]): Observable<u64> =>
       this._rpcCore.state.getStorageSize(getArgs(args), hash));
 
-    // FIXME NMap support
     // .keys() & .entries() only available on map types
-    if (creator.iterKey && (creator.meta.type.isMap || creator.meta.type.isDoubleMap || creator.meta.type.isNMap)) {
+    if (creator.iterKey && creator.meta.type.isMap) {
       decorated.entries = decorateMethod(
         memo(this.#instanceId, (...args: unknown[]): Observable<[StorageKey, Codec][]> =>
           this._retrieveMapEntries(creator, null, args)));
@@ -486,10 +479,13 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
           this._retrieveMapKeysPaged(creator, opts)));
     }
 
-    if (this.supportMulti) {
+    if (this.supportMulti && creator.meta.type.isMap) {
       // When using double map storage function, user need to pass double map key as an array
-      decorated.multi = decorateMethod((args: (unknown | unknown[])[]): Observable<Codec[]> =>
-        this._retrieveMulti(args.map((arg) => [creator, arg])));
+      decorated.multi = decorateMethod((args: unknown[]): Observable<Codec[]> =>
+        creator.meta.type.asMap.hashers.length === 1
+          ? this._retrieveMulti(args.map((a) => [creator, [a]]))
+          : this._retrieveMulti(args.map((a) => [creator, a as unknown[]]))
+      );
     }
 
     /* eslint-enable @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment */
@@ -520,11 +516,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
       u8aToHex(compactStripLength(creator(
         creator.meta.type.isPlain
           ? undefined
-          : creator.meta.type.isMap
-            ? args[0]
-            : creator.meta.type.isDoubleMap
-              ? [args[0], args[1]]
-              : args
+          : args
       ))[1]);
 
     decorated.keyPrefix = (...keys: unknown[]): string =>
@@ -535,7 +527,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
 
     // FIXME NMap support
     // .keys() & .entries() only available on map types
-    if (creator.iterKey && (creator.meta.type.isMap || creator.meta.type.isDoubleMap)) {
+    if (creator.iterKey && creator.meta.type.isMap) {
       decorated.entries = decorateMethod(
         memo(this.#instanceId, (...args: unknown[]): Observable<[StorageKey, Codec][]> =>
           this._retrieveMapEntries(creator, blockHash, args)));
@@ -579,7 +571,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
   }
 
   // retrieve a set of values for a specific set of keys - here we chunk the keys into PAGE_SIZE sizes
-  private _retrieveMulti (keys: [StorageEntry, unknown | unknown[]][]): Observable<Codec[]> {
+  private _retrieveMulti (keys: [StorageEntry, unknown[]][]): Observable<Codec[]> {
     if (!keys.length) {
       return of([]);
     }
@@ -596,7 +588,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
   }
 
   private _retrieveMapKeys ({ iterKey, meta, method, section }: StorageEntry, at: Hash | Uint8Array | string | null, args: unknown[]): Observable<StorageKey[]> {
-    assert(iterKey && (meta.type.isMap || meta.type.isDoubleMap || meta.type.isNMap), 'keys can only be retrieved on maps, linked maps and double maps');
+    assert(iterKey && meta.type.isMap, 'keys can only be retrieved on maps');
 
     const headKey = iterKey(...args).toHex();
     const startSubject = new BehaviorSubject<string>(headKey);
@@ -620,7 +612,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
   }
 
   private _retrieveMapKeysPaged ({ iterKey, meta, method, section }: StorageEntry, opts: PaginationOptions): Observable<StorageKey[]> {
-    assert(iterKey && (meta.type.isMap || meta.type.isDoubleMap || meta.type.isNMap), 'keys can only be retrieved on maps, linked maps and double maps');
+    assert(iterKey && meta.type.isMap, 'keys can only be retrieved on maps');
 
     const headKey = iterKey(...opts.args).toHex();
 

packages/api/src/base/Init.ts

@@ -165,7 +165,7 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
     }
 
     // nothing has been found, construct new
-    const registry = new TypeRegistry(blockHash);
+    const registry = new TypeRegistry(blockHash, this.registry.compatSpecs);
     const metadata = new Metadata(registry,
       await firstValueFrom((this._rpcCore.state.getMetadata as RpcInterfaceMethod).raw(header.parentHash))
     );

packages/api/src/checkTypes.manual.ts

@@ -21,7 +21,8 @@ function consts (api: ApiPromise): void {
   console.log(
     api.consts.foo.bar,
     api.consts.balances.existentialDeposit.toNumber(),
-    api.consts.balances.existentialDeposit.meta.docs.map((s): string => s.toString()).join('')
+    api.consts.balances.existentialDeposit.meta.docs.map((s) => s.toString()).join(''),
+    api.consts.system.blockWeights.maxBlock.divn(123).toNumber()
   );
 }
 

packages/api/src/packageInfo.ts

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

packages/api/src/promise/index.spec.ts

@@ -39,7 +39,7 @@ describe('ApiPromise', (): void => {
     };
 
     const signer = new SingleAccountSigner(registry, aliceEd);
-    const api = await ApiPromise.create({ provider, registry, signer });
+    const api = await ApiPromise.create({ provider, registry, signer, throwOnConnect: true });
     const transfer = api.tx.balances.transfer(keyring.getPair('0xe659a7a1628cdd93febc04a4e0646ea20e9f5f0ce097d9a05290d4a9e054df4e').address, 321564789876512345n);
 
     return { api, transfer: await transfer.signAsync(aliceEd.address, {}) };
@@ -59,7 +59,7 @@ describe('ApiPromise', (): void => {
       const rpcData = await provider.send<string>('state_getMetadata', []);
       const genesisHash = registry.createType('Hash', await provider.send('chain_getBlockHash', [])).toHex();
       const specVersion = 0;
-      const api = await ApiPromise.create({ metadata: { [`${genesisHash}-${specVersion}`]: rpcData }, provider, registry });
+      const api = await ApiPromise.create({ metadata: { [`${genesisHash}-${specVersion}`]: rpcData }, provider, registry, throwOnConnect: true });
 
       expect(api.genesisHash).toBeDefined();
       expect(api.runtimeMetadata).toBeDefined();
@@ -74,7 +74,7 @@ describe('ApiPromise', (): void => {
 
     it('Create API instance without metadata and makes the runtime, rpc, state & extrinsics available', async (): Promise<void> => {
       const metadata = {};
-      const api = await ApiPromise.create({ metadata, provider, registry });
+      const api = await ApiPromise.create({ metadata, provider, registry, throwOnConnect: true });
 
       expect(api.genesisHash).toBeDefined();
       expect(api.runtimeMetadata).toBeDefined();
@@ -98,17 +98,15 @@ describe('ApiPromise', (): void => {
         }
       }
 
-      const api = new ErrorApiPromise();
-
       try {
-        await api.isReadyOrError;
+        const api = await ErrorApiPromise.create({ provider, throwOnConnect: true });
+
+        await api.disconnect();
 
         fail('Expected an error but none occurred.');
       } catch {
         // Pass
       }
-
-      await api.disconnect();
     });
   });
 
@@ -118,7 +116,7 @@ describe('ApiPromise', (): void => {
     const SIG = '0x659effefbbe5ab4d7136ebb5084b959eb424e32b862307371be4721ac2c46334245af4f1476c36c5e5aff04396c2fdd2ce561ec90382821d4aa071b559b1db0f';
 
     it('signs data using a specified keyring', async (): Promise<void> => {
-      const api = await ApiPromise.create({ provider, registry });
+      const api = await ApiPromise.create({ provider, registry, throwOnConnect: true });
       const sig = await api.sign(aliceEd, TEST);
 
       expect(sig).toEqual(SIG);
@@ -127,11 +125,7 @@ describe('ApiPromise', (): void => {
     });
 
     it('signs data using an external signer', async (): Promise<void> => {
-      const api = await ApiPromise.create({
-        provider,
-        registry,
-        signer: new SingleAccountSigner(registry, aliceEd)
-      });
+      const api = await ApiPromise.create({ provider, registry, signer: new SingleAccountSigner(registry, aliceEd), throwOnConnect: true });
       const sig = await api.sign(ADDR, TEST);
 
       expect(sig).toEqual(SIG);

packages/api/src/types/consts.ts

@@ -1,7 +1,7 @@
 // Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { ModuleConstantMetadataLatest } from '@polkadot/types/interfaces';
+import type { PalletConstantMetadataLatest } from '@polkadot/types/interfaces';
 import type { Codec } from '@polkadot/types/types';
 import type { ApiTypes } from './base';
 
@@ -10,7 +10,7 @@ export interface AugmentedConsts<ApiType extends ApiTypes> { }
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export interface AugmentedConst<ApiType extends ApiTypes> {
-  meta: ModuleConstantMetadataLatest;
+  meta: PalletConstantMetadataLatest;
 }
 
 export interface QueryableModuleConsts {

packages/api/src/util/validate.spec.ts

@@ -1,8 +1,6 @@
 // Copyright 2017-2019 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { Storage } from '@polkadot/types/metadata/decorate/types';
-
 import { decorateStorage, Metadata, TypeRegistry } from '@polkadot/types';
 import metaStatic from '@polkadot/types-support/metadata/static-substrate';
 
@@ -10,50 +8,46 @@ import { extractStorageArgs } from './validate';
 
 describe('extractStorageArgs', (): void => {
   const registry = new TypeRegistry();
-  let storage: Storage;
+  const metadata = new Metadata(registry, metaStatic);
 
-  beforeEach((): void => {
-    const metadata = new Metadata(registry, metaStatic);
+  registry.setMetadata(metadata);
 
-    storage = decorateStorage(registry, metadata.asLatest, metadata.version);
-  });
+  const storage = decorateStorage(registry, metadata.asLatest, metadata.version);
 
   it('validates no-arg plain', (): void => {
     expect(
       extractStorageArgs(registry, storage.timestamp.now, [])
-    ).toEqual([storage.timestamp.now]);
+    ).toEqual([storage.timestamp.now, []]);
   });
 
   it('validates no-arg plain (with undefined, undefined)', (): void => {
     expect(
       extractStorageArgs(registry, storage.timestamp.now, [undefined, undefined])
-    ).toEqual([storage.timestamp.now]);
+    ).toEqual([storage.timestamp.now, []]);
   });
 
   it('validates no-arg plain (failing when there are args)', (): void => {
     expect(
-      (): unknown => extractStorageArgs(registry, storage.timestamp.now, [123, 456])
+      () => extractStorageArgs(registry, storage.timestamp.now, [123, 456])
     ).toThrow('timestamp.now() does not take any arguments, 2 found');
   });
 
   it('validates map, 1 arg', (): void => {
     expect(
       extractStorageArgs(registry, storage.staking.payee, ['abc'])
-    ).toEqual([storage.staking.payee, 'abc']);
+    ).toEqual([storage.staking.payee, ['abc']]);
   });
 
   it('validates map, 1 arg (failing with no args)', (): void => {
     expect(
-      (): any =>
-        extractStorageArgs(registry, storage.staking.payee, [])
-    ).toThrow('staking.payee(AccountId) is a map, requiring 1 argument, 0 found');
+      () => extractStorageArgs(registry, storage.staking.payee, [])
+    ).toThrow('staking.payee(AccountId32) is a map, requiring 1 arguments, 0 found');
   });
 
   it('validates map, 1 arg (failing with no args)', (): void => {
     expect(
-      (): any =>
-        extractStorageArgs(registry, storage.staking.payee, ['abc', 'def'])
-    ).toThrow('staking.payee(AccountId) is a map, requiring 1 argument, 2 found');
+      () => extractStorageArgs(registry, storage.staking.payee, ['abc', 'def'])
+    ).toThrow('staking.payee(AccountId32) is a map, requiring 1 arguments, 2 found');
   });
 
   it('validates doublemap, 2 args', (): void => {
@@ -64,35 +58,13 @@ describe('extractStorageArgs', (): void => {
 
   it('validates doublemap, 2 args (failing with no args)', (): void => {
     expect(
-      (): any =>
-        extractStorageArgs(registry, storage.staking.erasStakers, [])
-    ).toThrow('staking.erasStakers(EraIndex, AccountId) is a double map, requiring 2 arguments, 0 found');
+      () => extractStorageArgs(registry, storage.staking.erasStakers, [])
+    ).toThrow('staking.erasStakers(u32, AccountId32) is a map, requiring 2 arguments, 0 found');
   });
 
   it('validates doublemap, 2 args (failing with 1 arg)', (): void => {
     expect(
-      (): any =>
-        extractStorageArgs(registry, storage.staking.erasStakers, [123])
-    ).toThrow('staking.erasStakers(EraIndex, AccountId) is a double map, requiring 2 arguments, 1 found');
-  });
-
-  // Linked maps have been removed
-  it.skip('validates linked map, no args', (): void => {
-    expect(
-      extractStorageArgs(registry, storage.staking.validators, [])
-    ).toEqual([storage.staking.validators]);
-  });
-
-  it.skip('validates linked map, single arg', (): void => {
-    expect(
-      extractStorageArgs(registry, storage.staking.validators, [123])
-    ).toEqual([storage.staking.validators, 123]);
-  });
-
-  it.skip('validates linked map (failing with extra args)', (): void => {
-    expect(
-      (): any[] =>
-        extractStorageArgs(registry, storage.staking.validators, [123, 456])
-    ).toThrow('staking.validators(AccountId) is a linked map, requiring either 0 arguments (retrieving all) or 1 argument, 2 found');
+      () => extractStorageArgs(registry, storage.staking.erasStakers, [123])
+    ).toThrow('staking.erasStakers(u32, AccountId32) is a map, requiring 2 arguments, 1 found');
   });
 });

packages/api/src/util/validate.ts

@@ -1,60 +1,32 @@
 // Copyright 2017-2019 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { Type } from '@polkadot/types';
+import type { SiLookupTypeId } from '@polkadot/types/interfaces';
 import type { StorageEntry } from '@polkadot/types/primitive/types';
 import type { Registry } from '@polkadot/types/types';
 
 import { assert, isUndefined } from '@polkadot/util';
 
-function sig (_: Registry, { method, section }: StorageEntry, args: Type[]): string {
-  return `${section}.${method}(${args.join(', ')})`;
-}
-
-function doDoubleMap (registry: Registry, creator: StorageEntry, args: unknown[]): [StorageEntry, [any, any]] {
-  const { key1, key2 } = creator.meta.type.asDoubleMap;
-
-  assert(args.length === 2, () => `${sig(registry, creator, [key1, key2])} is a double map, requiring 2 arguments, ${args.length} found`);
-
-  // pass as tuple
-  return [creator, args as [any, any]];
-}
-
-function doMap (registry: Registry, creator: StorageEntry, args: unknown[]): [StorageEntry] | [StorageEntry, any] {
-  const { key } = creator.meta.type.asMap;
-
-  assert(args.length === 1, () => `${sig(registry, creator, [key])} is a map, requiring 1 argument, ${args.length} found`);
-
-  // expand
-  return args.length
-    ? [creator, args[0]]
-    : [creator];
-}
-
-function doNMap (registry: Registry, creator: StorageEntry, args: unknown[]): [StorageEntry, any[]] {
-  const { keyVec } = creator.meta.type.asNMap;
-
-  assert(args.length === keyVec.length, () => `${sig(registry, creator, keyVec)} is a multi map, requiring ${keyVec.length} arguments, ${args.length} found`);
-
-  // pass as tuple
-  return [creator, args];
+function sig ({ lookup }: Registry, { method, section }: StorageEntry, args: SiLookupTypeId[]): string {
+  return `${section}.${method}(${args.map((a) => lookup.getTypeDef(a).type).join(', ')})`;
 }
 
 // sets up the arguments in the form of [creator, args] ready to be used in a storage
 // call. Additionally, it verifies that the correct number of arguments have been passed
-export function extractStorageArgs (registry: Registry, creator: StorageEntry, _args: unknown[]): [StorageEntry, any[]] | [StorageEntry] | [StorageEntry, any] {
+export function extractStorageArgs (registry: Registry, creator: StorageEntry, _args: unknown[]): [StorageEntry, unknown[]] {
   const args = _args.filter((arg) => !isUndefined(arg));
 
-  if (creator.meta.type.isDoubleMap) {
-    return doDoubleMap(registry, creator, args);
-  } else if (creator.meta.type.isMap) {
-    return doMap(registry, creator, args);
-  } else if (creator.meta.type.isNMap) {
-    return doNMap(registry, creator, args);
+  if (creator.meta.type.isPlain) {
+    assert(args.length === 0, () => `${sig(registry, creator, [])} does not take any arguments, ${args.length} found`);
+  } else {
+    const { hashers, key } = creator.meta.type.asMap;
+    const keys = hashers.length === 1
+      ? [key]
+      : registry.lookup.getSiType(key).def.asTuple.map((t) => t);
+
+    assert(args.length === keys.length, () => `${sig(registry, creator, keys)} is a map, requiring ${keys.length} arguments, ${args.length} found`);
   }
 
-  assert(args.length === 0, () => `${sig(registry, creator, [])} does not take any arguments, ${args.length} found`);
-
-  // no args
-  return [creator];
+  // pass as tuple
+  return [creator, args];
 }

packages/api/test/api.spec.ts

@@ -22,6 +22,11 @@ describe('misc online tests', (): void => {
     await api.disconnect();
   });
 
+  it('expose rpc and rx definition', (): void => {
+    console.error(api.rpc.payment.queryFeeDetails.meta);
+    console.error(api.rx.rpc.chain.getBlock.meta);
+  });
+
   it.skip('retrieves balances correctly', async (): Promise<void> => {
     console.error(JSON.stringify(
       await api.query.system.account('FPzukZw2mphWsXDqdkNzLaxnanjZEWH9i2vqwobTdtde5me')
@@ -64,10 +69,4 @@ describe('misc online tests', (): void => {
       await api.query.society.defenderVotes('Dab4bfYTZRUDMWjYAUQuFbDreQ9mt7nULWu3Dw7jodbzVe9')
     ));
   });
-
-  it('expose rpc and rx definition', (): void => {
-    console.error(api.rpc.payment.queryFeeDetails.meta);
-
-    console.error(api.rx.rpc.chain.getBlock.meta);
-  });
 });

packages/api/test/typesBundleDerive.spec.ts

@@ -150,7 +150,7 @@ const typesBundle = {
 
       types: [
         {
-          minmax: [0, undefined] as [number?, number?],
+          minmax: [0, undefined],
           types: {
             Balance: 'u64',
             BalanceOf: 'Balance',

packages/rpc-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-core",
-  "version": "5.8.2",
+  "version": "6.0.3",
   "type": "module",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
@@ -20,12 +20,12 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-core#readme",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@polkadot/rpc-provider": "5.8.2",
-    "@polkadot/types": "5.8.2",
-    "@polkadot/util": "^7.3.1",
+    "@polkadot/rpc-provider": "6.0.3",
+    "@polkadot/types": "6.0.3",
+    "@polkadot/util": "^7.4.1",
     "rxjs": "^7.3.0"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^7.3.1"
+    "@polkadot/keyring": "^7.4.1"
   }
 }

packages/rpc-core/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/rpc-core', version: '5.8.2' };
+export const packageInfo = { name: '@polkadot/rpc-core', version: '6.0.3' };

packages/rpc-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-provider",
-  "version": "5.8.2",
+  "version": "6.0.3",
   "type": "module",
   "description": "Transport providers for the API",
   "main": "index.js",
@@ -20,17 +20,17 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-provider#readme",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@polkadot/types": "5.8.2",
-    "@polkadot/util": "^7.3.1",
-    "@polkadot/util-crypto": "^7.3.1",
-    "@polkadot/x-fetch": "^7.3.1",
-    "@polkadot/x-global": "^7.3.1",
-    "@polkadot/x-ws": "^7.3.1",
+    "@polkadot/types": "6.0.3",
+    "@polkadot/util": "^7.4.1",
+    "@polkadot/util-crypto": "^7.4.1",
+    "@polkadot/x-fetch": "^7.4.1",
+    "@polkadot/x-global": "^7.4.1",
+    "@polkadot/x-ws": "^7.4.1",
     "eventemitter3": "^4.0.7"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^7.3.1",
-    "@polkadot/types": "5.8.2",
+    "@polkadot/keyring": "^7.4.1",
+    "@polkadot/types": "6.0.3",
     "mock-socket": "^9.0.3",
     "nock": "^13.1.3"
   }

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

@@ -29,6 +29,14 @@ describe('Http', (): void => {
     ).not.toThrow();
   });
 
+  it('allow clone', (): void => {
+    const clone = http.clone();
+    /* eslint-disable */
+    expect((clone as any)['#endpoint']).toEqual((http as any)['#endpoint']);
+    expect((clone as any)['#headers']).toEqual((http as any)['#headers']);
+    /* eslint-enable */
+  });
+
   it('always returns isConnected true', (): void => {
     expect(http.isConnected).toEqual(true);
   });

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

@@ -62,7 +62,7 @@ export class HttpProvider implements ProviderInterface {
    * @description Returns a clone of the object
    */
   public clone (): HttpProvider {
-    throw new Error('Unimplemented');
+    return new HttpProvider(this.#endpoint, this.#headers);
   }
 
   /**

packages/rpc-provider/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/rpc-provider', version: '5.8.2' };
+export const packageInfo = { name: '@polkadot/rpc-provider', version: '6.0.3' };

packages/typegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/typegen",
-  "version": "5.8.2",
+  "version": "6.0.3",
   "type": "module",
   "description": "Type generation scripts",
   "main": "index.js",
@@ -29,11 +29,11 @@
     "@babel/core": "^7.15.5",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7.15.4",
-    "@polkadot/api": "5.8.2",
-    "@polkadot/rpc-provider": "5.8.2",
-    "@polkadot/types": "5.8.2",
-    "@polkadot/types-support": "5.8.2",
-    "@polkadot/util": "^7.3.1",
+    "@polkadot/api": "6.0.3",
+    "@polkadot/rpc-provider": "6.0.3",
+    "@polkadot/types": "6.0.3",
+    "@polkadot/types-support": "6.0.3",
+    "@polkadot/util": "^7.4.1",
     "handlebars": "^4.7.7",
     "websocket": "^1.0.34",
     "yargs": "^17.1.1"

packages/typegen/src/extractChain.ts

@@ -12,7 +12,7 @@ import { ApiPromise, WsProvider } from '@polkadot/api';
 /** @internal */
 async function run (ws: string): Promise<void> {
   const provider = new WsProvider(ws);
-  const api = await ApiPromise.create({ provider });
+  const api = await ApiPromise.create({ provider, throwOnConnect: true });
   const [chain, props] = await Promise.all([
     api.rpc.system.chain(),
     api.rpc.system.properties()

packages/typegen/src/generate/consts.ts

@@ -6,6 +6,7 @@ import type { ExtraTypes } from './types';
 
 import Handlebars from 'handlebars';
 
+import lookupDefinitions from '@polkadot/types/augment/lookup/definitions';
 import * as defaultDefs from '@polkadot/types/interfaces/definitions';
 import { stringCamelCase } from '@polkadot/util';
 
@@ -17,14 +18,19 @@ const generateForMetaTemplate = Handlebars.compile(template);
 /** @internal */
 function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes, isStrict: boolean): void {
   writeFile(dest, (): string => {
-    const allTypes = { '@polkadot/types/interfaces': defaultDefs, ...extraTypes };
+    const allTypes = {
+      '@polkadot/types/augment': { lookup: lookupDefinitions },
+      '@polkadot/types/interfaces': defaultDefs,
+      ...extraTypes
+    };
     const imports = createImports(allTypes);
     const allDefs = Object.entries(allTypes).reduce((defs, [path, obj]) => {
       return Object.entries(obj).reduce((defs, [key, value]) => ({ ...defs, [`${path}/${key}`]: value }), defs);
     }, {});
+    const { lookup, pallets, registry } = meta.asLatest;
 
-    const modules = meta.asLatest.modules
-      .filter((mod) => mod.constants.length > 0)
+    const modules = pallets
+      .filter(({ constants }) => constants.length > 0)
       .map(({ constants, name }) => {
         if (!isStrict) {
           setImports(allDefs, imports, ['Codec']);
@@ -32,7 +38,8 @@ function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes,
 
         const items = constants
           .map(({ docs, name, type }) => {
-            const returnType = formatType(meta.registry, allDefs, type.toString(), imports);
+            const typeDef = lookup.getTypeDef(type);
+            const returnType = typeDef.lookupName || formatType(registry, allDefs, typeDef, imports);
 
             setImports(allDefs, imports, [returnType]);
 
@@ -57,8 +64,8 @@ function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes,
       isStrict,
       modules,
       types: [
-        ...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({
-          file: packagePath,
+        ...Object.keys(imports.localTypes).sort().map<{ file: string; types: string[] }>((packagePath) => ({
+          file: packagePath.replace('@polkadot/types/augment', '@polkadot/types'),
           types: Object.keys(imports.localTypes[packagePath])
         })),
         {

packages/typegen/src/generate/errors.ts

@@ -17,11 +17,11 @@ const generateForMetaTemplate = Handlebars.compile(template);
 function generateForMeta (meta: Metadata, dest: string, isStrict: boolean): void {
   writeFile(dest, (): string => {
     const imports = createImports({});
-
-    const modules = meta.asLatest.modules
-      .filter((mod) => mod.errors.length > 0)
+    const { lookup, pallets } = meta.asLatest;
+    const modules = pallets
+      .filter(({ errors }) => errors.isSome)
       .map(({ errors, name }) => ({
-        items: errors
+        items: lookup.getSiType(errors.unwrap().type).def.asVariant.variants
           .map(({ docs, name }) => ({
             docs,
             name: name.toString()

packages/typegen/src/generate/events.ts

@@ -6,6 +6,7 @@ import type { ExtraTypes } from './types';
 
 import Handlebars from 'handlebars';
 
+import lookupDefinitions from '@polkadot/types/augment/lookup/definitions';
 import * as defaultDefs from '@polkadot/types/interfaces/definitions';
 import { stringCamelCase } from '@polkadot/util';
 
@@ -17,29 +18,34 @@ const generateForMetaTemplate = Handlebars.compile(template);
 /** @internal */
 function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes, isStrict: boolean): void {
   writeFile(dest, (): string => {
-    const allTypes = { '@polkadot/types/interfaces': defaultDefs, ...extraTypes };
+    const allTypes = {
+      '@polkadot/types/augment': { lookup: lookupDefinitions },
+      '@polkadot/types/interfaces': defaultDefs,
+      ...extraTypes
+    };
     const imports = createImports(allTypes);
     const allDefs = Object.entries(allTypes).reduce((defs, [path, obj]) => {
       return Object.entries(obj).reduce((defs, [key, value]) => ({ ...defs, [`${path}/${key}`]: value }), defs);
     }, {});
-
-    const modules = meta.asLatest.modules
-      .filter((mod) => mod.events.isSome)
+    const { lookup, pallets, registry } = meta.asLatest;
+    const modules = pallets
+      .filter(({ events }) => events.isSome)
       .map(({ events, name }) => ({
-        items: events
-          .unwrap()
-          .sort(compareName)
-          .map(({ args, docs, name }) => {
-            const types = args.map((type) => formatType(meta.registry, allDefs, type.toString(), imports));
+        items: lookup.getSiType(events.unwrap().type).def.asVariant.variants
+          .map(({ docs, fields, name }) => {
+            const args = fields
+              .map(({ type }) => lookup.getTypeDef(type))
+              .map((typeDef) => typeDef.lookupName || formatType(registry, allDefs, typeDef, imports));
 
-            setImports(allDefs, imports, types);
+            setImports(allDefs, imports, args);
 
             return {
               docs,
               name: name.toString(),
-              type: types.join(', ')
+              type: args.join(', ')
             };
-          }).sort(compareName),
+          })
+          .sort(compareName),
         name: stringCamelCase(name)
       }))
       .sort(compareName);
@@ -51,7 +57,7 @@ function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes,
       modules,
       types: [
         ...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({
-          file: packagePath,
+          file: packagePath.replace('@polkadot/types/augment', '@polkadot/types'),
           types: Object.keys(imports.localTypes[packagePath])
         })),
         {

packages/typegen/src/generate/index.ts

@@ -5,6 +5,7 @@ export { generateDefaultConsts } from './consts';
 export { generateDefaultErrors } from './errors';
 export { generateDefaultEvents } from './events';
 export { generateDefaultInterface } from './interfaceRegistry';
+export { generateDefaultLookup } from './lookup';
 export { generateDefaultQuery } from './query';
 export { generateDefaultRpc } from './rpc';
 export { generateDefaultTsDef } from './tsDef';

packages/typegen/src/generate/lookup.ts

@@ -0,0 +1,270 @@
+// Copyright 2017-2021 @polkadot/typegen authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { PortableRegistry, PortableType, SiLookupTypeId, SiPath, SiTypeParameter } from '@polkadot/types/interfaces';
+import type { TypeDef } from '@polkadot/types/types';
+
+import Handlebars from 'handlebars';
+import path from 'path';
+
+import * as defaultDefinitions from '@polkadot/types/interfaces/definitions';
+import { Registry } from '@polkadot/types/types';
+import staticKusama from '@polkadot/types-support/metadata/static-kusama';
+import staticPolkadot from '@polkadot/types-support/metadata/static-polkadot';
+import staticSubstrate from '@polkadot/types-support/metadata/static-substrate';
+import { isString, stringify } from '@polkadot/util';
+
+import { createImports, exportType, initMeta, readTemplate, writeFile } from '../util';
+import { typeEncoders } from './tsDef';
+
+const MAP_ENUMS = ['Call', 'Event', 'Error', 'RawEvent'];
+const WITH_TYPEDEF = false;
+
+const generateLookupDefsTmpl = Handlebars.compile(readTemplate('lookup/defs'));
+const generateLookupDefsNamedTmpl = Handlebars.compile(readTemplate('lookup/defs-named'));
+const generateLookupIndexTmpl = Handlebars.compile(readTemplate('lookup/index'));
+const generateLookupTypesTmpl = Handlebars.compile(readTemplate('lookup/types'));
+
+function generateParamType (registry: Registry, { name, type }: SiTypeParameter): string {
+  if (type.isSome) {
+    const link = registry.lookup.types[type.unwrap().toNumber()];
+
+    if (link.type.path.length) {
+      return generateTypeDocs(registry, null, link.type.path, link.type.params);
+    }
+  }
+
+  return name.toString();
+}
+
+function generateTypeDocs (registry: Registry, id: SiLookupTypeId | null, path: SiPath, params: SiTypeParameter[]): string {
+  return `${id ? `${registry.createLookupType(id)}${path.length ? ': ' : ''}` : ''}${path.map((p) => p.toString()).join('::')}${params.length ? `<${params.map((p) => generateParamType(registry, p)).join(', ')}>` : ''}`;
+}
+
+function formatObject (lines: string[]): string[] {
+  const max = lines.length - 1;
+
+  return [
+    '{',
+    ...lines.map((l, index) =>
+      (l.endsWith(',') || l.endsWith('{') || index === max || lines[index + 1].endsWith('}') || lines[index + 1].endsWith('}'))
+        ? l
+        : `${l},`
+    ),
+    '}'
+  ];
+}
+
+function expandSet (parsed: Record<string, number>): string[] {
+  return formatObject(
+    Object.entries(parsed).reduce<string[]>((all, [k, v]) => {
+      all.push(`${k}: ${v}`);
+
+      return all;
+    }, [])
+  );
+}
+
+function expandObject (parsed: Record<string, string | Record<string, string>>): string[] {
+  if (parsed._set) {
+    return expandSet(parsed._set as unknown as Record<string, number>);
+  }
+
+  return formatObject(
+    Object.entries(parsed).reduce<string[]>((all, [k, v]) => {
+      const inner = isString(v)
+        ? expandType(v)
+        : Array.isArray(v)
+          ? [`[${(v as string[]).map((e) => `'${e}'`).join(', ')}]`]
+          : expandObject(v);
+
+      inner.forEach((l, index): void => {
+        all.push(`${
+          index === 0
+            ? `${k}: ${l}`
+            : `${l}`
+        }`);
+      });
+
+      return all;
+    }, [])
+  );
+}
+
+function expandType (encoded: string): string[] {
+  if (!encoded.startsWith('{')) {
+    return [`'${encoded}'`];
+  }
+
+  return expandObject(JSON.parse(encoded) as Record<string, string | Record<string, string>>);
+}
+
+function expandDefToString ({ lookupNameRoot, type }: TypeDef, indent: number): string {
+  if (lookupNameRoot) {
+    return `'${lookupNameRoot}'`;
+  }
+
+  const lines = expandType(type);
+  let inc = 0;
+
+  return lines.map((l, index) => {
+    let r: string;
+
+    if (l.endsWith('{')) {
+      r = index === 0
+        ? l
+        : `${' '.padStart(indent + inc)}${l}`;
+      inc += 2;
+    } else {
+      if (l.endsWith('},') || l.endsWith('}')) {
+        inc -= 2;
+      }
+
+      r = index === 0
+        ? l
+        : `${' '.padStart(indent + inc)}${l}`;
+    }
+
+    return r;
+  }).join('\n');
+}
+
+function getFilteredTypes (lookup: PortableRegistry, exclude: string[] = []): [PortableType, TypeDef][] {
+  const named = lookup.types.filter(({ id, type: { path } }) => {
+    const typeDef = lookup.getTypeDef(id);
+
+    return (
+      // We actually only want those with lookupName set
+      !!typeDef.lookupName &&
+      !(
+        path.length === 2 &&
+        (
+          (
+            // Ensure that we match {node, kusama, *}_runtime
+            path[0].toString().split('_')[1] === 'runtime' &&
+            !['Call', 'Event'].includes(path[1].toString())
+          ) ||
+          path[0].toString().startsWith('pallet_')
+        ) &&
+        // Ensure we strip generics, e.g. Event<T>
+        MAP_ENUMS.includes(path[1].toString().split('<')[0])
+      ) &&
+      !(
+        path.length >= 3 &&
+        path[path.length - 2].toString() === 'pallet' &&
+        // As above, cater for generics
+        MAP_ENUMS.includes(path[path.length - 1].toString().split('<')[0])
+      )
+    );
+  });
+  const names = named.map(({ id }) => lookup.getName(id));
+
+  return named
+    .filter((_, index) =>
+      !names.some((n, iindex) =>
+        index > iindex &&
+        n === names[index]
+      )
+    )
+    .map((p): [PortableType, TypeDef] => [p, lookup.getTypeDef(p.id)])
+    .filter(([, typeDef]) => !exclude.includes(typeDef.lookupName || '<invalid>'));
+}
+
+function generateLookupDefs (registry: Registry, filtered: [PortableType, TypeDef][], destDir: string, subPath?: string): void {
+  writeFile(path.join(destDir, `${subPath || 'definitions'}.ts`), (): string => {
+    const all = filtered.map(([{ id, type: { params, path } }, typeDef]) => {
+      const typeLookup = registry.createLookupType(id);
+      const def = expandDefToString(typeDef, subPath ? 2 : 4);
+
+      return {
+        docs: [
+          generateTypeDocs(registry, id, path, params),
+          WITH_TYPEDEF
+            ? `@typeDef ${stringify(typeDef)}`
+            : null
+        ].filter((d): d is string => !!d),
+        type: { def, typeLookup, typeName: typeDef.lookupName }
+      };
+    });
+    const max = all.length - 1;
+
+    return (subPath ? generateLookupDefsNamedTmpl : generateLookupDefsTmpl)({
+      defs: all.map(({ docs, type }, i) => {
+        const { def, typeLookup, typeName } = type;
+
+        return {
+          defs: [
+            [typeName || typeLookup, `${def}${i !== max ? ',' : ''}`]
+          ].map(([n, t]) => `${n}: ${t}`),
+          docs
+        };
+      }),
+      headerType: 'defs'
+    });
+  });
+}
+
+function generateLookupTypes (registry: Registry, filtered: [PortableType, TypeDef][], destDir: string, subPath?: string): void {
+  const imports = {
+    ...createImports(
+      { '@polkadot/types/interfaces': defaultDefinitions },
+      { types: {} }
+    ),
+    interfaces: []
+  };
+  const items = filtered.map(([, typeDef]) => {
+    typeDef.name = typeDef.lookupName;
+
+    return typeDef.lookupNameRoot && typeDef.lookupName
+      ? exportType(typeDef.lookupIndex, typeDef.lookupName, typeDef.lookupNameRoot)
+      : typeEncoders[typeDef.info](registry, imports.definitions, typeDef, imports);
+  }).filter((t): t is string => !!t);
+
+  writeFile(path.join(destDir, `types${subPath ? `-${subPath}` : ''}.ts`), () => generateLookupTypesTmpl({
+    headerType: 'defs',
+    imports,
+    items: items.map((l) =>
+      l
+        .split('\n')
+        .map((l) => l.length ? `  ${l}` : '')
+        .join('\n')
+    ),
+    types: [
+      ...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({
+        file: packagePath,
+        types: Object.keys(imports.localTypes[packagePath])
+      }))
+    ]
+  }), true);
+  writeFile(path.join(destDir, 'index.ts'), () => generateLookupIndexTmpl({ headerType: 'defs' }), true);
+}
+
+function generateLookup (destDir: string, entries: [string | undefined, string][]): void {
+  entries.reduce<string[]>((exclude, [subPath, staticMeta]): string[] => {
+    const { lookup, registry } = initMeta(staticMeta).metadata.asLatest;
+    const filtered = getFilteredTypes(lookup, exclude);
+
+    generateLookupDefs(registry, filtered, destDir, subPath);
+    generateLookupTypes(registry, filtered, destDir, subPath);
+
+    return exclude.concat(
+      ...filtered
+        .map(([, typeDef]) => typeDef.lookupName)
+        .filter((n): n is string => !!n)
+    );
+  }, []);
+}
+
+// Generate `packages/types/src/lookup/*s`, the registry of all lookup types
+export function generateDefaultLookup (destDir = 'packages/types/src/augment/lookup', staticData?: string): void {
+  generateLookup(
+    destDir,
+    staticData
+      ? [[undefined, staticData]]
+      : [
+        ['substrate', staticSubstrate],
+        ['polkadot', staticPolkadot],
+        ['kusama', staticKusama]
+      ]
+  );
+}

packages/typegen/src/generate/query.ts

@@ -1,15 +1,16 @@
 // Copyright 2017-2021 @polkadot/typegen authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { StorageEntryMetadataLatest } from '@polkadot/types/interfaces/metadata';
+import type { PortableRegistry, StorageEntryMetadataLatest } from '@polkadot/types/interfaces/metadata';
 import type { Metadata } from '@polkadot/types/metadata/Metadata';
 import type { Registry } from '@polkadot/types/types';
 import type { ExtraTypes } from './types';
 
 import Handlebars from 'handlebars';
 
+import lookupDefinitions from '@polkadot/types/augment/lookup/definitions';
 import * as defaultDefs from '@polkadot/types/interfaces/definitions';
-import { unwrapStorageType } from '@polkadot/types/primitive/StorageKey';
+import { unwrapStorageSi } from '@polkadot/types/primitive/StorageKey';
 import { stringCamelCase } from '@polkadot/util';
 
 import { compareName, createImports, formatType, getSimilarTypes, initMeta, readTemplate, setImports, TypeImports, writeFile } from '../util';
@@ -17,69 +18,35 @@ import { ModuleTypes } from '../util/imports';
 
 // From a storage entry metadata, we return [args, returnType]
 /** @internal */
-function entrySignature (allDefs: Record<string, ModuleTypes>, registry: Registry, storageEntry: StorageEntryMetadataLatest, imports: TypeImports): [string, string, string] {
-  const outputType = unwrapStorageType(registry, storageEntry.type, storageEntry.modifier.isOptional);
+function entrySignature (lookup: PortableRegistry, allDefs: Record<string, ModuleTypes>, registry: Registry, storageEntry: StorageEntryMetadataLatest, imports: TypeImports): [boolean, string, string, string] {
+  const outputType = lookup.getTypeDef(unwrapStorageSi(storageEntry.type));
 
   if (storageEntry.type.isPlain) {
-    setImports(allDefs, imports, [storageEntry.type.asPlain.toString()]);
+    const typeDef = lookup.getTypeDef(storageEntry.type.asPlain);
 
-    return ['', '', formatType(registry, allDefs, outputType, imports)];
+    setImports(allDefs, imports, [typeDef.lookupName || typeDef.type]);
+
+    return [storageEntry.modifier.isOptional, '', '', formatType(registry, allDefs, outputType, imports)];
   } else if (storageEntry.type.isMap) {
-    const map = storageEntry.type.asMap;
-
-    // Find similar types of the `key` type
-    const similarTypes = getSimilarTypes(registry, allDefs, map.key.toString(), imports);
-
-    setImports(allDefs, imports, [
-      ...similarTypes,
-      map.value.toString()
-    ]);
-
-    return [
-      formatType(registry, allDefs, map.key.toString(), imports),
-      `arg: ${similarTypes.join(' | ')}`,
-      formatType(registry, allDefs, outputType, imports)
-    ];
-  } else if (storageEntry.type.isDoubleMap) {
-    const dm = storageEntry.type.asDoubleMap;
-
-    // Find similar types of `key1` and `key2` types
-    const similarTypes1 = getSimilarTypes(registry, allDefs, dm.key1.toString(), imports);
-    const similarTypes2 = getSimilarTypes(registry, allDefs, dm.key2.toString(), imports);
-
-    setImports(allDefs, imports, [
-      ...similarTypes1,
-      ...similarTypes2,
-      dm.value.toString()
-    ]);
-
-    const key1Types = similarTypes1.join(' | ');
-    const key2Types = similarTypes2.join(' | ');
-
-    return [
-      [
-        formatType(registry, allDefs, dm.key1.toString(), imports),
-        formatType(registry, allDefs, dm.key2.toString(), imports)
-      ].join(', '),
-      `arg1: ${key1Types}, arg2: ${key2Types}`,
-      formatType(registry, allDefs, outputType, imports)
-    ];
-  } else if (storageEntry.type.isNMap) {
-    const nmap = storageEntry.type.asNMap;
-
-    // Find similar types for all keys
-    const similarTypes = nmap.keyVec.map((k) => getSimilarTypes(registry, allDefs, k.toString(), imports));
+    const { hashers, key, value } = storageEntry.type.asMap;
+    const keyDefs = hashers.length === 1
+      ? [lookup.getTypeDef(key)]
+      : lookup.getSiType(key).def.asTuple.map((k) => lookup.getTypeDef(k));
+    const similarTypes = keyDefs.map((k) => getSimilarTypes(registry, allDefs, k.lookupName || k.type, imports));
+    const keyTypes = similarTypes.map((t) => t.join(' | '));
+    const defValue = lookup.getTypeDef(value);
 
     setImports(allDefs, imports, [
       ...similarTypes.reduce<string[]>((all, t) => all.concat(t), []),
-      nmap.value.toString()
+      defValue.lookupName
+        ? undefined
+        : defValue.type
     ]);
 
-    const keyTypes = similarTypes.map((t) => t.join(' | '));
-
     return [
-      nmap.keyVec.map((k) => formatType(registry, allDefs, k.toString(), imports)).join(', '),
-      keyTypes.map((t, i) => `arg${i + 1}: ${t}`).join(', '),
+      storageEntry.modifier.isOptional,
+      keyDefs.map((k) => formatType(registry, allDefs, k.lookupName || k.type, imports)).join(', '),
+      keyTypes.map((t, i) => `arg${keyTypes.length === 1 ? '' : (i + 1)}: ${t}`).join(', '),
       formatType(registry, allDefs, outputType, imports)
     ];
   }
@@ -93,19 +60,25 @@ const generateForMetaTemplate = Handlebars.compile(template);
 /** @internal */
 function generateForMeta (registry: Registry, meta: Metadata, dest: string, extraTypes: ExtraTypes, isStrict: boolean): void {
   writeFile(dest, (): string => {
-    const allTypes: ExtraTypes = { '@polkadot/types/interfaces': defaultDefs, ...extraTypes };
+    const allTypes: ExtraTypes = {
+      '@polkadot/types/augment': { lookup: lookupDefinitions },
+      '@polkadot/types/interfaces': defaultDefs,
+      ...extraTypes
+    };
     const imports = createImports(allTypes);
     const allDefs = Object.entries(allTypes).reduce((defs, [path, obj]) => {
       return Object.entries(obj).reduce((defs, [key, value]) => ({ ...defs, [`${path}/${key}`]: value }), defs);
     }, {});
-
-    const modules = meta.asLatest.modules
-      .sort(compareName)
-      .filter((mod) => !mod.storage.isNone)
+    const { lookup, pallets } = meta.asLatest;
+    const modules = pallets
+      .filter(({ storage }) => storage.isSome)
       .map(({ name, storage }) => {
         const items = storage.unwrap().items
           .map((storageEntry) => {
-            const [args, params, returnType] = entrySignature(allDefs, registry, storageEntry, imports);
+            const [isOptional, args, params, _returnType] = entrySignature(lookup, allDefs, registry, storageEntry, imports);
+            const returnType = isOptional
+              ? `Option<${_returnType}>`
+              : _returnType;
 
             return {
               args,
@@ -134,7 +107,7 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
       modules,
       types: [
         ...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({
-          file: packagePath,
+          file: packagePath.replace('@polkadot/types/augment', '@polkadot/types'),
           types: Object.keys(imports.localTypes[packagePath])
         })),
         {

packages/typegen/src/generate/rpc.ts

@@ -132,7 +132,7 @@ export function generateRpcTypes (registry: TypeRegistry, importDefinitions: Rec
       modules,
       types: [
         ...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({
-          file: packagePath,
+          file: packagePath.replace('@polkadot/types/augment', '@polkadot/types'),
           types: Object.keys(imports.localTypes[packagePath])
         }))
       ]

packages/typegen/src/generate/tsDef.ts

@@ -35,7 +35,7 @@ function errorUnhandled (_: Registry, definitions: Record<string, ModuleTypes>,
 
 /** @internal */
 function tsExport (registry: Registry, definitions: Record<string, ModuleTypes>, def: TypeDef, imports: TypeImports): string {
-  return exportInterface(def.name, formatType(registry, definitions, def, imports));
+  return exportInterface(def.lookupIndex, def.name, formatType(registry, definitions, def, imports, false));
 }
 
 const tsBTreeMap = tsExport;
@@ -48,16 +48,16 @@ const tsPlain = tsExport;
 const tsTuple = tsExport;
 
 /** @internal */
-function tsEnum (registry: Registry, definitions: Record<string, ModuleTypes>, { name: enumName, sub }: TypeDef, imports: TypeImports): string {
+function tsEnum (registry: Registry, definitions: Record<string, ModuleTypes>, { lookupIndex, name: enumName, sub }: TypeDef, imports: TypeImports): string {
   setImports(definitions, imports, ['Enum']);
 
   const keys = (sub as TypeDef[]).map((def, index): string => {
-    const { info, name = `unknown${index}`, type } = def;
+    const { info, lookupName, name = `unknown${index}`, type } = def;
     const getter = stringUpperFirst(stringCamelCase(name.replace(' ', '_')));
     const isComplex = [TypeDefInfo.Result, TypeDefInfo.Struct, TypeDefInfo.Tuple, TypeDefInfo.Vec, TypeDefInfo.VecFixed].includes(info);
     const asGetter = type === 'Null' || info === TypeDefInfo.DoNotConstruct
       ? ''
-      : createGetter(definitions, `as${getter}`, isComplex ? formatType(registry, definitions, info === TypeDefInfo.Struct ? def : type, imports) : type, imports);
+      : createGetter(definitions, `as${getter}`, lookupName || (isComplex ? formatType(registry, definitions, info === TypeDefInfo.Struct ? def : type, imports, false) : type), imports);
     const isGetter = info === TypeDefInfo.DoNotConstruct
       ? ''
       : createGetter(definitions, `is${getter}`, 'boolean', imports);
@@ -66,6 +66,7 @@ function tsEnum (registry: Registry, definitions: Record<string, ModuleTypes>, {
       case TypeDefInfo.Compact:
       case TypeDefInfo.Plain:
       case TypeDefInfo.Result:
+      case TypeDefInfo.Si:
       case TypeDefInfo.Struct:
       case TypeDefInfo.Tuple:
       case TypeDefInfo.Vec:
@@ -74,39 +75,54 @@ function tsEnum (registry: Registry, definitions: Record<string, ModuleTypes>, {
         return `${isGetter}${asGetter}`;
 
       case TypeDefInfo.DoNotConstruct:
-        return '';
+      case TypeDefInfo.Null:
+        return `${isGetter}`;
 
       default:
-        throw new Error(`Enum: ${enumName || 'undefined'}: Unhandled nested "${TypeDefInfo[info]}" type`);
+        throw new Error(`Enum: ${enumName || 'undefined'}: Unhandled type ${TypeDefInfo[info]}, ${stringify(def)}`);
     }
   });
 
-  return exportInterface(enumName, 'Enum', keys.join(''));
+  return exportInterface(lookupIndex, enumName, 'Enum', keys.join(''));
 }
 
 function tsInt (_: Registry, definitions: Record<string, ModuleTypes>, def: TypeDef, imports: TypeImports, type: 'Int' | 'UInt' = 'Int'): string {
   setImports(definitions, imports, [type]);
 
-  return exportInterface(def.name, type);
+  return exportInterface(def.lookupIndex, def.name, type);
+}
+
+/** @internal */
+function tsNull (registry: Registry, definitions: Record<string, ModuleTypes>, { lookupIndex = -1, name }: TypeDef, imports: TypeImports): string {
+  setImports(definitions, imports, ['Null']);
+
+  // * @description extends [[${base}]]
+  const doc = `/** @name ${name || ''}${lookupIndex !== -1 ? ` (${lookupIndex})` : ''} */\n`;
+
+  return `${doc}export type ${name || ''} = Null;`;
 }
 
 /** @internal */
 function tsResultGetter (registry: Registry, definitions: Record<string, ModuleTypes>, resultName = '', getter: 'Ok' | 'Err' | 'Error', def: TypeDef, imports: TypeImports): string {
-  const { info, type } = def;
+  const { info, lookupName, type } = def;
   const asGetter = type === 'Null'
     ? ''
-    : (getter === 'Error' ? '  /** @deprecated Use asErr */\n' : '') + createGetter(definitions, `as${getter}`, info === TypeDefInfo.Tuple ? formatType(registry, definitions, def, imports) : type, imports);
+    : (getter === 'Error' ? '  /** @deprecated Use asErr */\n' : '') + createGetter(definitions, `as${getter}`, lookupName || (info === TypeDefInfo.Tuple ? formatType(registry, definitions, def, imports, false) : type), imports);
   const isGetter = (getter === 'Error' ? '  /** @deprecated Use isErr */\n' : '') + createGetter(definitions, `is${getter}`, 'boolean', imports);
 
   switch (info) {
     case TypeDefInfo.Plain:
+    case TypeDefInfo.Si:
     case TypeDefInfo.Tuple:
     case TypeDefInfo.Vec:
     case TypeDefInfo.Option:
       return `${isGetter}${asGetter}`;
 
+    case TypeDefInfo.Null:
+      return `${isGetter}`;
+
     default:
-      throw new Error(`Result: ${resultName}: Unhandled type ${TypeDefInfo[info]}`);
+      throw new Error(`Result: ${resultName}: Unhandled type ${TypeDefInfo[info]}, ${stringify(def)}`);
   }
 }
 
@@ -122,17 +138,22 @@ function tsResult (registry: Registry, definitions: Record<string, ModuleTypes>,
 
   setImports(definitions, imports, [def.type]);
 
-  return exportInterface(def.name, formatType(registry, definitions, def, imports), inner);
+  const fmtType = def.lookupName && def.name !== def.lookupName
+    ? def.lookupName
+    : formatType(registry, definitions, def, imports, false);
+
+  return exportInterface(def.lookupIndex, def.name, fmtType, inner);
 }
 
 /** @internal */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-function tsSi (registry: Registry, definitions: Record<string, ModuleTypes>, { type }: TypeDef, imports: TypeImports): string {
-  throw new Error('Unable to generate string definition from TypeDefInfo.Si');
+function tsSi (registry: Registry, definitions: Record<string, ModuleTypes>, typeDef: TypeDef, imports: TypeImports): string {
+  // FIXME
+  return `// SI: ${JSON.stringify(typeDef)}`;
 }
 
 /** @internal */
-function tsSet (_: Registry, definitions: Record<string, ModuleTypes>, { name: setName, sub }: TypeDef, imports: TypeImports): string {
+function tsSet (_: Registry, definitions: Record<string, ModuleTypes>, { lookupIndex, name: setName, sub }: TypeDef, imports: TypeImports): string {
   setImports(definitions, imports, ['Set']);
 
   const types = (sub as TypeDef[]).map(({ name }): string => {
@@ -141,20 +162,22 @@ function tsSet (_: Registry, definitions: Record<string, ModuleTypes>, { name: s
     return createGetter(definitions, `is${name}`, 'boolean', imports);
   });
 
-  return exportInterface(setName, 'Set', types.join(''));
+  return exportInterface(lookupIndex, setName, 'Set', types.join(''));
 }
 
 /** @internal */
-function tsStruct (registry: Registry, definitions: Record<string, ModuleTypes>, { name: structName, sub }: TypeDef, imports: TypeImports): string {
+function tsStruct (registry: Registry, definitions: Record<string, ModuleTypes>, { lookupIndex, name: structName, sub }: TypeDef, imports: TypeImports): string {
   setImports(definitions, imports, ['Struct']);
 
-  const keys = (sub as TypeDef[]).map((typedef): string => {
-    const returnType = formatType(registry, definitions, typedef, imports);
+  const keys = (sub as TypeDef[]).map((def): string => {
+    const fmtType = def.lookupName && def.name !== def.lookupName
+      ? def.lookupName
+      : formatType(registry, definitions, def, imports, false);
 
-    return createGetter(definitions, typedef.name, returnType, imports);
+    return createGetter(definitions, def.name, fmtType, imports);
   });
 
-  return exportInterface(structName, 'Struct', keys.join(''));
+  return exportInterface(lookupIndex, structName, 'Struct', keys.join(''));
 }
 
 /** @internal */
@@ -166,19 +189,29 @@ function tsUInt (registry: Registry, definitions: Record<string, ModuleTypes>, d
 function tsVec (registry: Registry, definitions: Record<string, ModuleTypes>, def: TypeDef, imports: TypeImports): string {
   const type = (def.sub as TypeDef).type;
 
-  if (def.info === TypeDefInfo.VecFixed && type === 'u8') {
-    setImports(definitions, imports, ['U8aFixed']);
+  if (type === 'u8') {
+    if (def.info === TypeDefInfo.VecFixed) {
+      setImports(definitions, imports, ['U8aFixed']);
 
-    return exportType(def.name, 'U8aFixed');
+      return exportType(def.lookupIndex, def.name, 'U8aFixed');
+    } else {
+      setImports(definitions, imports, ['Bytes']);
+
+      return exportType(def.lookupIndex, def.name, 'Bytes');
+    }
   }
 
-  return exportInterface(def.name, formatType(registry, definitions, def, imports));
+  const fmtType = def.lookupName && def.name !== def.lookupName
+    ? def.lookupName
+    : formatType(registry, definitions, def, imports, false);
+
+  return exportInterface(def.lookupIndex, def.name, fmtType);
 }
 
 // handlers are defined externally to use - this means that when we do a
 // `generators[typedef.info](...)` TS will show any unhandled types. Rather
 // we are being explicit in having no handlers where we do not support (yet)
-const encoders: Record<TypeDefInfo, (registry: Registry, definitions: Record<string, ModuleTypes>, def: TypeDef, imports: TypeImports) => string> = {
+export const typeEncoders: Record<TypeDefInfo, (registry: Registry, definitions: Record<string, ModuleTypes>, def: TypeDef, imports: TypeImports) => string> = {
   [TypeDefInfo.BTreeMap]: tsBTreeMap,
   [TypeDefInfo.BTreeSet]: tsBTreeSet,
   [TypeDefInfo.Compact]: tsCompact,
@@ -187,7 +220,7 @@ const encoders: Record<TypeDefInfo, (registry: Registry, definitions: Record<str
   [TypeDefInfo.HashMap]: tsHashMap,
   [TypeDefInfo.Int]: tsInt,
   [TypeDefInfo.Linkage]: errorUnhandled,
-  [TypeDefInfo.Null]: errorUnhandled,
+  [TypeDefInfo.Null]: tsNull,
   [TypeDefInfo.Option]: tsOption,
   [TypeDefInfo.Plain]: tsPlain,
   [TypeDefInfo.Range]: errorUnhandled,
@@ -206,7 +239,7 @@ function generateInterfaces (registry: Registry, definitions: Record<string, Mod
   return Object.entries(types).map(([name, type]): [string, string] => {
     const def = getTypeDef(isString(type) ? type : stringify(type), { name });
 
-    return [name, encoders[def.info](registry, definitions, def, imports)];
+    return [name, typeEncoders[def.info](registry, definitions, def, imports)];
   });
 }
 
@@ -220,25 +253,23 @@ const templateTypes = readTemplate('tsDef/types');
 const generateTsDefTypesTemplate = Handlebars.compile(templateTypes);
 
 /** @internal */
-function generateTsDefFor (registry: Registry, importDefinitions: { [importPath: string]: Record<string, ModuleTypes> }, defName: string, { types }: { types: Record<string, any> }, outputDir: string): void {
+export function generateTsDefFor (registry: Registry, importDefinitions: { [importPath: string]: Record<string, ModuleTypes> }, defName: string, { types }: { types: Record<string, any> }, outputDir: string): void {
   const imports = { ...createImports(importDefinitions, { types }), interfaces: [] } as Imports;
   const definitions = imports.definitions;
   const interfaces = generateInterfaces(registry, definitions, { types }, imports);
-  const items = interfaces.sort((a, b): number => a[0].localeCompare(b[0])).map(([, definition]): string => definition);
-
-  const importTypes = [
-    ...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({
-      file: packagePath,
-      types: Object.keys(imports.localTypes[packagePath])
-    }))
-  ];
+  const items = interfaces.sort((a, b) => a[0].localeCompare(b[0])).map(([, definition]) => definition);
 
   writeFile(path.join(outputDir, defName, 'types.ts'), () => generateTsDefModuleTypesTemplate({
     headerType: 'defs',
     imports,
     items,
     name: defName,
-    types: importTypes
+    types: [
+      ...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({
+        file: packagePath.replace('@polkadot/types/augment', '@polkadot/types'),
+        types: Object.keys(imports.localTypes[packagePath])
+      }))
+    ]
   }), true);
   writeFile(path.join(outputDir, defName, 'index.ts'), () => generateTsDefIndexTemplate({ headerType: 'defs' }), true);
 }

packages/typegen/src/generate/tx.ts

@@ -7,6 +7,7 @@ import type { ExtraTypes } from './types';
 
 import Handlebars from 'handlebars';
 
+import lookupDefinitions from '@polkadot/types/augment/lookup/definitions';
 import * as defaultDefs from '@polkadot/types/interfaces/definitions';
 import { Text } from '@polkadot/types/primitive';
 import { stringCamelCase } from '@polkadot/util';
@@ -30,32 +31,54 @@ const generateForMetaTemplate = Handlebars.compile(template);
 /** @internal */
 function generateForMeta (registry: Registry, meta: Metadata, dest: string, extraTypes: ExtraTypes, isStrict: boolean): void {
   writeFile(dest, (): string => {
-    const allTypes: ExtraTypes = { '@polkadot/types/interfaces': defaultDefs, ...extraTypes };
+    const allTypes: ExtraTypes = {
+      '@polkadot/types/augment': { lookup: lookupDefinitions },
+      '@polkadot/types/interfaces': defaultDefs,
+      ...extraTypes
+    };
     const imports = createImports(allTypes);
     const allDefs = Object.entries(allTypes).reduce((defs, [path, obj]) => {
       return Object.entries(obj).reduce((defs, [key, value]) => ({ ...defs, [`${path}/${key}`]: value }), defs);
     }, {});
-
-    const modules = meta.asLatest.modules
-      .filter(({ calls }) => calls.unwrapOr([]).length !== 0)
+    const { lookup, pallets } = meta.asLatest;
+    const modules = pallets
+      .sort(compareName)
+      .filter(({ calls }) => calls.isSome)
       .map(({ calls, name }) => {
         setImports(allDefs, imports, ['Call', 'Extrinsic', 'SubmittableExtrinsic']);
 
-        const items = calls.unwrap()
-          .map(({ args, docs, name }) => {
-            const params = args
-              .map(({ name, type }) => {
-                const typeStr = type.toString();
+        const sectionName = stringCamelCase(name);
+        const items = lookup.getSiType(calls.unwrap().type).def.asVariant.variants
+          .map(({ docs, fields, name }) => {
+            const typesInfo = fields.map(({ name, type, typeName }, index): [string, string, string] => {
+              const typeDef = registry.lookup.getTypeDef(type);
+
+              return [
+                name.isSome
+                  ? mapName(name.unwrap())
+                  : `param${index}`,
+                typeName.isSome
+                  ? typeName.toString()
+                  : typeDef.type,
+                typeDef.isFromSi
+                  ? typeDef.type
+                  : typeDef.lookupName || typeDef.type
+              ];
+            });
+            const params = typesInfo
+              .map(([name,, typeStr]) => {
                 const similarTypes = getSimilarTypes(registry, allDefs, typeStr, imports);
 
                 setImports(allDefs, imports, [typeStr, ...similarTypes]);
 
-                return `${mapName(name)}: ${similarTypes.join(' | ')}`;
+                return `${name}: ${similarTypes.join(' | ')}`;
               })
               .join(', ');
 
             return {
-              args: args.map(({ type }) => formatType(registry, allDefs, type.toString(), imports)).join(', '),
+              args: typesInfo.map(([,, typeStr]) =>
+                formatType(registry, allDefs, typeStr, imports)
+              ).join(', '),
               docs,
               name: stringCamelCase(name),
               params
@@ -65,7 +88,7 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
 
         return {
           items,
-          name: stringCamelCase(name)
+          name: sectionName
         };
       })
       .sort(compareName);
@@ -77,7 +100,7 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
       modules,
       types: [
         ...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({
-          file: packagePath,
+          file: packagePath.replace('@polkadot/types/augment', '@polkadot/types'),
           types: Object.keys(imports.localTypes[packagePath])
         })),
         {

packages/typegen/src/interfacesTs.ts

@@ -1,9 +1,10 @@
 // Copyright 2017-2021 @polkadot/typegen authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { generateDefaultConsts, generateDefaultErrors, generateDefaultEvents, generateDefaultInterface, generateDefaultQuery, generateDefaultRpc, generateDefaultTsDef, generateDefaultTx } from './generate';
+import { generateDefaultConsts, generateDefaultErrors, generateDefaultEvents, generateDefaultInterface, generateDefaultLookup, generateDefaultQuery, generateDefaultRpc, generateDefaultTsDef, generateDefaultTx } from './generate';
 
 export function main (): void {
+  generateDefaultLookup();
   generateDefaultInterface();
 
   generateDefaultConsts();

packages/typegen/src/metadataMd.ts

@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/typegen authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { MetadataLatest } from '@polkadot/types/interfaces/metadata';
+import type { MetadataLatest, PortableRegistry, SiLookupTypeId } from '@polkadot/types/interfaces';
 import type { Codec, DefinitionRpcParam } from '@polkadot/types/types';
 
 import fs from 'fs';
 
-import { GenericCall as Call, Metadata, TypeRegistry, Vec } from '@polkadot/types';
+import { Metadata, TypeRegistry, Vec } from '@polkadot/types';
 import * as definitions from '@polkadot/types/interfaces/definitions';
 import { getStorage as getSubstrateStorage } from '@polkadot/types/metadata/decorate/storage/getStorage';
 import { Text } from '@polkadot/types/primitive';
@@ -45,9 +45,15 @@ const DESC_STORAGE = `The following sections contain Storage methods are part of
 /** @internal */
 function docsVecToMarkdown (docLines: Vec<Text>, indent = 0): string {
   const md = docLines
-    .map((docLine) => docLine && docLine.substring(1)) // trim the leading space
-    .reduce((md, docLine): string => // generate paragraphs
-      !docLine.trim().length
+    .map((docLine) =>
+      docLine
+        .toString()
+        .trimStart()
+        .replace(/^r"/g, '')
+        .trimStart()
+    )
+    .reduce((md, docLine) => // generate paragraphs
+      !docLine.length
         ? `${md}\n\n` // empty line
         : /^[*-]/.test(docLine.trimStart()) && !md.endsWith('\n\n')
           ? `${md}\n\n${docLine}` // line calling for a preceding linebreak
@@ -112,6 +118,12 @@ function sortByName<T extends { name: Codec | string }> (a: T, b: T): number {
   return a.name.toString().toUpperCase().localeCompare(b.name.toString().toUpperCase());
 }
 
+function getSiName (lookup: PortableRegistry, type: SiLookupTypeId): string {
+  const typeDef = lookup.getTypeDef(type);
+
+  return typeDef.lookupName || typeDef.type;
+}
+
 /** @internal */
 function addRpc (): string {
   const sections = Object
@@ -162,25 +174,25 @@ function addRpc (): string {
 }
 
 /** @internal */
-function addConstants (metadata: MetadataLatest): string {
+function addConstants ({ lookup, pallets }: MetadataLatest): string {
   return renderPage({
     description: DESC_CONSTANTS,
-    sections: metadata.modules
+    sections: pallets
       .sort(sortByName)
-      .filter((moduleMetadata) => !moduleMetadata.constants.isEmpty)
-      .map((moduleMetadata) => {
-        const sectionName = stringLowerFirst(moduleMetadata.name);
+      .filter(({ constants }) => !constants.isEmpty)
+      .map(({ constants, name }) => {
+        const sectionName = stringLowerFirst(name);
 
         return {
-          items: moduleMetadata.constants
+          items: constants
             .sort(sortByName)
-            .map((func) => {
-              const methodName = stringCamelCase(func.name);
+            .map(({ docs, name, type }) => {
+              const methodName = stringCamelCase(name);
 
               return {
                 interface: '`' + `api.consts.${sectionName}.${methodName}` + '`',
-                name: `${methodName}: ` + '`' + func.type.toString() + '`',
-                ...(func.docs.length && { summary: func.docs })
+                name: `${methodName}: ` + '`' + getSiName(lookup, type) + '`',
+                ...(docs.length && { summary: docs })
               };
             }),
           name: sectionName
@@ -191,9 +203,9 @@ function addConstants (metadata: MetadataLatest): string {
 }
 
 /** @internal */
-function addStorage (metadata: MetadataLatest): string {
-  const { substrate } = getSubstrateStorage(metadata.registry);
-  const moduleSections = metadata.modules
+function addStorage ({ lookup, pallets, registry }: MetadataLatest): string {
+  const { substrate } = getSubstrateStorage(registry);
+  const moduleSections = pallets
     .sort(sortByName)
     .filter((moduleMetadata) => !moduleMetadata.storage.isNone)
     .map((moduleMetadata): Section => {
@@ -203,15 +215,20 @@ function addStorage (metadata: MetadataLatest): string {
         items: moduleMetadata.storage.unwrap().items
           .sort(sortByName)
           .map((func) => {
-            const arg = func.type.isMap
-              ? ('`' + func.type.asMap.key.toString() + '`')
-              : func.type.isDoubleMap
-                ? ('`' + func.type.asDoubleMap.key1.toString() + ', ' + func.type.asDoubleMap.key2.toString() + '`')
-                : func.type.isNMap
-                  ? ('`' + func.type.asNMap.keyVec.map((k) => k.toString()).join(', ') + '`')
-                  : '';
+            let arg = '';
+
+            if (func.type.isMap) {
+              const { hashers, key } = func.type.asMap;
+
+              arg = '`' + (
+                hashers.length === 1
+                  ? getSiName(lookup, key)
+                  : lookup.getSiType(key).def.asTuple.map((t) => getSiName(lookup, t)).join(', ')
+              ) + '`';
+            }
+
             const methodName = stringLowerFirst(func.name);
-            const outputType = unwrapStorageType(metadata.registry, func.type, func.modifier.isOptional);
+            const outputType = unwrapStorageType(registry, func.type, func.modifier.isOptional);
 
             return {
               interface: '`' + `api.query.${sectionName}.${methodName}` + '`',
@@ -229,12 +246,10 @@ function addStorage (metadata: MetadataLatest): string {
       description: 'These are well-known keys that are always available to the runtime implementation of any Substrate-based network.',
       items: Object.entries(substrate).map(([name, { meta }]) => {
         const arg = meta.type.isMap
-          ? ('`' + meta.type.asMap.key.toString() + '`')
-          : meta.type.isDoubleMap
-            ? ('`' + meta.type.asDoubleMap.key1.toString() + ', ' + meta.type.asDoubleMap.key2.toString() + '`')
-            : '';
+          ? ('`' + getSiName(lookup, meta.type.asMap.key) + '`')
+          : '';
         const methodName = stringLowerFirst(name);
-        const outputType = unwrapStorageType(metadata.registry, meta.type, meta.modifier.isOptional);
+        const outputType = unwrapStorageType(registry, meta.type, meta.modifier.isOptional);
 
         return {
           interface: '`' + `api.query.substrate.${methodName}` + '`',
@@ -249,26 +264,28 @@ function addStorage (metadata: MetadataLatest): string {
 }
 
 /** @internal */
-function addExtrinsics (metadata: MetadataLatest): string {
+function addExtrinsics ({ lookup, pallets }: MetadataLatest): string {
   return renderPage({
     description: DESC_EXTRINSICS,
-    sections: metadata.modules
+    sections: pallets
       .sort(sortByName)
-      .filter((meta) => !meta.calls.isNone && meta.calls.unwrap().length !== 0)
-      .map((meta) => {
-        const sectionName = stringCamelCase(meta.name);
+      .filter(({ calls }) => calls.isSome)
+      .map(({ calls, name }) => {
+        const sectionName = stringCamelCase(name);
 
         return {
-          items: meta.calls.unwrap()
+          items: lookup.getSiType(calls.unwrap().type).def.asVariant.variants
             .sort(sortByName)
-            .map((func) => {
-              const methodName = stringCamelCase(func.name);
-              const args = Call.filterOrigin(func).map(({ name, type }) => `${name.toString()}: ` + '`' + type.toString() + '`').join(', ');
+            .map(({ docs, fields, name }, index) => {
+              const methodName = stringCamelCase(name);
+              const args = fields.map(({ name, type }) =>
+                `${name.isSome ? name.toString() : `param${index}`}: ` + '`' + getSiName(lookup, type) + '`'
+              ).join(', ');
 
               return {
                 interface: '`' + `api.tx.${sectionName}.${methodName}` + '`',
                 name: `${methodName}(${args})`,
-                ...(func.docs.length && { summary: func.docs })
+                ...(docs.length && { summary: docs })
               };
             }),
           name: sectionName
@@ -279,23 +296,25 @@ function addExtrinsics (metadata: MetadataLatest): string {
 }
 
 /** @internal */
-function addEvents (metadata: MetadataLatest): string {
+function addEvents ({ lookup, pallets }: MetadataLatest): string {
   return renderPage({
     description: DESC_EVENTS,
-    sections: metadata.modules
+    sections: pallets
       .sort(sortByName)
-      .filter((meta) => !meta.events.isNone && meta.events.unwrap().length !== 0)
+      .filter(({ events }) => events.isSome)
       .map((meta) => ({
-        items: meta.events.unwrap()
+        items: lookup.getSiType(meta.events.unwrap().type).def.asVariant.variants
           .sort(sortByName)
-          .map((func) => {
-            const methodName = func.name.toString();
-            const args = func.args.map((type): string => '`' + type.toString() + '`').join(', ');
+          .map(({ docs, fields, name }) => {
+            const methodName = name.toString();
+            const args = fields.map(({ type }) =>
+              '`' + getSiName(lookup, type) + '`'
+            ).join(', ');
 
             return {
               interface: '`' + `api.events.${stringCamelCase(meta.name)}.${methodName}.is` + '`',
               name: `${methodName}(${args})`,
-              ...(func.docs.length && { summary: func.docs })
+              ...(docs.length && { summary: docs })
             };
           }),
         name: stringCamelCase(meta.name)
@@ -305,14 +324,14 @@ function addEvents (metadata: MetadataLatest): string {
 }
 
 /** @internal */
-function addErrors (metadata: MetadataLatest): string {
+function addErrors ({ lookup, pallets }: MetadataLatest): string {
   return renderPage({
     description: DESC_ERRORS,
-    sections: metadata.modules
+    sections: pallets
       .sort(sortByName)
-      .filter((moduleMetadata) => !moduleMetadata.errors.isEmpty)
+      .filter(({ errors }) => errors.isSome)
       .map((moduleMetadata) => ({
-        items: moduleMetadata.errors
+        items: lookup.getSiType(moduleMetadata.errors.unwrap().type).def.asVariant.variants
           .sort(sortByName)
           .map((error) => ({
             interface: '`' + `api.errors.${stringCamelCase(moduleMetadata.name)}.${error.name.toString()}.is` + '`',

packages/typegen/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/typegen', version: '5.8.2' };
+export const packageInfo = { name: '@polkadot/typegen', version: '6.0.3' };

packages/typegen/src/templates/lookup/defs-named.hbs

@@ -0,0 +1,15 @@
+{{> header }}
+
+/* eslint-disable sort-keys */
+
+import type { DefinitionsTypes } from '../../types';
+
+export default {
+  {{#each defs}}
+  {{> docs}}
+  {{#each defs}}
+  {{{this}}}
+  {{/each}}
+  {{/each}}
+} as DefinitionsTypes;
+{{> footer }}

packages/typegen/src/templates/lookup/defs.hbs

@@ -0,0 +1,18 @@
+{{> header }}
+
+/* eslint-disable sort-keys */
+
+import type { Definitions } from '../../types';
+
+export default {
+  rpc: {},
+  types: {
+    {{#each defs}}
+    {{> docs}}
+    {{#each defs}}
+    {{{this}}}
+    {{/each}}
+    {{/each}}
+  }
+} as Definitions;
+{{> footer }}

packages/typegen/src/templates/lookup/index.hbs

@@ -0,0 +1,4 @@
+{{> header }}
+
+export * from './types';
+{{> footer }}

packages/typegen/src/templates/lookup/types.hbs

@@ -0,0 +1,12 @@
+{{> header }}
+
+{{{ imports }}}
+
+declare module '@polkadot/types/lookup' {
+
+{{#each items}}
+{{{this}}}
+
+{{/each}}
+}
+{{> footer }}

packages/typegen/src/util/formatting.ts

@@ -55,7 +55,7 @@ Handlebars.registerHelper({
       ...types
     ];
 
-    return defs.reduce((result, { file, types }): string => {
+    return [...defs].sort((a, b) => a.file.localeCompare(b.file)).reduce((result, { file, types }): string => {
       return types.length
         ? `${result}import type { ${types.sort().join(', ')} } from '${file}';\n`
         : result;
@@ -71,9 +71,9 @@ Handlebars.registerHelper({
 
 // helper to generate a `export interface <Name> extends <Base> {<Body>}
 /** @internal */
-export function exportInterface (name = '', base: string, body = ''): string {
+export function exportInterface (lookupIndex = -1, name = '', base: string, body = ''): string {
   // * @description extends [[${base}]]
-  const doc = `/** @name ${name} */\n`;
+  const doc = `/** @name ${name}${lookupIndex !== -1 ? ` (${lookupIndex})` : ''} */\n`;
 
   return `${doc}export interface ${name} extends ${base} {${body.length ? '\n' : ''}${body}}`;
 }
@@ -82,19 +82,19 @@ export function exportInterface (name = '', base: string, body = ''): string {
 // but since we don't want type alias (TS doesn't preserve names) we use
 // interface here.
 /** @internal */
-export function exportType (name = '', base: string): string {
-  return exportInterface(name, base);
+export function exportType (lookupIndex = -1, name = '', base: string): string {
+  return exportInterface(lookupIndex, name, base);
 }
 
 const formatters: Record<TypeDefInfo, (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => string> = {
   [TypeDefInfo.Compact]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
-    setImports(definitions, imports, ['Compact']);
-
     const sub = typeDef.sub as TypeDef;
 
-    return paramsNotation('Compact', formatType(registry, definitions, sub.lookupName || sub.type, imports, withShortcut));
+    setImports(definitions, imports, ['Compact', sub.lookupName]);
+
+    return paramsNotation('Compact', sub.lookupName || formatType(registry, definitions, sub.type, imports, withShortcut));
   },
-  [TypeDefInfo.DoNotConstruct]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
+  [TypeDefInfo.DoNotConstruct]: (registry: Registry, { lookupName }: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
     setImports(definitions, imports, ['DoNotConstruct']);
 
     return 'DoNotConstruct';
@@ -118,11 +118,11 @@ const formatters: Record<TypeDefInfo, (registry: Registry, typeDef: TypeDef, def
     return 'Null';
   },
   [TypeDefInfo.Option]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
-    setImports(definitions, imports, ['Option']);
-
     const sub = (typeDef.sub as TypeDef);
 
-    return paramsNotation('Option', formatType(registry, definitions, sub.lookupName || sub.type, imports, withShortcut));
+    setImports(definitions, imports, ['Option', sub.lookupName]);
+
+    return paramsNotation('Option', sub.lookupName || formatType(registry, definitions, sub.type, imports, withShortcut));
   },
   [TypeDefInfo.Plain]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
     setImports(definitions, imports, [typeDef.type]);
@@ -139,31 +139,39 @@ const formatters: Record<TypeDefInfo, (registry: Registry, typeDef: TypeDef, def
     return formatType(registry, definitions, registry.lookup.getTypeDef(typeDef.type), imports, withShortcut);
   },
   [TypeDefInfo.Struct]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
-    setImports(definitions, imports, ['Struct']);
+    if (typeDef.lookupName) {
+      return typeDef.lookupName;
+    }
+
+    const sub = typeDef.sub as TypeDef[];
+
+    setImports(definitions, imports, ['Struct', ...sub.map(({ lookupName }) => lookupName)]);
 
     return `{${withShortcut ? ' ' : '\n'}${
-      ((typeDef.sub as TypeDef[]).map(({ lookupName, name, type }, index) => [
+      sub.map(({ lookupName, name, type }, index) => [
         name || `unknown${index}`,
-        formatType(registry, definitions, lookupName || type, imports, withShortcut)
-      ])).map(([k, t]) => `${withShortcut ? '' : '    readonly '}${k}: ${t};`).join(withShortcut ? ' ' : '\n')
+        lookupName || formatType(registry, definitions, type, imports, withShortcut)
+      ]).map(([k, t]) => `${withShortcut ? '' : '    readonly '}${k}: ${t};`).join(withShortcut ? ' ' : '\n')
     }${withShortcut ? ' ' : '\n  '}} & Struct`;
   },
   [TypeDefInfo.Tuple]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
-    setImports(definitions, imports, ['ITuple']);
+    const sub = typeDef.sub as TypeDef[];
+
+    setImports(definitions, imports, ['ITuple', ...sub.map(({ lookupName }) => lookupName)]);
 
     // `(a,b)` gets transformed into `ITuple<[a, b]>`
     return paramsNotation('ITuple', `[${
-      ((typeDef.sub as TypeDef[]).map(({ lookupName, type }) =>
-        formatType(registry, definitions, lookupName || type, imports, withShortcut)
-      )).join(', ')
+      sub.map(({ lookupName, type }) =>
+        lookupName || formatType(registry, definitions, type, imports, withShortcut)
+      ).join(', ')
     }]`);
   },
   [TypeDefInfo.Vec]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
-    setImports(definitions, imports, ['Vec']);
-
     const sub = (typeDef.sub as TypeDef);
 
-    return paramsNotation('Vec', formatType(registry, definitions, sub.lookupName || sub.type, imports, withShortcut));
+    setImports(definitions, imports, ['Vec', sub.lookupName]);
+
+    return paramsNotation('Vec', sub.lookupName || formatType(registry, definitions, sub.type, imports, withShortcut));
   },
   [TypeDefInfo.VecFixed]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
     const sub = (typeDef.sub as TypeDef);
@@ -174,44 +182,44 @@ const formatters: Record<TypeDefInfo, (registry: Registry, typeDef: TypeDef, def
       return 'U8aFixed';
     }
 
-    setImports(definitions, imports, ['Vec']);
+    setImports(definitions, imports, ['Vec', sub.lookupName]);
 
-    return paramsNotation('Vec', formatType(registry, definitions, sub.lookupName || sub.type, imports, withShortcut));
+    return paramsNotation('Vec', sub.lookupName || formatType(registry, definitions, sub.type, imports, withShortcut));
   },
   [TypeDefInfo.BTreeMap]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
-    setImports(definitions, imports, ['BTreeMap']);
-
     const [keyDef, valDef] = (typeDef.sub as TypeDef[]);
 
-    return `BTreeMap<${formatType(registry, definitions, keyDef.lookupName || keyDef.type, imports, withShortcut)}, ${formatType(registry, definitions, valDef.lookupName || valDef.type, imports, withShortcut)}>`;
+    setImports(definitions, imports, ['BTreeMap', keyDef.lookupName, valDef.lookupName]);
+
+    return `BTreeMap<${keyDef.lookupName || formatType(registry, definitions, keyDef.type, imports, withShortcut)}, ${valDef.lookupName || formatType(registry, definitions, valDef.type, imports, withShortcut)}>`;
   },
   [TypeDefInfo.BTreeSet]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
-    setImports(definitions, imports, ['BTreeSet']);
-
     const valDef = typeDef.sub as TypeDef;
 
-    return `BTreeSet<${formatType(registry, definitions, valDef.lookupName || valDef.type, imports, withShortcut)}>`;
+    setImports(definitions, imports, ['BTreeSet', valDef.lookupName]);
+
+    return `BTreeSet<${valDef.lookupName || formatType(registry, definitions, valDef.type, imports, withShortcut)}>`;
   },
   [TypeDefInfo.HashMap]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
-    setImports(definitions, imports, ['HashMap']);
-
     const [keyDef, valDef] = (typeDef.sub as TypeDef[]);
 
-    return `HashMap<${formatType(registry, definitions, keyDef.lookupName || keyDef.type, imports, withShortcut)}, ${formatType(registry, definitions, valDef.lookupName || valDef.type, imports, withShortcut)}>`;
+    setImports(definitions, imports, ['HashMap', keyDef.lookupName, valDef.lookupName]);
+
+    return `HashMap<${keyDef.lookupName || formatType(registry, definitions, keyDef.type, imports, withShortcut)}, ${valDef.lookupName || formatType(registry, definitions, valDef.type, imports, withShortcut)}>`;
   },
   [TypeDefInfo.Linkage]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
-    setImports(definitions, imports, ['Linkage']);
-
     const sub = (typeDef.sub as TypeDef);
 
-    return paramsNotation('Linkage', formatType(registry, definitions, sub.lookupName || sub.type, imports, withShortcut));
+    setImports(definitions, imports, ['Linkage', sub.lookupName]);
+
+    return paramsNotation('Linkage', sub.lookupName || formatType(registry, definitions, sub.type, imports, withShortcut));
   },
   [TypeDefInfo.Result]: (registry: Registry, typeDef: TypeDef, definitions: Record<string, ModuleTypes>, imports: TypeImports, withShortcut: boolean) => {
-    setImports(definitions, imports, ['Result']);
-
     const [okDef, errDef] = (typeDef.sub as TypeDef[]);
 
-    return `Result<${formatType(registry, definitions, okDef.lookupName || okDef.type, imports, withShortcut)}, ${formatType(registry, definitions, errDef.lookupName || errDef.type, imports, withShortcut)}>`;
+    setImports(definitions, imports, ['Result', okDef.lookupName, errDef.lookupName]);
+
+    return `Result<${okDef.lookupName || formatType(registry, definitions, okDef.type, imports, withShortcut)}, ${errDef.lookupName || formatType(registry, definitions, errDef.type, imports, withShortcut)}>`;
   }
 };
 
@@ -237,7 +245,7 @@ export function formatType (registry: Registry, definitions: Record<string, Modu
     typeDef = type;
   }
 
-  setImports(definitions, imports, [typeDef.type]);
+  setImports(definitions, imports, [typeDef.lookupName || typeDef.type]);
 
   return formatters[typeDef.info](registry, typeDef, definitions, imports, withShortcut);
 }

packages/typegen/src/util/imports.ts

@@ -36,10 +36,10 @@ export interface TypeImports {
 // Maps the types as found to the source location. This is used to generate the
 // imports in the output file, dep-duped and sorted
 /** @internal */
-export function setImports (allDefs: Record<string, ModuleTypes>, imports: TypeImports, types: string[]): void {
+export function setImports (allDefs: Record<string, ModuleTypes>, imports: TypeImports, types: (string | null | undefined)[]): void {
   const { codecTypes, extrinsicTypes, genericTypes, ignoredTypes, localTypes, metadataTypes, primitiveTypes, typesTypes } = imports;
 
-  types.forEach((type): void => {
+  types.filter((t): t is string => !!t).forEach((type): void => {
     if (ignoredTypes.includes(type)) {
       // do nothing
     } else if (['AnyNumber', 'CallFunction', 'Codec', 'IExtrinsic', 'ITuple'].includes(type)) {

packages/typegen/src/util/initMeta.ts

@@ -4,7 +4,7 @@
 import type { ExtraTypes } from '../generate/types';
 
 import { Metadata, TypeRegistry } from '@polkadot/types';
-import staticData from '@polkadot/types-support/metadata/static-substrate';
+import staticSubstrate from '@polkadot/types-support/metadata/static-substrate';
 
 import { registerDefinitions } from './register';
 
@@ -13,12 +13,12 @@ interface Result {
   registry: TypeRegistry;
 }
 
-export function initMeta (data = staticData, extraTypes: ExtraTypes = {}): Result {
+export function initMeta (staticMeta = staticSubstrate, extraTypes: ExtraTypes = {}): Result {
   const registry = new TypeRegistry();
 
   registerDefinitions(registry, extraTypes);
 
-  const metadata = new Metadata(registry, data);
+  const metadata = new Metadata(registry, staticMeta);
 
   registry.setMetadata(metadata);
 

packages/types-known/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types-known",
-  "version": "5.8.2",
+  "version": "6.0.3",
   "type": "module",
   "description": "Known type definitions",
   "main": "index.js",
@@ -20,8 +20,8 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-known#readme",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@polkadot/networks": "^7.3.1",
-    "@polkadot/types": "5.8.2",
-    "@polkadot/util": "^7.3.1"
+    "@polkadot/networks": "^7.4.1",
+    "@polkadot/types": "6.0.3",
+    "@polkadot/util": "^7.4.1"
   }
 }

packages/types-known/src/bundle.ts

@@ -7,7 +7,7 @@ import type { Hash } from '@polkadot/types/interfaces';
 import type { ChainUpgradeVersion, CodecHasher, DefinitionRpc, DefinitionRpcSub, OverrideModuleType, OverrideVersionedType, Registry, RegistryTypes } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
 
-import { bnToBn, isUndefined } from '@polkadot/util';
+import { bnToBn, isNull, isUndefined } from '@polkadot/util';
 
 import typesChain from './chain';
 import typesModules from './modules';
@@ -22,8 +22,8 @@ export { packageInfo } from './packageInfo';
 function filterVersions (versions: OverrideVersionedType[] = [], specVersion: number): RegistryTypes {
   return versions
     .filter(({ minmax: [min, max] }) =>
-      (isUndefined(min) || specVersion >= min) &&
-      (isUndefined(max) || specVersion <= max)
+      (isUndefined(min) || isNull(min) || specVersion >= min) &&
+      (isUndefined(max) || isNull(max) || specVersion <= max)
     )
     .reduce((result: RegistryTypes, { types }): RegistryTypes => ({
       ...result,

packages/types-known/src/modules.ts

@@ -48,6 +48,9 @@ const typesModules: Record<string, OverrideModuleType> = {
   inclusion: {
     ValidatorIndex: 'ParaValidatorIndex'
   },
+  paraDisputes: {
+    ValidatorIndex: 'ParaValidatorIndex'
+  },
   paraInclusion: {
     ValidatorIndex: 'ParaValidatorIndex'
   },
@@ -60,6 +63,9 @@ const typesModules: Record<string, OverrideModuleType> = {
   parachains: {
     Id: 'ParaId'
   },
+  parasDisputes: {
+    ValidatorIndex: 'ParaValidatorIndex'
+  },
   parasInclusion: {
     ValidatorIndex: 'ParaValidatorIndex'
   },

packages/types-known/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/types-known', version: '5.8.2' };
+export const packageInfo = { name: '@polkadot/types-known', version: '6.0.3' };

packages/types-known/src/spec/centrifuge-chain.ts

@@ -66,19 +66,48 @@ const sharedTypes = {
   RegistryInfo: {
     fields: 'Vec<Bytes>',
     ownerCanBurn: 'bool'
+  },
+
+  ProxyType: {
+    _enum: [
+      'Any',
+      'NonTransfer',
+      'Governance',
+      'Staking',
+      'NonProxy'
+    ]
   }
 };
 
+const standaloneTypes = {
+  ...sharedTypes,
+  AccountInfo: 'AccountInfoWithRefCount',
+  Address: 'LookupSource',
+  LookupSource: 'IndicesLookupSource',
+  Multiplier: 'Fixed64',
+  RefCount: 'RefCountTo259'
+};
+
 const versioned: OverrideVersionedType[] = [
   {
-    minmax: [240, 999],
+    minmax: [240, 243],
     types: {
-      ...sharedTypes,
-      AccountInfo: 'AccountInfoWithRefCount',
-      Address: 'LookupSource',
-      LookupSource: 'IndicesLookupSource',
-      Multiplier: 'Fixed64',
-      RefCount: 'RefCountTo259'
+      ...standaloneTypes,
+      ProxyType: {
+        _enum: [
+          'Any',
+          'NonTransfer',
+          'Governance',
+          'Staking',
+          'Vesting'
+        ]
+      }
+    }
+  },
+  {
+    minmax: [244, 999],
+    types: {
+      ...standaloneTypes
     }
   },
   {

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

@@ -45,6 +45,7 @@ const versioned: OverrideVersionedType[] = [
       DispatchError: 'DispatchErrorTo198',
       DispatchInfo: 'DispatchInfoTo244',
       Heartbeat: 'HeartbeatTo244',
+      IdentityInfo: 'IdentityInfoTo198',
       Keys: 'SessionKeys5',
       Multiplier: 'Fixed64',
       OpenTip: 'OpenTipTo225',

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

@@ -43,6 +43,7 @@ const versioned: OverrideVersionedType[] = [
       ...sharedTypes,
       AssetInstance: 'AssetInstanceV0',
       MultiAsset: 'MultiAssetV0',
+      MultiLocation: 'MultiLocationV0',
       Response: 'ResponseV0',
       Xcm: 'XcmV0',
       XcmOrder: 'XcmOrderV0'

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

@@ -24,6 +24,7 @@ const versioned: OverrideVersionedType[] = [
       },
       AssetInstance: 'AssetInstanceV0',
       MultiAsset: 'MultiAssetV0',
+      MultiLocation: 'MultiLocationV0',
       Response: 'ResponseV0',
       Xcm: 'XcmV0',
       XcmOrder: 'XcmOrderV0'

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

@@ -94,6 +94,7 @@ const versioned: OverrideVersionedType[] = [
       ...sharedTypes,
       AssetInstance: 'AssetInstanceV0',
       MultiAsset: 'MultiAssetV0',
+      MultiLocation: 'MultiLocationV0',
       Response: 'ResponseV0',
       Xcm: 'XcmV0',
       XcmOrder: 'XcmOrderV0'

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

@@ -9,7 +9,7 @@ const upgrades: ChainUpgradesRaw = [
   [528470, 13], [687751, 14], [746085, 15], [787923, 16], [799302, 17],
   [1205128, 18], [1603423, 23], [1733218, 24], [2005673, 25], [2436698, 26],
   [3613564, 27], [3899547, 28], [4345767, 29], [4876134, 30], [5661442, 9050],
-  [6321619, 9080]
+  [6321619, 9080], [6713249, 9090]
 ];
 
 export default upgrades;

packages/types-support/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types-support",
-  "version": "5.8.2",
+  "version": "6.0.3",
   "type": "module",
   "description": "Supporting files for types, mostly for testing",
   "main": "index.js",
@@ -20,6 +20,6 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-support#readme",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@polkadot/util": "^7.3.1"
+    "@polkadot/util": "^7.4.1"
   }
 }

packages/types-support/src/metadata/static-kusama.ts

@@ -1,6 +1,6 @@
 // Copyright 2017-2021 @polkadot/types-support authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import metadata from './v13/kusama-hex';
+import metadata from './v14/kusama-hex';
 
 export default metadata;

packages/types-support/src/metadata/static-polkadot.ts

@@ -1,6 +1,6 @@
 // Copyright 2017-2021 @polkadot/types-support authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import metadata from './v13/polkadot-hex';
+import metadata from './v14/polkadot-hex';
 
 export default metadata;

packages/types-support/src/metadata/static-substrate.ts

@@ -1,6 +1,6 @@
 // Copyright 2017-2021 @polkadot/types-support authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import metadata from './v13/substrate-hex';
+import metadata from './v14/substrate-hex';
 
 export default metadata;

packages/types-support/src/metadata/v13/kusama-json.json

@@ -5222,7 +5222,7 @@
         {
           "name": "Council",
           "storage": {
-            "prefix": "Instance1Collective",
+            "prefix": "Council",
             "items": [
               {
                 "name": "Proposals",
@@ -5324,8 +5324,8 @@
                 "",
                 " - `new_members`: The new member list. Be nice to the chain and provide it sorted.",
                 " - `prime`: The prime member whose vote sets the default.",
-                " - `old_count`: The upper bound for the previous number of members in storage.",
-                "                Used for weight estimation.",
+                " - `old_count`: The upper bound for the previous number of members in storage. Used for",
+                "   weight estimation.",
                 "",
                 " Requires root origin.",
                 "",
@@ -5339,7 +5339,8 @@
                 "   - `N` new-members-count (code- and governance-bounded)",
                 "   - `P` proposals-count (code-bounded)",
                 " - DB:",
-                "   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the members",
+                "   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the",
+                "     members",
                 "   - 1 storage read (codec `O(P)`) for reading the proposals",
                 "   - `P` storage mutations (codec `O(M)`) for updating the votes for each proposal",
                 "   - 1 storage write (codec `O(1)`) for deleting the old `prime` and setting the new one",
@@ -5365,7 +5366,8 @@
                 "",
                 " # <weight>",
                 " ## Weight",
-                " - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching `proposal`",
+                " - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching",
+                "   `proposal`",
                 " - DB: 1 read (codec `O(M)`) + DB access of `proposal`",
                 " - 1 event",
                 " # </weight>"
@@ -5439,7 +5441,8 @@
                 " Requires the sender to be a member.",
                 "",
                 " Transaction fees will be waived if the member is voting on any particular proposal",
-                " for the first time and the call is successful. Subsequent vote changes will charge a fee.",
+                " for the first time and the call is successful. Subsequent vote changes will charge a",
+                " fee.",
                 " # <weight>",
                 " ## Weight",
                 " - `O(M)` where `M` is members-count (code- and governance-bounded)",
@@ -5484,9 +5487,10 @@
                 " If the close operation completes successfully with disapproval, the transaction fee will",
                 " be waived. Otherwise execution of the approved operation will be charged to the caller.",
                 "",
-                " + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal.",
+                " + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed",
+                " proposal.",
                 " + `length_bound`: The upper bound for the length of the proposal in storage. Checked via",
-                "                   `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.",
+                " `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.",
                 "",
                 " # <weight>",
                 " ## Weight",
@@ -5497,7 +5501,8 @@
                 "   - `P2` is proposal-count (code-bounded)",
                 " - DB:",
                 "  - 2 storage reads (`Members`: codec `O(M)`, `Prime`: codec `O(1)`)",
-                "  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec `O(P2)`)",
+                "  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec",
+                "    `O(P2)`)",
                 "  - any mutations done while executing `proposal` (`P1`)",
                 " - up to 3 events",
                 " # </weight>"
@@ -5512,7 +5517,8 @@
                 }
               ],
               "docs": [
-                " Disapprove a proposal, close, and remove it from the system, regardless of its current state.",
+                " Disapprove a proposal, close, and remove it from the system, regardless of its current",
+                " state.",
                 "",
                 " Must be called by the Root origin.",
                 "",
@@ -5681,7 +5687,7 @@
         {
           "name": "TechnicalCommittee",
           "storage": {
-            "prefix": "Instance2Collective",
+            "prefix": "TechnicalCommittee",
             "items": [
               {
                 "name": "Proposals",
@@ -5783,8 +5789,8 @@
                 "",
                 " - `new_members`: The new member list. Be nice to the chain and provide it sorted.",
                 " - `prime`: The prime member whose vote sets the default.",
-                " - `old_count`: The upper bound for the previous number of members in storage.",
-                "                Used for weight estimation.",
+                " - `old_count`: The upper bound for the previous number of members in storage. Used for",
+                "   weight estimation.",
                 "",
                 " Requires root origin.",
                 "",
@@ -5798,7 +5804,8 @@
                 "   - `N` new-members-count (code- and governance-bounded)",
                 "   - `P` proposals-count (code-bounded)",
                 " - DB:",
-                "   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the members",
+                "   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the",
+                "     members",
                 "   - 1 storage read (codec `O(P)`) for reading the proposals",
                 "   - `P` storage mutations (codec `O(M)`) for updating the votes for each proposal",
                 "   - 1 storage write (codec `O(1)`) for deleting the old `prime` and setting the new one",
@@ -5824,7 +5831,8 @@
                 "",
                 " # <weight>",
                 " ## Weight",
-                " - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching `proposal`",
+                " - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching",
+                "   `proposal`",
                 " - DB: 1 read (codec `O(M)`) + DB access of `proposal`",
                 " - 1 event",
                 " # </weight>"
@@ -5898,7 +5906,8 @@
                 " Requires the sender to be a member.",
                 "",
                 " Transaction fees will be waived if the member is voting on any particular proposal",
-                " for the first time and the call is successful. Subsequent vote changes will charge a fee.",
+                " for the first time and the call is successful. Subsequent vote changes will charge a",
+                " fee.",
                 " # <weight>",
                 " ## Weight",
                 " - `O(M)` where `M` is members-count (code- and governance-bounded)",
@@ -5943,9 +5952,10 @@
                 " If the close operation completes successfully with disapproval, the transaction fee will",
                 " be waived. Otherwise execution of the approved operation will be charged to the caller.",
                 "",
-                " + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal.",
+                " + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed",
+                " proposal.",
                 " + `length_bound`: The upper bound for the length of the proposal in storage. Checked via",
-                "                   `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.",
+                " `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.",
                 "",
                 " # <weight>",
                 " ## Weight",
@@ -5956,7 +5966,8 @@
                 "   - `P2` is proposal-count (code-bounded)",
                 " - DB:",
                 "  - 2 storage reads (`Members`: codec `O(M)`, `Prime`: codec `O(1)`)",
-                "  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec `O(P2)`)",
+                "  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec",
+                "    `O(P2)`)",
                 "  - any mutations done while executing `proposal` (`P1`)",
                 " - up to 3 events",
                 " # </weight>"
@@ -5971,7 +5982,8 @@
                 }
               ],
               "docs": [
-                " Disapprove a proposal, close, and remove it from the system, regardless of its current state.",
+                " Disapprove a proposal, close, and remove it from the system, regardless of its current",
+                " state.",
                 "",
                 " Must be called by the Root origin.",
                 "",
@@ -6620,7 +6632,7 @@
         {
           "name": "TechnicalMembership",
           "storage": {
-            "prefix": "Instance1Membership",
+            "prefix": "TechnicalMembership",
             "items": [
               {
                 "name": "Members",
@@ -11815,7 +11827,7 @@
         {
           "name": "Tips",
           "storage": {
-            "prefix": "Treasury",
+            "prefix": "Tips",
             "items": [
               {
                 "name": "Tips",
@@ -11951,9 +11963,9 @@
                 "",
                 " # <weight>",
                 " - Complexity: `O(R + T)` where `R` length of `reason`, `T` is the number of tippers.",
-                "   - `O(T)`: decoding `Tipper` vec of length `T`",
-                "     `T` is charged as upper bound given by `ContainsLengthBound`.",
-                "     The actual cost depends on the implementation of `T::Tippers`.",
+                "   - `O(T)`: decoding `Tipper` vec of length `T`. `T` is charged as upper bound given by",
+                "     `ContainsLengthBound`. The actual cost depends on the implementation of",
+                "     `T::Tippers`.",
                 "   - `O(R)`: hashing and encoding of reason of length `R`",
                 " - DbReads: `Tippers`, `Reasons`",
                 " - DbWrites: `Reasons`, `Tips`",
@@ -11988,10 +12000,9 @@
                 " has started.",
                 "",
                 " # <weight>",
-                " - Complexity: `O(T)` where `T` is the number of tippers.",
-                "   decoding `Tipper` vec of length `T`, insert tip and check closing,",
-                "   `T` is charged as upper bound given by `ContainsLengthBound`.",
-                "   The actual cost depends on the implementation of `T::Tippers`.",
+                " - Complexity: `O(T)` where `T` is the number of tippers. decoding `Tipper` vec of length",
+                "   `T`, insert tip and check closing, `T` is charged as upper bound given by",
+                "   `ContainsLengthBound`. The actual cost depends on the implementation of `T::Tippers`.",
                 "",
                 "   Actually weight could be lower as it depends on how many tips are in `OpenTip` but it",
                 "   is weighted as if almost full i.e of length `T-1`.",
@@ -12019,10 +12030,9 @@
                 "   as the hash of the tuple of the original tip `reason` and the beneficiary account ID.",
                 "",
                 " # <weight>",
-                " - Complexity: `O(T)` where `T` is the number of tippers.",
-                "   decoding `Tipper` vec of length `T`.",
-                "   `T` is charged as upper bound given by `ContainsLengthBound`.",
-                "   The actual cost depends on the implementation of `T::Tippers`.",
+                " - Complexity: `O(T)` where `T` is the number of tippers. decoding `Tipper` vec of length",
+                "   `T`. `T` is charged as upper bound given by `ContainsLengthBound`. The actual cost",
+                "   depends on the implementation of `T::Tippers`.",
                 " - DbReads: `Tips`, `Tippers`, `tip finder`",
                 " - DbWrites: `Reasons`, `Tips`, `Tippers`, `tip finder`",
                 " # </weight>"
@@ -12104,6 +12114,22 @@
             }
           ],
           "constants": [
+            {
+              "name": "MaximumReasonLength",
+              "type": "u32",
+              "value": "0x00400000",
+              "docs": [
+                " Maximum acceptable reason length."
+              ]
+            },
+            {
+              "name": "DataDepositPerByte",
+              "type": "BalanceOf",
+              "value": "0x55a0fc01000000000000000000000000",
+              "docs": [
+                " The amount held on deposit per byte within the tip report reason or bounty description."
+              ]
+            },
             {
               "name": "TipCountdown",
               "type": "BlockNumber",
@@ -12117,7 +12143,7 @@
               "type": "Percent",
               "value": "0x14",
               "docs": [
-                " 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."
               ]
             },
             {
@@ -12127,22 +12153,6 @@
               "docs": [
                 " The amount held on deposit for placing a tip report."
               ]
-            },
-            {
-              "name": "DataDepositPerByte",
-              "type": "BalanceOf",
-              "value": "0x55a0fc01000000000000000000000000",
-              "docs": [
-                " The amount held on deposit per byte within the tip report reason."
-              ]
-            },
-            {
-              "name": "MaximumReasonLength",
-              "type": "u32",
-              "value": "0x00400000",
-              "docs": [
-                " Maximum acceptable reason length."
-              ]
             }
           ],
           "errors": [
@@ -12544,15 +12554,6 @@
                 " The priority of the unsigned transaction submitted in the unsigned-phase"
               ]
             },
-            {
-              "name": "MinerMaxIterations",
-              "type": "u32",
-              "value": "0x0a000000",
-              "docs": [
-                " Maximum number of iteration of balancing that will be executed in the embedded miner of",
-                " the pallet."
-              ]
-            },
             {
               "name": "MinerMaxWeight",
               "type": "Weight",
@@ -13438,7 +13439,7 @@
               "name": "set_hrmp_open_request_ttl",
               "args": [
                 {
-                  "name": "new",
+                  "name": "_new",
                   "type": "u32"
                 }
               ],
@@ -13866,6 +13867,13 @@
               "docs": [
                 " The validation code hash of the candidate is not valid."
               ]
+            },
+            {
+              "name": "ParaHeadMismatch",
+              "docs": [
+                " The `para_head` hash in the candidate descriptor doesn't match the hash of the actual para head in the",
+                " commitments."
+              ]
             }
           ],
           "index": 53
@@ -15080,6 +15088,22 @@
                 " If there are pending HRMP close channel requests, you can use this",
                 " function process all of those requests immediately."
               ]
+            },
+            {
+              "name": "hrmp_cancel_open_request",
+              "args": [
+                {
+                  "name": "channel_id",
+                  "type": "HrmpChannelId"
+                }
+              ],
+              "docs": [
+                " This cancels a pending open channel request. It can be canceled be either of the sender",
+                " or the recipient for that request. The origin must be either of those.",
+                "",
+                " The cancelling happens immediately. It is not possible to cancel the request if it is",
+                " already accepted."
+              ]
             }
           ],
           "events": [
@@ -15096,6 +15120,17 @@
                 " `[sender, recipient, proposed_max_capacity, proposed_max_message_size]`"
               ]
             },
+            {
+              "name": "OpenChannelCanceled",
+              "args": [
+                "ParaId",
+                "HrmpChannelId"
+              ],
+              "docs": [
+                " An HRMP channel request sent by the receiver was canceled by either party.",
+                " `[by_parachain, channel_id]`"
+              ]
+            },
             {
               "name": "OpenChannelAccepted",
               "args": [
@@ -15208,6 +15243,24 @@
               "docs": [
                 " The channel close request is already requested."
               ]
+            },
+            {
+              "name": "CancelHrmpOpenChannelUnauthorized",
+              "docs": [
+                " Canceling is requested by neither the sender nor recipient of the open channel request."
+              ]
+            },
+            {
+              "name": "OpenHrmpChannelDoesntExist",
+              "docs": [
+                " The open request doesn't exist."
+              ]
+            },
+            {
+              "name": "OpenHrmpChannelAlreadyConfirmed",
+              "docs": [
+                " Cannot cancel an HRMP open channel request because it is already confirmed."
+              ]
             }
           ],
           "index": 60

packages/types-support/src/metadata/v13/polkadot-json.json

@@ -5533,7 +5533,7 @@
         {
           "name": "Council",
           "storage": {
-            "prefix": "Instance1Collective",
+            "prefix": "Council",
             "items": [
               {
                 "name": "Proposals",
@@ -5635,8 +5635,8 @@
                 "",
                 " - `new_members`: The new member list. Be nice to the chain and provide it sorted.",
                 " - `prime`: The prime member whose vote sets the default.",
-                " - `old_count`: The upper bound for the previous number of members in storage.",
-                "                Used for weight estimation.",
+                " - `old_count`: The upper bound for the previous number of members in storage. Used for",
+                "   weight estimation.",
                 "",
                 " Requires root origin.",
                 "",
@@ -5650,7 +5650,8 @@
                 "   - `N` new-members-count (code- and governance-bounded)",
                 "   - `P` proposals-count (code-bounded)",
                 " - DB:",
-                "   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the members",
+                "   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the",
+                "     members",
                 "   - 1 storage read (codec `O(P)`) for reading the proposals",
                 "   - `P` storage mutations (codec `O(M)`) for updating the votes for each proposal",
                 "   - 1 storage write (codec `O(1)`) for deleting the old `prime` and setting the new one",
@@ -5676,7 +5677,8 @@
                 "",
                 " # <weight>",
                 " ## Weight",
-                " - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching `proposal`",
+                " - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching",
+                "   `proposal`",
                 " - DB: 1 read (codec `O(M)`) + DB access of `proposal`",
                 " - 1 event",
                 " # </weight>"
@@ -5750,7 +5752,8 @@
                 " Requires the sender to be a member.",
                 "",
                 " Transaction fees will be waived if the member is voting on any particular proposal",
-                " for the first time and the call is successful. Subsequent vote changes will charge a fee.",
+                " for the first time and the call is successful. Subsequent vote changes will charge a",
+                " fee.",
                 " # <weight>",
                 " ## Weight",
                 " - `O(M)` where `M` is members-count (code- and governance-bounded)",
@@ -5795,9 +5798,10 @@
                 " If the close operation completes successfully with disapproval, the transaction fee will",
                 " be waived. Otherwise execution of the approved operation will be charged to the caller.",
                 "",
-                " + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal.",
+                " + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed",
+                " proposal.",
                 " + `length_bound`: The upper bound for the length of the proposal in storage. Checked via",
-                "                   `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.",
+                " `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.",
                 "",
                 " # <weight>",
                 " ## Weight",
@@ -5808,7 +5812,8 @@
                 "   - `P2` is proposal-count (code-bounded)",
                 " - DB:",
                 "  - 2 storage reads (`Members`: codec `O(M)`, `Prime`: codec `O(1)`)",
-                "  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec `O(P2)`)",
+                "  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec",
+                "    `O(P2)`)",
                 "  - any mutations done while executing `proposal` (`P1`)",
                 " - up to 3 events",
                 " # </weight>"
@@ -5823,7 +5828,8 @@
                 }
               ],
               "docs": [
-                " Disapprove a proposal, close, and remove it from the system, regardless of its current state.",
+                " Disapprove a proposal, close, and remove it from the system, regardless of its current",
+                " state.",
                 "",
                 " Must be called by the Root origin.",
                 "",
@@ -5992,7 +5998,7 @@
         {
           "name": "TechnicalCommittee",
           "storage": {
-            "prefix": "Instance2Collective",
+            "prefix": "TechnicalCommittee",
             "items": [
               {
                 "name": "Proposals",
@@ -6094,8 +6100,8 @@
                 "",
                 " - `new_members`: The new member list. Be nice to the chain and provide it sorted.",
                 " - `prime`: The prime member whose vote sets the default.",
-                " - `old_count`: The upper bound for the previous number of members in storage.",
-                "                Used for weight estimation.",
+                " - `old_count`: The upper bound for the previous number of members in storage. Used for",
+                "   weight estimation.",
                 "",
                 " Requires root origin.",
                 "",
@@ -6109,7 +6115,8 @@
                 "   - `N` new-members-count (code- and governance-bounded)",
                 "   - `P` proposals-count (code-bounded)",
                 " - DB:",
-                "   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the members",
+                "   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the",
+                "     members",
                 "   - 1 storage read (codec `O(P)`) for reading the proposals",
                 "   - `P` storage mutations (codec `O(M)`) for updating the votes for each proposal",
                 "   - 1 storage write (codec `O(1)`) for deleting the old `prime` and setting the new one",
@@ -6135,7 +6142,8 @@
                 "",
                 " # <weight>",
                 " ## Weight",
-                " - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching `proposal`",
+                " - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching",
+                "   `proposal`",
                 " - DB: 1 read (codec `O(M)`) + DB access of `proposal`",
                 " - 1 event",
                 " # </weight>"
@@ -6209,7 +6217,8 @@
                 " Requires the sender to be a member.",
                 "",
                 " Transaction fees will be waived if the member is voting on any particular proposal",
-                " for the first time and the call is successful. Subsequent vote changes will charge a fee.",
+                " for the first time and the call is successful. Subsequent vote changes will charge a",
+                " fee.",
                 " # <weight>",
                 " ## Weight",
                 " - `O(M)` where `M` is members-count (code- and governance-bounded)",
@@ -6254,9 +6263,10 @@
                 " If the close operation completes successfully with disapproval, the transaction fee will",
                 " be waived. Otherwise execution of the approved operation will be charged to the caller.",
                 "",
-                " + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal.",
+                " + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed",
+                " proposal.",
                 " + `length_bound`: The upper bound for the length of the proposal in storage. Checked via",
-                "                   `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.",
+                " `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.",
                 "",
                 " # <weight>",
                 " ## Weight",
@@ -6267,7 +6277,8 @@
                 "   - `P2` is proposal-count (code-bounded)",
                 " - DB:",
                 "  - 2 storage reads (`Members`: codec `O(M)`, `Prime`: codec `O(1)`)",
-                "  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec `O(P2)`)",
+                "  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec",
+                "    `O(P2)`)",
                 "  - any mutations done while executing `proposal` (`P1`)",
                 " - up to 3 events",
                 " # </weight>"
@@ -6282,7 +6293,8 @@
                 }
               ],
               "docs": [
-                " Disapprove a proposal, close, and remove it from the system, regardless of its current state.",
+                " Disapprove a proposal, close, and remove it from the system, regardless of its current",
+                " state.",
                 "",
                 " Must be called by the Root origin.",
                 "",
@@ -6931,7 +6943,7 @@
         {
           "name": "TechnicalMembership",
           "storage": {
-            "prefix": "Instance1Membership",
+            "prefix": "TechnicalMembership",
             "items": [
               {
                 "name": "Members",
@@ -10265,7 +10277,7 @@
         {
           "name": "Tips",
           "storage": {
-            "prefix": "Treasury",
+            "prefix": "Tips",
             "items": [
               {
                 "name": "Tips",
@@ -10401,9 +10413,9 @@
                 "",
                 " # <weight>",
                 " - Complexity: `O(R + T)` where `R` length of `reason`, `T` is the number of tippers.",
-                "   - `O(T)`: decoding `Tipper` vec of length `T`",
-                "     `T` is charged as upper bound given by `ContainsLengthBound`.",
-                "     The actual cost depends on the implementation of `T::Tippers`.",
+                "   - `O(T)`: decoding `Tipper` vec of length `T`. `T` is charged as upper bound given by",
+                "     `ContainsLengthBound`. The actual cost depends on the implementation of",
+                "     `T::Tippers`.",
                 "   - `O(R)`: hashing and encoding of reason of length `R`",
                 " - DbReads: `Tippers`, `Reasons`",
                 " - DbWrites: `Reasons`, `Tips`",
@@ -10438,10 +10450,9 @@
                 " has started.",
                 "",
                 " # <weight>",
-                " - Complexity: `O(T)` where `T` is the number of tippers.",
-                "   decoding `Tipper` vec of length `T`, insert tip and check closing,",
-                "   `T` is charged as upper bound given by `ContainsLengthBound`.",
-                "   The actual cost depends on the implementation of `T::Tippers`.",
+                " - Complexity: `O(T)` where `T` is the number of tippers. decoding `Tipper` vec of length",
+                "   `T`, insert tip and check closing, `T` is charged as upper bound given by",
+                "   `ContainsLengthBound`. The actual cost depends on the implementation of `T::Tippers`.",
                 "",
                 "   Actually weight could be lower as it depends on how many tips are in `OpenTip` but it",
                 "   is weighted as if almost full i.e of length `T-1`.",
@@ -10469,10 +10480,9 @@
                 "   as the hash of the tuple of the original tip `reason` and the beneficiary account ID.",
                 "",
                 " # <weight>",
-                " - Complexity: `O(T)` where `T` is the number of tippers.",
-                "   decoding `Tipper` vec of length `T`.",
-                "   `T` is charged as upper bound given by `ContainsLengthBound`.",
-                "   The actual cost depends on the implementation of `T::Tippers`.",
+                " - Complexity: `O(T)` where `T` is the number of tippers. decoding `Tipper` vec of length",
+                "   `T`. `T` is charged as upper bound given by `ContainsLengthBound`. The actual cost",
+                "   depends on the implementation of `T::Tippers`.",
                 " - DbReads: `Tips`, `Tippers`, `tip finder`",
                 " - DbWrites: `Reasons`, `Tips`, `Tippers`, `tip finder`",
                 " # </weight>"
@@ -10554,6 +10564,22 @@
             }
           ],
           "constants": [
+            {
+              "name": "MaximumReasonLength",
+              "type": "u32",
+              "value": "0x00400000",
+              "docs": [
+                " Maximum acceptable reason length."
+              ]
+            },
+            {
+              "name": "DataDepositPerByte",
+              "type": "BalanceOf",
+              "value": "0x00e1f505000000000000000000000000",
+              "docs": [
+                " The amount held on deposit per byte within the tip report reason or bounty description."
+              ]
+            },
             {
               "name": "TipCountdown",
               "type": "BlockNumber",
@@ -10567,7 +10593,7 @@
               "type": "Percent",
               "value": "0x14",
               "docs": [
-                " 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."
               ]
             },
             {
@@ -10577,22 +10603,6 @@
               "docs": [
                 " The amount held on deposit for placing a tip report."
               ]
-            },
-            {
-              "name": "DataDepositPerByte",
-              "type": "BalanceOf",
-              "value": "0x00e1f505000000000000000000000000",
-              "docs": [
-                " The amount held on deposit per byte within the tip report reason."
-              ]
-            },
-            {
-              "name": "MaximumReasonLength",
-              "type": "u32",
-              "value": "0x00400000",
-              "docs": [
-                " Maximum acceptable reason length."
-              ]
             }
           ],
           "errors": [
@@ -10994,15 +11004,6 @@
                 " The priority of the unsigned transaction submitted in the unsigned-phase"
               ]
             },
-            {
-              "name": "MinerMaxIterations",
-              "type": "u32",
-              "value": "0x0a000000",
-              "docs": [
-                " Maximum number of iteration of balancing that will be executed in the embedded miner of",
-                " the pallet."
-              ]
-            },
             {
               "name": "MinerMaxWeight",
               "type": "Weight",

packages/types-support/src/metadata/v13/substrate-json.json

@@ -503,7 +503,7 @@
             {
               "name": "Version",
               "type": "RuntimeVersion",
-              "value": "0x106e6f6465387375627374726174652d6e6f64650a0000000b0100000000000034df6acb689907609b0300000037e397fc7c91f5e40100000040fe3ad401f8959a05000000d2bc9897eed08f1503000000f78b278be53f454c02000000ed99c5acb25eedf503000000cbca25e39f14238702000000687ad44ad37f03c201000000bc9d89904f5b923f0100000068b66ba122c93fa70100000037c8bb1350a9a2a80100000091d5df18b0d2cf5801000000ab3c0572291feb8b0100000002000000",
+              "value": "0x106e6f6465387375627374726174652d6e6f64650a0000000b0100000100000034df6acb689907609b0300000037e397fc7c91f5e40100000040fe3ad401f8959a05000000d2bc9897eed08f1503000000f78b278be53f454c02000000ed99c5acb25eedf503000000cbca25e39f14238702000000687ad44ad37f03c201000000bc9d89904f5b923f0100000068b66ba122c93fa70100000037c8bb1350a9a2a80100000091d5df18b0d2cf5801000000ab3c0572291feb8b0100000002000000",
               "docs": [
                 " Get the chain's current version."
               ]
@@ -2292,15 +2292,6 @@
                 " The priority of the unsigned transaction submitted in the unsigned-phase"
               ]
             },
-            {
-              "name": "MinerMaxIterations",
-              "type": "u32",
-              "value": "0x0a000000",
-              "docs": [
-                " Maximum number of iteration of balancing that will be executed in the embedded miner of",
-                " the pallet."
-              ]
-            },
             {
               "name": "MinerMaxWeight",
               "type": "Weight",
@@ -5396,7 +5387,7 @@
         {
           "name": "Council",
           "storage": {
-            "prefix": "Instance1Collective",
+            "prefix": "Council",
             "items": [
               {
                 "name": "Proposals",
@@ -5498,8 +5489,8 @@
                 "",
                 " - `new_members`: The new member list. Be nice to the chain and provide it sorted.",
                 " - `prime`: The prime member whose vote sets the default.",
-                " - `old_count`: The upper bound for the previous number of members in storage.",
-                "                Used for weight estimation.",
+                " - `old_count`: The upper bound for the previous number of members in storage. Used for",
+                "   weight estimation.",
                 "",
                 " Requires root origin.",
                 "",
@@ -5513,7 +5504,8 @@
                 "   - `N` new-members-count (code- and governance-bounded)",
                 "   - `P` proposals-count (code-bounded)",
                 " - DB:",
-                "   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the members",
+                "   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the",
+                "     members",
                 "   - 1 storage read (codec `O(P)`) for reading the proposals",
                 "   - `P` storage mutations (codec `O(M)`) for updating the votes for each proposal",
                 "   - 1 storage write (codec `O(1)`) for deleting the old `prime` and setting the new one",
@@ -5539,7 +5531,8 @@
                 "",
                 " # <weight>",
                 " ## Weight",
-                " - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching `proposal`",
+                " - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching",
+                "   `proposal`",
                 " - DB: 1 read (codec `O(M)`) + DB access of `proposal`",
                 " - 1 event",
                 " # </weight>"
@@ -5613,7 +5606,8 @@
                 " Requires the sender to be a member.",
                 "",
                 " Transaction fees will be waived if the member is voting on any particular proposal",
-                " for the first time and the call is successful. Subsequent vote changes will charge a fee.",
+                " for the first time and the call is successful. Subsequent vote changes will charge a",
+                " fee.",
                 " # <weight>",
                 " ## Weight",
                 " - `O(M)` where `M` is members-count (code- and governance-bounded)",
@@ -5658,9 +5652,10 @@
                 " If the close operation completes successfully with disapproval, the transaction fee will",
                 " be waived. Otherwise execution of the approved operation will be charged to the caller.",
                 "",
-                " + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal.",
+                " + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed",
+                " proposal.",
                 " + `length_bound`: The upper bound for the length of the proposal in storage. Checked via",
-                "                   `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.",
+                " `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.",
                 "",
                 " # <weight>",
                 " ## Weight",
@@ -5671,7 +5666,8 @@
                 "   - `P2` is proposal-count (code-bounded)",
                 " - DB:",
                 "  - 2 storage reads (`Members`: codec `O(M)`, `Prime`: codec `O(1)`)",
-                "  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec `O(P2)`)",
+                "  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec",
+                "    `O(P2)`)",
                 "  - any mutations done while executing `proposal` (`P1`)",
                 " - up to 3 events",
                 " # </weight>"
@@ -5686,7 +5682,8 @@
                 }
               ],
               "docs": [
-                " Disapprove a proposal, close, and remove it from the system, regardless of its current state.",
+                " Disapprove a proposal, close, and remove it from the system, regardless of its current",
+                " state.",
                 "",
                 " Must be called by the Root origin.",
                 "",
@@ -5855,7 +5852,7 @@
         {
           "name": "TechnicalCommittee",
           "storage": {
-            "prefix": "Instance2Collective",
+            "prefix": "TechnicalCommittee",
             "items": [
               {
                 "name": "Proposals",
@@ -5957,8 +5954,8 @@
                 "",
                 " - `new_members`: The new member list. Be nice to the chain and provide it sorted.",
                 " - `prime`: The prime member whose vote sets the default.",
-                " - `old_count`: The upper bound for the previous number of members in storage.",
-                "                Used for weight estimation.",
+                " - `old_count`: The upper bound for the previous number of members in storage. Used for",
+                "   weight estimation.",
                 "",
                 " Requires root origin.",
                 "",
@@ -5972,7 +5969,8 @@
                 "   - `N` new-members-count (code- and governance-bounded)",
                 "   - `P` proposals-count (code-bounded)",
                 " - DB:",
-                "   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the members",
+                "   - 1 storage mutation (codec `O(M)` read, `O(N)` write) for reading and writing the",
+                "     members",
                 "   - 1 storage read (codec `O(P)`) for reading the proposals",
                 "   - `P` storage mutations (codec `O(M)`) for updating the votes for each proposal",
                 "   - 1 storage write (codec `O(1)`) for deleting the old `prime` and setting the new one",
@@ -5998,7 +5996,8 @@
                 "",
                 " # <weight>",
                 " ## Weight",
-                " - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching `proposal`",
+                " - `O(M + P)` where `M` members-count (code-bounded) and `P` complexity of dispatching",
+                "   `proposal`",
                 " - DB: 1 read (codec `O(M)`) + DB access of `proposal`",
                 " - 1 event",
                 " # </weight>"
@@ -6072,7 +6071,8 @@
                 " Requires the sender to be a member.",
                 "",
                 " Transaction fees will be waived if the member is voting on any particular proposal",
-                " for the first time and the call is successful. Subsequent vote changes will charge a fee.",
+                " for the first time and the call is successful. Subsequent vote changes will charge a",
+                " fee.",
                 " # <weight>",
                 " ## Weight",
                 " - `O(M)` where `M` is members-count (code- and governance-bounded)",
@@ -6117,9 +6117,10 @@
                 " If the close operation completes successfully with disapproval, the transaction fee will",
                 " be waived. Otherwise execution of the approved operation will be charged to the caller.",
                 "",
-                " + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal.",
+                " + `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed",
+                " proposal.",
                 " + `length_bound`: The upper bound for the length of the proposal in storage. Checked via",
-                "                   `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.",
+                " `storage::read` so it is `size_of::<u32>() == 4` larger than the pure length.",
                 "",
                 " # <weight>",
                 " ## Weight",
@@ -6130,7 +6131,8 @@
                 "   - `P2` is proposal-count (code-bounded)",
                 " - DB:",
                 "  - 2 storage reads (`Members`: codec `O(M)`, `Prime`: codec `O(1)`)",
-                "  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec `O(P2)`)",
+                "  - 3 mutations (`Voting`: codec `O(M)`, `ProposalOf`: codec `O(B)`, `Proposals`: codec",
+                "    `O(P2)`)",
                 "  - any mutations done while executing `proposal` (`P1`)",
                 " - up to 3 events",
                 " # </weight>"
@@ -6145,7 +6147,8 @@
                 }
               ],
               "docs": [
-                " Disapprove a proposal, close, and remove it from the system, regardless of its current state.",
+                " Disapprove a proposal, close, and remove it from the system, regardless of its current",
+                " state.",
                 "",
                 " Must be called by the Root origin.",
                 "",
@@ -6794,7 +6797,7 @@
         {
           "name": "TechnicalMembership",
           "storage": {
-            "prefix": "Instance1Membership",
+            "prefix": "TechnicalMembership",
             "items": [
               {
                 "name": "Members",
@@ -7657,30 +7660,6 @@
                 " code deployment step. Instead, the `code_hash` of an on-chain deployed wasm binary",
                 " must be supplied."
               ]
-            },
-            {
-              "name": "claim_surcharge",
-              "args": [
-                {
-                  "name": "dest",
-                  "type": "AccountId"
-                },
-                {
-                  "name": "aux_sender",
-                  "type": "Option<AccountId>"
-                }
-              ],
-              "docs": [
-                " Allows block producers to claim a small reward for evicting a contract. If a block",
-                " producer fails to do so, a regular users will be allowed to claim the reward.",
-                "",
-                " In case of a successful eviction no fees are charged from the sender. However, the",
-                " reward is capped by the total amount of rent that was paid by the contract while",
-                " it was alive.",
-                "",
-                " If contract is not evicted as a result of this call, [`Error::ContractNotEvictable`]",
-                " is returned and the sender is not eligible for the reward."
-              ]
             }
           ],
           "events": [
@@ -7694,15 +7673,6 @@
                 " Contract deployed by address at the specified address. \\[deployer, contract\\]"
               ]
             },
-            {
-              "name": "Evicted",
-              "args": [
-                "AccountId"
-              ],
-              "docs": [
-                " Contract has been evicted and is now in tombstone state. \\[contract\\]"
-              ]
-            },
             {
               "name": "Terminated",
               "args": [
@@ -7710,7 +7680,7 @@
                 "AccountId"
               ],
               "docs": [
-                " Contract has been terminated without leaving a tombstone.",
+                " Contract has been removed.",
                 " \\[contract, beneficiary\\]",
                 "",
                 " # Params",
@@ -7720,28 +7690,8 @@
                 "",
                 " # Note",
                 "",
-                " The only way for a contract to be removed without a tombstone and emitting",
-                " this event is by calling `seal_terminate`."
-              ]
-            },
-            {
-              "name": "Restored",
-              "args": [
-                "AccountId",
-                "AccountId",
-                "Hash",
-                "Balance"
-              ],
-              "docs": [
-                " Restoration of a contract has been successful.",
-                " \\[restorer, dest, code_hash, rent_allowance\\]",
-                "",
-                " # Params",
-                "",
-                " - `restorer`: Account ID of the restoring contract.",
-                " - `dest`: Account ID of the restored contract.",
-                " - `code_hash`: Code hash of the restored contract.",
-                " - `rent_allowance`: Rent allowance of the restored contract."
+                " The only way for a contract to be removed and emitting this event is by calling",
+                " `seal_terminate`."
               ]
             },
             {
@@ -7793,7 +7743,7 @@
                 " A code with the specified hash was removed.",
                 " \\[code_hash\\]",
                 "",
-                " This happens when the last contract that uses this code hash was removed or evicted."
+                " This happens when the last contract that uses this code hash was removed."
               ]
             }
           ],
@@ -7801,94 +7751,26 @@
             {
               "name": "Schedule",
               "type": "Schedule",
-              "value": "0x040000000002000000010000800000001000000000100000000100002000000020000000004000000000020002000000eb130000ae310000ab370000ba160000bb2b0000222000008c1a0000c83000005200000021e2020044620400151300005c1000005415000042150000f02600000731000070100000d5e3c402001600004016000011160000fb150000e5150000f815000026160000c01600004a16000070160000ac16000091160000cf160000d3160000eb160000f8150000f21600009d1600007a1600005c160000072f00000e250000d22f0000ad2400007c1a0000831600008716000002170000b51600008916000090160000a81600003ee4140000000000de0715000000000020e9140000000000aadd3b0000000000c4ea1400000000004af614000000000074fe14000000000044f714000000000088d614000000000084ee140000000000065f3100000000006276090000000000f0a6310000000000a504000000000000103d260000000000db020000000000007045df1f0000000028135a290000000056f6e60800000000a4bd4300000000003cfe6f000000000032eac2070000000078070000000000006c0f0c00000000001a3c0e0000000000007eb107000000005303000000000000b275fd0700000000c4bed00100000000170500000000000016ed470a000000003677ec24000000009a5c380800000000df02000000000000a2040000000000002888813700000000df02000000000000a0040000000000008b0800000000000028e015000000000085130000000000008a22170000000000b90d0000000000005cbe120000000000b906000000000000a8d6120000000000ba06000000000000",
+              "value": "0x040000000002000000010000800000001000000000100000000100002000000020000000004000000000020002000000a4150000f03200004a3d0000280f0000ce220000f4150000180b0000521c00000000000046c10200a8030400c80f000000050000c0080000000000009a15000052170000241300009b684a028e1200008e1200008e1200007012000000000000000000002a120000a410000086100000640f00001e0f0000b00e00005e100000ae10000072100000fe100000d61000006810000004100000d20f0000a6270000be1e000072290000141e0000d61000000e1000005a0f0000320f0000ae100000500f0000140f0000dc0f0000f425130000000000de3113000000000068f81200000000001a1e360000000000be38130000000000d616130000000000043e1300000000005411130000000000281a13000000000040572c000000000018ad0800000000001a531000000000007301000000000000d8f563000000000068020000000000000072a4200000000038093c0000000000aa696900000000007e4ebd07000000005306000000000000d81c0b0000000000fc4b1b0600000000bf02000000000000001e180600000000faf6d001000000004704000000000000caeb080a000000007a612d1f000000005aced709000000006c02000000000000e0030000000000002ef30132000000006b02000000000000d703000000000000b1070000000000005e6a1400000000000b1300000000000040781500000000003c0d0000000000005855110000000000420600000000000012461100000000004206000000000000c22a500900000000",
               "docs": [
                 " Cost schedule and limits."
               ]
             },
             {
-              "name": "SignedClaimHandicap",
-              "type": "BlockNumber",
-              "value": "0x02000000",
-              "docs": [
-                " 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"
-              ]
-            },
-            {
-              "name": "TombstoneDeposit",
+              "name": "ContractDeposit",
               "type": "BalanceOf",
-              "value": "0x00f0e8857a9c02000000000000000000",
+              "value": "0x00f0436de36a01000000000000000000",
               "docs": [
-                " The minimum amount required to generate a tombstone."
-              ]
-            },
-            {
-              "name": "DepositPerContract",
-              "type": "BalanceOf",
-              "value": "0x00f0e8857a9c02000000000000000000",
-              "docs": [
-                " 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."
-              ]
-            },
-            {
-              "name": "DepositPerStorageByte",
-              "type": "BalanceOf",
-              "value": "0x0060defb740500000000000000000000",
-              "docs": [
-                " 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."
-              ]
-            },
-            {
-              "name": "DepositPerStorageItem",
-              "type": "BalanceOf",
-              "value": "0x00f0ab75a40d00000000000000000000",
-              "docs": [
-                " 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."
-              ]
-            },
-            {
-              "name": "RentFraction",
-              "type": "Perbill",
-              "value": "0x85040000",
-              "docs": [
-                " 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."
-              ]
-            },
-            {
-              "name": "SurchargeReward",
-              "type": "BalanceOf",
-              "value": "0x005cb2ec220000000000000000000000",
-              "docs": [
-                " Reward that is received by the party whose touch has led",
-                " to removal of a contract."
+                " The deposit that must be placed into the contract's account to instantiate it.",
+                " This is in **addition** to the [`pallet_balances::Pallet::ExistenialDeposit`].",
+                " The minimum balance for a contract's account can be queried using",
+                " [`Pallet::subsistence_threshold`]."
               ]
             },
             {
               "name": "DeletionQueueDepth",
               "type": "u32",
-              "value": "0xed030000",
+              "value": "0xa2ba0100",
               "docs": [
                 " The maximum number of tries that can be queued for deletion."
               ]
@@ -7909,36 +7791,6 @@
                 " A new schedule must have a greater version than the current one."
               ]
             },
-            {
-              "name": "InvalidSurchargeClaim",
-              "docs": [
-                " An origin must be signed or inherent and auxiliary sender only provided on inherent."
-              ]
-            },
-            {
-              "name": "InvalidSourceContract",
-              "docs": [
-                " Cannot restore from nonexisting or tombstone contract."
-              ]
-            },
-            {
-              "name": "InvalidDestinationContract",
-              "docs": [
-                " Cannot restore to nonexisting or alive contract."
-              ]
-            },
-            {
-              "name": "InvalidTombstone",
-              "docs": [
-                " Tombstones don't match."
-              ]
-            },
-            {
-              "name": "InvalidContractOrigin",
-              "docs": [
-                " An origin TrieId written in the current block."
-              ]
-            },
             {
               "name": "OutOfGas",
               "docs": [
@@ -7955,9 +7807,8 @@
               "name": "BelowSubsistenceThreshold",
               "docs": [
                 " 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."
+                " the subsistence threshold. No transfer is allowed to do this. Use `seal_terminate`",
+                " to recover a deposit."
               ]
             },
             {
@@ -7988,26 +7839,6 @@
                 " No contract was found at the specified address."
               ]
             },
-            {
-              "name": "ContractIsTombstone",
-              "docs": [
-                " A tombstone exist at the specified address.",
-                "",
-                " Tombstone cannot be called. Anyone can use `seal_restore_to` in order to revive",
-                " the contract, though."
-              ]
-            },
-            {
-              "name": "RentNotPaid",
-              "docs": [
-                " 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."
-              ]
-            },
             {
               "name": "CodeTooLarge",
               "docs": [
@@ -8049,7 +7880,7 @@
               "name": "TerminatedWhileReentrant",
               "docs": [
                 " 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`."
               ]
             },
             {
@@ -8089,20 +7920,11 @@
               "docs": [
                 " 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."
               ]
             },
-            {
-              "name": "ContractNotEvictable",
-              "docs": [
-                " 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."
-              ]
-            },
             {
               "name": "StorageExhausted",
               "docs": [
@@ -8123,7 +7945,7 @@
               "docs": [
                 " 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`."
               ]
             },
             {
@@ -12875,7 +12697,7 @@
         {
           "name": "Tips",
           "storage": {
-            "prefix": "Treasury",
+            "prefix": "Tips",
             "items": [
               {
                 "name": "Tips",
@@ -13011,9 +12833,9 @@
                 "",
                 " # <weight>",
                 " - Complexity: `O(R + T)` where `R` length of `reason`, `T` is the number of tippers.",
-                "   - `O(T)`: decoding `Tipper` vec of length `T`",
-                "     `T` is charged as upper bound given by `ContainsLengthBound`.",
-                "     The actual cost depends on the implementation of `T::Tippers`.",
+                "   - `O(T)`: decoding `Tipper` vec of length `T`. `T` is charged as upper bound given by",
+                "     `ContainsLengthBound`. The actual cost depends on the implementation of",
+                "     `T::Tippers`.",
                 "   - `O(R)`: hashing and encoding of reason of length `R`",
                 " - DbReads: `Tippers`, `Reasons`",
                 " - DbWrites: `Reasons`, `Tips`",
@@ -13048,10 +12870,9 @@
                 " has started.",
                 "",
                 " # <weight>",
-                " - Complexity: `O(T)` where `T` is the number of tippers.",
-                "   decoding `Tipper` vec of length `T`, insert tip and check closing,",
-                "   `T` is charged as upper bound given by `ContainsLengthBound`.",
-                "   The actual cost depends on the implementation of `T::Tippers`.",
+                " - Complexity: `O(T)` where `T` is the number of tippers. decoding `Tipper` vec of length",
+                "   `T`, insert tip and check closing, `T` is charged as upper bound given by",
+                "   `ContainsLengthBound`. The actual cost depends on the implementation of `T::Tippers`.",
                 "",
                 "   Actually weight could be lower as it depends on how many tips are in `OpenTip` but it",
                 "   is weighted as if almost full i.e of length `T-1`.",
@@ -13079,10 +12900,9 @@
                 "   as the hash of the tuple of the original tip `reason` and the beneficiary account ID.",
                 "",
                 " # <weight>",
-                " - Complexity: `O(T)` where `T` is the number of tippers.",
-                "   decoding `Tipper` vec of length `T`.",
-                "   `T` is charged as upper bound given by `ContainsLengthBound`.",
-                "   The actual cost depends on the implementation of `T::Tippers`.",
+                " - Complexity: `O(T)` where `T` is the number of tippers. decoding `Tipper` vec of length",
+                "   `T`. `T` is charged as upper bound given by `ContainsLengthBound`. The actual cost",
+                "   depends on the implementation of `T::Tippers`.",
                 " - DbReads: `Tips`, `Tippers`, `tip finder`",
                 " - DbWrites: `Reasons`, `Tips`, `Tippers`, `tip finder`",
                 " # </weight>"
@@ -13164,6 +12984,22 @@
             }
           ],
           "constants": [
+            {
+              "name": "MaximumReasonLength",
+              "type": "u32",
+              "value": "0x00400000",
+              "docs": [
+                " Maximum acceptable reason length."
+              ]
+            },
+            {
+              "name": "DataDepositPerByte",
+              "type": "BalanceOf",
+              "value": "0x0010a5d4e80000000000000000000000",
+              "docs": [
+                " The amount held on deposit per byte within the tip report reason or bounty description."
+              ]
+            },
             {
               "name": "TipCountdown",
               "type": "BlockNumber",
@@ -13177,7 +13013,7 @@
               "type": "Percent",
               "value": "0x14",
               "docs": [
-                " 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."
               ]
             },
             {
@@ -13187,22 +13023,6 @@
               "docs": [
                 " The amount held on deposit for placing a tip report."
               ]
-            },
-            {
-              "name": "DataDepositPerByte",
-              "type": "BalanceOf",
-              "value": "0x0010a5d4e80000000000000000000000",
-              "docs": [
-                " The amount held on deposit per byte within the tip report reason."
-              ]
-            },
-            {
-              "name": "MaximumReasonLength",
-              "type": "u32",
-              "value": "0x00400000",
-              "docs": [
-                " Maximum acceptable reason length."
-              ]
             }
           ],
           "errors": [
@@ -14956,7 +14776,7 @@
             {
               "name": "IgnoredIssuance",
               "type": "BalanceOf",
-              "value": "0x00000000000000000000000000000000",
+              "value": "0x996af44a87686c010000000000000000",
               "docs": [
                 " 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."

packages/types-support/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/types-support', version: '5.8.2' };
+export const packageInfo = { name: '@polkadot/types-support', version: '6.0.3' };

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types",
-  "version": "5.8.2",
+  "version": "6.0.3",
   "type": "module",
   "description": "Implementation of the Parity codec",
   "main": "index.js",
@@ -20,13 +20,13 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@polkadot/util": "^7.3.1",
-    "@polkadot/util-crypto": "^7.3.1",
+    "@polkadot/util": "^7.4.1",
+    "@polkadot/util-crypto": "^7.4.1",
     "rxjs": "^7.3.0"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^7.3.1",
-    "@polkadot/types-support": "5.8.2",
+    "@polkadot/keyring": "^7.4.1",
+    "@polkadot/types-support": "6.0.3",
     "@types/bn.js": "^4.11.6",
     "bn.js": "^4.12.0"
   }

packages/types/src/augment/index.ts

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

packages/types/src/augment/lookup/definitions.ts

@@ -0,0 +1,19 @@
+// Copyright 2017-2021 @polkadot/api authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Definitions } from '../../types';
+
+import kusama from './kusama';
+import polkadot from './polkadot';
+import substrate from './substrate';
+
+export default {
+  rpc: {},
+  types: {
+    // Not 100% sure it is relevant, however the order here is the same
+    // as exposed in the typegen lookup order
+    ...substrate,
+    ...polkadot,
+    ...kusama
+  }
+} as Definitions;

packages/types/src/augment/lookup/index.ts

@@ -0,0 +1,4 @@
+// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
+/* eslint-disable */
+
+export * from './types';

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

@@ -0,0 +1,101 @@
+// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
+/* eslint-disable */
+
+/* eslint-disable sort-keys */
+
+import type { DefinitionsTypes } from '../../types';
+
+export default {
+  /**
+   * Lookup66: polkadot_runtime_common::claims::EthereumAddress
+   **/
+  PolkadotRuntimeCommonClaimsEthereumAddress: '[u8;20]',
+  /**
+   * Lookup72: polkadot_runtime::ProxyType
+   **/
+  PolkadotRuntimeProxyType: {
+    _enum: ['Any', 'NonTransfer', 'Governance', 'Staking', 'Unused4', 'IdentityJudgement', 'CancelProxy']
+  },
+  /**
+   * Lookup139: polkadot_runtime::SessionKeys
+   **/
+  PolkadotRuntimeSessionKeys: {
+    grandpa: 'SpFinalityGrandpaAppPublic',
+    babe: 'SpConsensusBabeAppPublic',
+    imOnline: 'PalletImOnlineSr25519AppSr25519Public',
+    paraValidator: 'PolkadotPrimitivesV0ValidatorAppPublic',
+    paraAssignment: 'PolkadotPrimitivesV1AssignmentAppPublic',
+    authorityDiscovery: 'SpAuthorityDiscoveryAppPublic'
+  },
+  /**
+   * Lookup140: polkadot_primitives::v0::validator_app::Public
+   **/
+  PolkadotPrimitivesV0ValidatorAppPublic: 'SpCoreSr25519Public',
+  /**
+   * Lookup141: polkadot_primitives::v1::assignment_app::Public
+   **/
+  PolkadotPrimitivesV1AssignmentAppPublic: 'SpCoreSr25519Public',
+  /**
+   * Lookup175: polkadot_runtime_common::claims::EcdsaSignature
+   **/
+  PolkadotRuntimeCommonClaimsEcdsaSignature: '[u8;65]',
+  /**
+   * Lookup180: polkadot_runtime_common::claims::StatementKind
+   **/
+  PolkadotRuntimeCommonClaimsStatementKind: {
+    _enum: ['Regular', 'Saft']
+  },
+  /**
+   * Lookup233: polkadot_runtime::NposCompactSolution16
+   **/
+  PolkadotRuntimeNposCompactSolution16: {
+    votes1: 'Vec<(Compact<u32>,Compact<u16>)>',
+    votes2: 'Vec<(Compact<u32>,(Compact<u16>,Compact<PerU16>),Compact<u16>)>',
+    votes3: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);2],Compact<u16>)>',
+    votes4: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);3],Compact<u16>)>',
+    votes5: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);4],Compact<u16>)>',
+    votes6: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);5],Compact<u16>)>',
+    votes7: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);6],Compact<u16>)>',
+    votes8: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);7],Compact<u16>)>',
+    votes9: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);8],Compact<u16>)>',
+    votes10: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);9],Compact<u16>)>',
+    votes11: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);10],Compact<u16>)>',
+    votes12: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);11],Compact<u16>)>',
+    votes13: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);12],Compact<u16>)>',
+    votes14: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);13],Compact<u16>)>',
+    votes15: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);14],Compact<u16>)>',
+    votes16: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);15],Compact<u16>)>'
+  },
+  /**
+   * Lookup290: polkadot_runtime::OriginCaller
+   **/
+  PolkadotRuntimeOriginCaller: {
+    _enum: {
+      system: 'FrameSystemRawOrigin',
+      Unused1: 'Null',
+      Unused2: 'Null',
+      Void: 'SpCoreVoid',
+      Unused4: 'Null',
+      Unused5: 'Null',
+      Unused6: 'Null',
+      Unused7: 'Null',
+      Unused8: 'Null',
+      Unused9: 'Null',
+      Unused10: 'Null',
+      Unused11: 'Null',
+      Unused12: 'Null',
+      Unused13: 'Null',
+      Unused14: 'Null',
+      Council: 'PalletCollectiveRawOrigin',
+      TechnicalCommittee: 'PalletCollectiveRawOrigin'
+    }
+  },
+  /**
+   * Lookup441: polkadot_runtime_common::claims::PrevalidateAttests<T>
+   **/
+  PolkadotRuntimeCommonClaimsPrevalidateAttests: 'Null',
+  /**
+   * Lookup442: polkadot_runtime::Runtime
+   **/
+  PolkadotRuntimeRuntime: 'Null'
+} as DefinitionsTypes;

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

@@ -0,0 +1,99 @@
+// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
+/* eslint-disable */
+
+import type { Compact, Enum, Null, Struct, U8aFixed, Vec, u16, u32 } from '@polkadot/types';
+import type { PerU16 } from '@polkadot/types/interfaces/runtime';
+import type { ITuple } from '@polkadot/types/types';
+
+declare module '@polkadot/types/lookup' {
+
+  /** @name PolkadotRuntimeCommonClaimsEthereumAddress (66) */
+  export interface PolkadotRuntimeCommonClaimsEthereumAddress extends U8aFixed {}
+
+  /** @name PolkadotRuntimeProxyType (72) */
+  export interface PolkadotRuntimeProxyType extends Enum {
+    readonly isAny: boolean;
+    readonly isNonTransfer: boolean;
+    readonly isGovernance: boolean;
+    readonly isStaking: boolean;
+    readonly isUnused4: boolean;
+    readonly isIdentityJudgement: boolean;
+    readonly isCancelProxy: boolean;
+  }
+
+  /** @name PolkadotRuntimeSessionKeys (139) */
+  export interface PolkadotRuntimeSessionKeys extends Struct {
+    readonly grandpa: SpFinalityGrandpaAppPublic;
+    readonly babe: SpConsensusBabeAppPublic;
+    readonly imOnline: PalletImOnlineSr25519AppSr25519Public;
+    readonly paraValidator: PolkadotPrimitivesV0ValidatorAppPublic;
+    readonly paraAssignment: PolkadotPrimitivesV1AssignmentAppPublic;
+    readonly authorityDiscovery: SpAuthorityDiscoveryAppPublic;
+  }
+
+  /** @name PolkadotPrimitivesV0ValidatorAppPublic (140) */
+  export interface PolkadotPrimitivesV0ValidatorAppPublic extends SpCoreSr25519Public {}
+
+  /** @name PolkadotPrimitivesV1AssignmentAppPublic (141) */
+  export interface PolkadotPrimitivesV1AssignmentAppPublic extends SpCoreSr25519Public {}
+
+  /** @name PolkadotRuntimeCommonClaimsEcdsaSignature (175) */
+  export interface PolkadotRuntimeCommonClaimsEcdsaSignature extends U8aFixed {}
+
+  /** @name PolkadotRuntimeCommonClaimsStatementKind (180) */
+  export interface PolkadotRuntimeCommonClaimsStatementKind extends Enum {
+    readonly isRegular: boolean;
+    readonly isSaft: boolean;
+  }
+
+  /** @name PolkadotRuntimeNposCompactSolution16 (233) */
+  export interface PolkadotRuntimeNposCompactSolution16 extends Struct {
+    readonly votes1: Vec<ITuple<[Compact<u32>, Compact<u16>]>>;
+    readonly votes2: Vec<ITuple<[Compact<u32>, ITuple<[Compact<u16>, Compact<PerU16>]>, Compact<u16>]>>;
+    readonly votes3: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+    readonly votes4: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+    readonly votes5: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+    readonly votes6: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+    readonly votes7: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+    readonly votes8: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+    readonly votes9: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+    readonly votes10: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+    readonly votes11: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+    readonly votes12: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+    readonly votes13: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+    readonly votes14: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+    readonly votes15: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+    readonly votes16: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
+  }
+
+  /** @name PolkadotRuntimeOriginCaller (290) */
+  export interface PolkadotRuntimeOriginCaller extends Enum {
+    readonly isSystem: boolean;
+    readonly asSystem: FrameSystemRawOrigin;
+    readonly isUnused1: boolean;
+    readonly isUnused2: boolean;
+    readonly isVoid: boolean;
+    readonly isUnused4: boolean;
+    readonly isUnused5: boolean;
+    readonly isUnused6: boolean;
+    readonly isUnused7: boolean;
+    readonly isUnused8: boolean;
+    readonly isUnused9: boolean;
+    readonly isUnused10: boolean;
+    readonly isUnused11: boolean;
+    readonly isUnused12: boolean;
+    readonly isUnused13: boolean;
+    readonly isUnused14: boolean;
+    readonly isCouncil: boolean;
+    readonly asCouncil: PalletCollectiveRawOrigin;
+    readonly isTechnicalCommittee: boolean;
+    readonly asTechnicalCommittee: PalletCollectiveRawOrigin;
+  }
+
+  /** @name PolkadotRuntimeCommonClaimsPrevalidateAttests (441) */
+  export type PolkadotRuntimeCommonClaimsPrevalidateAttests = Null;
+
+  /** @name PolkadotRuntimeRuntime (442) */
+  export type PolkadotRuntimeRuntime = Null;
+
+}

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

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/types authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import './types-substrate';
+import './types-polkadot';
+import './types-kusama';

packages/types/src/augment/registry.ts

@@ -29,14 +29,14 @@ import type { AnySignature, EcdsaSignature, Ed25519Signature, Era, Extrinsic, Ex
 import type { AssetOptions, Owner, PermissionLatest, PermissionVersions, PermissionsV1 } from '@polkadot/types/interfaces/genericAsset';
 import type { ActiveGilt, ActiveGiltsTotal, ActiveIndex, GiltBid } from '@polkadot/types/interfaces/gilt';
 import type { AuthorityIndex, AuthorityList, AuthoritySet, AuthoritySetChange, AuthoritySetChanges, AuthorityWeight, DelayKind, DelayKindBest, EncodedFinalityProofs, ForkTreePendingChange, ForkTreePendingChangeNode, GrandpaCommit, GrandpaEquivocation, GrandpaEquivocationProof, GrandpaEquivocationValue, GrandpaJustification, GrandpaPrecommit, GrandpaPrevote, GrandpaSignedPrecommit, JustificationNotification, KeyOwnerProof, NextAuthority, PendingChange, PendingPause, PendingResume, Precommits, Prevotes, ReportedRoundStates, RoundState, SetId, StoredPendingChange, StoredState } from '@polkadot/types/interfaces/grandpa';
-import type { IdentityFields, IdentityInfo, IdentityInfoAdditional, IdentityJudgement, RegistrarIndex, RegistrarInfo, Registration, RegistrationJudgement } from '@polkadot/types/interfaces/identity';
+import type { IdentityFields, IdentityInfo, IdentityInfoAdditional, IdentityInfoTo198, IdentityJudgement, RegistrarIndex, RegistrarInfo, Registration, RegistrationJudgement, RegistrationTo198 } from '@polkadot/types/interfaces/identity';
 import type { AuthIndex, AuthoritySignature, Heartbeat, HeartbeatTo244, OpaqueMultiaddr, OpaqueNetworkState, OpaquePeerId } from '@polkadot/types/interfaces/imOnline';
 import type { CallIndex, LotteryConfig } from '@polkadot/types/interfaces/lottery';
-import type { ErrorMetadataLatest, ErrorMetadataV10, ErrorMetadataV11, ErrorMetadataV12, ErrorMetadataV13, ErrorMetadataV14, ErrorMetadataV9, EventMetadataLatest, EventMetadataV10, EventMetadataV11, EventMetadataV12, EventMetadataV13, EventMetadataV14, EventMetadataV9, ExtrinsicMetadataLatest, ExtrinsicMetadataV11, ExtrinsicMetadataV12, ExtrinsicMetadataV13, ExtrinsicMetadataV14, FunctionArgumentMetadataLatest, FunctionArgumentMetadataV10, FunctionArgumentMetadataV11, FunctionArgumentMetadataV12, FunctionArgumentMetadataV13, FunctionArgumentMetadataV14, FunctionArgumentMetadataV9, FunctionMetadataLatest, FunctionMetadataV10, FunctionMetadataV11, FunctionMetadataV12, FunctionMetadataV13, FunctionMetadataV14, FunctionMetadataV9, MetadataAll, MetadataLatest, MetadataV10, MetadataV11, MetadataV12, MetadataV13, MetadataV14, MetadataV9, ModuleConstantMetadataLatest, ModuleConstantMetadataV10, ModuleConstantMetadataV11, ModuleConstantMetadataV12, ModuleConstantMetadataV13, ModuleConstantMetadataV9, ModuleMetadataLatest, ModuleMetadataV10, ModuleMetadataV11, ModuleMetadataV12, ModuleMetadataV13, ModuleMetadataV9, PalletCallMetadataLatest, PalletCallMetadataV14, PalletConstantMetadataLatest, PalletConstantMetadataV14, PalletErrorMetadataLatest, PalletErrorMetadataV14, PalletEventMetadataLatest, PalletEventMetadataV14, PalletMetadataLatest, PalletMetadataV14, PalletStorageMetadataLatest, PalletStorageMetadataV14, PortableRegistry, PortableType, SignedExtensionMetadataLatest, SignedExtensionMetadataV14, StorageEntryMetadataLatest, StorageEntryMetadataV10, StorageEntryMetadataV11, StorageEntryMetadataV12, StorageEntryMetadataV13, StorageEntryMetadataV14, StorageEntryMetadataV9, StorageEntryModifierLatest, StorageEntryModifierV10, StorageEntryModifierV11, StorageEntryModifierV12, StorageEntryModifierV13, StorageEntryModifierV14, StorageEntryModifierV9, StorageEntryTypeLatest, StorageEntryTypeV10, StorageEntryTypeV11, StorageEntryTypeV12, StorageEntryTypeV13, StorageEntryTypeV14, StorageEntryTypeV9, StorageHasher, StorageHasherV10, StorageHasherV11, StorageHasherV12, StorageHasherV13, StorageHasherV14, StorageHasherV9, StorageMetadataLatest, StorageMetadataV10, StorageMetadataV11, StorageMetadataV12, StorageMetadataV13, StorageMetadataV9 } from '@polkadot/types/interfaces/metadata';
+import type { ErrorMetadataLatest, ErrorMetadataV10, ErrorMetadataV11, ErrorMetadataV12, ErrorMetadataV13, ErrorMetadataV14, ErrorMetadataV9, EventMetadataLatest, EventMetadataV10, EventMetadataV11, EventMetadataV12, EventMetadataV13, EventMetadataV14, EventMetadataV9, ExtrinsicMetadataLatest, ExtrinsicMetadataV11, ExtrinsicMetadataV12, ExtrinsicMetadataV13, ExtrinsicMetadataV14, FunctionArgumentMetadataLatest, FunctionArgumentMetadataV10, FunctionArgumentMetadataV11, FunctionArgumentMetadataV12, FunctionArgumentMetadataV13, FunctionArgumentMetadataV14, FunctionArgumentMetadataV9, FunctionMetadataLatest, FunctionMetadataV10, FunctionMetadataV11, FunctionMetadataV12, FunctionMetadataV13, FunctionMetadataV14, FunctionMetadataV9, MetadataAll, MetadataLatest, MetadataV10, MetadataV11, MetadataV12, MetadataV13, MetadataV14, MetadataV9, ModuleConstantMetadataV10, ModuleConstantMetadataV11, ModuleConstantMetadataV12, ModuleConstantMetadataV13, ModuleConstantMetadataV9, ModuleMetadataV10, ModuleMetadataV11, ModuleMetadataV12, ModuleMetadataV13, ModuleMetadataV9, PalletCallMetadataLatest, PalletCallMetadataV14, PalletConstantMetadataLatest, PalletConstantMetadataV14, PalletErrorMetadataLatest, PalletErrorMetadataV14, PalletEventMetadataLatest, PalletEventMetadataV14, PalletMetadataLatest, PalletMetadataV14, PalletStorageMetadataLatest, PalletStorageMetadataV14, PortableRegistry, PortableType, SignedExtensionMetadataLatest, SignedExtensionMetadataV14, StorageEntryMetadataLatest, StorageEntryMetadataV10, StorageEntryMetadataV11, StorageEntryMetadataV12, StorageEntryMetadataV13, StorageEntryMetadataV14, StorageEntryMetadataV9, StorageEntryModifierLatest, StorageEntryModifierV10, StorageEntryModifierV11, StorageEntryModifierV12, StorageEntryModifierV13, StorageEntryModifierV14, StorageEntryModifierV9, StorageEntryTypeLatest, StorageEntryTypeV10, StorageEntryTypeV11, StorageEntryTypeV12, StorageEntryTypeV13, StorageEntryTypeV14, StorageEntryTypeV9, StorageHasher, StorageHasherV10, StorageHasherV11, StorageHasherV12, StorageHasherV13, StorageHasherV14, StorageHasherV9, StorageMetadataV10, StorageMetadataV11, StorageMetadataV12, StorageMetadataV13, StorageMetadataV9 } from '@polkadot/types/interfaces/metadata';
 import type { MmrLeafProof } from '@polkadot/types/interfaces/mmr';
 import type { StorageKind } from '@polkadot/types/interfaces/offchain';
 import type { DeferredOffenceOf, Kind, OffenceDetails, Offender, OpaqueTimeSlot, ReportIdOf, Reporter } from '@polkadot/types/interfaces/offences';
-import type { AbridgedCandidateReceipt, AbridgedHostConfiguration, AbridgedHrmpChannel, AssignmentId, AssignmentKind, AttestedCandidate, AuctionIndex, AuthorityDiscoveryId, AvailabilityBitfield, AvailabilityBitfieldRecord, BackedCandidate, Bidder, BufferedSessionChange, CandidateCommitments, CandidateDescriptor, CandidateHash, CandidateInfo, CandidatePendingAvailability, CandidateReceipt, CollatorId, CollatorSignature, CommittedCandidateReceipt, CoreAssignment, CoreIndex, CoreOccupied, DisputeStatement, DisputeStatementSet, DoubleVoteReport, DownwardMessage, ExplicitDisputeStatement, GlobalValidationData, GlobalValidationSchedule, GroupIndex, HeadData, HostConfiguration, HrmpChannel, HrmpChannelId, HrmpOpenChannelRequest, InboundDownwardMessage, InboundHrmpMessage, InboundHrmpMessages, IncomingParachain, IncomingParachainDeploy, IncomingParachainFixed, InvalidDisputeStatementKind, LeasePeriod, LeasePeriodOf, LocalValidationData, MessageIngestionType, MessageQueueChain, MessagingStateSnapshot, MessagingStateSnapshotEgressEntry, MultiDisputeStatementSet, NewBidder, OutboundHrmpMessage, ParaGenesisArgs, ParaId, ParaInfo, ParaLifecycle, ParaPastCodeMeta, ParaScheduling, ParaValidatorIndex, ParachainDispatchOrigin, ParachainInherentData, ParachainProposal, ParachainsInherentData, ParathreadClaim, ParathreadClaimQueue, ParathreadEntry, PersistedValidationData, QueuedParathread, RegisteredParachainInfo, RelayBlockNumber, RelayChainBlockNumber, RelayChainHash, RelayHash, Remark, ReplacementTimes, Retriable, Scheduling, ServiceQuality, SessionInfo, SessionInfoValidatorGroup, SignedAvailabilityBitfield, SignedAvailabilityBitfields, SigningContext, SlotRange, Statement, SubId, SystemInherentData, TransientValidationData, UpgradeGoAhead, UpgradeRestriction, UpwardMessage, ValidDisputeStatementKind, ValidationCode, ValidationCodeHash, ValidationData, ValidationDataType, ValidationFunctionParams, ValidatorSignature, ValidityAttestation, VecInboundHrmpMessage, WinnersData, WinnersDataTuple, WinningData, WinningDataEntry } from '@polkadot/types/interfaces/parachains';
+import type { AbridgedCandidateReceipt, AbridgedHostConfiguration, AbridgedHrmpChannel, AssignmentId, AssignmentKind, AttestedCandidate, AuctionIndex, AuthorityDiscoveryId, AvailabilityBitfield, AvailabilityBitfieldRecord, BackedCandidate, Bidder, BufferedSessionChange, CandidateCommitments, CandidateDescriptor, CandidateHash, CandidateInfo, CandidatePendingAvailability, CandidateReceipt, CollatorId, CollatorSignature, CommittedCandidateReceipt, CoreAssignment, CoreIndex, CoreOccupied, DisputeLocation, DisputeResult, DisputeState, DisputeStatement, DisputeStatementSet, DoubleVoteReport, DownwardMessage, ExplicitDisputeStatement, GlobalValidationData, GlobalValidationSchedule, GroupIndex, HeadData, HostConfiguration, HrmpChannel, HrmpChannelId, HrmpOpenChannelRequest, InboundDownwardMessage, InboundHrmpMessage, InboundHrmpMessages, IncomingParachain, IncomingParachainDeploy, IncomingParachainFixed, InvalidDisputeStatementKind, LeasePeriod, LeasePeriodOf, LocalValidationData, MessageIngestionType, MessageQueueChain, MessagingStateSnapshot, MessagingStateSnapshotEgressEntry, MultiDisputeStatementSet, NewBidder, OutboundHrmpMessage, ParaGenesisArgs, ParaId, ParaInfo, ParaLifecycle, ParaPastCodeMeta, ParaScheduling, ParaValidatorIndex, ParachainDispatchOrigin, ParachainInherentData, ParachainProposal, ParachainsInherentData, ParathreadClaim, ParathreadClaimQueue, ParathreadEntry, PersistedValidationData, QueuedParathread, RegisteredParachainInfo, RelayBlockNumber, RelayChainBlockNumber, RelayChainHash, RelayHash, Remark, ReplacementTimes, Retriable, Scheduling, ServiceQuality, SessionInfo, SessionInfoValidatorGroup, SignedAvailabilityBitfield, SignedAvailabilityBitfields, SigningContext, SlotRange, Statement, SubId, SystemInherentData, TransientValidationData, UpgradeGoAhead, UpgradeRestriction, UpwardMessage, ValidDisputeStatementKind, ValidationCode, ValidationCodeHash, ValidationData, ValidationDataType, ValidationFunctionParams, ValidatorSignature, ValidityAttestation, VecInboundHrmpMessage, WinnersData, WinnersDataTuple, WinningData, WinningDataEntry } from '@polkadot/types/interfaces/parachains';
 import type { FeeDetails, InclusionFee, RuntimeDispatchInfo } from '@polkadot/types/interfaces/payment';
 import type { Approvals } from '@polkadot/types/interfaces/poll';
 import type { ProxyAnnouncement, ProxyDefinition, ProxyType } from '@polkadot/types/interfaces/proxy';
@@ -274,6 +274,9 @@ declare module '@polkadot/types/types/registry' {
     DispatchResult: DispatchResult;
     DispatchResultOf: DispatchResultOf;
     DispatchResultTo198: DispatchResultTo198;
+    DisputeLocation: DisputeLocation;
+    DisputeResult: DisputeResult;
+    DisputeState: DisputeState;
     DisputeStatement: DisputeStatement;
     DisputeStatementSet: DisputeStatementSet;
     DoubleEncodedCall: DoubleEncodedCall;
@@ -453,6 +456,7 @@ declare module '@polkadot/types/types/registry' {
     IdentityFields: IdentityFields;
     IdentityInfo: IdentityInfo;
     IdentityInfoAdditional: IdentityInfoAdditional;
+    IdentityInfoTo198: IdentityInfoTo198;
     IdentityJudgement: IdentityJudgement;
     ImmortalEra: ImmortalEra;
     ImportedAux: ImportedAux;
@@ -536,14 +540,12 @@ declare module '@polkadot/types/types/registry' {
     MetadataV9: MetadataV9;
     MmrLeafProof: MmrLeafProof;
     MmrRootHash: MmrRootHash;
-    ModuleConstantMetadataLatest: ModuleConstantMetadataLatest;
     ModuleConstantMetadataV10: ModuleConstantMetadataV10;
     ModuleConstantMetadataV11: ModuleConstantMetadataV11;
     ModuleConstantMetadataV12: ModuleConstantMetadataV12;
     ModuleConstantMetadataV13: ModuleConstantMetadataV13;
     ModuleConstantMetadataV9: ModuleConstantMetadataV9;
     ModuleId: ModuleId;
-    ModuleMetadataLatest: ModuleMetadataLatest;
     ModuleMetadataV10: ModuleMetadataV10;
     ModuleMetadataV11: ModuleMetadataV11;
     ModuleMetadataV12: ModuleMetadataV12;
@@ -728,6 +730,7 @@ declare module '@polkadot/types/types/registry' {
     RegistrarInfo: RegistrarInfo;
     Registration: Registration;
     RegistrationJudgement: RegistrationJudgement;
+    RegistrationTo198: RegistrationTo198;
     RelayBlockNumber: RelayBlockNumber;
     RelayChainBlockNumber: RelayChainBlockNumber;
     RelayChainHash: RelayChainHash;
@@ -889,7 +892,6 @@ declare module '@polkadot/types/types/registry' {
     StorageHasherV9: StorageHasherV9;
     StorageKey: StorageKey;
     StorageKind: StorageKind;
-    StorageMetadataLatest: StorageMetadataLatest;
     StorageMetadataV10: StorageMetadataV10;
     StorageMetadataV11: StorageMetadataV11;
     StorageMetadataV12: StorageMetadataV12;

packages/types/src/codec/BTreeSet.ts

@@ -20,10 +20,10 @@ function decodeSetFromU8a<V extends Codec> (registry: Registry, ValClass: Constr
     types.push(ValClass);
   }
 
-  const values = decodeU8a(registry, u8a.subarray(offset), types);
+  const values = decodeU8a<V>(registry, u8a.subarray(offset), types);
 
   for (let i = 0; i < values.length; i++) {
-    output.add(values[i] as V);
+    output.add(values[i]);
   }
 
   return output;

packages/types/src/codec/Struct.ts

@@ -24,22 +24,23 @@ function decodeStructFromObject <T> (registry: Registry, Types: ConstructorDef,
     const jsonKey = (jsonMap.get(key as any) && !value[key])
       ? jsonMap.get(key as any)
       : key;
+    const Type = Types[key];
 
     try {
       if (Array.isArray(value)) {
         // TS2322: Type 'Codec' is not assignable to type 'T[keyof S]'.
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
-        (raw as any)[key] = value[index] instanceof Types[key]
+        (raw as any)[key] = value[index] instanceof Type
           ? value[index]
-          : new Types[key](registry, value[index]);
+          : new Type(registry, value[index]);
       } else if (value instanceof Map) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const mapped = value.get(jsonKey);
 
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        (raw as any)[key] = mapped instanceof Types[key]
+        (raw as any)[key] = mapped instanceof Type
           ? mapped
-          : new Types[key](registry, mapped);
+          : new Type(registry, mapped);
       } else if (isObject(value)) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         let assign = value[jsonKey as string];
@@ -59,17 +60,17 @@ function decodeStructFromObject <T> (registry: Registry, Types: ConstructorDef,
         }
 
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
-        (raw as any)[key] = assign instanceof Types[key]
+        (raw as any)[key] = assign instanceof Type
           ? assign
-          : new Types[key](registry, assign);
+          : new Type(registry, assign);
       } else {
         throw new Error(`Cannot decode value ${stringify(value)} (typeof ${typeof value}), expected an input object with known keys`);
       }
     } catch (error) {
-      let type = Types[key].name;
+      let type = Type.name;
 
       try {
-        type = new Types[key](registry).toRawType();
+        type = new Type(registry).toRawType();
       } catch (error) {
         // ignore
       }

packages/types/src/codec/Tuple.ts

@@ -86,7 +86,7 @@ export class Tuple extends AbstractArray<Codec> implements ITuple<Codec[]> {
    */
   public get Types (): string[] {
     return Array.isArray(this._Types)
-      ? this._Types.map((Type): string => new Type(this.registry).toRawType())
+      ? this._Types.map((Type) => new Type(this.registry).toRawType())
       : Object.keys(this._Types);
   }
 

packages/types/src/codec/Vec.ts

@@ -52,7 +52,7 @@ export class Vec<T extends Codec> extends AbstractArray<T> {
 
     assert(length.lten(MAX_LENGTH), () => `Vec length ${length.toString()} exceeds ${MAX_LENGTH}`);
 
-    return decodeU8a(registry, u8a.subarray(offset), new Array(length.toNumber()).fill(Type)) as T[];
+    return decodeU8a(registry, u8a.subarray(offset), new Array(length.toNumber()).fill(Type));
   }
 
   public static with<O extends Codec> (Type: Constructor<O> | string): Constructor<Vec<O>> {

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

@@ -10,13 +10,14 @@ import { u8aToHex } from '@polkadot/util';
  * types, and return an array of decoded values.
  *
  * @param u8a - The u8a to decode.
+ * @param result - The result array (will be returned with values pushed)
  * @param types - The array of Constructor to decode the U8a against.
  */
-export function decodeU8a (registry: Registry, u8a: Uint8Array, _types: Constructor[] | { [index: string]: Constructor }, _keys?: string[]): Codec[] {
-  const [types, keys]: [Constructor<Codec>[], string[]] = Array.isArray(_types)
+export function decodeU8a <T extends Codec = Codec> (registry: Registry, u8a: Uint8Array, _types: Constructor[] | { [index: string]: Constructor }, _keys?: string[]): T[] {
+  const result: T[] = [];
+  const [types, keys]: [Constructor[], string[]] = Array.isArray(_types)
     ? [_types, _keys || []]
     : [Object.values(_types), Object.keys(_types)];
-  const result: Codec[] = [];
   let offset = 0;
 
   for (let i = 0; i < types.length; i++) {
@@ -25,7 +26,7 @@ export function decodeU8a (registry: Registry, u8a: Uint8Array, _types: Construc
     try {
       const value = new Type(registry, u8a.subarray(offset));
 
-      result.push(value);
+      result.push(value as T);
       offset += value.encodedLength;
     } catch (error) {
       let rawType: string;