[CI Skip] release/stable 4.3.1

skip-checks: true

.123trigger

@@ -1,4 +1,4 @@
-26
+27
 1.4.2
 1.6.2
 1.11.2
@@ -17,6 +17,5 @@
 3.9.2
 3.9.3
 3.10.2
-
 4.0.2
-4.0.3
+4.0.3

CHANGELOG.md

@@ -1,5 +1,39 @@
 # CHANGELOG
 
+## 4.3.1 Mar 29, 2021
+
+Upgrade priority: Low.
+
+Contributed:
+
+- Fix documentation on ABI parameters (Thanks to https://github.com/vminkov)
+
+Changes:
+
+- Warn on usage of deprecated contract interfaces
+- Update `ParaInfo` type
+- Council should be optional in treasury derives
+- Allow extraction of session derives indexes with no staking
+
+
+## 4.2.1 Mar 22, 2021
+
+Upgrade priority: Low. Recommended when tracking the latest updates from Substrate.
+
+Contributed:
+
+- Fix contract even decoding on Substrate 3 (Thanks to https://github.com/vminkov)
+
+Changes:
+
+- Adjust `Extender{Header, SignedBlock}` types to ensure at-block `Header` types are used
+- Explicit definition for new Rococo triple refcount `AccountData` types
+- Convert metadata private class fields to ES-private
+- Adjust `SignedBlock` type for new `justifications` field
+- Optimize society derive for multi accounts
+- Bump metadata to latest substrate version
+
+
 ## 4.1.1 Mar 15, 2021
 
 Upgrade priority: Low. Recommended when tracking the latest updates from Substrate.

package.json

@@ -25,14 +25,14 @@
     "test:watch": "polkadot-dev-run-test --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.13.8",
+    "@babel/core": "^7.13.13",
     "@babel/register": "^7.13.8",
-    "@babel/runtime": "^7.13.9",
-    "@polkadot/dev": "^0.62.5",
+    "@babel/runtime": "^7.13.10",
+    "@polkadot/dev": "^0.62.7",
     "@polkadot/ts": "^0.3.62",
     "@polkadot/typegen": "workspace:packages/typegen",
-    "@types/jest": "^26.0.20",
+    "@types/jest": "^26.0.22",
     "copyfiles": "^2.4.1"
   },
-  "version": "4.1.1"
+  "version": "4.3.1"
 }

packages/api-contract/README.md

@@ -8,7 +8,7 @@ import { Abi } from '@polkadot/api-contract';
 
 const wsProvider = new WsProvider(<...Node Url...>);
 const api = await ApiPromise.create({ provider: wsProvider });
-const abi = new Abi(api.registry, <...JSON ABI...>);
+const abi = new Abi(<...JSON ABI...>, api.registry.getChainProperties());
 
 api.tx.contracts
   .call(<contract addr>, <value>, <max gas>, abi.messages.<method name>(<...params...>))

packages/api-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "4.1.1",
+  "version": "4.3.1",
   "type": "module",
   "description": "Interfaces for interacting with contracts and contract ABIs",
   "main": "index.js",
