@subwallet/extension-base 1.1.56-0 → 1.1.57-0

package/cjs/koni/background/handlers/State.js

@@ -1227,17 +1227,34 @@ class KoniState {
       maxFeePerGas: autoFormatNumber(transactionParams.maxFeePerGas),
       data: transactionParams.data
     };
+    const getTransactionGas = async () => {
+      try {
+        transaction.gas = await web3.eth.estimateGas({
+          ...transaction
+        });
+      } catch (e) {
+        // @ts-ignore
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
+      }
+    };
 
     // Calculate transaction data
     try {
-      transaction.gas = await web3.eth.estimateGas({
-        ...transaction
-      });
+      await Promise.race([getTransactionGas(), (0, _utils3.wait)(3000).then(async () => {
+        if (!transaction.gas) {
+          await this.chainService.initSingleApi(networkKey);
+          await getTransactionGas();
+        }
+      })]);
     } catch (e) {
       // @ts-ignore
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
     }
+    if (!transaction.gas) {
+      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS);
+    }
     let estimateGas;
 
     // TODO: Review, If not override, transaction maybe fail because fee too low

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.56-0'
+  version: '1.1.57-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/chain-service/index.js

@@ -631,6 +631,15 @@ class ChainService {
       }
     }));
   }
+  async initSingleApi(slug) {
+    const chainInfoMap = this.getChainInfoMap();
+    const chainStateMap = this.getChainStateMap();
+    if (!chainStateMap[slug].active) {
+      return false;
+    }
+    await this.initApiForChain(chainInfoMap[slug]);
+    return true;
+  }
   async initApiForChain(chainInfo) {
     const {
       endpoint,

package/cjs/services/earning-service/handlers/native-staking/relay-chain.js

@@ -51,13 +51,16 @@ class RelayNativeStakingPoolHandler extends _base.default {
     await defaultCallback();
     await substrateApi.isReady;
     const unsub = await ((_substrateApi$api$que = substrateApi.api.query.staking) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.currentEra(async _currentEra => {
-      var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
+      var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$cal, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
       if (cancel) {
         unsub();
         return;
       }
+      let maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '16';
+      const _maxNominationsByNominationQuota = await ((_substrateApi$api$cal = substrateApi.api.call.stakingApi) === null || _substrateApi$api$cal === void 0 ? void 0 : _substrateApi$api$cal.nominationsQuota(0)); // todo: review param. Currently return constant for all param.
+      const maxNominationsByNominationQuota = _maxNominationsByNominationQuota === null || _maxNominationsByNominationQuota === void 0 ? void 0 : _maxNominationsByNominationQuota.toString();
+      maxNominations = maxNominationsByNominationQuota !== null && maxNominationsByNominationQuota !== void 0 ? maxNominationsByNominationQuota : maxNominations;
       const currentEra = _currentEra.toString();
-      const maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '16'; // TODO
       const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
       const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();
       const maxSupportedEras = substrateApi.api.consts.staking.historyDepth.toString();
@@ -146,9 +149,20 @@ class RelayNativeStakingPoolHandler extends _base.default {
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
         let nominationStatus = _types.EarningStatus.NOT_EARNING;
-        const [[identity], _eraStaker] = await Promise.all([(0, _utils3.parseIdentity)(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
-        const eraStaker = _eraStaker.toPrimitive();
-        const sortedNominators = eraStaker.others.sort((a, b) => {
+        let eraStakerOtherList = [];
+        let identity;
+        if (['kusama', 'polkadot', 'westend'].includes(this.chain)) {
+          // todo: review all relaychains later
+          const [[_identity], _eraStaker] = await Promise.all([(0, _utils3.parseIdentity)(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress)]);
+          identity = _identity;
+          eraStakerOtherList = _eraStaker.flatMap(paged => paged[1].toPrimitive().others);
+        } else {
+          const [[_identity], _eraStaker] = await Promise.all([(0, _utils3.parseIdentity)(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
+          identity = _identity;
+          const eraStaker = _eraStaker.toPrimitive();
+          eraStakerOtherList = eraStaker.others;
+        }
+        const sortedNominators = eraStakerOtherList.sort((a, b) => {
           return new _bignumber.default(b.value).minus(a.value).toNumber();
         });
         const topNominators = sortedNominators.map(nominator => {
@@ -290,7 +304,14 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const maxEraRewardPointsEras = _constants2.MaxEraRewardPointsEras;
     const endEraForPoints = parseInt(activeEra) - 1;
     let startEraForPoints = endEraForPoints - maxEraRewardPointsEras + 1;
-    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators, ..._eraRewardPoints] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.data) && chainApi.api.query.stakingRewards.data(), chainApi.api.query.staking.validators.entries(), chainApi.api.query.staking.erasRewardPoints.multi([...Array(maxEraRewardPointsEras).keys()].map(i => i + startEraForPoints))]);
+    let _eraStakersPromise;
+    if (['kusama', 'polkadot', 'westend'].includes(this.chain)) {
+      // todo: review all relaychains later
+      _eraStakersPromise = chainApi.api.query.staking.erasStakersOverview.entries(parseInt(currentEra));
+    } else {
+      _eraStakersPromise = chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra));
+    }
+    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators, ..._eraRewardPoints] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), _eraStakersPromise, chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.data) && chainApi.api.query.stakingRewards.data(), chainApi.api.query.staking.validators.entries(), chainApi.api.query.staking.erasRewardPoints.multi([...Array(maxEraRewardPointsEras).keys()].map(i => i + startEraForPoints))]);
     const eraRewardMap = {};
     for (const item of _eraRewardPoints[0]) {
       eraRewardMap[startEraForPoints] = item.toHuman();
@@ -316,11 +337,11 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const bnTotalEraStake = new _util.BN(_totalEraStake.toString());
-    const eraStakers = _eraStakers;
     const rawMinBond = _minBond.toHuman();
     const minBond = rawMinBond.replaceAll(',', '');
     const totalStakeMap = {};
     const bnDecimals = new _util.BN((10 ** decimals).toString());
+    const eraStakers = _eraStakers;
     for (const item of eraStakers) {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const rawValidatorInfo = item[0].toHuman();

package/cjs/services/earning-service/handlers/nomination-pool/index.js

@@ -166,25 +166,19 @@ class NominationPoolHandler extends _base.default {
     if (nominations) {
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
-        let sortedNominators = [];
-        if (['kusama'].includes(this.chain)) {
-          // todo: hot fix for kusama first, we'll review all relaychains later
+        let eraStakerOtherList = [];
+        if (['kusama', 'polkadot', 'westend'].includes(this.chain)) {
+          // todo: review all relaychains later
           const _eraStaker = await substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress);
-          const eraStakerOtherList = [];
-          _eraStaker.forEach(paged => {
-            const pagedExposure = paged[1].toPrimitive();
-            eraStakerOtherList.push(...pagedExposure.others);
-          });
-          sortedNominators = eraStakerOtherList.sort((a, b) => {
-            return new _bignumber.default(b.value).minus(a.value).toNumber();
-          });
+          eraStakerOtherList = _eraStaker.flatMap(paged => paged[1].toPrimitive().others);
         } else {
           const _eraStaker = await substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress);
           const eraStaker = _eraStaker.toPrimitive();
-          sortedNominators = eraStaker.others.sort((a, b) => {
-            return new _bignumber.default(b.value).minus(a.value).toNumber();
-          });
+          eraStakerOtherList = eraStaker.others;
         }
+        const sortedNominators = eraStakerOtherList.sort((a, b) => {
+          return new _bignumber.default(b.value).minus(a.value).toNumber();
+        });
         const topNominators = sortedNominators.map(nominator => {
           return nominator.who;
         }).slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator);

package/cjs/services/earning-service/utils/index.js

@@ -81,12 +81,12 @@ async function parseIdentity(substrateApi, address, children) {
     const _identity = await substrateApi.api.query.identity.identityOf(address);
     const identityInfo = _identity.toHuman();
     if (identityInfo) {
-      var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t;
+      var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t, _identityInfo$judgeme;
       const displayName = (_identityInfo$info = identityInfo.info) === null || _identityInfo$info === void 0 ? void 0 : (_identityInfo$info$di = _identityInfo$info.display) === null || _identityInfo$info$di === void 0 ? void 0 : _identityInfo$info$di.Raw;
       const web = (_identityInfo$info2 = identityInfo.info) === null || _identityInfo$info2 === void 0 ? void 0 : (_identityInfo$info2$w = _identityInfo$info2.web) === null || _identityInfo$info2$w === void 0 ? void 0 : _identityInfo$info2$w.Raw;
       const riot = (_identityInfo$info3 = identityInfo.info) === null || _identityInfo$info3 === void 0 ? void 0 : (_identityInfo$info3$r = _identityInfo$info3.riot) === null || _identityInfo$info3$r === void 0 ? void 0 : _identityInfo$info3$r.Raw;
       const twitter = (_identityInfo$info4 = identityInfo.info) === null || _identityInfo$info4 === void 0 ? void 0 : (_identityInfo$info4$t = _identityInfo$info4.twitter) === null || _identityInfo$info4$t === void 0 ? void 0 : _identityInfo$info4$t.Raw;
-      const isReasonable = identityInfo.judgements.length > 0;
+      const isReasonable = ((_identityInfo$judgeme = identityInfo.judgements) === null || _identityInfo$judgeme === void 0 ? void 0 : _identityInfo$judgeme.length) > 0;
       if (displayName) {
         identity = (0, _util.isHex)(displayName) ? (0, _util.hexToString)(displayName) : displayName;
       } else {

package/cjs/utils/fetchStaticCache.js

@@ -9,10 +9,13 @@ var _axios = _interopRequireDefault(require("axios"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
+const branchName = process.env.BRANCH_NAME || 'koni-dev';
+const fetchTarget = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://static-cache.subwallet.app' : 'https://dev.sw-static-cache.pages.dev';
 async function fetchStaticCache(slug, defaultData) {
   let timeout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 9000;
   try {
-    const rs = await _axios.default.get(`https://static-cache.subwallet.app/${slug}`, {
+    const rs = await _axios.default.get(`${fetchTarget}/${slug}`, {
       timeout
     });
     return rs.data;

package/koni/background/handlers/State.js

@@ -32,7 +32,7 @@ import { SwapService } from '@subwallet/extension-base/services/swap-service';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
-import { isAccountAll, stripUrl, TARGET_ENV } from '@subwallet/extension-base/utils';
+import { isAccountAll, stripUrl, TARGET_ENV, wait } from '@subwallet/extension-base/utils';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
@@ -1204,17 +1204,34 @@ export default class KoniState {
       maxFeePerGas: autoFormatNumber(transactionParams.maxFeePerGas),
       data: transactionParams.data
     };
+    const getTransactionGas = async () => {
+      try {
+        transaction.gas = await web3.eth.estimateGas({
+          ...transaction
+        });
+      } catch (e) {
+        // @ts-ignore
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
+      }
+    };
 
     // Calculate transaction data
     try {
-      transaction.gas = await web3.eth.estimateGas({
-        ...transaction
-      });
+      await Promise.race([getTransactionGas(), wait(3000).then(async () => {
+        if (!transaction.gas) {
+          await this.chainService.initSingleApi(networkKey);
+          await getTransactionGas();
+        }
+      })]);
     } catch (e) {
       // @ts-ignore
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
     }
+    if (!transaction.gas) {
+      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS);
+    }
     let estimateGas;
 
     // TODO: Review, If not override, transaction maybe fail because fee too low

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.56-0",
+  "version": "1.1.57-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1874,10 +1874,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.56",
-    "@subwallet/extension-base": "^1.1.56-0",
-    "@subwallet/extension-chains": "^1.1.56-0",
-    "@subwallet/extension-dapp": "^1.1.56-0",
-    "@subwallet/extension-inject": "^1.1.56-0",
+    "@subwallet/extension-base": "^1.1.57-0",
+    "@subwallet/extension-chains": "^1.1.57-0",
+    "@subwallet/extension-dapp": "^1.1.57-0",
+    "@subwallet/extension-inject": "^1.1.57-0",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.56-0'
+  version: '1.1.57-0'
 };

package/services/chain-service/index.d.ts

@@ -93,6 +93,7 @@ export declare class ChainService {
     autoEnableTokens(): Promise<void>;
     handleLatestData(): void;
     private initApis;
+    initSingleApi(slug: string): Promise<boolean>;
     private initApiForChain;
     private destroyApiForChain;
     enableChain(chainSlug: string): Promise<boolean>;

package/services/chain-service/index.js

@@ -609,6 +609,15 @@ export class ChainService {
       }
     }));
   }
+  async initSingleApi(slug) {
+    const chainInfoMap = this.getChainInfoMap();
+    const chainStateMap = this.getChainStateMap();
+    if (!chainStateMap[slug].active) {
+      return false;
+    }
+    await this.initApiForChain(chainInfoMap[slug]);
+    return true;
+  }
   async initApiForChain(chainInfo) {
     const {
       endpoint,

package/services/earning-service/handlers/native-staking/relay-chain.js

@@ -44,13 +44,16 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     await defaultCallback();
     await substrateApi.isReady;
     const unsub = await ((_substrateApi$api$que = substrateApi.api.query.staking) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.currentEra(async _currentEra => {
-      var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
+      var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$cal, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
       if (cancel) {
         unsub();
         return;
       }
+      let maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '16';
+      const _maxNominationsByNominationQuota = await ((_substrateApi$api$cal = substrateApi.api.call.stakingApi) === null || _substrateApi$api$cal === void 0 ? void 0 : _substrateApi$api$cal.nominationsQuota(0)); // todo: review param. Currently return constant for all param.
+      const maxNominationsByNominationQuota = _maxNominationsByNominationQuota === null || _maxNominationsByNominationQuota === void 0 ? void 0 : _maxNominationsByNominationQuota.toString();
+      maxNominations = maxNominationsByNominationQuota !== null && maxNominationsByNominationQuota !== void 0 ? maxNominationsByNominationQuota : maxNominations;
       const currentEra = _currentEra.toString();
-      const maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '16'; // TODO
       const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
       const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();
       const maxSupportedEras = substrateApi.api.consts.staking.historyDepth.toString();
@@ -139,9 +142,20 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
         let nominationStatus = EarningStatus.NOT_EARNING;
-        const [[identity], _eraStaker] = await Promise.all([parseIdentity(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
-        const eraStaker = _eraStaker.toPrimitive();
-        const sortedNominators = eraStaker.others.sort((a, b) => {
+        let eraStakerOtherList = [];
+        let identity;
+        if (['kusama', 'polkadot', 'westend'].includes(this.chain)) {
+          // todo: review all relaychains later
+          const [[_identity], _eraStaker] = await Promise.all([parseIdentity(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress)]);
+          identity = _identity;
+          eraStakerOtherList = _eraStaker.flatMap(paged => paged[1].toPrimitive().others);
+        } else {
+          const [[_identity], _eraStaker] = await Promise.all([parseIdentity(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
+          identity = _identity;
+          const eraStaker = _eraStaker.toPrimitive();
+          eraStakerOtherList = eraStaker.others;
+        }
+        const sortedNominators = eraStakerOtherList.sort((a, b) => {
           return new BigN(b.value).minus(a.value).toNumber();
         });
         const topNominators = sortedNominators.map(nominator => {
@@ -283,7 +297,14 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const maxEraRewardPointsEras = MaxEraRewardPointsEras;
     const endEraForPoints = parseInt(activeEra) - 1;
     let startEraForPoints = endEraForPoints - maxEraRewardPointsEras + 1;
-    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators, ..._eraRewardPoints] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.data) && chainApi.api.query.stakingRewards.data(), chainApi.api.query.staking.validators.entries(), chainApi.api.query.staking.erasRewardPoints.multi([...Array(maxEraRewardPointsEras).keys()].map(i => i + startEraForPoints))]);
+    let _eraStakersPromise;
+    if (['kusama', 'polkadot', 'westend'].includes(this.chain)) {
+      // todo: review all relaychains later
+      _eraStakersPromise = chainApi.api.query.staking.erasStakersOverview.entries(parseInt(currentEra));
+    } else {
+      _eraStakersPromise = chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra));
+    }
+    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators, ..._eraRewardPoints] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), _eraStakersPromise, chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.data) && chainApi.api.query.stakingRewards.data(), chainApi.api.query.staking.validators.entries(), chainApi.api.query.staking.erasRewardPoints.multi([...Array(maxEraRewardPointsEras).keys()].map(i => i + startEraForPoints))]);
     const eraRewardMap = {};
     for (const item of _eraRewardPoints[0]) {
       eraRewardMap[startEraForPoints] = item.toHuman();
@@ -309,11 +330,11 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const bnTotalEraStake = new BN(_totalEraStake.toString());
-    const eraStakers = _eraStakers;
     const rawMinBond = _minBond.toHuman();
     const minBond = rawMinBond.replaceAll(',', '');
     const totalStakeMap = {};
     const bnDecimals = new BN((10 ** decimals).toString());
+    const eraStakers = _eraStakers;
     for (const item of eraStakers) {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const rawValidatorInfo = item[0].toHuman();

package/services/earning-service/handlers/nomination-pool/index.js

@@ -158,25 +158,19 @@ export default class NominationPoolHandler extends BasePoolHandler {
     if (nominations) {
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
-        let sortedNominators = [];
-        if (['kusama'].includes(this.chain)) {
-          // todo: hot fix for kusama first, we'll review all relaychains later
+        let eraStakerOtherList = [];
+        if (['kusama', 'polkadot', 'westend'].includes(this.chain)) {
+          // todo: review all relaychains later
           const _eraStaker = await substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress);
-          const eraStakerOtherList = [];
-          _eraStaker.forEach(paged => {
-            const pagedExposure = paged[1].toPrimitive();
-            eraStakerOtherList.push(...pagedExposure.others);
-          });
-          sortedNominators = eraStakerOtherList.sort((a, b) => {
-            return new BigN(b.value).minus(a.value).toNumber();
-          });
+          eraStakerOtherList = _eraStaker.flatMap(paged => paged[1].toPrimitive().others);
         } else {
           const _eraStaker = await substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress);
           const eraStaker = _eraStaker.toPrimitive();
-          sortedNominators = eraStaker.others.sort((a, b) => {
-            return new BigN(b.value).minus(a.value).toNumber();
-          });
+          eraStakerOtherList = eraStaker.others;
         }
+        const sortedNominators = eraStakerOtherList.sort((a, b) => {
+          return new BigN(b.value).minus(a.value).toNumber();
+        });
         const topNominators = sortedNominators.map(nominator => {
           return nominator.who;
         }).slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator);

package/services/earning-service/utils/index.js

@@ -69,12 +69,12 @@ export async function parseIdentity(substrateApi, address, children) {
     const _identity = await substrateApi.api.query.identity.identityOf(address);
     const identityInfo = _identity.toHuman();
     if (identityInfo) {
-      var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t;
+      var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t, _identityInfo$judgeme;
       const displayName = (_identityInfo$info = identityInfo.info) === null || _identityInfo$info === void 0 ? void 0 : (_identityInfo$info$di = _identityInfo$info.display) === null || _identityInfo$info$di === void 0 ? void 0 : _identityInfo$info$di.Raw;
       const web = (_identityInfo$info2 = identityInfo.info) === null || _identityInfo$info2 === void 0 ? void 0 : (_identityInfo$info2$w = _identityInfo$info2.web) === null || _identityInfo$info2$w === void 0 ? void 0 : _identityInfo$info2$w.Raw;
       const riot = (_identityInfo$info3 = identityInfo.info) === null || _identityInfo$info3 === void 0 ? void 0 : (_identityInfo$info3$r = _identityInfo$info3.riot) === null || _identityInfo$info3$r === void 0 ? void 0 : _identityInfo$info3$r.Raw;
       const twitter = (_identityInfo$info4 = identityInfo.info) === null || _identityInfo$info4 === void 0 ? void 0 : (_identityInfo$info4$t = _identityInfo$info4.twitter) === null || _identityInfo$info4$t === void 0 ? void 0 : _identityInfo$info4$t.Raw;
-      const isReasonable = identityInfo.judgements.length > 0;
+      const isReasonable = ((_identityInfo$judgeme = identityInfo.judgements) === null || _identityInfo$judgeme === void 0 ? void 0 : _identityInfo$judgeme.length) > 0;
       if (displayName) {
         identity = isHex(displayName) ? hexToString(displayName) : displayName;
       } else {

package/utils/fetchStaticCache.js

@@ -2,9 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import axios from 'axios';
+const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
+const branchName = process.env.BRANCH_NAME || 'koni-dev';
+const fetchTarget = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://static-cache.subwallet.app' : 'https://dev.sw-static-cache.pages.dev';
 export async function fetchStaticCache(slug, defaultData, timeout = 9000) {
   try {
-    const rs = await axios.get(`https://static-cache.subwallet.app/${slug}`, {
+    const rs = await axios.get(`${fetchTarget}/${slug}`, {
       timeout
     });
     return rs.data;