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

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

@@ -32,6 +32,7 @@ var _SettingService = _interopRequireDefault(require("@subwallet/extension-base/
 var _DatabaseService = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/DatabaseService"));
 var _subscanService = require("@subwallet/extension-base/services/subscan-service");
 var _subscanChainMap = require("@subwallet/extension-base/services/subscan-service/subscan-chain-map");
+var _swapService = require("@subwallet/extension-base/services/swap-service");
 var _transactionService = _interopRequireDefault(require("@subwallet/extension-base/services/transaction-service"));
 var _walletConnectService = _interopRequireDefault(require("@subwallet/extension-base/services/wallet-connect-service"));
 var _AccountRef = _interopRequireDefault(require("@subwallet/extension-base/stores/AccountRef"));
@@ -111,6 +112,7 @@ class KoniState {
     this.transactionService = new _transactionService.default(this);
     this.earningService = new _service.default(this);
     this.feeService = new _service2.default(this);
+    this.swapService = new _swapService.SwapService(this);
     this.subscription = new _subscription.KoniSubscription(this, this.dbService);
     this.cron = new _cron.KoniCron(this, this.subscription, this.dbService);
     this.logger = (0, _util.logger)('State');
@@ -234,6 +236,7 @@ class KoniState {
     this.eventService.emit('chain.ready', true);
     await this.balanceService.init();
     await this.earningService.init();
+    await this.swapService.init();
     this.onReady();
     this.onAccountAdd();
     this.onAccountRemove();
@@ -1419,7 +1422,7 @@ class KoniState {
     // Stopping services
     await Promise.all([this.cron.stop(), this.subscription.stop()]);
     await this.pauseAllNetworks(undefined, 'IDLE mode');
-    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop()]);
+    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop(), this.swapService.stop()]);
 
     // Complete sleeping
     sleeping.resolve();
@@ -1452,7 +1455,7 @@ class KoniState {
     }
 
     // Start services
-    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start()]);
+    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start(), this.swapService.start()]);
 
     // Complete starting
     starting.resolve();

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.54-0'
+  version: '1.1.56-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -191,7 +191,8 @@ class BalanceService {
       const chainInfoMap = this.state.chainService.getChainInfoMap();
       const evmApiMap = this.state.chainService.getEvmApiMap();
       const substrateApiMap = this.state.chainService.getSubstrateApiMap();
