[CI Skip] release/stable 8.0.2

skip-checks: true

.123trigger

@@ -48,3 +48,7 @@
 6.10.3
 
 7.0.2
+
+7.14.2
+7.14.3
+8.0.2

.gitignore

@@ -1,5 +1,7 @@
 _book/
 build/
+build-cjs/
+build-esm/
 build-docs/
 coverage/
 docs/.vuepress/dist/

CHANGELOG.md

@@ -1,5 +1,80 @@
 # CHANGELOG
 
+## 8.0.2 Apr 11, 2022
+
+Changes:
+
+- Detect typegen template location for commonjs execution
+
+
+## 8.0.1 Apr 10, 2022
+
+- **Breaking change** In this major version the commonjs outputs are moved to a sub-folder. Since the export map and main field in package.json does reflect this change, there should be no usage changes. However the packages here will all need to be on the same version for internal linkage.
+
+Contributed:
+
+- Improve `rpc-provider` README (Thanks to https://github.com/josepot)
+- Add handling for `Vec<[<Type>;<length>]>` in typegen (Thanks to https://github.com/zannis)
+
+Changes:
+
+- Add support for `apiAt.tx(...)` to construct at a specific point
+- Add basic `api.derive.bagsList.*` support
+- Return sorted names for `api.registry.lookup.names`
+- Optimize JSONRPC requests/response handling
+- Output commonjs files under the `cjs/**` root
+- Update to latest Substrate, Kusama & Polkadot static metadata
+- Add latest Polkadot 9180 upgrade block
+- Update to `@polkadot/util` 9.0.1
+
+
+## 7.15.1 Apr 3, 2022
+
+Contributed:
+
+- Export `WellKnownChain` for `substrate-connect` (Thanks to https://github.com/josepot)
+- Add support for `{entries, keys}Paged` in `.at` (Thanks to https://github.com/xlc)
+- Align `WeightsPerClass` interface on `maxExtrinsic` (Thanks to https://github.com/HackFisher)
+
+Changes:
+
+- Cater for `DispatchError` with `error` as `[u8; 4]`
+- Add in-flight cache for parallel same-version metadata queries
+- Cater for lazy `@polkadot/util-crypto` init (adjustment for React Native)
+- Update to latest Substrate, Kusama & Polkadot static metadata
+- Update latest Westend & Kusama (up to 9180) upgrade blocks
+
+
+## 7.14.3 Mar 28, 2022
+
+Changes:
+
+- Ensure `BitVec` with MSB does not fail (used in Polkadot `DeliveredMessages`)
+
+
+## 7.14.2 Mar 28, 2022
+
+Changes:
+
+- Don't export `ScProvider` top-level in `@polkadot/rpc-provider`
+
+
+## 7.14.1 Mar 27, 2022
+
+Contributed:
+
+- Add `ScProvider` for `@substrate/substrate-connect` (Thanks to https://github.com/josepot)
+- Add support for `BTree{Map, Set}` in typegen (Thanks to https://github.com/CertainLach)
+
+Changes:
+
+- Only explicitly support LSB on `BitVec` types
+- Change `toHuman()` on `BitVec` to output default LSB
+- Add `bytes{Sent, Recv}` to provider stats
+- Clear connection timout on provider `disconnect()`
+- Add support for `dev_getBlockStats` RPC
+
+
 ## 7.13.1 Mar 19, 2022
 
 **Important** This contains an upgraded version of `@polkadot/wasm-crypto`. For users of asm.js, e.g. React Native, there are some additional upgrade instructions in the release notes for this version https://github.com/polkadot-js/wasm/releases/tag/v5.0.1

CONTRIBUTORS

@@ -1,10 +1,10 @@
-    2873	Jaco                          	7.13.1 (#4670)
+    2909	Jaco                          	Detect typegen template location for commonjs execution (#4738)
       83	Amaury Martiny                	StatementKind: Regular and Saft (#2303)
       37	Keith Ingram                  	Update contract types and rpc (#4541)
       35	Stefanie Doll                 	Updated child storage parameters (#1709)
       20	Luke Schoen                   	fix: Fixes TypeError: Cannot read property 'vesting' of undefined (#1970)
+      16	Xiliang Chen                  	implement entriesPaged and keysPages for query at (#4701)
       15	Jeremías Díaz                 	feat(types): add correct tuple type to storage key (#3054)
-      15	Xiliang Chen                  	add Authority origin (#3645)
       11	Ian He                        	HttpProvider support clone() (#3949)
       10	Axel Chalon                   	Make Enum/Tuple constructor use value directly if instance (#1954)
        5	Chevdor                       	Fix metadata package link (#3458)
@@ -22,6 +22,7 @@
        3	Ewa Kowalska                  	Handle no council for bounties proposals (#3062)
        3	hamidra                       	add support for n key entries for NMaps (#3886)
        3	Hamza Tokuchi                 	more typos (#2532)
+       3	Josep M Sobrepere             	docs: improve rpc-provider README (#4719)
        3	Julien Eluard                 	Fixed typos about module balances (#1402)
        3	KarishmaBothara               	Backward compatibility thing (#3511)
        3	Miguel Hervas                 	Adding RT4 Types (#3007)
@@ -30,6 +31,7 @@
        2	Alexander Krupenkin           	Add [u8; 33] type width for U8aFixed type (#2391)
        2	Branan Riley                  	Add proxy type for Centrifuge (#3940)
        2	Caio                          	Add `Range` and `RangeInclusive` types (#3791)
+       2	HackFisher                    	Update maxExtrinsic definition (#4703)
        2	Jakub Pánik                   	All heads subscription (#1899)
        2	James Lefrère                 	Add `.eq()` usage to docs and fix docs typos (#1405)
        2	Keith Yeung                   	Allow keyPrefix to accept an additional argument for double maps (#2230)
@@ -93,6 +95,8 @@
        1	Sergei Pepyakin               	INK! -> ink! (#1347)
        1	WoeOm                         	adapt Darwinia, Crab Network types (#3498)
        1	Xat_MassacrE                  	Fix packages/types/src/codec/utils/encodeTypes.ts encodeSubTypes bug (#1544)
+       1	Yaroslav Bolyukin             	Support BTreeMap/BTreeSet in typegen (#4682)
        1	yjh                           	fix MetadataVersioned.asV12 (#2983)
        1	Yuri                          	fixes #3693 Fix uniques return types (#3694)
+       1	Zannis Kalampoukis            	fix: typegen supports vectors of slices (#4720)
        1	Zeke Mostov                   	fix: Allow sudo for polkadot indexed proxy enum (#3286)

README.md

@@ -14,17 +14,3 @@ If you are an existing user, please be sure to track the [CHANGELOG](CHANGELOG.m
 ## tutorials
 
 Looking for tutorials to get started? Look at [examples](https://polkadot.js.org/docs/api/examples/promise/) for guides on how to use the API to make queries and submit transactions.
-
-## overview
-
-The API is split up into a number of internal packages -
-
-- [@polkadot/api](packages/api/) The API library, providing both Promise and RxJS Observable-based interfaces. This is the main user-facing entry point.
-- [@polkadot/api-derive](packages/api-derive/) Derived results that are injected into the API, allowing for combinations of various query results (only used internally and exposed on the Api instances via `api.derive.*`)
-- [@polkadot/metadata](packages/metadata/) Base extrinsic, storage and constant injectors for injection
-- [@polkadot/rpc-core](packages/rpc-core/) Wrapper around all [JSON-RPC methods](https://polkadot.js.org/docs/substrate/rpc) exposed by a Polkadot network client
-- [@polkadot/rpc-provider](packages/rpc-provider/) Providers for connecting to nodes, including WebSockets and Http
-
-Type definitions for interfaces as exposed by Polkadot & Substrate clients -
-
-- [@polkadot/types](packages/types/) Codecs for all Polkadot and Substrate primitives

jest.config.cjs

@@ -15,5 +15,8 @@ module.exports = {
     // eslint-disable-next-line sort-keys
     '@polkadot/types(.*)$': '<rootDir>/packages/types/src/$1'
   },
+  "transformIgnorePatterns": [
+    '/node_modules/(?!@polkadot|@substrate/connect|@babel/runtime/helpers/esm/)'
+  ],
   testTimeout: 30000
 };

package.json

@@ -11,7 +11,7 @@
   },
   "sideEffects": false,
   "type": "commonjs",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "workspaces": [
     "packages/*"
   ],
@@ -31,15 +31,15 @@
     "test:watch": "polkadot-dev-run-test --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.8",
+    "@babel/core": "^7.17.9",
     "@babel/register": "^7.17.7",
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/dev": "^0.65.97",
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/dev": "^0.66.1",
     "@polkadot/typegen": "workspace:packages/typegen",
     "@types/jest": "^27.4.1",
     "copyfiles": "^2.4.1"
   },
   "resolutions": {
-    "typescript": "^4.6.2"
+    "typescript": "^4.6.3"
   }
 }

packages/api-augment/package.json

@@ -20,18 +20,18 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/api-base": "7.13.1",
-    "@polkadot/rpc-augment": "7.13.1",
-    "@polkadot/types": "7.13.1",
-    "@polkadot/types-augment": "7.13.1",
-    "@polkadot/types-codec": "7.13.1",
-    "@polkadot/util": "^8.6.1"
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/api-base": "8.0.2",
+    "@polkadot/rpc-augment": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-augment": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/util": "^9.0.1"
   },
   "devDependencies": {
-    "@polkadot/types-support": "7.13.1"
+    "@polkadot/types-support": "8.0.2"
   }
 }

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

@@ -135,11 +135,6 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     bounties: {
-      /**
-       * Percentage of the curator fee that will be reserved upfront as deposit for bounty
-       * curator.
-       **/
-      bountyCuratorDeposit: Permill & AugmentedConst<ApiType>;
       /**
        * The amount held on deposit for placing a bounty proposal.
        **/
@@ -156,6 +151,21 @@ declare module '@polkadot/api-base/types/consts' {
        * Minimum value for a bounty.
        **/
       bountyValueMinimum: u128 & AugmentedConst<ApiType>;
+      /**
+       * Maximum amount of funds that should be placed in a deposit for making a proposal.
+       **/
+      curatorDepositMax: Option<u128> & AugmentedConst<ApiType>;
+      /**
+       * Minimum amount of funds that should be placed in a deposit for making a proposal.
+       **/
+      curatorDepositMin: Option<u128> & AugmentedConst<ApiType>;
+      /**
+       * The curator deposit is calculated as a percentage of the curator fee.
+       * 
+       * This deposit has optional upper and lower bounds with `CuratorDepositMax` and
+       * `CuratorDepositMin`.
+       **/
+      curatorDepositMultiplier: Permill & AugmentedConst<ApiType>;
       /**
        * The amount held on deposit per byte within the tip report reason or bounty description.
        **/
@@ -172,11 +182,6 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     childBounties: {
-      /**
-       * Percentage of child-bounty value to be reserved as curator deposit
-       * when curator fee is zero.
-       **/
-      childBountyCuratorDepositBase: Permill & AugmentedConst<ApiType>;
       /**
        * Minimum value for a child-bounty.
        **/
@@ -279,6 +284,16 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     electionProviderMultiPhase: {
+      /**
+       * The maximum number of electable targets to put in the snapshot.
+       **/
+      maxElectableTargets: u16 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of electing voters to put in the snapshot. At the moment, snapshots
+       * are only over a single block, but once multi-block elections are introduced they will
+       * take place over multiple blocks.
+       **/
+      maxElectingVoters: u32 & AugmentedConst<ApiType>;
       /**
        * Maximum length (bytes) that the mined solution should consume.
        * 
@@ -349,15 +364,6 @@ declare module '@polkadot/api-base/types/consts' {
        * Duration of the unsigned phase.
        **/
       unsignedPhase: u32 & AugmentedConst<ApiType>;
-      /**
-       * The maximum number of voters to put in the snapshot. At the moment, snapshots are only
-       * over a single block, but once multi-block elections are introduced they will take place
-       * over multiple blocks.
-       * 
-       * Also, note the data type: If the voters are represented by a `u32` in `type
-       * CompactSolution`, the same `u32` is used here to ensure bounds are respected.
-       **/
-      voterSnapshotPerBlock: u32 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -835,6 +841,10 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     transactionPayment: {
+      /**
+       * The polynomial that is applied in order to derive fee from length.
+       **/
+      lengthToFee: Vec<FrameSupportWeightsWeightToFeeCoefficient> & AugmentedConst<ApiType>;
       /**
        * A fee mulitplier for `Operational` extrinsics to compute "virtual tip" to boost their
        * `priority`
@@ -859,10 +869,6 @@ declare module '@polkadot/api-base/types/consts' {
        * transactions.
        **/
       operationalFeeMultiplier: u8 & AugmentedConst<ApiType>;
-      /**
-       * The fee to be paid for making a transaction; the per-byte portion.
-       **/
-      transactionByteFee: u128 & AugmentedConst<ApiType>;
       /**
        * The polynomial that is applied in order to derive fee from weight.
        **/

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

@@ -722,6 +722,10 @@ declare module '@polkadot/api-base/types/events' {
        * A proxy was executed correctly, with the given.
        **/
       ProxyExecuted: AugmentedEvent<ApiType, [Result<Null, SpRuntimeDispatchError>]>;
+      /**
+       * A proxy was removed.
+       **/
+      ProxyRemoved: AugmentedEvent<ApiType, [AccountId32, AccountId32, KusamaRuntimeProxyType, u32]>;
       /**
        * Generic event
        **/

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

@@ -4408,10 +4408,13 @@ declare module '@polkadot/api-base/types/submittable' {
        **/
       forceXcmVersion: AugmentedSubmittable<(location: XcmV1MultiLocation | { parents?: any; interior?: any } | string | Uint8Array, xcmVersion: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [XcmV1MultiLocation, u32]>;
       /**
-       * Transfer some assets from the local chain to the sovereign account of a destination chain and forward
-       * a notification XCM.
+       * Transfer some assets from the local chain to the sovereign account of a destination
+       * chain and forward a notification XCM.
        * 
-       * Fee payment on the destination side is made from the first asset listed in the `assets` vector.
+       * Fee payment on the destination side is made from the asset in the `assets` vector of
+       * index `fee_asset_item`, up to enough to pay for `weight_limit` of weight. If more weight
+       * is needed than `weight_limit`, then the operation will fail and the assets send may be
+       * at risk.
        * 
        * - `origin`: Must be capable of withdrawing the `assets` and executing XCM.
        * - `dest`: Destination context for the assets. Will typically be `X2(Parent, Parachain(..))` to send
@@ -4428,7 +4431,10 @@ declare module '@polkadot/api-base/types/submittable' {
       /**
        * Teleport some assets from the local chain to some destination chain.
        * 
-       * Fee payment on the destination side is made from the first asset listed in the `assets` vector.
+       * Fee payment on the destination side is made from the asset in the `assets` vector of
+       * index `fee_asset_item`, up to enough to pay for `weight_limit` of weight. If more weight
+       * is needed than `weight_limit`, then the operation will fail and the assets send may be
+       * at risk.
        * 
        * - `origin`: Must be capable of withdrawing the `assets` and executing XCM.
        * - `dest`: Destination context for the assets. Will typically be `X2(Parent, Parachain(..))` to send
@@ -4443,12 +4449,12 @@ declare module '@polkadot/api-base/types/submittable' {
        **/
       limitedTeleportAssets: AugmentedSubmittable<(dest: XcmVersionedMultiLocation | { V0: any } | { V1: any } | string | Uint8Array, beneficiary: XcmVersionedMultiLocation | { V0: any } | { V1: any } | string | Uint8Array, assets: XcmVersionedMultiAssets | { V0: any } | { V1: any } | string | Uint8Array, feeAssetItem: u32 | AnyNumber | Uint8Array, weightLimit: XcmV2WeightLimit | { Unlimited: any } | { Limited: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [XcmVersionedMultiLocation, XcmVersionedMultiLocation, XcmVersionedMultiAssets, u32, XcmV2WeightLimit]>;
       /**
-       * Transfer some assets from the local chain to the sovereign account of a destination chain and forward
-       * a notification XCM.
+       * Transfer some assets from the local chain to the sovereign account of a destination
+       * chain and forward a notification XCM.
        * 
-       * Fee payment on the destination side is made from the first asset listed in the `assets` vector and
-       * fee-weight is calculated locally and thus remote weights are assumed to be equal to
-       * local weights.
+       * Fee payment on the destination side is made from the asset in the `assets` vector of
+       * index `fee_asset_item`. The weight limit for fees is not provided and thus is unlimited,
+       * with all fees taken as needed from the asset.
        * 
        * - `origin`: Must be capable of withdrawing the `assets` and executing XCM.
        * - `dest`: Destination context for the assets. Will typically be `X2(Parent, Parachain(..))` to send
@@ -4465,9 +4471,9 @@ declare module '@polkadot/api-base/types/submittable' {
       /**
        * Teleport some assets from the local chain to some destination chain.
        * 
-       * Fee payment on the destination side is made from the first asset listed in the `assets` vector and
-       * fee-weight is calculated locally and thus remote weights are assumed to be equal to
-       * local weights.
+       * Fee payment on the destination side is made from the asset in the `assets` vector of
+       * index `fee_asset_item`. The weight limit for fees is not provided and thus is unlimited,
+       * with all fees taken as needed from the asset.
        * 
        * - `origin`: Must be capable of withdrawing the `assets` and executing XCM.
        * - `dest`: Destination context for the assets. Will typically be `X2(Parent, Parachain(..))` to send

packages/api-augment/src/packageInfo.ts

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

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

@@ -135,11 +135,6 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     bounties: {
-      /**
-       * Percentage of the curator fee that will be reserved upfront as deposit for bounty
-       * curator.
-       **/
-      bountyCuratorDeposit: Permill & AugmentedConst<ApiType>;
       /**
        * The amount held on deposit for placing a bounty proposal.
        **/
@@ -156,6 +151,21 @@ declare module '@polkadot/api-base/types/consts' {
        * Minimum value for a bounty.
        **/
       bountyValueMinimum: u128 & AugmentedConst<ApiType>;
+      /**
+       * Maximum amount of funds that should be placed in a deposit for making a proposal.
+       **/
+      curatorDepositMax: Option<u128> & AugmentedConst<ApiType>;
+      /**
+       * Minimum amount of funds that should be placed in a deposit for making a proposal.
+       **/
+      curatorDepositMin: Option<u128> & AugmentedConst<ApiType>;
+      /**
+       * The curator deposit is calculated as a percentage of the curator fee.
+       * 
+       * This deposit has optional upper and lower bounds with `CuratorDepositMax` and
+       * `CuratorDepositMin`.
+       **/
+      curatorDepositMultiplier: Permill & AugmentedConst<ApiType>;
       /**
        * The amount held on deposit per byte within the tip report reason or bounty description.
        **/
@@ -172,11 +182,6 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     childBounties: {
-      /**
-       * Percentage of child-bounty value to be reserved as curator deposit
-       * when curator fee is zero.
-       **/
-      childBountyCuratorDepositBase: Permill & AugmentedConst<ApiType>;
       /**
        * Minimum value for a child-bounty.
        **/
@@ -279,6 +284,16 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     electionProviderMultiPhase: {
+      /**
+       * The maximum number of electable targets to put in the snapshot.
+       **/
+      maxElectableTargets: u16 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of electing voters to put in the snapshot. At the moment, snapshots
+       * are only over a single block, but once multi-block elections are introduced they will
+       * take place over multiple blocks.
+       **/
+      maxElectingVoters: u32 & AugmentedConst<ApiType>;
       /**
        * Maximum length (bytes) that the mined solution should consume.
        * 
@@ -349,15 +364,6 @@ declare module '@polkadot/api-base/types/consts' {
        * Duration of the unsigned phase.
        **/
       unsignedPhase: u32 & AugmentedConst<ApiType>;
-      /**
-       * The maximum number of voters to put in the snapshot. At the moment, snapshots are only
-       * over a single block, but once multi-block elections are introduced they will take place
-       * over multiple blocks.
-       * 
-       * Also, note the data type: If the voters are represented by a `u32` in `type
-       * CompactSolution`, the same `u32` is used here to ensure bounds are respected.
-       **/
-      voterSnapshotPerBlock: u32 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -702,6 +708,10 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     transactionPayment: {
+      /**
+       * The polynomial that is applied in order to derive fee from length.
+       **/
+      lengthToFee: Vec<FrameSupportWeightsWeightToFeeCoefficient> & AugmentedConst<ApiType>;
       /**
        * A fee mulitplier for `Operational` extrinsics to compute "virtual tip" to boost their
        * `priority`
@@ -726,10 +736,6 @@ declare module '@polkadot/api-base/types/consts' {
        * transactions.
        **/
       operationalFeeMultiplier: u8 & AugmentedConst<ApiType>;
-      /**
-       * The fee to be paid for making a transaction; the per-byte portion.
-       **/
-      transactionByteFee: u128 & AugmentedConst<ApiType>;
       /**
        * The polynomial that is applied in order to derive fee from weight.
        **/

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

@@ -700,6 +700,10 @@ declare module '@polkadot/api-base/types/events' {
        * A proxy was executed correctly, with the given.
        **/
       ProxyExecuted: AugmentedEvent<ApiType, [Result<Null, SpRuntimeDispatchError>]>;
+      /**
+       * A proxy was removed.
+       **/
+      ProxyRemoved: AugmentedEvent<ApiType, [AccountId32, AccountId32, PolkadotRuntimeProxyType, u32]>;
       /**
        * Generic event
        **/

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

@@ -3826,10 +3826,13 @@ declare module '@polkadot/api-base/types/submittable' {
        **/
       forceXcmVersion: AugmentedSubmittable<(location: XcmV1MultiLocation | { parents?: any; interior?: any } | string | Uint8Array, xcmVersion: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [XcmV1MultiLocation, u32]>;
       /**
-       * Transfer some assets from the local chain to the sovereign account of a destination chain and forward
-       * a notification XCM.
+       * Transfer some assets from the local chain to the sovereign account of a destination
+       * chain and forward a notification XCM.
        * 
-       * Fee payment on the destination side is made from the first asset listed in the `assets` vector.
+       * Fee payment on the destination side is made from the asset in the `assets` vector of
+       * index `fee_asset_item`, up to enough to pay for `weight_limit` of weight. If more weight
+       * is needed than `weight_limit`, then the operation will fail and the assets send may be
+       * at risk.
        * 
        * - `origin`: Must be capable of withdrawing the `assets` and executing XCM.
        * - `dest`: Destination context for the assets. Will typically be `X2(Parent, Parachain(..))` to send
@@ -3846,7 +3849,10 @@ declare module '@polkadot/api-base/types/submittable' {
       /**
        * Teleport some assets from the local chain to some destination chain.
        * 
-       * Fee payment on the destination side is made from the first asset listed in the `assets` vector.
+       * Fee payment on the destination side is made from the asset in the `assets` vector of
+       * index `fee_asset_item`, up to enough to pay for `weight_limit` of weight. If more weight
+       * is needed than `weight_limit`, then the operation will fail and the assets send may be
+       * at risk.
        * 
        * - `origin`: Must be capable of withdrawing the `assets` and executing XCM.
        * - `dest`: Destination context for the assets. Will typically be `X2(Parent, Parachain(..))` to send
@@ -3861,12 +3867,12 @@ declare module '@polkadot/api-base/types/submittable' {
        **/
       limitedTeleportAssets: AugmentedSubmittable<(dest: XcmVersionedMultiLocation | { V0: any } | { V1: any } | string | Uint8Array, beneficiary: XcmVersionedMultiLocation | { V0: any } | { V1: any } | string | Uint8Array, assets: XcmVersionedMultiAssets | { V0: any } | { V1: any } | string | Uint8Array, feeAssetItem: u32 | AnyNumber | Uint8Array, weightLimit: XcmV2WeightLimit | { Unlimited: any } | { Limited: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [XcmVersionedMultiLocation, XcmVersionedMultiLocation, XcmVersionedMultiAssets, u32, XcmV2WeightLimit]>;
       /**
-       * Transfer some assets from the local chain to the sovereign account of a destination chain and forward
-       * a notification XCM.
+       * Transfer some assets from the local chain to the sovereign account of a destination
+       * chain and forward a notification XCM.
        * 
-       * Fee payment on the destination side is made from the first asset listed in the `assets` vector and
-       * fee-weight is calculated locally and thus remote weights are assumed to be equal to
-       * local weights.
+       * Fee payment on the destination side is made from the asset in the `assets` vector of
+       * index `fee_asset_item`. The weight limit for fees is not provided and thus is unlimited,
+       * with all fees taken as needed from the asset.
        * 
        * - `origin`: Must be capable of withdrawing the `assets` and executing XCM.
        * - `dest`: Destination context for the assets. Will typically be `X2(Parent, Parachain(..))` to send
@@ -3883,9 +3889,9 @@ declare module '@polkadot/api-base/types/submittable' {
       /**
        * Teleport some assets from the local chain to some destination chain.
        * 
-       * Fee payment on the destination side is made from the first asset listed in the `assets` vector and
-       * fee-weight is calculated locally and thus remote weights are assumed to be equal to
-       * local weights.
+       * Fee payment on the destination side is made from the asset in the `assets` vector of
+       * index `fee_asset_item`. The weight limit for fees is not provided and thus is unlimited,
+       * with all fees taken as needed from the asset.
        * 
        * - `origin`: Must be capable of withdrawing the `assets` and executing XCM.
        * - `dest`: Destination context for the assets. Will typically be `X2(Parent, Parachain(..))` to send

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

@@ -5,7 +5,7 @@ import type { ApiTypes } from '@polkadot/api-base/types';
 import type { Option, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { Codec } from '@polkadot/types-codec/types';
 import type { Perbill, Percent, Permill } from '@polkadot/types/interfaces/runtime';
-import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, PalletContractsSchedule, PalletStateTrieMigrationMigrationLimits, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
+import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, PalletContractsSchedule, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
 
 declare module '@polkadot/api-base/types/consts' {
   export interface AugmentedConsts<ApiType extends ApiTypes> {
@@ -149,11 +149,6 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     bounties: {
-      /**
-       * Percentage of the curator fee that will be reserved upfront as deposit for bounty
-       * curator.
-       **/
-      bountyCuratorDeposit: Permill & AugmentedConst<ApiType>;
       /**
        * The amount held on deposit for placing a bounty proposal.
        **/
@@ -170,6 +165,21 @@ declare module '@polkadot/api-base/types/consts' {
        * Minimum value for a bounty.
        **/
       bountyValueMinimum: u128 & AugmentedConst<ApiType>;
+      /**
+       * Maximum amount of funds that should be placed in a deposit for making a proposal.
+       **/
+      curatorDepositMax: Option<u128> & AugmentedConst<ApiType>;
+      /**
+       * Minimum amount of funds that should be placed in a deposit for making a proposal.
+       **/
+      curatorDepositMin: Option<u128> & AugmentedConst<ApiType>;
+      /**
+       * The curator deposit is calculated as a percentage of the curator fee.
+       * 
+       * This deposit has optional upper and lower bounds with `CuratorDepositMax` and
+       * `CuratorDepositMin`.
+       **/
+      curatorDepositMultiplier: Permill & AugmentedConst<ApiType>;
       /**
        * The amount held on deposit per byte within the tip report reason or bounty description.
        **/
@@ -186,11 +196,6 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     childBounties: {
-      /**
-       * Percentage of child-bounty value to be reserved as curator deposit
-       * when curator fee is zero.
-       **/
-      childBountyCuratorDepositBase: Permill & AugmentedConst<ApiType>;
       /**
        * Minimum value for a child-bounty.
        **/
@@ -340,6 +345,16 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     electionProviderMultiPhase: {
+      /**
+       * The maximum number of electable targets to put in the snapshot.
+       **/
+      maxElectableTargets: u16 & AugmentedConst<ApiType>;
+      /**
+       * The maximum number of electing voters to put in the snapshot. At the moment, snapshots
+       * are only over a single block, but once multi-block elections are introduced they will
+       * take place over multiple blocks.
+       **/
+      maxElectingVoters: u32 & AugmentedConst<ApiType>;
       /**
        * Maximum length (bytes) that the mined solution should consume.
        * 
@@ -410,15 +425,6 @@ declare module '@polkadot/api-base/types/consts' {
        * Duration of the unsigned phase.
        **/
       unsignedPhase: u32 & AugmentedConst<ApiType>;
-      /**
-       * The maximum number of voters to put in the snapshot. At the moment, snapshots are only
-       * over a single block, but once multi-block elections are introduced they will take place
-       * over multiple blocks.
-       * 
-       * Also, note the data type: If the voters are represented by a `u32` in `type
-       * CompactSolution`, the same `u32` is used here to ensure bounds are respected.
-       **/
-      voterSnapshotPerBlock: u32 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/
@@ -829,16 +835,6 @@ declare module '@polkadot/api-base/types/consts' {
        **/
       [key: string]: Codec;
     };
-    stateTrieMigration: {
-      /**
-       * The maximum limits that the signed migration could use.
-       **/
-      signedMigrationMaxLimits: PalletStateTrieMigrationMigrationLimits & AugmentedConst<ApiType>;
-      /**
-       * Generic const
-       **/
-      [key: string]: Codec;
-    };
     system: {
       /**
        * Maximum number of block number to block hash mappings to keep (oldest pruned first).
@@ -915,6 +911,10 @@ declare module '@polkadot/api-base/types/consts' {
       [key: string]: Codec;
     };
     transactionPayment: {
+      /**
+       * The polynomial that is applied in order to derive fee from length.
+       **/
+      lengthToFee: Vec<FrameSupportWeightsWeightToFeeCoefficient> & AugmentedConst<ApiType>;
       /**
        * A fee mulitplier for `Operational` extrinsics to compute "virtual tip" to boost their
        * `priority`
@@ -939,10 +939,6 @@ declare module '@polkadot/api-base/types/consts' {
        * transactions.
        **/
       operationalFeeMultiplier: u8 & AugmentedConst<ApiType>;
-      /**
-       * The fee to be paid for making a transaction; the per-byte portion.
-       **/
-      transactionByteFee: u128 & AugmentedConst<ApiType>;
       /**
        * The polynomial that is applied in order to derive fee from weight.
        **/

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

@@ -1451,6 +1451,10 @@ declare module '@polkadot/api-base/types/errors' {
        * submitter does not have enough funds.
        **/
       NotEnoughFunds: AugmentedError<ApiType>;
+      /**
+       * Signed migration is not allowed because the maximum limit is not set yet.
+       **/
+      SignedMigrationNotAllowed: AugmentedError<ApiType>;
       /**
        * upper bound of size is exceeded,
        **/

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

@@ -663,6 +663,10 @@ declare module '@polkadot/api-base/types/events' {
        * A proxy was executed correctly, with the given.
        **/
       ProxyExecuted: AugmentedEvent<ApiType, [Result<Null, SpRuntimeDispatchError>]>;
+      /**
+       * A proxy was removed.
+       **/
+      ProxyRemoved: AugmentedEvent<ApiType, [AccountId32, AccountId32, NodeRuntimeProxyType, u32]>;
       /**
        * Generic event
        **/

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

@@ -1282,6 +1282,12 @@ declare module '@polkadot/api-base/types/storage' {
        * forward by any of the means provided by this pallet.
        **/
       migrationProcess: AugmentedQuery<ApiType, () => Observable<PalletStateTrieMigrationMigrationTask>, []> & QueryableStorageEntry<ApiType, []>;
+      /**
+       * The maximum limits that the signed migration could use.
+       * 
+       * If not set, no signed submission is allowed.
+       **/
+      signedMigrationMaxLimits: AugmentedQuery<ApiType, () => Observable<Option<PalletStateTrieMigrationMigrationLimits>>, []> & QueryableStorageEntry<ApiType, []>;
       /**
        * Generic query
        **/

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

@@ -6,7 +6,7 @@ import type { Data } from '@polkadot/types';
 import type { Bytes, Compact, Option, U8aFixed, Vec, WrapperKeepOpaque, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';
 import type { AccountId32, Call, H256, MultiAddress, Perbill, Percent, Perquintill } from '@polkadot/types/interfaces/runtime';
-import type { FrameSupportScheduleDispatchTime, FrameSupportScheduleMaybeHashed, NodeRuntimeOriginCaller, NodeRuntimeProxyType, NodeRuntimeSessionKeys, PalletAssetsDestroyWitness, PalletConvictionVotingConviction, PalletConvictionVotingVoteAccountVote, PalletDemocracyConviction, PalletDemocracyVoteAccountVote, PalletElectionProviderMultiPhaseRawSolution, PalletElectionProviderMultiPhaseSolutionOrSnapshotSize, PalletElectionsPhragmenRenouncing, PalletIdentityBitFlags, PalletIdentityIdentityInfo, PalletIdentityJudgement, PalletImOnlineHeartbeat, PalletImOnlineSr25519AppSr25519Signature, PalletMultisigTimepoint, PalletSocietyJudgement, PalletStakingPalletConfigOpPerbill, PalletStakingPalletConfigOpPercent, PalletStakingPalletConfigOpU128, PalletStakingPalletConfigOpU32, PalletStakingRewardDestination, PalletStakingValidatorPrefs, PalletStateTrieMigrationMigrationLimits, PalletStateTrieMigrationMigrationTask, PalletUniquesDestroyWitness, PalletVestingVestingInfo, SpConsensusBabeDigestsNextConfigDescriptor, SpConsensusSlotsEquivocationProof, SpFinalityGrandpaEquivocationProof, SpNposElectionsElectionScore, SpNposElectionsSupport, SpRuntimeHeader, SpSessionMembershipProof, SpTransactionStorageProofTransactionStorageProof } from '@polkadot/types/lookup';
+import type { FrameSupportScheduleDispatchTime, FrameSupportScheduleMaybeHashed, NodeRuntimeOriginCaller, NodeRuntimeProxyType, NodeRuntimeSessionKeys, PalletAssetsDestroyWitness, PalletConvictionVotingConviction, PalletConvictionVotingVoteAccountVote, PalletDemocracyConviction, PalletDemocracyVoteAccountVote, PalletElectionProviderMultiPhaseRawSolution, PalletElectionProviderMultiPhaseSolutionOrSnapshotSize, PalletElectionsPhragmenRenouncing, PalletIdentityBitFlags, PalletIdentityIdentityInfo, PalletIdentityJudgement, PalletImOnlineHeartbeat, PalletImOnlineSr25519AppSr25519Signature, PalletMultisigTimepoint, PalletSocietyJudgement, PalletStakingPalletConfigOpPerbill, PalletStakingPalletConfigOpPercent, PalletStakingPalletConfigOpU128, PalletStakingPalletConfigOpU32, PalletStakingRewardDestination, PalletStakingValidatorPrefs, PalletStateTrieMigrationMigrationLimits, PalletStateTrieMigrationMigrationTask, PalletStateTrieMigrationProgress, PalletUniquesDestroyWitness, PalletVestingVestingInfo, SpConsensusBabeDigestsNextConfigDescriptor, SpConsensusSlotsEquivocationProof, SpFinalityGrandpaEquivocationProof, SpNposElectionsElectionScore, SpNposElectionsSupport, SpRuntimeHeader, SpSessionMembershipProof, SpTransactionStorageProofTransactionStorageProof } from '@polkadot/types/lookup';
 
 declare module '@polkadot/api-base/types/submittable' {
   export interface AugmentedSubmittables<ApiType extends ApiTypes> {
@@ -3795,6 +3795,18 @@ declare module '@polkadot/api-base/types/submittable' {
        * The dispatch origin of this call must be [`Config::ControlOrigin`].
        **/
       controlAutoMigration: AugmentedSubmittable<(maybeConfig: Option<PalletStateTrieMigrationMigrationLimits> | null | object | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [Option<PalletStateTrieMigrationMigrationLimits>]>;
+      /**
+       * Forcefully set the progress the running migration.
+       * 
+       * This is only useful in one case: the next key to migrate is too big to be migrated with
+       * a signed account, in a parachain context, and we simply want to skip it. A reasonable
+       * example of this would be `:code:`, which is both very expensive to migrate, and commonly
+       * used, so probably it is already migrated.
+       * 
+       * In case you mess things up, you can also, in principle, use this to reset the migration
+       * process.
+       **/
+      forceSetProgress: AugmentedSubmittable<(progressTop: PalletStateTrieMigrationProgress | { ToStart: any } | { LastKey: any } | { Complete: any } | string | Uint8Array, progressChild: PalletStateTrieMigrationProgress | { ToStart: any } | { LastKey: any } | { Complete: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [PalletStateTrieMigrationProgress, PalletStateTrieMigrationProgress]>;
       /**
        * Migrate the list of child keys by iterating each of them one by one.
        * 
@@ -3811,6 +3823,10 @@ declare module '@polkadot/api-base/types/submittable' {
        * should only be used in case any keys are leftover due to a bug.
        **/
       migrateCustomTop: AugmentedSubmittable<(keys: Vec<Bytes> | (Bytes | string | Uint8Array)[], witnessSize: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Vec<Bytes>, u32]>;
+      /**
+       * Set the maximum limit of the signed migration.
+       **/
+      setSignedMaxLimits: AugmentedSubmittable<(limits: PalletStateTrieMigrationMigrationLimits | { size_?: any; item?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [PalletStateTrieMigrationMigrationLimits]>;
       /**
        * Generic tx
        **/

packages/api-base/package.json

@@ -20,13 +20,13 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/rpc-core": "7.13.1",
-    "@polkadot/types": "7.13.1",
-    "@polkadot/util": "^8.6.1",
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/rpc-core": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/util": "^9.0.1",
     "rxjs": "^7.5.5"
   }
 }

packages/api-base/src/packageInfo.ts

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

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

@@ -74,12 +74,10 @@ export interface StorageEntryBase<ApiType extends ApiTypes, F extends AnyFunctio
    * @deprecated Use api.at(<blockHash>)
    */
   entriesAt: <T extends Codec | any = ReturnCodec<F>, K extends AnyTuple = A>(hash: Hash | Uint8Array | string, ...args: DropLast<Parameters<F>>) => PromiseOrObs<ApiType, [StorageKey<K>, T][]>;
-  entriesPaged: <T extends Codec | any = ReturnCodec<F>, K extends AnyTuple = A>(opts: PaginationOptions<Parameters<F>[0]>) => PromiseOrObs<ApiType, [StorageKey<K>, T][]>;
   /**
    * @deprecated Use api.at(<blockHash>)
    */
   keysAt: <K extends AnyTuple = A> (hash: Hash | Uint8Array | string, ...args: DropLast<Parameters<F>>) => PromiseOrObs<ApiType, StorageKey<K>[]>;
-  keysPaged: <K extends AnyTuple = A> (opts: PaginationOptions<Parameters<F>[0]>) => PromiseOrObs<ApiType, StorageKey<K>[]>;
   /**
    * @deprecated The underlying RPC this been marked unsafe and is generally not exposed
    */
@@ -95,11 +93,13 @@ export interface StorageEntryBase<ApiType extends ApiTypes, F extends AnyFunctio
 
 export interface StorageEntryBaseAt<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> {
   entries: <T extends Codec | any = ReturnCodec<F>, K extends AnyTuple = A>(...args: DropLast<Parameters<F>>) => PromiseOrObs<ApiType, [StorageKey<K>, T][]>;
+  entriesPaged: <T extends Codec | any = ReturnCodec<F>, K extends AnyTuple = A>(opts: PaginationOptions<Parameters<F>[0]>) => PromiseOrObs<ApiType, [StorageKey<K>, T][]>;
   hash: (...args: Parameters<F>) => PromiseOrObs<ApiType, Hash>;
   is: (key: IStorageKey<AnyTuple>) => key is IStorageKey<A>;
   key: (...args: Parameters<F>) => string;
   keyPrefix: (...args: DropLast<Parameters<F>>) => string;
   keys: <K extends AnyTuple = A> (...args: DropLast<Parameters<F>>) => PromiseOrObs<ApiType, StorageKey<K>[]>;
+  keysPaged: <K extends AnyTuple = A> (opts: PaginationOptions<Parameters<F>[0]>) => PromiseOrObs<ApiType, StorageKey<K>[]>;
   size: (...args: Parameters<F>) => PromiseOrObs<ApiType, u64>;
 }
 

packages/api-contract/package.json

@@ -20,20 +20,20 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/api": "7.13.1",
-    "@polkadot/types": "7.13.1",
-    "@polkadot/types-codec": "7.13.1",
-    "@polkadot/types-create": "7.13.1",
-    "@polkadot/util": "^8.6.1",
-    "@polkadot/util-crypto": "^8.6.1",
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/api": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/types-create": "8.0.2",
+    "@polkadot/util": "^9.0.1",
+    "@polkadot/util-crypto": "^9.0.1",
     "rxjs": "^7.5.5"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "7.13.1",
-    "@polkadot/keyring": "^8.6.1"
+    "@polkadot/api-augment": "8.0.2",
+    "@polkadot/keyring": "^9.0.1"
   }
 }

packages/api-contract/src/packageInfo.ts

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

packages/api-derive/package.json

@@ -20,25 +20,25 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/api": "7.13.1",
-    "@polkadot/api-augment": "7.13.1",
-    "@polkadot/api-base": "7.13.1",
-    "@polkadot/rpc-core": "7.13.1",
-    "@polkadot/types": "7.13.1",
-    "@polkadot/types-codec": "7.13.1",
-    "@polkadot/util": "^8.6.1",
-    "@polkadot/util-crypto": "^8.6.1",
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/api": "8.0.2",
+    "@polkadot/api-augment": "8.0.2",
+    "@polkadot/api-base": "8.0.2",
+    "@polkadot/rpc-core": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/util": "^9.0.1",
+    "@polkadot/util-crypto": "^9.0.1",
     "rxjs": "^7.5.5"
   },
   "devDependencies": {
-    "@polkadot/api": "7.13.1",
-    "@polkadot/api-augment": "7.13.1",
-    "@polkadot/rpc-augment": "7.13.1",
-    "@polkadot/rpc-provider": "7.13.1",
-    "@polkadot/types-support": "7.13.1"
+    "@polkadot/api": "8.0.2",
+    "@polkadot/api-augment": "8.0.2",
+    "@polkadot/rpc-augment": "8.0.2",
+    "@polkadot/rpc-provider": "8.0.2",
+    "@polkadot/types-support": "8.0.2"
   }
 }

packages/api-derive/src/bagsList/get.ts

@@ -0,0 +1,72 @@
+// Copyright 2017-2022 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { Option } from '@polkadot/types';
+import type { PalletBagsListListBag } from '@polkadot/types/lookup';
+import type { BN } from '@polkadot/util';
+import type { DeriveApi } from '../types';
+import type { Bag } from './types';
+
+import { map, of, switchMap } from 'rxjs';
+
+import { BN_ZERO, bnToBn } from '@polkadot/util';
+
+import { memo } from '../util';
+
+function orderBags (ids: BN[], bags: Option<PalletBagsListListBag>[]): Bag[] {
+  const sorted = ids
+    .map((id, index) => ({
+      bag: bags[index].unwrapOr(null),
+      id,
+      key: id.toString()
+    }))
+    .sort((a, b) => b.id.cmp(a.id))
+    .map((base, index): Bag => ({
+      ...base,
+      bagLower: BN_ZERO,
+      bagUpper: base.id,
+      index
+    }));
+  const max = sorted.length - 1;
+
+  return sorted.map((entry, index) =>
+    index === max
+      ? entry
+      // We could probably use a .add(BN_ONE) here
+      : { ...entry, bagLower: sorted[index + 1].bagUpper }
+  );
+}
+
+export function _getIds (instanceId: string, api: DeriveApi): (ids: (BN | number)[]) => Observable<Bag[]> {
+  return memo(instanceId, (_ids: (BN | number)[]): Observable<Bag[]> => {
+    const ids = _ids.map((id) => bnToBn(id));
+
+    return ids.length
+      ? api.query.listBags.multi<Option<PalletBagsListListBag>[]>(ids).pipe(
+        map((bags) => orderBags(ids, bags))
+      )
+      : of([]);
+  });
+}
+
+export function all (instanceId: string, api: DeriveApi): () => Observable<Bag[]> {
+  return memo(instanceId, (): Observable<Bag[]> =>
+    api.query.bagsList.listBags.keys().pipe(
+      switchMap((keys) =>
+        api.derive.bagsList._getIds(keys.map(({ args: [id] }) => id))
+      ),
+      map((list) =>
+        list.filter(({ bag }) => bag)
+      )
+    )
+  );
+}
+
+export function get (instanceId: string, api: DeriveApi): (id: BN | number) => Observable<Bag> {
+  return memo(instanceId, (id: BN | number): Observable<Bag> =>
+    api.derive.bagsList._getIds([bnToBn(id)]).pipe(
+      map((bags) => bags[0])
+    )
+  );
+}

packages/api-derive/src/bagsList/getExpanded.ts

@@ -0,0 +1,29 @@
+// Copyright 2017-2022 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { BN } from '@polkadot/util';
+import type { DeriveApi } from '../types';
+import type { Bag, BagExpanded } from './types';
+
+import { map, switchMap } from 'rxjs';
+
+import { memo } from '../util';
+
+export function expand (instanceId: string, api: DeriveApi): (bag: Bag) => Observable<BagExpanded> {
+  return memo(instanceId, (bag: Bag): Observable<BagExpanded> =>
+    api.derive.bagsList.listNodes(bag.bag).pipe(
+      map((nodes) => ({ ...bag, nodes }))
+    )
+  );
+}
+
+export function getExpanded (instanceId: string, api: DeriveApi): (id: BN | number) => Observable<BagExpanded> {
+  return memo(instanceId, (id: BN | number): Observable<BagExpanded> =>
+    api.derive.bagsList.get(id).pipe(
+      switchMap((bag) =>
+        api.derive.bagsList.expand(bag)
+      )
+    )
+  );
+}

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

@@ -0,0 +1,6 @@
+// Copyright 2017-2022 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export * from './get';
+export * from './getExpanded';
+export * from './listNodes';

packages/api-derive/src/bagsList/listNodes.ts

@@ -0,0 +1,41 @@
+// Copyright 2017-2022 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Observable } from 'rxjs';
+import type { Option } from '@polkadot/types';
+import type { AccountId32 } from '@polkadot/types/interfaces';
+import type { PalletBagsListListBag, PalletBagsListListNode } from '@polkadot/types/lookup';
+import type { DeriveApi } from '../types';
+
+import { BehaviorSubject, map, of, switchMap, tap, toArray } from 'rxjs';
+
+import { memo } from '../util';
+
+function traverseLinks (api: DeriveApi, head: AccountId32 | string): Observable<PalletBagsListListNode[]> {
+  const subject = new BehaviorSubject<AccountId32 | string>(head);
+
+  return subject.pipe(
+    switchMap((account) =>
+      api.query.bagsList.listNodes(account)
+    ),
+    tap((node: Option<PalletBagsListListNode>): void => {
+      setTimeout((): void => {
+        node.isSome && (node.value as PalletBagsListListNode).next.isSome
+          ? subject.next(node.unwrap().next.unwrap())
+          : subject.complete();
+      }, 0);
+    }),
+    toArray(), // toArray since we want to startSubject to be completed
+    map((all: Option<PalletBagsListListNode>[]) =>
+      all.map((o) => o.unwrap())
+    )
+  );
+}
+
+export function listNodes (instanceId: string, api: DeriveApi): (bag: PalletBagsListListBag | null) => Observable<PalletBagsListListNode[]> {
+  return memo(instanceId, (bag: PalletBagsListListBag | null): Observable<PalletBagsListListNode[]> =>
+    bag && bag.head.isSome
+      ? traverseLinks(api, bag.head.unwrap())
+      : of([])
+  );
+}

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

@@ -0,0 +1,18 @@
+// Copyright 2017-2022 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { PalletBagsListListBag, PalletBagsListListNode } from '@polkadot/types/lookup';
+import type { BN } from '@polkadot/util';
+
+export interface Bag {
+  bag: PalletBagsListListBag | null;
+  bagUpper: BN;
+  bagLower: BN;
+  id: BN;
+  index: number;
+  key: string;
+}
+
+export interface BagExpanded extends Bag {
+  nodes: PalletBagsListListNode[];
+}

packages/api-derive/src/bundle.ts

@@ -22,6 +22,10 @@ export { lazyDeriveSection };
 
 // Enable derive only if some of these modules are available
 const checks: Record<string, Avail> = {
+  bagsList: {
+    instances: ['bagsList'],
+    methods: []
+  },
   contracts: {
     instances: ['contracts'],
     methods: []

packages/api-derive/src/crowdloan/contributions.ts

@@ -60,17 +60,17 @@ function _eventTriggerAll (api: DeriveApi, paraId: string | number | BN): Observ
 }
 
 function _getKeysPaged (api: DeriveApi, childKey: string): Observable<StorageKey[]> {
-  const startSubject = new BehaviorSubject<string | undefined>(undefined);
+  const subject = new BehaviorSubject<string | undefined>(undefined);
 
-  return startSubject.pipe(
+  return subject.pipe(
     switchMap((startKey) =>
       api.rpc.childstate.getKeysPaged(childKey, '0x', PAGE_SIZE_K, startKey)
     ),
     tap((keys): void => {
       setTimeout((): void => {
         keys.length === PAGE_SIZE_K
-          ? startSubject.next(keys[PAGE_SIZE_K - 1].toHex())
-          : startSubject.complete();
+          ? subject.next(keys[PAGE_SIZE_K - 1].toHex())
+          : subject.complete();
       }, 0);
     }),
     toArray(), // toArray since we want to startSubject to be completed

packages/api-derive/src/derive.ts

@@ -4,6 +4,7 @@
 import type { AnyFunction } from '@polkadot/types/types';
 
 import * as accounts from './accounts';
+import * as bagsList from './bagsList';
 import * as balances from './balances';
 import * as bounties from './bounties';
 import * as chain from './chain';
@@ -22,7 +23,7 @@ import * as technicalCommittee from './technicalCommittee';
 import * as treasury from './treasury';
 import * as tx from './tx';
 
-export const derive = { accounts, balances, bounties, chain, contracts, council, crowdloan, democracy, elections, imOnline, membership, parachains, session, society, staking, technicalCommittee, treasury, tx };
+export const derive = { accounts, bagsList, balances, bounties, chain, contracts, council, crowdloan, democracy, elections, imOnline, membership, parachains, session, society, staking, technicalCommittee, treasury, tx };
 
 type DeriveSection<Section> = {
   [M in keyof Section]: Section[M] extends AnyFunction

packages/api-derive/src/packageInfo.ts

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

packages/api-derive/src/staking/util.ts

@@ -23,17 +23,17 @@ const ERA_CHUNK_SIZE = 14;
 function chunkEras <T> (eras: EraIndex[], fn: (eras: EraIndex[]) => Observable<T[]>): Observable<T[]> {
   const chunked = arrayChunk(eras, ERA_CHUNK_SIZE);
   let index = 0;
-  const startSubject = new BehaviorSubject<EraIndex[]>(chunked[index]);
+  const subject = new BehaviorSubject<EraIndex[]>(chunked[index]);
 
-  return startSubject.pipe(
+  return subject.pipe(
     switchMap(fn),
     tap((): void => {
       setTimeout((): void => {
         index++;
 
         index === chunked.length
-          ? startSubject.complete()
-          : startSubject.next(chunked[index]);
+          ? subject.complete()
+          : subject.next(chunked[index]);
       }, 0);
     }),
     toArray(),

packages/api-derive/src/types.ts

@@ -10,6 +10,7 @@ import type { ExactDerive } from './derive';
 
 export * from './accounts/types';
 export * from './balances/types';
+export * from './bagsList/types';
 export * from './council/types';
 export * from './crowdloan/types';
 export * from './democracy/types';

packages/api/package.json

@@ -20,29 +20,29 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/api-augment": "7.13.1",
-    "@polkadot/api-base": "7.13.1",
-    "@polkadot/api-derive": "7.13.1",
-    "@polkadot/keyring": "^8.6.1",
-    "@polkadot/rpc-augment": "7.13.1",
-    "@polkadot/rpc-core": "7.13.1",
-    "@polkadot/rpc-provider": "7.13.1",
-    "@polkadot/types": "7.13.1",
-    "@polkadot/types-augment": "7.13.1",
-    "@polkadot/types-codec": "7.13.1",
-    "@polkadot/types-create": "7.13.1",
-    "@polkadot/types-known": "7.13.1",
-    "@polkadot/util": "^8.6.1",
-    "@polkadot/util-crypto": "^8.6.1",
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/api-augment": "8.0.2",
+    "@polkadot/api-base": "8.0.2",
+    "@polkadot/api-derive": "8.0.2",
+    "@polkadot/keyring": "^9.0.1",
+    "@polkadot/rpc-augment": "8.0.2",
+    "@polkadot/rpc-core": "8.0.2",
+    "@polkadot/rpc-provider": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-augment": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/types-create": "8.0.2",
+    "@polkadot/types-known": "8.0.2",
+    "@polkadot/util": "^9.0.1",
+    "@polkadot/util-crypto": "^9.0.1",
     "eventemitter3": "^4.0.7",
     "rxjs": "^7.5.5"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "7.13.1",
-    "@polkadot/types-support": "7.13.1"
+    "@polkadot/api-augment": "8.0.2",
+    "@polkadot/types-support": "8.0.2"
   }
 }

packages/api/src/base/Decorate.ts

@@ -199,18 +199,23 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
     return this._rpcCore.provider.hasSubscriptions || !!this._rpcCore.state.queryStorageAt;
   }
 
+  protected _emptyDecorated (registry: Registry, blockHash?: Uint8Array): ApiDecoration<ApiType> {
+    return {
+      consts: {},
+      errors: {},
+      events: {},
+      query: {},
+      registry,
+      rx: {
+        query: {}
+      },
+      tx: createSubmittable(this._type, this._rx, this._decorateMethod, registry, blockHash)
+    } as ApiDecoration<ApiType>;
+  }
+
   protected _createDecorated (registry: VersionedRegistry<ApiType>, fromEmpty: boolean, decoratedApi: ApiDecoration<ApiType> | null, blockHash?: Uint8Array): FullDecoration<ApiType> {
     if (!decoratedApi) {
-      decoratedApi = {
-        consts: {},
-        errors: {},
-        events: {},
-        query: {},
-        registry: registry.registry,
-        rx: {
-          query: {}
-        }
-      } as ApiDecoration<ApiType>;
+      decoratedApi = this._emptyDecorated(registry.registry, blockHash);
     }
 
     if (fromEmpty || !registry.decoratedMeta) {
@@ -243,16 +248,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
   protected _injectMetadata (registry: VersionedRegistry<ApiType>, fromEmpty = false): void {
     // clear the decoration, we are redoing it here
     if (fromEmpty || !registry.decoratedApi) {
-      registry.decoratedApi = {
-        consts: {},
-        errors: {},
-        events: {},
-        query: {},
-        registry: registry.registry,
-        rx: {
-          query: {}
-        }
-      } as ApiDecoration<ApiType>;
+      registry.decoratedApi = this._emptyDecorated(registry.registry);
     }
 
     const { decoratedApi, decoratedMeta } = this._createDecorated(registry, fromEmpty, registry.decoratedApi);
@@ -543,7 +539,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
 
       decorated.entriesPaged = decorateMethod(
         memo(this.#instanceId, (opts: PaginationOptions): Observable<[StorageKey, Codec][]> =>
-          this._retrieveMapEntriesPaged(creator, opts)));
+          this._retrieveMapEntriesPaged(creator, undefined, opts)));
 
       decorated.keys = decorateMethod(
         memo(this.#instanceId, (...args: unknown[]): Observable<StorageKey[]> =>
@@ -556,7 +552,7 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
 
       decorated.keysPaged = decorateMethod(
         memo(this.#instanceId, (opts: PaginationOptions): Observable<StorageKey[]> =>
-          this._retrieveMapKeysPaged(creator, opts)));
+          this._retrieveMapKeysPaged(creator, undefined, opts)));
     }
 
     if (this.supportMulti && creator.meta.type.isMap) {
@@ -610,9 +606,17 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
         memo(this.#instanceId, (...args: unknown[]): Observable<[StorageKey, Codec][]> =>
           this._retrieveMapEntries(creator, blockHash, args)));
 
+      decorated.entriesPaged = decorateMethod(
+        memo(this.#instanceId, (opts: PaginationOptions): Observable<[StorageKey, Codec][]> =>
+          this._retrieveMapEntriesPaged(creator, blockHash, opts)));
+
       decorated.keys = decorateMethod(
         memo(this.#instanceId, (...args: unknown[]): Observable<StorageKey[]> =>
           this._retrieveMapKeys(creator, blockHash, args)));
+
+      decorated.keysPaged = decorateMethod(
+        memo(this.#instanceId, (opts: PaginationOptions): Observable<StorageKey[]> =>
+          this._retrieveMapKeysPaged(creator, blockHash, opts)));
     }
 
     if (this.supportMulti && creator.meta.type.isMap) {
@@ -703,13 +707,13 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
     );
   }
 
-  private _retrieveMapKeysPaged ({ iterKey, meta, method, section }: StorageEntry, opts: PaginationOptions): Observable<StorageKey[]> {
+  private _retrieveMapKeysPaged ({ iterKey, meta, method, section }: StorageEntry, at: Hash | Uint8Array | string | undefined, opts: PaginationOptions): Observable<StorageKey[]> {
     assert(iterKey && meta.type.isMap, 'keys can only be retrieved on maps');
 
     const headKey = iterKey(...opts.args).toHex();
     const setMeta = (key: StorageKey) => key.setMeta(meta, section, method);
 
-    return this._rpcCore.state.getKeysPaged(headKey, opts.pageSize, opts.startKey || headKey).pipe(
+    return this._rpcCore.state.getKeysPaged(headKey, opts.pageSize, opts.startKey || headKey, at).pipe(
       map((keys) => keys.map(setMeta))
     );
   }
@@ -732,11 +736,11 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
     );
   }
 
-  private _retrieveMapEntriesPaged (entry: StorageEntry, opts: PaginationOptions): Observable<[StorageKey, Codec][]> {
-    return this._retrieveMapKeysPaged(entry, opts).pipe(
+  private _retrieveMapEntriesPaged (entry: StorageEntry, at: Hash | Uint8Array | string | undefined, opts: PaginationOptions): Observable<[StorageKey, Codec][]> {
+    return this._retrieveMapKeysPaged(entry, at, opts).pipe(
       switchMap((keys) =>
         keys.length
-          ? this._rpcCore.state.queryStorageAt(keys).pipe(
+          ? this._rpcCore.state.queryStorageAt(keys, at).pipe(
             map((valsArr) =>
               valsArr.map((value, index): [StorageKey, Codec] => [keys[index], value])
             )

packages/api/src/base/Init.ts

@@ -4,7 +4,7 @@
 import type { Observable, Subscription } from 'rxjs';
 import type { Text } from '@polkadot/types';
 import type { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types';
-import type { ChainProperties, Hash, RuntimeVersion, RuntimeVersionPartial } from '@polkadot/types/interfaces';
+import type { ChainProperties, Hash, HeaderPartial, RuntimeVersion, RuntimeVersionPartial } from '@polkadot/types/interfaces';
 import type { Registry } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
 import type { HexString } from '@polkadot/util/types';
@@ -35,7 +35,7 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
 
   #updateSub?: Subscription | null = null;
 
-  #waitingRegistries: Record<string, Promise<VersionedRegistry<ApiType>>> = {};
+  #waitingRegistries: Record<HexString, Promise<VersionedRegistry<ApiType>>> = {};
 
   constructor (options: ApiOptions, type: ApiTypes, decorateMethod: DecorateMethod<ApiType>) {
     super(options, type, decorateMethod);
@@ -120,6 +120,44 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
     return this._createDecorated(registry, true, null, u8aHash).decoratedApi;
   }
 
+  private async _createBlockRegistry (blockHash: Uint8Array, header: HeaderPartial, version: RuntimeVersionPartial): Promise<VersionedRegistry<ApiType>> {
+    const registry = new TypeRegistry(blockHash);
+    const metadata = new Metadata(registry,
+      await firstValueFrom(this._rpcCore.state.getMetadata.raw<HexString>(header.parentHash))
+    );
+
+    this._initRegistry(registry, this._runtimeChain as Text, version, metadata);
+
+    // add our new registry
+    const result = { lastBlockHash: blockHash, metadata, registry, specName: version.specName, specVersion: version.specVersion };
+
+    this.#registries.push(result);
+
+    return result;
+  }
+
+  private _cacheBlockRegistryProgress (key: HexString, creator: () => Promise<VersionedRegistry<ApiType>>): Promise<VersionedRegistry<ApiType>> {
+    // look for waiting resolves
+    let waiting = this.#waitingRegistries[key];
+
+    if (isUndefined(waiting)) {
+      // nothing waiting, construct new
+      waiting = this.#waitingRegistries[key] = new Promise<VersionedRegistry<ApiType>>((resolve, reject): void => {
+        creator()
+          .then((registry): void => {
+            delete this.#waitingRegistries[key];
+            resolve(registry);
+          })
+          .catch((error): void => {
+            delete this.#waitingRegistries[key];
+            reject(error);
+          });
+      });
+    }
+
+    return waiting;
+  }
+
   private _getBlockRegistryViaVersion (blockHash: Uint8Array, version?: RuntimeVersionPartial): VersionedRegistry<ApiType> | null {
     if (version) {
       // check for pre-existing registries. We also check specName, e.g. it
@@ -139,7 +177,7 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
     return null;
   }
 
-  private async _getBlockRegistry (blockHash: Uint8Array): Promise<VersionedRegistry<ApiType>> {
+  private async _getBlockRegistryViaHash (blockHash: Uint8Array): Promise<VersionedRegistry<ApiType>> {
     // ensure we have everything required
     assert(this._genesisHash && this._runtimeVersion, 'Cannot retrieve data on an uninitialized chain');
 
@@ -161,62 +199,28 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
         : await firstValueFrom(this._rpcCore.state.getRuntimeVersion.raw(header.parentHash))
     );
 
-    const existingViaVersion = this._getBlockRegistryViaVersion(blockHash, version);
-
-    if (existingViaVersion) {
-      return existingViaVersion;
-    }
-
-    // nothing has been found, construct new
-    const registry = new TypeRegistry(blockHash);
-    const metadata = new Metadata(registry,
-      await firstValueFrom(this._rpcCore.state.getMetadata.raw<HexString>(header.parentHash))
+    return (
+      // try to find via version
+      this._getBlockRegistryViaVersion(blockHash, version) ||
+      // return new or in-flight result
+      await this._cacheBlockRegistryProgress(version.toHex(), () => this._createBlockRegistry(blockHash, header, version))
     );
-
-    this._initRegistry(registry, this._runtimeChain as Text, version, metadata);
-
-    // add our new registry
-    const result = { lastBlockHash: blockHash, metadata, registry, specName: version.specName, specVersion: version.specVersion };
-
-    this.#registries.push(result);
-
-    return result;
   }
 
   /**
    * @description Sets up a registry based on the block hash defined
    */
   public async getBlockRegistry (blockHash: Uint8Array, knownVersion?: RuntimeVersion): Promise<VersionedRegistry<ApiType>> {
-    const existingViaHash = this.#registries.find(({ lastBlockHash }) =>
-      lastBlockHash && u8aEq(lastBlockHash, blockHash)
+    return (
+      // try to find via blockHash
+      this.#registries.find(({ lastBlockHash }) =>
+        lastBlockHash && u8aEq(lastBlockHash, blockHash)
+      ) ||
+      // try to find via version
+      this._getBlockRegistryViaVersion(blockHash, knownVersion) ||
+      // return new or in-flight result
+      await this._cacheBlockRegistryProgress(u8aToHex(blockHash), () => this._getBlockRegistryViaHash(blockHash))
     );
-
-    if (existingViaHash) {
-      return existingViaHash;
-    }
-
-    const existingViaVersion = this._getBlockRegistryViaVersion(blockHash, knownVersion);
-
-    if (existingViaVersion) {
-      return existingViaVersion;
-    }
-
-    const blockHashHex = u8aToHex(blockHash);
-    let waiting = this.#waitingRegistries[blockHashHex];
-
-    if (isUndefined(waiting)) {
-      waiting = this._getBlockRegistry(blockHash);
-      this.#waitingRegistries[blockHashHex] = waiting;
-
-      // when we have resolved, remove this from the waiting list
-      waiting
-        .then((): void => {
-          delete this.#waitingRegistries[blockHashHex];
-        })
-        .catch(() => undefined);
-    }
-
-    return waiting;
   }
 
   protected async _loadMeta (): Promise<boolean> {
@@ -387,12 +391,10 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
     this.emit('connected');
 
     try {
-      const [hasMeta, cryptoReady] = await Promise.all([
-        this._loadMeta(),
-        this._options.initWasm === false
-          ? Promise.resolve(true)
-          : cryptoWaitReady()
-      ]);
+      const cryptoReady = this._options.initWasm === false
+        ? true
+        : await cryptoWaitReady();
+      const hasMeta = await this._loadMeta();
 
       this._subscribeHealth();
 

packages/api/src/packageInfo.ts

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

packages/api/src/submittable/createClass.ts

@@ -21,6 +21,7 @@ import { SubmittableResult } from './Result';
 interface SubmittableOptions<ApiType extends ApiTypes> {
   api: ApiInterfaceRx;
   apiType: ApiTypes;
+  blockHash?: Uint8Array;
   decorateMethod: ApiBase<ApiType>['_decorateMethod'];
 }
 
@@ -80,7 +81,7 @@ function optionsOrNonce (partialOptions: Partial<SignerOptions> = {}): Partial<S
     : partialOptions;
 }
 
-export function createClass <ApiType extends ApiTypes> ({ api, apiType, decorateMethod }: SubmittableOptions<ApiType>): Constructor<SubmittableExtrinsic<ApiType>> {
+export function createClass <ApiType extends ApiTypes> ({ api, apiType, blockHash, decorateMethod }: SubmittableOptions<ApiType>): Constructor<SubmittableExtrinsic<ApiType>> {
   // an instance of the base extrinsic for us to extend
   const ExtrinsicBase = api.registry.createClass('Extrinsic');
 
@@ -97,10 +98,10 @@ export function createClass <ApiType extends ApiTypes> ({ api, apiType, decorate
 
     // dry run an extrinsic
     public dryRun (account: AddressOrPair, optionsOrHash?: Partial<SignerOptions> | Uint8Array | string): SubmittableDryRunResult<ApiType> {
-      if (isString(optionsOrHash) || isU8a(optionsOrHash)) {
+      if (blockHash || isString(optionsOrHash) || isU8a(optionsOrHash)) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return decorateMethod(
-          () => api.rpc.system.dryRun(this.toHex(), optionsOrHash)
+          () => api.rpc.system.dryRun(this.toHex(), blockHash || optionsOrHash as string)
         );
       }
 
@@ -115,10 +116,10 @@ export function createClass <ApiType extends ApiTypes> ({ api, apiType, decorate
 
     // calculate the payment info for this transaction (if signed and submitted)
     public paymentInfo (account: AddressOrPair, optionsOrHash?: Partial<SignerOptions> | Uint8Array | string): SubmittablePaymentResult<ApiType> {
-      if (isString(optionsOrHash) || isU8a(optionsOrHash)) {
+      if (blockHash || isString(optionsOrHash) || isU8a(optionsOrHash)) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return decorateMethod(
-          (): Observable<RuntimeDispatchInfo> => api.rpc.payment.queryInfo(this.toHex(), optionsOrHash)
+          (): Observable<RuntimeDispatchInfo> => api.rpc.payment.queryInfo(this.toHex(), blockHash || optionsOrHash as string)
         );
       }
 

packages/api/src/submittable/createSubmittable.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Call, Extrinsic } from '@polkadot/types/interfaces';
+import type { Registry } from '@polkadot/types-codec/types';
 import type { ApiInterfaceRx, ApiTypes } from '../types';
 import type { SubmittableExtrinsic } from './types';
 
@@ -10,9 +11,9 @@ import { createClass } from './createClass';
 
 type Creator<ApiType extends ApiTypes> = (extrinsic: Call | Uint8Array | string) => SubmittableExtrinsic<ApiType>;
 
-export function createSubmittable<ApiType extends ApiTypes> (apiType: ApiTypes, api: ApiInterfaceRx, decorateMethod: ApiBase<ApiType>['_decorateMethod']): Creator<ApiType> {
-  const Submittable = createClass<ApiType>({ api, apiType, decorateMethod });
+export function createSubmittable<ApiType extends ApiTypes> (apiType: ApiTypes, api: ApiInterfaceRx, decorateMethod: ApiBase<ApiType>['_decorateMethod'], registry?: Registry, blockHash?: Uint8Array): Creator<ApiType> {
+  const Submittable = createClass<ApiType>({ api, apiType, blockHash, decorateMethod });
 
   return (extrinsic: Call | Extrinsic | Uint8Array | string): SubmittableExtrinsic<ApiType> =>
-    new Submittable(api.registry, extrinsic);
+    new Submittable(registry || api.registry, extrinsic);
 }

packages/api/src/types/index.ts

@@ -9,11 +9,12 @@ import type { DecoratedEvents } from '@polkadot/api-base/types/events';
 import type { QueryableStorage } from '@polkadot/api-base/types/storage';
 import type { ProviderInterface, ProviderInterfaceEmitted } from '@polkadot/rpc-provider/types';
 import type { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types';
-import type { Hash } from '@polkadot/types/interfaces';
+import type { Call, Extrinsic, Hash } from '@polkadot/types/interfaces';
 import type { CallFunction, DefinitionRpc, DefinitionRpcSub, RegisteredTypes, Registry, RegistryError, SignatureOptions, Signer } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
 import type { HexString } from '@polkadot/util/types';
 import type { ApiBase } from '../base';
+import type { SubmittableExtrinsic } from '../types/submittable';
 import type { AllDerives } from '../util/decorate';
 
 export * from '@polkadot/api-base/types';
@@ -96,7 +97,8 @@ export interface ApiDecoration<ApiType extends ApiTypes> {
   registry: Registry;
   rx: {
     query: QueryableStorage<'rxjs'>;
-  }
+  };
+  tx: (extrinsic: Call | Extrinsic | Uint8Array | string) => SubmittableExtrinsic<ApiType>;
 
   findCall (callIndex: Uint8Array | string): CallFunction;
   findError (errorIndex: Uint8Array | string): RegistryError;

packages/rpc-augment/package.json

@@ -20,13 +20,13 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/rpc-core": "7.13.1",
-    "@polkadot/types": "7.13.1",
-    "@polkadot/types-codec": "7.13.1",
-    "@polkadot/util": "^8.6.1"
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/rpc-core": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/util": "^9.0.1"
   }
 }

packages/rpc-augment/src/augment/jsonrpc.ts

@@ -12,6 +12,7 @@ import type { BlockHash } from '@polkadot/types/interfaces/chain';
 import type { PrefixedStorageKey } from '@polkadot/types/interfaces/childstate';
 import type { AuthorityId } from '@polkadot/types/interfaces/consensus';
 import type { CodeUploadRequest, CodeUploadResult, ContractCallRequest, ContractExecResult, ContractInstantiateResult, InstantiateRequest } from '@polkadot/types/interfaces/contracts';
+import type { BlockStats } from '@polkadot/types/interfaces/dev';
 import type { CreatedBlock } from '@polkadot/types/interfaces/engine';
 import type { EthAccount, EthCallRequest, EthFilter, EthFilterChanges, EthLog, EthReceipt, EthRichBlock, EthSubKind, EthSubParams, EthSyncStatus, EthTransaction, EthTransactionRequest, EthWork } from '@polkadot/types/interfaces/eth';
 import type { Extrinsic } from '@polkadot/types/interfaces/extrinsics';
@@ -155,6 +156,12 @@ declare module '@polkadot/rpc-core/types/jsonrpc' {
        **/
       uploadCode: AugmentedRpc<(uploadRequest: CodeUploadRequest | { origin?: any; code?: any; storageDepositLimit?: any } | string | Uint8Array, at?: BlockHash | string | Uint8Array) => Observable<CodeUploadResult>>;
     };
+    dev: {
+      /**
+       * Reexecute the specified `block_hash` and gather statistics while doing so
+       **/
+      getBlockStats: AugmentedRpc<(at: Hash | string | Uint8Array) => Observable<Option<BlockStats>>>;
+    };
     engine: {
       /**
        * Instructs the manual-seal authorship task to create a new block

packages/rpc-augment/src/packageInfo.ts

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

packages/rpc-core/package.json

@@ -20,18 +20,18 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/rpc-augment": "7.13.1",
-    "@polkadot/rpc-provider": "7.13.1",
-    "@polkadot/types": "7.13.1",
-    "@polkadot/util": "^8.6.1",
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/rpc-augment": "8.0.2",
+    "@polkadot/rpc-provider": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/util": "^9.0.1",
     "rxjs": "^7.5.5"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^8.6.1",
-    "@polkadot/rpc-augment": "7.13.1"
+    "@polkadot/keyring": "^9.0.1",
+    "@polkadot/rpc-augment": "8.0.2"
   }
 }

packages/rpc-core/src/packageInfo.ts

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

packages/rpc-core/src/replay.spec.ts

@@ -36,7 +36,9 @@ describe('replay', (): void => {
     const observable = rpc.system.chain();
     let a: any | undefined;
 
-    observable.subscribe((value?: unknown): void => { a = value; });
+    observable.subscribe((value?: unknown): void => {
+      a = value;
+    });
 
     setTimeout((): void => {
       // Subscribe again to the same observable, it should fire value immediately

packages/rpc-core/src/util/drr.spec.ts

@@ -14,7 +14,9 @@ describe('drr', (): void => {
   it('should not fire twice the same value', (done): void => {
     let count = 0;
 
-    const sub = of(1, 1).pipe(drr({ delay: 500 })).subscribe((): void => { ++count; });
+    const sub = of(1, 1).pipe(drr({ delay: 500 })).subscribe((): void => {
+      ++count;
+    });
 
     setTimeout((): void => {
       expect(count).toBe(1);

packages/rpc-provider/README.md

@@ -4,9 +4,9 @@ Generic transport providers to handle the transport of method calls to and from
 
 ## Provider Selection
 
-There are two flavours of the providers provided, one allowing for using HTTP as a transport mechanism, the other using WebSockets. It is generally recommended to use the [[WsProvider]] since in addition to standard calls, it allows for subscriptions where all changes to state can be pushed from the node to the client.
+There are three flavours of the providers provided, one allowing for using HTTP as a transport mechanism, the other using WebSockets, and the third one uses substrate light-client through @substrate/connect. It is generally recommended to use the [[WsProvider]] since in addition to standard calls, it allows for subscriptions where all changes to state can be pushed from the node to the client.
 
-Both providers are usable (as is the API), in both browser-based and Node.js environments. Polyfills for unsupported functionality are automatically applied based on feature-detection.
+All providers are usable (as is the API), in both browser-based and Node.js environments. Polyfills for unsupported functionality are automatically applied based on feature-detection.
 
 ## Usage
 
@@ -39,3 +39,24 @@ const version = await provider.send('chain_getBlockHash', []);
 
 console.log('latest block Hash', hash);
 ```
+
+@substrate/connect Initialization -
+
+Instantiating a Provider for the Polkadot Relay Chain:
+```javascript
+import { ScProvider, WellKnownChain } from '@polkadot/rpc-provider/substrate-connect';
+
+const provider = new ScProvider(WellKnownChain.polkadot);
+await provider.connect();
+const version = await provider.send('chain_getBlockHash', []);
+```
+
+Instantiating a Provider for a Polkadot parachain:
+```javascript
+import { ScProvider, WellKnownChain } from '@polkadot/rpc-provider/substrate-connect';
+
+const polkadotProvider = new ScProvider(WellKnownChain.polkadot);
+const parachainProvider = new ScProvider(parachainSpec, polkadotProvider);
+await parachainProvider.connect();
+const version = await parachainProvider.send('chain_getBlockHash', []);
+```

packages/rpc-provider/package.json

@@ -20,18 +20,19 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/keyring": "^8.6.1",
-    "@polkadot/types": "7.13.1",
-    "@polkadot/types-support": "7.13.1",
-    "@polkadot/util": "^8.6.1",
-    "@polkadot/util-crypto": "^8.6.1",
-    "@polkadot/x-fetch": "^8.6.1",
-    "@polkadot/x-global": "^8.6.1",
-    "@polkadot/x-ws": "^8.6.1",
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/keyring": "^9.0.1",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-support": "8.0.2",
+    "@polkadot/util": "^9.0.1",
+    "@polkadot/util-crypto": "^9.0.1",
+    "@polkadot/x-fetch": "^9.0.1",
+    "@polkadot/x-global": "^9.0.1",
+    "@polkadot/x-ws": "^9.0.1",
+    "@substrate/connect": "0.7.2",
     "eventemitter3": "^4.0.7",
     "mock-socket": "^9.1.2",
     "nock": "^13.2.4"

packages/rpc-provider/src/bundle.ts

@@ -4,3 +4,6 @@
 export { HttpProvider } from './http';
 export { packageInfo } from './packageInfo';
 export { WsProvider } from './ws';
+
+// ESM-only, only export top-level when we have dual versions
+// export { ScProvider } from './substrate-connect';

packages/rpc-provider/src/coder/decodeResponse.spec.ts

@@ -15,7 +15,7 @@ describe('decodeResponse', (): void => {
   it('expects a non-empty input object', (): void => {
     expect(
       () => coder.decodeResponse(undefined as unknown as JsonRpcResponse)
-    ).toThrow(/Empty response/);
+    ).toThrow(/Invalid jsonrpc/);
   });
 
   it('expects a valid jsonrpc field', (): void => {

packages/rpc-provider/src/coder/encodeJson.spec.ts

@@ -13,6 +13,6 @@ describe('encodeJson', (): void => {
   it('encodes a valid JsonRPC JSON string', (): void => {
     expect(
       coder.encodeJson('method', ['params'])
-    ).toEqual('{"id":1,"jsonrpc":"2.0","method":"method","params":["params"]}');
+    ).toEqual([1, '{"id":1,"jsonrpc":"2.0","method":"method","params":["params"]}']);
   });
 });

packages/rpc-provider/src/coder/encodeObject.spec.ts

@@ -10,19 +10,14 @@ describe('encodeObject', (): void => {
     coder = new RpcCoder();
   });
 
-  it('starts with id === 0 (nothing sent)', (): void => {
-    expect(coder.getId()).toEqual(0);
-  });
-
   it('encodes a valid JsonRPC object', (): void => {
     expect(
       coder.encodeObject('method', ['a', 'b'])
-    ).toEqual({
+    ).toEqual([1, {
       id: 1,
       jsonrpc: '2.0',
       method: 'method',
       params: ['a', 'b']
-    });
-    expect(coder.getId()).toEqual(1);
+    }]);
   });
 });

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

@@ -20,27 +20,34 @@ function formatErrorData (data?: string | number): string {
   // very nested, pick a number and trim the result display to it
   return formatted.length <= 256
     ? formatted
-    : `${formatted.substr(0, 255)}…`;
+    : `${formatted.substring(0, 255)}…`;
+}
+
+function checkError (error?: JsonRpcResponseBaseError): void {
+  if (error) {
+    const { code, data, message } = error;
+
+    throw new RpcError(`${code}: ${message}${formatErrorData(data)}`, code, data);
+  }
 }
 
 /** @internal */
 export class RpcCoder {
   #id = 0;
 
-  public decodeResponse (response: JsonRpcResponse): unknown {
-    assert(response, 'Empty response object received');
-    assert(response.jsonrpc === '2.0', 'Invalid jsonrpc field in decoded object');
+  public decodeResponse (response?: JsonRpcResponse): unknown {
+    assert(response && response.jsonrpc === '2.0', 'Invalid jsonrpc field in decoded object');
 
     const isSubscription = !isUndefined(response.params) && !isUndefined(response.method);
 
     assert(isNumber(response.id) || (isSubscription && (isNumber(response.params.subscription) || isString(response.params.subscription))), 'Invalid id field in decoded object');
 
-    this._checkError(response.error);
+    checkError(response.error);
 
-    assert(!isUndefined(response.result) || isSubscription, 'No result found in JsonRpc response');
+    assert(!isUndefined(response.result) || isSubscription, 'No result found in jsonrpc response');
 
     if (isSubscription) {
-      this._checkError(response.params.error);
+      checkError(response.params.error);
 
       return response.params.result;
     }
@@ -48,31 +55,20 @@ export class RpcCoder {
     return response.result;
   }
 
-  public encodeJson (method: string, params: unknown[]): string {
-    return stringify(
-      this.encodeObject(method, params)
-    );
+  public encodeJson (method: string, params: unknown[]): [number, string] {
+    const [id, data] = this.encodeObject(method, params);
+
+    return [id, stringify(data)];
   }
 
-  public encodeObject (method: string, params: unknown[]): JsonRpcRequest {
-    return {
-      id: ++this.#id,
+  public encodeObject (method: string, params: unknown[]): [number, JsonRpcRequest] {
+    const id = ++this.#id;
+
+    return [id, {
+      id,
       jsonrpc: '2.0',
       method,
       params
-    };
-  }
-
-  public getId (): number {
-    return this.#id;
-  }
-
-  private _checkError (error?: JsonRpcResponseBaseError): void {
-    if (error) {
-      const { code, data, message } = error;
-      const fmtMessage = `${code}: ${message}${formatErrorData(data)}`;
-
-      throw new RpcError(fmtMessage, code, data);
-    }
+    }];
   }
 }

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

@@ -56,7 +56,7 @@ export class HttpProvider implements ProviderInterface {
     this.#headers = headers;
     this.#stats = {
       active: { requests: 0, subscriptions: 0 },
-      total: { cached: 0, requests: 0, subscriptions: 0, timeout: 0 }
+      total: { bytesRecv: 0, bytesSent: 0, cached: 0, requests: 0, subscriptions: 0, timeout: 0 }
     };
   }
 
@@ -122,7 +122,7 @@ export class HttpProvider implements ProviderInterface {
   public async send <T> (method: string, params: unknown[], isCacheable?: boolean): Promise<T> {
     this.#stats.total.requests++;
 
-    const body = this.#coder.encodeJson(method, params);
+    const [, body] = this.#coder.encodeJson(method, params);
     let resultPromise: Promise<T> | null = isCacheable
       ? this.#callCache.get(body) as Promise<T>
       : null;
@@ -142,6 +142,7 @@ export class HttpProvider implements ProviderInterface {
 
   async #send <T> (body: string): Promise<T> {
     this.#stats.active.requests++;
+    this.#stats.total.bytesSent += body.length;
 
     try {
       const response = await fetch(this.#endpoint, {
@@ -157,8 +158,11 @@ export class HttpProvider implements ProviderInterface {
 
       assert(response.ok, () => `[${response.status}]: ${response.statusText}`);
 
-      const result = (await response.json()) as JsonRpcResponse;
-      const decoded = this.#coder.decodeResponse(result) as T;
+      const result = await response.text();
+
+      this.#stats.total.bytesRecv += result.length;
+
+      const decoded = this.#coder.decodeResponse(JSON.parse(result) as JsonRpcResponse) as T;
 
       this.#stats.active.requests--;
 

packages/rpc-provider/src/packageInfo.ts

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

packages/rpc-provider/src/substrate-connect/Health.ts

@@ -0,0 +1,347 @@
+// Copyright 2017-2022 @polkadot/rpc-provider authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { assert } from '@polkadot/util';
+
+export interface SmoldotHealth {
+  isSyncing: boolean
+  peers: number
+  shouldHavePeers: boolean
+}
+
+export interface HealthChecker {
+  setSendJsonRpc(sendRequest: (request: string) => void): void
+  start(healthCallback: (health: SmoldotHealth) => void): void
+  stop(): void
+  sendJsonRpc(request: string): void
+  responsePassThrough(response: string): string | null
+}
+
+/*
+ * Creates a new health checker.
+ *
+ * The role of the health checker is to report to the user the health of a smoldot chain.
+ *
+ * In order to use it, start by creating a health checker, and call `setSendJsonRpc` to set the
+ * way to send a JSON-RPC request to a chain. The health checker is disabled by default. Use
+ * `start()` in order to start the health checks. The `start()` function must be passed a callback called
+ * when an update to the health of the node is available.
+ *
+ * In order to send a JSON-RPC request to the chain, you **must** use the `sendJsonRpc` function
+ * of the health checker. The health checker rewrites the `id` of the requests it receives.
+ *
+ * When the chain send a JSON-RPC response, it must be passed to `responsePassThrough()`. This
+ * function intercepts the responses destined to the requests that have been emitted by the health
+ * checker and returns `null`. If the response doesn't concern the health checker, the response is
+ * simply returned by the function.
+ *
+ * # How it works
+ *
+ * The health checker periodically calls the `system_health` JSON-RPC call in order to determine
+ * the health of the chain.
+ *
+ * In addition to this, as long as the health check reports that `isSyncing` is `true`, the
+ * health checker also maintains a subscription to new best blocks using `chain_subscribeNewHeads`.
+ * Whenever a new block is notified, a health check is performed immediately in order to determine
+ * whether `isSyncing` has changed to `false`.
+ *
+ * Thanks to this subscription, the latency of the report of the switch from `isSyncing: true` to
+ * `isSyncing: false` is very low.
+ *
+ */
+export function healthChecker (): HealthChecker {
+  // `null` if health checker is not started.
+  let checker: null | InnerChecker = null;
+  let sendJsonRpc: null | ((request: string) => void) = null;
+
+  return {
+    responsePassThrough: (jsonRpcResponse) => {
+      if (checker === null) {
+        return jsonRpcResponse;
+      }
+
+      return checker.responsePassThrough(jsonRpcResponse);
+    },
+    sendJsonRpc: (request) => {
+      assert(
+        sendJsonRpc,
+        'setSendJsonRpc must be called before sending requests'
+      );
+
+      if (checker === null) {
+        sendJsonRpc(request);
+      } else {
+        checker.sendJsonRpc(request);
+      }
+    },
+    setSendJsonRpc: (cb) => {
+      sendJsonRpc = cb;
+    },
+    start: (healthCallback) => {
+      assert(
+        checker === null,
+        "Can't start the health checker multiple times in parallel"
+      );
+      assert(
+        sendJsonRpc,
+        'setSendJsonRpc must be called before starting the health checks'
+      );
+      checker = new InnerChecker(healthCallback, sendJsonRpc);
+      checker.update(true);
+    },
+    stop: () => {
+      if (checker === null) {
+        return;
+      } // Already stopped.
+
+      checker.destroy();
+      checker = null;
+    }
+  };
+}
+
+class InnerChecker {
+  #healthCallback: (health: SmoldotHealth) => void;
+  #currentHealthCheckId: string | null = null;
+  #currentHealthTimeout: ReturnType<typeof setTimeout> | null = null;
+  #currentSubunsubRequestId: string | null = null;
+  #currentSubscriptionId: string | null = null;
+  #requestToSmoldot: (request: string) => void;
+  #isSyncing = false;
+  #nextRequestId = 0;
+
+  constructor (
+    healthCallback: (health: SmoldotHealth) => void,
+    requestToSmoldot: (request: string) => void
+  ) {
+    this.#healthCallback = healthCallback;
+    this.#requestToSmoldot = requestToSmoldot;
+  }
+
+  sendJsonRpc = (request: string): void => {
+    // Replace the `id` in the request to prefix the request ID with `extern:`.
+    let parsedRequest: {id: string | number};
+
+    try {
+      parsedRequest = JSON.parse(request) as {id: string | number};
+    } catch (err) {
+      return;
+    }
+
+    if (parsedRequest.id) {
+      const newId = 'extern:' + JSON.stringify(parsedRequest.id);
+
+      parsedRequest.id = newId;
+    }
+
+    this.#requestToSmoldot(JSON.stringify(parsedRequest));
+  };
+
+  responsePassThrough = (jsonRpcResponse: string): string | null => {
+    let parsedResponse: {id: string, result?: SmoldotHealth, params?: { subscription: string }};
+
+    try {
+      parsedResponse = JSON.parse(jsonRpcResponse) as {id: string, result: undefined | SmoldotHealth};
+    } catch (err) {
+      return jsonRpcResponse;
+    }
+
+    // Check whether response is a response to `system_health`.
+    if (parsedResponse.id && this.#currentHealthCheckId === parsedResponse.id) {
+      this.#currentHealthCheckId = null;
+
+      // Check whether query was successful. It is possible for queries to fail for
+      // various reasons, such as the client being overloaded.
+      if (!parsedResponse.result) {
+        this.update(false);
+
+        return null;
+      }
+
+      this.#healthCallback(parsedResponse.result);
+      this.#isSyncing = parsedResponse.result.isSyncing;
+      this.update(false);
+
+      return null;
+    }
+
+    // Check whether response is a response to the subscription or unsubscription.
+    if (
+      parsedResponse.id &&
+      this.#currentSubunsubRequestId === parsedResponse.id
+    ) {
+      this.#currentSubunsubRequestId = null;
+
+      // Check whether query was successful. It is possible for queries to fail for
+      // various reasons, such as the client being overloaded.
+      if (!parsedResponse.result) {
+        this.update(false);
+
+        return null;
+      }
+
+      if (this.#currentSubscriptionId) {
+        this.#currentSubscriptionId = null;
+      } else {
+        this.#currentSubscriptionId = parsedResponse.result as unknown as string;
+      }
+
+      this.update(false);
+
+      return null;
+    }
+
+    // Check whether response is a notification to a subscription.
+    if (
+      parsedResponse.params &&
+      this.#currentSubscriptionId &&
+      parsedResponse.params.subscription === this.#currentSubscriptionId
+    ) {
+      // Note that after a successful subscription, a notification containing
+      // the current best block is always returned. Considering that a
+      // subscription is performed in response to a health check, calling
+      // `startHealthCheck()` here will lead to a second health check.
+      // It might seem redundant to perform two health checks in a quick
+      // succession, but doing so doesn't lead to any problem, and it is
+      // actually possible for the health to have changed in between as the
+      // current best block might have been updated during the subscription
+      // request.
+      this.update(true);
+
+      return null;
+    }
+
+    // Response doesn't concern us.
+    if (parsedResponse.id) {
+      const id: string = parsedResponse.id;
+
+      // Need to remove the `extern:` prefix.
+      assert(id.startsWith('extern:'), 'State inconsistency in health checker');
+
+      const newId = JSON.parse(id.slice('extern:'.length)) as string;
+
+      parsedResponse.id = newId;
+    }
+
+    return JSON.stringify(parsedResponse);
+  };
+
+  update = (startNow: boolean): void => {
+    // If `startNow`, clear `#currentHealthTimeout` so that it is set below.
+    if (startNow && this.#currentHealthTimeout) {
+      clearTimeout(this.#currentHealthTimeout);
+      this.#currentHealthTimeout = null;
+    }
+
+    if (!this.#currentHealthTimeout) {
+      const startHealthRequest = () => {
+        this.#currentHealthTimeout = null;
+
+        // No matter what, don't start a health request if there is already one in progress.
+        // This is sane to do because receiving a response to a health request calls `update()`.
+        if (this.#currentHealthCheckId) {
+          return;
+        }
+
+        // Actual request starting.
+        this.#currentHealthCheckId = 'health-checker:'.concat(
+          this.#nextRequestId.toString()
+        );
+        this.#nextRequestId += 1;
+        this.#requestToSmoldot(
+          JSON.stringify({
+            id: this.#currentHealthCheckId,
+            jsonrpc: '2.0',
+            method: 'system_health',
+            params: []
+          })
+        );
+      };
+
+      if (startNow) {
+        startHealthRequest();
+      } else {
+        this.#currentHealthTimeout = setTimeout(startHealthRequest, 1000);
+      }
+    }
+
+    if (
+      this.#isSyncing &&
+      !this.#currentSubscriptionId &&
+      !this.#currentSubunsubRequestId
+    ) {
+      this.startSubscription();
+    }
+
+    if (
+      !this.#isSyncing &&
+      this.#currentSubscriptionId &&
+      !this.#currentSubunsubRequestId
+    ) {
+      this.endSubscription();
+    }
+  };
+
+  startSubscription = (): void => {
+    assert(
+      !this.#currentSubunsubRequestId && !this.#currentSubscriptionId,
+      'Internal error in health checker'
+    );
+
+    this.#currentSubunsubRequestId = 'health-checker:'.concat(
+      this.#nextRequestId.toString()
+    );
+    this.#nextRequestId += 1;
+    this.#requestToSmoldot(
+      JSON.stringify({
+        id: this.#currentSubunsubRequestId,
+        jsonrpc: '2.0',
+        method: 'chain_subscribeNewHeads',
+        params: []
+      })
+    );
+  };
+
+  endSubscription = (): void => {
+    assert(
+      !this.#currentSubunsubRequestId && this.#currentSubscriptionId,
+      'Internal error in health checker'
+    );
+
+    this.#currentSubunsubRequestId = 'health-checker:'.concat(
+      this.#nextRequestId.toString()
+    );
+    this.#nextRequestId += 1;
+    this.#requestToSmoldot(
+      JSON.stringify({
+        id: this.#currentSubunsubRequestId,
+        jsonrpc: '2.0',
+        method: 'chain_unsubscribeNewHeads',
+        params: [this.#currentSubscriptionId]
+      })
+    );
+  };
+
+  destroy = (): void => {
+    if (this.#currentHealthTimeout) {
+      clearTimeout(this.#currentHealthTimeout);
+      this.#currentHealthTimeout = null;
+    }
+  };
+}
+
+export class HealthCheckError extends Error {
+  readonly #cause: unknown;
+
+  getCause (): unknown {
+    return this.#cause;
+  }
+
+  constructor (
+    response: unknown,
+    message = 'Got error response asking for system health'
+  ) {
+    super(message);
+    this.#cause = response;
+  }
+}

packages/rpc-provider/src/substrate-connect/ScProvider.spec.ts

@@ -0,0 +1,647 @@
+// Copyright 2017-2022 @polkadot/rpc-provider authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+/* eslint-disable sort-keys */
+/* eslint-disable promise/param-names */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-empty-function */
+/* eslint-disable @typescript-eslint/no-floating-promises */
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+/* eslint-disable @typescript-eslint/ban-types */
+
+import type { Chain, JsonRpcCallback } from '@substrate/connect';
+import type { HealthChecker, SmoldotHealth } from './Health';
+import type { ScProviderClass } from './ScProvider';
+
+import { jest } from '@jest/globals';
+
+const wait = (ms: number) => new Promise((res) => setTimeout(res, ms));
+
+type MockedHealthChecker = HealthChecker & {
+  _isActive: () => boolean
+  _triggerHealthUpdate: (update: SmoldotHealth) => void
+}
+
+const healthCheckerMock = (): MockedHealthChecker => {
+  let cb: (health: SmoldotHealth) => void = () => {};
+
+  let sendJsonRpc: (request: string) => void = () => {};
+
+  let isActive = false;
+
+  return {
+    setSendJsonRpc: (cb) => {
+      sendJsonRpc = cb;
+    },
+    start: (x) => {
+      isActive = true;
+      cb = x;
+    },
+    stop: () => {
+      isActive = false;
+    },
+    sendJsonRpc: (...args) => sendJsonRpc(...args),
+    responsePassThrough: (response) => response,
+    _isActive: () => isActive,
+    _triggerHealthUpdate: (update: SmoldotHealth) => {
+      cb(update);
+    }
+  };
+};
+
+const healthCheckerFactory = () => {
+  const _healthCheckers: MockedHealthChecker[] = [];
+
+  return {
+    healthChecker: () => {
+      const result = healthCheckerMock();
+
+      _healthCheckers.push(result);
+
+      return result;
+    },
+    _healthCheckers,
+    _latestHealthChecker: () => _healthCheckers.slice(-1)[0]
+  };
+};
+
+jest.mock('./Health', () => healthCheckerFactory());
+
+type MockChain = Chain & {
+  _spec: () => string
+  _recevedRequests: () => string[]
+  _isTerminated: () => boolean
+  _triggerCallback: (response: string | {}) => void
+  _setTerminateInterceptor: (fn: () => void) => void
+  _setSendJsonRpcInterceptor: (fn: (rpc: string) => void) => void
+  _getLatestRequest: () => string
+}
+
+const getFakeChain = (spec: string, callback: JsonRpcCallback): MockChain => {
+  const _receivedRequests: string[] = [];
+  let _isTerminated = false;
+
+  let terminateInterceptor: Function = Function.prototype;
+  let sendJsonRpcInterceptor: Function = Function.prototype;
+
+  return {
+    _spec: () => spec,
+    _recevedRequests: () => _receivedRequests,
+    _isTerminated: () => _isTerminated,
+    _triggerCallback: (response) => {
+      callback(
+        typeof response === 'string' ? response : JSON.stringify(response)
+      );
+    },
+    _setSendJsonRpcInterceptor: (fn) => {
+      sendJsonRpcInterceptor = fn;
+    },
+    _setTerminateInterceptor: (fn) => {
+      terminateInterceptor = fn;
+    },
+    sendJsonRpc: (rpc) => {
+      sendJsonRpcInterceptor(rpc);
+      _receivedRequests.push(rpc);
+    },
+    remove: () => {
+      terminateInterceptor();
+      _isTerminated = true;
+    },
+    _getLatestRequest: () => _receivedRequests[_receivedRequests.length - 1]
+  };
+};
+
+const getFakeClient = () => {
+  const chains: MockChain[] = [];
+  let addChainInterceptor: Promise<void> = Promise.resolve();
+  let addWellKnownChainInterceptor: Promise<void> = Promise.resolve();
+
+  return {
+    _chains: () => chains,
+    _setAddChainInterceptor: (interceptor: Promise<void>) => {
+      addChainInterceptor = interceptor;
+    },
+    _setAddWellKnownChainInterceptor: (interceptor: Promise<void>) => {
+      addWellKnownChainInterceptor = interceptor;
+    },
+    addChain: (chainSpec: string, cb: JsonRpcCallback): Promise<MockChain> =>
+      addChainInterceptor.then(() => {
+        const result = getFakeChain(chainSpec, cb);
+
+        chains.push(result);
+
+        return result;
+      }),
+    addWellKnownChain: (
+      wellKnownChain: string,
+      cb: JsonRpcCallback
+    ): Promise<MockChain> =>
+      addWellKnownChainInterceptor.then(() => {
+        const result = getFakeChain(wellKnownChain, cb);
+
+        chains.push(result);
+
+        return result;
+      })
+  };
+};
+
+enum WellKnownChain {
+  polkadot = 'polkadot',
+  ksmcc3 = 'ksmcc3',
+  rococo_v2_1 = 'rococo_v2_1',
+  westend2 = 'westend2'
+}
+
+const connectorFactory = () => {
+  const clients: ReturnType<typeof getFakeClient>[] = [];
+  const latestClient = () => clients[clients.length - 1];
+
+  return {
+    WellKnownChain,
+    createScClient: () => {
+      const result = getFakeClient();
+
+      clients.push(result);
+
+      return result;
+    },
+    _clients: () => clients,
+    latestClient,
+    latestChain: () =>
+      latestClient()._chains()[latestClient()._chains().length - 1]
+  };
+};
+
+jest.mock('@substrate/connect', () => connectorFactory());
+
+let ScProvider: ScProviderClass;
+let mockedConnector: ReturnType<typeof connectorFactory>;
+let mockedHealthChecker: ReturnType<typeof healthCheckerFactory>;
+const getCurrentHealthChecker = () => mockedHealthChecker._latestHealthChecker();
+
+const setChainSyncyingStatus = (isSyncing: boolean) => {
+  getCurrentHealthChecker()._triggerHealthUpdate({
+    isSyncing,
+    peers: 1,
+    shouldHavePeers: true
+  });
+};
+
+beforeAll(async () => {
+  ({ ScProvider } = await import('./ScProvider'));
+  mockedConnector = (await import(
+    '@substrate/connect'
+  )) as unknown as ReturnType<typeof connectorFactory>;
+  mockedHealthChecker = await (import('./Health') as any);
+});
+
+describe('ScProvider', () => {
+  describe('on', () => {
+    it('emits `connected` as soon as the chain is not syncing', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+
+      const onConnected = jest.fn();
+
+      provider.on('connected', onConnected);
+
+      expect(onConnected).not.toHaveBeenCalled();
+      setChainSyncyingStatus(false);
+      expect(onConnected).toHaveBeenCalled();
+    });
+
+    it('stops receiving notifications after unsubscribing', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+
+      const onConnected = jest.fn();
+
+      provider.on('connected', onConnected)();
+      expect(onConnected).not.toHaveBeenCalled();
+
+      setChainSyncyingStatus(false);
+      expect(onConnected).not.toHaveBeenCalled();
+    });
+
+    it('synchronously emits connected if the Provider is already `connected`', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+
+      setChainSyncyingStatus(false);
+
+      const onConnected = jest.fn();
+
+      provider.on('connected', onConnected);
+      expect(onConnected).toHaveBeenCalled();
+    });
+
+    it('emits `disconnected` once the chain goes back to syncing', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+
+      setChainSyncyingStatus(false);
+
+      const onConnected = jest.fn();
+
+      provider.on('connected', onConnected);
+      const onDisconnected = jest.fn();
+
+      provider.on('disconnected', onDisconnected);
+
+      expect(onConnected).toHaveBeenCalled();
+      expect(onDisconnected).not.toHaveBeenCalled();
+
+      onConnected.mockRestore();
+      setChainSyncyingStatus(true);
+
+      expect(onConnected).not.toHaveBeenCalled();
+      expect(onDisconnected).toHaveBeenCalled();
+    });
+  });
+
+  describe('hasSubscriptions', () => {
+    it('supports subscriptions', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+
+      expect(provider.hasSubscriptions).toBe(true);
+    });
+  });
+
+  describe('clone', () => {
+    it('can not be clonned', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+
+      expect(() => provider.clone()).toThrowError();
+    });
+  });
+
+  describe('connect', () => {
+    it('does not create a new chain when trying to re-connect while the current chain is syncing', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+      const chain = mockedConnector.latestChain();
+
+      await provider.connect();
+      expect(chain).toBe(mockedConnector.latestChain());
+    });
+
+    it('throws when trying to connect on an already connected Provider', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+
+      setChainSyncyingStatus(false);
+
+      await expect(provider.connect()).rejects.toThrowError(
+        'Already connected!'
+      );
+    });
+  });
+
+  describe('disconnect', () => {
+    it('removes the chain and cleans up', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+      const chain = mockedConnector.latestChain();
+
+      await provider.disconnect();
+
+      expect(chain._isTerminated()).toBe(true);
+    });
+
+    it('does not throw when disconnecting on an already disconnected Provider', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+
+      await provider.disconnect();
+      await expect(provider.disconnect()).resolves.not.toThrow();
+    });
+  });
+
+  describe('send', () => {
+    it('throws when trying to send a request while the Provider is not connected', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+
+      await expect(provider.send('', [])).rejects.toThrow();
+    });
+
+    it('receives responses to its requests', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+      const chain = mockedConnector.latestChain();
+
+      setChainSyncyingStatus(false);
+
+      const responsePromise = provider.send('getData', ['foo']);
+
+      await wait(0);
+      expect(chain._getLatestRequest()).toEqual(
+        '{"id":1,"jsonrpc":"2.0","method":"getData","params":["foo"]}'
+      );
+
+      const result = { foo: 'foo' };
+
+      chain._triggerCallback({
+        jsonrpc: '2.0',
+        id: 1,
+        result
+      });
+
+      const response = await responsePromise;
+
+      expect(response).toEqual(result);
+    });
+
+    it("rejects when the response can't be deserialized", async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+      const chain = mockedConnector.latestChain();
+
+      setChainSyncyingStatus(false);
+
+      setTimeout(() => {
+        chain._triggerCallback({
+          jsonrpc: '2.0',
+          id: 1
+        });
+      }, 0);
+
+      await expect(provider.send('getData', ['foo'])).rejects.toThrow();
+    });
+
+    it('rejects when the smoldot chain has crashed', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+      const chain = mockedConnector.latestChain();
+
+      setChainSyncyingStatus(false);
+      await wait(0);
+
+      chain._setSendJsonRpcInterceptor(() => {
+        throw new Error('boom!');
+      });
+
+      await expect(provider.send('getData', ['foo'])).rejects.toThrowError(
+        'Disconnected'
+      );
+      expect(provider.isConnected).toBe(false);
+    });
+  });
+
+  describe('subscribe', () => {
+    it('subscribes and recives messages until it unsubscribes', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+      const chain = mockedConnector.latestChain();
+
+      setChainSyncyingStatus(false);
+
+      const unsubscribeToken = 'unsubscribeToken';
+
+      setTimeout(() => {
+        chain._triggerCallback({
+          jsonrpc: '2.0',
+          id: 1,
+          result: unsubscribeToken
+        });
+      }, 0);
+
+      const cb = jest.fn();
+      const token = await provider.subscribe(
+        'foo',
+        'chain_subscribeNewHeads',
+        ['baz'],
+        cb
+      );
+
+      expect(token).toBe(unsubscribeToken);
+      expect(cb).not.toHaveBeenCalled();
+
+      chain._triggerCallback({
+        jsonrpc: '2.0',
+        method: 'foo',
+        params: {
+          result: 1,
+          subscription: token
+        }
+      });
+      expect(cb).toHaveBeenCalledTimes(1);
+      expect(cb).toHaveBeenLastCalledWith(null, 1);
+
+      chain._triggerCallback({
+        jsonrpc: '2.0',
+        method: 'foo',
+        params: {
+          result: 2,
+          subscription: token
+        }
+      });
+      expect(cb).toHaveBeenCalledTimes(2);
+      expect(cb).toHaveBeenLastCalledWith(null, 2);
+
+      provider.unsubscribe('foo', 'chain_unsubscribeNewHeads', unsubscribeToken);
+
+      chain._triggerCallback({
+        jsonrpc: '2.0',
+        method: 'foo',
+        params: {
+          result: 3,
+          subscription: token
+        }
+      });
+      expect(cb).toHaveBeenCalledTimes(2);
+      expect(cb).toHaveBeenLastCalledWith(null, 2);
+    });
+
+    it('ignores subscription messages that were received before the subscription token', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+      const chain = mockedConnector.latestChain();
+
+      setChainSyncyingStatus(false);
+
+      const unsubscribeToken = 'unsubscribeToken';
+
+      chain._triggerCallback({
+        jsonrpc: '2.0',
+        method: 'foo',
+        params: {
+          result: 1,
+          subscription: unsubscribeToken
+        }
+      });
+      setTimeout(() => {
+        chain._triggerCallback({
+          jsonrpc: '2.0',
+          id: 1,
+          result: unsubscribeToken
+        });
+      }, 0);
+
+      const cb = jest.fn();
+      const token = await provider.subscribe(
+        'foo',
+        'chain_subscribeNewHeads',
+        ['baz'],
+        cb
+      );
+
+      expect(token).toBe(unsubscribeToken);
+      expect(cb).not.toHaveBeenCalled();
+    });
+
+    it('emits the error when the message has an error', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+      const chain = mockedConnector.latestChain();
+
+      setChainSyncyingStatus(false);
+      await wait(0);
+
+      const unsubscribeToken = 'unsubscribeToken';
+
+      setTimeout(() => {
+        chain._triggerCallback({
+          jsonrpc: '2.0',
+          id: 1,
+          result: unsubscribeToken
+        });
+      }, 0);
+
+      const cb = jest.fn();
+      const token = await provider.subscribe(
+        'foo',
+        'chain_subscribeNewHeads',
+        ['baz'],
+        cb
+      );
+
+      chain._triggerCallback({
+        jsonrpc: '2.0',
+        method: 'foo',
+        params: {
+          error: 'boom',
+          subscription: unsubscribeToken
+        }
+      });
+
+      expect(token).toBe(unsubscribeToken);
+      expect(cb).toHaveBeenCalledTimes(1);
+      expect(cb.mock.lastCall![0]).toBeInstanceOf(Error);
+      expect(cb.mock.lastCall![1]).toBe(undefined);
+    });
+
+    it('errors when subscribing to an unsupported method', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+
+      setChainSyncyingStatus(false);
+      await wait(0);
+
+      await expect(
+        provider.subscribe('foo', 'bar', ['baz'], () => {})
+      ).rejects.toThrowError('Unsupported subscribe method: bar');
+    });
+  });
+
+  describe('unsubscribe', () => {
+    it('rejects when trying to unsubscribe from un unexisting subscription', async () => {
+      const provider = new ScProvider('');
+
+      await provider.connect();
+
+      setChainSyncyingStatus(false);
+
+      await expect(provider.unsubscribe('', '', '')).rejects.toThrowError(
+        'Unable to find active subscription=::'
+      );
+    });
+  });
+
+  it('cleans up the stale subscriptions once it reconnects', async () => {
+    const provider = new ScProvider('');
+
+    await provider.connect();
+    const chain = mockedConnector.latestChain();
+
+    // setting the syncing status of the chain to fals so that the Provider
+    // gets `connected`
+    setChainSyncyingStatus(false);
+
+    // while connected we create a subscription
+    const unsubscribeToken = 'unsubscribeToken';
+
+    setTimeout(() => {
+      chain._triggerCallback({
+        jsonrpc: '2.0',
+        id: 1,
+        result: unsubscribeToken
+      });
+    }, 0);
+
+    const cb = jest.fn();
+    const token = await provider.subscribe(
+      'foo',
+      'chain_subscribeNewHeads',
+      ['baz'],
+      cb
+    );
+
+    // setting the syncing status of the chain to fals so that the Provider
+    // gets `disconnected`
+    setChainSyncyingStatus(true);
+
+    // let's wait some time in order to ensure that the stale unsubscription
+    // messages are not sent until the chain syncing status changes back to false
+    await wait(200);
+
+    // before we let the healthChecker know that the chain is no longer syncing,
+    // let's make sure that the chain has received the correct request, and
+    // most importantly that it has not received a request for unsubscribing
+    // from the stale subscription, since that request should happen once the
+    // chain is no longer syncing
+    expect(chain._recevedRequests()).toEqual([
+      '{"id":1,"jsonrpc":"2.0","method":"chain_subscribeNewHeads","params":["baz"]}'
+    ]);
+
+    // lets change the sync status back to false
+    setChainSyncyingStatus(false);
+
+    // let's wait one tick to ensure that the microtasks got processed
+    await wait(0);
+
+    // let's make sure that we have now sent the request for killing the
+    // stale subscription
+    expect(chain._recevedRequests()).toEqual([
+      '{"id":1,"jsonrpc":"2.0","method":"chain_subscribeNewHeads","params":["baz"]}',
+      `{"id":2,"jsonrpc":"2.0","method":"chain_unsubscribeNewHeads","params":["${token}"]}`
+    ]);
+  });
+});

packages/rpc-provider/src/substrate-connect/ScProvider.ts

@@ -0,0 +1,350 @@
+// Copyright 2017-2022 @polkadot/rpc-provider authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { JsonRpcResponse, ProviderInterface, ProviderInterfaceCallback, ProviderInterfaceEmitCb, ProviderInterfaceEmitted } from '../types';
+
+import { Chain, createScClient, ScClient, WellKnownChain } from '@substrate/connect';
+import EventEmitter from 'eventemitter3';
+
+import { assert, isError } from '@polkadot/util';
+
+import { RpcCoder } from '../coder';
+import { healthChecker } from './Health';
+
+type ResponseCallback = (response: string | Error) => void
+
+// These methods have been taken from:
+// https://github.com/paritytech/smoldot/blob/17425040ddda47d539556eeaf62b88c4240d1d42/src/json_rpc/methods.rs#L338-L462
+// It's important to take into account that smoldot is adding support to the new
+// json-rpc-interface https://paritytech.github.io/json-rpc-interface-spec/
+// However, at the moment this list only includes methods that belong to the "old" API
+const subscriptionUnsubscriptionMethods = new Map<string, string>([
+  ['author_submitAndWatchExtrinsic', 'author_unwatchExtrinsic'],
+  ['chain_subscribeAllHeads', 'chain_unsubscribeAllHeads'],
+  ['chain_subscribeFinalizedHeads', 'chain_unsubscribeFinalizedHeads'],
+  ['chain_subscribeFinalisedHeads', 'chain_subscribeFinalisedHeads'],
+  ['chain_subscribeNewHeads', 'chain_unsubscribeNewHeads'],
+  ['chain_subscribeNewHead', 'chain_unsubscribeNewHead'],
+  ['chain_subscribeRuntimeVersion', 'chain_unsubscribeRuntimeVersion'],
+  ['subscribe_newHead', 'unsubscribe_newHead'],
+  ['state_subscribeRuntimeVersion', 'state_unsubscribeRuntimeVersion'],
+  ['state_subscribeStorage', 'state_unsubscribeStorage']
+]);
+
+const wellKnownChains = new Set(Object.values(WellKnownChain));
+const scClients = new WeakMap<ScProvider, ScClient>();
+
+export { WellKnownChain };
+export class ScProvider implements ProviderInterface {
+  readonly #coder: RpcCoder = new RpcCoder();
+  readonly #spec: string | WellKnownChain;
+  readonly #sharedSandbox?: ScProvider;
+  readonly #subscriptions: Map<
+  string,
+  [ResponseCallback, { unsubscribeMethod: string; id: string | number }]
+  > = new Map();
+
+  readonly #requests: Map<number, ResponseCallback> = new Map();
+  readonly #eventemitter: EventEmitter = new EventEmitter();
+  #chain: Promise<Chain> | null = null;
+  #isChainReady = false;
+
+  public constructor (spec: string | WellKnownChain, sharedSandbox?: ScProvider) {
+    this.#spec = spec;
+    this.#sharedSandbox = sharedSandbox;
+  }
+
+  public get hasSubscriptions (): boolean {
+    // Indicates that subscriptions are supported
+    return true;
+  }
+
+  public get isConnected (): boolean {
+    return !!this.#chain && this.#isChainReady;
+  }
+
+  public clone (): ProviderInterface {
+    throw new Error('clone() is not supported.');
+  }
+
+  async connect (): Promise<void> {
+    assert(!this.isConnected, 'Already connected!');
+
+    // it could happen that after emitting `disconnected` due to the fact taht
+    // smoldot is syncing, the consumer tries to reconnect after a certain amount
+    // of time... In which case we want to make sure that we don't create a new
+    // chain.
+    if (this.#chain) {
+      await this.#chain;
+
+      return;
+    }
+
+    if (this.#sharedSandbox && !this.#sharedSandbox.isConnected) {
+      await this.#sharedSandbox.connect();
+    }
+
+    const client = this.#sharedSandbox
+      ? scClients.get(this.#sharedSandbox)
+      : createScClient();
+
+    assert(client, 'Unkown ScProvider!');
+    scClients.set(this, client);
+
+    const hc = healthChecker();
+
+    const onResponse = (res: string): void => {
+      const hcRes = hc.responsePassThrough(res);
+
+      if (!hcRes) {
+        return;
+      }
+
+      const response = JSON.parse(hcRes) as JsonRpcResponse;
+      let decodedResponse: string | Error;
+
+      try {
+        decodedResponse = this.#coder.decodeResponse(response) as string;
+      } catch (e) {
+        decodedResponse = e as Error;
+      }
+
+      // It's not a subscription message, but rather a standar RPC response
+      if (response.params?.subscription === undefined || !response.method) {
+        return this.#requests.get(response.id)?.(decodedResponse);
+      }
+
+      // We are dealing with a subscription message
+      const subscriptionId = `${response.method}::${response.params.subscription}`;
+
+      const callback = this.#subscriptions.get(subscriptionId)?.[0];
+
+      callback?.(decodedResponse);
+    };
+
+    const addChain = wellKnownChains.has(this.#spec as WellKnownChain)
+      ? client.addWellKnownChain
+      : client.addChain;
+
+    this.#chain = addChain(this.#spec as WellKnownChain, onResponse).then((chain) => {
+      hc.setSendJsonRpc(chain.sendJsonRpc);
+
+      this.#isChainReady = false;
+
+      const cleanup = () => {
+        // If there are any callbacks left, we have to reject/error them.
+        // Otherwise, that would cause a memory leak.
+        const disconnectionError = new Error('Disconnected');
+
+        this.#requests.forEach((cb) => cb(disconnectionError));
+        this.#subscriptions.forEach(([cb]) => cb(disconnectionError));
+        this.#subscriptions.clear();
+      };
+
+      const staleSubscriptions: {
+        unsubscribeMethod: string
+        id: number | string
+      }[] = [];
+
+      const killStaleSubscriptions = () => {
+        if (staleSubscriptions.length === 0) {
+          return;
+        }
+
+        const stale = staleSubscriptions.pop();
+
+        assert(stale, 'Unable to get stale subscription');
+
+        const { id, unsubscribeMethod } = stale;
+
+        Promise
+          .race([
+            this.send(unsubscribeMethod, [id]).catch(() => undefined),
+            new Promise((resolve) => setTimeout(resolve, 500))
+          ])
+          .then(killStaleSubscriptions)
+          .catch(() => undefined);
+      };
+
+      hc.start((health) => {
+        const isReady =
+          !health.isSyncing && (health.peers > 0 || !health.shouldHavePeers);
+
+        // if it's the same as before, then nothing has changed and we are done
+        if (this.#isChainReady === isReady) {
+          return;
+        }
+
+        this.#isChainReady = isReady;
+
+        if (!isReady) {
+          // If we've reached this point, that means that the chain used to be "ready"
+          // and now we are about to emit `disconnected`.
+          //
+          // This will cause the PolkadotJs API think that the connection is
+          // actually dead. In reality the smoldot chain is not dead, of course.
+          // However, we have to cleanup all the existing callbacks because when
+          // the smoldot chain stops syncing, then we will emit `connected` and
+          // the PolkadotJs API will try to re-create the previous
+          // subscriptions and requests. Although, now is not a good moment
+          // to be sending unsubscription messages to the smoldot chain, we
+          // should wait until is no longer syncing to send the unsubscription
+          // messages from the stale subscriptions of the previous connection.
+          //
+          // That's why -before we perform the cleanup of `this.#subscriptions`-
+          // we keep the necessary information that we will need later on to
+          // kill the stale subscriptions.
+          [...this.#subscriptions.values()].forEach((s) => {
+            staleSubscriptions.push(s[1]);
+          });
+          cleanup();
+        } else {
+          killStaleSubscriptions();
+        }
+
+        this.#eventemitter.emit(isReady ? 'connected' : 'disconnected');
+      });
+
+      return {
+        ...chain,
+        remove: () => {
+          hc.stop();
+          chain.remove();
+          cleanup();
+        },
+        sendJsonRpc: hc.sendJsonRpc.bind(hc)
+      };
+    });
+
+    try {
+      await this.#chain;
+    } catch (e) {
+      this.#chain = null;
+      this.#eventemitter.emit('error', e);
+      throw e;
+    }
+  }
+
+  async disconnect (): Promise<void> {
+    if (!this.#chain) {
+      return;
+    }
+
+    const chain = await this.#chain;
+
+    this.#chain = null;
+    this.#isChainReady = false;
+
+    try {
+      chain.remove();
+    } catch (_) {}
+
+    this.#eventemitter.emit('disconnected');
+  }
+
+  public on (
+    type: ProviderInterfaceEmitted,
+    sub: ProviderInterfaceEmitCb
+  ): () => void {
+    // It's possible. Although, quite unlikely, that by the time that polkadot
+    // subscribes to the `connected` event, the Provider is already connected.
+    // In that case, we must emit to let the consumer know that we are connected.
+    if (type === 'connected' && this.isConnected) {
+      sub();
+    }
+
+    this.#eventemitter.on(type, sub);
+
+    return (): void => {
+      this.#eventemitter.removeListener(type, sub);
+    };
+  }
+
+  public async send<T = any> (method: string, params: unknown[]): Promise<T> {
+    assert(this.isConnected && this.#chain, 'Provider is not connected');
+
+    const chain = await this.#chain;
+    const [id, json] = this.#coder.encodeJson(method, params);
+
+    const result = new Promise<T>((resolve, reject): void => {
+      this.#requests.set(id, (response) => {
+        (isError(response) ? reject : resolve)(response as unknown as T);
+      });
+
+      try {
+        chain.sendJsonRpc(json);
+      } catch (e) {
+        this.#chain = null;
+
+        try {
+          chain.remove();
+        } catch (_) {}
+
+        this.#eventemitter.emit('error', e);
+      }
+    });
+
+    try {
+      return await result;
+    } finally {
+      // let's ensure that once the Promise is resolved/rejected, then we remove
+      // remove its entry from the internal #requests
+      this.#requests.delete(id);
+    }
+  }
+
+  public async subscribe (
+    type: string,
+    method: string,
+    params: any[],
+    callback: ProviderInterfaceCallback
+  ): Promise<number | string> {
+    assert(
+      subscriptionUnsubscriptionMethods.has(method),
+      `Unsupported subscribe method: ${method}`
+    );
+
+    const id = await this.send<number | string>(method, params);
+    const subscriptionId = `${type}::${id}`;
+
+    const cb = (response: Error | string) => {
+      if (response instanceof Error) {
+        callback(response, undefined);
+      } else {
+        callback(null, response);
+      }
+    };
+
+    const unsubscribeMethod = subscriptionUnsubscriptionMethods.get(method);
+
+    assert(unsubscribeMethod, 'Invalid unsubscribe method found');
+
+    this.#subscriptions.set(subscriptionId, [cb, { id, unsubscribeMethod }]);
+
+    return id;
+  }
+
+  public unsubscribe (
+    type: string,
+    method: string,
+    id: number | string
+  ): Promise<boolean> {
+    assert(
+      this.isConnected,
+      'Provider is not connected'
+    );
+
+    const subscriptionId = `${type}::${id}`;
+
+    if (!this.#subscriptions.has(subscriptionId)) {
+      return Promise.reject(
+        new Error(`Unable to find active subscription=${subscriptionId}`)
+      );
+    }
+
+    this.#subscriptions.delete(subscriptionId);
+
+    return this.send(method, [id]);
+  }
+}
+export type ScProviderClass = typeof ScProvider

packages/rpc-provider/src/substrate-connect/index.ts

@@ -0,0 +1,4 @@
+// Copyright 2017-2022 @polkadot/rpc-provider authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export * from './ScProvider';

packages/rpc-provider/src/types.ts

@@ -68,6 +68,8 @@ export interface ProviderStats {
     subscriptions: number;
   };
   total: {
+    bytesRecv: number;
+    bytesSent: number;
     cached: number;
     requests: number;
     subscriptions: number;

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

@@ -107,6 +107,8 @@ export class WsProvider implements ProviderInterface {
 
   #subscriptions: Record<string, WsStateSubscription> = {};
 
+  #timeoutId?: NodeJS.Timeout | null = null;
+
   #websocket: WebSocket | null;
 
   /**
@@ -133,7 +135,7 @@ export class WsProvider implements ProviderInterface {
     this.#websocket = null;
     this.#stats = {
       active: { requests: 0, subscriptions: 0 },
-      total: { cached: 0, requests: 0, subscriptions: 0, timeout: 0 }
+      total: { bytesRecv: 0, bytesSent: 0, cached: 0, requests: 0, subscriptions: 0, timeout: 0 }
     };
 
     if (autoConnectMs > 0) {
@@ -147,9 +149,6 @@ export class WsProvider implements ProviderInterface {
         resolve(this);
       });
     });
-
-    // timeout any handlers that have not had a response
-    setInterval(() => this.#timeout(), TIMEOUT_INTERVAL);
   }
 
   /**
@@ -209,6 +208,9 @@ export class WsProvider implements ProviderInterface {
       this.#websocket.onerror = this.#onSocketError;
       this.#websocket.onmessage = this.#onSocketMessage;
       this.#websocket.onopen = this.#onSocketOpen;
+
+      // timeout any handlers that have not had a response
+      this.#timeoutId = setInterval(() => this.#timeout(), TIMEOUT_INTERVAL);
     } catch (error) {
       l.error(error);
 
@@ -293,13 +295,13 @@ export class WsProvider implements ProviderInterface {
   public send <T = any> (method: string, params: unknown[], isCacheable?: boolean, subscription?: SubscriptionHandler): Promise<T> {
     this.#stats.total.requests++;
 
-    const body = this.#coder.encodeJson(method, params);
+    const [id, body] = this.#coder.encodeJson(method, params);
     let resultPromise: Promise<T> | null = isCacheable
       ? this.#callCache.get(body) as Promise<T>
       : null;
 
     if (!resultPromise) {
-      resultPromise = this.#send(body, method, params, subscription);
+      resultPromise = this.#send(id, body, method, params, subscription);
 
       if (isCacheable) {
         this.#callCache.set(body, resultPromise);
@@ -311,20 +313,18 @@ export class WsProvider implements ProviderInterface {
     return resultPromise;
   }
 
-  async #send <T> (json: string, method: string, params: unknown[], subscription?: SubscriptionHandler): Promise<T> {
+  async #send <T> (id: number, body: string, method: string, params: unknown[], subscription?: SubscriptionHandler): Promise<T> {
     return new Promise<T>((resolve, reject): void => {
       try {
         assert(this.isConnected && !isNull(this.#websocket), 'WebSocket is not connected');
 
-        const id = this.#coder.getId();
-
         const callback = (error?: Error | null, result?: T): void => {
           error
             ? reject(error)
             : resolve(result as T);
         };
 
-        l.debug(() => ['calling', method, json]);
+        l.debug(() => ['calling', method, body]);
 
         this.#handlers[id] = {
           callback,
@@ -333,8 +333,8 @@ export class WsProvider implements ProviderInterface {
           start: Date.now(),
           subscription
         };
-
-        this.#websocket.send(json);
+        this.#stats.total.bytesSent += body.length;
+        this.#websocket.send(body);
       } catch (error) {
         reject(error);
       }
@@ -414,6 +414,11 @@ export class WsProvider implements ProviderInterface {
       this.#websocket = null;
     }
 
+    if (this.#timeoutId) {
+      clearInterval(this.#timeoutId);
+      this.#timeoutId = null;
+    }
+
     this.#emit('disconnected');
 
     // reject all hanging requests
@@ -444,6 +449,8 @@ export class WsProvider implements ProviderInterface {
   #onSocketMessage = (message: MessageEvent<string>): void => {
     l.debug(() => ['received', message.data]);
 
+    this.#stats.total.bytesRecv += message.data.length;
+
     const response = JSON.parse(message.data) as JsonRpcResponse;
 
     return isUndefined(response.method)

packages/typegen/package.json

@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "bin": {
     "polkadot-types-chain-info": "./scripts/polkadot-types-chain-info.cjs",
@@ -30,23 +30,23 @@
     "polkadot-types-internal-metadata": "./scripts/polkadot-types-internal-metadata.cjs"
   },
   "dependencies": {
-    "@babel/core": "^7.17.8",
+    "@babel/core": "^7.17.9",
     "@babel/register": "^7.17.7",
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/api": "7.13.1",
-    "@polkadot/api-augment": "7.13.1",
-    "@polkadot/rpc-augment": "7.13.1",
-    "@polkadot/rpc-provider": "7.13.1",
-    "@polkadot/types": "7.13.1",
-    "@polkadot/types-augment": "7.13.1",
-    "@polkadot/types-codec": "7.13.1",
-    "@polkadot/types-create": "7.13.1",
-    "@polkadot/types-support": "7.13.1",
-    "@polkadot/util": "^8.6.1",
-    "@polkadot/x-ws": "^8.6.1",
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/api": "8.0.2",
+    "@polkadot/api-augment": "8.0.2",
+    "@polkadot/rpc-augment": "8.0.2",
+    "@polkadot/rpc-provider": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-augment": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/types-create": "8.0.2",
+    "@polkadot/types-support": "8.0.2",
+    "@polkadot/util": "^9.0.1",
+    "@polkadot/x-ws": "^9.0.1",
     "handlebars": "^4.7.7",
     "websocket": "^1.0.34",
-    "yargs": "^17.3.1"
+    "yargs": "^17.4.0"
   },
   "devDependencies": {
     "@types/websocket": "^1.0.5",

packages/typegen/scripts/execWithSrc.cjs

@@ -5,7 +5,7 @@ module.exports = function (file) {
   let main;
 
   try {
-    main = require(`../${file}.cjs`).main;
+    main = require(`../cjs/${file}.js`).main;
   } catch (error) {
     // required for dev-only setups
     process.env.JEST_WORKER_ID = '123';

packages/typegen/src/generate/tsDef.ts

@@ -77,6 +77,8 @@ function tsEnum (registry: Registry, definitions: Record<string, ModuleTypes>, {
       case TypeDefInfo.Struct:
       case TypeDefInfo.Tuple:
       case TypeDefInfo.Vec:
+      case TypeDefInfo.BTreeMap:
+      case TypeDefInfo.BTreeSet:
       case TypeDefInfo.Option:
       case TypeDefInfo.VecFixed:
       case TypeDefInfo.WrapperKeepOpaque:
@@ -125,6 +127,8 @@ function tsResultGetter (registry: Registry, definitions: Record<string, ModuleT
     case TypeDefInfo.Si:
     case TypeDefInfo.Tuple:
     case TypeDefInfo.Vec:
+    case TypeDefInfo.BTreeMap:
+    case TypeDefInfo.BTreeSet:
     case TypeDefInfo.WrapperKeepOpaque:
     case TypeDefInfo.WrapperOpaque:
       return `${isGetter}${asGetter}`;

packages/typegen/src/packageInfo.ts

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

packages/typegen/src/util/derived.spec.ts

@@ -8,26 +8,37 @@ import { getSimilarTypes } from './derived';
 describe('getSimilarTypes', (): void => {
   let registry: TypeRegistry;
 
+  const mockImports = {
+    codecTypes: {},
+    definitions: {},
+    extrinsicTypes: {},
+    genericTypes: {},
+    ignoredTypes: [],
+    localTypes: {},
+    lookupTypes: {},
+    metadataTypes: {},
+    primitiveTypes: {},
+    typeToModule: {},
+    typesTypes: {}
+  };
+
   beforeAll((): void => {
     registry = new TypeRegistry();
   });
 
   it('handles nested Tuples', (): void => {
-    expect(getSimilarTypes(registry, {}, '(AccountId, (Balance, u32), u64)', {
-      codecTypes: {},
-      definitions: {},
-      extrinsicTypes: {},
-      genericTypes: {},
-      ignoredTypes: [],
-      localTypes: {},
-      lookupTypes: {},
-      metadataTypes: {},
-      primitiveTypes: {},
-      typeToModule: {},
-      typesTypes: {}
-    })).toEqual([
+    expect(getSimilarTypes(registry, {}, '(AccountId, (Balance, u32), u64)', mockImports)).toEqual([
       'ITuple<[AccountId, ITuple<[Balance, u32]>, u64]>',
       '[AccountId | string | Uint8Array, ITuple<[Balance, u32]> | [Balance | AnyNumber | Uint8Array, u32 | AnyNumber | Uint8Array], u64 | AnyNumber | Uint8Array]'
     ]);
   });
+
+  it('handles vectors of slices', (): void => {
+    expect(getSimilarTypes(registry, {}, 'Vec<[u8;4]>', mockImports)).toEqual([
+      'Vec<U8aFixed>'
+    ]);
+    expect(getSimilarTypes(registry, {}, 'Vec<[Balance;8]>', mockImports)).toEqual([
+      'Vec<Vec<Balance>>'
+    ]);
+  });
 });

packages/typegen/src/util/derived.ts

@@ -58,6 +58,8 @@ export function getSimilarTypes (registry: Registry, definitions: Record<string,
         );
 
         possibleTypes.push(`([${subs.join(', ')}])[]`);
+      } else if (subDef.info === TypeDefInfo.VecFixed) {
+        // TODO: Add possibleTypes so imports work
       } else {
         throw new Error(`Unhandled subtype in Vec, ${stringify(subDef)}`);
       }

packages/typegen/src/util/file.ts

@@ -4,6 +4,8 @@
 import fs from 'fs';
 import path from 'path';
 
+import { assert } from '@polkadot/util';
+
 export function writeFile (dest: string, generator: () => string, noLog?: boolean): void {
   !noLog && console.log(`${dest}\n\tGenerating`);
 
@@ -21,5 +23,12 @@ export function writeFile (dest: string, generator: () => string, noLog?: boolea
 }
 
 export function readTemplate (template: string): string {
-  return fs.readFileSync(path.join(__dirname, `../templates/${template}.hbs`)).toString();
+  // NOTE With cjs in a subdir, search one lower as well
+  const file = ['../templates', '../../templates']
+    .map((p) => path.join(__dirname, p, `${template}.hbs`))
+    .find((p) => fs.existsSync(p));
+
+  assert(file, `Unable to locate ${template}.hbs from ${__dirname}`);
+
+  return fs.readFileSync(file).toString();
 }

packages/types-augment/package.json

@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/types": "7.13.1",
-    "@polkadot/types-codec": "7.13.1",
-    "@polkadot/util": "^8.6.1"
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/util": "^9.0.1"
   }
 }

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

@@ -5,13 +5,13 @@
 
 export default {
   /**
-   * Lookup75: kusama_runtime::ProxyType
+   * Lookup76: kusama_runtime::ProxyType
    **/
   KusamaRuntimeProxyType: {
     _enum: ['Any', 'NonTransfer', 'Governance', 'Staking', 'IdentityJudgement', 'CancelProxy', 'Auction', 'Society']
   },
   /**
-   * Lookup252: kusama_runtime::SessionKeys
+   * Lookup253: kusama_runtime::SessionKeys
    **/
   KusamaRuntimeSessionKeys: {
     grandpa: 'SpFinalityGrandpaAppPublic',
@@ -22,7 +22,7 @@ export default {
     authorityDiscovery: 'SpAuthorityDiscoveryAppPublic'
   },
   /**
-   * Lookup326: kusama_runtime::OriginCaller
+   * Lookup327: kusama_runtime::OriginCaller
    **/
   KusamaRuntimeOriginCaller: {
     _enum: {
@@ -129,7 +129,7 @@ export default {
     }
   },
   /**
-   * Lookup392: kusama_runtime::NposCompactSolution24
+   * Lookup393: kusama_runtime::NposCompactSolution24
    **/
   KusamaRuntimeNposCompactSolution24: {
     votes1: 'Vec<(Compact<u32>,Compact<u16>)>',
@@ -158,7 +158,7 @@ export default {
     votes24: 'Vec<(Compact<u32>,[(Compact<u16>,Compact<PerU16>);23],Compact<u16>)>'
   },
   /**
-   * Lookup747: kusama_runtime::Runtime
+   * Lookup748: kusama_runtime::Runtime
    **/
   KusamaRuntimeRuntime: 'Null'
 };

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

@@ -6,7 +6,7 @@ declare module '@polkadot/types/lookup' {
   import type { ITuple } from '@polkadot/types-codec/types';
   import type { PerU16 } from '@polkadot/types/interfaces/runtime';
 
-  /** @name KusamaRuntimeProxyType (75) */
+  /** @name KusamaRuntimeProxyType (76) */
   export interface KusamaRuntimeProxyType extends Enum {
     readonly isAny: boolean;
     readonly isNonTransfer: boolean;
@@ -19,7 +19,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'Any' | 'NonTransfer' | 'Governance' | 'Staking' | 'IdentityJudgement' | 'CancelProxy' | 'Auction' | 'Society';
   }
 
-  /** @name KusamaRuntimeSessionKeys (252) */
+  /** @name KusamaRuntimeSessionKeys (253) */
   export interface KusamaRuntimeSessionKeys extends Struct {
     readonly grandpa: SpFinalityGrandpaAppPublic;
     readonly babe: SpConsensusBabeAppPublic;
@@ -29,7 +29,7 @@ declare module '@polkadot/types/lookup' {
     readonly authorityDiscovery: SpAuthorityDiscoveryAppPublic;
   }
 
-  /** @name KusamaRuntimeOriginCaller (326) */
+  /** @name KusamaRuntimeOriginCaller (327) */
   export interface KusamaRuntimeOriginCaller extends Enum {
     readonly isSystem: boolean;
     readonly asSystem: FrameSupportDispatchRawOrigin;
@@ -45,7 +45,7 @@ declare module '@polkadot/types/lookup' {
     readonly type: 'System' | 'Void' | 'Council' | 'TechnicalCommittee' | 'ParachainsOrigin' | 'XcmPallet';
   }
 
-  /** @name KusamaRuntimeNposCompactSolution24 (392) */
+  /** @name KusamaRuntimeNposCompactSolution24 (393) */
   export interface KusamaRuntimeNposCompactSolution24 extends Struct {
     readonly votes1: Vec<ITuple<[Compact<u32>, Compact<u16>]>>;
     readonly votes2: Vec<ITuple<[Compact<u32>, ITuple<[Compact<u16>, Compact<PerU16>]>, Compact<u16>]>>;
@@ -73,7 +73,7 @@ declare module '@polkadot/types/lookup' {
     readonly votes24: Vec<ITuple<[Compact<u32>, Vec<ITuple<[Compact<u16>, Compact<PerU16>]>>, Compact<u16>]>>;
   }
 
-  /** @name KusamaRuntimeRuntime (747) */
+  /** @name KusamaRuntimeRuntime (748) */
   export type KusamaRuntimeRuntime = Null;
 
 } // declare module

packages/types-augment/src/packageInfo.ts

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

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

@@ -22,6 +22,7 @@ import type { ContractConstructorSpecLatest, ContractConstructorSpecV0, Contract
 import type { FundIndex, FundInfo, LastContribution, TrieIndex } from '@polkadot/types/interfaces/crowdloan';
 import type { ConfigData, MessageId, OverweightIndex, PageCounter, PageIndexData } from '@polkadot/types/interfaces/cumulus';
 import type { AccountVote, AccountVoteSplit, AccountVoteStandard, Conviction, Delegations, PreimageStatus, PreimageStatusAvailable, PriorLock, PropIndex, Proposal, ProxyState, ReferendumIndex, ReferendumInfo, ReferendumInfoFinished, ReferendumInfoTo239, ReferendumStatus, Tally, Voting, VotingDelegating, VotingDirect, VotingDirectVote } from '@polkadot/types/interfaces/democracy';
+import type { BlockStats } from '@polkadot/types/interfaces/dev';
 import type { ApprovalFlag, DefunctVoter, Renouncing, SetIndex, Vote, VoteIndex, VoteThreshold, VoterInfo } from '@polkadot/types/interfaces/elections';
 import type { CreatedBlock, ImportedAux } from '@polkadot/types/interfaces/engine';
 import type { BlockV0, BlockV1, BlockV2, EIP1559Transaction, EIP2930Transaction, EthAccessList, EthAccessListItem, EthAccount, EthAddress, EthBlock, EthBloom, EthCallRequest, EthFilter, EthFilterAddress, EthFilterChanges, EthFilterTopic, EthFilterTopicEntry, EthFilterTopicInner, EthHeader, EthLog, EthReceipt, EthRichBlock, EthRichHeader, EthStorageProof, EthSubKind, EthSubParams, EthSubResult, EthSyncInfo, EthSyncStatus, EthTransaction, EthTransactionAction, EthTransactionCondition, EthTransactionRequest, EthTransactionSignature, EthTransactionStatus, EthWork, EthereumAccountId, EthereumAddress, EthereumLookupSource, EthereumSignature, LegacyTransaction, TransactionV0, TransactionV1, TransactionV2 } from '@polkadot/types/interfaces/eth';
@@ -52,7 +53,7 @@ import type { Bid, BidKind, SocietyJudgement, SocietyVote, StrikeCount, Vouching
 import type { ActiveEraInfo, CompactAssignments, CompactAssignmentsTo257, CompactAssignmentsTo265, CompactAssignmentsWith16, CompactAssignmentsWith24, CompactScore, CompactScoreCompact, ElectionCompute, ElectionPhase, ElectionResult, ElectionScore, ElectionSize, ElectionStatus, EraIndex, EraPoints, EraRewardPoints, EraRewards, Exposure, ExtendedBalance, Forcing, IndividualExposure, KeyType, MomentOf, Nominations, NominatorIndex, NominatorIndexCompact, OffchainAccuracy, OffchainAccuracyCompact, PhragmenScore, Points, RawSolution, RawSolutionTo265, RawSolutionWith16, RawSolutionWith24, ReadySolution, RewardDestination, RewardPoint, RoundSnapshot, SeatHolder, SignedSubmission, SignedSubmissionOf, SignedSubmissionTo276, SlashJournalEntry, SlashingSpans, SlashingSpansTo204, SolutionOrSnapshotSize, SolutionSupport, SolutionSupports, SpanIndex, SpanRecord, StakingLedger, StakingLedgerTo223, StakingLedgerTo240, SubmissionIndicesOf, Supports, UnappliedSlash, UnappliedSlashOther, UnlockChunk, ValidatorIndex, ValidatorIndexCompact, ValidatorPrefs, ValidatorPrefsTo145, ValidatorPrefsTo196, ValidatorPrefsWithBlocked, ValidatorPrefsWithCommission, VoteWeight, Voter } from '@polkadot/types/interfaces/staking';
 import type { ApiId, BlockTrace, BlockTraceEvent, BlockTraceEventData, BlockTraceSpan, KeyValueOption, MigrationStatusResult, ReadProof, RuntimeVersion, RuntimeVersionApi, RuntimeVersionPartial, SpecVersion, StorageChangeSet, TraceBlockResponse, TraceError } from '@polkadot/types/interfaces/state';
 import type { WeightToFeeCoefficient } from '@polkadot/types/interfaces/support';
-import type { AccountInfo, AccountInfoWithDualRefCount, AccountInfoWithProviders, AccountInfoWithRefCount, AccountInfoWithRefCountU8, AccountInfoWithTripleRefCount, ApplyExtrinsicResult, ArithmeticError, BlockLength, BlockWeights, ChainProperties, ChainType, ConsumedWeight, DigestOf, DispatchClass, DispatchError, DispatchErrorModule, DispatchErrorTo198, DispatchInfo, DispatchInfoTo190, DispatchInfoTo244, DispatchOutcome, DispatchResult, DispatchResultOf, DispatchResultTo198, Event, EventId, EventIndex, EventRecord, Health, InvalidTransaction, Key, LastRuntimeUpgradeInfo, NetworkState, NetworkStatePeerset, NetworkStatePeersetInfo, NodeRole, NotConnectedPeer, Peer, PeerEndpoint, PeerEndpointAddr, PeerInfo, PeerPing, PerDispatchClassU32, PerDispatchClassWeight, PerDispatchClassWeightsPerClass, Phase, RawOrigin, RefCount, RefCountTo259, SyncState, SystemOrigin, TokenError, TransactionValidityError, UnknownTransaction, WeightPerClass } from '@polkadot/types/interfaces/system';
+import type { AccountInfo, AccountInfoWithDualRefCount, AccountInfoWithProviders, AccountInfoWithRefCount, AccountInfoWithRefCountU8, AccountInfoWithTripleRefCount, ApplyExtrinsicResult, ArithmeticError, BlockLength, BlockWeights, ChainProperties, ChainType, ConsumedWeight, DigestOf, DispatchClass, DispatchError, DispatchErrorModule, DispatchErrorModuleU8a, DispatchErrorTo198, DispatchInfo, DispatchInfoTo190, DispatchInfoTo244, DispatchOutcome, DispatchResult, DispatchResultOf, DispatchResultTo198, Event, EventId, EventIndex, EventRecord, Health, InvalidTransaction, Key, LastRuntimeUpgradeInfo, NetworkState, NetworkStatePeerset, NetworkStatePeersetInfo, NodeRole, NotConnectedPeer, Peer, PeerEndpoint, PeerEndpointAddr, PeerInfo, PeerPing, PerDispatchClassU32, PerDispatchClassWeight, PerDispatchClassWeightsPerClass, Phase, RawOrigin, RefCount, RefCountTo259, SyncState, SystemOrigin, TokenError, TransactionValidityError, UnknownTransaction, WeightPerClass } from '@polkadot/types/interfaces/system';
 import type { Bounty, BountyIndex, BountyStatus, BountyStatusActive, BountyStatusCuratorProposed, BountyStatusPendingPayout, OpenTip, OpenTipFinderTo225, OpenTipTip, OpenTipTo225, TreasuryProposal } from '@polkadot/types/interfaces/treasury';
 import type { Multiplier } from '@polkadot/types/interfaces/txpayment';
 import type { ClassDetails, ClassId, ClassMetadata, DepositBalance, DepositBalanceOf, DestroyWitness, InstanceDetails, InstanceId, InstanceMetadata } from '@polkadot/types/interfaces/uniques';
@@ -152,6 +153,7 @@ declare module '@polkadot/types/types/registry' {
     BlockNumber: BlockNumber;
     BlockNumberFor: BlockNumberFor;
     BlockNumberOf: BlockNumberOf;
+    BlockStats: BlockStats;
     BlockTrace: BlockTrace;
     BlockTraceEvent: BlockTraceEvent;
     BlockTraceEventData: BlockTraceEventData;
@@ -305,6 +307,7 @@ declare module '@polkadot/types/types/registry' {
     DispatchClass: DispatchClass;
     DispatchError: DispatchError;
     DispatchErrorModule: DispatchErrorModule;
+    DispatchErrorModuleU8a: DispatchErrorModuleU8a;
     DispatchErrorTo198: DispatchErrorTo198;
     DispatchFeePayment: DispatchFeePayment;
     DispatchInfo: DispatchInfo;

packages/types-codec/package.json

@@ -20,16 +20,16 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/util": "^8.6.1"
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/util": "^9.0.1"
   },
   "devDependencies": {
-    "@polkadot/types": "7.13.1",
-    "@polkadot/types-augment": "7.13.1",
-    "@polkadot/types-support": "7.13.1",
-    "@polkadot/util-crypto": "^8.6.1"
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-augment": "8.0.2",
+    "@polkadot/types-support": "8.0.2",
+    "@polkadot/util-crypto": "^9.0.1"
   }
 }

packages/types-codec/src/extended/BitVec.spec.ts

@@ -11,24 +11,41 @@ const TESTS = ['0x00', '0x0817', '0x0837', '0x087b', '0x0c33'];
 const registry = new TypeRegistry();
 
 describe('BitVec', (): void => {
-  TESTS.forEach((test): void => {
-    describe(test, (): void => {
-      const input = hexToU8a(test);
+  describe('decoding known', (): void => {
+    TESTS.forEach((test): void => {
+      describe(test, (): void => {
+        const input = hexToU8a(test);
+        const bitvec = new BitVec(registry, input);
 
-      it('has the right encodedLength', (): void => {
-        expect(
-          new BitVec(registry, input).encodedLength
-        ).toEqual((test.length - 2) / 2);
-      });
+        it('has the right encodedLength', (): void => {
+          expect(
+            bitvec.encodedLength
+          ).toEqual((test.length - 2) / 2);
+        });
 
-      it('re-encodes to the same input value', (): void => {
-        expect(
-          new BitVec(registry, input).toU8a()
-        ).toEqual(input);
+        it('re-encodes to the same input value', (): void => {
+          expect(
+            bitvec.toU8a()
+          ).toEqual(input);
+        });
       });
     });
   });
 
+  describe('toHuman() ordering', (): void => {
+    it('defaults to Lsb', (): void => {
+      expect(
+        new BitVec(registry, '0x0100010500').toHuman()
+      ).toEqual('0b10000000_00000000_10000000_10100000_00000000');
+    });
+
+    it('can output to Msb', (): void => {
+      expect(
+        new BitVec(registry, '0x0100010500', true).toHuman()
+      ).toEqual('0b00000001_00000000_00000001_00000101_00000000');
+    });
+  });
+
   it('has a sane inspect', (): void => {
     expect(
       new BitVec(registry, '0x0837').inspect()

packages/types-codec/src/extended/BitVec.ts

@@ -41,13 +41,18 @@ function decodeBitVec (value?: AnyU8a): [number, Uint8Array] {
  */
 export class BitVec extends Raw {
   readonly #decodedLength: number;
+  readonly #isMsb?: boolean;
 
-  constructor (registry: Registry, value?: AnyU8a) {
+  // In lieu of having the Msb/Lsb identifiers passed through, we default to assuming
+  // we are dealing with Lsb, which is the default (as of writing) BitVec format used
+  // in the Polkadot code (this only affects the toHuman displays)
+  constructor (registry: Registry, value?: AnyU8a, isMsb = false) {
     const [decodedLength, u8a] = decodeBitVec(value);
 
     super(registry, u8a);
 
     this.#decodedLength = decodedLength;
+    this.#isMsb = isMsb;
   }
 
   /**
@@ -67,7 +72,12 @@ export class BitVec extends Raw {
   }
 
   public override toHuman (): string {
-    return `0b${[...this.toU8a(true)].map((d) => `00000000${d.toString(2)}`.slice(-8)).join('_')}`;
+    return `0b${
+      [...this.toU8a(true)]
+        .map((d) => `00000000${d.toString(2)}`.slice(-8))
+        .map((s) => this.#isMsb ? s : s.split('').reverse().join(''))
+        .join('_')
+    }`;
   }
 
   /**

packages/types-codec/src/native/Text.spec.ts

@@ -23,7 +23,9 @@ describe('Text', (): void => {
     testDecode('Raw', new Raw(registry, Uint8Array.from([102, 111, 111])), 'foo', 'toHuman'); // no length
     testDecode('Bytes', new Bytes(registry, Uint8Array.from([12, 102, 111, 111])), 'foo'); // length-aware encoding
     testDecode('Bytes', new Bytes(registry, Uint8Array.from([12, 102, 111, 111])), 'foo', 'toHuman'); // length-aware encoding
-    testDecode('object with `toString()`', { toString (): string { return 'foo'; } }, 'foo');
+    testDecode('object with `toString()`', { toString (): string {
+      return 'foo';
+    } }, 'foo');
     testDecode('hex input value', new Text(registry, '0x12345678'), '0x12345678', 'toHex');
     testDecode('null', null, '');
   });

packages/types-codec/src/packageInfo.ts

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

packages/types-codec/src/types/registry.ts

@@ -60,7 +60,7 @@ export interface Registry {
   createdAtHash?: IU8a;
 
   findMetaCall (callIndex: Uint8Array): CallFunction;
-  findMetaError (errorIndex: Uint8Array | { error: BN, index: BN }): RegistryError;
+  findMetaError (errorIndex: Uint8Array | { error: BN, index: BN } | { error: BN | Uint8Array, index: BN }): RegistryError;
   findMetaEvent (eventIndex: Uint8Array): CodecClass<any>;
 
   isLookupType (value: string): boolean;

packages/types-create/package.json

@@ -20,14 +20,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/types-codec": "7.13.1",
-    "@polkadot/util": "^8.6.1"
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/util": "^9.0.1"
   },
   "devDependencies": {
-    "@polkadot/types": "7.13.1"
+    "@polkadot/types": "8.0.2"
   }
 }

packages/types-create/src/packageInfo.ts

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

packages/types-known/package.json

@@ -20,14 +20,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/networks": "^8.6.1",
-    "@polkadot/types": "7.13.1",
-    "@polkadot/types-codec": "7.13.1",
-    "@polkadot/types-create": "7.13.1",
-    "@polkadot/util": "^8.6.1"
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/networks": "^9.0.1",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/types-create": "8.0.2",
+    "@polkadot/util": "^9.0.1"
   }
 }

packages/types-known/src/packageInfo.ts

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

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

@@ -15,7 +15,7 @@ const upgrades: ChainUpgradesRaw = [
   [6137912, 2028], [6561855, 2029], [7100891, 2030], [7468792, 9010], [7668600, 9030],
   [7812476, 9040], [8010981, 9050], [8073833, 9070], [8555825, 9080], [8945245, 9090],
   [9611377, 9100], [9625129, 9111], [9866422, 9122], [10403784, 9130], [10960765, 9150],
-  [11006614, 9151], [11404482, 9160], [11601803, 9170]
+  [11006614, 9151], [11404482, 9160], [11601803, 9170], [12008022, 9180]
 ];
 
 export default upgrades;

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

@@ -10,7 +10,7 @@ const upgrades: ChainUpgradesRaw = [
   [1205128, 18], [1603423, 23], [1733218, 24], [2005673, 25], [2436698, 26],
   [3613564, 27], [3899547, 28], [4345767, 29], [4876134, 30], [5661442, 9050],
   [6321619, 9080], [6713249, 9090], [7217907, 9100], [7229126, 9110], [7560558, 9122],
-  [8115869, 9140], [8638103, 9151], [9280179, 9170]
+  [8115869, 9140], [8638103, 9151], [9280179, 9170], [9738717, 9180]
 ];
 
 export default upgrades;

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

@@ -12,7 +12,8 @@ const upgrades: ChainUpgradesRaw = [
   [5124076, 50], [5478664, 900], [5482450, 9000], [5584305, 9010], [5784566, 9030],
   [5879822, 9031], [5896856, 9032], [5897316, 9033], [6117927, 9050], [6210274, 9070],
   [6379314, 9080], [6979141, 9090], [7568453, 9100], [7766394, 9111], [7911691, 9120],
-  [7968866, 9121], [7982889, 9122]
+  [7968866, 9121], [7982889, 9122], [8514322, 9130], [9091726, 9140], [9091774, 9150],
+  [9406726, 9160], [9921066, 9170], [10007115, 9180]
 ];
 
 export default upgrades;

packages/types-support/package.json

@@ -20,10 +20,10 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.13.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@polkadot/util": "^8.6.1"
+    "@babel/runtime": "^7.17.9",
+    "@polkadot/util": "^9.0.1"
   }
 }