@subwallet/extension-base 1.1.51-1 → 1.1.52-0

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 => {

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

@@ -4,22 +4,30 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.subscribeEqBalanceAccountPallet = subscribeEqBalanceAccountPallet;
-exports.subscribeEquilibriumTokenBalance = subscribeEquilibriumTokenBalance;
+exports.subscribeEquilibriumTokenBalance = exports.subscribeEqBalanceAccountPallet = void 0;
 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 _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-async function subscribeEquilibriumTokenBalance(addresses, chain, api, callBack, includeNativeToken) {
+const subscribeEquilibriumTokenBalance = async _ref => {
+  let {
+    addresses,
+    assetMap,
+    callback,
+    chainInfo,
+    includeNativeToken,
+    substrateApi
+  } = _ref;
+  const chain = chainInfo.slug;
   const tokenTypes = includeNativeToken ? [_types._AssetType.NATIVE, _types._AssetType.LOCAL] : [_types._AssetType.LOCAL];
-  const tokenMap = _handlers.state.getAssetByChainAndAsset(chain, tokenTypes);
+  const tokenMap = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, tokenTypes);
   try {
-    const unsub = await api.query.system.account.multi(addresses, balances => {
+    const unsub = await substrateApi.query.system.account.multi(addresses, balances => {
       // Equilibrium customizes the SystemAccount pallet
       Object.values(tokenMap).forEach(tokenInfo => {
         const assetId = (0, _utils._getTokenOnChainAssetId)(tokenInfo);
@@ -40,7 +48,7 @@ async function subscribeEquilibriumTokenBalance(addresses, chain, api, callBack,
             tokenSlug: tokenInfo.slug
           };
         });
-        callBack(items);
+        callback(items);
       });
     });
     return () => {
@@ -58,22 +66,32 @@ async function subscribeEquilibriumTokenBalance(addresses, chain, api, callBack,
           tokenSlug: tokenInfo.slug
         };
       });
-      callBack(items);
+      callback(items);
     });
     return () => {
       // Empty
     };
   }
-}
+};
 
 // eslint-disable-next-line @typescript-eslint/require-await
-async function subscribeEqBalanceAccountPallet(addresses, chain, api, callBack, includeNativeToken) {
+exports.subscribeEquilibriumTokenBalance = subscribeEquilibriumTokenBalance;
+const subscribeEqBalanceAccountPallet = async _ref2 => {
+  let {
+    addresses,
+    assetMap,
+    callback,
+    chainInfo,
+    includeNativeToken,
+    substrateApi
+  } = _ref2;
+  const chain = chainInfo.slug;
   const tokenTypes = includeNativeToken ? [_types._AssetType.NATIVE, _types._AssetType.LOCAL] : [_types._AssetType.LOCAL];
-  const tokenMap = _handlers.state.getAssetByChainAndAsset(chain, tokenTypes);
+  const tokenMap = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, tokenTypes);
   const unsubList = Object.values(tokenMap).map(async tokenInfo => {
     try {
       const assetId = (0, _utils._getTokenOnChainAssetId)(tokenInfo);
-      const unsub = await api.query.eqBalances.account.multi(addresses.map(address => [address, [assetId]]), balances => {
+      const unsub = await substrateApi.query.eqBalances.account.multi(addresses.map(address => [address, [assetId]]), balances => {
         const items = balances.map((balance, index) => {
           return {
             address: addresses[index],
@@ -84,7 +102,7 @@ async function subscribeEqBalanceAccountPallet(addresses, chain, api, callBack,
             tokenSlug: tokenInfo.slug
           };
         });
-        callBack(items);
+        callback(items);
       });
       return unsub;
     } catch (err) {
@@ -99,7 +117,7 @@ async function subscribeEqBalanceAccountPallet(addresses, chain, api, callBack,
           tokenSlug: tokenInfo.slug
         };
       });
-      callBack(items);
+      callback(items);
       return undefined;
     }
   });
@@ -110,4 +128,5 @@ async function subscribeEqBalanceAccountPallet(addresses, chain, api, callBack,
       }).catch(console.error);
     });
   };
-}
+};
+exports.subscribeEqBalanceAccountPallet = subscribeEqBalanceAccountPallet;

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

@@ -3,51 +3,72 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.subscribeSubstrateBalance = subscribeSubstrateBalance;
+exports.subscribeSubstrateBalance = void 0;
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
 var _wasm = require("@subwallet/extension-base/koni/api/tokens/wasm");
 var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
