[CI Skip] release/stable 3.10.1

skip-checks: true

.123trigger

@@ -15,4 +15,5 @@
 3.6.4
 3.7.2
 3.7.3
-3.9.2
+3.9.2
+3.9.3

CHANGELOG.md

@@ -1,5 +1,26 @@
 # CHANGELOG
 
+## 3.10.1 Feb 22, 2021
+
+Upgrade priority: Low.
+
+Changes:
+
+- Adjust ConsumedWeight types to align with Rust module code
+- Check for connection status in subscription unsubscribe
+- Adjust staking reward derives ordering for better performance
+- Adapt detection imports to remove `.json` dependencies (Better behavior using Node.js with ESM)
+
+
+## 3.9.3 Feb 16, 2021
+
+Upgrade priority: Low. Recommended for parachain builders since it contains the updated parachain types.
+
+Changes:
+
+- Adjusted parachain `PersistedValidationData` structure
+
+
 ## 3.9.2 Feb 15, 2021
 
 Upgrade priority: Low. Recommended for parachain builders since it contains the latest parachain types.

package.json

@@ -8,7 +8,7 @@
     "packages/*"
   ],
   "resolutions": {
-    "typescript": "^4.1.3"
+    "typescript": "^4.1.5"
   },
   "scripts": {
     "build": "yarn build:interfaces && polkadot-dev-build-ts",
@@ -25,14 +25,14 @@
     "test:watch": "polkadot-dev-run-test --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.13",
+    "@babel/core": "^7.12.17",
     "@babel/register": "^7.12.13",
-    "@babel/runtime": "^7.12.13",
-    "@polkadot/dev": "^0.61.25",
+    "@babel/runtime": "^7.12.18",
+    "@polkadot/dev": "^0.61.26",
     "@polkadot/ts": "^0.3.59",
     "@polkadot/typegen": "workspace:packages/typegen",
     "@types/jest": "^26.0.20",
     "copyfiles": "^2.4.1"
   },
-  "version": "3.9.2"
+  "version": "3.10.1"
 }

packages/api-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "3.9.2",
+  "version": "3.10.1",
   "description": "Interfaces for interacting with contracts and contract ABIs",
   "main": "index.js",
   "sideEffects": false,
@@ -12,11 +12,11 @@
   "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.12.13",
-    "@polkadot/api": "3.9.2",
-    "@polkadot/types": "3.9.2",
-    "@polkadot/util": "^5.6.2",
-    "@polkadot/x-rxjs": "^5.6.2",
+    "@babel/runtime": "^7.12.18",
+    "@polkadot/api": "3.10.1",
+    "@polkadot/types": "3.10.1",
+    "@polkadot/util": "^5.7.1",
+    "@polkadot/x-rxjs": "^5.7.1",
     "bn.js": "^4.11.9"
   }
 }

packages/api-contract/src/packageInfo.ts

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

packages/api-derive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "3.9.2",
+  "version": "3.10.1",
   "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
   "main": "index.js",
   "sideEffects": false,
@@ -12,17 +12,17 @@
   "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.12.13",
-    "@polkadot/api": "3.9.2",
-    "@polkadot/rpc-core": "3.9.2",
-    "@polkadot/types": "3.9.2",
-    "@polkadot/util": "^5.6.2",
-    "@polkadot/util-crypto": "^5.6.2",
-    "@polkadot/x-rxjs": "^5.6.2",
+    "@babel/runtime": "^7.12.18",
+    "@polkadot/api": "3.10.1",
+    "@polkadot/rpc-core": "3.10.1",
+    "@polkadot/types": "3.10.1",
+    "@polkadot/util": "^5.7.1",
+    "@polkadot/util-crypto": "^5.7.1",
+    "@polkadot/x-rxjs": "^5.7.1",
     "bn.js": "^4.11.9"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^5.6.2",
-    "@polkadot/rpc-provider": "3.9.2"
+    "@polkadot/keyring": "^5.7.1",
+    "@polkadot/rpc-provider": "3.10.1"
   }
 }

packages/api-derive/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/dev authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/api-derive', version: '3.10.1' };

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

@@ -3,7 +3,7 @@
 
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { StorageKey } from '@polkadot/types';
-import type { EraIndex, Exposure } from '@polkadot/types/interfaces';
+import type { AccountId, EraIndex, Exposure } from '@polkadot/types/interfaces';
 import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveEraExposure, DeriveEraNominatorExposure, DeriveEraValidatorExposure } from '../types';
 
@@ -12,7 +12,7 @@ import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { deriveCache, memo } from '../util';
 
-type KeysAndExposures = [StorageKey, Exposure][];
+type KeysAndExposures = [StorageKey<[EraIndex, AccountId]>, Exposure][];
 
 const CACHE_KEY = 'eraExposure';
 

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

@@ -1,55 +1,37 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { ApiInterfaceRx, QueryableStorageMultiArg } from '@polkadot/api/types';
 import type { EraIndex, Exposure } from '@polkadot/types/interfaces';
 import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveOwnExposure } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
+import { of } from '@polkadot/x-rxjs';
 import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
-import { deriveCache, memo } from '../util';
+import { memo } from '../util';
 
