@subwallet/extension-base 1.0.2-1 → 1.0.2-1b

package/cjs/koni/api/dotsama/balance.js

@@ -3,34 +3,33 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getFreeBalance = getFreeBalance;
 exports.subscribeBalance = subscribeBalance;
 exports.subscribeEVMBalance = subscribeEVMBalance;
 exports.subscribeSubstrateBalance = subscribeSubstrateBalance;
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
-var _balance2 = require("@subwallet/extension-base/koni/api/tokens/evm/balance");
+var _balance = require("@subwallet/extension-base/koni/api/tokens/evm/balance");
 var _web = require("@subwallet/extension-base/koni/api/tokens/evm/web3");
 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 _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
-var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _utils2 = require("@subwallet/extension-base/utils");
+var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
-var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
 // main subscription
 function subscribeBalance(addresses, chainInfoMap, substrateApiMap, evmApiMap, callback) {
-  const [substrateAddresses, evmAddresses] = (0, _utils2.categoryAddresses)(addresses);
+  const [substrateAddresses, evmAddresses] = (0, _utils3.categoryAddresses)(addresses);
 
   // Looping over each chain
   const unsubList = Object.entries(chainInfoMap).map(async _ref => {
     let [chainSlug, chainInfo] = _ref;
-    const useAddresses = (0, _utils._isChainEvmCompatible)(chainInfo) ? evmAddresses : substrateAddresses;
-    if ((0, _utils._isPureEvmChain)(chainInfo)) {
+    const useAddresses = (0, _utils2._isChainEvmCompatible)(chainInfo) ? evmAddresses : substrateAddresses;
+    if ((0, _utils2._isPureEvmChain)(chainInfo)) {
       const nativeTokenInfo = _handlers.state.getNativeTokenInfo(chainSlug);
       return subscribeEVMBalance(chainSlug, useAddresses, evmApiMap, callback, nativeTokenInfo);
     }
@@ -79,10 +78,10 @@ async function subscribeSubstrateBalance(addresses, chainInfo, chain, networkAPI
     } else if (_constants2._BALANCE_CHAIN_GROUP.equilibrium_parachain.includes(chain)) {
       unsubLocalToken = await subscribeEquilibriumTokenBalance(addresses, chain, networkAPI.api, callBack, true);
     }
-    if ((0, _utils._isChainEvmCompatible)(chainInfo)) {
+    if ((0, _utils2._isChainEvmCompatible)(chainInfo)) {
       unsubEvmContractToken = subscribeERC20Interval(addresses, chain, evmApiMap, callBack);
     }
-    if ((0, _utils._checkSmartContractSupportByChain)(chainInfo, _types._AssetType.PSP22)) {
+    if ((0, _utils2._checkSmartContractSupportByChain)(chainInfo, _types._AssetType.PSP22)) {
       // Get sub-token for substrate-based chains
       unsubWasmContractToken = subscribePSP22Balance(addresses, chain, networkAPI.api, callBack);
     }
@@ -99,17 +98,23 @@ async function subscribeSubstrateBalance(addresses, chainInfo, chain, networkAPI
 
 // handler according to different logic
 async function subscribeWithSystemAccountPallet(addresses, chainInfo, networkAPI, callBack) {
-  const chainNativeTokenSlug = (0, _utils._getChainNativeTokenSlug)(chainInfo);
+  const chainNativeTokenSlug = (0, _utils2._getChainNativeTokenSlug)(chainInfo);
   const unsub = await networkAPI.query.system.account.multi(addresses, async balances => {
     let [total, reserved, miscFrozen, feeFrozen] = [new _util.BN(0), new _util.BN(0), new _util.BN(0), new _util.BN(0)];
     let pooledStakingBalance = _util.BN_ZERO;
-    if ((0, _utils._isSubstrateRelayChain)(chainInfo) && networkAPI.query.nominationPools) {
+    if ((0, _utils2._isSubstrateRelayChain)(chainInfo) && networkAPI.query.nominationPools) {
       const poolMemberDatas = await networkAPI.query.nominationPools.poolMembers.multi(addresses);
-      for (const _poolMemberData of poolMemberDatas) {
-        const poolMemberData = _poolMemberData.toPrimitive();
-        if (poolMemberData) {
-          const pooledBalance = new _util.BN(poolMemberData.points.toString());
-          pooledStakingBalance = pooledStakingBalance.add(pooledBalance);
+      if (poolMemberDatas) {
+        for (const _poolMemberData of poolMemberDatas) {
+          const poolMemberData = _poolMemberData.toPrimitive();
+          if (poolMemberData) {
+            const pooledBalance = new _util.BN(poolMemberData.points.toString());
+            pooledStakingBalance = pooledStakingBalance.add(pooledBalance);
+            Object.entries(poolMemberData.unbondingEras).forEach(_ref2 => {
+              let [, amount] = _ref2;
+              pooledStakingBalance = pooledStakingBalance.add(new _util.BN(amount));
+            });
+          }
         }
       }
     }
@@ -130,7 +135,7 @@ async function subscribeWithSystemAccountPallet(addresses, chainInfo, networkAPI
     const free = total.sub(locked);
     callBack({
       tokenSlug: chainNativeTokenSlug,
-      free: free.toString(),
+      free: free.gte(_util.BN_ZERO) ? free.toString() : '0',
       locked: locked.toString(),
       state: _KoniTypes.APIItemState.READY,
       substrateInfo: {
@@ -144,79 +149,6 @@ async function subscribeWithSystemAccountPallet(addresses, chainInfo, networkAPI
     unsub();
   };
 }
-
-// deprecated
-// function subscribeDarwiniaBalance (addresses: string[], chainInfo: _ChainInfo, chain: string, networkAPI: ApiPromise, callBack: (rs: BalanceItem) => void) {
-//   const tokenMap = state.getAssetByChainAndAsset(chain, [_AssetType.LOCAL]);
-//   const nativeTokenSlug = _getChainNativeTokenSlug(chainInfo);
-//
-//   let totalBalance: BN = new BN(0);
-//   let freeBalance: BN = new BN(0);
-//   let miscFrozen: BN = new BN(0);
-//   let reservedKtonBalance: BN = new BN(0);
-//   let totalKtonBalance: BN = new BN(0);
-//
-//   const unsubProms = addresses.map((address) => {
-//     return networkAPI.derive.balances?.all(address, async (balance: DeriveBalancesAll) => {
-//       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-//       freeBalance = freeBalance.add(balance.availableBalance?.toBn() || new BN(0));
-//       miscFrozen = miscFrozen.add(balance.lockedBalance?.toBn() || new BN(0));
-//       totalBalance = totalBalance.add(balance.freeBalance?.toBn() || new BN(0));
-//
-//       const _systemBalance = await networkAPI.query.system.account(address);
-//       const systemBalance = _systemBalance.toHuman() as unknown as AccountInfo;
-//
-//       // @ts-ignore
-//       const rawTotalKton = (systemBalance.data?.freeKton as string).replaceAll(',', '');
-//       // @ts-ignore
-//       const rawReservedKton = (systemBalance.data?.reservedKton as string).replaceAll(',', '');
-//
-//       // @ts-ignore
-//       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-//       totalKtonBalance = totalKtonBalance.add(new BN(rawTotalKton) || new BN(0));
-//       // @ts-ignore
-//       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-//       reservedKtonBalance = reservedKtonBalance.add(new BN(rawReservedKton) || new BN(0));
-//
-//       if (Object.keys(tokenMap).length > 1) {
-//         for (const tokenInfo of Object.values(tokenMap)) {
-//           if (_BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol)) {
-//             const freeKton = totalKtonBalance.sub(reservedKtonBalance);
-//
-//             callBack({
-//               free: freeKton.toString(),
-//               locked: reservedKtonBalance.toString(),
-//               state: APIItemState.READY,
-//               tokenSlug: tokenInfo.slug
-//             });
-//             break;
-//           }
-//         }
-//       }
-//
-//       const free = totalBalance.sub(miscFrozen);
-//
-//       callBack({
-//         tokenSlug: nativeTokenSlug,
-//         free: free.toString(),
-//         locked: miscFrozen.toString(),
-//         state: APIItemState.READY,
-//         substrateInfo: {
-//           miscFrozen: miscFrozen.toString()
-//         }
-//       });
-//     });
-//   });
-//
-//   return () => {
-//     Promise.all(unsubProms).then((unsubs) => {
-//       unsubs.forEach((unsub) => {
-//         unsub && unsub();
-//       });
-//     }).catch(console.error);
-//   };
-// }
-
 function subscribeERC20Interval(addresses, chain, evmApiMap, callBack) {
   let tokenList = {};
   const erc20ContractMap = {};
@@ -229,7 +161,7 @@ function subscribeERC20Interval(addresses, chain, evmApiMap, callBack) {
           // eslint-disable-next-line @typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
           return contract.methods.balanceOf(address).call();
         }));
-        free = (0, _utils2.sumBN)(balanceList.map(balance => new _util.BN(balance || 0)));
+        free = (0, _utils3.sumBN)(balanceList.map(balance => new _util.BN(balance || 0)));
         callBack({
           tokenSlug: tokenInfo.slug,
           free: free.toString(),
@@ -242,9 +174,9 @@ function subscribeERC20Interval(addresses, chain, evmApiMap, callBack) {
     });
   };
   tokenList = _handlers.state.getAssetByChainAndAsset(chain, [_types._AssetType.ERC20]);
-  Object.entries(tokenList).forEach(_ref2 => {
-    let [slug, tokenInfo] = _ref2;
-    erc20ContractMap[slug] = (0, _web.getERC20Contract)(chain, (0, _utils._getContractAddressOfToken)(tokenInfo), evmApiMap);
+  Object.entries(tokenList).forEach(_ref3 => {
+    let [slug, tokenInfo] = _ref3;
+    erc20ContractMap[slug] = (0, _web.getERC20Contract)(chain, (0, _utils2._getContractAddressOfToken)(tokenInfo), evmApiMap);
   });
   getTokenBalances();
   const interval = setInterval(getTokenBalances, _constants.SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
@@ -261,12 +193,14 @@ function subscribePSP22Balance(addresses, chain, api, callBack) {
       try {
         const contract = psp22ContractMap[tokenInfo.slug];
         const balances = await Promise.all(addresses.map(async address => {
+          var _balanceOf$output;
           const _balanceOf = await contract.query['psp22::balanceOf'](address, {
-            gasLimit: -1
+            gasLimit: (0, _utils.getDefaultWeightV2)(api)
           }, address);
-          return _balanceOf.output ? _balanceOf.output.toString() : '0';
+          const balanceObj = _balanceOf === null || _balanceOf === void 0 ? void 0 : (_balanceOf$output = _balanceOf.output) === null || _balanceOf$output === void 0 ? void 0 : _balanceOf$output.toPrimitive();
+          return _balanceOf.output ? balanceObj.ok || balanceObj.Ok : '0';
         }));
-        free = (0, _utils2.sumBN)(balances.map(bal => new _util.BN(bal || 0)));
+        free = (0, _utils3.sumBN)(balances.map(bal => new _util.BN(bal || 0)));
         callBack({
           tokenSlug: tokenInfo.slug,
           free: free.toString(),
@@ -274,14 +208,15 @@ function subscribePSP22Balance(addresses, chain, api, callBack) {
           state: _KoniTypes.APIItemState.READY
         });
       } catch (err) {
-        console.log('There is a problem fetching ' + tokenInfo.slug + ' PSP-22 token balance', err);
+        console.warn('Problem fetching ' + tokenInfo.slug + ' PSP-22 token balance', 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, _utils._getContractAddressOfToken)(tokenInfo));
+  Object.entries(tokenList).forEach(_ref4 => {
+    let [slug, tokenInfo] = _ref4;
+    psp22ContractMap[slug] = (0, _wasm.getPSP22ContractPromise)(api, (0, _utils2._getContractAddressOfToken)(tokenInfo));
   });
   getTokenBalances();
   const interval = setInterval(getTokenBalances, _constants.SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
@@ -295,7 +230,7 @@ async function subscribeEquilibriumTokenBalance(addresses, chain, api, callBack,
   const unsub = await api.query.system.account.multi(addresses, balances => {
     // Equilibrium customizes the SystemAccount pallet
     Object.values(tokenMap).forEach(tokenInfo => {
-      const assetId = (0, _utils._getTokenOnChainAssetId)(tokenInfo);
+      const assetId = (0, _utils2._getTokenOnChainAssetId)(tokenInfo);
       let tokenFreeBalance = _util.BN_ZERO;
       for (const balance of balances) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
@@ -328,10 +263,10 @@ async function subscribeEqBalanceAccountPallet(addresses, chain, api, callBack,
   const tokenMap = _handlers.state.getAssetByChainAndAsset(chain, tokenTypes);
   const unsubList = Object.values(tokenMap).map(async tokenInfo => {
     try {
-      const assetId = (0, _utils._getTokenOnChainAssetId)(tokenInfo);
+      const assetId = (0, _utils2._getTokenOnChainAssetId)(tokenInfo);
       const unsub = await api.query.eqBalances.account.multi(addresses.map(address => [address, [assetId]]), balances => {
         const tokenBalance = {
-          free: (0, _utils2.sumBN)(balances.map(b => b.asPositive)).toString(),
+          free: (0, _utils3.sumBN)(balances.map(b => b.asPositive)).toString(),
           locked: '0',
           // Equilibrium doesn't show locked balance
           state: _KoniTypes.APIItemState.READY,
@@ -358,15 +293,15 @@ async function subscribeTokensAccountsPallet(addresses, chain, api, callBack, in
   const tokenMap = _handlers.state.getAssetByChainAndAsset(chain, tokenTypes);
   const unsubList = await Promise.all(Object.values(tokenMap).map(async tokenInfo => {
     try {
-      const onChainInfo = (0, _utils._getTokenOnChainInfo)(tokenInfo);
+      const onChainInfo = (0, _utils2._getTokenOnChainInfo)(tokenInfo);
 
       // Get Token Balance
       // @ts-ignore
       return await api.query.tokens.accounts.multi(addresses.map(address => [address, onChainInfo]), balances => {
         const tokenBalance = {
-          reserved: (0, _utils2.sumBN)(balances.map(b => b.reserved || new _util.BN(0))),
-          frozen: (0, _utils2.sumBN)(balances.map(b => b.frozen || new _util.BN(0))),
-          free: (0, _utils2.sumBN)(balances.map(b => b.free || new _util.BN(0))) // free is actually total balance
+          reserved: (0, _utils3.sumBN)(balances.map(b => b.reserved || new _util.BN(0))),
+          frozen: (0, _utils3.sumBN)(balances.map(b => b.frozen || new _util.BN(0))),
+          free: (0, _utils3.sumBN)(balances.map(b => b.free || new _util.BN(0))) // free is actually total balance
         };
 
         // free balance = total balance - frozen misc
@@ -399,7 +334,7 @@ async function subscribeAssetsAccountPallet(addresses, chain, api, callBack) {
   const tokenMap = _handlers.state.getAssetByChainAndAsset(chain, [_types._AssetType.LOCAL]);
   const unsubList = await Promise.all(Object.values(tokenMap).map(async tokenInfo => {
     try {
-      const assetIndex = (0, _utils._getTokenOnChainAssetId)(tokenInfo);
+      const assetIndex = (0, _utils2._getTokenOnChainAssetId)(tokenInfo);
 
       // Get Token Balance
       return await api.query.assets.account.multi(addresses.map(address => [assetIndex, address]), balances => {
@@ -408,11 +343,11 @@ async function subscribeAssetsAccountPallet(addresses, chain, api, callBack) {
         balances.forEach(b => {
           // @ts-ignore
           // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-assignment
-          const bdata = b === null || b === void 0 ? void 0 : b.toJSON();
+          const bdata = b === null || b === void 0 ? void 0 : b.toHuman();
           if (bdata) {
             // @ts-ignore
             // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument
-            const addressBalance = new _util.BN(String(bdata === null || bdata === void 0 ? void 0 : bdata.balance) || '0');
+            const addressBalance = new _util.BN(String(bdata === null || bdata === void 0 ? void 0 : bdata.balance).replaceAll(',', '') || '0');
 
             // @ts-ignore
             if (bdata !== null && bdata !== void 0 && bdata.isFrozen) {
@@ -453,8 +388,8 @@ function subscribeEVMBalance(chain, addresses, evmApiMap, callback, tokenInfo) {
     locked: '0'
   };
   function getBalance() {
-    (0, _balance2.getEVMBalance)(chain, addresses, evmApiMap).then(balances => {
-      balanceItem.free = (0, _utils2.sumBN)(balances.map(b => new _util.BN(b || '0'))).toString();
+    (0, _balance.getEVMBalance)(chain, addresses, evmApiMap).then(balances => {
+      balanceItem.free = (0, _utils3.sumBN)(balances.map(b => new _util.BN(b || '0'))).toString();
       balanceItem.state = _KoniTypes.APIItemState.READY;
       callback(balanceItem);
     }).catch(console.warn);
@@ -466,114 +401,4 @@ function subscribeEVMBalance(chain, addresses, evmApiMap, callback, tokenInfo) {
     clearInterval(interval);
     unsub2 && unsub2();
   };
-}
-async function getFreeBalance(chain, address, substrateApiMap, evmApiMap, tokenSlug) {
-  const substrateApi = await substrateApiMap[chain].isReady;
-  const api = substrateApi.api;
-  const web3Api = evmApiMap[chain];
-  const tokenInfo = tokenSlug ? _handlers.state.getAssetBySlug(tokenSlug) : _handlers.state.getNativeTokenInfo(chain);
-  const chainInfo = _handlers.state.getChainInfo(chain);
-
-  // Only EVM Address use with EVM network
-  if (Boolean(web3Api || (0, _utils._isChainEvmCompatible)(chainInfo)) !== (0, _utilCrypto.isEthereumAddress)(address)) {
-    if (!(0, _utilCrypto.isEthereumAddress)(address)) {
-      return '0';
-    }
-  }
-
-  // web3Api support mean isEthereum Network support
-  if (web3Api) {
-    if ((0, _utils._isNativeToken)(tokenInfo)) {
-      var _web3Api$api;
-      return (await ((_web3Api$api = web3Api.api) === null || _web3Api$api === void 0 ? void 0 : _web3Api$api.eth.getBalance(address))) || '0';
-    } else {
-      if ((0, _utils._getContractAddressOfToken)(tokenInfo).length > 0) {
-        return '0';
-      }
-      const contract = (0, _web.getERC20Contract)(chain, (0, _utils._getContractAddressOfToken)(tokenInfo), evmApiMap);
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-      const free = await contract.methods.balanceOf(address).call();
-
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return
-      return (free === null || free === void 0 ? void 0 : free.toString()) || '0';
-    }
-  } else {
-    var _balance$availableBal, _balance$availableBal2;
-    if (tokenSlug) {
-      if ((0, _utils._isSmartContractToken)(tokenInfo)) {
-        if ((0, _utils._getContractAddressOfToken)(tokenInfo).length > 0) {
-          return '0';
-        }
-        const contractPromise = (0, _wasm.getPSP22ContractPromise)(api, (0, _utils._getContractAddressOfToken)(tokenInfo));
-        const balanceOf = await contractPromise.query['psp22::balanceOf'](address, {
-          gasLimit: -1
-        }, address);
-        return balanceOf.output ? balanceOf.output.toString() : '0';
-      } else if (_constants2._BALANCE_CHAIN_GROUP.genshiro.includes(chain)) {
-        var _balance$asPositive;
-        const onChainInfo = (0, _utils._getTokenOnChainInfo)(tokenInfo);
-        const balance = await api.query.eqBalances.account(address, onChainInfo);
-
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-return
-        return ((_balance$asPositive = balance.asPositive) === null || _balance$asPositive === void 0 ? void 0 : _balance$asPositive.toString()) || '0';
-      } else if (_constants2._BALANCE_CHAIN_GROUP.equilibrium_parachain.includes(chain)) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        const balance = await api.query.system.account(address);
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-        const balancesData = JSON.parse(balance.data.toString());
-        const balanceList = balancesData.v0.balance;
-        let freeTokenBalance;
-        const assetId = (0, _utils._getTokenOnChainAssetId)(tokenInfo);
-        if (!(0, _utils._isNativeToken)(tokenInfo)) {
-          // @ts-ignore
-          freeTokenBalance = balanceList.find(data => data[0] === assetId);
-        } else {
-          freeTokenBalance = balanceList[0];
-        }
-        return freeTokenBalance ? freeTokenBalance[1].positive.toString() : '0';
-      } else if (_constants2._BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol)) {
-        var _balance$data5, _balance$data5$freeKt;
-        // @ts-ignore
-        const balance = await api.query.system.account(address);
-        return ((_balance$data5 = balance.data) === null || _balance$data5 === void 0 ? void 0 : (_balance$data5$freeKt = _balance$data5.freeKton) === null || _balance$data5$freeKt === void 0 ? void 0 : _balance$data5$freeKt.toString()) || '0';
-      } else if (!(0, _utils._isNativeToken)(tokenInfo) && _constants2._BALANCE_CHAIN_GROUP.statemine.includes(chain)) {
-        var _balanceInfo$balance;
-        const assetId = (0, _utils._getTokenOnChainAssetId)(tokenInfo);
-        const balanceInfo = (await api.query.assets.account(assetId, address)).toHuman();
-
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-return
-        return (balanceInfo === null || balanceInfo === void 0 ? void 0 : (_balanceInfo$balance = balanceInfo.balance) === null || _balanceInfo$balance === void 0 ? void 0 : _balanceInfo$balance.replaceAll(',', '')) || '0';
-      } else if (!(0, _utils._isNativeToken)(tokenInfo) || _constants2._BALANCE_CHAIN_GROUP.kintsugi.includes(chain)) {
-        var _balance$free;
-        const onChainInfo = (0, _utils._getTokenOnChainInfo)(tokenInfo);
-        // @ts-ignore
-        const balance = await api.query.tokens.accounts(address, onChainInfo);
-        return ((_balance$free = balance.free) === null || _balance$free === void 0 ? void 0 : _balance$free.toString()) || '0';
-      }
-    }
-    if (_constants2._BALANCE_CHAIN_GROUP.kusama.includes(chain)) {
-      var _balance$data6, _balance$data7;
-      // @ts-ignore
-      const _balance = await api.query.system.account(address);
-
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-      const balance = _balance.toHuman();
-
-      // @ts-ignore
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-      const freeBalance = new _util.BN((_balance$data6 = balance.data) === null || _balance$data6 === void 0 ? void 0 : _balance$data6.free.replaceAll(',', ''));
-
-      // @ts-ignore
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-      const miscFrozen = new _util.BN((_balance$data7 = balance.data) === null || _balance$data7 === void 0 ? void 0 : _balance$data7.miscFrozen.replaceAll(',', ''));
-      const transferable = freeBalance.sub(miscFrozen);
-
-      // @ts-ignore
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-return
-      return transferable.toString() || '0';
-    }
-    const balance = await api.derive.balances.all(address);
-    return ((_balance$availableBal = balance.availableBalance) === null || _balance$availableBal === void 0 ? void 0 : (_balance$availableBal2 = _balance$availableBal.toBn()) === null || _balance$availableBal2 === void 0 ? void 0 : _balance$availableBal2.toString()) || '0';
-  }
 }

package/cjs/koni/api/dotsama/transfer.js

@@ -7,8 +7,9 @@ exports.checkReferenceCount = checkReferenceCount;
 exports.checkSupportTransfer = checkSupportTransfer;
 exports.createTransferExtrinsic = void 0;
 var _wasm = require("@subwallet/extension-base/koni/api/tokens/wasm");
+var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
-var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -19,7 +20,7 @@ function isRefCount(accountInfo) {
 async function checkReferenceCount(networkKey, address, substrateApiMap, chainInfo) {
   const apiProps = await substrateApiMap[networkKey].isReady;
   const api = apiProps.api;
-  if ((0, _utils._isChainEvmCompatible)(chainInfo)) {
+  if ((0, _utils2._isChainEvmCompatible)(chainInfo)) {
     return false;
   }
 
@@ -35,7 +36,7 @@ async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMap, chai
       supportTransferAll: false
     };
   }
-  if ((0, _utils._isChainEvmCompatible)(chainInfo)) {
+  if ((0, _utils2._isChainEvmCompatible)(chainInfo)) {
     return {
       supportTransfer: true,
       supportTransferAll: true
@@ -59,32 +60,32 @@ async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMap, chai
   if (!(isTxCurrenciesSupported || isTxBalancesSupported || isTxTokensSupported || isTxEqBalancesSupported)) {
     return result;
   }
-  if ((0, _utils._isTokenWasmSmartContract)(tokenInfo) && api.query.contracts) {
+  if ((0, _utils2._isTokenWasmSmartContract)(tokenInfo) && api.query.contracts) {
     // for PSP tokens
     return {
       supportTransfer: true,
       supportTransferAll: true
     };
   }
-  if (_constants._TRANSFER_CHAIN_GROUP.acala.includes(networkKey) && !(0, _utils._isNativeToken)(tokenInfo) && isTxCurrenciesSupported) {
+  if (_constants._TRANSFER_CHAIN_GROUP.acala.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxCurrenciesSupported) {
     result.supportTransfer = true;
     result.supportTransferAll = false;
-  } else if (_constants._TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !(0, _utils._isNativeToken)(tokenInfo) && isTxTokensSupported) {
+  } else if (_constants._TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxTokensSupported) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
-  } else if (_constants._TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && !(0, _utils._isNativeToken)(tokenInfo) && isTxEqBalancesSupported) {
+  } else if (_constants._TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxEqBalancesSupported) {
     result.supportTransfer = true;
     result.supportTransferAll = false;
   } else if (_constants._TRANSFER_CHAIN_GROUP.crab.includes(networkKey) && _constants._BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol)) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
-  } else if (isTxBalancesSupported && (0, _utils._isNativeToken)(tokenInfo)) {
+  } else if (isTxBalancesSupported && (0, _utils2._isNativeToken)(tokenInfo)) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
-  } else if (_constants._TRANSFER_CHAIN_GROUP.bitcountry.includes(networkKey) && !(0, _utils._isNativeToken)(tokenInfo) && _constants._BALANCE_TOKEN_GROUP.bitcountry.includes(tokenInfo.symbol)) {
+  } else if (_constants._TRANSFER_CHAIN_GROUP.bitcountry.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && _constants._BALANCE_TOKEN_GROUP.bitcountry.includes(tokenInfo.symbol)) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
-  } else if (_constants._TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !(0, _utils._isNativeToken)(tokenInfo)) {
+  } else if (_constants._TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo)) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
   }
@@ -111,45 +112,45 @@ const createTransferExtrinsic = async _ref => {
   const isTxEqBalancesSupported = !!api && !!api.tx && !!api.tx.eqBalances;
   let transferAmount; // for PSP-22 tokens, might be deprecated in the future
 
-  if ((0, _utils._isTokenWasmSmartContract)(tokenInfo) && api.query.contracts) {
-    const contractPromise = (0, _wasm.getPSP22ContractPromise)(api, (0, _utils._getContractAddressOfToken)(tokenInfo));
-    const transferQuery = await contractPromise.query['psp22::transfer'](from, {
-      gasLimit: -1
-    }, to, value, {});
-    const gasLimit = transferQuery.gasRequired.toString();
+  if ((0, _utils2._isTokenWasmSmartContract)(tokenInfo) && api.query.contracts) {
+    const contractPromise = (0, _wasm.getPSP22ContractPromise)(api, (0, _utils2._getContractAddressOfToken)(tokenInfo));
+    // @ts-ignore
+    const gasLimit = await (0, _utils.getWasmContractGasLimit)(api, from, 'psp22::transfer', contractPromise, {}, [from, value, {}]);
+
+    // @ts-ignore
     transfer = contractPromise.tx['psp22::transfer']({
       gasLimit
     }, to, value, {});
     transferAmount = value;
-  } else if (_constants._TRANSFER_CHAIN_GROUP.acala.includes(networkKey) && !(0, _utils._isNativeToken)(tokenInfo) && isTxCurrenciesSupported) {
+  } else if (_constants._TRANSFER_CHAIN_GROUP.acala.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxCurrenciesSupported) {
     if (transferAll) {
       // currently Acala, Karura, Acala testnet do not have transfer all method for sub token
     } else if (value) {
-      transfer = api.tx.currencies.transfer(to, (0, _utils._getTokenOnChainInfo)(tokenInfo), value);
+      transfer = api.tx.currencies.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo), value);
     }
-  } else if (_constants._TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !(0, _utils._isNativeToken)(tokenInfo) && isTxTokensSupported) {
+  } else if (_constants._TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxTokensSupported) {
     if (transferAll) {
-      transfer = api.tx.tokens.transferAll(to, (0, _utils._getTokenOnChainInfo)(tokenInfo), false);
+      transfer = api.tx.tokens.transferAll(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo), false);
     } else if (value) {
-      transfer = api.tx.tokens.transfer(to, (0, _utils._getTokenOnChainInfo)(tokenInfo), new _util.BN(value));
+      transfer = api.tx.tokens.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo), new _util.BN(value));
     }
-  } else if (_constants._TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && !(0, _utils._isNativeToken)(tokenInfo) && isTxEqBalancesSupported) {
+  } else if (_constants._TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo) && isTxEqBalancesSupported) {
     if (transferAll) {
       // currently genshiro_testnet, genshiro, equilibrium_parachain do not have transfer all method for tokens
     } else if (value) {
-      transfer = api.tx.eqBalances.transfer((0, _utils._getTokenOnChainAssetId)(tokenInfo), to, value);
+      transfer = api.tx.eqBalances.transfer((0, _utils2._getTokenOnChainAssetId)(tokenInfo), to, value);
     }
-  } else if (!(0, _utils._isNativeToken)(tokenInfo) && (_constants._TRANSFER_CHAIN_GROUP.crab.includes(networkKey) || _constants._BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol))) {
+  } else if (!(0, _utils2._isNativeToken)(tokenInfo) && (_constants._TRANSFER_CHAIN_GROUP.crab.includes(networkKey) || _constants._BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol))) {
     if (transferAll) {
       transfer = api.tx.kton.transferAll(to, false);
     } else if (value) {
       transfer = api.tx.kton.transfer(to, new _util.BN(value));
     }
-  } else if (_constants._TRANSFER_CHAIN_GROUP.bitcountry.includes(networkKey) && !(0, _utils._isNativeToken)(tokenInfo)) {
-    transfer = api.tx.currencies.transfer(to, (0, _utils._getTokenOnChainInfo)(tokenInfo), value);
-  } else if (_constants._TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !(0, _utils._isNativeToken)(tokenInfo)) {
-    transfer = api.tx.assets.transfer((0, _utils._getTokenOnChainAssetId)(tokenInfo), to, value);
-  } else if (isTxBalancesSupported && (0, _utils._isNativeToken)(tokenInfo)) {
+  } else if (_constants._TRANSFER_CHAIN_GROUP.bitcountry.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo)) {
+    transfer = api.tx.currencies.transfer(to, (0, _utils2._getTokenOnChainInfo)(tokenInfo), value);
+  } else if (_constants._TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !(0, _utils2._isNativeToken)(tokenInfo)) {
+    transfer = api.tx.assets.transfer((0, _utils2._getTokenOnChainAssetId)(tokenInfo), to, value);
+  } else if (isTxBalancesSupported && (0, _utils2._isNativeToken)(tokenInfo)) {
     if (transferAll) {
       transfer = api.tx.balances.transferAll(to, false);
     } else if (value) {

package/cjs/koni/api/nft/acala_nft/index.js

@@ -117,8 +117,11 @@ class AcalaNftApi extends _nft.BaseNftApi {
         };
         params.updateItem(this.chain, parsedNft, address);
         params.updateCollection(this.chain, parsedCollection);
-        // params.updateReady(true);
       }));
+      Object.entries(collectionNftIds).forEach(_ref => {
+        let [collectionId, nftIds] = _ref;
+        params.cleanUpNfts(this.chain, address, collectionId, nftIds);
+      });
     } catch (e) {
       console.error('Failed to fetch acala nft', e);
     }

package/cjs/koni/api/nft/bit.country/index.js

@@ -114,8 +114,11 @@ class BitCountryNftApi extends _nft.BaseNftApi {
         };
         params.updateItem(this.chain, parsedNft, address);
         params.updateCollection(this.chain, parsedCollection);
-        // params.updateReady(true);
       }));
+      Object.entries(collectionNftIds).forEach(_ref => {
+        let [collectionId, nftIds] = _ref;
+        params.cleanUpNfts(this.chain, address, collectionId, nftIds);
+      });
     } catch (e) {
       console.error('Failed to fetch bit.country nft', e);
     }

package/cjs/koni/api/nft/evm_nft/index.js

@@ -82,6 +82,7 @@ class EvmNftApi extends _nft.BaseNftApi {
     const contract = new this.evmApi.api.eth.Contract(_helper._ERC721_ABI, smartContract);
     let ownItem = false;
     let collectionImage;
+    const nftOwnerMap = {};
     await Promise.all(this.addresses.map(async address => {
       if (!(0, _utilCrypto.isEthereumAddress)(address)) {
         return;
@@ -132,8 +133,9 @@ class EvmNftApi extends _nft.BaseNftApi {
             }
           }
         }));
+        nftOwnerMap[address] = nftIds;
       } catch (e) {
-        console.error('evm nft error', e);
+        console.error('EVM NFT error', e);
       }
     }));
     if (ownItem) {
@@ -145,10 +147,12 @@ class EvmNftApi extends _nft.BaseNftApi {
         originAsset: tokenInfo.slug
       };
       nftParams.updateCollection(this.chain, nftCollection);
-      // nftParams.updateReady(true);
+      Object.entries(nftOwnerMap).forEach(_ref => {
+        let [owner, nftIds] = _ref;
+        nftParams.cleanUpNfts(this.chain, owner, smartContract, nftIds);
+      });
     }
   }
-
   async handleNfts(params) {
     if (!this.evmContracts || this.evmContracts.length === 0) {
       return;

package/cjs/koni/api/nft/index.js

@@ -132,19 +132,16 @@ class NftHandler {
       console.error('error setting up nft handlers', e);
     }
   }
-  async handleNfts(nftContracts, updateItem, updateCollection) {
+  async handleNfts(nftContracts, updateItem, updateCollection, cleanUpNfts) {
     this.setupApi();
     this.setupNftContracts(nftContracts);
     await Promise.all(this.handlers.map(async handler => {
       await handler.fetchNfts({
         updateItem,
-        updateCollection
+        updateCollection,
+        cleanUpNfts
       });
     }));
   }
-  parseAssetId(id) {
-    const numberId = parseInt(id);
-    return numberId.toString();
-  }
 }
 exports.NftHandler = NftHandler;