@subwallet/extension-base 1.2.27-0 → 1.2.29-0

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

@@ -22,6 +22,7 @@ var _utils2 = require("@subwallet/extension-base/utils");
 var _web = _interopRequireDefault(require("web3"));
 var _phishing = require("@polkadot/phishing");
 var _util = require("@polkadot/util");
+var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -286,8 +287,6 @@ class KoniTabs {
     } = _ref11;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const authInfoSubject = this.#koniState.requestService.subscribeAuthorizeUrlSubject;
-
-    // Update unsubscribe from @polkadot/extension-base
     this.#accountSubs[id] = {
       subscription: authInfoSubject.subscribe(infos => {
         this.getAuthInfo(url, infos).then(authInfo => {
@@ -298,6 +297,8 @@ class KoniTabs {
       }),
       url
     };
+
+    // Update unsubscribe from @polkadot/extension-base
     port.onDisconnect.addListener(() => {
       this.accountsUnsubscribe(url, {
         id
@@ -421,10 +422,80 @@ class KoniTabs {
       date: new Date().getTime()
     }];
   }
-  async switchEvmChain(id, url, _ref13) {
+  async revokePermissions(url, id, _ref13) {
     let {
       params
     } = _ref13;
+    if (!params || !(0, _util.isArray)(params) || params.length === 0) {
+      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'No list of permissions found to revoke in the parameters.');
+    }
+
+    // Example of a request in MetaMask wallet
+    // await window.ethereum.request({
+    //   "method": "wallet_revokePermissions",
+    //   "params": [
+    //     {
+    //       "eth_accounts": {}
+    //     }
+    //   ]
+    // });
+    // Doc: https://docs.metamask.io/wallet/reference/wallet_revokepermissions/
+
+    const permissions = new Set(Object.keys(params[0]).filter(permission => _constants.PERMISSIONS_TO_REVOKE.includes(permission)));
+    const permissionPromise = async permission => {
+      if (permission === 'eth_accounts') {
+        return new Promise(resolve => {
+          this.#koniState.getAuthorize(value => {
+            const urlStripped = (0, _utils2.stripUrl)(url);
+            if (value && value[urlStripped]) {
+              const {
+                accountAuthType,
+                isAllowedMap
+              } = {
+                ...value[urlStripped]
+              };
+              if (!accountAuthType) {
+                resolve();
+              }
+              switch (accountAuthType) {
+                case 'substrate':
+                  resolve();
+                  break;
+                case 'evm':
+                  delete value[urlStripped];
+                  break;
+                case 'both':
+                  {
+                    value[urlStripped].isAllowedMap = Object.entries(isAllowedMap).reduce((allowedMap, _ref14) => {
+                      let [address, value] = _ref14;
+                      if ((0, _utilCrypto.isEthereumAddress)(address)) {
+                        allowedMap[address] = false;
+                      } else {
+                        allowedMap[address] = value;
+                      }
+                      return allowedMap;
+                    }, {});
+                    value[urlStripped].accountAuthType = 'substrate';
+                    break;
+                  }
+              }
+              this.#koniState.setAuthorize(value, () => {
+                resolve();
+              });
+            } else {
+              resolve();
+            }
+          });
+        });
+      }
+    };
+    await Promise.all(Array.from(permissions).map(permissionPromise));
+    return null;
+  }
+  async switchEvmChain(id, url, _ref15) {
+    let {
+      params
+    } = _ref15;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const chainId = params[0].chainId;
     const chainIdDec = parseInt(chainId, 16);
@@ -456,11 +527,11 @@ class KoniTabs {
     }
     return null;
   }
