[CI Skip] release/stable 3.5.1

skip-checks: true

.123trigger

@@ -8,3 +8,5 @@
 2.8.2
 3.2.2
 3.2.3
+
+3.3.2

CHANGELOG.md

@@ -1,5 +1,56 @@
 # CHANGELOG
 
+## 3.5.1 Jan 18, 2020
+
+Upgrade priority: Low. Recommended for parachain developers.
+
+- **Important** The default for Substrate on the Address types are `MultiAddress`. It is recommended that chains add explicit definitions for `Address` and `LookupSource` in their types, instead of relying on the API-defaults. A future update will swap the API defaults to align with Substrate.
+- **Important** Like the above changes in Substrate, the `AccountInfo` structure has also changed. It is recommended that chain developers explicitly add `AccountInfo: 'AccountInfoWithRefCount'` for the version with `refCount` on and `AccountInfoWithProviders` for the latest Substrate version. As per the above, the API defaults will be changed to align with Substrate.
+
+Contributed:
+
+- Apply correct TypeScript type for `toBigInt()` (Thanks to https://github.com/ianhe8x)
+- Expand type definitions for storage key tuples (Thanks to https://github.com/monitz87)
+- Adjust bounty derive to cater for non-council chains (Thanks to https://github.com/ekowalsk)
+
+Changes:
+
+- Remove recursion in vector/struct U8a stream decoding
+- Availability of staking made optional in session length calcs (era does require it)
+- Updates to parachain types, ensuring it has coverage for all the latest
+- Update all Rococo types to the latest (session keys, session reports, parachain indexes)
+- Update known upgrade checkpoints fo WestEnd
+- Add types of the lottery module in Substrate
+- Add and extend types for the crowdloan module in Polkadot
+- Adjust node-template to default to `MultiAddress` on specVersion >= 100
+
+
+## 3.4.1 Jan 11, 2020
+
+Upgrade priority: Low. Fixes for parachain types, `.entries()` (with no values) and `event.is(...)` checks, users of these interfaces will have benefit.
+
+- **Breaking change** The `derive.chain.{getBlock, subscribeNewBlocks}` now return `SignedBlockExtended`, all with the actual extrinsics and events mapped. Users of the latter interface should take note.
+
+Contributed:
+
+- Fix `SessionKeys{6-9}` definitions (Thanks to https://github.com/icodezjb)
+- Support `Vec<(a, b)>` in enums (Thanks to https://github.com/monitz87)
+- Add motions to bounty derive (Thanks to https://github.com/ekowalsk)
+
+Changes:
+
+- `derive.chain.getBlock()` now maps events to extrinsics via `.extrinsics` getter
+- Ensure dispatchInfo is extracted on failed extrinsics (`getBlock` derive)
+- Allow specification of additional signed extrinsic via API options
+- Add missing parachain types, `ParaGenesisArgs`
+- Correct `EthTransaction` type (as per the correct cargo crate)
+- Update with latest contract types for Substrate master
+- Update alias mapping for asset palette (including Substrate starting defaults)
+- Allow `.entries()` call where 0 keys are present
+- Fix `.is` on events not checking the correct index
+- Construction of `i*` types ow correctly checks for max positive/negative
+
+
 ## 3.3.1 Jan 4, 2021
 
 Upgrade priority: Low. Recommended for users of frontier evm module with additional types.

package.json

@@ -28,11 +28,11 @@
     "@babel/core": "^7.12.10",
     "@babel/register": "^7.12.10",
     "@babel/runtime": "^7.12.5",
-    "@polkadot/dev": "^0.61.22",
+    "@polkadot/dev": "^0.61.24",
     "@polkadot/ts": "^0.3.59",
     "@polkadot/typegen": "workspace:packages/typegen",
-    "@types/jest": "^26.0.19",
+    "@types/jest": "^26.0.20",
     "copyfiles": "^2.4.1"
   },
-  "version": "3.3.1"
+  "version": "3.5.1"
 }

packages/api-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "3.3.1",
+  "version": "3.5.1",
   "description": "Interfaces for interacting with contracts and contract ABIs",
   "main": "index.js",
   "module": "index.mjs",
@@ -14,10 +14,10 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/api": "3.3.1",
-    "@polkadot/types": "3.3.1",
-    "@polkadot/util": "^5.2.3",
-    "@polkadot/x-rxjs": "3.3.1",
+    "@polkadot/api": "3.5.1",
+    "@polkadot/types": "3.5.1",
+    "@polkadot/util": "^5.3.1",
+    "@polkadot/x-rxjs": "3.5.1",
     "bn.js": "^4.11.9"
   }
 }

packages/api-derive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "3.3.1",
+  "version": "3.5.1",
   "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
   "main": "index.js",
   "module": "index.mjs",
@@ -14,16 +14,16 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-derive#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/api": "3.3.1",
-    "@polkadot/rpc-core": "3.3.1",
-    "@polkadot/types": "3.3.1",
-    "@polkadot/util": "^5.2.3",
-    "@polkadot/util-crypto": "^5.2.3",
-    "@polkadot/x-rxjs": "3.3.1",
+    "@polkadot/api": "3.5.1",
+    "@polkadot/rpc-core": "3.5.1",
+    "@polkadot/types": "3.5.1",
+    "@polkadot/util": "^5.3.1",
+    "@polkadot/util-crypto": "^5.3.1",
+    "@polkadot/x-rxjs": "3.5.1",
     "bn.js": "^4.11.9"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^5.2.3",
-    "@polkadot/rpc-provider": "3.3.1"
+    "@polkadot/keyring": "^5.3.1",
+    "@polkadot/rpc-provider": "3.5.1"
   }
 }

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

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { AccountIndex } from '@polkadot/types/interfaces';
 import type { Observable } from '@polkadot/x-rxjs';
 import type { AccountIndexes } from '../types';
 
