@subwallet/extension-base 1.1.51-2 → 1.1.53-0

package/cjs/koni/api/tokens/evm/balance.js

@@ -7,8 +7,7 @@ exports.getEVMBalance = getEVMBalance;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-async function getEVMBalance(networkKey, addresses, evmApiMap) {
-  const web3Api = evmApiMap[networkKey];
+async function getEVMBalance(networkKey, addresses, web3Api) {
   return await Promise.all(addresses.map(async address => {
     try {
       return await web3Api.api.eth.getBalance(address);

package/cjs/koni/api/tokens/evm/transfer.js

@@ -46,10 +46,9 @@ const handleTransferBalanceResult = _ref => {
   callback(response);
 };
 exports.handleTransferBalanceResult = handleTransferBalanceResult;
-async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, evmApiMap) {
+async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, web3Api) {
   var _priority$maxFeePerGa, _priority$maxPriority;
   const networkKey = chainInfo.slug;
-  const web3Api = evmApiMap[networkKey];
   const priority = await (0, _utils.calculateGasFeeParams)(web3Api, networkKey);
   const transactionObject = {
     to: to,
@@ -75,11 +74,10 @@ async function getEVMTransactionObject(chainInfo, from, to, value, transferAll,
   }
   return [transactionObject, transactionObject.value.toString()];
 }
-async function getERC20TransactionObject(assetAddress, chainInfo, from, to, value, transferAll, evmApiMap) {
+async function getERC20TransactionObject(assetAddress, chainInfo, from, to, value, transferAll, evmApi) {
   var _priority$maxFeePerGa2, _priority$maxPriority2;
   const networkKey = chainInfo.slug;
-  const evmApi = evmApiMap[networkKey];
-  const erc20Contract = (0, _web.getERC20Contract)(networkKey, assetAddress, evmApiMap);
+  const erc20Contract = (0, _web.getERC20Contract)(assetAddress, evmApi);
   let freeAmount = new _bignumber.default(0);
   let transferValue = value;
   if (transferAll) {

package/cjs/koni/api/tokens/evm/web3.js

@@ -8,10 +8,10 @@ var _helper = require("@subwallet/extension-base/services/chain-service/helper")
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const getERC20Contract = function (networkKey, assetAddress, evmApiMap) {
-  let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+const getERC20Contract = function (assetAddress, evmApi) {
+  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   // @ts-ignore
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
-  return new evmApiMap[networkKey].api.eth.Contract(_helper._ERC20_ABI, assetAddress, options);
+  return new evmApi.api.eth.Contract(_helper._ERC20_ABI, assetAddress, options);
 };
 exports.getERC20Contract = getERC20Contract;

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

@@ -1079,11 +1079,11 @@ class KoniExtension {
     return this.getPrice();
   }
   async getBalance(reset) {
-    return this.#koniState.getBalance(reset);
+    return this.#koniState.balanceService.getBalance(reset);
   }
   async subscribeBalance(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
-    const balanceSubscription = this.#koniState.subscribeBalance().subscribe({
+    const balanceSubscription = this.#koniState.balanceService.subscribeBalanceMap().subscribe({
       next: rs => {
         const data = {
           details: rs
@@ -1619,12 +1619,13 @@ class KoniExtension {
         // TODO: review this
         chainType = _KoniTypes.ChainType.EVM;
         const txVal = transferAll ? freeBalance.value : value || '0';
+        const evmApi = evmApiMap[networkKey];
 
         // Estimate with EVM API
         if ((0, _utils2._isTokenEvmSmartContract)(tokenInfo) || (0, _utils2._isLocalToken)(tokenInfo)) {
-          [transaction, transferAmount.value] = await (0, _transfer3.getERC20TransactionObject)((0, _utils2._getContractAddressOfToken)(tokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApiMap);
+          [transaction, transferAmount.value] = await (0, _transfer3.getERC20TransactionObject)((0, _utils2._getContractAddressOfToken)(tokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApi);
         } else {
-          [transaction, transferAmount.value] = await (0, _transfer3.getEVMTransactionObject)(chainInfo, from, to, txVal, !!transferAll, evmApiMap);
+          [transaction, transferAmount.value] = await (0, _transfer3.getEVMTransactionObject)(chainInfo, from, to, txVal, !!transferAll, evmApi);
         }
       } else if ((0, _utils2._isMantaZkAsset)(tokenInfo)) {
         // TODO

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

@@ -11,7 +11,6 @@ var _subscriptions = require("@subwallet/extension-base/background/handlers/subs
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
 var _balanceService = require("@subwallet/extension-base/services/balance-service");
-var _BalanceMapImpl = require("@subwallet/extension-base/services/balance-service/BalanceMapImpl");
 var _types = require("@subwallet/extension-base/services/base/types");
 var _buyService = _interopRequireDefault(require("@subwallet/extension-base/services/buy-service"));
 var _campaignService = _interopRequireDefault(require("@subwallet/extension-base/services/campaign-service"));
@@ -72,7 +71,6 @@ class KoniState {
   unsubscriptionMap = {};
   accountRefStore = new _AccountRef.default();
   externalRequest = {};
-  balanceMap = new _BalanceMapImpl.BalanceMapImpl();
   crowdloanMap = generateDefaultCrowdloanMap();
   crowdloanSubject = new _rxjs.Subject();
   nftSubject = new _rxjs.Subject();
@@ -234,6 +232,7 @@ class KoniState {
     await this.migrationService.run();
     this.campaignService.init();
     this.eventService.emit('chain.ready', true);
+    await this.balanceService.init();
     await this.earningService.init();
     this.onReady();
     this.onAccountAdd();
@@ -689,35 +688,6 @@ class KoniState {
   getAllAddresses() {
     return _uiKeyring.keyring.getAccounts().map(account => account.address);
   }
-  async removeInactiveChainBalances() {
-    const assetSettings = await this.chainService.getAssetSettings();
-    this.balanceMap.removeBalanceItemByFilter(item => {
-      return !assetSettings[item.tokenSlug];
-    });
-  }
-  async getBalance(reset) {
-    await this.removeInactiveChainBalances();
-    return {
-      details: this.balanceMap.map,
-      reset
-    };
-  }
-  async getStoredBalance(address) {
-    return await this.dbService.stores.balance.getBalanceMapByAddresses(address);
-  }
-  isFirstLoad = true;
-  async handleResetBalance(newAddress, forceRefresh) {
-    if (this.isFirstLoad) {
-      const backupBalanceData = await this.dbService.getStoredBalance();
-      this.balanceMap.updateBalanceItems(backupBalanceData, (0, _utils3.isAccountAll)(newAddress));
-      this.isFirstLoad = false;
-    }
-    if (forceRefresh) {
-      this.balanceMap.setData({});
-      await this.dbService.stores.balance.clear();
-    }
-    await Promise.all([this.removeInactiveChainBalances()]);
-  }
   async resetCrowdloanMap(newAddress) {
     const defaultData = generateDefaultCrowdloanMap();
     const storedData = await this.getStoredCrowdloan(newAddress);
@@ -739,36 +709,6 @@ class KoniState {
       });
     });
   }
-  balanceUpdateCache = [];
-
-  /** Note: items must be same tokenSlug */
-  setBalanceItem(items) {
-    if (items.length) {
-      const nowTime = new Date().getTime();
-      for (const item of items) {
-        const balance = {
-          timestamp: nowTime,
-          ...item
-        };
-        this.balanceUpdateCache.push(balance);
-      }
-      (0, _utils3.addLazy)('updateBalanceStore', () => {
-        const isAllAccount = (0, _utils3.isAccountAll)(this.keyringService.currentAccount.address);
-        this.balanceMap.updateBalanceItems(this.balanceUpdateCache, isAllAccount);
-        if (isAllAccount) {
-          this.balanceUpdateCache = [...this.balanceUpdateCache, ...Object.values(this.balanceMap.map[_constants.ALL_ACCOUNT_KEY])];
-        }
-        this.updateBalanceStore(this.balanceUpdateCache);
-        this.balanceUpdateCache = [];
-      }, 300, 1800);
-    }
-  }
-  updateBalanceStore(items) {
-    this.dbService.updateBulkBalanceStore(items).catch(e => this.logger.warn(e));
-  }
-  subscribeBalance() {
-    return this.balanceMap.mapSubject;
-  }
   getCrowdloan(reset) {
     return {
       details: this.crowdloanMap,
@@ -1479,7 +1419,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.earningService.stop()]);
+    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop()]);
 
     // Complete sleeping
     sleeping.resolve();
@@ -1512,7 +1452,7 @@ class KoniState {
     }
 
     // Start services
-    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.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()]);
 
     // Complete starting
     starting.resolve();
@@ -1558,11 +1498,6 @@ class KoniState {
 
       const stores = this.dbService.stores;
 
-      // Remove Balance
-      stores.balance.removeAllByAddress(address).catch(console.error);
-      stores.balance.removeAllByAddress(_constants.ALL_ACCOUNT_KEY).catch(console.error);
-      this.balanceMap.removeBalanceItems([address, _constants.ALL_ACCOUNT_KEY]);
-
       // Remove NFT
       stores.nft.deleteNftByAddress([address]).catch(console.error);
 
@@ -1580,7 +1515,7 @@ class KoniState {
     return true;
   }
   async reloadBalance() {
-    await this.subscription.reloadBalance();
+    await this.balanceService.reloadBalance();
     return true;
   }
   async reloadCrowdloan() {
@@ -1605,9 +1540,11 @@ class KoniState {
   }
   async resetWallet(resetAll) {
     await this.keyringService.resetWallet(resetAll);
+    await this.earningService.resetYieldPosition();
+    await this.balanceService.handleResetBalance(true);
     this.requestService.resetWallet();
     this.transactionService.resetWallet();
-    await this.handleResetBalance(_constants.ALL_ACCOUNT_KEY, true);
+    // await this.handleResetBalance(ALL_ACCOUNT_KEY, true);
     await this.earningService.resetWallet();
     await this.dbService.resetWallet(resetAll);
     this.accountRefStore.set('refList', []);
@@ -1720,7 +1657,7 @@ class KoniState {
         };
         balanceItem.free = ((_zkBalances$i = zkBalances[i]) === null || _zkBalances$i === void 0 ? void 0 : _zkBalances$i.toString()) || '0';
         balanceItem.state = _KoniTypes.APIItemState.READY;
-        this.setBalanceItem([balanceItem]);
+        this.balanceService.setBalanceItem([balanceItem]);
       }
     }).catch(console.warn);
   }

package/cjs/koni/background/subscription.js

@@ -5,12 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.KoniSubscription = void 0;
 var _crowdloan = require("@subwallet/extension-base/koni/api/dotsama/crowdloan");
-var _staking = require("@subwallet/extension-base/koni/api/staking");
 var _handlers = require("@subwallet/extension-base/koni/background/handlers");
-var _balance = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/balance");
-var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/services/event-service/types");
-var _utils2 = require("@subwallet/extension-base/utils");
+var _utils = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -53,7 +50,6 @@ class KoniSubscription {
     await Promise.all([this.state.eventService.waitCryptoReady, this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
     const currentAddress = (_this$state$keyringSe = this.state.keyringService.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.address;
     if (currentAddress) {
-      this.subscribeBalances(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
       this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
     }
     this.eventHandler = (events, eventTypes) => {
@@ -67,7 +63,6 @@ class KoniSubscription {
       if (!address) {
         return;
       }
-      this.subscribeBalances(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
       this.subscribeCrowdloans(address, serviceInfo.chainApiMap.substrate);
     };
     this.state.eventService.onLazy(this.eventHandler.bind(this));
@@ -80,15 +75,6 @@ class KoniSubscription {
     this.stopAllSubscription();
     return Promise.resolve();
   }
-  subscribeBalances(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
-    const addresses = this.state.getDecodedAddresses(address);
-    if (!addresses.length) {
-      return;
-    }
-    this.state.handleResetBalance(address).then(() => {
-      this.updateSubscription('balance', this.initBalanceSubscription(addresses, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime));
-    }).catch(err => this.logger.warn(err));
-  }
   subscribeCrowdloans(address, substrateApiMap, onlyRunOnFirstTime) {
     const addresses = this.state.getDecodedAddresses(address);
     if (!addresses.length) {
@@ -98,27 +84,6 @@ class KoniSubscription {
       this.updateSubscription('crowdloan', this.initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
     }).catch(console.error);
   }
-  initBalanceSubscription(addresses, chainInfoMap, chainStateMap, substrateApiMap, evmApiMap, onlyRunOnFirstTime) {
-    const filteredChainInfoMap = {};
-    Object.values(chainStateMap).forEach(chainState => {
-      if (chainState.active) {
-        filteredChainInfoMap[chainState.slug] = chainInfoMap[chainState.slug];
-      }
-    });
-    const unsub = (0, _balance.subscribeBalance)(addresses, filteredChainInfoMap, substrateApiMap, evmApiMap, result => {
-      this.state.setBalanceItem(result);
-    });
-    const unsub2 = this.state.subscribeMantaPayBalance();
-    if (onlyRunOnFirstTime) {
-      unsub && unsub();
-      unsub2 && unsub2();
-      return;
-    }
-    return () => {
-      unsub && unsub();
-      unsub2 && unsub2();
-    };
-  }
   initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime) {
     const subscriptionPromise = (0, _crowdloan.subscribeCrowdloan)(addresses, substrateApiMap, (networkKey, rs) => {
       this.state.setCrowdloanItem(networkKey, rs);
@@ -150,36 +115,11 @@ class KoniSubscription {
       return _this.state.setNftCollection(...arguments);
     }).catch(this.logger.log);
   }
-  async subscribeStakingReward(address) {
-    const addresses = this.state.getDecodedAddresses(address);
-    if (!addresses.length) {
-      return;
-    }
-    const chainInfoMap = this.state.getChainInfoMap();
-    const targetNetworkMap = {};
-    Object.entries(chainInfoMap).forEach(_ref => {
-      let [key, network] = _ref;
-      const chainState = this.state.getChainStateByKey(key);
-      if ((0, _utils._isChainEnabled)(chainState) && (0, _utils._isChainSupportSubstrateStaking)(network)) {
-        targetNetworkMap[key] = network;
-      }
-    });
-    await (0, _staking.getNominationStakingRewardData)(addresses, targetNetworkMap, rewardItem => {
-      this.state.updateStakingReward(rewardItem);
-    });
-  }
-  async reloadBalance() {
+  async reloadCrowdloan() {
     var _this$state$keyringSe2;
     const currentAddress = (_this$state$keyringSe2 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe2 === void 0 ? void 0 : _this$state$keyringSe2.address;
-    await this.state.handleResetBalance(currentAddress, true);
-    this.subscribeBalances(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
-    await (0, _utils2.waitTimeout)(1800);
-  }
-  async reloadCrowdloan() {
-    var _this$state$keyringSe3;
-    const currentAddress = (_this$state$keyringSe3 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe3 === void 0 ? void 0 : _this$state$keyringSe3.address;
     this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
-    await (0, _utils2.waitTimeout)(1800);
+    await (0, _utils.waitTimeout)(1800);
   }
 }
 exports.KoniSubscription = KoniSubscription;

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.51-2'
+  version: '1.1.53-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BalanceMapImpl = void 0;
 var _constants = require("@subwallet/extension-base/constants");
-var _group = require("@subwallet/extension-base/services/balance-service/helpers/group");
 var _utils = require("@subwallet/extension-base/utils");
 var _rxjs = require("rxjs");
+var _helpers = require("./helpers");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -78,7 +78,7 @@ class BalanceMapImpl {
     });
     Object.entries(allAccountBalance).forEach(_ref => {
       let [tokenSlug, balanceItems] = _ref;
-      allAccountBalanceInfo[tokenSlug] = (0, _group.groupBalance)(balanceItems, _constants.ALL_ACCOUNT_KEY, tokenSlug);
+      allAccountBalanceInfo[tokenSlug] = (0, _helpers.groupBalance)(balanceItems, _constants.ALL_ACCOUNT_KEY, tokenSlug);
     });
     this._map[_constants.ALL_ACCOUNT_KEY] = allAccountBalanceInfo;
   }

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

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _group = require("./group");
+Object.keys(_group).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _group[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _group[key];
+    }
+  });
+});
+var _subscribe = require("./subscribe");
+Object.keys(_subscribe).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _subscribe[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _subscribe[key];
+    }
+  });
+});

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

@@ -10,15 +10,27 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
 var _balance = require("@subwallet/extension-base/koni/api/tokens/evm/balance");
 var _web = require("@subwallet/extension-base/koni/api/tokens/evm/web3");
-var _handlers = require("@subwallet/extension-base/koni/background/handlers");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils2 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-function subscribeERC20Interval(addresses, chain, evmApiMap, callBack) {
-  let tokenList = {};
+function subscribeERC20Interval(_ref) {
+  let {
+    addresses,
+    assetMap,
+    callback,
+    chainInfo,
+    evmApi
+  } = _ref;
+  const chain = chainInfo.slug;
+  const tokenList = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.ERC20]);
   const erc20ContractMap = {};
+  Object.entries(tokenList).forEach(_ref2 => {
+    let [slug, tokenInfo] = _ref2;
+    erc20ContractMap[slug] = (0, _web.getERC20Contract)((0, _utils._getContractAddressOfToken)(tokenInfo), evmApi);
+  });
   const getTokenBalances = () => {
     Object.values(tokenList).map(async tokenInfo => {
       try {
@@ -41,41 +53,47 @@ function subscribeERC20Interval(addresses, chain, evmApiMap, callBack) {
             state: _KoniTypes.APIItemState.READY
           };
         });
-        callBack(items);
+        callback(items);
       } catch (err) {
         console.log(tokenInfo.slug, err);
       }
     });
   };
-  tokenList = _handlers.state.getAssetByChainAndAsset(chain, [_types._AssetType.ERC20]);
-  Object.entries(tokenList).forEach(_ref => {
-    let [slug, tokenInfo] = _ref;
-    erc20ContractMap[slug] = (0, _web.getERC20Contract)(chain, (0, _utils._getContractAddressOfToken)(tokenInfo), evmApiMap);
-  });
   getTokenBalances();
   const interval = setInterval(getTokenBalances, _constants.SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
   return () => {
     clearInterval(interval);
   };
 }
-function subscribeEVMBalance(chain, addresses, evmApiMap, callback, tokenInfo) {
+function subscribeEVMBalance(params) {
+  var _Object$values$;
+  const {
+    addresses,
+    assetMap,
+    callback,
+    chainInfo,
+    evmApi
+  } = params;
+  const chain = chainInfo.slug;
+  const nativeTokenInfo = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.NATIVE]);
+  const nativeTokenSlug = ((_Object$values$ = Object.values(nativeTokenInfo)[0]) === null || _Object$values$ === void 0 ? void 0 : _Object$values$.slug) || '';
   function getBalance() {
-    (0, _balance.getEVMBalance)(chain, addresses, evmApiMap).then(balances => {
+    (0, _balance.getEVMBalance)(chain, addresses, evmApi).then(balances => {
       return balances.map((balance, index) => {
         return {
           address: addresses[index],
-          tokenSlug: tokenInfo.slug,
+          tokenSlug: nativeTokenSlug,
           state: _KoniTypes.APIItemState.READY,
           free: new _util.BN(balance || '0').toString(),
           locked: '0'
         };
       });
     }).catch(e => {
-      console.error(`Error on get native balance with token ${tokenInfo.slug}`, e);
+      console.error(`Error on get native balance with token ${nativeTokenSlug}`, e);
       return addresses.map(address => {
         return {
           address: address,
-          tokenSlug: tokenInfo.slug,
+          tokenSlug: nativeTokenSlug,
           state: _KoniTypes.APIItemState.READY,
           free: '0',
           locked: '0'
@@ -87,7 +105,7 @@ function subscribeEVMBalance(chain, addresses, evmApiMap, callback, tokenInfo) {
   }
   getBalance();
   const interval = setInterval(getBalance, _constants.ASTAR_REFRESH_BALANCE_INTERVAL);
-  const unsub2 = subscribeERC20Interval(addresses, chain, evmApiMap, callback);
+  const unsub2 = subscribeERC20Interval(params);
   return () => {
     clearInterval(interval);
     unsub2 && unsub2();

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

@@ -8,7 +8,6 @@ exports.getAccountJsonByAddress = void 0;
 exports.subscribeBalance = subscribeBalance;
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _handlers = require("@subwallet/extension-base/koni/background/handlers");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
@@ -43,6 +42,8 @@ const getAccountJsonByAddress = address => {
     return null;
   }
 };
+
+/** Filter addresses to subscribe by chain info */
 exports.getAccountJsonByAddress = getAccountJsonByAddress;
 const filterAddress = (addresses, chainInfo) => {
   const isEvmChain = (0, _utils._isChainEvmCompatible)(chainInfo);
@@ -74,40 +75,56 @@ const filterAddress = (addresses, chainInfo) => {
   }
 };
 
-// main subscription
-function subscribeBalance(addresses, chainInfoMap, substrateApiMap, evmApiMap, callback) {
+// interface SubscribeBlanceOptions {
+//   addresses: string[];
+//   chains: string[];
+//   tokens: string[];
+//   chainInfoMap: Record<string, _ChainInfo>;
+//   substrateApiMap: Record<string, _SubstrateApi>;
+//   evmApiMap: Record<string, _EvmApi>;
+//   callback: (rs: BalanceItem[]) => void;
+// }
+
+// main subscription, use for multiple chains, multiple addresses and multiple tokens
+function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoMap, substrateApiMap, evmApiMap, callback) {
+  // Filter chain and token
+  const chainAssetMap = Object.fromEntries(Object.entries(_chainAssetMap).filter(_ref => {
+    let [token] = _ref;
+    return tokens.includes(token);
+  }));
+  const chainInfoMap = Object.fromEntries(Object.entries(_chainInfoMap).filter(_ref2 => {
+    let [chain] = _ref2;
+    return chains.includes(chain);
+  }));
+
   // Looping over each chain
-  const unsubList = Object.entries(chainInfoMap).map(async _ref => {
-    let [chainSlug, chainInfo] = _ref;
+  const unsubList = Object.values(chainInfoMap).map(async chainInfo => {
+    const chainSlug = chainInfo.slug;
     const [useAddresses, notSupportAddresses] = filterAddress(addresses, chainInfo);
     if (notSupportAddresses.length) {
-      const tokens = _handlers.state.chainService.getAssetByChainAndType(chainSlug, [_types._AssetType.NATIVE, _types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.LOCAL]);
-      const assetSetting = await _handlers.state.chainService.getAssetSettings();
-      const filtered = Object.values(tokens).filter(_ref2 => {
-        var _assetSetting$slug;
-        let {
-          slug
-        } = _ref2;
-        return (_assetSetting$slug = assetSetting[slug]) === null || _assetSetting$slug === void 0 ? void 0 : _assetSetting$slug.visible;
-      });
+      const tokens = (0, _utils2.filterAssetsByChainAndType)(chainAssetMap, chainSlug, [_types._AssetType.NATIVE, _types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.LOCAL]);
       const now = new Date().getTime();
-      notSupportAddresses.forEach(address => {
-        const items = filtered.map(token => {
-          return {
-            address,
-            tokenSlug: token.slug,
-            free: '0',
-            locked: '0',
-            state: _KoniTypes.APIItemState.NOT_SUPPORT,
-            timestamp: now
-          };
-        });
+      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);
       });
     }
+    const evmApi = evmApiMap[chainSlug];
     if ((0, _utils._isPureEvmChain)(chainInfo)) {
-      const nativeTokenInfo = _handlers.state.getNativeTokenInfo(chainSlug);
-      return (0, _evm.subscribeEVMBalance)(chainSlug, useAddresses, evmApiMap, callback, nativeTokenInfo);
+      return (0, _evm.subscribeEVMBalance)({
+        addresses: useAddresses,
+        assetMap: chainAssetMap,
+        callback,
+        chainInfo,
+        evmApi
+      });
     }
 
     // if (!useAddresses || useAddresses.length === 0 || _PURE_EVM_CHAINS.indexOf(chainSlug) > -1) {
@@ -127,8 +144,8 @@ function subscribeBalance(addresses, chainInfoMap, substrateApiMap, evmApiMap, c
     //   return undefined;
     // }
 
-    const networkAPI = await substrateApiMap[chainSlug].isReady;
-    return (0, _substrate.subscribeSubstrateBalance)(useAddresses, chainInfo, chainSlug, networkAPI, evmApiMap, callback);
+    const substrateApi = await substrateApiMap[chainSlug].isReady;
+    return (0, _substrate.subscribeSubstrateBalance)(useAddresses, chainInfo, chainAssetMap, substrateApi, evmApi, callback);
   });
   return () => {
     unsubList.forEach(subProm => {