-  async addEvmToken(id, url, _ref14) {
+  async addEvmToken(id, url, _ref16) {
     var _input$type, _input$options, _input$options2, _input$options3, _input$options4, _input$options5;
     let {
       params
-    } = _ref14;
+    } = _ref16;
     const input = params;
     const _tokenType = (input === null || input === void 0 ? void 0 : (_input$type = input.type) === null || _input$type === void 0 ? void 0 : _input$type.toLowerCase()) || '';
     if (_tokenType !== 'erc20' && _tokenType !== 'erc721') {
@@ -513,10 +584,10 @@ class KoniTabs {
 
     return await this.#koniState.addTokenConfirm(id, url, tokenInfo);
   }
-  async addEvmChain(id, url, _ref15) {
+  async addEvmChain(id, url, _ref17) {
     let {
       params
-    } = _ref15;
+    } = _ref17;
     const input = params;
     if (input && input.length > 0) {
       const {
@@ -719,11 +790,11 @@ class KoniTabs {
     const networkCheckInterval = setInterval(networkCheck, _constants.CRON_GET_API_MAP_STATUS);
     const provider = await this.getEvmProvider(url);
     const eventMap = {};
-    eventMap.data = _ref16 => {
+    eventMap.data = _ref18 => {
       let {
         method,
         params
-      } = _ref16;
+      } = _ref18;
       emitEvent('message', {
         type: method,
         data: params
@@ -732,8 +803,8 @@ class KoniTabs {
     eventMap.error = rs => {
       emitEvent('error', rs);
     };
-    Object.entries(eventMap).forEach(_ref17 => {
-      let [event, callback] = _ref17;
+    Object.entries(eventMap).forEach(_ref19 => {
+      let [event, callback] = _ref19;
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       (provider === null || provider === void 0 ? void 0 : provider.on) && (provider === null || provider === void 0 ? void 0 : provider.on(event, callback));
     });
@@ -747,8 +818,8 @@ class KoniTabs {
       if (this.evmEventEmitterMap[url][id]) {
         delete this.evmEventEmitterMap[url][id];
       }
-      Object.entries(eventMap).forEach(_ref18 => {
-        let [event, callback] = _ref18;
+      Object.entries(eventMap).forEach(_ref20 => {
+        let [event, callback] = _ref20;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         (provider === null || provider === void 0 ? void 0 : provider.removeListener) && (provider === null || provider === void 0 ? void 0 : provider.removeListener(event, callback));
       });
@@ -783,11 +854,11 @@ class KoniTabs {
     }
     return provider;
   }
-  async performWeb3Method(id, url, _ref19, callback) {
+  async performWeb3Method(id, url, _ref21, callback) {
     let {
       method,
       params
-    } = _ref19;
+    } = _ref21;
     const provider = await this.getEvmProvider(url);
     this.checkAndHandleProviderStatus(provider);
     return new Promise((resolve, reject) => {
@@ -823,11 +894,11 @@ class KoniTabs {
     const allowedAccounts = await this.getEvmCurrentAccount(url);
     return !!allowedAccounts.find(acc => acc.toLowerCase() === address.toLowerCase());
   }
-  async evmSign(id, url, _ref20) {
+  async evmSign(id, url, _ref22) {
     let {
       method,
       params
-    } = _ref20;
+    } = _ref22;
     const signResult = await this.#koniState.evmSign(id, url, method, params);
     if (signResult) {
       return signResult;
@@ -835,10 +906,10 @@ class KoniTabs {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Failed to sign message');
     }
   }
-  async evmSendTransaction(id, url, _ref21) {
+  async evmSendTransaction(id, url, _ref23) {
     let {
       params
-    } = _ref21;
+    } = _ref23;
     const transactionParams = params[0];
     const transactionHash = await this.#koniState.evmSendTransaction(id, url, transactionParams);
     if (!transactionHash) {
@@ -881,6 +952,8 @@ class KoniTabs {
           return await this.getEvmPermission(url, id);
         case 'wallet_getPermissions':
           return await this.getEvmPermission(url, id);
+        case 'wallet_revokePermissions':
+          return await this.revokePermissions(url, id, request);
         case 'wallet_addEthereumChain':
           return await this.addEvmChain(id, url, request);
         case 'wallet_switchEthereumChain':
@@ -920,13 +993,13 @@ class KoniTabs {
     return true;
   }
   isEvmPublicRequest(type, request) {
-    return type === 'evm(request)' && ['eth_chainId', 'net_version'].includes(request === null || request === void 0 ? void 0 : request.method);
+    return type === 'evm(request)' && ['eth_chainId', 'net_version', 'wallet_requestPermissions', 'wallet_getPermissions'].includes(request === null || request === void 0 ? void 0 : request.method) || type === 'evm(events.subscribe)';
   }
-  async addPspToken(id, url, _ref22) {
+  async addPspToken(id, url, _ref24) {
     let {
       genesisHash,
       tokenInfo: input
-    } = _ref22;
+    } = _ref24;
     const _tokenType = input.type;
     if (_tokenType !== 'psp22' && _tokenType !== 'psp34') {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Assets type {{tokenType}} is not supported'.replace('{{tokenType}}', _tokenType));
@@ -987,7 +1060,7 @@ class KoniTabs {
 
     // Wait for account ready and chain ready
     await Promise.all([this.#koniState.eventService.waitAccountReady, this.#koniState.eventService.waitChainReady]);
-    if (type !== 'pub(authorize.tabV2)' && !this.isEvmPublicRequest(type, request)) {
+    if (!['pub(authorize.tabV2)', 'pub(accounts.subscribeV2)'].includes(type) && !this.isEvmPublicRequest(type, request)) {
       await this.#koniState.ensureUrlAuthorizedV2(url).catch(e => {
         if (type.startsWith('evm')) {
           throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, e.message);

package/cjs/packageInfo.js

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

package/cjs/services/balance-service/helpers/subscribe/index.js

@@ -78,6 +78,21 @@ const filterAddress = (addresses, chainInfo) => {
     return [fetchList, [...unfetchList, ...evmAddresses]];
   }
 };
+const handleUnsupportedOrPendingAddresses = (addresses, chainSlug, chainAssetMap, state, callback) => {
+  const tokens = (0, _utils2.filterAssetsByChainAndType)(chainAssetMap, chainSlug, [_types._AssetType.NATIVE, _types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.LOCAL, _types._AssetType.GRC20, _types._AssetType.VFT]);
+  const now = new Date().getTime();
+  Object.values(tokens).forEach(token => {
+    const items = addresses.map(address => ({
+      address,
+      tokenSlug: token.slug,
+      free: '0',
+      locked: '0',
+      state,
+      timestamp: now
+    }));
+    callback(items);
+  });
+};
 
 // main subscription, use for multiple chains, multiple addresses and multiple tokens
 function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoMap, substrateApiMap, evmApiMap, callback, extrinsicType) {
@@ -96,19 +111,7 @@ function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoM
     const chainSlug = chainInfo.slug;
     const [useAddresses, notSupportAddresses] = filterAddress(addresses, chainInfo);
     if (notSupportAddresses.length) {
-      const tokens = (0, _utils2.filterAssetsByChainAndType)(chainAssetMap, chainSlug, [_types._AssetType.NATIVE, _types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.LOCAL, _types._AssetType.GRC20, _types._AssetType.VFT]);
-      const now = new Date().getTime();
-      Object.values(tokens).forEach(token => {
-        const items = notSupportAddresses.map(address => ({
-          address,
-          tokenSlug: token.slug,
-          free: '0',
-          locked: '0',
-          state: _KoniTypes.APIItemState.NOT_SUPPORT,
-          timestamp: now
-        }));
-        callback(items);
-      });
+      handleUnsupportedOrPendingAddresses(notSupportAddresses, chainSlug, chainAssetMap, _KoniTypes.APIItemState.NOT_SUPPORT, callback);
     }
     const evmApi = evmApiMap[chainSlug];
     if ((0, _utils._isPureEvmChain)(chainInfo)) {
@@ -120,6 +123,9 @@ function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoM
         evmApi
       });
     }
+    if (!substrateApiMap[chainSlug].isApiReady) {
+      handleUnsupportedOrPendingAddresses(useAddresses, chainSlug, chainAssetMap, _KoniTypes.APIItemState.PENDING, callback);
+    }
     const substrateApi = await substrateApiMap[chainSlug].isReady;
     return (0, _substrate.subscribeSubstrateBalance)(useAddresses, chainInfo, chainAssetMap, substrateApi, evmApi, callback, extrinsicType);
   });

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -114,7 +114,6 @@ const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substra
 // eslint-disable-next-line @typescript-eslint/require-await
 exports.subscribeSubstrateBalance = subscribeSubstrateBalance;
 const subscribeWithSystemAccountPallet = async _ref => {
-  var _substrateApi$api$tx, _substrateApi$api$tx$;
   let {
     addresses,
     callback,
@@ -124,7 +123,7 @@ const subscribeWithSystemAccountPallet = async _ref => {
   } = _ref;
   const systemAccountKey = 'query_system_account';
   const poolMembersKey = 'query_nominationPools_poolMembers';
-  const isNominationPoolMigrated = !!((_substrateApi$api$tx = substrateApi.api.tx) !== null && _substrateApi$api$tx !== void 0 && (_substrateApi$api$tx$ = _substrateApi$api$tx.nominationPools) !== null && _substrateApi$api$tx$ !== void 0 && _substrateApi$api$tx$.migrateDelegation);
+  const isNominationPoolMigrated = await checkNominationPoolCompleteMigrated(substrateApi);
   const params = [{
     section: 'query',
     module: systemAccountKey.split('_')[1],
@@ -167,6 +166,19 @@ const subscribeWithSystemAccountPallet = async _ref => {
     subscription.unsubscribe();
   };
 };
+const checkNominationPoolCompleteMigrated = async substrateApi => {
+  if (!substrateApi.api.tx.nominationPools || !substrateApi.api.query.staking) {
+    return false;
+  }
+  const isNominationPoolMigrated = !!substrateApi.api.tx.nominationPools.migrateDelegation && !!substrateApi.api.query.staking.counterForVirtualStakers && !!substrateApi.api.query.staking.virtualStakers;
+  if (!isNominationPoolMigrated) {
+    return false;
+  }
+  const [nominationPoolCounterRaw, nominationPoolInfoRaw] = await Promise.all([substrateApi.api.query.staking.counterForVirtualStakers(), substrateApi.api.query.staking.virtualStakers.entries()]);
+  const nominationPoolCounter = nominationPoolCounterRaw.toPrimitive();
+  const nominationPoolInfoLength = nominationPoolInfoRaw.length;
+  return nominationPoolCounter !== 0 && nominationPoolInfoLength !== 0;
+};
 const subscribeForeignAssetBalance = async _ref2 => {
   let {
     addresses,

package/cjs/services/balance-service/transfer/xcm/index.js

@@ -49,19 +49,14 @@ const createXcmExtrinsic = async _ref2 => {
   const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
   const chainApi = await substrateApi.isReady;
   const api = chainApi.api;
-  let extrinsic;
-  if (_constants._XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain)) {
-    if (['astar', 'shiden'].includes(originChainInfo.slug) && !(0, _utils._isNativeToken)(originTokenInfo)) {
-      extrinsic = (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
-    } else {
-      extrinsic = (0, _polkadotXcm.getExtrinsicByPolkadotXcmPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
-    }
-  } else if (_constants._XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
-    extrinsic = (0, _xcmPallet.getExtrinsicByXcmPalletPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
-  } else {
-    extrinsic = (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+  const polkadotXcmSpecialCases = _constants._XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChainInfo.slug) && (0, _utils._isNativeToken)(originTokenInfo);
+  if (_constants._XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
+    return (0, _polkadotXcm.getExtrinsicByPolkadotXcmPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
   }
-  return extrinsic;
+  if (_constants._XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
+    return (0, _xcmPallet.getExtrinsicByXcmPalletPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+  }
+  return (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
 };
 exports.createXcmExtrinsic = createXcmExtrinsic;
 const getXcmMockTxFee = async (substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo) => {
@@ -69,7 +64,7 @@ const getXcmMockTxFee = async (substrateApi, chainInfoMap, originTokenInfo, dest
     var _paymentInfo$partialF;
     const destChainInfo = chainInfoMap[destinationTokenInfo.originChain];
     const originChainInfo = chainInfoMap[originTokenInfo.originChain];
-    const address = '5DRewsYzhJqZXU3SRaWy1FSt5iDr875ao91aw5fjrJmDG4Ap';
+    const address = '5DRewsYzhJqZXU3SRaWy1FSt5iDr875ao91aw5fjrJmDG4Ap'; // todo: move this
 
     // mock receiving account from sender
     const recipient = !(0, _utilCrypto.isEthereumAddress)(address) && (0, _utils._isChainEvmCompatible)(destChainInfo) && !(0, _utils._isChainEvmCompatible)(originChainInfo) ? (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(address)) : address;

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

@@ -283,7 +283,8 @@ const _DEFAULT_MANTA_ZK_CHAIN = 'calamari';
 // XCM------------------------------------------------------------------------------------------------------------------
 exports._DEFAULT_MANTA_ZK_CHAIN = _DEFAULT_MANTA_ZK_CHAIN;
 const _XCM_CHAIN_GROUP = {
-  polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos'],
+  polkadotXcm: ['statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos'],
+  polkadotXcmSpecialCases: ['astar', 'shiden'],
   xcmPallet: ['polkadot', 'kusama', 'rococo']
   // default is xTokens pallet
 };

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

@@ -28,7 +28,7 @@ const filterChainInfoMap = (data, ignoredChains) => {
     return !info.bitcoinInfo && !ignoredChains.includes(slug);
   }));
 };
-const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest', 'syscoin_evm', 'syscoin_evm_testnet', 'rollux_evm', 'rollux_testnet', 'boolAlpha', 'boolBeta_testnet', 'core', 'satoshivm', 'satoshivm_testnet', 'ton', 'ton_testnet'];
+const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest', 'syscoin_evm', 'syscoin_evm_testnet', 'rollux_evm', 'rollux_testnet', 'boolAlpha', 'boolBeta_testnet', 'core', 'satoshivm', 'satoshivm_testnet', 'ton', 'ton_testnet', 'storyPartner_testnet'];
 const filterAssetInfoMap = (chainInfo, assets) => {
   return Object.fromEntries(Object.entries(assets).filter(_ref2 => {
     let [, info] = _ref2;

package/cjs/services/earning-service/constants/chains.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._UPDATED_RUNTIME_STAKING_GROUP = exports._STAKING_CHAIN_GROUP = exports.ST_LIQUID_TOKEN_ABI = exports.MaxEraRewardPointsEras = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = void 0;
+exports._STAKING_CHAIN_GROUP = exports.ST_LIQUID_TOKEN_ABI = exports.MaxEraRewardPointsEras = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = void 0;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -25,8 +25,6 @@ const _STAKING_CHAIN_GROUP = {
   manta: ['manta_network']
 };
 exports._STAKING_CHAIN_GROUP = _STAKING_CHAIN_GROUP;
-const _UPDATED_RUNTIME_STAKING_GROUP = ['kusama', 'polkadot', 'westend', 'availTuringTest', 'avail_mainnet', 'dentnet'];
-exports._UPDATED_RUNTIME_STAKING_GROUP = _UPDATED_RUNTIME_STAKING_GROUP;
 const MaxEraRewardPointsEras = 14;
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment

package/cjs/services/earning-service/handlers/lending/interlay.js

@@ -61,7 +61,6 @@ class InterlayLendingPoolHandler extends _base.default {
       statistic: {
         assetEarning: [{
           slug: this.rewardAssets[0],
-          apr: 1.29,
           exchangeRate: exchangeRate / decimals
         }],
         maxCandidatePerFarmer: 1,
@@ -71,7 +70,6 @@ class InterlayLendingPoolHandler extends _base.default {
           defaultUnstake: '0',
           fastUnstake: '0'
         },
-        totalApr: 1.29,
         tvl: '291890000000000'
       }
     };

package/cjs/services/earning-service/handlers/liquid-staking/parallel.js

@@ -46,7 +46,7 @@ class ParallelLiquidStakingPoolHandler extends _base.default {
 
   async getPoolStat() {
     const substrateApi = await this.substrateApi.isReady;
-    const [_exchangeRate, _currentBlockHeader, _currentTimestamp, _stakingLedgers] = await Promise.all([substrateApi.api.query.liquidStaking.exchangeRate(), substrateApi.api.rpc.chain.getHeader(), substrateApi.api.query.timestamp.now(), substrateApi.api.query.liquidStaking.stakingLedgers.entries()]);
+    const [_exchangeRate, _stakingLedgers] = await Promise.all([substrateApi.api.query.liquidStaking.exchangeRate(), substrateApi.api.query.liquidStaking.stakingLedgers.entries()]);
     let tvl = _util.BN_ZERO;
     for (const _stakingLedger of _stakingLedgers) {
       const _ledger = _stakingLedger[1];
@@ -54,16 +54,7 @@ class ParallelLiquidStakingPoolHandler extends _base.default {
       tvl = tvl.add(new _util.BN(ledger.total.toString()));
     }
     const exchangeRate = _exchangeRate.toPrimitive();
-    const currentBlockHeader = _currentBlockHeader.toPrimitive();
-    const currentTimestamp = _currentTimestamp.toPrimitive();
-    const beginBlock = currentBlockHeader.number - 24 * 60 * 60 / 6 * 14;
-    const _beginBlockHash = await substrateApi.api.rpc.chain.getBlockHash(beginBlock);
-    const beginBlockHash = _beginBlockHash.toString();
-    const [_beginTimestamp, _beginExchangeRate] = await Promise.all([substrateApi.api.query.timestamp.now.at(beginBlockHash), substrateApi.api.query.liquidStaking.exchangeRate.at(beginBlockHash)]);
-    const beginTimestamp = _beginTimestamp.toPrimitive();
-    const beginExchangeRate = _beginExchangeRate.toPrimitive();
     const decimals = 10 ** this.rateDecimals;
-    const apy = (exchangeRate / beginExchangeRate) ** (365 * 24 * 60 * 60000 / (currentTimestamp - beginTimestamp)) - 1;
     const minStake = substrateApi.api.consts.liquidStaking.minStake.toString();
     const minUnstake = substrateApi.api.consts.liquidStaking.minUnstake.toString();
     this.updateExchangeRate(exchangeRate);
@@ -77,7 +68,6 @@ class ParallelLiquidStakingPoolHandler extends _base.default {
       statistic: {
         assetEarning: [{
           slug: this.rewardAssets[0],
-          apy: apy * 100,
           exchangeRate: exchangeRate / decimals
         }],
         unstakingPeriod: 24 * 28,
@@ -88,7 +78,6 @@ class ParallelLiquidStakingPoolHandler extends _base.default {
           defaultUnstake: minUnstake,
           fastUnstake: '0'
         },
-        totalApy: apy * 100,
         tvl: tvl.toString()
       }
     };

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

@@ -199,7 +199,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
       let nominationStatus = _types.EarningStatus.NOT_EARNING;
       let eraStakerOtherList = [];
       let identity;
-      if (_constants2._UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
+      if (substrateApi.api.query.staking.erasStakersPaged) {
         // 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;
@@ -307,20 +307,19 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const maxEraRewardPointsEras = _constants2.MaxEraRewardPointsEras;
     const endEraForPoints = parseInt(activeEra) - 1;
     const startEraForPoints = Math.max(endEraForPoints - maxEraRewardPointsEras + 1, 0);
-    let _eraStakersPromise;
-    if (chainApi.api.query.staking.erasStakersOverview) {
-      // 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 _eraStakersPromise = chainApi.api.query.staking.erasStakersOverview // todo: review all relaychains later
+    ? chainApi.api.query.staking.erasStakersOverview.entries(parseInt(currentEra)) : 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 = (0, _utils.getRelayEraRewardMap)(_eraRewardPoints[0], startEraForPoints);
     const validatorPointsMap = (0, _utils.getRelayValidatorPointsMap)(eraRewardMap);
     const topValidatorList = (0, _utils.getRelayTopValidatorByPoints)(validatorPointsMap);
-    const validators = _validators;
-    const blockedValidatorList = (0, _utils.getRelayBlockedValidatorList)(validators);
-    const waitingValidatorList = (0, _utils.getRelayWaitingValidatorList)(validators);
+    const allValidatorList = _validators;
+
+    // todo: optimize naming for all filtered validatorList: all, block, waiting, selected, waiting but is not selected, waiting but is not blocked, ...
+    const blockedValidatorList = (0, _utils.getRelayBlockedValidatorList)(allValidatorList);
+    const waitingValidatorList = (0, _utils.getRelayWaitingValidatorList)(allValidatorList); // all validators that are not blocked
+
+    // todo: improve handle waitingValidatorLedger
     const _waitingValidatorLedger = await chainApi.api.query.staking.ledger.multi(waitingValidatorList);
     const waitingValidatorLedger = {};
     if (_waitingValidatorLedger) {
@@ -334,7 +333,9 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const bnTotalEraStake = new _util.BN(_totalEraStake.toString());
     const minBond = _minBond.toPrimitive();
-    const [totalStakeMap, allValidatorAddresses, validatorInfoList] = this.parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorLedger, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
+    const [totalStakeMap, allValidatorAddresses, allValidatorInfo] = this.parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorLedger, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
+    const currentSelectedValidatorList = allValidatorInfo.currentSelectedValidatorList;
+    const allValidatorInfoList = [...currentSelectedValidatorList, ...allValidatorInfo.waitingValidatorList];
     const extraInfoMap = {};
     await Promise.all(allValidatorAddresses.map(async address => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -348,17 +349,19 @@ class RelayNativeStakingPoolHandler extends _base.default {
       };
     }));
     const decimals = this.nativeToken.decimals || 0;
-    const bnAvgStake = (0, _utils3.applyDecimal)(bnTotalEraStake.divn(validatorInfoList.length), decimals);
-    for (const validator of validatorInfoList) {
+    const bnAvgStake = (0, _utils3.applyDecimal)(bnTotalEraStake.divn(currentSelectedValidatorList.length), decimals);
+    for (const validator of allValidatorInfoList) {
       const commissionString = extraInfoMap[validator.address].commission;
       const commission = (0, _utils.getCommission)(commissionString);
-      validator.expectedReturn = this.getValidatorExpectedReturn(this.chain, validator, poolInfo.statistic.totalApy, commission, _stakingRewards, allValidatorAddresses, decimals, totalStakeMap, bnAvgStake);
+
+      // the waiting validator is missing info for calculating APY
+      validator.expectedReturn = currentSelectedValidatorList.includes(validator) ? this.getValidatorExpectedReturn(this.chain, validator, poolInfo.statistic.totalApy, commission, _stakingRewards, allValidatorAddresses, decimals, totalStakeMap, bnAvgStake) : 0;
       validator.commission = commission;
       validator.blocked = extraInfoMap[validator.address].blocked;
       validator.identity = extraInfoMap[validator.address].identity;
       validator.isVerified = extraInfoMap[validator.address].isVerified;
     }
-    return validatorInfoList;
+    return allValidatorInfoList;
   }
   getValidatorExpectedReturn(chain, validator, totalApy, commission, _stakingRewards, allValidatorAddresses, decimals, totalStakeMap, bnAvgStake) {
     if (_constants2._STAKING_CHAIN_GROUP.aleph.includes(chain)) {
@@ -377,10 +380,13 @@ class RelayNativeStakingPoolHandler extends _base.default {
       }
     }
   }
-  parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
+  parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorLedger, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
     const totalStakeMap = {};
     const allValidatorAddresses = [];
-    const validatorInfoList = [];
+    const allValidatorInfo = {
+      currentSelectedValidatorList: [],
+      waitingValidatorList: []
+    };
     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();
@@ -398,7 +404,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
         const otherStake = bnTotalStake.sub(bnOwnStake);
         totalStakeMap[validatorAddress] = bnTotalStake;
         let nominatorCount = 0;
-        if (_constants2._UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
+        if (rawValidatorStat.nominatorCount) {
           nominatorCount = rawValidatorStat.nominatorCount;
         } else {
           if ('others' in rawValidatorStat) {
@@ -409,7 +415,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
           }
         }
         allValidatorAddresses.push(validatorAddress);
-        validatorInfoList.push({
+        allValidatorInfo.currentSelectedValidatorList.push({
           address: validatorAddress,
           totalStake: bnTotalStake.toString(),
           ownStake: bnOwnStake.toString(),
@@ -427,13 +433,13 @@ class RelayNativeStakingPoolHandler extends _base.default {
         });
       }
     }
-    for (const waitingValidator of Object.keys(waitingValidatorList)) {
+    for (const waitingValidator of Object.keys(waitingValidatorLedger)) {
       if (!allValidatorAddresses.includes(waitingValidator)) {
         allValidatorAddresses.push(waitingValidator);
-        validatorInfoList.push({
+        allValidatorInfo.waitingValidatorList.push({
           address: waitingValidator,
-          totalStake: waitingValidatorList[waitingValidator],
-          ownStake: waitingValidatorList[waitingValidator],
+          totalStake: waitingValidatorLedger[waitingValidator],
+          ownStake: waitingValidatorLedger[waitingValidator],
           otherStake: '0',
           nominatorCount: 0,
           // to be added later
@@ -448,7 +454,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
         });
       }
     }
-    return [totalStakeMap, allValidatorAddresses, validatorInfoList];
+    return [totalStakeMap, allValidatorAddresses, allValidatorInfo];
   }
   /* Get pool targets */
 

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

@@ -10,7 +10,6 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
-var _constants2 = require("@subwallet/extension-base/services/earning-service/constants");
 var _types = require("@subwallet/extension-base/types");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -170,7 +169,7 @@ class NominationPoolHandler extends _base.default {
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
         let eraStakerOtherList = [];
-        if (_constants2._UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
+        if (substrateApi.api.query.staking.erasStakersPaged) {
           // todo: review all relaychains later
           const _eraStaker = await substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress);
           eraStakerOtherList = _eraStaker.flatMap(paged => paged[1].toPrimitive().others);

package/cjs/services/migration-service/scripts/MigrateTransactionHistoryBySymbol.js

@@ -14,8 +14,8 @@ class MigrateTransactionHistoryBySymbol extends _Base.default {
     const state = this.state;
     try {
       const changeSlugsMap = {
-        'bobMainnet-LOCAL-wBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3': 'bobMainnet-LOCAL-WBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3',
-        'hydradx_main-LOCAL-LRNA': 'hydradx_main-LOCAL-H2O'
+        'polygon-NATIVE-MATIC': 'polygon-NATIVE-POL',
+        '5irechain_mainnet-NATIVE-5IRE': '5irechain_mainnet-NATIVE-5ire'
       };
       const allTxs = [];
       await Promise.all(Object.entries(changeSlugsMap).map(async (_ref, i) => {