@@ -18,7 +17,7 @@ function queryAccounts (api: ApiInterfaceRx): Observable<AccountIndexes> {
     map((entries): AccountIndexes =>
       entries.reduce((indexes: AccountIndexes, [key, idOpt]): AccountIndexes => {
         if (idOpt.isSome) {
-          indexes[idOpt.unwrap()[0].toString()] = key.args[0] as AccountIndex;
+          indexes[idOpt.unwrap()[0].toString()] = key.args[0];
         }
 
         return indexes;

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

@@ -1,16 +1,20 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { ApiInterfaceRx, SubmittableExtrinsic } from '@polkadot/api/types';
 import type { Bytes, Option, StorageKey } from '@polkadot/types';
-import type { Bounty, BountyIndex } from '@polkadot/types/interfaces';
+import type { Bounty, BountyIndex, ProposalIndex } from '@polkadot/types/interfaces';
 import type { Codec, InterfaceTypes } from '@polkadot/types/types';
 
+import { ApiPromise } from '@polkadot/api';
+import { DeriveCollectiveProposal } from '@polkadot/api-derive/types';
+import { Proposal } from '@polkadot/types/interfaces';
 import { of } from '@polkadot/x-rxjs';
 
 import { BountyFactory } from '../../test/bountyFactory';
 import { BytesFactory } from '../../test/bytesFactory';
 import { createApiWithAugmentations } from '../../test/helpers';
+import { ProposalFactory } from '../../test/proposalFactory';
 import { bounties } from '.';
 
 const DEFAULT_PROPOSER = '5C4hrfjw9DjXZTzV3MwzrrAr9P1MJhSrvWGWqi1eSuyUpnhM';
@@ -21,22 +25,62 @@ describe('bounties derive', () => {
   let emptyOption: <T extends Codec> (typeName: keyof InterfaceTypes) => Option<T>;
   let optionOf: <T extends Codec> (value: T)=> Option<T>;
   let bountyIndex: (index: number) => BountyIndex;
+  let proposalIndex: (index: number) => ProposalIndex;
   let bytes: (value: string) => Bytes;
+  let api: ApiPromise;
+  let createProposal: (method: SubmittableExtrinsic<'promise'>) => Proposal;
+  let defaultMockApi: ApiInterfaceRx;
 
   beforeAll(() => {
-    const api = createApiWithAugmentations();
+    api = createApiWithAugmentations();
 
     ({ bountyIndex, defaultBounty, emptyOption, optionOf, storageKey } = new BountyFactory(api));
     ({ bytes } = new BytesFactory(api.registry));
+    ({ createProposal, proposalIndex } = new ProposalFactory(api));
+  });
+
+  beforeEach(() => {
+    defaultMockApi = {
+      derive: {
+        council: {
+          proposals: () => of([] as DeriveCollectiveProposal[])
+        }
+      },
+      query: {
+        council: {
+          proposalCount: () => of(proposalIndex(2))
+        },
+        treasury: {
+          bounties: {
+            keys: () => of([storageKey(0), storageKey(1)]),
+            multi: () => of([optionOf(defaultBounty()), optionOf(defaultBounty())])
+          },
+          bountyCount: () => of(bountyIndex(2)),
+          bountyDescriptions: {
+            multi: () => of([
+              optionOf(bytes('make polkadot even better')),
+              optionOf(bytes('some other bounty'))
+            ])
+          }
+        }
+      },
+      tx: api.tx
+    } as unknown as ApiInterfaceRx;
   });
 
   it('creates storage key', function () {
     expect(storageKey(194).args[0].eq(194)).toBe(true);
   });
 
+  it('creates proposal', function () {
+    expect(createProposal(api.tx.balances.transfer('5EYCAe5ijiYfyeZ2JJCGq56LmPyNRAKzpG4QkoQkkQNB5e6Z', 1))).toBeTruthy();
+  });
+
   it('combines bounties with descriptions', async () => {
     const mockApi = {
+      ...defaultMockApi,
       query: {
+        ...defaultMockApi.query,
         treasury: {
           bounties: {
             keys: () => of([storageKey(0), storageKey(2), storageKey(3)]),
@@ -64,4 +108,54 @@ describe('bounties derive', () => {
     expect(result[1].description).toEqual('');
     expect(result[1].index.eq(3)).toBe(true);
   });
+
+  it('returns motions', async () => {
+    const result = await bounties('', defaultMockApi)().toPromise();
+
+    expect(result).toHaveLength(2);
+    expect(result[0].proposals).toHaveLength(0);
+    expect(result[1].proposals).toHaveLength(0);
+  });
+
+  it('when no council, returns bounties without motions', async () => {
+    const mockApi = {
+      ...defaultMockApi,
+      query: {
+        ...defaultMockApi.query,
+        council: null
+      }
+    } as unknown as ApiInterfaceRx;
+
+    const result = await bounties('', mockApi)().toPromise();
+
+    expect(result).toHaveLength(2);
+    expect(result[0].bounty.proposer.toString()).toEqual(DEFAULT_PROPOSER);
+    expect(result[0].description).toEqual('make polkadot even better');
+    expect(result[0].index.eq(0)).toBe(true);
+    expect(result[0].proposals).toHaveLength(0);
+    expect(result[1].bounty.proposer.toString()).toEqual(DEFAULT_PROPOSER);
+    expect(result[1].description).toEqual('some other bounty');
+    expect(result[1].index.eq(1)).toBe(true);
+    expect(result[1].proposals).toHaveLength(0);
+  });
+
+  it('combines bounties with motions', async () => {
+    const mockApi = {
+      ...defaultMockApi,
+      derive: {
+        council: {
+          proposals: () => of([
+            { proposal: createProposal(api.tx.bounties.approveBounty(1)) },
+            { proposal: createProposal(api.tx.treasury.approveProposal(1)) }] as DeriveCollectiveProposal[])
+        }
+      }
+    } as unknown as ApiInterfaceRx;
+
+    const result = await bounties('', mockApi)().toPromise();
+
+    expect(result).toHaveLength(2);
+    expect(result[0].proposals).toHaveLength(0);
+    expect(result[1].proposals).toHaveLength(1);
+    expect(result[1].proposals[0].proposal.method).toEqual('approveBounty');
+  });
 });

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

@@ -2,17 +2,19 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { DeriveBounties } from '@polkadot/api-derive/types';
-import type { Bytes, Option } from '@polkadot/types';
-import type { Bounty, BountyIndex } from '@polkadot/types/interfaces';
+import type { DeriveBounties, DeriveCollectiveProposal } from '@polkadot/api-derive/types';
+import type { Bytes, Option, StorageKey } from '@polkadot/types';
+import type { Bounty, BountyIndex, ProposalIndex } from '@polkadot/types/interfaces';
 
 import { memo } from '@polkadot/api-derive/util';
 import { combineLatest, Observable, of } from '@polkadot/x-rxjs';
 import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
-type Result = [Option<Bounty>[], Option<Bytes>[], BountyIndex[]];
+import { filterBountiesProposals } from './helpers/filterBountyProposals';
 
-function parseResult (api: ApiInterfaceRx, [maybeBounties, maybeDescriptions, ids]: Result): DeriveBounties {
+type Result = [Option<Bounty>[], Option<Bytes>[], BountyIndex[], DeriveCollectiveProposal[]];
+
+function parseResult ([maybeBounties, maybeDescriptions, ids, bountyProposals]: Result): DeriveBounties {
   const bounties: DeriveBounties = [];
 
   maybeBounties.forEach((bounty, index) => {
@@ -20,7 +22,8 @@ function parseResult (api: ApiInterfaceRx, [maybeBounties, maybeDescriptions, id
       bounties.push({
         bounty: bounty.unwrap(),
         description: maybeDescriptions[index].unwrapOrDefault().toUtf8(),
-        index: ids[index]
+        index: ids[index],
+        proposals: bountyProposals.filter((bountyProposal) => ids[index].eq(bountyProposal.proposal.args[0]))
       });
     }
   });
@@ -29,23 +32,30 @@ function parseResult (api: ApiInterfaceRx, [maybeBounties, maybeDescriptions, id
 }
 
 export function bounties (instanceId: string, api: ApiInterfaceRx): () => Observable<DeriveBounties> {
-  const bountyBase = api.query.bounties
-    ? api.query.bounties
-    : api.query.treasury;
+  const bountyBase = api.query.bounties ? api.query.bounties : api.query.treasury;
 
   return memo(instanceId, (): Observable<DeriveBounties> =>
-    bountyBase.bountyCount<BountyIndex>().pipe(
-      switchMap(() => bountyBase.bounties.keys()),
-      switchMap((keys): Observable<Result> => {
-        const ids = keys.map(({ args: [id] }) => id as BountyIndex);
+    combineLatest([
+      bountyBase.bountyCount<BountyIndex>(),
+      api.query.council ? api.query.council.proposalCount<ProposalIndex>() : of(0)
+    ]).pipe(
+      switchMap(() =>
+        combineLatest([
+          bountyBase.bounties.keys(),
+          api.derive.council ? api.derive.council.proposals() : of([])
+        ])
+      ),
+      switchMap(([keys, proposals]): Observable<Result> => {
+        const ids = (keys as StorageKey<[BountyIndex]>[]).map(({ args: [id] }) => id);
 
         return combineLatest([
           bountyBase.bounties.multi<Option<Bounty>>(ids),
           bountyBase.bountyDescriptions.multi<Option<Bytes>>(ids),
-          of(ids)
+          of(ids),
+          of(filterBountiesProposals(api, proposals))
         ]);
       }),
-      map(([maybeBounties, maybeDescriptions, ids]) => parseResult(api, [maybeBounties, maybeDescriptions, ids]))
+      map(parseResult)
     )
   );
 }

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

@@ -0,0 +1,12 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { ApiInterfaceRx } from '@polkadot/api/types';
+import { DeriveCollectiveProposal } from '@polkadot/api-derive/types';
+
+export function filterBountiesProposals (api: ApiInterfaceRx, allProposals: DeriveCollectiveProposal[]): DeriveCollectiveProposal[] {
+  const bountyTxBase = api.tx.bounties ? api.tx.bounties : api.tx.treasury;
+  const bountyProposalCalls = [bountyTxBase.approveBounty, bountyTxBase.closeBounty, bountyTxBase.proposeCurator, bountyTxBase.unassignCurator];
+
+  return allProposals.filter((proposal) => bountyProposalCalls.find((bountyCall) => bountyCall.is(proposal.proposal)));
+}

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

@@ -27,12 +27,13 @@ export function getBlock (instanceId: string, api: ApiInterfaceRx): (hash: Uint8
   return memo(instanceId, (hash: Uint8Array | string): Observable<SignedBlockExtended | undefined> =>
     combineLatest([
       api.rpc.chain.getBlock(hash),
+      api.query.system.events.at(hash),
       api.query.session
         ? api.query.session.validators.at(hash)
         : of([])
     ]).pipe(
-      map(([signedBlock, validators]): SignedBlockExtended =>
-        new SignedBlockExtended(api.registry, signedBlock, validators)
+      map(([signedBlock, events, validators]): SignedBlockExtended =>
+        new SignedBlockExtended(api.registry, signedBlock, events, validators)
       ),
       catchError((): Observable<undefined> =>
         // where rpc.chain.getHeader throws, we will land here - it can happen that

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

@@ -2,32 +2,34 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { EventRecord, Hash, SignedBlock } from '@polkadot/types/interfaces';
+import type { AccountId, EventRecord, SignedBlock } from '@polkadot/types/interfaces';
 import type { Observable } from '@polkadot/x-rxjs';
-import type { FullNewBlock } from '../types';
 
 import { combineLatest, of } from '@polkadot/x-rxjs';
 import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
+import { SignedBlockExtended } from '../type';
 import { memo } from '../util';
 
 /**
  * @name subscribeNewBlocks
  * @returns The latest block & events for that block
  */
-export function subscribeNewBlocks (instanceId: string, api: ApiInterfaceRx): () => Observable<FullNewBlock> {
-  return memo(instanceId, (): Observable<FullNewBlock> =>
+export function subscribeNewBlocks (instanceId: string, api: ApiInterfaceRx): () => Observable<SignedBlockExtended> {
+  return memo(instanceId, (): Observable<SignedBlockExtended> =>
     api.derive.chain.subscribeNewHeads().pipe(
-      switchMap((header): Observable<[Hash, EventRecord[], SignedBlock]> => {
+      switchMap((header): Observable<[SignedBlock, EventRecord[], AccountId[] | undefined]> => {
         const blockHash = header.hash;
 
         return combineLatest(
-          of(blockHash),
+          api.rpc.chain.getBlock(blockHash),
           api.query.system.events.at(blockHash),
-          api.rpc.chain.getBlock(header.hash)
+          of(header.validators)
         );
       }),
-      map(([blockHash, events, block]) => ({ block: block.block, blockHash, blockNumber: block.block.header.number.unwrap(), events, justification: block.justification }))
+      map(([block, events, validators]) =>
+        new SignedBlockExtended(api.registry, block, events, validators)
+      )
     )
   );
 }

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

@@ -1,12 +0,0 @@
-// Copyright 2017-2021 @polkadot/api-derive authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import type { Block, BlockNumber, EventRecord, Hash, Justification } from '@polkadot/types/interfaces';
-
-export interface FullNewBlock {
-  block: Block;
-  blockHash: Hash;
-  blockNumber: BlockNumber;
-  events: EventRecord[];
-  justification: Justification;
-}

packages/api-derive/src/democracy/dispatchQueue.ts

@@ -51,7 +51,7 @@ function schedulerEntries (api: ApiInterfaceRx): Observable<[BlockNumber[], Opti
       api.query.scheduler.agenda.keys()
     ),
     switchMap((keys) => {
-      const blockNumbers = keys.map((key) => key.args[0] as BlockNumber);
+      const blockNumbers = keys.map((key) => key.args[0]);
 
       return combineLatest([
         of(blockNumbers),

packages/api-derive/src/democracy/referendumsInfo.ts

@@ -69,7 +69,7 @@ function extractVotes (mapped: [AccountId, Voting][], referendumId: BN): DeriveR
 function votesCurr (api: ApiInterfaceRx, referendumId: BN): Observable<DeriveReferendumVote[]> {
   return api.query.democracy.votingOf.entries<Voting>().pipe(
     map((allVoting): DeriveReferendumVote[] => {
-      const mapped = allVoting.map(([key, voting]): [AccountId, Voting] => [key.args[0] as AccountId, voting]);
+      const mapped = allVoting.map(([key, voting]): [AccountId, Voting] => [key.args[0], voting]);
       const votes = extractVotes(mapped, referendumId);
       const delegations = mapped
         .filter(([, voting]) => voting.isDelegating)

packages/api-derive/src/session/info.ts

@@ -35,6 +35,7 @@ function queryAura (api: ApiInterfaceRx): Observable<DeriveSessionInfo> {
         [
           false,
           api.registry.createType('u64', 1),
+          // we may have aura without staking (permissioned)
           api.consts.staking?.sessionsPerEra || api.registry.createType('SessionIndex', 1)
         ],
         indexes
@@ -50,7 +51,8 @@ function queryBabe (api: ApiInterfaceRx): Observable<DeriveSessionInfo> {
         [
           true,
           api.consts.babe.epochDuration,
-          api.consts.staking.sessionsPerEra
+          // we may have babe without staking (permissioned)
+          api.consts.staking?.sessionsPerEra || api.registry.createType('SessionIndex', 1)
         ],
         indexes
       ])

packages/api-derive/src/session/progress.ts

@@ -12,6 +12,7 @@ import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
+type ResultSlotsNoSession = [u64, u64, u64];
 type ResultSlots = [u64, u64, u64, Option<SessionIndex>];
 type ResultSlotsFlat = [u64, u64, u64, SessionIndex];
 
@@ -39,19 +40,26 @@ function queryAura (api: ApiInterfaceRx): Observable<DeriveSessionProgress> {
 
 function queryBabe (api: ApiInterfaceRx): Observable<[DeriveSessionInfo, ResultSlotsFlat]> {
   return api.derive.session.info().pipe(
-    switchMap((info): Observable<[DeriveSessionInfo, ResultSlots]> =>
+    switchMap((info): Observable<[DeriveSessionInfo, ResultSlots | ResultSlotsNoSession]> =>
       combineLatest([
         of(info),
-        api.queryMulti<ResultSlots>([
-          api.query.babe.currentSlot,
-          api.query.babe.epochIndex,
-          api.query.babe.genesisSlot,
-          [api.query.staking.erasStartSessionIndex, info.activeEra]
-        ])
+        // we may have no staking, but have babe (permissioned)
+        api.query.staking
+          ? api.queryMulti<ResultSlots>([
+            api.query.babe.currentSlot,
+            api.query.babe.epochIndex,
+            api.query.babe.genesisSlot,
+            [api.query.staking.erasStartSessionIndex, info.activeEra]
+          ])
+          : api.queryMulti<ResultSlotsNoSession>([
+            api.query.babe.currentSlot,
+            api.query.babe.epochIndex,
+            api.query.babe.genesisSlot
+          ])
       ])
     ),
     map(([info, [currentSlot, epochIndex, genesisSlot, optStartIndex]]): [DeriveSessionInfo, ResultSlotsFlat] => [
-      info, [currentSlot, epochIndex, genesisSlot, optStartIndex.unwrapOr(api.registry.createType('SessionIndex', 1))]
+      info, [currentSlot, epochIndex, genesisSlot, optStartIndex && optStartIndex.isSome ? optStartIndex.unwrap() : api.registry.createType('SessionIndex', 1)]
     ])
   );
 }

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

@@ -15,7 +15,7 @@ import { memo } from '../util';
 export function stashes (instanceId: string, api: ApiInterfaceRx): () => Observable<AccountId[]> {
   return memo(instanceId, (): Observable<AccountId[]> =>
     api.query.staking.validators.keys().pipe(
-      map((keys) => keys.map((key) => key.args[0] as AccountId).filter((a) => a))
+      map((keys) => keys.map((key) => key.args[0]).filter((a) => a))
     )
   );
 }

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

@@ -18,7 +18,7 @@ export function nextElected (instanceId: string, api: ApiInterfaceRx): () => Obs
         // only populate for next era in the last session, so track both here - entries are not
         // subscriptions, so we need a trigger - currentIndex acts as that trigger to refresh
         switchMap(({ currentEra }) => api.query.staking.erasStakers.keys(currentEra)),
-        map((keys) => keys.map((key) => key.args[1] as AccountId))
+        map((keys) => keys.map((key) => key.args[1]))
       )
       : api.query.staking.currentElected<AccountId[]>()
   );

packages/api-derive/src/type/HeaderExtended.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { AccountId, Header } from '@polkadot/types/interfaces';
-import type { AnyJson, Constructor, Registry } from '@polkadot/types/types';
+import type { Constructor, Registry } from '@polkadot/types/types';
 
 import { Struct } from '@polkadot/types';
 import runtimeTypes from '@polkadot/types/interfaces/runtime/definitions';
@@ -19,11 +19,13 @@ const _Header = Struct.with(runtimeTypes.types.Header as any) as Constructor<Hea
  */
 export class HeaderExtended extends _Header {
   readonly #author?: AccountId;
+  readonly #validators?: AccountId[];
 
-  constructor (registry: Registry, header?: Header, sessionValidators?: AccountId[]) {
+  constructor (registry: Registry, header?: Header, validators?: AccountId[]) {
     super(registry, header);
 
-    this.#author = extractAuthor(this.digest, sessionValidators);
+    this.#author = extractAuthor(this.digest, validators);
+    this.#validators = validators;
   }
 
   /**
@@ -34,26 +36,9 @@ export class HeaderExtended extends _Header {
   }
 
   /**
-   * @description Creates a human-friendly JSON representation
+   * @description Convenience method, returns the validators for the block
    */
-  public toHuman (isExtended?: boolean): Record<string, AnyJson> {
-    return {
-      ...super.toHuman(isExtended),
-      author: this.author
-        ? this.author.toHuman()
-        : undefined
-    };
-  }
-
-  /**
-   * @description Creates the JSON representation
-   */
-  public toJSON (): Record<string, AnyJson> {
-    return {
-      ...super.toJSON(),
-      author: this.author
-        ? this.author.toJSON()
-        : undefined
-    };
+  public get validators (): AccountId[] | undefined {
+    return this.#validators;
   }
 }

packages/api-derive/src/type/SignedBlockExtended.ts

@@ -1,8 +1,8 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { AccountId, SignedBlock } from '@polkadot/types/interfaces';
-import type { AnyJson, Constructor, Registry } from '@polkadot/types/types';
+import type { AccountId, DispatchError, DispatchInfo, Event, EventRecord, Extrinsic, SignedBlock } from '@polkadot/types/interfaces';
+import type { Constructor, Registry } from '@polkadot/types/types';
 
 import { Struct } from '@polkadot/types';
 import runtimeTypes from '@polkadot/types/interfaces/runtime/definitions';
@@ -12,6 +12,37 @@ import { extractAuthor } from './util';
 // We can ignore the properties, added via Struct.with
 const _SignedBlock = Struct.with(runtimeTypes.types.SignedBlock as any) as Constructor<SignedBlock>;
 
+interface TxWithEvent {
+  dispatchError?: DispatchError;
+  dispatchInfo?: DispatchInfo;
+  events: Event[];
+  extrinsic: Extrinsic;
+}
+
+function mapExtrinsics (extrinsics: Extrinsic[], records: EventRecord[]): TxWithEvent[] {
+  return extrinsics.map((extrinsic, index): TxWithEvent => {
+    let dispatchError: DispatchError | undefined;
+    let dispatchInfo: DispatchInfo | undefined;
+
+    const events = records
+      .filter(({ phase }) => phase.isApplyExtrinsic && phase.asApplyExtrinsic.eq(index))
+      .map(({ event }) => {
+        if (event.section === 'system') {
+          if (event.method === 'ExtrinsicSuccess') {
+            dispatchInfo = event.data[0] as DispatchInfo;
+          } else if (event.method === 'ExtrinsicFailed') {
+            dispatchError = event.data[0] as DispatchError;
+            dispatchInfo = event.data[1] as DispatchInfo;
+          }
+        }
+
+        return event;
+      });
+
+    return { dispatchError, dispatchInfo, events, extrinsic };
+  });
+}
+
 /**
  * @name SignedBlockExtended
  * @description
@@ -19,11 +50,15 @@ const _SignedBlock = Struct.with(runtimeTypes.types.SignedBlock as any) as Const
  */
 export class SignedBlockExtended extends _SignedBlock {
   readonly #author?: AccountId;
+  readonly #events: EventRecord[];
+  readonly #extrinsics: TxWithEvent[];
 
-  constructor (registry: Registry, block?: SignedBlock, sessionValidators?: AccountId[]) {
+  constructor (registry: Registry, block?: SignedBlock, events?: EventRecord[], sessionValidators?: AccountId[]) {
     super(registry, block);
 
     this.#author = extractAuthor(this.block.header.digest, sessionValidators);
+    this.#events = events || ([] as EventRecord[]);
+    this.#extrinsics = mapExtrinsics(this.block.extrinsics, this.#events);
   }
 
   /**
@@ -34,26 +69,16 @@ export class SignedBlockExtended extends _SignedBlock {
   }
 
   /**
-   * @description Creates a human-friendly JSON representation
+   * @description Convenience method, returns the events associated with the block
    */
-  public toHuman (isExtended?: boolean): Record<string, AnyJson> {
-    return {
-      ...super.toHuman(isExtended),
-      author: this.author
-        ? this.author.toHuman()
-        : undefined
-    };
+  public get events (): EventRecord[] {
+    return this.#events;
   }
 
   /**
-   * @description Creates the JSON representation
+   * @description Returns the extrinsics and their events, mapped
    */
-  public toJSON (): Record<string, AnyJson> {
-    return {
-      ...super.toJSON(),
-      author: this.author
-        ? this.author.toJSON()
-        : undefined
-    };
+  public get extrinsics (): TxWithEvent[] {
+    return this.#extrinsics;
   }
 }

packages/api-derive/src/types.ts

@@ -6,7 +6,6 @@ import type { u32 } from '@polkadot/types';
 import type { AccountId, Balance, BalanceLock, BalanceLockTo212, BalanceOf, Bid, BidKind, BlockNumber, Bounty, BountyIndex, Hash, Index, Proposal, ProposalIndex, SetIndex, SocietyVote, StrikeCount, TreasuryProposal, Votes, VouchingStatus } from '@polkadot/types/interfaces';
 
 export * from './accounts/types';
-export * from './chain/types';
 export * from './council/types';
 export * from './democracy/types';
 export * from './elections/types';
@@ -132,6 +131,7 @@ export interface DeriveBounty {
   bounty: Bounty;
   description: string;
   index: BountyIndex;
+  proposals: DeriveCollectiveProposal[];
 }
 
 export type DeriveBounties = DeriveBounty[];

packages/api-derive/test/helpers.ts

@@ -10,7 +10,9 @@ export function createApiWithAugmentations (): ApiPromise {
   const registry = new TypeRegistry();
   const metadata = new Metadata(registry, metaStatic);
 
-  const api = new ApiPromise({ provider: new WsProvider('ws://', false) });
+  registry.setMetadata(metadata);
+
+  const api = new ApiPromise({ provider: new WsProvider('ws://', false), registry });
 
   api.injectMetadata(metadata, true);
 

packages/api-derive/test/proposalFactory.ts

@@ -0,0 +1,25 @@
+// Copyright 2017-2021 @polkadot/api authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { ApiPromise } from '@polkadot/api';
+import { SubmittableExtrinsic } from '@polkadot/api/types';
+import { Proposal, ProposalIndex } from '@polkadot/types/interfaces';
+import { Registry } from '@polkadot/types/types';
+
+export class ProposalFactory {
+  readonly #api: ApiPromise;
+  readonly #registry: Registry;
+
+  constructor (api: ApiPromise) {
+    this.#api = api;
+    this.#registry = this.#api.registry;
+  }
+
+  public createProposal = (method: SubmittableExtrinsic<'promise'>): Proposal => {
+    return this.#registry.createType('Proposal', method);
+  };
+
+  public proposalIndex = (index: number): ProposalIndex => {
+    return this.#registry.createType('ProposalIndex', index);
+  }
+}

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api",
-  "version": "3.3.1",
+  "version": "3.5.1",
   "description": "Promise and RxJS wrappers around the Polkadot JS RPC",
   "main": "index.js",
   "module": "index.mjs",
@@ -17,16 +17,16 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/api-derive": "3.3.1",
-    "@polkadot/keyring": "^5.2.3",
-    "@polkadot/metadata": "3.3.1",
-    "@polkadot/rpc-core": "3.3.1",
-    "@polkadot/rpc-provider": "3.3.1",
-    "@polkadot/types": "3.3.1",
-    "@polkadot/types-known": "3.3.1",
-    "@polkadot/util": "^5.2.3",
-    "@polkadot/util-crypto": "^5.2.3",
-    "@polkadot/x-rxjs": "3.3.1",
+    "@polkadot/api-derive": "3.5.1",
+    "@polkadot/keyring": "^5.3.1",
+    "@polkadot/metadata": "3.5.1",
+    "@polkadot/rpc-core": "3.5.1",
+    "@polkadot/rpc-provider": "3.5.1",
+    "@polkadot/types": "3.5.1",
+    "@polkadot/types-known": "3.5.1",
+    "@polkadot/util": "^5.3.1",
+    "@polkadot/util-crypto": "^5.3.1",
+    "@polkadot/x-rxjs": "3.5.1",
     "bn.js": "^4.11.9",
     "eventemitter3": "^4.0.7"
   }

packages/api/src/augment/events.ts

@@ -3,6 +3,7 @@
 
 import type { Bytes, Option, Vec, bool, u16, u32 } from '@polkadot/types';
 import type { ITuple } from '@polkadot/types/types';
+import type { TAssetBalance } from '@polkadot/types/interfaces/assets';
 import type { BalanceStatus } from '@polkadot/types/interfaces/balances';
 import type { MemberCount, ProposalIndex } from '@polkadot/types/interfaces/collective';
 import type { AuthorityId } from '@polkadot/types/interfaces/consensus';
@@ -28,7 +29,7 @@ declare module '@polkadot/api/types/events' {
       /**
        * Some assets were destroyed. \[asset_id, owner, balance\]
        **/
-      Burned: AugmentedEvent<ApiType, [AssetId, AccountId, Balance]>;
+      Burned: AugmentedEvent<ApiType, [AssetId, AccountId, TAssetBalance]>;
       /**
        * Some asset class was created. \[asset_id, creator, owner\]
        **/
@@ -44,7 +45,7 @@ declare module '@polkadot/api/types/events' {
       /**
        * Some assets was transferred by an admin. \[asset_id, from, to, amount\]
        **/
-      ForceTransferred: AugmentedEvent<ApiType, [AssetId, AccountId, AccountId, Balance]>;
+      ForceTransferred: AugmentedEvent<ApiType, [AssetId, AccountId, AccountId, TAssetBalance]>;
       /**
        * Some account `who` was frozen. \[asset_id, who\]
        **/
@@ -52,7 +53,7 @@ declare module '@polkadot/api/types/events' {
       /**
        * Some assets were issued. \[asset_id, owner, total_supply\]
        **/
-      Issued: AugmentedEvent<ApiType, [AssetId, AccountId, Balance]>;
+      Issued: AugmentedEvent<ApiType, [AssetId, AccountId, TAssetBalance]>;
       /**
        * The maximum amount of zombies allowed has changed. \[asset_id, max_zombies\]
        **/
@@ -72,7 +73,7 @@ declare module '@polkadot/api/types/events' {
       /**
        * Some assets were transferred. \[asset_id, from, to, amount\]
        **/
-      Transferred: AugmentedEvent<ApiType, [AssetId, AccountId, AccountId, Balance]>;
+      Transferred: AugmentedEvent<ApiType, [AssetId, AccountId, AccountId, TAssetBalance]>;
     };
     balances: {
       [key: string]: AugmentedEvent<ApiType>;

packages/api/src/augment/tx.ts

@@ -3,6 +3,7 @@
 
 import type { Bytes, Compact, Data, Option, U8aFixed, Vec, bool, u16, u32, u64 } from '@polkadot/types';
 import type { AnyNumber, ITuple } from '@polkadot/types/types';
+import type { TAssetBalance } from '@polkadot/types/interfaces/assets';
 import type { BabeEquivocationProof } from '@polkadot/types/interfaces/babe';
 import type { MemberCount, ProposalIndex } from '@polkadot/types/interfaces/collective';
 import type { CodeHash, Gas, Schedule } from '@polkadot/types/interfaces/contracts';
@@ -45,7 +46,7 @@ declare module '@polkadot/api/types/submittable' {
        * Weight: `O(1)`
        * Modes: Post-existence of `who`; Pre & post Zombie-status of `who`.
        **/
-      burn: AugmentedSubmittable<(id: Compact<AssetId> | AnyNumber | Uint8Array, who: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, amount: Compact<Balance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<AssetId>, LookupSource, Compact<Balance>]>;
+      burn: AugmentedSubmittable<(id: Compact<AssetId> | AnyNumber | Uint8Array, who: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, amount: Compact<TAssetBalance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<AssetId>, LookupSource, Compact<TAssetBalance>]>;
       /**
        * Issue a new class of fungible assets from a public origin.
        * 
@@ -71,7 +72,7 @@ declare module '@polkadot/api/types/submittable' {
        * 
        * Weight: `O(1)`
        **/
-      create: AugmentedSubmittable<(id: Compact<AssetId> | AnyNumber | Uint8Array, admin: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, maxZombies: u32 | AnyNumber | Uint8Array, minBalance: Balance | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<AssetId>, LookupSource, u32, Balance]>;
+      create: AugmentedSubmittable<(id: Compact<AssetId> | AnyNumber | Uint8Array, admin: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, maxZombies: u32 | AnyNumber | Uint8Array, minBalance: TAssetBalance | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<AssetId>, LookupSource, u32, TAssetBalance]>;
       /**
        * Destroy a class of fungible assets owned by the sender.
        * 
@@ -108,7 +109,7 @@ declare module '@polkadot/api/types/submittable' {
        * 
        * Weight: `O(1)`
        **/
-      forceCreate: AugmentedSubmittable<(id: Compact<AssetId> | AnyNumber | Uint8Array, owner: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, maxZombies: Compact<u32> | AnyNumber | Uint8Array, minBalance: Compact<Balance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<AssetId>, LookupSource, Compact<u32>, Compact<Balance>]>;
+      forceCreate: AugmentedSubmittable<(id: Compact<AssetId> | AnyNumber | Uint8Array, owner: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, maxZombies: Compact<u32> | AnyNumber | Uint8Array, minBalance: Compact<TAssetBalance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<AssetId>, LookupSource, Compact<u32>, Compact<TAssetBalance>]>;
       /**
        * Destroy a class of fungible assets.
        * 
@@ -143,7 +144,7 @@ declare module '@polkadot/api/types/submittable' {
        * Modes: Pre-existence of `dest`; Post-existence of `source`; Prior & post zombie-status
        * of `source`; Account pre-existence of `dest`.
        **/
-      forceTransfer: AugmentedSubmittable<(id: Compact<AssetId> | AnyNumber | Uint8Array, source: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, dest: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, amount: Compact<Balance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<AssetId>, LookupSource, LookupSource, Compact<Balance>]>;
+      forceTransfer: AugmentedSubmittable<(id: Compact<AssetId> | AnyNumber | Uint8Array, source: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, dest: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, amount: Compact<TAssetBalance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<AssetId>, LookupSource, LookupSource, Compact<TAssetBalance>]>;
       /**
        * Disallow further unprivileged transfers from an account.
        * 
@@ -171,7 +172,7 @@ declare module '@polkadot/api/types/submittable' {
        * Weight: `O(1)`
        * Modes: Pre-existing balance of `beneficiary`; Account pre-existence of `beneficiary`.
        **/
-      mint: AugmentedSubmittable<(id: Compact<AssetId> | AnyNumber | Uint8Array, beneficiary: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, amount: Compact<Balance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<AssetId>, LookupSource, Compact<Balance>]>;
+      mint: AugmentedSubmittable<(id: Compact<AssetId> | AnyNumber | Uint8Array, beneficiary: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, amount: Compact<TAssetBalance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<AssetId>, LookupSource, Compact<TAssetBalance>]>;
       setMaxZombies: AugmentedSubmittable<(id: Compact<AssetId> | AnyNumber | Uint8Array, maxZombies: Compact<u32> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<AssetId>, Compact<u32>]>;
       /**
        * Change the Issuer, Admin and Freezer of an asset.
@@ -221,7 +222,7 @@ declare module '@polkadot/api/types/submittable' {
        * Modes: Pre-existence of `target`; Post-existence of sender; Prior & post zombie-status
        * of sender; Account pre-existence of `target`.
        **/
-      transfer: AugmentedSubmittable<(id: Compact<AssetId> | AnyNumber | Uint8Array, target: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, amount: Compact<Balance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<AssetId>, LookupSource, Compact<Balance>]>;
+      transfer: AugmentedSubmittable<(id: Compact<AssetId> | AnyNumber | Uint8Array, target: LookupSource | Address | AccountId | AccountIndex | string | Uint8Array, amount: Compact<TAssetBalance> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<AssetId>, LookupSource, Compact<TAssetBalance>]>;
       /**
        * Change the Owner of an asset.
        * 

packages/api/src/base/Decorate.ts

@@ -518,13 +518,13 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
 
     return this._retrieveMapKeys(entry, at, arg).pipe(
       switchMap((keys) =>
-        combineLatest(
-          arrayChunk(keys, PAGE_SIZE).map((keys) => query(keys))
-        ).pipe(
-          map((valsArr) =>
-            arrayFlatten(valsArr).map((value, index): [StorageKey, Codec] => [keys[index], value])
+        keys.length
+          ? combineLatest(arrayChunk(keys, PAGE_SIZE).map(query)).pipe(
+            map((valsArr) =>
+              arrayFlatten(valsArr).map((value, index): [StorageKey, Codec] => [keys[index], value])
+            )
           )
-        )
+          : of([])
       )
     );
   }
@@ -532,11 +532,13 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
   private _retrieveMapEntriesPaged (entry: StorageEntry, opts: PaginationOptions): Observable<[StorageKey, Codec][]> {
     return this._retrieveMapKeysPaged(entry, opts).pipe(
       switchMap((keys) =>
-        this._rpcCore.state.queryStorageAt(keys).pipe(
-          map((valsArr) =>
-            valsArr.map((value, index): [StorageKey, Codec] => [keys[index], value])
+        keys.length
+          ? this._rpcCore.state.queryStorageAt(keys).pipe(
+            map((valsArr) =>
+              valsArr.map((value, index): [StorageKey, Codec] => [keys[index], value])
+            )
           )
-        )
+          : of([])
       )
     );
   }

packages/api/src/base/Init.ts

@@ -89,7 +89,7 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
       registry.knownTypes.typesAlias = getSpecAlias(registry, chain, version.specName);
     }
 
-    registry.setMetadata(metadata);
+    registry.setMetadata(metadata, undefined, this._options.signedExtensions);
 
     return registry;
   }

packages/api/src/types/index.ts

@@ -9,6 +9,7 @@ import type { DeriveCustom, ExactDerive } from '@polkadot/api-derive';
 import type { Metadata } from '@polkadot/metadata';
 import type { RpcInterface } from '@polkadot/rpc-core/types';
 import type { ProviderInterface, ProviderInterfaceEmitted } from '@polkadot/rpc-provider/types';
+import type { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types';
 import type { Hash, RuntimeVersion } from '@polkadot/types/interfaces';
 import type { DefinitionRpc, DefinitionRpcSub, RegisteredTypes, Registry, SignatureOptions, Signer } from '@polkadot/types/types';
 import type { ApiBase } from '../base';
@@ -56,6 +57,10 @@ export interface ApiOptions extends RegisteredTypes {
    * @description User-defined RPC methods
    */
   rpc?: Record<string, Record<string, DefinitionRpc | DefinitionRpcSub>>;
+  /**
+   * @description Any chain-specific signed extensions that are now well-known
+   */
+  signedExtensions?: Record<string, ExtDef>;
   /**
    * @description An external signer which will be used to sign extrinsic when account passed in is not KeyringPair
    */

packages/api/src/types/storage.ts

@@ -38,16 +38,16 @@ export type QueryableStorageEntry<ApiType extends ApiTypes, A extends AnyTuple =
 export interface StorageEntryBase<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple> {
   at: <T extends Codec | any = ObsInnerType<ReturnType<F>>>(hash: Hash | Uint8Array | string, ...args: Parameters<F>) => PromiseOrObs<ApiType, T>;
   creator: StorageEntry;
-  entries: <T extends Codec | any = ObsInnerType<ReturnType<F>>>(arg?: Parameters<F>[0]) => PromiseOrObs<ApiType, [StorageKey, T][]>;
-  entriesAt: <T extends Codec | any = ObsInnerType<ReturnType<F>>>(hash: Hash | Uint8Array | string, arg?: Parameters<F>[0]) => PromiseOrObs<ApiType, [StorageKey, T][]>;
-  entriesPaged: <T extends Codec | any = ObsInnerType<ReturnType<F>>>(opts: PaginationOptions<Parameters<F>[0]>) => PromiseOrObs<ApiType, [StorageKey, T][]>;
+  entries: <T extends Codec | any = ObsInnerType<ReturnType<F>>>(arg?: Parameters<F>[0]) => PromiseOrObs<ApiType, [StorageKey<A>, T][]>;
+  entriesAt: <T extends Codec | any = ObsInnerType<ReturnType<F>>>(hash: Hash | Uint8Array | string, arg?: Parameters<F>[0]) => PromiseOrObs<ApiType, [StorageKey<A>, T][]>;
+  entriesPaged: <T extends Codec | any = ObsInnerType<ReturnType<F>>>(opts: PaginationOptions<Parameters<F>[0]>) => PromiseOrObs<ApiType, [StorageKey<A>, T][]>;
   hash: (...args: Parameters<F>) => PromiseOrObs<ApiType, Hash>;
   is: (key: IStorageKey<AnyTuple>) => key is IStorageKey<A>;
   key: (...args: Parameters<F>) => string;
   keyPrefix: () => string;
-  keys: (arg?: any) => PromiseOrObs<ApiType, StorageKey[]>;
-  keysAt: (hash: Hash | Uint8Array | string, arg?: any) => PromiseOrObs<ApiType, StorageKey[]>;
-  keysPaged: (opts: PaginationOptions<Parameters<F>[0]>) => PromiseOrObs<ApiType, StorageKey[]>;
+  keys: (arg?: any) => PromiseOrObs<ApiType, StorageKey<A>[]>;
+  keysAt: (hash: Hash | Uint8Array | string, arg?: any) => PromiseOrObs<ApiType, StorageKey<A>[]>;
+  keysPaged: (opts: PaginationOptions<Parameters<F>[0]>) => PromiseOrObs<ApiType, StorageKey<A>[]>;
   // @deprecated The underlying RPC this been marked unsafe and is generally not exposed
   range: <T extends Codec | any = ObsInnerType<ReturnType<F>>>([from, to]: [Hash | Uint8Array | string, Hash | Uint8Array | string | undefined] | [Hash | Uint8Array | string], ...args: Parameters<F>) => PromiseOrObs<ApiType, [Hash, T][]>;
   size: (...args: Parameters<F>) => PromiseOrObs<ApiType, u64>;

packages/metadata/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/metadata",
-  "version": "3.3.1",
+  "version": "3.5.1",
   "description": "Helpers to extract information from runtime metadata",
   "main": "index.js",
   "module": "index.mjs",
@@ -17,13 +17,13 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/type-metadata#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/types": "3.3.1",
-    "@polkadot/types-known": "3.3.1",
-    "@polkadot/util": "^5.2.3",
-    "@polkadot/util-crypto": "^5.2.3",
+    "@polkadot/types": "3.5.1",
+    "@polkadot/types-known": "3.5.1",
+    "@polkadot/util": "^5.3.1",
+    "@polkadot/util-crypto": "^5.3.1",
     "bn.js": "^4.11.9"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^5.2.3"
+    "@polkadot/keyring": "^5.3.1"
   }
 }

packages/metadata/src/decorate/events/index.ts

@@ -8,7 +8,7 @@ import type { Events, ModuleEvents } from '../types';
 import { stringCamelCase } from '@polkadot/util';
 
 function isEvent <T extends AnyTuple> (event: IEvent<AnyTuple>, sectionIndex: number, eventIndex: number): event is IEvent<T> {
-  return event.index[0] === sectionIndex && event.index[0] === eventIndex;
+  return event.index[0] === sectionIndex && event.index[1] === eventIndex;
 }
 
 /** @internal */

packages/metadata/src/v12/static-substrate.json

@@ -12320,7 +12320,7 @@
                 },
                 {
                   "name": "min_balance",
-                  "type": "Balance"
+                  "type": "TAssetBalance"
                 }
               ],
               "documentation": [
@@ -12366,7 +12366,7 @@
                 },
                 {
                   "name": "min_balance",
-                  "type": "Compact<Balance>"
+                  "type": "Compact<TAssetBalance>"
                 }
               ],
               "documentation": [
@@ -12456,7 +12456,7 @@
                 },
                 {
                   "name": "amount",
-                  "type": "Compact<Balance>"
+                  "type": "Compact<TAssetBalance>"
                 }
               ],
               "documentation": [
@@ -12487,7 +12487,7 @@
                 },
                 {
                   "name": "amount",
-                  "type": "Compact<Balance>"
+                  "type": "Compact<TAssetBalance>"
                 }
               ],
               "documentation": [
@@ -12521,7 +12521,7 @@
                 },
                 {
                   "name": "amount",
-                  "type": "Compact<Balance>"
+                  "type": "Compact<TAssetBalance>"
                 }
               ],
               "documentation": [
@@ -12562,7 +12562,7 @@
                 },
                 {
                   "name": "amount",
-                  "type": "Compact<Balance>"
+                  "type": "Compact<TAssetBalance>"
                 }
               ],
               "documentation": [
@@ -12729,7 +12729,7 @@
               "args": [
                 "AssetId",
                 "AccountId",
-                "Balance"
+                "TAssetBalance"
               ],
               "documentation": [
                 " Some assets were issued. \\[asset_id, owner, total_supply\\]"
@@ -12741,7 +12741,7 @@
                 "AssetId",
                 "AccountId",
                 "AccountId",
-                "Balance"
+                "TAssetBalance"
               ],
               "documentation": [
                 " Some assets were transferred. \\[asset_id, from, to, amount\\]"
@@ -12752,7 +12752,7 @@
               "args": [
                 "AssetId",
                 "AccountId",
-                "Balance"
+                "TAssetBalance"
               ],
               "documentation": [
                 " Some assets were destroyed. \\[asset_id, owner, balance\\]"
@@ -12786,7 +12786,7 @@
                 "AssetId",
                 "AccountId",
                 "AccountId",
-                "Balance"
+                "TAssetBalance"
               ],
               "documentation": [
                 " Some assets was transferred by an admin. \\[asset_id, from, to, amount\\]"

packages/rpc-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-core",
-  "version": "3.3.1",
+  "version": "3.5.1",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
   "module": "index.mjs",
@@ -14,13 +14,13 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-core#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/metadata": "3.3.1",
-    "@polkadot/rpc-provider": "3.3.1",
-    "@polkadot/types": "3.3.1",
-    "@polkadot/util": "^5.2.3",
-    "@polkadot/x-rxjs": "3.3.1"
+    "@polkadot/metadata": "3.5.1",
+    "@polkadot/rpc-provider": "3.5.1",
+    "@polkadot/types": "3.5.1",
+    "@polkadot/util": "^5.3.1",
+    "@polkadot/x-rxjs": "3.5.1"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^5.2.3"
+    "@polkadot/keyring": "^5.3.1"
   }
 }

packages/rpc-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-provider",
-  "version": "3.3.1",
+  "version": "3.5.1",
   "description": "Transport providers for the API",
   "main": "index.js",
   "module": "index.mjs",
@@ -14,17 +14,17 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-provider#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/types": "3.3.1",
-    "@polkadot/util": "^5.2.3",
-    "@polkadot/util-crypto": "^5.2.3",
-    "@polkadot/x-fetch": "^5.2.3",
-    "@polkadot/x-ws": "^5.2.3",
+    "@polkadot/types": "3.5.1",
+    "@polkadot/util": "^5.3.1",
+    "@polkadot/util-crypto": "^5.3.1",
+    "@polkadot/x-fetch": "^5.3.1",
+    "@polkadot/x-ws": "^5.3.1",
     "bn.js": "^4.11.9",
     "eventemitter3": "^4.0.7"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^5.2.3",
-    "@polkadot/metadata": "3.3.1",
+    "@polkadot/keyring": "^5.3.1",
+    "@polkadot/metadata": "3.5.1",
     "mock-socket": "^9.0.3",
     "nock": "^13.0.5"
   }

packages/typegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/typegen",
-  "version": "3.3.1",
+  "version": "3.5.1",
   "description": "Type generation scripts",
   "main": "index.js",
   "module": "index.mjs",
@@ -23,11 +23,11 @@
     "@babel/core": "^7.12.10",
     "@babel/register": "^7.12.10",
     "@babel/runtime": "^7.12.5",
-    "@polkadot/api": "3.3.1",
-    "@polkadot/metadata": "3.3.1",
-    "@polkadot/rpc-provider": "3.3.1",
-    "@polkadot/types": "3.3.1",
-    "@polkadot/util": "^5.2.3",
+    "@polkadot/api": "3.5.1",
+    "@polkadot/metadata": "3.5.1",
+    "@polkadot/rpc-provider": "3.5.1",
+    "@polkadot/types": "3.5.1",
+    "@polkadot/util": "^5.3.1",
     "handlebars": "^4.7.6",
     "websocket": "^1.0.33",
     "yargs": "^16.2.0"

packages/typegen/src/generate/interfaceRegistry.ts

@@ -72,7 +72,7 @@ export function generateInterfaceTypes (importDefinitions: { [importPath: string
     return generateInterfaceTypesTemplate({
       headerType: 'defs',
       imports,
-      items,
+      items: items.sort((a, b) => a.localeCompare(b)),
       types
     });
   });

packages/typegen/src/generate/tsDef.ts

@@ -52,7 +52,7 @@ function tsEnum (definitions: Record<string, ModuleTypes>, { name: enumName, sub
 
   const keys = (sub as TypeDef[]).map(({ info, name = '', type }): string => {
     const getter = stringUpperFirst(stringCamelCase(name.replace(' ', '_')));
-    const isComplexType = [TypeDefInfo.Tuple, TypeDefInfo.VecFixed].includes(info);
+    const isComplexType = [TypeDefInfo.Tuple, TypeDefInfo.Vec, TypeDefInfo.VecFixed].includes(info);
     const asGetter = type === 'Null' || info === TypeDefInfo.DoNotConstruct
       ? ''
       : createGetter(definitions, `as${getter}`, isComplexType ? formatType(definitions, type, imports) : type, imports);

packages/types-known/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types-known",
-  "version": "3.3.1",
+  "version": "3.5.1",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
   "module": "index.mjs",
@@ -14,8 +14,8 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-known#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/types": "3.3.1",
-    "@polkadot/util": "^5.2.3",
+    "@polkadot/types": "3.5.1",
+    "@polkadot/util": "^5.3.1",
     "bn.js": "^4.11.9"
   },
   "devDependencies": {

packages/types-known/src/modules.ts

@@ -5,6 +5,9 @@ import type { OverrideModuleType } from '@polkadot/types/types';
 
 // type overrides for modules (where duplication between modules exist)
 const typesModules: Record<string, OverrideModuleType> = {
+  assets: {
+    Balance: 'TAssetBalance'
+  },
   babe: {
     EquivocationProof: 'BabeEquivocationProof'
   },

packages/types-known/src/spec/node-template.ts

@@ -7,11 +7,18 @@ import type { OverrideVersionedType } from '@polkadot/types/types';
 
 const versioned: OverrideVersionedType[] = [
   {
-    minmax: [0, undefined],
+    minmax: [0, 99],
     types: {
       Address: 'AccountId',
       LookupSource: 'AccountId'
     }
+  },
+  {
+    minmax: [100, undefined],
+    types: {
+      Address: 'MultiAddress',
+      LookupSource: 'MultiAddress'
+    }
   }
 ];
 

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

@@ -16,12 +16,20 @@ const versioned: OverrideVersionedType[] = [
     }
   },
   {
-    minmax: [260, undefined],
+    minmax: [260, 260],
     types: {
       AccountInfo: 'AccountInfoWithRefCount',
       Address: 'MultiAddress',
       LookupSource: 'MultiAddress'
     }
+  },
+  {
+    minmax: [261, undefined],
+    types: {
+      AccountInfo: 'AccountInfoWithProviders',
+      Address: 'MultiAddress',
+      LookupSource: 'MultiAddress'
+    }
   }
 ];
 

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

@@ -11,8 +11,9 @@ import type { OverrideVersionedType } from '@polkadot/types/types';
 const sharedTypes = {
   AccountInfo: 'AccountInfoWithRefCount',
   Address: 'AccountId',
-  Keys: 'SessionKeys5',
-  LookupSource: 'AccountId'
+  FullIdentification: '()', // No staking, only session (as per config)
+  LookupSource: 'AccountId',
+  Keys: 'SessionKeys6'
 };
 
 const versioned: OverrideVersionedType[] = [
@@ -22,18 +23,21 @@ const versioned: OverrideVersionedType[] = [
       ...sharedTypes,
       CompactAssignments: 'CompactAssignmentsTo257',
       RefCount: 'RefCountTo259',
-      RewardDestination: 'RewardDestinationTo257'
+      RewardDestination: 'RewardDestinationTo257',
+      Keys: 'SessionKeys5'
     }
   },
   {
-    minmax: [10, undefined],
+    minmax: [10, 12],
     types: {
       ...sharedTypes,
-      ParaGenesisArgs: {
-        genesisHead: 'Bytes',
-        validationCode: 'Bytes',
-        parachain: 'bool'
-      }
+      Keys: 'SessionKeys5'
+    }
+  },
+  {
+    minmax: [13, undefined],
+    types: {
+      ...sharedTypes
     }
   }
 ];

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

@@ -10,7 +10,7 @@ const upgrades: ChainUpgradesRaw = {
     [879238, 25], [889472, 26], [902937, 27], [932751, 28], [991142, 29],
     [1030162, 31], [1119657, 32], [1199282, 33], [1342534, 34], [1392263, 35],
     [1431703, 36], [1433369, 37], [1490972, 41], [2087397, 43], [2316688, 44],
-    [2549864, 45]
+    [2549864, 45], [3925782, 46], [3925843, 47]
   ]
 };
 

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types",
-  "version": "3.3.1",
+  "version": "3.5.1",
   "description": "Implementation of the Parity codec",
   "main": "index.js",
   "module": "index.mjs",
@@ -17,14 +17,14 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/metadata": "3.3.1",
-    "@polkadot/util": "^5.2.3",
-    "@polkadot/util-crypto": "^5.2.3",
-    "@polkadot/x-rxjs": "3.3.1",
+    "@polkadot/metadata": "3.5.1",
+    "@polkadot/util": "^5.3.1",
+    "@polkadot/util-crypto": "^5.3.1",
+    "@polkadot/x-rxjs": "3.5.1",
     "@types/bn.js": "^4.11.6",
     "bn.js": "^4.11.9"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^5.2.3"
+    "@polkadot/keyring": "^5.3.1"
   }
 }

packages/types/src/codec/AbstractInt.ts

@@ -78,8 +78,11 @@ export abstract class AbstractInt extends BN implements Codec {
     this.#bitLength = bitLength;
     this.#isSigned = isSigned;
 
-    assert(isSigned || this.gte(BN_ZERO), `${this.toRawType()}: Negative number passed to unsigned type`);
-    assert(super.bitLength() <= bitLength, `${this.toRawType()}: Input too large. Found input with ${super.bitLength()} bits, expected ${bitLength}`);
+    const isPositive = this.gte(BN_ZERO);
+    const maxBits = bitLength - (isSigned && isPositive ? 1 : 0);
+
+    assert(isSigned || isPositive, `${this.toRawType()}: Negative number passed to unsigned type`);
+    assert(super.bitLength() <= maxBits, `${this.toRawType()}: Input too large. Found input with ${super.bitLength()} bits, expected ${maxBits}`);
   }
 
   /**
@@ -143,7 +146,7 @@ export abstract class AbstractInt extends BN implements Codec {
   /**
    * @description Returns a BigInt representation of the number
    */
-  public toBigInt (): BigInt {
+  public toBigInt (): bigint {
     return BigInt(this.toString());
   }
 

packages/types/src/codec/BTreeSet.ts

@@ -4,7 +4,7 @@
 import type { H256 } from '../interfaces/runtime';
 import type { AnyJson, Codec, Constructor, InterfaceTypes, Registry } from '../types';
 
-import { compactFromU8a, compactToU8a, hexToU8a, isHex, isU8a, logger, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { compactFromU8a, compactToU8a, isHex, isU8a, logger, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
 
 import { compareSet, decodeU8a, typeToConstructor } from './utils';
 
@@ -67,9 +67,7 @@ function decodeSet<V extends Codec = Codec> (registry: Registry, valType: Constr
 
   const ValClass = typeToConstructor(registry, valType);
 
-  if (isHex(value)) {
-    return decodeSet(registry, ValClass, hexToU8a(value));
-  } else if (isU8a(value)) {
+  if (isHex(value) || isU8a(value)) {
     return decodeSetFromU8a<V>(registry, ValClass, u8aToU8a(value));
   } else if (Array.isArray(value) || value instanceof Set) {
     return decodeSetFromSet<V>(registry, ValClass, value);

packages/types/src/codec/Compact.spec.ts

@@ -73,7 +73,9 @@ describe('Compact', (): void => {
     });
 
     it('has a valid toBigInt interface', (): void => {
-      expect(new (Compact.with('u128'))(registry, 12345678987654321n).toBigInt() === 12345678987654321n).toBe(true);
+      expect(
+        (new (Compact.with('u128'))(registry, 12345678987654321n).toBigInt() + 1n) === 12345678987654322n
+      ).toBe(true);
     });
   });
 });

packages/types/src/codec/Compact.ts

@@ -95,7 +95,7 @@ export class Compact<T extends CompactEncodable> implements ICompact<T> {
   /**
    * @description Returns a BigInt representation of the number
    */
-  public toBigInt (): BigInt {
+  public toBigInt (): bigint {
     return BigInt(this.toString());
   }
 

packages/types/src/codec/Date.spec.ts

@@ -59,6 +59,12 @@ describe('Date', (): void => {
         new CodecDate(registry, 3).toHex(true)
       ).toEqual('0x0300000000000000');
     });
+
+    it('encodes correctly to BigInt', (): void => {
+      expect(
+        new CodecDate(registry, 41).toBigInt() + 1n
+      ).toEqual(42n);
+    });
   });
 
   describe('utils', (): void => {

packages/types/src/codec/Date.ts

@@ -83,7 +83,7 @@ export class CodecDate extends Date implements Codec {
   /**
    * @description Returns a BigInt representation of the number
    */
-  public toBigInt (): BigInt {
+  public toBigInt (): bigint {
     return BigInt(this.toNumber());
   }
 

packages/types/src/codec/Map.ts

@@ -4,7 +4,7 @@
 import type { H256 } from '../interfaces/runtime';
 import type { AnyJson, Codec, Constructor, InterfaceTypes, Registry } from '../types';
 
-import { compactFromU8a, compactToU8a, hexToU8a, isHex, isObject, isU8a, logger, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { compactFromU8a, compactToU8a, isHex, isObject, isU8a, logger, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
 
 import { compareMap, decodeU8a, typeToConstructor } from './utils';
 
@@ -74,9 +74,7 @@ function decodeMap<K extends Codec = Codec, V extends Codec = Codec> (registry:
 
   if (!value) {
     return new Map<K, V>();
-  } else if (isHex(value)) {
-    return decodeMap(registry, KeyClass, ValClass, hexToU8a(value));
-  } else if (isU8a(value)) {
+  } else if (isU8a(value) || isHex(value)) {
     return decodeMapFromU8a<K, V>(registry, KeyClass, ValClass, u8aToU8a(value));
   } else if (value instanceof Map) {
     return decodeMapFromMap<K, V>(registry, KeyClass, ValClass, value);

packages/types/src/codec/Raw.ts

@@ -4,16 +4,7 @@
 import type { H256 } from '../interfaces/runtime';
 import type { AnyJson, AnyU8a, IU8a, Registry } from '../types';
 
-import { assert, isAscii, isU8a, isUndefined, isUtf8, u8aToHex, u8aToString, u8aToU8a } from '@polkadot/util';
-
-/** @internal */
-function decodeU8a (value?: any): Uint8Array {
-  if (isU8a(value)) {
-    return value;
-  }
-
-  return u8aToU8a(value);
-}
+import { assert, isAscii, isUndefined, isUtf8, u8aToHex, u8aToString, u8aToU8a } from '@polkadot/util';
 
 /**
  * @name Raw
@@ -28,7 +19,7 @@ export class Raw extends Uint8Array implements IU8a {
   public readonly registry: Registry;
 
   constructor (registry: Registry, value?: AnyU8a) {
-    super(decodeU8a(value));
+    super(u8aToU8a(value));
 
     this.registry = registry;
   }
@@ -92,7 +83,7 @@ export class Raw extends Uint8Array implements IU8a {
         !this.some((value, index) => value !== other[index]);
     }
 
-    return this.eq(decodeU8a(other));
+    return this.eq(u8aToU8a(other as any));
   }
 
   /**

packages/types/src/codec/Tuple.ts

@@ -3,7 +3,7 @@
 
 import type { AnyNumber, AnyString, AnyU8a, Codec, Constructor, InterfaceTypes, Registry } from '../types';
 
-import { hexToU8a, isHex, isU8a, u8aConcat } from '@polkadot/util';
+import { isHex, isU8a, u8aConcat, u8aToU8a } from '@polkadot/util';
 
 import { AbstractArray } from './AbstractArray';
 import { decodeU8a, mapToTypeMap, typeToConstructor } from './utils';
@@ -20,10 +20,8 @@ type TupleTypes = (Constructor | keyof InterfaceTypes)[] | {
 
 /** @internal */
 function decodeTuple (registry: Registry, _Types: TupleConstructors, value?: AnyTuple): Codec[] {
-  if (isU8a(value)) {
-    return decodeU8a(registry, value, _Types);
-  } else if (isHex(value)) {
-    return decodeTuple(registry, _Types, hexToU8a(value));
+  if (isU8a(value) || isHex(value)) {
+    return decodeU8a(registry, u8aToU8a(value), _Types);
   }
 
   const Types: Constructor[] = Array.isArray(_Types)

packages/types/src/codec/UInt.spec.ts

@@ -45,6 +45,12 @@ describe('UInt', (): void => {
     ).toEqual(4567);
   });
 
+  it('has a working toBigInt', (): void => {
+    expect(
+      new UInt(registry, 4567).toBigInt() + BigInt(1)
+    ).toEqual(BigInt(4568));
+  });
+
   it('converts to Little Endian from the provided value', (): void => {
     expect(
       new UInt(registry, 1234567).toU8a()

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

@@ -3,8 +3,6 @@
 
 import type { Codec, Constructor, Registry } from '../../types';
 
-import { arrayFlatten } from '@polkadot/util';
-
 /**
  * Given an u8a, and an array of Type constructors, decode the u8a against the
  * types, and return an array of decoded values.
@@ -16,13 +14,15 @@ export function decodeU8a (registry: Registry, u8a: Uint8Array, _types: Construc
   const types = Array.isArray(_types)
     ? _types
     : Object.values(_types);
+  const result: Codec[] = [];
+  let offset = 0;
 
-  if (!types.length) {
-    return [];
+  for (let i = 0; i < types.length; i++) {
+    const value = new types[i](registry, u8a.subarray(offset));
+
+    result.push(value);
+    offset += value.encodedLength;
   }
 
-  const Type = types[0];
-  const value = new Type(registry, u8a);
-
-  return arrayFlatten([[value], decodeU8a(registry, u8a.subarray(value.encodedLength), types.slice(1))]);
+  return result;
 }

packages/types/src/create/registry.ts

@@ -3,6 +3,7 @@
 
 /* eslint-disable @typescript-eslint/no-var-requires */
 
+import type { ExtDef } from '../extrinsic/signedExtensions/types';
 import type { ChainProperties, DispatchErrorModule, H256 } from '../interfaces/types';
 import type { CallFunction, Codec, Constructor, InterfaceTypes, RegisteredTypes, Registry, RegistryError, RegistryTypes } from '../types';
 
@@ -38,8 +39,9 @@ function injectErrors (_: Registry, metadata: Metadata, metadataErrors: Record<s
       const eventIndex = new Uint8Array([sectionIndex, index]);
 
       metadataErrors[u8aToHex(eventIndex)] = {
-        documentation: documentation.map((d): string => d.toString()),
+        documentation: documentation.map((d) => d.toString()),
         index,
+        method: name.toString(),
         name: name.toString(),
         section: sectionName
       };
@@ -133,6 +135,8 @@ export class TypeRegistry implements Registry {
 
   #signedExtensions: string[] = defaultExtensions;
 
+  #userExtensions?: Record<string, ExtDef>;
+
   constructor () {
     this.#knownDefaults = { Json, Metadata, Raw, ...baseTypes };
     this.#knownDefinitions = definitions as unknown as Record<string, { types: RegistryTypes }>;
@@ -277,11 +281,11 @@ export class TypeRegistry implements Registry {
   }
 
   public getSignedExtensionExtra (): Record<string, keyof InterfaceTypes> {
-    return expandExtensionTypes(this.#signedExtensions, 'extra');
+    return expandExtensionTypes(this.#signedExtensions, 'payload', this.#userExtensions);
   }
 
   public getSignedExtensionTypes (): Record<string, keyof InterfaceTypes> {
-    return expandExtensionTypes(this.#signedExtensions, 'types');
+    return expandExtensionTypes(this.#signedExtensions, 'extrinsic', this.#userExtensions);
   }
 
   public hasClass (name: string): boolean {
@@ -355,7 +359,7 @@ export class TypeRegistry implements Registry {
   }
 
   // sets the metadata
-  public setMetadata (metadata: Metadata, signedExtensions?: string[]): void {
+  public setMetadata (metadata: Metadata, signedExtensions?: string[], userExtensions?: Record<string, ExtDef>): void {
     injectExtrinsics(this, metadata, this.#metadataCalls);
     injectErrors(this, metadata, this.#metadataErrors);
     injectEvents(this, metadata, this.#metadataEvents);
@@ -366,7 +370,8 @@ export class TypeRegistry implements Registry {
         metadata.asLatest.extrinsic.version.gt(BN_ZERO)
           ? metadata.asLatest.extrinsic.signedExtensions.map((key) => key.toString())
           : defaultExtensions
-      )
+      ),
+      userExtensions
     );
 
     // setup the chain properties with format overrides
@@ -376,10 +381,11 @@ export class TypeRegistry implements Registry {
   }
 
   // sets the available signed extensions
-  setSignedExtensions (signedExtensions: string[] = defaultExtensions): void {
+  setSignedExtensions (signedExtensions: string[] = defaultExtensions, userExtensions?: Record<string, ExtDef>): void {
     this.#signedExtensions = signedExtensions;
+    this.#userExtensions = userExtensions;
 
-    const unknown = findUnknownExtensions(this.#signedExtensions);
+    const unknown = findUnknownExtensions(this.#signedExtensions, this.#userExtensions);
 
     if (unknown.length) {
       l.warn(`Unknown signed extensions ${unknown.join(', ')} found, treating them as no-effect`);

packages/types/src/extrinsic/signedExtensions/emptyCheck.ts

@@ -2,6 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export const emptyCheck = {
-  extra: {},
-  types: {}
+  extrinsic: {},
+  payload: {}
 };

packages/types/src/extrinsic/signedExtensions/index.ts

@@ -9,7 +9,7 @@ import substrateExtensions from './substrate';
 // A mapping of the known signed extensions to the extra fields that they contain. Unlike in the actual extensions,
 // we define the extra fields not as a Tuple, but rather as a struct so they can be named. These will be expanded
 // into the various fields when added to the payload (we only support V4 onwards with these, V3 and earlier are
-// deemded fixed and non-changeable)
+// deemed fixed and non-changeable)
 const allExtensions: ExtDef = {
   ...substrateExtensions,
   ...polkadotExtensions
@@ -26,16 +26,16 @@ const defaultExtensions: Array<keyof typeof allExtensions> = [
   'CheckBlockGasLimit'
 ];
 
-function findUnknownExtensions (extensions: string[]): string[] {
-  const names = Object.keys(allExtensions);
+function findUnknownExtensions (extensions: string[], userExtensions: Record<string, ExtDef> = {}): string[] {
+  const names = [...Object.keys(allExtensions), ...Object.keys(userExtensions)];
 
-  return extensions.filter((key): boolean => !names.includes(key));
+  return extensions.filter((key) => !names.includes(key));
 }
 
-function expandExtensionTypes (extensions: string[], type: keyof ExtInfo): ExtTypes {
+function expandExtensionTypes (extensions: string[], type: keyof ExtInfo, userExtensions: Record<string, ExtDef> = {}): ExtTypes {
   return extensions
-    .map((key): ExtInfo => allExtensions[key])
-    .filter((info): boolean => !!info)
+    .map((key) => allExtensions[key] || userExtensions[key])
+    .filter((info): info is ExtInfo => !!info)
     .reduce((result, info): ExtTypes => ({ ...result, ...info[type] }), {});
 }
 

packages/types/src/extrinsic/signedExtensions/substrate.ts

@@ -6,53 +6,53 @@ import type { ExtDef } from './types';
 import { emptyCheck } from './emptyCheck';
 
 const CheckMortality = {
-  extra: {
-    blockHash: 'Hash'
-  },
-  types: {
+  extrinsic: {
     era: 'ExtrinsicEra'
+  },
+  payload: {
+    blockHash: 'Hash'
   }
 };
 
 export default {
   ChargeTransactionPayment: {
-    extra: {},
-    types: {
+    extrinsic: {
       tip: 'Compact<Balance>'
-    }
+    },
+    payload: {}
   },
   CheckBlockGasLimit: emptyCheck,
   CheckEra: CheckMortality,
   CheckGenesis: {
-    extra: {
+    extrinsic: {},
+    payload: {
       genesisHash: 'Hash'
-    },
-    types: {}
+    }
   },
   CheckMortality,
   CheckNonce: {
-    extra: {},
-    types: {
+    extrinsic: {
       nonce: 'Compact<Index>'
-    }
+    },
+    payload: {}
   },
   CheckSpecVersion: {
-    extra: {
+    extrinsic: {},
+    payload: {
       specVersion: 'u32'
-    },
-    types: {}
+    }
   },
   CheckTxVersion: {
-    extra: {
+    extrinsic: {},
+    payload: {
       transactionVersion: 'u32'
-    },
-    types: {}
+    }
   },
   CheckVersion: {
-    extra: {
+    extrinsic: {},
+    payload: {
       specVersion: 'u32'
-    },
-    types: {}
+    }
   },
   CheckWeight: emptyCheck,
   LockStakingStatus: emptyCheck,

packages/types/src/extrinsic/signedExtensions/types.ts

@@ -6,8 +6,8 @@ import type { InterfaceTypes } from '../../types';
 export type ExtTypes = Record<string, keyof InterfaceTypes>;
 
 export type ExtInfo = {
-  extra: ExtTypes;
-  types: ExtTypes;
+  extrinsic: ExtTypes;
+  payload: ExtTypes;
 }
 
 export type ExtDef = Record<string, ExtInfo>;

packages/types/src/interfaces/assets/definitions.ts

@@ -26,7 +26,7 @@ export default {
       zombies: 'u32',
       accounts: 'u32'
     },
-    TAssetBalance: 'Balance',
+    TAssetBalance: 'u64',
     TAssetDepositBalance: 'BalanceOf'
   }
 } as Definitions;

packages/types/src/interfaces/assets/types.ts

@@ -1,8 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Struct, bool, u32 } from '@polkadot/types';
-import type { AccountId, Balance, BalanceOf } from '@polkadot/types/interfaces/runtime';
+import type { Struct, bool, u32, u64 } from '@polkadot/types';
+import type { AccountId, BalanceOf } from '@polkadot/types/interfaces/runtime';
 
 /** @name AssetBalance */
 export interface AssetBalance extends Struct {
@@ -26,7 +26,7 @@ export interface AssetDetails extends Struct {
 }
 
 /** @name TAssetBalance */
-export interface TAssetBalance extends Balance {}
+export interface TAssetBalance extends u64 {}
 
 /** @name TAssetDepositBalance */
 export interface TAssetDepositBalance extends BalanceOf {}

packages/types/src/interfaces/contracts/definitions.ts

@@ -136,6 +136,10 @@ export default {
       }
     },
     ContractStorageKey: '[u8; 32]',
+    DeletedContract: {
+      pairCount: 'u32',
+      trieId: 'TrieId'
+    },
     Gas: 'u64',
     HostFnWeights: {
       caller: 'Weight',

packages/types/src/interfaces/contracts/types.ts

@@ -104,6 +104,12 @@ export interface ContractInfo extends Enum {
 /** @name ContractStorageKey */
 export interface ContractStorageKey extends U8aFixed {}
 
+/** @name DeletedContract */
+export interface DeletedContract extends Struct {
+  readonly pairCount: u32;
+  readonly trieId: TrieId;
+}
+
 /** @name Gas */
 export interface Gas extends u64 {}
 

packages/types/src/interfaces/crowdloan/definitions.ts

@@ -0,0 +1,38 @@
+// Copyright 2017-2021 @polkadot/types authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// order important in structs... :)
+/* eslint-disable sort-keys */
+
+import type { Definitions } from '../../types';
+
+export default {
+  rpc: {},
+  types: {
+    FundIndex: 'u32',
+    LastContribution: {
+      _enum: {
+        Never: 'Null',
+        PreEnding: 'AuctionIndex',
+        Ending: 'BlockNumber'
+      }
+    },
+    DeployData: {
+      codeHash: 'Hash',
+      codeSize: 'u32',
+      initialHeadData: 'HeadData'
+    },
+    FundInfo: {
+      parachain: 'Option<ParaId>',
+      owner: 'AccountId',
+      deposit: 'Balance',
+      raised: 'Balance',
+      end: 'BlockNumber',
+      cap: 'Balance',
+      lastContribution: 'LastContribution',
+      firstSlot: 'BlockNumber',
+      lastSlot: 'BlockNumber',
+      deployData: 'Option<DeployData>'
+    }
+  }
+} as Definitions;

packages/types/src/interfaces/crowdloan/index.ts

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

packages/types/src/interfaces/crowdloan/types.ts

@@ -0,0 +1,41 @@
+// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
+/* eslint-disable */
+
+import type { Enum, Option, Struct, u32 } from '@polkadot/types';
+import type { AuctionIndex, HeadData, ParaId } from '@polkadot/types/interfaces/parachains';
+import type { AccountId, Balance, BlockNumber, Hash } from '@polkadot/types/interfaces/runtime';
+
+/** @name DeployData */
+export interface DeployData extends Struct {
+  readonly codeHash: Hash;
+  readonly codeSize: u32;
+  readonly initialHeadData: HeadData;
+}
+
+/** @name FundIndex */
+export interface FundIndex extends u32 {}
+
+/** @name FundInfo */
+export interface FundInfo extends Struct {
+  readonly parachain: Option<ParaId>;
+  readonly owner: AccountId;
+  readonly deposit: Balance;
+  readonly raised: Balance;
+  readonly end: BlockNumber;
+  readonly cap: Balance;
+  readonly lastContribution: LastContribution;
+  readonly firstSlot: BlockNumber;
+  readonly lastSlot: BlockNumber;
+  readonly deployData: Option<DeployData>;
+}
+
+/** @name LastContribution */
+export interface LastContribution extends Enum {
+  readonly isNever: boolean;
+  readonly isPreEnding: boolean;
+  readonly asPreEnding: AuctionIndex;
+  readonly isEnding: boolean;
+  readonly asEnding: BlockNumber;
+}
+
+export type PHANTOM_CROWDLOAN = 'crowdloan';

packages/types/src/interfaces/definitions.ts

@@ -22,6 +22,7 @@ export { default as genericAsset } from './genericAsset/definitions';
 export { default as grandpa } from './grandpa/definitions';
 export { default as identity } from './identity/definitions';
 export { default as imOnline } from './imOnline/definitions';
+export { default as lottery } from './lottery/definitions';
 export { default as offences } from './offences/definitions';
 export { default as proxy } from './proxy/definitions';
 export { default as recovery } from './recovery/definitions';
@@ -40,6 +41,7 @@ export { default as vesting } from './vesting/definitions';
 // polkadot-specific types
 export { default as attestations } from './attestations/definitions';
 export { default as claims } from './claims/definitions';
+export { default as crowdloan } from './crowdloan/definitions';
 export { default as parachains } from './parachains/definitions';
 export { default as poll } from './poll/definitions';
 export { default as purchase } from './purchase/definitions';

packages/types/src/interfaces/eth/definitions.ts

@@ -176,26 +176,46 @@ const types: DefinitionsTypes = {
     }
   },
   EthTransaction: {
-    blockHash: 'Option<H256>',
-    blockNumber: 'Option<U256>',
-    chainId: 'Option<u64>',
-    condition: 'Option<EthTransactionCondition>',
-    creates: 'Option<H160>',
-    from: 'H160',
-    gas: 'U256',
-    gasPrice: 'U256',
-    hash: 'H256',
-    input: 'Bytes',
     nonce: 'U256',
-    publicKey: 'Option<H512>',
-    r: 'U256',
-    raw: 'Bytes',
-    s: 'U256',
-    standardV: 'U256',
-    to: 'Option<H160>',
-    transactionIndex: 'Option<U256>',
-    v: 'U256',
-    value: 'U256'
+    gasPrice: 'U256',
+    gasLimit: 'U256',
+    action: 'EthTransactionAction',
+    value: 'U256',
+    input: 'Bytes',
+    // TransactionSignature (embedded)
+    v: 'u64',
+    r: 'H256',
+    s: 'H256'
+  },
+  // as per the RPC definition
+  // TODO: Check these, re-add
+  // EthTransaction: {
+  //   // hash in Rust
+  //   transactionHash: 'H256',
+  //   nonce: 'U256',
+  //   blockHash: 'Option<H256>',
+  //   blockNumber: 'Option<U256>',
+  //   transactionIndex: 'Option<U256>',
+  //   from: 'H160',
+  //   to: 'Option<H160>',
+  //   value: 'U256',
+  //   gasPrice: 'U256',
+  //   gas: 'U256',
+  //   input: 'Bytes',
+  //   creates: 'Option<H160>',
+  //   raw: 'Bytes',
+  //   publicKey: 'Option<H512>',
+  //   chainId: 'Option<U64>',
+  //   standardV: 'U256',
+  //   v: 'U256',
+  //   r: 'U256',
+  //   s: 'U256'
+  // },
+  EthTransactionAction: {
+    _enum: {
+      Call: 'H160',
+      Create: 'Null'
+    }
   },
   EthTransactionCondition: {
     _enum: {

packages/types/src/interfaces/eth/types.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 
 import type { Bytes, Enum, GenericEthereumAccountId, GenericEthereumLookupSource, Option, Struct, U256, U64, U8aFixed, Vec, bool, u32, u64 } from '@polkadot/types';
-import type { BlockNumber, H160, H2048, H256, H512 } from '@polkadot/types/interfaces/runtime';
+import type { BlockNumber, H160, H2048, H256 } from '@polkadot/types/interfaces/runtime';
 
 /** @name EthAccount */
 export interface EthAccount extends Struct {
@@ -211,26 +211,22 @@ export interface EthSyncStatus extends Enum {
 
 /** @name EthTransaction */
 export interface EthTransaction extends Struct {
-  readonly blockHash: Option<H256>;
-  readonly blockNumber: Option<U256>;
-  readonly chainId: Option<u64>;
-  readonly condition: Option<EthTransactionCondition>;
-  readonly creates: Option<H160>;
-  readonly from: H160;
-  readonly gas: U256;
-  readonly gasPrice: U256;
-  readonly hash: H256;
-  readonly input: Bytes;
   readonly nonce: U256;
-  readonly publicKey: Option<H512>;
-  readonly r: U256;
-  readonly raw: Bytes;
-  readonly s: U256;
-  readonly standardV: U256;
-  readonly to: Option<H160>;
-  readonly transactionIndex: Option<U256>;
-  readonly v: U256;
+  readonly gasPrice: U256;
+  readonly gasLimit: U256;
+  readonly action: EthTransactionAction;
   readonly value: U256;
+  readonly input: Bytes;
+  readonly v: u64;
+  readonly r: H256;
+  readonly s: H256;
+}
+
+/** @name EthTransactionAction */
+export interface EthTransactionAction extends Enum {
+  readonly isCall: boolean;
+  readonly asCall: H160;
+  readonly isCreate: boolean;
 }
 
 /** @name EthTransactionCondition */

packages/types/src/interfaces/lottery/definitions.ts

@@ -0,0 +1,21 @@
+// Copyright 2017-2021 @polkadot/types authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// order important in structs... :)
+/* eslint-disable sort-keys */
+
+import type { Definitions } from '../../types';
+
+export default {
+  rpc: {},
+  types: {
+    CallIndex: '(u8, u8)',
+    LotteryConfig: {
+      price: 'Balance',
+      start: 'BlockNumber',
+      length: 'BlockNumber',
+      delay: 'BlockNumber',
+      repeat: 'bool'
+    }
+  }
+} as Definitions;

packages/types/src/interfaces/lottery/index.ts

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

packages/types/src/interfaces/lottery/types.ts

@@ -0,0 +1,20 @@
+// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
+/* eslint-disable */
+
+import type { Struct, bool, u8 } from '@polkadot/types';
+import type { ITuple } from '@polkadot/types/types';
+import type { Balance, BlockNumber } from '@polkadot/types/interfaces/runtime';
+
+/** @name CallIndex */
+export interface CallIndex extends ITuple<[u8, u8]> {}
+
+/** @name LotteryConfig */
+export interface LotteryConfig extends Struct {
+  readonly price: Balance;
+  readonly start: BlockNumber;
+  readonly length: BlockNumber;
+  readonly delay: BlockNumber;
+  readonly repeat: bool;
+}
+
+export type PHANTOM_LOTTERY = 'lottery';

packages/types/src/interfaces/parachains/definitions.ts

@@ -6,15 +6,17 @@
 
 import type { Definitions } from '../../types';
 
-const SLOT_RANGE_COUNT = 10;
+import hrmpTypes from './hrmp';
+import slotTypes from './slots';
 
+// proposeParachain
 const proposeTypes = {
   ParachainProposal: {
     proposer: 'AccountId',
-    validationFunction: 'ValidationCode',
-    initialHeadState: 'HeadData',
+    validationCode: 'ValidationCode',
+    genesisHead: 'HeadData',
     validators: 'Vec<ValidatorId>',
-    name: 'Vec<u8>',
+    name: 'Bytes',
     balance: 'Balance'
   },
   RegisteredParachainInfo: {
@@ -27,6 +29,8 @@ export default {
   rpc: {},
   types: {
     ...proposeTypes,
+    ...hrmpTypes,
+    ...slotTypes,
     AbridgedCandidateReceipt: {
       parachainIndex: 'ParaId',
       relayParent: 'Hash',
@@ -36,6 +40,25 @@ export default {
       povBlockHash: 'Hash',
       commitments: 'CandidateCommitments'
     },
+    AbridgedHostConfiguration: {
+      maxCodeSize: 'u32',
+      maxHeadDataSize: 'u32',
+      maxUpwardQueueCount: 'u32',
+      maxUpwardQueueSize: 'u32',
+      maxUpwardMessageSize: 'u32',
+      maxUpwardMessageNumPerCandidate: 'u32',
+      hrmpMaxMessageNumPerCandidate: 'u32',
+      validationUpgradeFrequency: 'BlockNumber',
+      validationUpgradeDelay: 'BlockNumber'
+    },
+    AbridgedHrmpChannel: {
+      maxCapacity: 'u32',
+      maxTotalSize: 'u32',
+      maxMessageSize: 'u32',
+      msgCount: 'u32',
+      totalSize: 'u32',
+      mqcHead: 'Option<Hash>'
+    },
     AssignmentId: 'AccountId',
     AssignmentKind: {
       _enum: {
@@ -49,7 +72,6 @@ export default {
       validatorIndices: 'BitVec'
     },
     AuthorityDiscoveryId: 'AccountId',
-    AuctionIndex: 'u32',
     AvailabilityBitfield: 'BitVec',
     AvailabilityBitfieldRecord: {
       bitfield: 'AvailabilityBitfield',
@@ -60,12 +82,6 @@ export default {
       validityVotes: 'Vec<ValidityAttestation>',
       validatorIndices: 'BitVec'
     },
-    Bidder: {
-      _enum: {
-        New: 'NewBidder',
-        Existing: 'ParaId'
-      }
-    },
     BufferedSessionChange: {
       applyAt: 'BlockNumber',
       validators: 'Vec<ValidatorId>',
@@ -83,11 +99,11 @@ export default {
     CandidateDescriptor: {
       paraId: 'ParaId',
       relayParent: 'Hash',
-      collatorId: 'Hash',
+      collatorId: 'CollatorId',
       persistedValidationDataHash: 'Hash',
       povHash: 'Hash',
       erasureRoot: 'Hash',
-      signature: 'Signature'
+      signature: 'CollatorSignature'
     },
     CandidateHash: 'Hash',
     CandidatePendingAvailability: {
@@ -103,7 +119,7 @@ export default {
       descriptor: 'CandidateDescriptor',
       commitmentsHash: 'Hash'
     },
-    CollatorId: '[u8; 32]',
+    CollatorId: 'H256',
     CollatorSignature: 'Signature',
     CommittedCandidateReceipt: {
       descriptor: 'CandidateDescriptor',
@@ -138,12 +154,29 @@ export default {
     },
     HeadData: 'Bytes',
     HostConfiguration: {
-      validationUpgradeFrequency: 'BlockNumber',
-      validationUpgradeDelay: 'BlockNumber',
-      acceptancePeriod: 'BlockNumber',
       maxCodeSize: 'u32',
       maxHeadDataSize: 'u32',
+      maxUpwardQueueCount: 'u32',
+      maxUpwardQueueSize: 'u32',
+      maxUpwardMessageSize: 'u32',
+      maxUpwardMessageNumPerCandidate: 'u32',
+      hrmpMaxMessageNumPerCandidate: 'u32',
+      validationUpgradeFrequency: 'BlockNumber',
+      validationUpgradeDelay: 'BlockNumber',
       maxPovSize: 'u32',
+      maxDownwardMessageSize: 'u32',
+      preferredDispatchableUpwardMessagesStepWeight: 'Weight',
+      hrmpMaxParachainOutboundChannels: 'u32',
+      hrmpMaxParathreadOutboundChannels: 'u32',
+      hrmpOpenRequestTtl: 'u32',
+      hrmpSenderDeposit: 'Balance',
+      hrmpRecipientDeposit: 'Balance',
+      hrmpChannelMaxCapacity: 'u32',
+      hrmpChannelMaxTotalSize: 'u32',
+      hrmpMaxParachainInboundChannels: 'u32',
+      hrmpMaxParathreadInboundChannels: 'u32',
+      hrmpChannelMaxMessageSize: 'u32',
+      acceptancePeriod: 'BlockNumber',
       parathreadCores: 'u32',
       parathreadRetries: 'u32',
       groupRotationFrequency: 'BlockNumber',
@@ -156,46 +189,7 @@ export default {
       nDelayTranches: 'u32',
       zerothDelayTrancheWidth: 'u32',
       neededApprovals: 'u32',
-      relayVrfModuloSamples: 'u32',
-      maxUpwardQueueCount: 'u32',
-      maxUpwardQueueSize: 'u32',
-      maxDownwardMessageSize: 'u32',
-      preferredDispatchableUpwardMessagesStepWeight: 'Weight',
-      maxUpwardMessageSize: 'u32',
-      maxUpwardMessageNumPerCandidate: 'u32',
-      hrmpOpenRequestTtl: 'u32',
-      hrmpSenderDeposit: 'Balance',
-      hrmpRecipientDeposit: 'Balance',
-      hrmpChannelMaxCapacity: 'u32',
-      hrmpChannelMaxTotalSize: 'u32',
-      hrmpMaxParachainInboundChannels: 'u32',
-      hrmpMaxParathreadInboundChannels: 'u32',
-      hrmpChannelMaxMessageSize: 'u32',
-      hrmpMaxParachainOutboundChannels: 'u32',
-      hrmpMaxParathreadOutboundChannels: 'u32',
-      hrmpMaxMessageNumPerCandidate: 'u32'
-    },
-    HrmpChannel: {
-      senderDeposit: 'Balance',
-      recipientDeposit: 'Balance',
-      maxCapacity: 'u32',
-      maxTotalSize: 'u32',
-      maxMessageSize: 'u32',
-      msgCount: 'u32',
-      totalSize: 'u32',
-      mqcHead: 'Option<Hash>'
-    },
-    HrmpChannelId: {
-      sender: 'u32',
-      receiver: 'u32'
-    },
-    HrmpOpenChannelRequest: {
-      confirmed: 'bool',
-      age: 'SessionIndex',
-      senderDeposit: 'Balance',
-      maxMessageSize: 'u32',
-      maxCapacity: 'u32',
-      maxTotalSize: 'u32'
+      relayVrfModuloSamples: 'u32'
     },
     InboundDownwardMessage: {
       pubSentAt: 'BlockNumber',
@@ -206,24 +200,6 @@ export default {
       data: 'Bytes'
     },
     InboundHrmpMessages: 'Vec<InboundHrmpMessage>',
-    IncomingParachain: {
-      _enum: {
-        Unset: 'NewBidder',
-        Fixed: 'IncomingParachainFixed',
-        Deploy: 'IncomingParachainDeploy'
-      }
-    },
-    IncomingParachainFixed: {
-      codeHash: 'Hash',
-      codeSize: 'u32',
-      initialHeadData: 'HeadData'
-    },
-    IncomingParachainDeploy: {
-      code: 'ValidationCode',
-      initialHeadData: 'HeadData'
-    },
-    LeasePeriod: 'BlockNumber',
-    LeasePeriodOf: 'LeasePeriod',
     LocalValidationData: {
       parentHead: 'HeadData',
       balance: 'Balance',
@@ -233,10 +209,6 @@ export default {
       downwardMessages: 'Vec<InboundDownwardMessage>',
       horizontalMessages: 'BTreeMap<ParaId, InboundHrmpMessages>'
     },
-    NewBidder: {
-      who: 'AccountId',
-      sub: 'SubId'
-    },
     OutboundHrmpMessage: {
       recipient: 'u32',
       data: 'Bytes'
@@ -244,6 +216,11 @@ export default {
     ParachainDispatchOrigin: {
       _enum: ['Signed', 'Parachain', 'Root']
     },
+    ParaGenesisArgs: {
+      genesisHead: 'Bytes',
+      validationCode: 'Bytes',
+      parachain: 'bool'
+    },
     ParaId: 'u32',
     ParaInfo: {
       scheduling: 'Scheduling'
@@ -267,6 +244,7 @@ export default {
     PersistedValidationData: {
       parentHead: 'HeadData',
       blockNumber: 'BlockNumber',
+      relayStorageRoot: 'Hash',
       hrmpMqcHeads: 'Vec<(u32, Hash)>',
       dmqMqcHead: 'Hash',
       maxPovSize: 'u32'
@@ -290,7 +268,7 @@ export default {
       validators: 'Vec<ValidatorId>',
       discoveryKeys: 'Vec<AuthorityDiscoveryId>',
       assignmentKeys: 'Vec<AssignmentId>',
-      validatorGroups: 'Vec<ValidatorGroup>',
+      validatorGroups: 'Vec<SessionInfoValidatorGroup>',
       nCores: 'u32',
       zerothDelayTrancheWidth: 'u32',
       relayVrfModuloSamples: 'u32',
@@ -298,19 +276,17 @@ export default {
       noShowSlots: 'u32',
       neededApprovals: 'u32'
     },
+    SessionInfoValidatorGroup: 'Vec<u32>', // ValidatorIndex (u16 in staking)
     SignedAvailabilityBitfield: {
       payload: 'BitVec',
-      validatorIndex: 'u32',
-      signature: 'Signature'
+      validatorIndex: 'u32', // ValidatorIndex for inclusion
+      signature: 'ValidatorSignature'
     },
     SignedAvailabilityBitfields: 'Vec<SignedAvailabilityBitfield>',
     SigningContext: {
       sessionIndex: 'SessionIndex',
       parentHash: 'Hash'
     },
-    SlotRange: {
-      _enum: ['ZeroZero', 'ZeroOne', 'ZeroTwo', 'ZeroThree', 'OneOne', 'OneTwo', 'OneThree', 'TwoTwo', 'TwoThree', 'ThreeThree']
-    },
     Statement: {
       _enum: {
         Never: 'Null', // starts at 1
@@ -319,7 +295,6 @@ export default {
         Invalid: 'Hash'
       }
     },
-    SubId: 'u32',
     TransientValidationData: {
       maxCodeSize: 'u32',
       maxHeadDataSize: 'u32',
@@ -338,7 +313,10 @@ export default {
       persisted: 'PersistedValidationData',
       transient: 'TransientValidationData'
     },
-    ValidatorGroup: 'Vec<ValidatorIndex>',
+    ValidationDataType: {
+      validationData: 'ValidationData',
+      relayChainState: 'Vec<Bytes>'
+    },
     ValidatorSignature: 'Signature',
     ValidityAttestation: {
       _enum: {
@@ -352,8 +330,6 @@ export default {
         V0: 'Xcm'
       }
     },
-    WinningData: `[WinningDataEntry; ${SLOT_RANGE_COUNT}]`,
-    WinningDataEntry: 'Option<Bidder>',
     WithdrawAsset: {
       assets: 'Vec<MultiAsset>',
       effects: 'Vec<Order>'

packages/types/src/interfaces/parachains/hrmp.ts

@@ -0,0 +1,30 @@
+// Copyright 2017-2021 @polkadot/types authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// order important in structs... :)
+/* eslint-disable sort-keys */
+
+export default {
+  HrmpChannel: {
+    maxCapacity: 'u32',
+    maxTotalSize: 'u32',
+    maxMessageSize: 'u32',
+    msgCount: 'u32',
+    totalSize: 'u32',
+    mqcHead: 'Option<Hash>',
+    senderDeposit: 'Balance',
+    recipientDeposit: 'Balance'
+  },
+  HrmpChannelId: {
+    sender: 'u32',
+    receiver: 'u32'
+  },
+  HrmpOpenChannelRequest: {
+    confirmed: 'bool',
+    age: 'SessionIndex',
+    senderDeposit: 'Balance',
+    maxMessageSize: 'u32',
+    maxCapacity: 'u32',
+    maxTotalSize: 'u32'
+  }
+};

packages/types/src/interfaces/parachains/slots.ts

@@ -0,0 +1,48 @@
+// Copyright 2017-2021 @polkadot/types authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// order important in structs... :)
+/* eslint-disable sort-keys */
+
+const SLOT_RANGE_COUNT = 10;
+
+export default {
+  AuctionIndex: 'u32',
+  Bidder: {
+    _enum: {
+      New: 'NewBidder',
+      Existing: 'ParaId'
+    }
+  },
+  IncomingParachain: {
+    _enum: {
+      Unset: 'NewBidder',
+      Fixed: 'IncomingParachainFixed',
+      Deploy: 'IncomingParachainDeploy'
+    }
+  },
+  IncomingParachainDeploy: {
+    code: 'ValidationCode',
+    initialHeadData: 'HeadData'
+  },
+  IncomingParachainFixed: {
+    codeHash: 'Hash',
+    codeSize: 'u32',
+    initialHeadData: 'HeadData'
+  },
+  LeasePeriod: 'BlockNumber',
+  LeasePeriodOf: 'BlockNumber',
+  NewBidder: {
+    who: 'AccountId',
+    sub: 'SubId'
+  },
+  NewBidderOption: 'Option<NewBidder>',
+  SlotRange: {
+    _enum: ['ZeroZero', 'ZeroOne', 'ZeroTwo', 'ZeroThree', 'OneOne', 'OneTwo', 'OneThree', 'TwoTwo', 'TwoThree', 'ThreeThree']
+  },
+  SubId: 'u32',
+  WinningData: `[WinningDataEntry; ${SLOT_RANGE_COUNT}]`,
+  WinningDataEntry: 'Option<Bidder>',
+  WinnersData: 'Vec<WinnersDataTuple>',
+  WinnersDataTuple: '(NewBidderOption, ParaId, BalanceOf, SlotRange)'
+};

packages/types/src/interfaces/parachains/types.ts

@@ -4,9 +4,8 @@
 import type { BTreeMap, BitVec, Bytes, Compact, Enum, Option, Struct, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types';
 import type { ITuple } from '@polkadot/types/types';
 import type { Signature } from '@polkadot/types/interfaces/extrinsics';
-import type { AccountId, Balance, BlockNumber, Hash, ValidatorId, Weight } from '@polkadot/types/interfaces/runtime';
+import type { AccountId, Balance, BalanceOf, BlockNumber, H256, Hash, ValidatorId, Weight } from '@polkadot/types/interfaces/runtime';
 import type { MembershipProof, SessionIndex } from '@polkadot/types/interfaces/session';
-import type { ValidatorIndex } from '@polkadot/types/interfaces/staking';
 
 /** @name AbridgedCandidateReceipt */
 export interface AbridgedCandidateReceipt extends Struct {
@@ -19,6 +18,29 @@ export interface AbridgedCandidateReceipt extends Struct {
   readonly commitments: CandidateCommitments;
 }
 
+/** @name AbridgedHostConfiguration */
+export interface AbridgedHostConfiguration extends Struct {
+  readonly maxCodeSize: u32;
+  readonly maxHeadDataSize: u32;
+  readonly maxUpwardQueueCount: u32;
+  readonly maxUpwardQueueSize: u32;
+  readonly maxUpwardMessageSize: u32;
+  readonly maxUpwardMessageNumPerCandidate: u32;
+  readonly hrmpMaxMessageNumPerCandidate: u32;
+  readonly validationUpgradeFrequency: BlockNumber;
+  readonly validationUpgradeDelay: BlockNumber;
+}
+
+/** @name AbridgedHrmpChannel */
+export interface AbridgedHrmpChannel extends Struct {
+  readonly maxCapacity: u32;
+  readonly maxTotalSize: u32;
+  readonly maxMessageSize: u32;
+  readonly msgCount: u32;
+  readonly totalSize: u32;
+  readonly mqcHead: Option<Hash>;
+}
+
 /** @name AbstractFungible */
 export interface AbstractFungible extends Struct {
   readonly id: Bytes;
@@ -149,11 +171,11 @@ export interface CandidateCommitments extends Struct {
 export interface CandidateDescriptor extends Struct {
   readonly paraId: ParaId;
   readonly relayParent: Hash;
-  readonly collatorId: Hash;
+  readonly collatorId: CollatorId;
   readonly persistedValidationDataHash: Hash;
   readonly povHash: Hash;
   readonly erasureRoot: Hash;
-  readonly signature: Signature;
+  readonly signature: CollatorSignature;
 }
 
 /** @name CandidateHash */
@@ -177,7 +199,7 @@ export interface CandidateReceipt extends Struct {
 }
 
 /** @name CollatorId */
-export interface CollatorId extends U8aFixed {}
+export interface CollatorId extends H256 {}
 
 /** @name CollatorSignature */
 export interface CollatorSignature extends Signature {}
@@ -264,12 +286,29 @@ export interface HeadData extends Bytes {}
 
 /** @name HostConfiguration */
 export interface HostConfiguration extends Struct {
-  readonly validationUpgradeFrequency: BlockNumber;
-  readonly validationUpgradeDelay: BlockNumber;
-  readonly acceptancePeriod: BlockNumber;
   readonly maxCodeSize: u32;
   readonly maxHeadDataSize: u32;
+  readonly maxUpwardQueueCount: u32;
+  readonly maxUpwardQueueSize: u32;
+  readonly maxUpwardMessageSize: u32;
+  readonly maxUpwardMessageNumPerCandidate: u32;
+  readonly hrmpMaxMessageNumPerCandidate: u32;
+  readonly validationUpgradeFrequency: BlockNumber;
+  readonly validationUpgradeDelay: BlockNumber;
   readonly maxPovSize: u32;
+  readonly maxDownwardMessageSize: u32;
+  readonly preferredDispatchableUpwardMessagesStepWeight: Weight;
+  readonly hrmpMaxParachainOutboundChannels: u32;
+  readonly hrmpMaxParathreadOutboundChannels: u32;
+  readonly hrmpOpenRequestTtl: u32;
+  readonly hrmpSenderDeposit: Balance;
+  readonly hrmpRecipientDeposit: Balance;
+  readonly hrmpChannelMaxCapacity: u32;
+  readonly hrmpChannelMaxTotalSize: u32;
+  readonly hrmpMaxParachainInboundChannels: u32;
+  readonly hrmpMaxParathreadInboundChannels: u32;
+  readonly hrmpChannelMaxMessageSize: u32;
+  readonly acceptancePeriod: BlockNumber;
   readonly parathreadCores: u32;
   readonly parathreadRetries: u32;
   readonly groupRotationFrequency: BlockNumber;
@@ -283,35 +322,18 @@ export interface HostConfiguration extends Struct {
   readonly zerothDelayTrancheWidth: u32;
   readonly neededApprovals: u32;
   readonly relayVrfModuloSamples: u32;
-  readonly maxUpwardQueueCount: u32;
-  readonly maxUpwardQueueSize: u32;
-  readonly maxDownwardMessageSize: u32;
-  readonly preferredDispatchableUpwardMessagesStepWeight: Weight;
-  readonly maxUpwardMessageSize: u32;
-  readonly maxUpwardMessageNumPerCandidate: u32;
-  readonly hrmpOpenRequestTtl: u32;
-  readonly hrmpSenderDeposit: Balance;
-  readonly hrmpRecipientDeposit: Balance;
-  readonly hrmpChannelMaxCapacity: u32;
-  readonly hrmpChannelMaxTotalSize: u32;
-  readonly hrmpMaxParachainInboundChannels: u32;
-  readonly hrmpMaxParathreadInboundChannels: u32;
-  readonly hrmpChannelMaxMessageSize: u32;
-  readonly hrmpMaxParachainOutboundChannels: u32;
-  readonly hrmpMaxParathreadOutboundChannels: u32;
-  readonly hrmpMaxMessageNumPerCandidate: u32;
 }
 
 /** @name HrmpChannel */
 export interface HrmpChannel extends Struct {
-  readonly senderDeposit: Balance;
-  readonly recipientDeposit: Balance;
   readonly maxCapacity: u32;
   readonly maxTotalSize: u32;
   readonly maxMessageSize: u32;
   readonly msgCount: u32;
   readonly totalSize: u32;
   readonly mqcHead: Option<Hash>;
+  readonly senderDeposit: Balance;
+  readonly recipientDeposit: Balance;
 }
 
 /** @name HrmpChannelId */
@@ -406,7 +428,7 @@ export interface Junction extends Enum {
 export interface LeasePeriod extends BlockNumber {}
 
 /** @name LeasePeriodOf */
-export interface LeasePeriodOf extends LeasePeriod {}
+export interface LeasePeriodOf extends BlockNumber {}
 
 /** @name LocalValidationData */
 export interface LocalValidationData extends Struct {
@@ -473,6 +495,9 @@ export interface NewBidder extends Struct {
   readonly sub: SubId;
 }
 
+/** @name NewBidderOption */
+export interface NewBidderOption extends Option<NewBidder> {}
+
 /** @name Order */
 export interface Order extends Enum {
   readonly isNull: boolean;
@@ -513,13 +538,20 @@ export interface ParachainDispatchOrigin extends Enum {
 /** @name ParachainProposal */
 export interface ParachainProposal extends Struct {
   readonly proposer: AccountId;
-  readonly validationFunction: ValidationCode;
-  readonly initialHeadState: HeadData;
+  readonly validationCode: ValidationCode;
+  readonly genesisHead: HeadData;
   readonly validators: Vec<ValidatorId>;
   readonly name: Bytes;
   readonly balance: Balance;
 }
 
+/** @name ParaGenesisArgs */
+export interface ParaGenesisArgs extends Struct {
+  readonly genesisHead: Bytes;
+  readonly validationCode: Bytes;
+  readonly parachain: bool;
+}
+
 /** @name ParaId */
 export interface ParaId extends u32 {}
 
@@ -559,6 +591,7 @@ export interface ParathreadEntry extends Struct {
 export interface PersistedValidationData extends Struct {
   readonly parentHead: HeadData;
   readonly blockNumber: BlockNumber;
+  readonly relayStorageRoot: Hash;
   readonly hrmpMqcHeads: Vec<ITuple<[u32, Hash]>>;
   readonly dmqMqcHead: Hash;
   readonly maxPovSize: u32;
@@ -625,7 +658,7 @@ export interface SessionInfo extends Struct {
   readonly validators: Vec<ValidatorId>;
   readonly discoveryKeys: Vec<AuthorityDiscoveryId>;
   readonly assignmentKeys: Vec<AssignmentId>;
-  readonly validatorGroups: Vec<ValidatorGroup>;
+  readonly validatorGroups: Vec<SessionInfoValidatorGroup>;
   readonly nCores: u32;
   readonly zerothDelayTrancheWidth: u32;
   readonly relayVrfModuloSamples: u32;
@@ -634,11 +667,14 @@ export interface SessionInfo extends Struct {
   readonly neededApprovals: u32;
 }
 
+/** @name SessionInfoValidatorGroup */
+export interface SessionInfoValidatorGroup extends Vec<u32> {}
+
 /** @name SignedAvailabilityBitfield */
 export interface SignedAvailabilityBitfield extends Struct {
   readonly payload: BitVec;
   readonly validatorIndex: u32;
-  readonly signature: Signature;
+  readonly signature: ValidatorSignature;
 }
 
 /** @name SignedAvailabilityBitfields */
@@ -711,6 +747,12 @@ export interface ValidationData extends Struct {
   readonly transient: TransientValidationData;
 }
 
+/** @name ValidationDataType */
+export interface ValidationDataType extends Struct {
+  readonly validationData: ValidationData;
+  readonly relayChainState: Vec<Bytes>;
+}
+
 /** @name ValidationFunctionParams */
 export interface ValidationFunctionParams extends Struct {
   readonly maxCodeSize: u32;
@@ -718,9 +760,6 @@ export interface ValidationFunctionParams extends Struct {
   readonly codeUpgradeAllowed: Option<RelayChainBlockNumber>;
 }
 
-/** @name ValidatorGroup */
-export interface ValidatorGroup extends Vec<ValidatorIndex> {}
-
 /** @name ValidatorSignature */
 export interface ValidatorSignature extends Signature {}
 
@@ -751,6 +790,12 @@ export interface VersionedXcm extends Enum {
   readonly asV0: Xcm;
 }
 
+/** @name WinnersData */
+export interface WinnersData extends Vec<WinnersDataTuple> {}
+
+/** @name WinnersDataTuple */
+export interface WinnersDataTuple extends ITuple<[NewBidderOption, ParaId, BalanceOf, SlotRange]> {}
+
 /** @name WinningData */
 export interface WinningData extends Vec<WinningDataEntry> {}
 

packages/types/src/interfaces/runtime/definitions.ts

@@ -86,7 +86,7 @@ export default {
     LookupTarget: 'AccountId',
     ModuleId: 'LockIdentifier',
     MultiAddress: 'GenericMultiAddress',
-    Moment: 'u64',
+    Moment: 'UInt<64, Moment>',
     OpaqueCall: 'Bytes',
     Origin: 'DoNotConstruct<Origin>',
     OriginCaller: {
@@ -120,6 +120,7 @@ export default {
     StorageData: 'Bytes',
     TransactionPriority: 'u64',
     ValidatorId: 'AccountId',
+    ValidatorIdOf: 'ValidatorId',
     Weight: 'u64',
     WeightMultiplier: 'Fixed64',
 

packages/types/src/interfaces/runtime/types.ts

@@ -166,7 +166,7 @@ export interface LookupTarget extends AccountId {}
 export interface ModuleId extends LockIdentifier {}
 
 /** @name Moment */
-export interface Moment extends u64 {}
+export interface Moment extends UInt {}
 
 /** @name MultiAddress */
 export interface MultiAddress extends GenericMultiAddress {}
@@ -267,6 +267,9 @@ export interface U32F32 extends UInt {}
 /** @name ValidatorId */
 export interface ValidatorId extends AccountId {}
 
+/** @name ValidatorIdOf */
+export interface ValidatorIdOf extends ValidatorId {}
+
 /** @name Weight */
 export interface Weight extends u64 {}
 

packages/types/src/interfaces/session/definitions.ts

@@ -24,10 +24,10 @@ const keyTypes = {
   SessionKeys4: '(AccountId, AccountId, AccountId, AccountId)',
   // CC3
   SessionKeys5: '(AccountId, AccountId, AccountId, AccountId, AccountId)',
-  SessionKeys6: '(AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId)',
-  SessionKeys7: '(AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId)',
-  SessionKeys8: '(AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId)',
-  SessionKeys9: '(AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId)'
+  SessionKeys6: '(AccountId, AccountId, AccountId, AccountId, AccountId, AccountId)',
+  SessionKeys7: '(AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId)',
+  SessionKeys8: '(AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId)',
+  SessionKeys9: '(AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId)'
 };
 
 export default {

packages/types/src/interfaces/session/types.ts

@@ -41,16 +41,16 @@ export interface SessionKeys4 extends ITuple<[AccountId, AccountId, AccountId, A
 export interface SessionKeys5 extends ITuple<[AccountId, AccountId, AccountId, AccountId, AccountId]> {}
 
 /** @name SessionKeys6 */
-export interface SessionKeys6 extends ITuple<[AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId]> {}
+export interface SessionKeys6 extends ITuple<[AccountId, AccountId, AccountId, AccountId, AccountId, AccountId]> {}
 
 /** @name SessionKeys7 */
-export interface SessionKeys7 extends ITuple<[AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId]> {}
+export interface SessionKeys7 extends ITuple<[AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId]> {}
 
 /** @name SessionKeys8 */
-export interface SessionKeys8 extends ITuple<[AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId]> {}
+export interface SessionKeys8 extends ITuple<[AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId]> {}
 
 /** @name SessionKeys9 */
-export interface SessionKeys9 extends ITuple<[AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId]> {}
+export interface SessionKeys9 extends ITuple<[AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId, AccountId]> {}
 
 /** @name ValidatorCount */
 export interface ValidatorCount extends u32 {}

packages/types/src/interfaces/types.ts

@@ -19,6 +19,7 @@ export * from './genericAsset/types';
 export * from './grandpa/types';
 export * from './identity/types';
 export * from './imOnline/types';
+export * from './lottery/types';
 export * from './offences/types';
 export * from './proxy/types';
 export * from './recovery/types';
@@ -35,6 +36,7 @@ export * from './utility/types';
 export * from './vesting/types';
 export * from './attestations/types';
 export * from './claims/types';
+export * from './crowdloan/types';
 export * from './parachains/types';
 export * from './poll/types';
 export * from './purchase/types';

packages/types/src/primitive/BitVec.spec.ts

@@ -0,0 +1,32 @@
+// Copyright 2017-2021 @polkadot/types authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { hexToU8a } from '@polkadot/util';
+
+import { TypeRegistry } from '../create';
+import { BitVec } from './';
+
+// form Inclusion BitVec<lsb0, u8>
+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);
+
+      it('has the right encodedLength', (): void => {
+        expect(
+          new BitVec(registry, input).encodedLength
+        ).toEqual((test.length - 2) / 2);
+      });
+
+      // FIXME These do not align at all
+      it.skip('re-encodes to the same input value', (): void => {
+        expect(
+          new BitVec(registry, input).toU8a()
+        ).toEqual(input);
+      });
+    });
+  });
+});

packages/types/src/types/interfaces.ts

@@ -8,7 +8,7 @@ import type { Hash } from '../interfaces/runtime';
 import type { AnyTuple, ArgsDef, Codec } from './codec';
 
 export interface ICompact<T> extends Codec {
-  toBigInt (): BigInt;
+  toBigInt (): bigint;
   toBn (): BN;
   toNumber (): number;
   unwrap (): T;

packages/types/src/types/registry.ts

@@ -4,6 +4,7 @@
 import type BN from 'bn.js';
 import type { Metadata } from '@polkadot/metadata';
 import type { Observable } from '@polkadot/x-rxjs';
+import type { ExtDef } from '../extrinsic/signedExtensions/types';
 import type { H256 } from '../interfaces/runtime';
 import type { ChainProperties } from '../interfaces/system';
 import type { CallFunction } from './calls';
@@ -29,6 +30,8 @@ export type RegistryTypes = Record<string, Constructor | string | Record<string,
 export interface RegistryError {
   documentation: string[];
   index: number;
+  // compat
+  method: string;
   name: string;
   section: string;
 }
@@ -111,6 +114,6 @@ export interface Registry {
   register (arg1: string | Constructor | RegistryTypes, arg2?: Constructor): void;
   setChainProperties (properties?: ChainProperties): void;
   setHasher (hasher?: (data: Uint8Array) => Uint8Array): void;
-  setMetadata (metadata: Metadata, signedExtensions?: string[]): void;
-  setSignedExtensions (signedExtensions?: string[]): void;
+  setMetadata (metadata: Metadata, signedExtensions?: string[], userExtensions?: Record<string, ExtDef>): void;
+  setSignedExtensions (signedExtensions?: string[], userExtensions?: Record<string, ExtDef>): void;
 }

packages/x-rxjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/x-rxjs",
-  "version": "3.3.1",
+  "version": "3.5.1",
   "description": "A pass-through interface for RxJs (allowing node + mjs usage)",
   "main": "index.js",
   "sideEffects": false,