-const CACHE_KEY = 'ownExposure';
-
-export function _ownExposure (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, era: EraIndex, withActive: boolean) => Observable<DeriveOwnExposure> {
-  return memo(instanceId, (accountId: Uint8Array | string, era: EraIndex, withActive: boolean): Observable<DeriveOwnExposure> => {
-    const cacheKey = `${CACHE_KEY}-${era.toString()}-${accountId.toString()}`;
-    const cached = withActive
-      ? undefined
-      : deriveCache.get<DeriveOwnExposure>(cacheKey);
-
-    return cached
-      ? of(cached)
-      : api.queryMulti<[Exposure, Exposure]>([
-        [api.query.staking.erasStakersClipped, [era, accountId]],
-        [api.query.staking.erasStakers, [era, accountId]]
+export function _ownExposures (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, eras: EraIndex[], withActive: boolean) => Observable<DeriveOwnExposure[]> {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  return memo(instanceId, (accountId: Uint8Array | string, eras: EraIndex[], _withActive: boolean): Observable<DeriveOwnExposure[]> =>
+    eras.length
+      ? api.queryMulti<Exposure[]>([
+        ...eras.map((era): QueryableStorageMultiArg<'rxjs'> => [api.query.staking.erasStakersClipped, [era, accountId]]),
+        ...eras.map((era): QueryableStorageMultiArg<'rxjs'> => [api.query.staking.erasStakers, [era, accountId]])
       ]).pipe(
-        map(([clipped, exposure]): DeriveOwnExposure => {
-          const value = { clipped, era, exposure };
-
-          !withActive && deriveCache.set(cacheKey, value);
-
-          return value;
-        })
-      );
-  });
+        map((all): DeriveOwnExposure[] =>
+          eras.map((era, index) => ({ clipped: all[index], era, exposure: all[eras.length + index] }))
+        )
+      )
+      : of([])
+  );
 }
 
 export function ownExposure (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, era: EraIndex) => Observable<DeriveOwnExposure> {
   return memo(instanceId, (accountId: Uint8Array | string, era: EraIndex): Observable<DeriveOwnExposure> =>
-    api.derive.staking._ownExposure(accountId, era, true)
-  );
-}
-
-export function _ownExposures (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, eras: EraIndex[], withActive: boolean) => Observable<DeriveOwnExposure[]> {
-  return memo(instanceId, (accountId: Uint8Array | string, eras: EraIndex[], withActive: boolean): Observable<DeriveOwnExposure[]> =>
-    eras.length
-      ? combineLatest(
-        eras.map((era) => api.derive.staking._ownExposure(accountId, era, withActive))
-      )
-      : of([])
+    api.derive.staking._ownExposures(accountId, [era], true).pipe(
+      map(([first]) => first)
+    )
   );
 }
 

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

@@ -1,62 +1,44 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { ApiInterfaceRx, QueryableStorageMultiArg } from '@polkadot/api/types';
 import type { Option } from '@polkadot/types';
 import type { BalanceOf, EraIndex, Perbill } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
 import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveStakerSlashes } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
+import { of } from '@polkadot/x-rxjs';
 import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
-import { deriveCache, memo } from '../util';
+import { memo } from '../util';
 
-const CACHE_KEY = 'ownSlash';
-
-export function _ownSlash (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, era: EraIndex, withActive: boolean) => Observable<DeriveStakerSlashes> {
-  return memo(instanceId, (accountId: Uint8Array | string, era: EraIndex, withActive: boolean): Observable<DeriveStakerSlashes> => {
-    const cacheKey = `${CACHE_KEY}-${era.toString()}-${accountId.toString()}`;
-    const cached = withActive
-      ? undefined
-      : deriveCache.get<DeriveStakerSlashes>(cacheKey);
-
-    return cached
-      ? of(cached)
-      : api.queryMulti<[Option<BalanceOf>, Option<ITuple<[Perbill, BalanceOf]>>]>([
-        [api.query.staking.nominatorSlashInEra, [era, accountId]],
-        [api.query.staking.validatorSlashInEra, [era, accountId]]
+export function _ownSlashes (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, eras: EraIndex[], withActive: boolean) => Observable<DeriveStakerSlashes[]> {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  return memo(instanceId, (accountId: Uint8Array | string, eras: EraIndex[], _withActive: boolean): Observable<DeriveStakerSlashes[]> =>
+    eras.length
+      ? api.queryMulti<(Option<ITuple<[Perbill, BalanceOf]>> | Option<BalanceOf>)[]>([
+        ...eras.map((era): QueryableStorageMultiArg<'rxjs'> => [api.query.staking.validatorSlashInEra, [era, accountId]]),
+        ...eras.map((era): QueryableStorageMultiArg<'rxjs'> => [api.query.staking.nominatorSlashInEra, [era, accountId]])
       ]).pipe(
-        map(([optNom, optVal]): DeriveStakerSlashes => {
-          const value = {
+        map((values): DeriveStakerSlashes[] =>
+          eras.map((era, index) => ({
             era,
-            total: optVal.isSome
-              ? optVal.unwrap()[1]
-              : optNom.unwrapOrDefault()
-          };
-
-          !withActive && deriveCache.set(cacheKey, value);
-
-          return value;
-        })
-      );
-  });
+            total: values[index].isSome
+              ? (values[index].unwrap() as ITuple<[Perbill, BalanceOf]>)[1]
+              : (values[index + eras.length].unwrapOrDefault() as BalanceOf)
+          }))
+        )
+      )
+      : of([])
+  );
 }
 
 export function ownSlash (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, era: EraIndex) => Observable<DeriveStakerSlashes> {
   return memo(instanceId, (accountId: Uint8Array | string, era: EraIndex): Observable<DeriveStakerSlashes> =>
-    api.derive.staking._ownSlash(accountId, era, true)
-  );
-}
-
-export function _ownSlashes (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, eras: EraIndex[], withActive: boolean) => Observable<DeriveStakerSlashes[]> {
-  return memo(instanceId, (accountId: Uint8Array | string, eras: EraIndex[], withActive: boolean): Observable<DeriveStakerSlashes[]> =>
-    eras.length
-      ? combineLatest(
-        eras.map((era) => api.derive.staking._ownSlash(accountId, era, withActive))
-      )
-      : of([])
+    api.derive.staking._ownSlashes(accountId, [era], true).pipe(
+      map(([first]) => first)
+    )
   );
 }
 

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

@@ -10,36 +10,46 @@ import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
-export function _stakerExposure (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, eras: EraIndex[], withActive: boolean) => Observable<DeriveStakerExposure[]> {
-  return memo(instanceId, (accountId: Uint8Array | string, eras: EraIndex[], withActive: boolean): Observable<DeriveStakerExposure[]> => {
-    const stakerId = api.registry.createType('AccountId', accountId).toString();
+export function _stakerExposures (instanceId: string, api: ApiInterfaceRx): (accountIds: (Uint8Array | string)[], eras: EraIndex[], withActive: boolean) => Observable<DeriveStakerExposure[][]> {
+  return memo(instanceId, (accountIds: (Uint8Array | string)[], eras: EraIndex[], withActive: boolean): Observable<DeriveStakerExposure[][]> => {
+    const stakerIds = accountIds.map((a) => api.registry.createType('AccountId', a).toString());
 
     return api.derive.staking._erasExposure(eras, withActive).pipe(
-      map((exposures): DeriveStakerExposure[] =>
-        exposures.map(({ era, nominators: allNominators, validators: allValidators }): DeriveStakerExposure => {
-          const isValidator = !!allValidators[stakerId];
-          const validators: DeriveEraValidatorExposure = {};
-          const nominating = allNominators[stakerId] || [];
+      map((exposures): DeriveStakerExposure[][] =>
+        stakerIds.map((stakerId) =>
+          exposures.map(({ era, nominators: allNominators, validators: allValidators }): DeriveStakerExposure => {
+            const isValidator = !!allValidators[stakerId];
+            const validators: DeriveEraValidatorExposure = {};
+            const nominating = allNominators[stakerId] || [];
 
-          if (isValidator) {
-            validators[stakerId] = allValidators[stakerId];
-          } else if (nominating) {
-            nominating.forEach(({ validatorId }): void => {
-              validators[validatorId] = allValidators[validatorId];
-            });
-          }
+            if (isValidator) {
+              validators[stakerId] = allValidators[stakerId];
+            } else if (nominating) {
+              nominating.forEach(({ validatorId }): void => {
+                validators[validatorId] = allValidators[validatorId];
+              });
+            }
 
-          return { era, isEmpty: !Object.keys(validators).length, isValidator, nominating, validators };
-        })
+            return { era, isEmpty: !Object.keys(validators).length, isValidator, nominating, validators };
+          })
+        )
       )
     );
   });
 }
 
-export function stakerExposure (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, withActive?: boolean) => Observable<DeriveStakerExposure[]> {
-  return memo(instanceId, (accountId: Uint8Array | string, withActive = false): Observable<DeriveStakerExposure[]> =>
+export function stakerExposures (instanceId: string, api: ApiInterfaceRx): (accountIds: (Uint8Array | string)[], withActive?: boolean) => Observable<DeriveStakerExposure[][]> {
+  return memo(instanceId, (accountIds: (Uint8Array | string)[], withActive = false): Observable<DeriveStakerExposure[][]> =>
     api.derive.staking.erasHistoric(withActive).pipe(
-      switchMap((eras) => api.derive.staking._stakerExposure(accountId, eras, withActive))
+      switchMap((eras) => api.derive.staking._stakerExposures(accountIds, eras, withActive))
+    )
+  );
+}
+
+export function stakerExposure (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, withActive?: boolean) => Observable<DeriveStakerExposure[]> {
+  return memo(instanceId, (accountId: Uint8Array | string, withActive = false): Observable<DeriveStakerExposure[]> =>
+    api.derive.staking.stakerExposures([accountId, withActive]).pipe(
+      map(([first]) => first)
     )
   );
 }

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

@@ -2,25 +2,22 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Option } from '@polkadot/types';
-import type { AccountId, EraIndex, StakingLedger, StakingLedgerTo240 } from '@polkadot/types/interfaces';
+import type { AccountId, EraIndex, StakingLedger } from '@polkadot/types/interfaces';
 import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveEraPoints, DeriveEraPrefs, DeriveEraRewards, DeriveEraValPrefs, DeriveStakerExposure, DeriveStakerReward, DeriveStakerRewardValidator } from '../types';
 import type { DeriveStakingQuery } from './types';
 
 import BN from 'bn.js';
 
-import { BN_BILLION, BN_ZERO, isFunction } from '@polkadot/util';
+import { BN_BILLION, BN_ZERO } from '@polkadot/util';
 import { combineLatest, of } from '@polkadot/x-rxjs';
 import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
-type ErasResult = [{ unwrapOr: (value: BN) => BN }, DeriveEraPoints[], DeriveEraPrefs[], DeriveEraRewards[]];
+type ErasResult = [DeriveEraPoints[], DeriveEraPrefs[], DeriveEraRewards[]];
 
-const MIN_ONE = new BN(-1);
-
-function parseRewards (api: ApiInterfaceRx, stashId: AccountId, [, erasPoints, erasPrefs, erasRewards]: ErasResult, exposures: DeriveStakerExposure[]): DeriveStakerReward[] {
+function parseRewards (api: ApiInterfaceRx, stashId: AccountId, [erasPoints, erasPrefs, erasRewards]: ErasResult, exposures: DeriveStakerExposure[]): DeriveStakerReward[] {
   return exposures.map(({ era, isEmpty, isValidator, nominating, validators: eraValidators }): DeriveStakerReward => {
     const { eraPoints, validators: allValPoints } = erasPoints.find((p) => p.era.eq(era)) || { eraPoints: BN_ZERO, validators: {} };
     const { eraReward } = erasRewards.find((r) => r.era.eq(era)) || { eraReward: api.registry.createType('Balance') };
@@ -71,32 +68,25 @@ function parseRewards (api: ApiInterfaceRx, stashId: AccountId, [, erasPoints, e
   });
 }
 
-function uniqValidators (rewards: DeriveStakerReward[]): string[] {
-  const uniq: string[] = [];
+function allUniqValidators (rewards: DeriveStakerReward[][]): [string[], string[][]] {
+  return rewards.reduce(([all, perStash]: [string[], string[][]], rewards) => {
+    const uniq: string[] = [];
 
-  rewards.forEach(({ validators }): void => {
-    Object.keys(validators).forEach((validatorId): void => {
-      if (!uniq.includes(validatorId)) {
-        uniq.push(validatorId);
-      }
-    });
-  });
+    perStash.push(uniq);
+    rewards.forEach(({ validators }) =>
+      Object.keys(validators).forEach((validatorId): void => {
+        if (!uniq.includes(validatorId)) {
+          uniq.push(validatorId);
 
-  return uniq;
-}
+          if (!all.includes(validatorId)) {
+            all.push(validatorId);
+          }
+        }
+      })
+    );
 
-function isOldLedger (ledger?: StakingLedger | StakingLedgerTo240): ledger is StakingLedgerTo240 {
-  return !!(ledger as StakingLedgerTo240)?.lastReward;
-}
-
-function filterEra (era: EraIndex, stakingLedger: StakingLedger): boolean {
-  return isOldLedger(stakingLedger)
-    ? era.gt(stakingLedger.lastReward.unwrapOr(MIN_ONE))
-    : !stakingLedger.claimedRewards.some((e) => e.eq(era));
-}
-
-function filterEras (eras: EraIndex[], stakingLedger: StakingLedger): EraIndex[] {
-  return eras.filter((era) => filterEra(era, stakingLedger));
+    return [all, perStash];
+  }, [[], []]);
 }
 
 function removeClaimed (validators: string[], queryValidators: DeriveStakingQuery[], reward: DeriveStakerReward): void {
@@ -119,43 +109,34 @@ function removeClaimed (validators: string[], queryValidators: DeriveStakingQuer
   });
 }
 
-function filterRewards (api: ApiInterfaceRx, eras: EraIndex[], { migrateEra, rewards, stakingLedger }: { migrateEra: BN, rewards: DeriveStakerReward[]; stakingLedger: StakingLedger }): Observable<DeriveStakerReward[]> {
-  const validators = uniqValidators(rewards);
-  const filter = filterEras(eras, stakingLedger);
+function filterRewards (eras: EraIndex[], valInfo: [string, DeriveStakingQuery][], { rewards, stakingLedger }: { rewards: DeriveStakerReward[]; stakingLedger: StakingLedger }): DeriveStakerReward[] {
+  const filter = eras.filter((era) => !stakingLedger.claimedRewards.some((e) => e.eq(era)));
+  const validators = valInfo.map(([v]) => v);
+  const queryValidators = valInfo.map(([, q]) => q);
 
-  return api.derive.staking.queryMulti(validators, { withLedger: true }).pipe(
-    map((queryValidators): DeriveStakerReward[] =>
-      rewards
-        .filter(({ isEmpty }) => !isEmpty)
-        .filter((reward): boolean => {
-          if (!filter.some((filter) => reward.era.eq(filter))) {
-            return false;
-          } else if (reward.era.lt(migrateEra)) {
-            // we filter again here, the actual ledger may have changed, e.g. something has been claimed
-            return filterEra(reward.era, stakingLedger);
-          }
+  return rewards
+    .filter(({ isEmpty }) => !isEmpty)
+    .filter((reward): boolean => {
+      if (!filter.some((filter) => reward.era.eq(filter))) {
+        return false;
+      }
 
-          reward.isStakerPayout = true;
+      reward.isStakerPayout = true;
 
-          removeClaimed(validators, queryValidators, reward);
+      removeClaimed(validators, queryValidators, reward);
 
-          return true;
-        })
-        .filter(({ validators }) => Object.keys(validators).length !== 0)
-        .map((reward) => ({
-          ...reward,
-          nominators: reward.nominating.filter((n) => reward.validators[n.validatorId])
-        }))
-    )
-  );
+      return true;
+    })
+    .filter(({ validators }) => Object.keys(validators).length !== 0)
+    .map((reward) => ({
+      ...reward,
+      nominators: reward.nominating.filter((n) => reward.validators[n.validatorId])
+    }));
 }
 
 export function _stakerRewardsEras (instanceId: string, api: ApiInterfaceRx): (eras: EraIndex[], withActive: boolean) => Observable<ErasResult> {
   return memo(instanceId, (eras: EraIndex[], withActive: boolean): Observable<ErasResult> =>
     combineLatest([
-      isFunction(api.query.staking.migrateEra)
-        ? api.query.staking.migrateEra<Option<EraIndex>>()
-        : of(api.registry.createType('Option<EraIndex>')),
       api.derive.staking._erasPoints(eras, withActive),
       api.derive.staking._erasPrefs(eras, withActive),
       api.derive.staking._erasRewards(eras, withActive)
@@ -163,23 +144,39 @@ export function _stakerRewardsEras (instanceId: string, api: ApiInterfaceRx): (e
   );
 }
 
-export function _stakerRewards (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, eras: EraIndex[], withActive: boolean) => Observable<DeriveStakerReward[]> {
-  return memo(instanceId, (accountId: Uint8Array | string, eras: EraIndex[], withActive: boolean): Observable<DeriveStakerReward[]> =>
+export function _stakerRewards (instanceId: string, api: ApiInterfaceRx): (accountIds: (Uint8Array | string)[], eras: EraIndex[], withActive: boolean) => Observable<DeriveStakerReward[][]> {
+  return memo(instanceId, (accountIds: (Uint8Array | string)[], eras: EraIndex[], withActive: boolean): Observable<DeriveStakerReward[][]> =>
     combineLatest([
-      api.derive.staking.query(accountId, { withLedger: true }),
-      api.derive.staking._stakerExposure(accountId, eras, withActive),
+      api.derive.staking.queryMulti(accountIds, { withLedger: true }),
+      api.derive.staking._stakerExposures(accountIds, eras, withActive),
       api.derive.staking._stakerRewardsEras(eras, withActive)
     ]).pipe(
-      switchMap(([{ stakingLedger, stashId }, exposures, erasResult]): Observable<DeriveStakerReward[]> => {
-        if (!stashId || !stakingLedger) {
-          return of([]);
+      switchMap(([queries, exposures, erasResult]): Observable<DeriveStakerReward[][]> => {
+        const allRewards = queries.map(({ stakingLedger, stashId }, index): DeriveStakerReward[] =>
+          (!stashId || !stakingLedger)
+            ? []
+            : parseRewards(api, stashId, erasResult, exposures[index])
+        );
+
+        if (withActive) {
+          return of(allRewards);
         }
 
-        const rewards = parseRewards(api, stashId, erasResult, exposures);
+        const [allValidators, stashValidators] = allUniqValidators(allRewards);
 
-        return withActive
-          ? of(rewards)
-          : filterRewards(api, eras, { migrateEra: erasResult[0].unwrapOr(BN_ZERO), rewards, stakingLedger });
+        return api.derive.staking.queryMulti(allValidators, { withLedger: true }).pipe(
+          map((queriedVals): DeriveStakerReward[][] => {
+            return queries.map(({ stakingLedger }, index): DeriveStakerReward[] => {
+              const rewards = allRewards[index];
+              const ownValidators = stashValidators[index].map((validatorId): [string, DeriveStakingQuery] => [
+                validatorId,
+                queriedVals.find((q) => q.accountId.eq(validatorId)) as DeriveStakingQuery
+              ]);
+
+              return filterRewards(eras, ownValidators, { rewards, stakingLedger });
+            });
+          })
+        );
       })
     )
   );
@@ -188,7 +185,8 @@ export function _stakerRewards (instanceId: string, api: ApiInterfaceRx): (accou
 export function stakerRewards (instanceId: string, api: ApiInterfaceRx): (accountId: Uint8Array | string, withActive?: boolean) => Observable<DeriveStakerReward[]> {
   return memo(instanceId, (accountId: Uint8Array | string, withActive = false): Observable<DeriveStakerReward[]> =>
     api.derive.staking.erasHistoric(withActive).pipe(
-      switchMap((eras) => api.derive.staking._stakerRewards(accountId, eras, withActive))
+      switchMap((eras) => api.derive.staking._stakerRewards([accountId], eras, withActive)),
+      map(([first]) => first)
     )
   );
 }
@@ -196,7 +194,7 @@ export function stakerRewards (instanceId: string, api: ApiInterfaceRx): (accoun
 export function stakerRewardsMultiEras (instanceId: string, api: ApiInterfaceRx): (accountIds: (Uint8Array | string)[], eras: EraIndex[]) => Observable<DeriveStakerReward[][]> {
   return memo(instanceId, (accountIds: (Uint8Array | string)[], eras: EraIndex[]): Observable<DeriveStakerReward[][]> =>
     accountIds.length && eras.length
-      ? combineLatest(accountIds.map((acc) => api.derive.staking._stakerRewards(acc, eras, false)))
+      ? api.derive.staking._stakerRewards(accountIds, eras, false)
       : of([])
   );
 }

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api",
-  "version": "3.9.2",
+  "version": "3.10.1",
   "description": "Promise and RxJS wrappers around the Polkadot JS RPC",
   "main": "index.js",
   "sideEffects": [
@@ -15,17 +15,17 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api#readme",
   "dependencies": {
-    "@babel/runtime": "^7.12.13",
-    "@polkadot/api-derive": "3.9.2",
-    "@polkadot/keyring": "^5.6.2",
-    "@polkadot/metadata": "3.9.2",
-    "@polkadot/rpc-core": "3.9.2",
-    "@polkadot/rpc-provider": "3.9.2",
-    "@polkadot/types": "3.9.2",
-    "@polkadot/types-known": "3.9.2",
-    "@polkadot/util": "^5.6.2",
-    "@polkadot/util-crypto": "^5.6.2",
-    "@polkadot/x-rxjs": "^5.6.2",
+    "@babel/runtime": "^7.12.18",
+    "@polkadot/api-derive": "3.10.1",
+    "@polkadot/keyring": "^5.7.1",
+    "@polkadot/metadata": "3.10.1",
+    "@polkadot/rpc-core": "3.10.1",
+    "@polkadot/rpc-provider": "3.10.1",
+    "@polkadot/types": "3.10.1",
+    "@polkadot/types-known": "3.10.1",
+    "@polkadot/util": "^5.7.1",
+    "@polkadot/util-crypto": "^5.7.1",
+    "@polkadot/x-rxjs": "^5.7.1",
     "bn.js": "^4.11.9",
     "eventemitter3": "^4.0.7"
   }

packages/api/src/detectPackage.ts

@@ -18,7 +18,7 @@
 
 import { detectPackage } from '@polkadot/util';
 
-import packageInfo from './package-info.json';
+import { packageInfo } from './packageInfo';
 
 detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname);
 

packages/api/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/dev authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/api', version: '3.10.1' };

packages/metadata/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/metadata",
-  "version": "3.9.2",
+  "version": "3.10.1",
   "description": "Helpers to extract information from runtime metadata",
   "main": "index.js",
   "sideEffects": [
@@ -15,14 +15,14 @@
   "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.12.13",
-    "@polkadot/types": "3.9.2",
-    "@polkadot/types-known": "3.9.2",
-    "@polkadot/util": "^5.6.2",
-    "@polkadot/util-crypto": "^5.6.2",
+    "@babel/runtime": "^7.12.18",
+    "@polkadot/types": "3.10.1",
+    "@polkadot/types-known": "3.10.1",
+    "@polkadot/util": "^5.7.1",
+    "@polkadot/util-crypto": "^5.7.1",
     "bn.js": "^4.11.9"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^5.6.2"
+    "@polkadot/keyring": "^5.7.1"
   }
 }

packages/metadata/src/detectPackage.ts

@@ -18,7 +18,7 @@
 
 import { detectPackage } from '@polkadot/util';
 
-import packageInfo from './package-info.json';
+import { packageInfo } from './packageInfo';
 
 detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname);
 

packages/metadata/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/dev authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/metadata', version: '3.10.1' };

packages/rpc-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-core",
-  "version": "3.9.2",
+  "version": "3.10.1",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
   "sideEffects": false,
@@ -12,14 +12,14 @@
   "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.12.13",
-    "@polkadot/metadata": "3.9.2",
-    "@polkadot/rpc-provider": "3.9.2",
-    "@polkadot/types": "3.9.2",
-    "@polkadot/util": "^5.6.2",
-    "@polkadot/x-rxjs": "^5.6.2"
+    "@babel/runtime": "^7.12.18",
+    "@polkadot/metadata": "3.10.1",
+    "@polkadot/rpc-provider": "3.10.1",
+    "@polkadot/types": "3.10.1",
+    "@polkadot/util": "^5.7.1",
+    "@polkadot/x-rxjs": "^5.7.1"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^5.6.2"
+    "@polkadot/keyring": "^5.7.1"
   }
 }

packages/rpc-core/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/dev authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/rpc-core', version: '3.10.1' };

packages/rpc-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-provider",
-  "version": "3.9.2",
+  "version": "3.10.1",
   "description": "Transport providers for the API",
   "main": "index.js",
   "sideEffects": false,
@@ -12,19 +12,19 @@
   "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.12.13",
-    "@polkadot/types": "3.9.2",
-    "@polkadot/util": "^5.6.2",
-    "@polkadot/util-crypto": "^5.6.2",
-    "@polkadot/x-fetch": "^5.6.2",
-    "@polkadot/x-global": "^5.6.2",
-    "@polkadot/x-ws": "^5.6.2",
+    "@babel/runtime": "^7.12.18",
+    "@polkadot/types": "3.10.1",
+    "@polkadot/util": "^5.7.1",
+    "@polkadot/util-crypto": "^5.7.1",
+    "@polkadot/x-fetch": "^5.7.1",
+    "@polkadot/x-global": "^5.7.1",
+    "@polkadot/x-ws": "^5.7.1",
     "bn.js": "^4.11.9",
     "eventemitter3": "^4.0.7"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^5.6.2",
-    "@polkadot/metadata": "3.9.2",
+    "@polkadot/keyring": "^5.7.1",
+    "@polkadot/metadata": "3.10.1",
     "mock-socket": "^9.0.3",
     "nock": "^13.0.7"
   }

packages/rpc-provider/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/dev authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/rpc-provider', version: '3.10.1' };

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

@@ -245,8 +245,8 @@ export class WsProvider implements ProviderInterface {
    * @param params Encoded parameters as applicable for the method
    * @param subscription Subscription details (internally used)
    */
-  public send (method: string, params: any[], subscription?: SubscriptionHandler): Promise<any> {
-    return new Promise((resolve, reject): void => {
+  public send <T = any> (method: string, params: any[], subscription?: SubscriptionHandler): Promise<T> {
+    return new Promise<T>((resolve, reject): void => {
       try {
         assert(this.isConnected && !isNull(this.#websocket), 'WebSocket is not connected');
 
@@ -298,10 +298,8 @@ export class WsProvider implements ProviderInterface {
    * })
    * ```
    */
-  public async subscribe (type: string, method: string, params: any[], callback: ProviderInterfaceCallback): Promise<number | string> {
-    const id = await this.send(method, params, { callback, type }) as Promise<number | string>;
-
-    return id;
+  public subscribe (type: string, method: string, params: any[], callback: ProviderInterfaceCallback): Promise<number | string> {
+    return this.send<number | string>(method, params, { callback, type });
   }
 
   /**
@@ -322,9 +320,13 @@ export class WsProvider implements ProviderInterface {
 
     delete this.#subscriptions[subscription];
 
-    const result = await this.send(method, [id]) as Promise<boolean>;
-
-    return result;
+    try {
+      return this.isConnected && !isNull(this.#websocket)
+        ? this.send<boolean>(method, [id])
+        : true;
+    } catch (error) {
+      return false;
+    }
   }
 
   #emit = (type: ProviderInterfaceEmitted, ...args: any[]): void => {

packages/typegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/typegen",
-  "version": "3.9.2",
+  "version": "3.10.1",
   "description": "Type generation scripts",
   "main": "index.js",
   "sideEffects": false,
@@ -19,15 +19,15 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/typegen#readme",
   "dependencies": {
-    "@babel/core": "^7.12.13",
+    "@babel/core": "^7.12.17",
     "@babel/register": "^7.12.13",
-    "@babel/runtime": "^7.12.13",
-    "@polkadot/api": "3.9.2",
-    "@polkadot/metadata": "3.9.2",
-    "@polkadot/rpc-provider": "3.9.2",
-    "@polkadot/types": "3.9.2",
-    "@polkadot/util": "^5.6.2",
-    "handlebars": "^4.7.6",
+    "@babel/runtime": "^7.12.18",
+    "@polkadot/api": "3.10.1",
+    "@polkadot/metadata": "3.10.1",
+    "@polkadot/rpc-provider": "3.10.1",
+    "@polkadot/types": "3.10.1",
+    "@polkadot/util": "^5.7.1",
+    "handlebars": "^4.7.7",
     "websocket": "^1.0.33",
     "yargs": "^16.2.0"
   },

packages/typegen/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/dev authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/typegen', version: '3.10.1' };

packages/types-known/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types-known",
-  "version": "3.9.2",
+  "version": "3.10.1",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
   "sideEffects": false,
@@ -12,10 +12,10 @@
   "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.12.13",
-    "@polkadot/networks": "^5.6.2",
-    "@polkadot/types": "3.9.2",
-    "@polkadot/util": "^5.6.2",
+    "@babel/runtime": "^7.12.18",
+    "@polkadot/networks": "^5.7.1",
+    "@polkadot/types": "3.10.1",
+    "@polkadot/util": "^5.7.1",
     "bn.js": "^4.11.9"
   },
   "devDependencies": {

packages/types-known/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/dev authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/types-known', version: '3.10.1' };

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types",
-  "version": "3.9.2",
+  "version": "3.10.1",
   "description": "Implementation of the Parity codec",
   "main": "index.js",
   "sideEffects": [
@@ -15,15 +15,15 @@
   "bugs": "https://github.com/polkadot-js/api/issues",
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme",
   "dependencies": {
-    "@babel/runtime": "^7.12.13",
-    "@polkadot/metadata": "3.9.2",
-    "@polkadot/util": "^5.6.2",
-    "@polkadot/util-crypto": "^5.6.2",
-    "@polkadot/x-rxjs": "^5.6.2",
+    "@babel/runtime": "^7.12.18",
+    "@polkadot/metadata": "3.10.1",
+    "@polkadot/util": "^5.7.1",
+    "@polkadot/util-crypto": "^5.7.1",
+    "@polkadot/x-rxjs": "^5.7.1",
     "@types/bn.js": "^4.11.6",
     "bn.js": "^4.11.9"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^5.6.2"
+    "@polkadot/keyring": "^5.7.1"
   }
 }

packages/types/src/augment/registry.ts

@@ -46,7 +46,7 @@ import type { Bid, BidKind, SocietyJudgement, SocietyVote, StrikeCount, Vouching
 import type { ActiveEraInfo, CompactAssignments, CompactAssignmentsTo257, CompactScore, CompactScoreCompact, ElectionCompute, ElectionResult, ElectionScore, ElectionSize, ElectionStatus, EraIndex, EraPoints, EraRewardPoints, EraRewards, Exposure, Forcing, IndividualExposure, KeyType, MomentOf, Nominations, NominatorIndex, NominatorIndexCompact, OffchainAccuracy, OffchainAccuracyCompact, PhragmenScore, Points, RewardDestination, RewardDestinationTo257, RewardPoint, SeatHolder, SlashJournalEntry, SlashingSpans, SlashingSpansTo204, SpanIndex, SpanRecord, StakingLedger, StakingLedgerTo223, StakingLedgerTo240, UnappliedSlash, UnappliedSlashOther, UnlockChunk, ValidatorIndex, ValidatorIndexCompact, ValidatorPrefs, ValidatorPrefsTo145, ValidatorPrefsTo196, ValidatorPrefsWithBlocked, ValidatorPrefsWithCommission, Voter } from '@polkadot/types/interfaces/staking';
 import type { ApiId, KeyValueOption, ReadProof, RuntimeVersion, RuntimeVersionApi, StorageChangeSet } from '@polkadot/types/interfaces/state';
 import type { WeightToFeeCoefficient } from '@polkadot/types/interfaces/support';
-import type { AccountInfo, AccountInfoWithProviders, AccountInfoWithRefCount, ApplyExtrinsicResult, BlockLength, BlockWeights, ChainProperties, ChainType, ConsumedWeight, DigestOf, DispatchClass, DispatchError, DispatchErrorModule, DispatchErrorTo198, DispatchInfo, DispatchInfoTo190, DispatchInfoTo244, DispatchOutcome, DispatchResult, DispatchResultOf, DispatchResultTo198, Event, EventId, EventIndex, EventRecord, Health, InvalidTransaction, Key, LastRuntimeUpgradeInfo, NetworkState, NetworkStatePeerset, NetworkStatePeersetInfo, NodeRole, NotConnectedPeer, Peer, PeerEndpoint, PeerEndpointAddr, PeerInfo, PeerPing, PerDispatchClass, PerDispatchClassU32, Phase, RawOrigin, RefCount, RefCountTo259, SyncState, SystemOrigin, TransactionValidityError, UnknownTransaction, WeightPerClass } from '@polkadot/types/interfaces/system';
+import type { AccountInfo, AccountInfoWithProviders, AccountInfoWithRefCount, ApplyExtrinsicResult, BlockLength, BlockWeights, ChainProperties, ChainType, ConsumedWeight, DigestOf, DispatchClass, DispatchError, DispatchErrorModule, DispatchErrorTo198, DispatchInfo, DispatchInfoTo190, DispatchInfoTo244, DispatchOutcome, DispatchResult, DispatchResultOf, DispatchResultTo198, Event, EventId, EventIndex, EventRecord, Health, InvalidTransaction, Key, LastRuntimeUpgradeInfo, NetworkState, NetworkStatePeerset, NetworkStatePeersetInfo, NodeRole, NotConnectedPeer, Peer, PeerEndpoint, PeerEndpointAddr, PeerInfo, PeerPing, PerDispatchClassU32, PerDispatchClassWeight, PerDispatchClassWeightsPerClass, Phase, RawOrigin, RefCount, RefCountTo259, SyncState, SystemOrigin, TransactionValidityError, UnknownTransaction, WeightPerClass } from '@polkadot/types/interfaces/system';
 import type { Bounty, BountyIndex, BountyStatus, BountyStatusActive, BountyStatusCuratorProposed, BountyStatusPendingPayout, OpenTip, OpenTipFinderTo225, OpenTipTip, OpenTipTo225, TreasuryProposal } from '@polkadot/types/interfaces/treasury';
 import type { Multiplier } from '@polkadot/types/interfaces/txpayment';
 import type { Multisig, Timepoint } from '@polkadot/types/interfaces/utility';
@@ -597,8 +597,9 @@ declare module '@polkadot/types/types/registry' {
     'Option<PendingResume>': Option<PendingResume>;
     'Option<Perbill>': Option<Perbill>;
     'Option<Percent>': Option<Percent>;
-    'Option<PerDispatchClass>': Option<PerDispatchClass>;
     'Option<PerDispatchClassU32>': Option<PerDispatchClassU32>;
+    'Option<PerDispatchClassWeight>': Option<PerDispatchClassWeight>;
+    'Option<PerDispatchClassWeightsPerClass>': Option<PerDispatchClassWeightsPerClass>;
     'Option<Period>': Option<Period>;
     'Option<Permill>': Option<Permill>;
     'Option<PermissionLatest>': Option<PermissionLatest>;
@@ -1324,8 +1325,9 @@ declare module '@polkadot/types/types/registry' {
     'Vec<PendingResume>': Vec<PendingResume>;
     'Vec<Perbill>': Vec<Perbill>;
     'Vec<Percent>': Vec<Percent>;
-    'Vec<PerDispatchClass>': Vec<PerDispatchClass>;
     'Vec<PerDispatchClassU32>': Vec<PerDispatchClassU32>;
+    'Vec<PerDispatchClassWeight>': Vec<PerDispatchClassWeight>;
+    'Vec<PerDispatchClassWeightsPerClass>': Vec<PerDispatchClassWeightsPerClass>;
     'Vec<Period>': Vec<Period>;
     'Vec<Permill>': Vec<Permill>;
     'Vec<PermissionLatest>': Vec<PermissionLatest>;
@@ -2051,8 +2053,9 @@ declare module '@polkadot/types/types/registry' {
     PendingResume: PendingResume;
     Perbill: Perbill;
     Percent: Percent;
-    PerDispatchClass: PerDispatchClass;
     PerDispatchClassU32: PerDispatchClassU32;
+    PerDispatchClassWeight: PerDispatchClassWeight;
+    PerDispatchClassWeightsPerClass: PerDispatchClassWeightsPerClass;
     Period: Period;
     Permill: Permill;
     PermissionLatest: PermissionLatest;

packages/types/src/detectPackage.ts

@@ -18,7 +18,7 @@
 
 import { detectPackage } from '@polkadot/util';
 
-import packageInfo from './package-info.json';
+import { packageInfo } from './packageInfo';
 
 detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname);
 

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

@@ -254,10 +254,8 @@ export default {
     ParaValidatorIndex: 'u32',
     PersistedValidationData: {
       parentHead: 'HeadData',
-      blockNumber: 'RelayChainBlockNumber',
-      relayStorageRoot: 'Hash',
-      hrmpMqcHeads: 'Vec<(u32, Hash)>',
-      dmqMqcHead: 'Hash',
+      relayParentNumber: 'RelayChainBlockNumber',
+      relayParentStorageRoot: 'Hash',
       maxPovSize: 'u32'
     },
     RelayChainBlockNumber: 'u32',

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

@@ -624,10 +624,8 @@ export interface ParaValidatorIndex extends u32 {}
 /** @name PersistedValidationData */
 export interface PersistedValidationData extends Struct {
   readonly parentHead: HeadData;
-  readonly blockNumber: RelayChainBlockNumber;
-  readonly relayStorageRoot: Hash;
-  readonly hrmpMqcHeads: Vec<ITuple<[u32, Hash]>>;
-  readonly dmqMqcHead: Hash;
+  readonly relayParentNumber: RelayChainBlockNumber;
+  readonly relayParentStorageRoot: Hash;
   readonly maxPovSize: u32;
 }
 

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

@@ -153,7 +153,7 @@ export default {
     BlockWeights: {
       baseBlock: 'Weight',
       maxBlock: 'Weight',
-      perClass: 'PerDispatchClass'
+      perClass: 'PerDispatchClassWeightsPerClass'
     },
     ChainProperties: 'GenericChainProperties',
     ChainType: {
@@ -164,7 +164,7 @@ export default {
         Custom: 'Text'
       }
     },
-    ConsumedWeight: 'PerDispatchClass',
+    ConsumedWeight: 'PerDispatchClassWeight',
     DigestOf: 'Digest',
     DispatchClass: {
       _enum: ['Normal', 'Operational', 'Mandatory']
@@ -296,16 +296,21 @@ export default {
       bestHash: 'Hash',
       bestNumber: 'BlockNumber'
     },
-    PerDispatchClass: {
-      normal: 'WeightPerClass',
-      operational: 'WeightPerClass',
-      mandatory: 'WeightPerClass'
-    },
     PerDispatchClassU32: {
       normal: 'u32',
       operational: 'u32',
       mandatory: 'u32'
     },
+    PerDispatchClassWeight: {
+      normal: 'Weight',
+      operational: 'Weight',
+      mandatory: 'Weight'
+    },
+    PerDispatchClassWeightsPerClass: {
+      normal: 'WeightPerClass',
+      operational: 'WeightPerClass',
+      mandatory: 'WeightPerClass'
+    },
     Phase: {
       _enum: {
         ApplyExtrinsic: 'u32',

packages/types/src/interfaces/system/types.ts

@@ -45,7 +45,7 @@ export interface BlockLength extends Struct {
 export interface BlockWeights extends Struct {
   readonly baseBlock: Weight;
   readonly maxBlock: Weight;
-  readonly perClass: PerDispatchClass;
+  readonly perClass: PerDispatchClassWeightsPerClass;
 }
 
 /** @name ChainProperties */
@@ -61,7 +61,7 @@ export interface ChainType extends Enum {
 }
 
 /** @name ConsumedWeight */
-export interface ConsumedWeight extends PerDispatchClass {}
+export interface ConsumedWeight extends PerDispatchClassWeight {}
 
 /** @name DigestOf */
 export interface DigestOf extends Digest {}
@@ -276,13 +276,6 @@ export interface PeerPing extends Struct {
   readonly secs: u64;
 }
 
-/** @name PerDispatchClass */
-export interface PerDispatchClass extends Struct {
-  readonly normal: WeightPerClass;
-  readonly operational: WeightPerClass;
-  readonly mandatory: WeightPerClass;
-}
-
 /** @name PerDispatchClassU32 */
 export interface PerDispatchClassU32 extends Struct {
   readonly normal: u32;
@@ -290,6 +283,20 @@ export interface PerDispatchClassU32 extends Struct {
   readonly mandatory: u32;
 }
 
+/** @name PerDispatchClassWeight */
+export interface PerDispatchClassWeight extends Struct {
+  readonly normal: Weight;
+  readonly operational: Weight;
+  readonly mandatory: Weight;
+}
+
+/** @name PerDispatchClassWeightsPerClass */
+export interface PerDispatchClassWeightsPerClass extends Struct {
+  readonly normal: WeightPerClass;
+  readonly operational: WeightPerClass;
+  readonly mandatory: WeightPerClass;
+}
+
 /** @name Phase */
 export interface Phase extends Enum {
   readonly isApplyExtrinsic: boolean;

packages/types/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/dev authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/types', version: '3.10.1' };