-var _handlers = require("@subwallet/extension-base/koni/background/handlers");
-var _evm = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/evm");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
+var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
+var _evm = require("../evm");
 var _equilibrium = require("./equilibrium");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-async function subscribeSubstrateBalance(addresses, chainInfo, chain, networkAPI, evmApiMap, callBack) {
+const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substrateApi, evmApi, callback) => {
   let unsubNativeToken;
-  if (!_constants2._BALANCE_CHAIN_GROUP.kintsugi.includes(chain) && !_constants2._BALANCE_CHAIN_GROUP.genshiro.includes(chain) && !_constants2._BALANCE_CHAIN_GROUP.equilibrium_parachain.includes(chain)) {
-    unsubNativeToken = await subscribeWithSystemAccountPallet(addresses, chainInfo, networkAPI.api, callBack);
-  }
   let unsubLocalToken;
   let unsubEvmContractToken;
   let unsubWasmContractToken;
   let unsubBridgedToken;
+  const chain = chainInfo.slug;
+  const baseParams = {
+    addresses,
+    chainInfo,
+    assetMap,
+    callback
+  };
+  const substrateParams = {
+    ...baseParams,
+    substrateApi: substrateApi.api
+  };
+  if (!_constants2._BALANCE_CHAIN_GROUP.kintsugi.includes(chain) && !_constants2._BALANCE_CHAIN_GROUP.genshiro.includes(chain) && !_constants2._BALANCE_CHAIN_GROUP.equilibrium_parachain.includes(chain)) {
+    unsubNativeToken = await subscribeWithSystemAccountPallet(substrateParams);
+  }
   try {
     if (_constants2._BALANCE_CHAIN_GROUP.bifrost.includes(chain)) {
-      unsubLocalToken = await subscribeTokensAccountsPallet(addresses, chain, networkAPI.api, callBack);
+      unsubLocalToken = await subscribeTokensAccountsPallet(substrateParams);
     } else if (_constants2._BALANCE_CHAIN_GROUP.kintsugi.includes(chain)) {
-      unsubLocalToken = await subscribeTokensAccountsPallet(addresses, chain, networkAPI.api, callBack, true);
+      unsubLocalToken = await subscribeTokensAccountsPallet({
+        ...substrateParams,
+        includeNativeToken: true
+      });
     } else if (_constants2._BALANCE_CHAIN_GROUP.statemine.includes(chain)) {
-      unsubLocalToken = await subscribeAssetsAccountPallet(addresses, chain, networkAPI.api, callBack);
+      unsubLocalToken = await subscribeAssetsAccountPallet(substrateParams);
     } else if (_constants2._BALANCE_CHAIN_GROUP.genshiro.includes(chain) || _constants2._BALANCE_CHAIN_GROUP.equilibrium_parachain.includes(chain)) {
-      unsubLocalToken = await (0, _equilibrium.subscribeEquilibriumTokenBalance)(addresses, chain, networkAPI.api, callBack, true);
+      unsubLocalToken = await (0, _equilibrium.subscribeEquilibriumTokenBalance)({
+        ...substrateParams,
+        includeNativeToken: true
+      });
     } else if (_constants2._BALANCE_CHAIN_GROUP.centrifuge.includes(chain)) {
-      unsubLocalToken = await subscribeOrmlTokensPallet(addresses, chain, networkAPI.api, callBack);
+      unsubLocalToken = await subscribeOrmlTokensPallet(substrateParams);
     }
     if (_constants2._BALANCE_CHAIN_GROUP.supportBridged.includes(chain)) {
-      unsubBridgedToken = await subscribeBridgedBalance(addresses, chain, networkAPI.api, callBack);
+      unsubBridgedToken = await subscribeBridgedBalance(substrateParams);
     }
     if ((0, _utils2._isChainEvmCompatible)(chainInfo)) {
-      unsubEvmContractToken = (0, _evm.subscribeERC20Interval)(addresses, chain, evmApiMap, callBack);
+      unsubEvmContractToken = (0, _evm.subscribeERC20Interval)({
+        ...baseParams,
+        evmApi: evmApi
+      });
     }
     if ((0, _utils2._checkSmartContractSupportByChain)(chainInfo, _types._AssetType.PSP22)) {
       // Get sub-token for substrate-based chains
-      unsubWasmContractToken = subscribePSP22Balance(addresses, chain, networkAPI.api, callBack);
+      unsubWasmContractToken = subscribePSP22Balance(substrateParams);
     }
   } catch (err) {
     console.warn(err);
@@ -59,32 +80,54 @@ async function subscribeSubstrateBalance(addresses, chainInfo, chain, networkAPI
     unsubWasmContractToken && unsubWasmContractToken();
     unsubBridgedToken && unsubBridgedToken();
   };
-}
+};
 
 // handler according to different logic