@@ -16,9 +16,9 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme",
   "dependencies": {
-    "@babel/runtime": "^7.13.9",
-    "@polkadot/api": "4.1.1",
-    "@polkadot/types": "4.1.1",
+    "@babel/runtime": "^7.13.10",
+    "@polkadot/api": "4.3.1",
+    "@polkadot/types": "4.3.1",
     "@polkadot/util": "^6.0.5",
     "@polkadot/x-rxjs": "^6.0.5",
     "bn.js": "^4.11.9"

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

@@ -10,7 +10,7 @@ import type { MapConstructorExec } from './types';
 
 import { SubmittableResult } from '@polkadot/api';
 import { ApiBase } from '@polkadot/api/base';
-import { assert, compactAddLength, isFunction, isUndefined, isWasm, stringCamelCase, u8aToU8a } from '@polkadot/util';
+import { assert, compactAddLength, isFunction, isUndefined, isWasm, logger, stringCamelCase, u8aToU8a } from '@polkadot/util';
 import { blake2AsU8a } from '@polkadot/util-crypto';
 
 import { Abi } from '../Abi';
@@ -20,6 +20,8 @@ import { Blueprint } from './Blueprint';
 import { Contract } from './Contract';
 import { createBluePrintTx, EMPTY_SALT, encodeSalt } from './util';
 
+const l = logger('Code');
+
 export class CodeSubmittableResult<ApiType extends ApiTypes> extends SubmittableResult {
   public readonly blueprint?: Blueprint<ApiType>;
   public readonly contract?: Contract<ApiType>;
@@ -64,22 +66,26 @@ export class Code<ApiType extends ApiTypes> extends Base<ApiType> {
    * @deprecated Use the `code.tx.<constructor>(...) format to put code and deploy
    */
   public createContract (constructorOrId: AbiConstructor | string | number, options: BlueprintOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> {
+    l.warn('.createContract is deprecated, use code.tx.<constructorName>(...) instead (where code refers to this instance)');
+
     return this.#instantiate(constructorOrId, options, params);
   }
 
   #instantiate = (constructorOrId: AbiConstructor | string | number, options: BlueprintOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> => {
     return isFunction(this.api.tx.contracts.instantiateWithCode)
-      ? this.#instantiateSingle(constructorOrId, options, params)
-      : this.#instantiateBatch(constructorOrId, options, params);
+      ? this.#instantiateCurrent(constructorOrId, options, params)
+      : this.#instantiatePrev(constructorOrId, options, params);
   }
 
-  #instantiateSingle = (constructorOrId: AbiConstructor | string | number, { gasLimit = 0, salt, value = 0 }: BlueprintOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> => {
+  #instantiateCurrent = (constructorOrId: AbiConstructor | string | number, { gasLimit = 0, salt, value = 0 }: BlueprintOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> => {
     return this.api.tx.contracts
       .instantiateWithCode(value, gasLimit, compactAddLength(this.code), this.abi.findConstructor(constructorOrId).toU8a(params), encodeSalt(salt))
       .withResultTransform(this.#transformEvents);
   }
 
-  #instantiateBatch = (constructorOrId: AbiConstructor | string | number, { gasLimit = 0, salt, value = 0 }: BlueprintOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> => {
+  #instantiatePrev = (constructorOrId: AbiConstructor | string | number, { gasLimit = 0, salt, value = 0 }: BlueprintOptions, params: CodecArg[]): SubmittableExtrinsic<ApiType, CodeSubmittableResult<ApiType>> => {
+    assert(isFunction(this.api.tx.utility?.batch), 'Your chain does not include the utility pallet, for contracts v2 deployment, this is required');
+
     const encodedSalt = encodeSalt(salt);
     const withSalt = this.api.tx.contracts.instantiate.meta.args.length === 5;
     const encoded = this.abi.findConstructor(constructorOrId).toU8a(params, withSalt ? EMPTY_SALT : encodedSalt);

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

@@ -23,6 +23,7 @@ import { Base } from './Base';
 // As per Rust, 5 * GAS_PER_SEC
 const MAX_CALL_GAS = new BN(5_000_000_000_000).subn(1);
 const ERROR_NO_CALL = 'Your node does not expose the contracts.call RPC. This is most probably due to a runtime configuration.';
+
 const l = logger('Contract');
 
 function createQuery <ApiType extends ApiTypes> (fn: (origin: string | AccountId | Uint8Array, options: ContractOptions, params: CodecArg[]) => ContractCallResult<ApiType, ContractCallOutcome>): ContractQuery<ApiType> {
@@ -39,11 +40,14 @@ function createTx <ApiType extends ApiTypes> (fn: (options: ContractOptions, par
       : fn(...extractOptions(options, params));
 }
 
-function createWithId <T> (fn: (messageOrId: AbiMessage | string | number, options: ContractOptions, params: CodecArg[]) => T): ContractGeneric<ContractOptions, T> {
-  return (messageOrId: AbiMessage | string | number, options: BigInt | string | number | BN | ContractOptions, ...params: CodecArg[]): T =>
-    isOptions(options)
+function createWithId <T> (fn: (messageOrId: AbiMessage | string | number, options: ContractOptions, params: CodecArg[]) => T, warn?: string): ContractGeneric<ContractOptions, T> {
+  return (messageOrId: AbiMessage | string | number, options: BigInt | string | number | BN | ContractOptions, ...params: CodecArg[]): T => {
+    warn && l.warn(warn);
+
+    return isOptions(options)
       ? fn(messageOrId, options, params)
       : fn(messageOrId, ...extractOptions(options, params));
+  };
 }
 
 export class ContractSubmittableResult extends SubmittableResult {
@@ -109,8 +113,8 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
     super(api, abi, decorateMethod);
 
     this.address = this.registry.createType('AccountId', address);
-    this.exec = createWithId(this.#exec);
-    this.read = createWithId(this.#read);
+    this.exec = createWithId(this.#exec, '.exec is deprecated, use contract.tx.<messageName>(...) instead (where contract refers to this instance)');
+    this.read = createWithId(this.#read, '.read is deprecated, use contract.query.<messageName>(...) instead (where contract refers to this instance)');
 
     this.abi.messages.forEach((m): void => {
       const messageName = stringCamelCase(m.identifier);
@@ -156,7 +160,8 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
     return this.api.tx.contracts
       .call(this.address, value, this.#getGas(gasLimit), this.abi.findMessage(messageOrId).toU8a(params))
       .withResultTransform((result: ISubmittableResult) =>
-        new ContractSubmittableResult(result, applyOnEvent(result, ['ContractExecution'], (records: EventRecord[]) =>
+        // ContractEmitted is the current generation, ContractExecution is the previous generation
+        new ContractSubmittableResult(result, applyOnEvent(result, ['ContractEmitted', 'ContractExecution'], (records: EventRecord[]) =>
           records
             .map(({ event: { data: [, data] } }): DecodedEvent | null => {
               try {

packages/api-contract/src/packageInfo.ts

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

packages/api-contract/src/util.ts

@@ -12,7 +12,7 @@ import BN from 'bn.js';
 import { createTypeUnsafe } from '@polkadot/types/create';
 import { isBigInt, isBn, isNumber, isString } from '@polkadot/util';
 
-type ContractEvents = 'CodeStored' | 'ContractExecution' | 'Instantiated';
+type ContractEvents = 'CodeStored' | 'ContractEmitted' | 'ContractExecution' | 'Instantiated';
 
 type TOptions = BlueprintOptions | ContractOptions;
 

packages/api-derive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "4.1.1",
+  "version": "4.3.1",
   "type": "module",
   "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
   "main": "index.js",
@@ -16,10 +16,10 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-derive#readme",
   "dependencies": {
-    "@babel/runtime": "^7.13.9",
-    "@polkadot/api": "4.1.1",
-    "@polkadot/rpc-core": "4.1.1",
-    "@polkadot/types": "4.1.1",
+    "@babel/runtime": "^7.13.10",
+    "@polkadot/api": "4.3.1",
+    "@polkadot/rpc-core": "4.3.1",
+    "@polkadot/types": "4.3.1",
     "@polkadot/util": "^6.0.5",
     "@polkadot/util-crypto": "^6.0.5",
     "@polkadot/x-rxjs": "^6.0.5",
@@ -27,6 +27,6 @@
   },
   "devDependencies": {
     "@polkadot/keyring": "^6.0.5",
-    "@polkadot/rpc-provider": "4.1.1"
+    "@polkadot/rpc-provider": "4.3.1"
   }
 }

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

@@ -37,12 +37,16 @@ export function bounties (instanceId: string, api: ApiInterfaceRx): () => Observ
   return memo(instanceId, (): Observable<DeriveBounties> =>
     combineLatest([
       bountyBase.bountyCount<BountyIndex>(),
-      api.query.council ? api.query.council.proposalCount<ProposalIndex>() : of(0)
+      api.query.council
+        ? api.query.council.proposalCount<ProposalIndex>()
+        : of(0)
     ]).pipe(
       switchMap(() =>
         combineLatest([
           bountyBase.bounties.keys<[BountyIndex]>(),
-          api.derive.council ? api.derive.council.proposals() : of([])
+          api.derive.council
+            ? api.derive.council.proposals()
+            : of([])
         ])
       ),
       switchMap(([keys, proposals]): Observable<Result> => {

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

@@ -3,11 +3,12 @@
 
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Observable } from '@polkadot/x-rxjs';
+import type { SignedBlockExtended } from '../type/types';
 
 import { combineLatest, of } from '@polkadot/x-rxjs';
 import { catchError, map } from '@polkadot/x-rxjs/operators';
 
-import { SignedBlockExtended } from '../type';
+import { createSignedBlockExtended } from '../type';
 import { memo } from '../util';
 
 /**
@@ -33,7 +34,7 @@ export function getBlock (instanceId: string, api: ApiInterfaceRx): (hash: Uint8
         : of([])
     ]).pipe(
       map(([signedBlock, events, validators]): SignedBlockExtended =>
-        new SignedBlockExtended(signedBlock.registry, signedBlock, events, validators)
+        createSignedBlockExtended(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/getHeader.ts

@@ -3,11 +3,12 @@
 
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Observable } from '@polkadot/x-rxjs';
+import type { HeaderExtended } from '../type/types';
 
 import { combineLatest, of } from '@polkadot/x-rxjs';
 import { catchError, map } from '@polkadot/x-rxjs/operators';
 
-import { HeaderExtended } from '../type';
+import { createHeaderExtended } from '../type';
 import { memo } from '../util';
 
 /**
@@ -33,7 +34,7 @@ export function getHeader (instanceId: string, api: ApiInterfaceRx): (hash: Uint
         : of([])
     ]).pipe(
       map(([header, validators]): HeaderExtended =>
-        new HeaderExtended(header.registry, header, validators)
+        createHeaderExtended(header.registry, header, validators)
       ),
       catchError((): Observable<undefined> =>
         // where rpc.chain.getHeader throws, we will land here - it can happen that

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

@@ -5,12 +5,12 @@ import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Vec } from '@polkadot/types';
 import type { EventRecord, SignedBlock } from '@polkadot/types/interfaces';
 import type { Observable } from '@polkadot/x-rxjs';
-import type { HeaderExtended } from '../type';
+import type { HeaderExtended, SignedBlockExtended } from '../type/types';
 
 import { combineLatest, of } from '@polkadot/x-rxjs';
 import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
-import { SignedBlockExtended } from '../type';
+import { createSignedBlockExtended } from '../type';
 import { memo } from '../util';
 
 /**
@@ -30,7 +30,7 @@ export function subscribeNewBlocks (instanceId: string, api: ApiInterfaceRx): ()
         );
       }),
       map(([block, events, header]) =>
-        new SignedBlockExtended(block.registry, block, events, header.validators)
+        createSignedBlockExtended(block.registry, block, events, header.validators)
       )
     )
   );

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

@@ -3,11 +3,12 @@
 
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Observable } from '@polkadot/x-rxjs';
+import type { HeaderExtended } from '../type/types';
 
 import { combineLatest, of } from '@polkadot/x-rxjs';
 import { map } from '@polkadot/x-rxjs/operators';
 
-import { HeaderExtended } from '../type';
+import { createHeaderExtended } from '../type';
 import { memo } from '../util';
 
 /**
@@ -34,7 +35,7 @@ export function subscribeNewHeads (instanceId: string, api: ApiInterfaceRx): ()
       map(([header, validators]): HeaderExtended => {
         header.createdAtHash = header.hash;
 
-        return new HeaderExtended(header.registry, header, validators);
+        return createHeaderExtended(header.registry, header, validators);
       })
     )
   );

packages/api-derive/src/packageInfo.ts

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

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

@@ -13,7 +13,7 @@ import { map } from '@polkadot/x-rxjs/operators';
 import { memo } from '../util';
 
 // parse into Indexes
-function parse ([activeEra, activeEraStart, currentEra, currentIndex, validatorCount]: [EraIndex, Option<Moment>, EraIndex, SessionIndex, u32]): DeriveSessionIndexes {
+function parse ([currentIndex, activeEra, activeEraStart, currentEra, validatorCount]: [SessionIndex, EraIndex, Option<Moment>, EraIndex, u32]): DeriveSessionIndexes {
   return {
     activeEra,
     activeEraStart,
@@ -24,42 +24,57 @@ function parse ([activeEra, activeEraStart, currentEra, currentIndex, validatorC
 }
 
 // query based on latest
-function query (api: ApiInterfaceRx): Observable<DeriveSessionIndexes> {
-  return api.queryMulti<[Option<ActiveEraInfo>, Option<EraIndex>, SessionIndex, u32]>([
+function queryStaking (api: ApiInterfaceRx): Observable<DeriveSessionIndexes> {
+  return api.queryMulti<[SessionIndex, Option<ActiveEraInfo>, Option<EraIndex>, u32]>([
+    api.query.session.currentIndex,
     api.query.staking.activeEra,
     api.query.staking.currentEra,
-    api.query.session.currentIndex,
     api.query.staking.validatorCount
   ]).pipe(
-    map(([activeOpt, currentEra, currentIndex, validatorCount]): DeriveSessionIndexes => {
+    map(([currentIndex, activeOpt, currentEra, validatorCount]): DeriveSessionIndexes => {
       const { index, start } = activeOpt.unwrapOrDefault();
 
       return parse([
+        currentIndex,
         index,
         start,
         currentEra.unwrapOrDefault(),
-        currentIndex,
         validatorCount
       ]);
     })
   );
 }
 
+// query based on latest
+function querySession (api: ApiInterfaceRx): Observable<DeriveSessionIndexes> {
+  return api.query.session.currentIndex().pipe(
+    map((currentIndex): DeriveSessionIndexes => parse([
+      currentIndex,
+      api.registry.createType('EraIndex'),
+      api.registry.createType('Option<Moment>'),
+      api.registry.createType('EraIndex'),
+      api.registry.createType('u32')
+    ]))
+  );
+}
+
 // empty set when none is available
 function empty (api: ApiInterfaceRx): Observable<DeriveSessionIndexes> {
   return of(parse([
+    api.registry.createType('SessionIndex', 1),
     api.registry.createType('EraIndex'),
     api.registry.createType('Option<Moment>'),
     api.registry.createType('EraIndex'),
-    api.registry.createType('SessionIndex', 1),
     api.registry.createType('u32')
   ]));
 }
 
 export function indexes (instanceId: string, api: ApiInterfaceRx): () => Observable<DeriveSessionIndexes> {
   return memo(instanceId, (): Observable<DeriveSessionIndexes> =>
-    api.query.session && api.query.staking
-      ? query(api)
+    api.query.session
+      ? api.query.staking
+        ? queryStaking(api)
+        : querySession(api)
       : empty(api)
   );
 }

packages/api-derive/src/society/member.ts

@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { bool, Option, Vec } from '@polkadot/types';
-import type { AccountId, Balance, BlockNumber, SocietyVote, StrikeCount, VouchingStatus } from '@polkadot/types/interfaces';
-import type { ITuple } from '@polkadot/types/types';
+import type { AccountId } from '@polkadot/types/interfaces';
 import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveSocietyMember } from '../types';
 
@@ -12,28 +10,13 @@ import { map } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
-type Result = [Vec<ITuple<[BlockNumber, Balance]>>, StrikeCount, Option<SocietyVote>, bool, Option<VouchingStatus>];
-
 /**
  * @description Get the member info for a society
  */
 export function member (instanceId: string, api: ApiInterfaceRx): (accountId: AccountId) => Observable<DeriveSocietyMember> {
   return memo(instanceId, (accountId: AccountId): Observable<DeriveSocietyMember> =>
-    api.queryMulti<Result>([
-      [api.query.society.payouts, accountId],
-      [api.query.society.strikes, accountId],
-      [api.query.society.defenderVotes, accountId],
-      [api.query.society.suspendedMembers, accountId],
-      [api.query.society.vouching, accountId]
-    ]).pipe(
-      map(([payouts, strikes, defenderVotes, suspended, vouching]: Result): DeriveSocietyMember => ({
-        accountId,
-        isSuspended: suspended.isTrue,
-        payouts,
-        strikes,
-        vote: defenderVotes.unwrapOr(undefined),
-        vouching: vouching.unwrapOr(undefined)
-      }))
+    api.derive.society._members([accountId]).pipe(
+      map(([result]) => result)
     )
   );
 }

packages/api-derive/src/society/members.ts

@@ -2,28 +2,51 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { AccountId } from '@polkadot/types/interfaces';
+import type { bool, Option, Vec } from '@polkadot/types';
+import type { AccountId, Balance, BlockNumber, SocietyVote, StrikeCount, VouchingStatus } from '@polkadot/types/interfaces';
+import type { ITuple } from '@polkadot/types/types';
 import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveSocietyMember } from '../types';
 
-import { combineLatest } from '@polkadot/x-rxjs';
-import { switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, of } from '@polkadot/x-rxjs';
+import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
+type Result = [AccountId[], Vec<ITuple<[BlockNumber, Balance]>>[], StrikeCount[], Option<SocietyVote>[], bool[], Option<VouchingStatus>[]];
+
+export function _members (instanceId: string, api: ApiInterfaceRx): (accountIds: AccountId[]) => Observable<DeriveSocietyMember[]> {
+  return memo(instanceId, (accountIds: AccountId[]): Observable<DeriveSocietyMember[]> =>
+    combineLatest<Result>([
+      of(accountIds),
+      api.query.society.payouts.multi(accountIds),
+      api.query.society.strikes.multi(accountIds),
+      api.query.society.defenderVotes.multi(accountIds),
+      api.query.society.suspendedMembers.multi(accountIds),
+      api.query.society.vouching.multi(accountIds)
+    ]).pipe(
+      map(([accountIds, payouts, strikes, defenderVotes, suspended, vouching]) =>
+        accountIds.map((accountId, index) => ({
+          accountId,
+          isDefenderVoter: defenderVotes[index].isSome,
+          isSuspended: suspended[index].isTrue,
+          payouts: payouts[index],
+          strikes: strikes[index],
+          vote: defenderVotes[index].unwrapOr(undefined),
+          vouching: vouching[index].unwrapOr(undefined)
+        }))
+      )
+    )
+  );
+}
+
 /**
  * @description Get the member info for a society
  */
 export function members (instanceId: string, api: ApiInterfaceRx): () => Observable<DeriveSocietyMember[]> {
   return memo(instanceId, (): Observable<DeriveSocietyMember[]> =>
     api.query.society.members<AccountId[]>().pipe(
-      switchMap((members): Observable<DeriveSocietyMember[]> =>
-        combineLatest(
-          members.map((accountId): Observable<DeriveSocietyMember> =>
-            api.derive.society.member(accountId)
-          )
-        )
-      )
+      switchMap((members) => api.derive.society._members(members))
     )
   );
 }

packages/api-derive/src/treasury/proposals.ts

@@ -61,7 +61,9 @@ function retrieveProposals (api: ApiInterfaceRx, proposalCount: ProposalIndex, a
 
   return combineLatest([
     api.query.treasury.proposals.multi<Option<TreasuryProposal>>(allIds),
-    api.derive.council.proposals()
+    api.derive.council
+      ? api.derive.council.proposals()
+      : of([] as DeriveCollectiveProposal[])
   ]).pipe(
     map(([allProposals, councilProposals]: [Option<TreasuryProposal>[], DeriveCollectiveProposal[]]): DeriveTreasuryProposals =>
       parseResult(api, { allIds, allProposals, approvalIds, councilProposals, proposalCount })

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

@@ -2,44 +2,41 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { AccountId, Header } 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';
+import type { Registry } from '@polkadot/types/types';
+import type { HeaderExtended } from './types';
 
 import { extractAuthor } from './util';
 
-// We can ignore the properties, added via Struct.with
-const _Header = Struct.with(runtimeTypes.types.Header as any) as Constructor<Header>;
+export function createHeaderExtended (registry: Registry, header?: Header, validators?: AccountId[]): HeaderExtended {
+  // an instance of the base extrinsic for us to extend
+  const HeaderBase = registry.createClass('Header');
 
-/**
- * @name HeaderExtended
- * @description
- * A [[Block]] header with an additional `author` field that indicates the block author
- */
-export class HeaderExtended extends _Header {
-  readonly #author?: AccountId;
-  readonly #validators?: AccountId[];
+  class Implementation extends HeaderBase implements HeaderExtended {
+    readonly #author?: AccountId;
+    readonly #validators?: AccountId[];
 
-  constructor (registry: Registry, header?: Header, validators?: AccountId[]) {
-    super(registry, header);
+    constructor (registry: Registry, header?: Header, validators?: AccountId[]) {
+      super(registry, header);
 
-    this.#author = extractAuthor(this.digest, validators);
-    this.#validators = validators;
-    this.createdAtHash = header?.createdAtHash;
+      this.#author = extractAuthor(this.digest, validators);
+      this.#validators = validators;
+      this.createdAtHash = header?.createdAtHash;
+    }
+
+    /**
+     * @description Convenience method, returns the author for the block
+     */
+    public get author (): AccountId | undefined {
+      return this.#author;
+    }
+
+    /**
+     * @description Convenience method, returns the validators for the block
+     */
+    public get validators (): AccountId[] | undefined {
+      return this.#validators;
+    }
   }
 
-  /**
-   * @description Convenience method, returns the author for the block
-   */
-  public get author (): AccountId | undefined {
-    return this.#author;
-  }
-
-  /**
-   * @description Convenience method, returns the validators for the block
-   */
-  public get validators (): AccountId[] | undefined {
-    return this.#validators;
-  }
+  return new Implementation(registry, header, validators);
 }

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

@@ -1,24 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-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';
+import type { AccountId, DispatchError, DispatchInfo, EventRecord, Extrinsic, SignedBlock } from '@polkadot/types/interfaces';
+import type { Registry } from '@polkadot/types/types';
+import type { SignedBlockExtended, TxWithEvent } from './types';
 
 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;
@@ -43,43 +31,45 @@ function mapExtrinsics (extrinsics: Extrinsic[], records: EventRecord[]): TxWith
   });
 }
 
-/**
- * @name SignedBlockExtended
- * @description
- * A [[Block]] header with an additional `author` field that indicates the block author
- */
-export class SignedBlockExtended extends _SignedBlock {
-  readonly #author?: AccountId;
-  readonly #events: EventRecord[];
-  readonly #extrinsics: TxWithEvent[];
+export function createSignedBlockExtended (registry: Registry, block?: SignedBlock, events?: EventRecord[], validators?: AccountId[]): SignedBlockExtended {
+  // an instance of the base extrinsic for us to extend
+  const SignedBlockBase = registry.createClass('SignedBlock');
 
-  constructor (registry: Registry, block?: SignedBlock, events?: EventRecord[], validators?: AccountId[]) {
-    super(registry, block);
+  class Implementation extends SignedBlockBase implements SignedBlockExtended {
+    readonly #author?: AccountId;
+    readonly #events: EventRecord[];
+    readonly #extrinsics: TxWithEvent[];
 
-    this.#author = extractAuthor(this.block.header.digest, validators);
-    this.#events = events || ([] as EventRecord[]);
-    this.#extrinsics = mapExtrinsics(this.block.extrinsics, this.#events);
-    this.createdAtHash = block?.createdAtHash;
+    constructor (registry: Registry, block?: SignedBlock, events?: EventRecord[], validators?: AccountId[]) {
+      super(registry, block);
+
+      this.#author = extractAuthor(this.block.header.digest, validators);
+      this.#events = events || ([] as EventRecord[]);
+      this.#extrinsics = mapExtrinsics(this.block.extrinsics, this.#events);
+      this.createdAtHash = block?.createdAtHash;
+    }
+
+    /**
+     * @description Convenience method, returns the author for the block
+     */
+    public get author (): AccountId | undefined {
+      return this.#author;
+    }
+
+    /**
+     * @description Convenience method, returns the events associated with the block
+     */
+    public get events (): EventRecord[] {
+      return this.#events;
+    }
+
+    /**
+     * @description Returns the extrinsics and their events, mapped
+     */
+    public get extrinsics (): TxWithEvent[] {
+      return this.#extrinsics;
+    }
   }
 
-  /**
-   * @description Convenience method, returns the author for the block
-   */
-  public get author (): AccountId | undefined {
-    return this.#author;
-  }
-
-  /**
-   * @description Convenience method, returns the events associated with the block
-   */
-  public get events (): EventRecord[] {
-    return this.#events;
-  }
-
-  /**
-   * @description Returns the extrinsics and their events, mapped
-   */
-  public get extrinsics (): TxWithEvent[] {
-    return this.#extrinsics;
-  }
+  return new Implementation(registry, block, events, validators);
 }

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

@@ -1,5 +1,5 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export { HeaderExtended } from './HeaderExtended';
-export { SignedBlockExtended } from './SignedBlockExtended';
+export { createHeaderExtended } from './HeaderExtended';
+export { createSignedBlockExtended } from './SignedBlockExtended';

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

@@ -0,0 +1,22 @@
+// Copyright 2017-2021 @polkadot/api-derive authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { AccountId, DispatchError, DispatchInfo, Event, EventRecord, Extrinsic, Header, SignedBlock } from '@polkadot/types/interfaces';
+
+export interface HeaderExtended extends Header {
+  readonly author: AccountId | undefined;
+  readonly validators: AccountId[] | undefined;
+}
+
+export interface SignedBlockExtended extends SignedBlock {
+  readonly author: AccountId | undefined;
+  readonly events: EventRecord[];
+  readonly extrinsics: TxWithEvent[];
+}
+
+export interface TxWithEvent {
+  dispatchError?: DispatchError;
+  dispatchInfo?: DispatchInfo;
+  events: Event[];
+  extrinsic: Extrinsic;
+}

packages/api-derive/src/types.ts

@@ -12,6 +12,7 @@ export * from './elections/types';
 export * from './parachains/types';
 export * from './session/types';
 export * from './staking/types';
+export * from './type/types';
 
 export interface DeriveBalancesAccountData {
   freeBalance: Balance;
@@ -107,6 +108,7 @@ export interface DeriveSocietyCandidate {
 
 export interface DeriveSocietyMember {
   accountId: AccountId;
+  isDefenderVoter: boolean;
   isSuspended: boolean;
   payouts: [BlockNumber, Balance][];
   strikes: StrikeCount;

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api",
-  "version": "4.1.1",
+  "version": "4.3.1",
   "type": "module",
   "description": "Promise and RxJS wrappers around the Polkadot JS RPC",
   "main": "index.js",
@@ -16,14 +16,14 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api#readme",
   "dependencies": {
-    "@babel/runtime": "^7.13.9",
-    "@polkadot/api-derive": "4.1.1",
+    "@babel/runtime": "^7.13.10",
+    "@polkadot/api-derive": "4.3.1",
     "@polkadot/keyring": "^6.0.5",
-    "@polkadot/metadata": "4.1.1",
-    "@polkadot/rpc-core": "4.1.1",
-    "@polkadot/rpc-provider": "4.1.1",
-    "@polkadot/types": "4.1.1",
-    "@polkadot/types-known": "4.1.1",
+    "@polkadot/metadata": "4.3.1",
+    "@polkadot/rpc-core": "4.3.1",
+    "@polkadot/rpc-provider": "4.3.1",
+    "@polkadot/types": "4.3.1",
+    "@polkadot/types-known": "4.3.1",
     "@polkadot/util": "^6.0.5",
     "@polkadot/util-crypto": "^6.0.5",
     "@polkadot/x-rxjs": "^6.0.5",

packages/api/src/augment/consts.ts

@@ -16,11 +16,9 @@ declare module '@polkadot/api/types/consts' {
     babe: {
       [key: string]: Codec;
       /**
-       * The number of **slots** that an epoch takes. We couple sessions to
-       * epochs, i.e. we start a new session once the new epoch begins.
-       * NOTE: Currently it is not possible to change the epoch duration
-       * after the chain has started. Attempting to do so will brick block
-       * production.
+       * The amount of time, in slots, that each epoch should last.
+       * NOTE: Currently it is not possible to change the epoch duration after
+       * the chain has started. Attempting to do so will brick block production.
        **/
       epochDuration: u64 & AugmentedConst<ApiType>;
       /**
@@ -318,15 +316,20 @@ declare module '@polkadot/api/types/consts' {
     proxy: {
       [key: string]: Codec;
       /**
-       * `AnnouncementDepositBase` metadata shadow.
+       * The base amount of currency needed to reserve for creating an announcement.
+       * 
+       * This is held when a new storage item holding a `Balance` is created (typically 16 bytes).
        **/
       announcementDepositBase: BalanceOf & AugmentedConst<ApiType>;
       /**
-       * `AnnouncementDepositFactor` metadata shadow.
+       * The amount of currency needed per announcement made.
+       * 
+       * This is held for adding an `AccountId`, `Hash` and `BlockNumber` (typically 68 bytes)
+       * into a pre-existing storage value.
        **/
       announcementDepositFactor: BalanceOf & AugmentedConst<ApiType>;
       /**
-       * `MaxPending` metadata shadow.
+       * The maximum amount of time-delayed announcements that are allowed to be pending.
        **/
       maxPending: u32 & AugmentedConst<ApiType>;
       /**
@@ -335,10 +338,17 @@ declare module '@polkadot/api/types/consts' {
       maxProxies: u16 & AugmentedConst<ApiType>;
       /**
        * The base amount of currency needed to reserve for creating a proxy.
+       * 
+       * This is held for an additional storage item whose value size is
+       * `sizeof(Balance)` bytes and whose key size is `sizeof(AccountId)` bytes.
        **/
       proxyDepositBase: BalanceOf & AugmentedConst<ApiType>;
       /**
        * The amount of currency needed per proxy added.
+       * 
+       * This is held for adding 32 bytes plus an instance of `ProxyType` more into a pre-existing
+       * storage value. Thus, when configuring `ProxyDepositFactor` one should take into account
+       * `32 + proxy_type.encode().len()` bytes of data.
        **/
       proxyDepositFactor: BalanceOf & AugmentedConst<ApiType>;
     };
@@ -400,22 +410,6 @@ declare module '@polkadot/api/types/consts' {
        * Number of eras that staked funds must remain bonded for.
        **/
       bondingDuration: EraIndex & AugmentedConst<ApiType>;
-      /**
-       * The number of blocks before the end of the era from which election submissions are allowed.
-       * 
-       * Setting this to zero will disable the offchain compute and only on-chain seq-phragmen will
-       * be used.
-       * 
-       * This is bounded by being within the last session. Hence, setting it to a value more than the
-       * length of a session will be pointless.
-       **/
-      electionLookahead: BlockNumber & AugmentedConst<ApiType>;
-      /**
-       * Maximum number of balancing iterations to run in the offchain submission.
-       * 
-       * If set to 0, balance_solution will not be executed at all.
-       **/
-      maxIterations: u32 & AugmentedConst<ApiType>;
       /**
        * The maximum number of nominators rewarded for each validator.
        * 
@@ -423,10 +417,6 @@ declare module '@polkadot/api/types/consts' {
        * their reward. This used to limit the i/o cost for the nominator payout.
        **/
       maxNominatorRewardedPerValidator: u32 & AugmentedConst<ApiType>;
-      /**
-       * The threshold of improvement that should be provided for a new solution to be accepted.
-       **/
-      minSolutionScoreBump: Perbill & AugmentedConst<ApiType>;
       /**
        * Number of sessions per era.
        **/

packages/api/src/augment/errors.ts

@@ -91,6 +91,21 @@ declare module '@polkadot/api/types/errors' {
        **/
       UnclesAlreadySet: AugmentedError<ApiType>;
     };
+    babe: {
+      [key: string]: AugmentedError<ApiType>;
+      /**
+       * A given equivocation report is valid but already previously reported.
+       **/
+      DuplicateOffenceReport: AugmentedError<ApiType>;
+      /**
+       * An equivocation proof provided as part of an equivocation report is invalid.
+       **/
+      InvalidEquivocationProof: AugmentedError<ApiType>;
+      /**
+       * A key ownership proof provided as part of an equivocation report is invalid.
+       **/
+      InvalidKeyOwnershipProof: AugmentedError<ApiType>;
+    };
     balances: {
       [key: string]: AugmentedError<ApiType>;
       /**
@@ -1032,10 +1047,6 @@ declare module '@polkadot/api/types/errors' {
        * A nomination target was supplied that was blocked or otherwise not a validator.
        **/
       BadTarget: AugmentedError<ApiType>;
-      /**
-       * The call is not allowed at the given time due to restrictions of election period.
-       **/
-      CallNotAllowed: AugmentedError<ApiType>;
       /**
        * Duplicate index.
        **/
@@ -1092,61 +1103,6 @@ declare module '@polkadot/api/types/errors' {
        * Can not rebond without unlocking chunks.
        **/
       NoUnlockChunk: AugmentedError<ApiType>;
-      /**
-       * Error while building the assignment type from the compact. This can happen if an index
-       * is invalid, or if the weights _overflow_.
-       **/
-      OffchainElectionBogusCompact: AugmentedError<ApiType>;
-      /**
-       * The submitted result has unknown edges that are not among the presented winners.
-       **/
-      OffchainElectionBogusEdge: AugmentedError<ApiType>;
-      /**
-       * The election size is invalid.
-       **/
-      OffchainElectionBogusElectionSize: AugmentedError<ApiType>;
-      /**
-       * One of the submitted nominators has an edge to which they have not voted on chain.
-       **/
-      OffchainElectionBogusNomination: AugmentedError<ApiType>;
-      /**
-       * One of the submitted nominators is not an active nominator on chain.
-       **/
-      OffchainElectionBogusNominator: AugmentedError<ApiType>;
-      /**
-       * The claimed score does not match with the one computed from the data.
-       **/
-      OffchainElectionBogusScore: AugmentedError<ApiType>;
-      /**
-       * A self vote must only be originated from a validator to ONLY themselves.
-       **/
-      OffchainElectionBogusSelfVote: AugmentedError<ApiType>;
-      /**
-       * One of the submitted winners is not an active candidate on chain (index is out of range
-       * in snapshot).
-       **/
-      OffchainElectionBogusWinner: AugmentedError<ApiType>;
-      /**
-       * Incorrect number of winners were presented.
-       **/
-      OffchainElectionBogusWinnerCount: AugmentedError<ApiType>;
-      /**
-       * The submitted result is received out of the open window.
-       **/
-      OffchainElectionEarlySubmission: AugmentedError<ApiType>;
-      /**
-       * One of the submitted nominators has an edge which is submitted before the last non-zero
-       * slash of the target.
-       **/
-      OffchainElectionSlashedNomination: AugmentedError<ApiType>;
-      /**
-       * The submitted result is not as good as the one stored on chain.
-       **/
-      OffchainElectionWeakSubmission: AugmentedError<ApiType>;
-      /**
-       * The snapshot data of the current window is missing.
-       **/
-      SnapshotUnavailable: AugmentedError<ApiType>;
       /**
        * Too many nomination targets supplied.
        **/

packages/api/src/augment/events.ts

@@ -769,13 +769,9 @@ declare module '@polkadot/api/types/events' {
        **/
       Slash: AugmentedEvent<ApiType, [AccountId, Balance]>;
       /**
-       * A new solution for the upcoming election has been stored. \[compute\]
+       * A new set of stakers was elected.
        **/
-      SolutionStored: AugmentedEvent<ApiType, [ElectionCompute]>;
-      /**
-       * A new set of stakers was elected with the given \[compute\].
-       **/
-      StakingElection: AugmentedEvent<ApiType, [ElectionCompute]>;
+      StakingElection: AugmentedEvent<ApiType, []>;
       /**
        * An account has unbonded this amount. \[stash, amount\]
        **/

packages/api/src/augment/query.ts

@@ -24,7 +24,7 @@ import type { AccountId, AccountIndex, AssetId, Balance, BalanceOf, BlockNumber,
 import type { Scheduled, TaskAddress } from '@polkadot/types/interfaces/scheduler';
 import type { Keys, SessionIndex } from '@polkadot/types/interfaces/session';
 import type { Bid, BidKind, SocietyVote, StrikeCount, VouchingStatus } from '@polkadot/types/interfaces/society';
-import type { ActiveEraInfo, ElectionPhase, ElectionResult, ElectionScore, ElectionStatus, EraIndex, EraRewardPoints, Exposure, Forcing, Nominations, ReadySolution, RewardDestination, RoundSnapshot, SeatHolder, SlashingSpans, SolutionOrSnapshotSize, SpanIndex, SpanRecord, StakingLedger, UnappliedSlash, ValidatorPrefs, Voter } from '@polkadot/types/interfaces/staking';
+import type { ActiveEraInfo, ElectionPhase, EraIndex, EraRewardPoints, Exposure, Forcing, Nominations, ReadySolution, RewardDestination, RoundSnapshot, SeatHolder, SlashingSpans, SolutionOrSnapshotSize, SpanIndex, SpanRecord, StakingLedger, UnappliedSlash, ValidatorPrefs, Voter } from '@polkadot/types/interfaces/staking';
 import type { AccountInfo, ConsumedWeight, DigestOf, EventIndex, EventRecord, LastRuntimeUpgradeInfo, Phase } from '@polkadot/types/interfaces/system';
 import type { Bounty, BountyIndex, OpenTip, TreasuryProposal } from '@polkadot/types/interfaces/treasury';
 import type { Multiplier } from '@polkadot/types/interfaces/txpayment';
@@ -822,13 +822,6 @@ declare module '@polkadot/api/types/storage' {
        * The earliest era for which we have a pending, unapplied slash.
        **/
       earliestUnappliedSlash: AugmentedQuery<ApiType, () => Observable<Option<EraIndex>>, []> & QueryableStorageEntry<ApiType, []>;
-      /**
-       * Flag to control the execution of the offchain election. When `Open(_)`, we accept
-       * solutions to be submitted.
-       * 
-       * TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
-       **/
-      eraElectionStatus: AugmentedQuery<ApiType, () => Observable<ElectionStatus>, []> & QueryableStorageEntry<ApiType, []>;
       /**
        * Rewards for the last `HISTORY_DEPTH` eras.
        * If reward hasn't been set or has been removed then 0 reward is returned.
@@ -903,13 +896,6 @@ declare module '@polkadot/api/types/storage' {
        * invulnerables) and restricted to testnets.
        **/
       invulnerables: AugmentedQuery<ApiType, () => Observable<Vec<AccountId>>, []> & QueryableStorageEntry<ApiType, []>;
-      /**
-       * True if the current **planned** session is final. Note that this does not take era
-       * forcing into account.
-       * 
-       * TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
-       **/
-      isCurrentSessionFinal: AugmentedQuery<ApiType, () => Observable<bool>, []> & QueryableStorageEntry<ApiType, []>;
       /**
        * Map from all (unlocked) "controller" accounts to the info regarding the staking.
        **/
@@ -930,20 +916,6 @@ declare module '@polkadot/api/types/storage' {
        * Where the reward payment should be made. Keyed by stash.
        **/
       payee: AugmentedQuery<ApiType, (arg: AccountId | string | Uint8Array) => Observable<RewardDestination>, [AccountId]> & QueryableStorageEntry<ApiType, [AccountId]>;
-      /**
-       * The next validator set. At the end of an era, if this is available (potentially from the
-       * result of an offchain worker), it is immediately used. Otherwise, the on-chain election
-       * is executed.
-       * 
-       * TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
-       **/
-      queuedElected: AugmentedQuery<ApiType, () => Observable<Option<ElectionResult>>, []> & QueryableStorageEntry<ApiType, []>;
-      /**
-       * The score of the current [`QueuedElected`].
-       * 
-       * TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
-       **/
-      queuedScore: AugmentedQuery<ApiType, () => Observable<Option<ElectionScore>>, []> & QueryableStorageEntry<ApiType, []>;
       /**
        * Slashing spans for stash accounts.
        **/
@@ -954,20 +926,6 @@ declare module '@polkadot/api/types/storage' {
        * The rest of the slashed value is handled by the `Slash`.
        **/
       slashRewardFraction: AugmentedQuery<ApiType, () => Observable<Perbill>, []> & QueryableStorageEntry<ApiType, []>;
-      /**
-       * Snapshot of nominators at the beginning of the current election window. This should only
-       * have a value when [`EraElectionStatus`] == `ElectionStatus::Open(_)`.
-       * 
-       * TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
-       **/
-      snapshotNominators: AugmentedQuery<ApiType, () => Observable<Option<Vec<AccountId>>>, []> & QueryableStorageEntry<ApiType, []>;
-      /**
-       * Snapshot of validators at the beginning of the current election window. This should only
-       * have a value when [`EraElectionStatus`] == `ElectionStatus::Open(_)`.
-       * 
-       * TWO_PHASE_NOTE: should be removed once we switch to multi-phase.
-       **/
-      snapshotValidators: AugmentedQuery<ApiType, () => Observable<Option<Vec<AccountId>>>, []> & QueryableStorageEntry<ApiType, []>;
       /**
        * Records information about the maximum slash of a stash within a slashing span,
        * as well as how much reward has been paid out.
@@ -977,7 +935,7 @@ declare module '@polkadot/api/types/storage' {
        * True if network has been upgraded to this version.
        * Storage version of the pallet.
        * 
-       * This is set to v5.0.0 for new networks.
+       * This is set to v6.0.0 for new networks.
        **/
       storageVersion: AugmentedQuery<ApiType, () => Observable<Releases>, []> & QueryableStorageEntry<ApiType, []>;
       /**

packages/api/src/augment/rpc.ts

@@ -134,7 +134,7 @@ declare module '@polkadot/rpc-core/types.jsonrpc' {
       /**
        * Instructs the manual-seal authorship task to finalize a block
        **/
-      finalizeBlock: AugmentedRpc<(hash: BlockHash | string | Uint8Array, justification?: Justification | string | Uint8Array) => Observable<bool>>;
+      finalizeBlock: AugmentedRpc<(hash: BlockHash | string | Uint8Array, justification?: Justification) => Observable<bool>>;
     };
     eth: {
       /**

packages/api/src/augment/tx.ts

@@ -19,7 +19,7 @@ import type { AccountId, AccountIndex, AssetId, Balance, BalanceOf, BlockNumber,
 import type { Period, Priority } from '@polkadot/types/interfaces/scheduler';
 import type { Keys } from '@polkadot/types/interfaces/session';
 import type { SocietyJudgement } from '@polkadot/types/interfaces/society';
-import type { CompactAssignments, ElectionScore, ElectionSize, EraIndex, RawSolution, RewardDestination, SolutionOrSnapshotSize, ValidatorIndex, ValidatorPrefs } from '@polkadot/types/interfaces/staking';
+import type { EraIndex, RawSolution, RewardDestination, SolutionOrSnapshotSize, ValidatorPrefs } from '@polkadot/types/interfaces/staking';
 import type { Key } from '@polkadot/types/interfaces/system';
 import type { BountyIndex } from '@polkadot/types/interfaces/treasury';
 import type { Timepoint } from '@polkadot/types/interfaces/utility';
@@ -2098,7 +2098,7 @@ declare module '@polkadot/api/types/submittable' {
        **/
       proxy: AugmentedSubmittable<(real: AccountId | string | Uint8Array, forceProxyType: Option<ProxyType> | null | object | string | Uint8Array, call: Call | { callIndex?: any; args?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [AccountId, Option<ProxyType>, Call]>;
       /**
-       * Dispatch the given `call` from an account that the sender is authorised for through
+       * Dispatch the given `call` from an account that the sender is authorized for through
        * `add_proxy`.
        * 
        * Removes any corresponding announcement(s).
@@ -3155,70 +3155,6 @@ declare module '@polkadot/api/types/submittable' {
        * # </weight>
        **/
       setValidatorCount: AugmentedSubmittable<(updated: Compact<u32> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [Compact<u32>]>;
-      /**
-       * Submit an election result to the chain. If the solution:
-       * 
-       * 1. is valid.
-       * 2. has a better score than a potentially existing solution on chain.
-       * 
-       * then, it will be _put_ on chain.
-       * 
-       * A solution consists of two pieces of data:
-       * 
-       * 1. `winners`: a flat vector of all the winners of the round.
-       * 2. `assignments`: the compact version of an assignment vector that encodes the edge
-       * weights.
-       * 
-       * Both of which may be computed using _phragmen_, or any other algorithm.
-       * 
-       * Additionally, the submitter must provide:
-       * 
-       * - The `score` that they claim their solution has.
-       * 
-       * Both validators and nominators will be represented by indices in the solution. The
-       * indices should respect the corresponding types ([`ValidatorIndex`] and
-       * [`NominatorIndex`]). Moreover, they should be valid when used to index into
-       * [`SnapshotValidators`] and [`SnapshotNominators`]. Any invalid index will cause the
-       * solution to be rejected. These two storage items are set during the election window and
-       * may be used to determine the indices.
-       * 
-       * A solution is valid if:
-       * 
-       * 0. It is submitted when [`EraElectionStatus`] is `Open`.
-       * 1. Its claimed score is equal to the score computed on-chain.
-       * 2. Presents the correct number of winners.
-       * 3. All indexes must be value according to the snapshot vectors. All edge values must
-       * also be correct and should not overflow the granularity of the ratio type (i.e. 256
-       * or billion).
-       * 4. For each edge, all targets are actually nominated by the voter.
-       * 5. Has correct self-votes.
-       * 
-       * A solutions score is consisted of 3 parameters:
-       * 
-       * 1. `min { support.total }` for each support of a winner. This value should be maximized.
-       * 2. `sum { support.total }` for each support of a winner. This value should be minimized.
-       * 3. `sum { support.total^2 }` for each support of a winner. This value should be
-       * minimized (to ensure less variance)
-       * 
-       * # <weight>
-       * The transaction is assumed to be the longest path, a better solution.
-       * - Initial solution is almost the same.
-       * - Worse solution is retraced in pre-dispatch-checks which sets its own weight.
-       * # </weight>
-       **/
-      submitElectionSolution: AugmentedSubmittable<(winners: Vec<ValidatorIndex> | (ValidatorIndex | AnyNumber | Uint8Array)[], compact: CompactAssignments | { votes1?: any; votes2?: any; votes3?: any; votes4?: any; votes5?: any; votes6?: any; votes7?: any; votes8?: any; votes9?: any; votes10?: any; votes11?: any; votes12?: any; votes13?: any; votes14?: any; votes15?: any; votes16?: any } | string | Uint8Array, score: ElectionScore, era: EraIndex | AnyNumber | Uint8Array, size: ElectionSize | { validators?: any; nominators?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [Vec<ValidatorIndex>, CompactAssignments, ElectionScore, EraIndex, ElectionSize]>;
-      /**
-       * Unsigned version of `submit_election_solution`.
-       * 
-       * Note that this must pass the [`ValidateUnsigned`] check which only allows transactions
-       * from the local node to be included. In other words, only the block author can include a
-       * transaction in the block.
-       * 
-       * # <weight>
-       * See [`submit_election_solution`].
-       * # </weight>
-       **/
-      submitElectionSolutionUnsigned: AugmentedSubmittable<(winners: Vec<ValidatorIndex> | (ValidatorIndex | AnyNumber | Uint8Array)[], compact: CompactAssignments | { votes1?: any; votes2?: any; votes3?: any; votes4?: any; votes5?: any; votes6?: any; votes7?: any; votes8?: any; votes9?: any; votes10?: any; votes11?: any; votes12?: any; votes13?: any; votes14?: any; votes15?: any; votes16?: any } | string | Uint8Array, score: ElectionScore, era: EraIndex | AnyNumber | Uint8Array, size: ElectionSize | { validators?: any; nominators?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [Vec<ValidatorIndex>, CompactAssignments, ElectionScore, EraIndex, ElectionSize]>;
       /**
        * Schedule a portion of the stash to be unlocked ready for transfer out after the bond
        * period ends. If this leaves an amount actively bonded less than

packages/api/src/checkTypes.manual.ts

@@ -3,12 +3,12 @@
 
 // Simple non-runnable checks to test type definitions in the editor itself
 
+import type { HeaderExtended } from '@polkadot/api-derive/types';
 import type { StorageKey } from '@polkadot/types';
 import type { AccountId, Balance, DispatchErrorModule, Event, Header, Index } from '@polkadot/types/interfaces';
 import type { AnyTuple, IExtrinsic, IMethod } from '@polkadot/types/types';
 
 import { ApiPromise } from '@polkadot/api';
-import { HeaderExtended } from '@polkadot/api-derive';
 import { createTestPairs, TestKeyringMap } from '@polkadot/keyring/testingPairs';
 import { createTypeUnsafe, TypeRegistry } from '@polkadot/types/create';
 

packages/api/src/packageInfo.ts

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

packages/metadata/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/metadata",
-  "version": "4.1.1",
+  "version": "4.3.1",
   "type": "module",
   "description": "Helpers to extract information from runtime metadata",
   "main": "index.js",
@@ -16,9 +16,9 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/type-metadata#readme",
   "dependencies": {
-    "@babel/runtime": "^7.13.9",
-    "@polkadot/types": "4.1.1",
-    "@polkadot/types-known": "4.1.1",
+    "@babel/runtime": "^7.13.10",
+    "@polkadot/types": "4.3.1",
+    "@polkadot/types-known": "4.3.1",
     "@polkadot/util": "^6.0.5",
     "@polkadot/util-crypto": "^6.0.5",
     "bn.js": "^4.11.9"

packages/metadata/src/MetadataVersioned.ts

@@ -33,18 +33,18 @@ export class MetadataVersioned extends Struct {
     }, value as Map<unknown, unknown>);
   }
 
-  private _assertVersion (version: number): boolean {
+  #assertVersion = (version: number): boolean => {
     assert(this.version <= version, `Cannot convert metadata from v${this.version} to v${version}`);
 
     return this.version === version;
-  }
+  };
 
-  private _getVersion<T extends MetaMapped, F extends MetaMapped> (version: MetaVersions, fromPrev: (registry: Registry, input: F, metaVersion: number) => T): T {
+  #getVersion = <T extends MetaMapped, F extends MetaMapped>(version: MetaVersions, fromPrev: (registry: Registry, input: F, metaVersion: number) => T): T => {
     const asCurr = `asV${version}` as MetaAsX;
     const asPrev = `asV${version - 1}` as MetaAsX;
 
-    if (this._assertVersion(version)) {
-      return this._metadata[asCurr] as T;
+    if (this.#assertVersion(version)) {
+      return this.#metadata()[asCurr] as T;
     }
 
     if (!this.#converted.has(version)) {
@@ -52,6 +52,13 @@ export class MetadataVersioned extends Struct {
     }
 
     return this.#converted.get(version) as T;
+  };
+
+  /**
+   * @description the metadata wrapped
+   */
+  #metadata = (): MetadataAll => {
+    return this.get('metadata') as MetadataAll;
   }
 
   /**
@@ -68,30 +75,30 @@ export class MetadataVersioned extends Struct {
    * @description Returns the wrapped metadata as a V9 object
    */
   public get asV9 (): MetadataV9 {
-    this._assertVersion(9);
+    this.#assertVersion(9);
 
-    return this._metadata.asV9;
+    return this.#metadata().asV9;
   }
 
   /**
    * @description Returns the wrapped values as a V10 object
    */
   public get asV10 (): MetadataV10 {
-    return this._getVersion(10, toV10);
+    return this.#getVersion(10, toV10);
   }
 
   /**
    * @description Returns the wrapped values as a V11 object
    */
   public get asV11 (): MetadataV11 {
-    return this._getVersion(11, toV11);
+    return this.#getVersion(11, toV11);
   }
 
   /**
    * @description Returns the wrapped values as a V12 object
    */
   public get asV12 (): MetadataV12 {
-    return this._getVersion(12, toV12);
+    return this.#getVersion(12, toV12);
   }
 
   /**
@@ -99,7 +106,7 @@ export class MetadataVersioned extends Struct {
    */
   public get asLatest (): MetadataLatest {
     // This is non-existent & latest - applied here to do the module-specific type conversions
-    return this._getVersion(13, toLatest);
+    return this.#getVersion(13, toLatest);
   }
 
   /**
@@ -109,18 +116,11 @@ export class MetadataVersioned extends Struct {
     return this.get('magicNumber') as MagicNumber;
   }
 
-  /**
-   * @description the metadata wrapped
-   */
-  private get _metadata (): MetadataAll {
-    return this.get('metadata') as MetadataAll;
-  }
-
   /**
    * @description the metadata version this structure represents
    */
   public get version (): number {
-    return this._metadata.index;
+    return this.#metadata().index;
   }
 
   public getUniqTypes (throwError: boolean): string[] {

packages/metadata/src/packageInfo.ts

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

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

@@ -949,11 +949,9 @@
               "type": "u64",
               "value": "0x1400000000000000",
               "documentation": [
-                " The number of **slots** that an epoch takes. We couple sessions to",
-                " epochs, i.e. we start a new session once the new epoch begins.",
-                " NOTE: Currently it is not possible to change the epoch duration",
-                " after the chain has started. Attempting to do so will brick block",
-                " production."
+                " The amount of time, in slots, that each epoch should last.",
+                " NOTE: Currently it is not possible to change the epoch duration after",
+                " the chain has started. Attempting to do so will brick block production."
               ]
             },
             {
@@ -969,7 +967,26 @@
               ]
             }
           ],
-          "errors": [],
+          "errors": [
+            {
+              "name": "InvalidEquivocationProof",
+              "documentation": [
+                " An equivocation proof provided as part of an equivocation report is invalid."
+              ]
+            },
+            {
+              "name": "InvalidKeyOwnershipProof",
+              "documentation": [
+                " A key ownership proof provided as part of an equivocation report is invalid."
+              ]
+            },
+            {
+              "name": "DuplicateOffenceReport",
+              "documentation": [
+                " A given equivocation report is valid but already previously reported."
+              ]
+            }
+          ],
           "index": 2
         },
         {
@@ -1970,7 +1987,7 @@
             {
               "name": "SolutionImprovementThreshold",
               "type": "Perbill",
-              "value": "0x20a10700",
+              "value": "0xa0860100",
               "documentation": [
                 " The minimum amount of improvement to the solution score that defines a solution as",
                 " \"better\" (in any phase)."
@@ -2463,102 +2480,18 @@
                   " This is basically in sync with the call to [`SessionManager::new_session`]."
                 ]
               },
-              {
-                "name": "SnapshotValidators",
-                "modifier": "Optional",
-                "type": {
-                  "plain": "Vec<AccountId>"
-                },
-                "fallback": "0x00",
-                "documentation": [
-                  " Snapshot of validators at the beginning of the current election window. This should only",
-                  " have a value when [`EraElectionStatus`] == `ElectionStatus::Open(_)`.",
-                  "",
-                  " TWO_PHASE_NOTE: should be removed once we switch to multi-phase."
-                ]
-              },
-              {
-                "name": "SnapshotNominators",
-                "modifier": "Optional",
-                "type": {
-                  "plain": "Vec<AccountId>"
-                },
-                "fallback": "0x00",
-                "documentation": [
-                  " Snapshot of nominators at the beginning of the current election window. This should only",
-                  " have a value when [`EraElectionStatus`] == `ElectionStatus::Open(_)`.",
-                  "",
-                  " TWO_PHASE_NOTE: should be removed once we switch to multi-phase."
-                ]
-              },
-              {
-                "name": "QueuedElected",
-                "modifier": "Optional",
-                "type": {
-                  "plain": "ElectionResult"
-                },
-                "fallback": "0x00",
-                "documentation": [
-                  " The next validator set. At the end of an era, if this is available (potentially from the",
-                  " result of an offchain worker), it is immediately used. Otherwise, the on-chain election",
-                  " is executed.",
-                  "",
-                  " TWO_PHASE_NOTE: should be removed once we switch to multi-phase."
-                ]
-              },
-              {
-                "name": "QueuedScore",
-                "modifier": "Optional",
-                "type": {
-                  "plain": "ElectionScore"
-                },
-                "fallback": "0x00",
-                "documentation": [
-                  " The score of the current [`QueuedElected`].",
-                  "",
-                  " TWO_PHASE_NOTE: should be removed once we switch to multi-phase."
-                ]
-              },
-              {
-                "name": "EraElectionStatus",
-                "modifier": "Default",
-                "type": {
-                  "plain": "ElectionStatus"
-                },
-                "fallback": "0x00",
-                "documentation": [
-                  " Flag to control the execution of the offchain election. When `Open(_)`, we accept",
-                  " solutions to be submitted.",
-                  "",
-                  " TWO_PHASE_NOTE: should be removed once we switch to multi-phase."
-                ]
-              },
-              {
-                "name": "IsCurrentSessionFinal",
-                "modifier": "Default",
-                "type": {
-                  "plain": "bool"
-                },
-                "fallback": "0x00",
-                "documentation": [
-                  " True if the current **planned** session is final. Note that this does not take era",
-                  " forcing into account.",
-                  "",
-                  " TWO_PHASE_NOTE: should be removed once we switch to multi-phase."
-                ]
-              },
               {
                 "name": "StorageVersion",
                 "modifier": "Default",
                 "type": {
                   "plain": "Releases"
                 },
-                "fallback": "0x04",
+                "fallback": "0x05",
                 "documentation": [
                   " True if network has been upgraded to this version.",
                   " Storage version of the pallet.",
                   "",
-                  " This is set to v5.0.0 for new networks."
+                  " This is set to v6.0.0 for new networks."
                 ]
               }
             ]
@@ -3163,118 +3096,6 @@
                 " # </weight>"
               ]
             },
-            {
-              "name": "submit_election_solution",
-              "args": [
-                {
-                  "name": "winners",
-                  "type": "Vec<ValidatorIndex>"
-                },
-                {
-                  "name": "compact",
-                  "type": "CompactAssignments"
-                },
-                {
-                  "name": "score",
-                  "type": "ElectionScore"
-                },
-                {
-                  "name": "era",
-                  "type": "EraIndex"
-                },
-                {
-                  "name": "size",
-                  "type": "ElectionSize"
-                }
-              ],
-              "documentation": [
-                " Submit an election result to the chain. If the solution:",
-                "",
-                " 1. is valid.",
-                " 2. has a better score than a potentially existing solution on chain.",
-                "",
-                " then, it will be _put_ on chain.",
-                "",
-                " A solution consists of two pieces of data:",
-                "",
-                " 1. `winners`: a flat vector of all the winners of the round.",
-                " 2. `assignments`: the compact version of an assignment vector that encodes the edge",
-                "    weights.",
-                "",
-                " Both of which may be computed using _phragmen_, or any other algorithm.",
-                "",
-                " Additionally, the submitter must provide:",
-                "",
-                " - The `score` that they claim their solution has.",
-                "",
-                " Both validators and nominators will be represented by indices in the solution. The",
-                " indices should respect the corresponding types ([`ValidatorIndex`] and",
-                " [`NominatorIndex`]). Moreover, they should be valid when used to index into",
-                " [`SnapshotValidators`] and [`SnapshotNominators`]. Any invalid index will cause the",
-                " solution to be rejected. These two storage items are set during the election window and",
-                " may be used to determine the indices.",
-                "",
-                " A solution is valid if:",
-                "",
-                " 0. It is submitted when [`EraElectionStatus`] is `Open`.",
-                " 1. Its claimed score is equal to the score computed on-chain.",
-                " 2. Presents the correct number of winners.",
-                " 3. All indexes must be value according to the snapshot vectors. All edge values must",
-                "    also be correct and should not overflow the granularity of the ratio type (i.e. 256",
-                "    or billion).",
-                " 4. For each edge, all targets are actually nominated by the voter.",
-                " 5. Has correct self-votes.",
-                "",
-                " A solutions score is consisted of 3 parameters:",
-                "",
-                " 1. `min { support.total }` for each support of a winner. This value should be maximized.",
-                " 2. `sum { support.total }` for each support of a winner. This value should be minimized.",
-                " 3. `sum { support.total^2 }` for each support of a winner. This value should be",
-                "    minimized (to ensure less variance)",
-                "",
-                " # <weight>",
-                " The transaction is assumed to be the longest path, a better solution.",
-                "   - Initial solution is almost the same.",
-                "   - Worse solution is retraced in pre-dispatch-checks which sets its own weight.",
-                " # </weight>"
-              ]
-            },
-            {
-              "name": "submit_election_solution_unsigned",
-              "args": [
-                {
-                  "name": "winners",
-                  "type": "Vec<ValidatorIndex>"
-                },
-                {
-                  "name": "compact",
-                  "type": "CompactAssignments"
-                },
-                {
-                  "name": "score",
-                  "type": "ElectionScore"
-                },
-                {
-                  "name": "era",
-                  "type": "EraIndex"
-                },
-                {
-                  "name": "size",
-                  "type": "ElectionSize"
-                }
-              ],
-              "documentation": [
-                " Unsigned version of `submit_election_solution`.",
-                "",
-                " Note that this must pass the [`ValidateUnsigned`] check which only allows transactions",
-                " from the local node to be included. In other words, only the block author can include a",
-                " transaction in the block.",
-                "",
-                " # <weight>",
-                " See [`submit_election_solution`].",
-                " # </weight>"
-              ]
-            },
             {
               "name": "kick",
               "args": [
@@ -3347,20 +3168,9 @@
             },
             {
               "name": "StakingElection",
-              "args": [
-                "ElectionCompute"
-              ],
+              "args": [],
               "documentation": [
-                " A new set of stakers was elected with the given \\[compute\\]."
-              ]
-            },
-            {
-              "name": "SolutionStored",
-              "args": [
-                "ElectionCompute"
-              ],
-              "documentation": [
-                " A new solution for the upcoming election has been stored. \\[compute\\]"
+                " A new set of stakers was elected."
               ]
             },
             {
@@ -3437,38 +3247,6 @@
                 " intervention."
               ]
             },
-            {
-              "name": "ElectionLookahead",
-              "type": "BlockNumber",
-              "value": "0x05000000",
-              "documentation": [
-                " The number of blocks before the end of the era from which election submissions are allowed.",
-                "",
-                " Setting this to zero will disable the offchain compute and only on-chain seq-phragmen will",
-                " be used.",
-                "",
-                " This is bounded by being within the last session. Hence, setting it to a value more than the",
-                " length of a session will be pointless."
-              ]
-            },
-            {
-              "name": "MaxIterations",
-              "type": "u32",
-              "value": "0x0a000000",
-              "documentation": [
-                " Maximum number of balancing iterations to run in the offchain submission.",
-                "",
-                " If set to 0, balance_solution will not be executed at all."
-              ]
-            },
-            {
-              "name": "MinSolutionScoreBump",
-              "type": "Perbill",
-              "value": "0x20a10700",
-              "documentation": [
-                " The threshold of improvement that should be provided for a new solution to be accepted."
-              ]
-            },
             {
               "name": "MaxNominatorRewardedPerValidator",
               "type": "u32",
@@ -3572,93 +3350,6 @@
                 " Rewards for this era have already been claimed for this validator."
               ]
             },
-            {
-              "name": "OffchainElectionEarlySubmission",
-              "documentation": [
-                " The submitted result is received out of the open window."
-              ]
-            },
-            {
-              "name": "OffchainElectionWeakSubmission",
-              "documentation": [
-                " The submitted result is not as good as the one stored on chain."
-              ]
-            },
-            {
-              "name": "SnapshotUnavailable",
-              "documentation": [
-                " The snapshot data of the current window is missing."
-              ]
-            },
-            {
-              "name": "OffchainElectionBogusWinnerCount",
-              "documentation": [
-                " Incorrect number of winners were presented."
-              ]
-            },
-            {
-              "name": "OffchainElectionBogusWinner",
-              "documentation": [
-                " One of the submitted winners is not an active candidate on chain (index is out of range",
-                " in snapshot)."
-              ]
-            },
-            {
-              "name": "OffchainElectionBogusCompact",
-              "documentation": [
-                " Error while building the assignment type from the compact. This can happen if an index",
-                " is invalid, or if the weights _overflow_."
-              ]
-            },
-            {
-              "name": "OffchainElectionBogusNominator",
-              "documentation": [
-                " One of the submitted nominators is not an active nominator on chain."
-              ]
-            },
-            {
-              "name": "OffchainElectionBogusNomination",
-              "documentation": [
-                " One of the submitted nominators has an edge to which they have not voted on chain."
-              ]
-            },
-            {
-              "name": "OffchainElectionSlashedNomination",
-              "documentation": [
-                " One of the submitted nominators has an edge which is submitted before the last non-zero",
-                " slash of the target."
-              ]
-            },
-            {
-              "name": "OffchainElectionBogusSelfVote",
-              "documentation": [
-                " A self vote must only be originated from a validator to ONLY themselves."
-              ]
-            },
-            {
-              "name": "OffchainElectionBogusEdge",
-              "documentation": [
-                " The submitted result has unknown edges that are not among the presented winners."
-              ]
-            },
-            {
-              "name": "OffchainElectionBogusScore",
-              "documentation": [
-                " The claimed score does not match with the one computed from the data."
-              ]
-            },
-            {
-              "name": "OffchainElectionBogusElectionSize",
-              "documentation": [
-                " The election size is invalid."
-              ]
-            },
-            {
-              "name": "CallNotAllowed",
-              "documentation": [
-                " The call is not allowed at the given time due to restrictions of election period."
-              ]
-            },
             {
               "name": "IncorrectHistoryDepth",
               "documentation": [
@@ -11397,7 +11088,7 @@
                 }
               ],
               "documentation": [
-                " Dispatch the given `call` from an account that the sender is authorised for through",
+                " Dispatch the given `call` from an account that the sender is authorized for through",
                 " `add_proxy`.",
                 "",
                 " Removes any corresponding announcement(s).",
@@ -11458,7 +11149,10 @@
               "type": "BalanceOf",
               "value": "0x00f09e544c3900000000000000000000",
               "documentation": [
-                " The base amount of currency needed to reserve for creating a proxy."
+                " The base amount of currency needed to reserve for creating a proxy.",
+                "",
+                " This is held for an additional storage item whose value size is",
+                " `sizeof(Balance)` bytes and whose key size is `sizeof(AccountId)` bytes."
               ]
             },
             {
@@ -11466,7 +11160,11 @@
               "type": "BalanceOf",
               "value": "0x0060aa7714b400000000000000000000",
               "documentation": [
-                " The amount of currency needed per proxy added."
+                " The amount of currency needed per proxy added.",
+                "",
+                " This is held for adding 32 bytes plus an instance of `ProxyType` more into a pre-existing",
+                " storage value. Thus, when configuring `ProxyDepositFactor` one should take into account",
+                " `32 + proxy_type.encode().len()` bytes of data."
               ]
             },
             {
@@ -11482,7 +11180,7 @@
               "type": "u32",
               "value": "0x20000000",
               "documentation": [
-                " `MaxPending` metadata shadow."
+                " The maximum amount of time-delayed announcements that are allowed to be pending."
               ]
             },
             {
@@ -11490,7 +11188,9 @@
               "type": "BalanceOf",
               "value": "0x00f09e544c3900000000000000000000",
               "documentation": [
-                " `AnnouncementDepositBase` metadata shadow."
+                " The base amount of currency needed to reserve for creating an announcement.",
+                "",
+                " This is held when a new storage item holding a `Balance` is created (typically 16 bytes)."
               ]
             },
             {
@@ -11498,7 +11198,10 @@
               "type": "BalanceOf",
               "value": "0x00c054ef286801000000000000000000",
               "documentation": [
-                " `AnnouncementDepositFactor` metadata shadow."
+                " The amount of currency needed per announcement made.",
+                "",
+                " This is held for adding an `AccountId`, `Hash` and `BlockNumber` (typically 68 bytes)",
+                " into a pre-existing storage value."
               ]
             }
           ],

packages/rpc-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-core",
-  "version": "4.1.1",
+  "version": "4.3.1",
   "type": "module",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
@@ -16,10 +16,10 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-core#readme",
   "dependencies": {
-    "@babel/runtime": "^7.13.9",
-    "@polkadot/metadata": "4.1.1",
-    "@polkadot/rpc-provider": "4.1.1",
-    "@polkadot/types": "4.1.1",
+    "@babel/runtime": "^7.13.10",
+    "@polkadot/metadata": "4.3.1",
+    "@polkadot/rpc-provider": "4.3.1",
+    "@polkadot/types": "4.3.1",
     "@polkadot/util": "^6.0.5",
     "@polkadot/x-rxjs": "^6.0.5"
   },

packages/rpc-core/src/packageInfo.ts

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

packages/rpc-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-provider",
-  "version": "4.1.1",
+  "version": "4.3.1",
   "type": "module",
   "description": "Transport providers for the API",
   "main": "index.js",
@@ -16,8 +16,8 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-provider#readme",
   "dependencies": {
-    "@babel/runtime": "^7.13.9",
-    "@polkadot/types": "4.1.1",
+    "@babel/runtime": "^7.13.10",
+    "@polkadot/types": "4.3.1",
     "@polkadot/util": "^6.0.5",
     "@polkadot/util-crypto": "^6.0.5",
     "@polkadot/x-fetch": "^6.0.5",
@@ -28,8 +28,8 @@
   },
   "devDependencies": {
     "@polkadot/keyring": "^6.0.5",
-    "@polkadot/metadata": "4.1.1",
+    "@polkadot/metadata": "4.3.1",
     "mock-socket": "^9.0.3",
-    "nock": "^13.0.10"
+    "nock": "^13.0.11"
   }
 }

packages/rpc-provider/src/packageInfo.ts

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

packages/typegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/typegen",
-  "version": "4.1.1",
+  "version": "4.3.1",
   "type": "module",
   "description": "Type generation scripts",
   "main": "index.js",
@@ -23,13 +23,13 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/typegen#readme",
   "dependencies": {
-    "@babel/core": "^7.13.8",
+    "@babel/core": "^7.13.13",
     "@babel/register": "^7.13.8",
-    "@babel/runtime": "^7.13.9",
-    "@polkadot/api": "4.1.1",
-    "@polkadot/metadata": "4.1.1",
-    "@polkadot/rpc-provider": "4.1.1",
-    "@polkadot/types": "4.1.1",
+    "@babel/runtime": "^7.13.10",
+    "@polkadot/api": "4.3.1",
+    "@polkadot/metadata": "4.3.1",
+    "@polkadot/rpc-provider": "4.3.1",
+    "@polkadot/types": "4.3.1",
     "@polkadot/util": "^6.0.5",
     "handlebars": "^4.7.7",
     "websocket": "^1.0.33",
@@ -37,6 +37,6 @@
   },
   "devDependencies": {
     "@types/websocket": "^1.0.2",
-    "@types/yargs": "^16.0.0"
+    "@types/yargs": "^16.0.1"
   }
 }

packages/typegen/src/packageInfo.ts

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

packages/types-known/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types-known",
-  "version": "4.1.1",
+  "version": "4.3.1",
   "type": "module",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
@@ -16,9 +16,9 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-known#readme",
   "dependencies": {
-    "@babel/runtime": "^7.13.9",
+    "@babel/runtime": "^7.13.10",
     "@polkadot/networks": "^6.0.5",
-    "@polkadot/types": "4.1.1",
+    "@polkadot/types": "4.3.1",
     "@polkadot/util": "^6.0.5",
     "bn.js": "^4.11.9"
   },

packages/types-known/src/packageInfo.ts

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

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

@@ -9,10 +9,7 @@ import type { OverrideVersionedType } from '@polkadot/types/types';
 /* eslint-disable sort-keys */
 
 const sharedTypes = {
-  AccountInfo: 'AccountInfoWithDualRefCount',
-  Address: 'MultiAddress',
   FullIdentification: '()', // No staking, only session (as per config)
-  LookupSource: 'MultiAddress',
   Keys: 'SessionKeys6'
 };
 
@@ -21,12 +18,20 @@ const versioned: OverrideVersionedType[] = [
     minmax: [0, 200],
     types: {
       ...sharedTypes,
+      AccountInfo: 'AccountInfoWithDualRefCount',
       Address: 'AccountId',
       LookupSource: 'AccountId'
     }
   },
   {
-    minmax: [201, undefined],
+    minmax: [201, 214],
+    types: {
+      ...sharedTypes,
+      AccountInfo: 'AccountInfoWithDualRefCount'
+    }
+  },
+  {
+    minmax: [215, undefined],
     types: {
       ...sharedTypes
     }

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types",
-  "version": "4.1.1",
+  "version": "4.3.1",
   "type": "module",
   "description": "Implementation of the Parity codec",
   "main": "index.js",
@@ -16,8 +16,8 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme",
   "dependencies": {
-    "@babel/runtime": "^7.13.9",
-    "@polkadot/metadata": "4.1.1",
+    "@babel/runtime": "^7.13.10",
+    "@polkadot/metadata": "4.3.1",
     "@polkadot/util": "^6.0.5",
     "@polkadot/util-crypto": "^6.0.5",
     "@polkadot/x-rxjs": "^6.0.5",

packages/types/src/augment/registry.ts

@@ -40,7 +40,7 @@ import type { ProxyAnnouncement, ProxyDefinition, ProxyType } from '@polkadot/ty
 import type { AccountStatus, AccountValidity } from '@polkadot/types/interfaces/purchase';
 import type { ActiveRecovery, RecoveryConfig } from '@polkadot/types/interfaces/recovery';
 import type { RpcMethods } from '@polkadot/types/interfaces/rpc';
-import type { AccountId, AccountIdOf, AccountIndex, Address, AssetId, Balance, BalanceOf, Block, BlockNumber, Call, CallHash, CallHashOf, ChangesTrieConfiguration, CodecHash, Consensus, ConsensusEngineId, Digest, DigestItem, ExtrinsicsWeight, Fixed128, Fixed64, FixedI128, FixedI64, FixedU128, FixedU64, H1024, H128, H160, H2048, H256, H512, H64, Hash, Header, I32F32, Index, IndicesLookupSource, Justification, KeyTypeId, KeyValue, LockIdentifier, LookupSource, LookupTarget, ModuleId, Moment, MultiAddress, MultiSigner, OpaqueCall, Origin, OriginCaller, PalletVersion, PalletsOrigin, Pays, PerU16, Perbill, Percent, Permill, Perquintill, Phantom, PhantomData, PreRuntime, Releases, RuntimeDbWeight, Seal, SealV0, SignedBlock, Slot, StorageData, StorageProof, TransactionPriority, U32F32, ValidatorId, ValidatorIdOf, Weight, WeightMultiplier } from '@polkadot/types/interfaces/runtime';
+import type { AccountId, AccountIdOf, AccountIndex, Address, AssetId, Balance, BalanceOf, Block, BlockNumber, Call, CallHash, CallHashOf, ChangesTrieConfiguration, CodecHash, Consensus, ConsensusEngineId, Digest, DigestItem, EncodedJustification, ExtrinsicsWeight, Fixed128, Fixed64, FixedI128, FixedI64, FixedU128, FixedU64, H1024, H128, H160, H2048, H256, H512, H64, Hash, Header, I32F32, Index, IndicesLookupSource, Justification, Justifications, KeyTypeId, KeyValue, LockIdentifier, LookupSource, LookupTarget, ModuleId, Moment, MultiAddress, MultiSigner, OpaqueCall, Origin, OriginCaller, PalletVersion, PalletsOrigin, Pays, PerU16, Perbill, Percent, Permill, Perquintill, Phantom, PhantomData, PreRuntime, Releases, RuntimeDbWeight, Seal, SealV0, SignedBlock, SignedBlockWithJustification, SignedBlockWithJustifications, Slot, StorageData, StorageProof, TransactionPriority, U32F32, ValidatorId, ValidatorIdOf, Weight, WeightMultiplier } from '@polkadot/types/interfaces/runtime';
 import type { SiField, SiLookupTypeId, SiPath, SiType, SiTypeDef, SiTypeDefArray, SiTypeDefComposite, SiTypeDefPrimitive, SiTypeDefSequence, SiTypeDefTuple, SiTypeDefVariant, SiVariant } from '@polkadot/types/interfaces/scaleInfo';
 import type { Period, Priority, SchedulePeriod, SchedulePriority, Scheduled, ScheduledTo254, TaskAddress } from '@polkadot/types/interfaces/scheduler';
 import type { FullIdentification, IdentificationTuple, Keys, MembershipProof, SessionIndex, SessionKeys1, SessionKeys2, SessionKeys3, SessionKeys4, SessionKeys5, SessionKeys6, SessionKeys7, SessionKeys8, SessionKeys9, ValidatorCount } from '@polkadot/types/interfaces/session';
@@ -336,6 +336,7 @@ declare module '@polkadot/types/types/registry' {
     'Option<ElectionSize>': Option<ElectionSize>;
     'Option<ElectionStatus>': Option<ElectionStatus>;
     'Option<EncodedFinalityProofs>': Option<EncodedFinalityProofs>;
+    'Option<EncodedJustification>': Option<EncodedJustification>;
     'Option<EpochAuthorship>': Option<EpochAuthorship>;
     'Option<EraIndex>': Option<EraIndex>;
     'Option<EraPoints>': Option<EraPoints>;
@@ -499,6 +500,7 @@ declare module '@polkadot/types/types/registry' {
     'Option<Junction>': Option<Junction>;
     'Option<Justification>': Option<Justification>;
     'Option<JustificationNotification>': Option<JustificationNotification>;
+    'Option<Justifications>': Option<Justifications>;
     'Option<Key>': Option<Key>;
     'Option<KeyOwnerProof>': Option<KeyOwnerProof>;
     'Option<Keys>': Option<Keys>;
@@ -735,6 +737,8 @@ declare module '@polkadot/types/types/registry' {
     'Option<SignedAvailabilityBitfield>': Option<SignedAvailabilityBitfield>;
     'Option<SignedAvailabilityBitfields>': Option<SignedAvailabilityBitfields>;
     'Option<SignedBlock>': Option<SignedBlock>;
+    'Option<SignedBlockWithJustification>': Option<SignedBlockWithJustification>;
+    'Option<SignedBlockWithJustifications>': Option<SignedBlockWithJustifications>;
     'Option<SignerPayload>': Option<SignerPayload>;
     'Option<SigningContext>': Option<SigningContext>;
     'Option<SiLookupTypeId>': Option<SiLookupTypeId>;
@@ -1086,6 +1090,7 @@ declare module '@polkadot/types/types/registry' {
     'Vec<ElectionSize>': Vec<ElectionSize>;
     'Vec<ElectionStatus>': Vec<ElectionStatus>;
     'Vec<EncodedFinalityProofs>': Vec<EncodedFinalityProofs>;
+    'Vec<EncodedJustification>': Vec<EncodedJustification>;
     'Vec<EpochAuthorship>': Vec<EpochAuthorship>;
     'Vec<EraIndex>': Vec<EraIndex>;
     'Vec<EraPoints>': Vec<EraPoints>;
@@ -1249,6 +1254,7 @@ declare module '@polkadot/types/types/registry' {
     'Vec<Junction>': Vec<Junction>;
     'Vec<Justification>': Vec<Justification>;
     'Vec<JustificationNotification>': Vec<JustificationNotification>;
+    'Vec<Justifications>': Vec<Justifications>;
     'Vec<Key>': Vec<Key>;
     'Vec<KeyOwnerProof>': Vec<KeyOwnerProof>;
     'Vec<Keys>': Vec<Keys>;
@@ -1485,6 +1491,8 @@ declare module '@polkadot/types/types/registry' {
     'Vec<SignedAvailabilityBitfield>': Vec<SignedAvailabilityBitfield>;
     'Vec<SignedAvailabilityBitfields>': Vec<SignedAvailabilityBitfields>;
     'Vec<SignedBlock>': Vec<SignedBlock>;
+    'Vec<SignedBlockWithJustification>': Vec<SignedBlockWithJustification>;
+    'Vec<SignedBlockWithJustifications>': Vec<SignedBlockWithJustifications>;
     'Vec<SignerPayload>': Vec<SignerPayload>;
     'Vec<SigningContext>': Vec<SigningContext>;
     'Vec<SiLookupTypeId>': Vec<SiLookupTypeId>;
@@ -1836,6 +1844,7 @@ declare module '@polkadot/types/types/registry' {
     ElectionSize: ElectionSize;
     ElectionStatus: ElectionStatus;
     EncodedFinalityProofs: EncodedFinalityProofs;
+    EncodedJustification: EncodedJustification;
     EpochAuthorship: EpochAuthorship;
     EraIndex: EraIndex;
     EraPoints: EraPoints;
@@ -1999,6 +2008,7 @@ declare module '@polkadot/types/types/registry' {
     Junction: Junction;
     Justification: Justification;
     JustificationNotification: JustificationNotification;
+    Justifications: Justifications;
     Key: Key;
     KeyOwnerProof: KeyOwnerProof;
     Keys: Keys;
@@ -2235,6 +2245,8 @@ declare module '@polkadot/types/types/registry' {
     SignedAvailabilityBitfield: SignedAvailabilityBitfield;
     SignedAvailabilityBitfields: SignedAvailabilityBitfields;
     SignedBlock: SignedBlock;
+    SignedBlockWithJustification: SignedBlockWithJustification;
+    SignedBlockWithJustifications: SignedBlockWithJustifications;
     SignerPayload: SignerPayload;
     SigningContext: SigningContext;
     SiLookupTypeId: SiLookupTypeId;

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

@@ -231,7 +231,8 @@ export default {
     },
     ParaId: 'u32',
     ParaInfo: {
-      scheduling: 'Scheduling'
+      manager: 'AccountId',
+      deposit: 'Balance'
     },
     ParaLifecycle: {
       _enum: ['Onboarding', 'Parathread', 'Parachain', 'UpgradingToParachain', 'DowngradingToParathread', 'OutgoingParathread', 'OutgoingParachain']

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

@@ -575,7 +575,8 @@ export interface ParaId extends u32 {}
 
 /** @name ParaInfo */
 export interface ParaInfo extends Struct {
-  readonly scheduling: Scheduling;
+  readonly manager: AccountId;
+  readonly deposit: Balance;
 }
 
 /** @name ParaLifecycle */

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

@@ -79,7 +79,9 @@ export default {
     },
     IndicesLookupSource: 'GenericLookupSource',
     Index: 'u32',
-    Justification: 'Bytes',
+    Justification: '(ConsensusEngineId, EncodedJustification)',
+    EncodedJustification: 'Bytes',
+    Justifications: 'Vec<Justification>',
     KeyValue: '(StorageKey, StorageData)',
     KeyTypeId: 'u32',
     LockIdentifier: '[u8; 8]',
@@ -121,9 +123,14 @@ export default {
       read: 'Weight',
       write: 'Weight'
     },
-    SignedBlock: {
+    SignedBlock: 'SignedBlockWithJustifications',
+    SignedBlockWithJustification: {
       block: 'Block',
-      justification: 'Justification'
+      justification: 'Option<EncodedJustification>'
+    },
+    SignedBlockWithJustifications: {
+      block: 'Block',
+      justifications: 'Option<Justifications>'
     },
     Slot: 'u64',
     StorageData: 'Bytes',

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

@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Compact, DoNotConstruct, Enum, GenericAccountId, GenericAccountIndex, GenericBlock, GenericCall, GenericConsensusEngineId, GenericLookupSource, GenericMultiAddress, Int, Null, StorageKey, Struct, U8aFixed, UInt, Vec, u16, u32, u64, u8 } from '@polkadot/types';
+import type { Bytes, Compact, DoNotConstruct, Enum, GenericAccountId, GenericAccountIndex, GenericBlock, GenericCall, GenericConsensusEngineId, GenericLookupSource, GenericMultiAddress, Int, Null, Option, StorageKey, Struct, U8aFixed, UInt, Vec, u16, u32, u64, u8 } from '@polkadot/types';
 import type { ITuple } from '@polkadot/types/types';
 import type { AuthorityId } from '@polkadot/types/interfaces/consensus';
 import type { Signature } from '@polkadot/types/interfaces/extrinsics';
@@ -81,6 +81,9 @@ export interface DigestItem extends Enum {
   readonly asPreRuntime: PreRuntime;
 }
 
+/** @name EncodedJustification */
+export interface EncodedJustification extends Bytes {}
+
 /** @name ExtrinsicsWeight */
 export interface ExtrinsicsWeight extends Struct {
   readonly normal: Weight;
@@ -148,7 +151,10 @@ export interface Index extends u32 {}
 export interface IndicesLookupSource extends GenericLookupSource {}
 
 /** @name Justification */
-export interface Justification extends Bytes {}
+export interface Justification extends ITuple<[ConsensusEngineId, EncodedJustification]> {}
+
+/** @name Justifications */
+export interface Justifications extends Vec<Justification> {}
 
 /** @name KeyTypeId */
 export interface KeyTypeId extends u32 {}
@@ -263,9 +269,18 @@ export interface Seal extends ITuple<[ConsensusEngineId, Bytes]> {}
 export interface SealV0 extends ITuple<[u64, Signature]> {}
 
 /** @name SignedBlock */
-export interface SignedBlock extends Struct {
+export interface SignedBlock extends SignedBlockWithJustifications {}
+
+/** @name SignedBlockWithJustification */
+export interface SignedBlockWithJustification extends Struct {
   readonly block: Block;
-  readonly justification: Justification;
+  readonly justification: Option<EncodedJustification>;
+}
+
+/** @name SignedBlockWithJustifications */
+export interface SignedBlockWithJustifications extends Struct {
+  readonly block: Block;
+  readonly justifications: Option<Justifications>;
 }
 
 /** @name Slot */

packages/types/src/packageInfo.ts

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