-      const unsub = (0, _helpers.subscribeBalance)([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, result => {
+      let unsub = _util.noop;
+      unsub = (0, _helpers.subscribeBalance)([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, result => {
         const rs = result[0];
         if (rs.tokenSlug === tSlug) {
           hasError = false;
@@ -203,15 +204,17 @@ class BalanceService {
           if (callback) {
             callback(balance);
           } else {
+            var _unsub;
             // Auto unsubscribe if no callback
-            unsub();
+            (_unsub = unsub) === null || _unsub === void 0 ? void 0 : _unsub();
           }
           resolve([unsub, balance]);
         }
       });
       setTimeout(() => {
         if (hasError) {
-          unsub();
+          var _unsub2;
+          (_unsub2 = unsub) === null || _unsub2 === void 0 ? void 0 : _unsub2();
           reject(new Error((0, _i18next.t)('Failed to get balance. Please check your internet connection or change your network endpoint')));
         }
       }, 9999);

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

@@ -39,7 +39,7 @@ const _BALANCE_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
-  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude', 'continuum_network'],
+  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'hydradx_rococo', 'pendulum', 'amplitude', 'continuum_network'],
   statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
@@ -84,7 +84,8 @@ const _STAKING_ERA_LENGTH_MAP = {
   shiden: 24,
   shibuya: 24,
   bifrost_testnet: 0.5,
-  bifrost: 2,
+  bifrost: 13 * 600 / 3600,
+  // real blocktime of bifros ksm = 13s
   bifrost_dot: 24,
   ternoa: 24,
   calamari: 6,
@@ -101,7 +102,8 @@ const _STAKING_ERA_LENGTH_MAP = {
   goldberg_testnet: 24,
   manta_network: 6,
   krest_network: 4,
-  polimec: 6
+  polimec: 6,
+  enjin_relaychain: 24
 };
 exports._STAKING_ERA_LENGTH_MAP = _STAKING_ERA_LENGTH_MAP;
 const _EXPECTED_BLOCK_TIME = {
@@ -119,7 +121,19 @@ const _EXPECTED_BLOCK_TIME = {
   creditcoin: 12,
   vara_network: 3,
   goldberg_testnet: 20,
-  polimec: 12
+  polimec: 12,
+  bifrost: 13,
+  // expect 12 but actual 13
+  moonbeam: 12,
+  moonriver: 12,
+  moonbase: 6,
+  turing: 12,
+  turingStaging: 12,
+  bifrost_testnet: 3,
+  calamari: 12,
+  calamari_test: 12,
+  manta_network: 12,
+  enjin_relaychain: 6
 };
 exports._EXPECTED_BLOCK_TIME = _EXPECTED_BLOCK_TIME;
 const _PARACHAIN_INFLATION_DISTRIBUTION = {

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

@@ -42,6 +42,7 @@ class ChainService {
   assetRegistrySubject = new _rxjs.Subject();
   multiChainAssetMapSubject = new _rxjs.Subject();
   xcmRefMapSubject = new _rxjs.Subject();
+  swapRefMapSubject = new _rxjs.Subject();
   assetLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.AssetLogoMap);
   chainLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.ChainLogoMap);
   assetMapPatch = JSON.stringify({});
@@ -57,6 +58,7 @@ class ChainService {
     this.chainStateMapSubject.next(this.dataMap.chainStateMap);
     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
     this.xcmRefMapSubject.next(this.xcmRefMap);
+    this.swapRefMapSubject.next(this.swapRefMap);
     if (_utils2.MODULE_SUPPORT.MANTA_ZK) {
       console.log('Init Manta ZK');
       this.mantaChainHandler = new _MantaPrivateHandler.MantaPrivateHandler(dbService);
@@ -65,6 +67,9 @@ class ChainService {
     this.evmChainHandler = new _EvmChainHandler.EvmChainHandler(this);
     this.logger = (0, _logger.logger)('chain-service');
   }
+  subscribeSwapRefMap() {
+    return this.swapRefMapSubject;
+  }
 
   // Getter
   get xcmRefMap() {
@@ -77,6 +82,16 @@ class ChainService {
     });
     return result;
   }
+  get swapRefMap() {
+    const result = {};
+    Object.entries(this.dataMap.assetRefMap).forEach(_ref2 => {
+      let [key, assetRef] = _ref2;
+      if (assetRef.path === _types._AssetRefPath.SWAP) {
+        result[key] = assetRef;
+      }
+    });
+    return result;
+  }
   getEvmApi(slug) {
     return this.evmChainHandler.getEvmApiByChain(slug);
   }
@@ -200,11 +215,11 @@ class ChainService {
     return this.getChainStatusMap()[key];
   }
   getActiveChains() {
-    return Object.entries(this.dataMap.chainStateMap).filter(_ref2 => {
-      let [, chainState] = _ref2;
+    return Object.entries(this.dataMap.chainStateMap).filter(_ref3 => {
+      let [, chainState] = _ref3;
       return (0, _utils._isChainEnabled)(chainState);
-    }).map(_ref3 => {
-      let [key] = _ref3;
+    }).map(_ref4 => {
+      let [key] = _ref4;
       return key;
     });
   }
@@ -364,8 +379,8 @@ class ChainService {
     (0, _utils2.addLazy)('updateChainConnectionStatus', () => {
       const chainStatusMap = this.getChainStatusMap();
       let update = false;
-      Object.entries(this.connectionStatusQueueMap).forEach(_ref4 => {
-        let [slug, status] = _ref4;
+      Object.entries(this.connectionStatusQueueMap).forEach(_ref5 => {
+        let [slug, status] = _ref5;
         if (chainStatusMap[slug]) {
           if (chainStatusMap[slug].connectionStatus !== status) {
             chainStatusMap[slug].connectionStatus = status;
@@ -497,12 +512,13 @@ class ChainService {
     });
     this.dataMap.assetRefMap = updatedAssetRefMap;
     this.xcmRefMapSubject.next(this.xcmRefMap);
+    this.swapRefMapSubject.next(this.swapRefMap);
     this.logger.log('Finished updating latest asset ref');
   }
   handleLatestPriceId(latestPriceIds) {
     let isUpdated = false;
-    Object.entries(latestPriceIds).forEach(_ref5 => {
-      let [slug, priceId] = _ref5;
+    Object.entries(latestPriceIds).forEach(_ref6 => {
+      let [slug, priceId] = _ref6;
       if (this.dataMap.assetRegistry[slug] && this.dataMap.assetRegistry[slug].priceId !== priceId) {
         isUpdated = true;
         this.dataMap.assetRegistry[slug].priceId = priceId;
@@ -581,8 +597,8 @@ class ChainService {
     }
   }
   handleLatestData() {
-    this.fetchLatestAssetData().then(_ref6 => {
-      let [latestAssetInfo, latestAssetLogoMap] = _ref6;
+    this.fetchLatestAssetData().then(_ref7 => {
+      let [latestAssetInfo, latestAssetLogoMap] = _ref7;
       this.eventService.waitAssetReady.then(() => {
         this.handleLatestAssetData(latestAssetInfo, latestAssetLogoMap);
       }).catch(console.error);
@@ -590,8 +606,8 @@ class ChainService {
     this.fetchLatestChainData().then(latestChainInfo => {
       this.handleLatestChainData(latestChainInfo);
     }).catch(console.error);
-    this.fetchLatestAssetRef().then(_ref7 => {
-      let [latestAssetRef, latestAssetRefMap] = _ref7;
+    this.fetchLatestAssetRef().then(_ref8 => {
+      let [latestAssetRef, latestAssetRefMap] = _ref8;
       this.handleLatestAssetRef(latestAssetRef, latestAssetRefMap);
     }).catch(console.error);
     this.fetchLatestPriceIdsData().then(latestPriceIds => {
@@ -601,12 +617,12 @@ class ChainService {
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
     const chainStateMap = this.getChainStateMap();
-    await Promise.all(Object.entries(chainInfoMap).filter(_ref8 => {
+    await Promise.all(Object.entries(chainInfoMap).filter(_ref9 => {
       var _chainStateMap$slug;
-      let [slug] = _ref8;
+      let [slug] = _ref9;
       return (_chainStateMap$slug = chainStateMap[slug]) === null || _chainStateMap$slug === void 0 ? void 0 : _chainStateMap$slug.active;
-    }).map(_ref9 => {
-      let [, chainInfo] = _ref9;
+    }).map(_ref10 => {
+      let [, chainInfo] = _ref10;
       try {
         return this.initApiForChain(chainInfo);
       } catch (e) {
@@ -949,8 +965,8 @@ class ChainService {
       }
 
       // Fill in the missing chainState and storageData (new chains never before seen)
-      Object.entries(mergedChainInfoMap).forEach(_ref10 => {
-        let [slug, chainInfo] = _ref10;
+      Object.entries(mergedChainInfoMap).forEach(_ref11 => {
+        let [slug, chainInfo] = _ref11;
         if (!(slug in this.dataMap.chainStateMap)) {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
@@ -1633,5 +1649,10 @@ class ChainService {
     }
     return result;
   }
+  getFeeTokensByChain(chainSlug) {
+    return Object.values(this.getAssetRegistry()).filter(chainAsset => {
+      return chainAsset.originChain === chainSlug && (chainAsset.assetType === _types._AssetType.NATIVE || (0, _utils._isAssetCanPayTxFee)(chainAsset));
+    }).map(chainAsset => chainAsset.slug);
+  }
 }
 exports.ChainService = ChainService;

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

@@ -55,6 +55,7 @@ var _exportNames = {
   _isAssetValuable: true,
   _getMultiChainAsset: true,
   _getAssetPriceId: true,
+  _getAssetName: true,
   _getMultiChainAssetPriceId: true,
   _getAssetSymbol: true,
   _getMultiChainAssetSymbol: true,
@@ -73,11 +74,13 @@ var _exportNames = {
   findChainInfoByChainId: true,
   _isMantaZkAsset: true,
   randomizeProvider: true,
+  _isAssetCanPayTxFee: true,
   updateLatestChainInfo: true
 };
 exports._checkSmartContractSupportByChain = _checkSmartContractSupportByChain;
 exports._generateCustomProviderKey = _generateCustomProviderKey;
 exports._getAssetDecimals = _getAssetDecimals;
+exports._getAssetName = _getAssetName;
 exports._getAssetOriginChain = _getAssetOriginChain;
 exports._getAssetPriceId = _getAssetPriceId;
 exports._getAssetSymbol = _getAssetSymbol;
@@ -108,6 +111,7 @@ exports._getXcmAssetMultilocation = _getXcmAssetMultilocation;
 exports._getXcmAssetType = _getXcmAssetType;
 exports._getXcmTransferType = _getXcmTransferType;
 exports._isAssetAutoEnable = void 0;
+exports._isAssetCanPayTxFee = _isAssetCanPayTxFee;
 exports._isAssetFungibleToken = _isAssetFungibleToken;
 exports._isAssetSmartContractNft = _isAssetSmartContractNft;
 exports._isAssetValuable = _isAssetValuable;
@@ -439,6 +443,9 @@ function _getMultiChainAsset(assetInfo) {
 function _getAssetPriceId(assetInfo) {
   return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.priceId) || '';
 }
+function _getAssetName(assetInfo) {
+  return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.name) || '';
+}
 function _getMultiChainAssetPriceId(multiChainAsset) {
   return (multiChainAsset === null || multiChainAsset === void 0 ? void 0 : multiChainAsset.priceId) || '';
 }
@@ -449,13 +456,13 @@ function _getMultiChainAssetSymbol(multiChainAsset) {
   return multiChainAsset.symbol;
 }
 function _getAssetOriginChain(assetInfo) {
-  return assetInfo.originChain;
+  return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.originChain) || '';
 }
 function _getChainName(chainInfo) {
   return chainInfo.name;
 }
 function _getAssetDecimals(assetInfo) {
-  return assetInfo.decimals || 0;
+  return (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo.decimals) || 0;
 }
 function _getBlockExplorerFromChain(chainInfo) {
   let blockExplorer;
@@ -557,6 +564,10 @@ function randomizeProvider(providers, excludedKeys) {
     providerValue: selectedProviderValue
   };
 }
+function _isAssetCanPayTxFee(chainAsset) {
+  var _ref, _chainAsset$metadata;
+  return (_ref = (_chainAsset$metadata = chainAsset.metadata) === null || _chainAsset$metadata === void 0 ? void 0 : _chainAsset$metadata.canPayTxFee) !== null && _ref !== void 0 ? _ref : false;
+}
 function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
   const currentChainInfoMap = currentDataMap.chainInfoMap;
   const currentChainStateMap = currentDataMap.chainStateMap;
@@ -569,8 +580,8 @@ function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
     let needUpdate = false;
     if (currentChainInfo && currentChainState) {
       const preservedProvider = {};
-      Object.entries(currentChainInfo.providers).forEach(_ref => {
-        let [providerKey, providerValue] = _ref;
+      Object.entries(currentChainInfo.providers).forEach(_ref2 => {
+        let [providerKey, providerValue] = _ref2;
         if (providerValue !== null && providerValue !== void 0 && providerValue.startsWith('light') || providerKey !== null && providerKey !== void 0 && providerKey.startsWith(_types2._CUSTOM_PREFIX)) {
           preservedProvider[providerKey] = providerValue;
         }

package/cjs/services/chain-service/utils/patch.js

@@ -12,7 +12,7 @@ var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
-const ChainListVersion = '0.2.54';
+const ChainListVersion = '0.2.55';
 async function fetchPatchData(slug) {
   try {
     const fetchPromise = (0, _crossFetch.default)(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._STAKING_CHAIN_GROUP = exports.ST_LIQUID_TOKEN_ABI = 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
 
@@ -24,9 +24,11 @@ const _STAKING_CHAIN_GROUP = {
   krest_network: ['krest_network'],
   manta: ['manta_network']
 };
+exports._STAKING_CHAIN_GROUP = _STAKING_CHAIN_GROUP;
+const MaxEraRewardPointsEras = 14;
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
-exports._STAKING_CHAIN_GROUP = _STAKING_CHAIN_GROUP;
+exports.MaxEraRewardPointsEras = MaxEraRewardPointsEras;
 const ST_LIQUID_TOKEN_ABI = require('./abis/st_liquid_token_abi.json');
 exports.ST_LIQUID_TOKEN_ABI = ST_LIQUID_TOKEN_ABI;
 const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;

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

@@ -137,27 +137,25 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
         });
       }
       if (hasUnstakingInfo) {
-        const _currentBlockInfo = await substrateApi.api.rpc.chain.getHeader();
-        const currentBlockInfo = _currentBlockInfo.toPrimitive();
-        const currentBlockNumber = currentBlockInfo.number;
+        const [_currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
+        const currentBlock = _currentBlock.toPrimitive();
+        const currentTimestamp = _currentTimestamp.toPrimitive();
         const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
         const blockPerRound = parseFloat(_blockPerRound);
         for (const [unstakingBlock, unstakingAmount] of Object.entries(unstakingInfo)) {
           const blockDuration = (_constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
 
-          const isClaimable = parseInt(unstakingBlock) - currentBlockNumber < 0;
-          const remainingBlock = parseInt(unstakingBlock) - currentBlockNumber;
+          const isClaimable = parseInt(unstakingBlock) - currentBlock <= 0;
+          const remainingBlock = parseInt(unstakingBlock) - currentBlock;
           const waitingTime = remainingBlock * blockDuration;
-          // const currentTimestampMs = Date.now();
-          // const targetTimestampMs = currentTimestampMs + waitingTime * 60 * 60 * 1000;
-
+          const targetTimestampMs = remainingBlock * blockDuration * 3600 * 1000 + currentTimestamp;
           unstakingBalance = unstakingAmount.toString();
           unstakingList.push({
             chain: chainInfo.slug,
             status: isClaimable ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
             claimable: unstakingAmount.toString(),
             waitingTime,
-            // targetTimestampMs: targetTimestampMs,
+            targetTimestampMs: targetTimestampMs,
             validatorAddress: undefined
           });
         }

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

@@ -250,11 +250,12 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
     };
   }
   async subscribePoolPosition(useAddresses, resultCallback) {
+    var _substrateApi$api$que;
     let cancel = false;
     const substrateApi = await this.substrateApi.isReady;
     const defaultInfo = this.baseInfo;
     const chainInfo = this.chainInfo;
-    const unsub = await substrateApi.api.query.dappsStaking.ledger.multi(useAddresses, async ledgers => {
+    const unsub = await ((_substrateApi$api$que = substrateApi.api.query.dappsStaking) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.ledger.multi(useAddresses, async ledgers => {
       if (cancel) {
         unsub();
         return;
@@ -288,10 +289,10 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
           }
         }));
       }
-    });
+    }));
     return () => {
       cancel = true;
-      unsub();
+      unsub && unsub();
     };
   }
 

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

@@ -144,7 +144,9 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
     const roundInfo = _roundInfo.toPrimitive();
     const currentRound = roundInfo.current;
     await Promise.all(delegatorState.delegations.map(async delegation => {
-      const [_delegationScheduledRequests, [identity], _collatorInfo] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (0, _utils2.parseIdentity)(substrateApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
+      const [_delegationScheduledRequests, [identity], _collatorInfo, _currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (0, _utils2.parseIdentity)(substrateApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner), substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
+      const currentBlock = _currentBlock.toPrimitive();
+      const currentTimestamp = _currentTimestamp.toPrimitive();
       const collatorInfo = _collatorInfo.toPrimitive();
       const minDelegation = collatorInfo === null || collatorInfo === void 0 ? void 0 : collatorInfo.lowestTopDelegationAmount.toString();
       const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
@@ -156,22 +158,23 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
         for (const scheduledRequest of delegationScheduledRequests) {
           if ((0, _utils3.reformatAddress)(scheduledRequest.delegator, 0) === (0, _utils3.reformatAddress)(address, 0)) {
             // add network prefix
-            const isClaimable = scheduledRequest.whenExecutable - currentRound <= 0;
-            const remainingEra = scheduledRequest.whenExecutable - currentRound;
+            const isClaimable = scheduledRequest.whenExecutable - parseInt(currentRound) <= 0;
+            const remainingEra = scheduledRequest.whenExecutable - parseInt(currentRound);
             const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
             const claimable = Object.values(scheduledRequest.action)[0];
-            // const currentTimestampMs = Date.now();
-            // const targetTimestampMs = currentTimestampMs + waitingTime * 60 * 60 * 1000;
 
+            // noted: target timestamp in parachainStaking easily volatile if block time volatile
+            const targetBlock = remainingEra * parseInt(roundInfo.length) + parseInt(roundInfo.first);
+            const remainingBlock = targetBlock - currentBlock;
+            const targetTimestampMs = remainingBlock * _constants._EXPECTED_BLOCK_TIME[chainInfo.slug] * 1000 + currentTimestamp;
             unstakingMap[delegation.owner] = {
               chain: chainInfo.slug,
               status: isClaimable ? _types.UnstakingStatus.CLAIMABLE : _types.UnstakingStatus.UNLOCKING,
               validatorAddress: delegation.owner,
               claimable: claimable.toString(),
-              waitingTime
-              // targetTimestampMs: targetTimestampMs
+              waitingTime,
+              targetTimestampMs: targetTimestampMs
             };
-
             hasUnstaking = true;
             break; // only handle 1 scheduledRequest per collator
           }

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

@@ -281,11 +281,23 @@ class RelayNativeStakingPoolHandler extends _base.default {
     if (!poolInfo || !poolInfo.statistic) {
       return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR));
     }
-    const _era = await chainApi.api.query.staking.currentEra();
+    const [_era, _activeEraInfo] = await Promise.all([chainApi.api.query.staking.currentEra(), chainApi.api.query.staking.activeEra()]);
     const currentEra = _era.toString();
+    const activeEraInfo = _activeEraInfo.toPrimitive();
+    const activeEra = activeEraInfo.index;
     const allValidators = [];
     const validatorInfoList = [];
-    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators] = 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()]);
+    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))]);
+    const eraRewardMap = {};
+    for (const item of _eraRewardPoints[0]) {
+      eraRewardMap[startEraForPoints] = item.toHuman();
+      startEraForPoints++;
+    }
+    const validatorPointsMap = (0, _utils.getValidatorPointsMap)(eraRewardMap);
+    const topValidatorList = (0, _utils.getTopValidatorByPoints)(validatorPointsMap);
 
     // filter blocked validators
     const validators = _validators;
@@ -316,6 +328,11 @@ class RelayNativeStakingPoolHandler extends _base.default {
       const rawValidatorStat = item[1].toHuman();
       const validatorAddress = rawValidatorInfo[1];
       if (!blockValidatorList.includes(validatorAddress)) {
+        var _validatorPointsMap$v;
+        let isTopQuartile = false;
+        if (topValidatorList.includes(validatorAddress)) {
+          isTopQuartile = true;
+        }
         const rawTotalStake = rawValidatorStat.total;
         const rawOwnStake = rawValidatorStat.own;
         const bnTotalStake = new _util.BN(rawTotalStake.replaceAll(',', ''));
@@ -340,7 +357,9 @@ class RelayNativeStakingPoolHandler extends _base.default {
           blocked: false,
           isVerified: false,
           minBond,
-          isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded)
+          isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded),
+          eraRewardPoint: ((_validatorPointsMap$v = validatorPointsMap[validatorAddress]) !== null && _validatorPointsMap$v !== void 0 ? _validatorPointsMap$v : _util.BN_ZERO).toString(),
+          topQuartile: isTopQuartile
         });
       }
     }

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

@@ -166,11 +166,25 @@ class NominationPoolHandler extends _base.default {
     if (nominations) {
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
-        const _eraStaker = await substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress);
-        const eraStaker = _eraStaker.toPrimitive();
-        const sortedNominators = eraStaker.others.sort((a, b) => {
-          return new _bignumber.default(b.value).minus(a.value).toNumber();
-        });
+        let sortedNominators = [];
+        if (['kusama'].includes(this.chain)) {
+          // todo: hot fix for kusama first, we'll 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();
+          });
+        } 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();
+          });
+        }
         const topNominators = sortedNominators.map(nominator => {
           return nominator.who;
         }).slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator);

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

@@ -404,7 +404,6 @@ class EarningService {
     const removeKeys = [];
     chains && chains.length > 0 && Object.entries(this.yieldPositionSubject.getValue()).forEach(_ref => {
       let [key, value] = _ref;
-      console.log('removeYieldPositions', key, value.chain, chains.indexOf(value.chain) > -1);
       if (chains.indexOf(value.chain) > -1 && !removeKeys.includes(key)) {
         removeKeys.push(key);
       }

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

@@ -14,23 +14,10 @@ class MigrateTransactionHistoryBySymbol extends _Base.default {
     const state = this.state;
     try {
       const changeSlugsMap = {
-        'ethereum-ERC20-WFTM-0x4E15361FD6b4BB609Fa63C81A2be19d873717870': 'ethereum-ERC20-FTM-0x4E15361FD6b4BB609Fa63C81A2be19d873717870',
-        'moonbeam-ERC20-CSG-0x2Dfc76901bB2ac2A5fA5fc479590A490BBB10a5F': 'moonbeam-ERC20-CGS-0x2Dfc76901bB2ac2A5fA5fc479590A490BBB10a5F',
-        'astar-LOCAL-aUSD': 'astar-LOCAL-aSEED',
-        'astarEvm-ERC20-aUSD-0xfFFFFfFF00000000000000010000000000000001': 'astarEvm-ERC20-aSEED-0xfFFFFfFF00000000000000010000000000000001',
-        'moonriver-LOCAL-xcaUSD': 'moonriver-LOCAL-xcaSeed',
-        'moonriver-LOCAL-xckBTC': 'moonriver-LOCAL-xcKBTC',
-        'bifrost-LOCAL-aUSD': 'bifrost-LOCAL-KUSD',
-        'calamari-LOCAL-aUSD': 'calamari-LOCAL-AUSD',
-        'shiden-LOCAL-aUSD': 'shiden-LOCAL-aSEED',
-        'shidenEvm-ERC20-aUSD-0xfFFfFFfF00000000000000010000000000000000': 'shidenEvm-ERC20-aSEED-0xfFFfFFfF00000000000000010000000000000000',
-        'ethereum_goerli-NATIVE-GoerliETH': 'ethereum_goerli-NATIVE-ETH',
-        'binance_test-NATIVE-BNB': 'binance_test-NATIVE-tBNB',
-        'pangolin-LOCAL-CKTON': 'pangolin-LOCAL-PKTON',
-        'zeta_test-NATIVE-aZETA': 'zeta_test-NATIVE-ZETA',
-        'origintrail-NATIVE-OTP': 'origintrail-NATIVE-NEURO',
-        'moonbeam-LOCAL-xciBTC': 'moonbeam-LOCAL-xcIBTC',
-        'tomochain-NATIVE-TOMO': 'tomochain-NATIVE-VIC'
+        'moonbeam-LOCAL-xcaUSD': 'moonbeam-LOCAL-xcaSEED',
+        'calamari-LOCAL-AUSD': 'calamari-LOCAL-aSEED',
+        'moonriver-LOCAL-xcaSeed': 'moonriver-LOCAL-xcaSEED',
+        'bifrost-LOCAL-KUSD': 'bifrost-LOCAL-aSEED'
       };
       const allTxs = [];
       await Promise.all(Object.entries(changeSlugsMap).map(async (_ref, i) => {

package/cjs/services/migration-service/scripts/databases/MigrateAssetSetting.js

@@ -13,23 +13,10 @@ class MigrateAssetSetting extends _Base.default {
   async run() {
     try {
       const changeSlugsMap = {
-        'ethereum-ERC20-WFTM-0x4E15361FD6b4BB609Fa63C81A2be19d873717870': 'ethereum-ERC20-FTM-0x4E15361FD6b4BB609Fa63C81A2be19d873717870',
-        'moonbeam-ERC20-CSG-0x2Dfc76901bB2ac2A5fA5fc479590A490BBB10a5F': 'moonbeam-ERC20-CGS-0x2Dfc76901bB2ac2A5fA5fc479590A490BBB10a5F',
-        'astar-LOCAL-aUSD': 'astar-LOCAL-aSEED',
-        'astarEvm-ERC20-aUSD-0xfFFFFfFF00000000000000010000000000000001': 'astarEvm-ERC20-aSEED-0xfFFFFfFF00000000000000010000000000000001',
-        'moonriver-LOCAL-xcaUSD': 'moonriver-LOCAL-xcaSeed',
-        'moonriver-LOCAL-xckBTC': 'moonriver-LOCAL-xcKBTC',
-        'bifrost-LOCAL-aUSD': 'bifrost-LOCAL-KUSD',
-        'calamari-LOCAL-aUSD': 'calamari-LOCAL-AUSD',
-        'shiden-LOCAL-aUSD': 'shiden-LOCAL-aSEED',
-        'shidenEvm-ERC20-aUSD-0xfFFfFFfF00000000000000010000000000000000': 'shidenEvm-ERC20-aSEED-0xfFFfFFfF00000000000000010000000000000000',
-        'ethereum_goerli-NATIVE-GoerliETH': 'ethereum_goerli-NATIVE-ETH',
-        'binance_test-NATIVE-BNB': 'binance_test-NATIVE-tBNB',
-        'pangolin-LOCAL-CKTON': 'pangolin-LOCAL-PKTON',
-        'zeta_test-NATIVE-aZETA': 'zeta_test-NATIVE-ZETA',
-        'origintrail-NATIVE-OTP': 'origintrail-NATIVE-NEURO',
-        'moonbeam-LOCAL-xciBTC': 'moonbeam-LOCAL-xcIBTC',
-        'tomochain-NATIVE-TOMO': 'tomochain-NATIVE-VIC'
+        'moonbeam-LOCAL-xcaUSD': 'moonbeam-LOCAL-xcaSEED',
+        'calamari-LOCAL-AUSD': 'calamari-LOCAL-aSEED',
+        'moonriver-LOCAL-xcaSeed': 'moonriver-LOCAL-xcaSEED',
+        'bifrost-LOCAL-KUSD': 'bifrost-LOCAL-aSEED'
       };
       const assetSetting = await this.state.chainService.getAssetSettings();
       const migratedAssetSetting = {};