-async function subscribeWithSystemAccountPallet(addresses, chainInfo, networkAPI, callBack) {
+// eslint-disable-next-line @typescript-eslint/require-await
+exports.subscribeSubstrateBalance = subscribeSubstrateBalance;
+const subscribeWithSystemAccountPallet = async _ref => {
+  let {
+    addresses,
+    callback,
+    chainInfo,
+    substrateApi
+  } = _ref;
   const chainNativeTokenSlug = (0, _utils2._getChainNativeTokenSlug)(chainInfo);
-
-  // TODO: Need handle case error
-  const unsub = await networkAPI.query.system.account.multi(addresses, async balances => {
-    const pooledStakingBalances = [];
-    if ((0, _utils2._isSubstrateRelayChain)(chainInfo) && networkAPI.query.nominationPools) {
-      var _networkAPI$query$nom;
-      const poolMemberDatas = await ((_networkAPI$query$nom = networkAPI.query.nominationPools.poolMembers) === null || _networkAPI$query$nom === void 0 ? void 0 : _networkAPI$query$nom.multi(addresses));
-      if (poolMemberDatas) {
-        for (const _poolMemberData of poolMemberDatas) {
-          const poolMemberData = _poolMemberData.toPrimitive();
-          if (poolMemberData) {
-            let pooled = new _util.BN(poolMemberData.points.toString());
-            Object.entries(poolMemberData.unbondingEras).forEach(_ref => {
-              let [, amount] = _ref;
-              pooled = pooled.add(new _util.BN(amount));
-            });
-            pooledStakingBalances.push(pooled);
-          } else {
-            pooledStakingBalances.push(_util.BN_ZERO);
-          }
+  const balanceSubscribe = substrateApi.rx.query.system.account.multi(addresses);
+  let poolSubscribe;
+  if ((0, _utils2._isSubstrateRelayChain)(chainInfo) && substrateApi.query.nominationPools) {
+    var _substrateApi$rx$quer;
+    poolSubscribe = (_substrateApi$rx$quer = substrateApi.rx.query.nominationPools.poolMembers) === null || _substrateApi$rx$quer === void 0 ? void 0 : _substrateApi$rx$quer.multi(addresses);
+  } else {
+    poolSubscribe = new _rxjs.Observable(subscriber => {
+      subscriber.next(addresses.map(() => ({
+        toPrimitive() {
+          return null;
         }
+      })));
+    });
+  }
+  const subscription = (0, _rxjs.combineLatest)({
+    balances: balanceSubscribe,
+    pools: poolSubscribe
+  }).subscribe(_ref2 => {
+    let {
+      balances: _balances,
+      pools: poolMemberDatas
+    } = _ref2;
+    const balances = _balances;
+    const pooledStakingBalances = [];
+    for (const _poolMemberData of poolMemberDatas) {
+      const poolMemberData = _poolMemberData.toPrimitive();
+      if (poolMemberData) {
+        let pooled = new _util.BN(poolMemberData.points.toString());
+        Object.entries(poolMemberData.unbondingEras).forEach(_ref3 => {
+          let [, amount] = _ref3;
+          pooled = pooled.add(new _util.BN(amount));
+        });
+        pooledStakingBalances.push(pooled);
+      } else {
+        pooledStakingBalances.push(_util.BN_ZERO);
       }
     }
     const items = balances.map((balance, index) => {
@@ -116,14 +159,22 @@ async function subscribeWithSystemAccountPallet(addresses, chainInfo, networkAPI
         }
       };
     });
-    callBack(items);
+    callback(items);
   });
   return () => {
-    unsub();
+    subscription.unsubscribe();
   };
-}
-async function subscribeBridgedBalance(addresses, chain, api, callBack) {
-  const tokenMap = _handlers.state.getAssetByChainAndAsset(chain, [_types._AssetType.LOCAL]);
+};
+const subscribeBridgedBalance = async _ref4 => {
+  let {
+    addresses,
+    assetMap,
+    callback,
+    chainInfo,
+    substrateApi
+  } = _ref4;
+  const chain = chainInfo.slug;
+  const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.LOCAL]);
 
   // @ts-ignore
   const unsubList = await Promise.all(Object.values(tokenMap).map(async tokenInfo => {
@@ -131,7 +182,7 @@ async function subscribeBridgedBalance(addresses, chain, api, callBack) {
       const isBridgedToken = (0, _utils2._isBridgedToken)(tokenInfo);
       if (isBridgedToken) {
         const multiLocation = (0, _utils2._getXcmAssetMultilocation)(tokenInfo);
-        return await api.query.foreignAssets.account.multi(addresses.map(address => [multiLocation, address]), balances => {
+        return await substrateApi.query.foreignAssets.account.multi(addresses.map(address => [multiLocation, address]), balances => {
           const items = balances.map((balance, index) => {
             const bdata = balance === null || balance === void 0 ? void 0 : balance.toHuman();
             let frozen = _util.BN_ZERO;
@@ -161,7 +212,7 @@ async function subscribeBridgedBalance(addresses, chain, api, callBack) {
               }
             };
           });
-          callBack(items);
+          callback(items);
         });
       }
     } catch (err) {
@@ -174,25 +225,37 @@ async function subscribeBridgedBalance(addresses, chain, api, callBack) {
       unsub && unsub();
     });
   };
-}
-function subscribePSP22Balance(addresses, chain, api, callBack) {
-  let tokenList = {};
+};
+const subscribePSP22Balance = _ref5 => {
+  let {
+    addresses,
+    assetMap,
+    callback,
+    chainInfo,
+    substrateApi
+  } = _ref5;
+  const chain = chainInfo.slug;
   const psp22ContractMap = {};
+  const tokenList = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.PSP22]);
+  Object.entries(tokenList).forEach(_ref6 => {
+    let [slug, tokenInfo] = _ref6;
+    psp22ContractMap[slug] = (0, _wasm.getPSP22ContractPromise)(substrateApi, (0, _utils2._getContractAddressOfToken)(tokenInfo));
+  });
   const getTokenBalances = () => {
     Object.values(tokenList).map(async tokenInfo => {
       try {
         const contract = psp22ContractMap[tokenInfo.slug];
         const balances = await Promise.all(addresses.map(async address => {
           try {
-            var _balanceOf$output, _ref2;
+            var _balanceOf$output, _ref7;
             const _balanceOf = await contract.query['psp22::balanceOf'](address, {
-              gasLimit: (0, _utils.getDefaultWeightV2)(api)
+              gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi)
             }, address);
             const balanceObj = _balanceOf === null || _balanceOf === void 0 ? void 0 : (_balanceOf$output = _balanceOf.output) === null || _balanceOf$output === void 0 ? void 0 : _balanceOf$output.toPrimitive();
             return {
               address: address,
               tokenSlug: tokenInfo.slug,
-              free: _balanceOf.output ? (_ref2 = balanceObj.ok) !== null && _ref2 !== void 0 ? _ref2 : balanceObj.Ok : '0',
+              free: _balanceOf.output ? (_ref7 = balanceObj.ok) !== null && _ref7 !== void 0 ? _ref7 : balanceObj.Ok : '0',
               locked: '0',
               state: _KoniTypes.APIItemState.READY
             };
@@ -207,27 +270,31 @@ function subscribePSP22Balance(addresses, chain, api, callBack) {
             };
           }
         }));
-        callBack(balances);
+        callback(balances);
       } catch (err) {
         console.warn(tokenInfo.slug, err); // TODO: error createType
       }
     });
   };
 
-  tokenList = _handlers.state.getAssetByChainAndAsset(chain, [_types._AssetType.PSP22]);
-  Object.entries(tokenList).forEach(_ref3 => {
-    let [slug, tokenInfo] = _ref3;
-    psp22ContractMap[slug] = (0, _wasm.getPSP22ContractPromise)(api, (0, _utils2._getContractAddressOfToken)(tokenInfo));
-  });
   getTokenBalances();
   const interval = setInterval(getTokenBalances, _constants.SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
   return () => {
     clearInterval(interval);
   };
-}
-async function subscribeTokensAccountsPallet(addresses, chain, api, callBack, includeNativeToken) {
+};
+const subscribeTokensAccountsPallet = async _ref8 => {
+  let {
+    addresses,
+    assetMap,
+    callback,
+    chainInfo,
+    includeNativeToken,
+    substrateApi
+  } = _ref8;
+  const chain = chainInfo.slug;
   const tokenTypes = includeNativeToken ? [_types._AssetType.NATIVE, _types._AssetType.LOCAL] : [_types._AssetType.LOCAL];
-  const tokenMap = _handlers.state.getAssetByChainAndAsset(chain, tokenTypes);
+  const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, tokenTypes);
   const unsubList = await Promise.all(Object.values(tokenMap).map(async tokenInfo => {
     try {
       const onChainInfo = (0, _utils2._getTokenOnChainInfo)(tokenInfo);
@@ -235,7 +302,7 @@ async function subscribeTokensAccountsPallet(addresses, chain, api, callBack, in
 
       // Get Token Balance
       // @ts-ignore
-      return await api.query.tokens.accounts.multi(addresses.map(address => [address, onChainInfo || assetId]), balances => {
+      return await substrateApi.query.tokens.accounts.multi(addresses.map(address => [address, onChainInfo || assetId]), balances => {
         const items = balances.map((balance, index) => {
           const tokenBalance = {
             reserved: balance.reserved || new _util.BN(0),
@@ -257,7 +324,7 @@ async function subscribeTokensAccountsPallet(addresses, chain, api, callBack, in
             }
           };
         });
-        callBack(items);
+        callback(items);
       });
     } catch (err) {
       console.warn(err);
@@ -269,9 +336,18 @@ async function subscribeTokensAccountsPallet(addresses, chain, api, callBack, in
       unsub && unsub();
     });
   };
-}
-async function subscribeAssetsAccountPallet(addresses, chain, api, callBack) {
-  const tokenMap = _handlers.state.getAssetByChainAndAsset(chain, [_types._AssetType.LOCAL]);
+};
+const subscribeAssetsAccountPallet = async _ref9 => {
+  let {
+    addresses,
+    assetMap,
+    callback,
+    chainInfo,
+    includeNativeToken,
+    substrateApi
+  } = _ref9;
+  const chain = chainInfo.slug;
+  const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.LOCAL]);
   Object.values(tokenMap).forEach(token => {
     if (_constants2._MANTA_ZK_CHAIN_GROUP.includes(token.originChain) && token.symbol.startsWith(_constants2._ZK_ASSET_PREFIX)) {
       delete tokenMap[token.slug];
@@ -282,7 +358,7 @@ async function subscribeAssetsAccountPallet(addresses, chain, api, callBack) {
       const assetIndex = (0, _utils2._getTokenOnChainAssetId)(tokenInfo);
 
       // Get Token Balance
-      return await api.query.assets.account.multi(addresses.map(address => [assetIndex, address]), balances => {
+      return await substrateApi.query.assets.account.multi(addresses.map(address => [assetIndex, address]), balances => {
         const items = balances.map((balance, index) => {
           const bdata = balance === null || balance === void 0 ? void 0 : balance.toPrimitive();
           let frozen = _util.BN_ZERO;
@@ -311,7 +387,7 @@ async function subscribeAssetsAccountPallet(addresses, chain, api, callBack) {
             }
           };
         });
-        callBack(items);
+        callback(items);
       });
     } catch (err) {
       console.warn(err);
@@ -323,19 +399,27 @@ async function subscribeAssetsAccountPallet(addresses, chain, api, callBack) {
       unsub && unsub();
     });
   };
-}
+};
 
 // eslint-disable-next-line @typescript-eslint/require-await
-async function subscribeOrmlTokensPallet(addresses, chain, api, callBack) {
+const subscribeOrmlTokensPallet = async _ref10 => {
+  let {
+    addresses,
+    assetMap,
+    callback,
+    chainInfo,
+    substrateApi
+  } = _ref10;
+  const chain = chainInfo.slug;
   const tokenTypes = [_types._AssetType.LOCAL];
-  const tokenMap = _handlers.state.getAssetByChainAndAsset(chain, tokenTypes);
+  const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, tokenTypes);
   const unsubList = Object.values(tokenMap).map(async tokenInfo => {
     try {
       const onChainInfo = (0, _utils2._getTokenOnChainInfo)(tokenInfo);
 
       // Get Token Balance
       // @ts-ignore
-      const unsub = await api.query.ormlTokens.accounts.multi(addresses.map(address => [address, onChainInfo]), balances => {
+      const unsub = await substrateApi.query.ormlTokens.accounts.multi(addresses.map(address => [address, onChainInfo]), balances => {
         const items = balances.map((balance, index) => {
           const tokenBalance = {
             reserved: balance.reserved || new _util.BN(0),
@@ -359,7 +443,7 @@ async function subscribeOrmlTokensPallet(addresses, chain, api, callBack) {
             }
           };
         });
-        callBack(items);
+        callback(items);
       });
       return unsub;
     } catch (err) {
@@ -374,4 +458,4 @@ async function subscribeOrmlTokensPallet(addresses, chain, api, callBack) {
       }).catch(console.error);
     });
   };
-}
+};