@subwallet/extension-base 1.0.2-2 → 1.0.3-0

package/koni/api/dotsama/balance.js

@@ -7,12 +7,12 @@ import { ASTAR_REFRESH_BALANCE_INTERVAL, SUB_TOKEN_REFRESH_BALANCE_INTERVAL } fr
 import { getEVMBalance } from '@subwallet/extension-base/koni/api/tokens/evm/balance';
 import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
 import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
+import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { state } from '@subwallet/extension-base/koni/background/handlers';
-import { _BALANCE_CHAIN_GROUP, _BALANCE_TOKEN_GROUP, _PURE_EVM_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
-import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isNativeToken, _isPureEvmChain, _isSmartContractToken, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _BALANCE_CHAIN_GROUP, _PURE_EVM_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
+import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isPureEvmChain, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses, sumBN } from '@subwallet/extension-base/utils';
 import { BN, BN_ZERO } from '@polkadot/util';
-import { isEthereumAddress } from '@polkadot/util-crypto';
 // main subscription
 export function subscribeBalance(addresses, chainInfoMap, substrateApiMap, evmApiMap, callback) {
   const [substrateAddresses, evmAddresses] = categoryAddresses(addresses);
@@ -95,11 +95,16 @@ async function subscribeWithSystemAccountPallet(addresses, chainInfo, networkAPI
     let pooledStakingBalance = BN_ZERO;
     if (_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 BN(poolMemberData.points.toString());
-          pooledStakingBalance = pooledStakingBalance.add(pooledBalance);
+      if (poolMemberDatas) {
+        for (const _poolMemberData of poolMemberDatas) {
+          const poolMemberData = _poolMemberData.toPrimitive();
+          if (poolMemberData) {
+            const pooledBalance = new BN(poolMemberData.points.toString());
+            pooledStakingBalance = pooledStakingBalance.add(pooledBalance);
+            Object.entries(poolMemberData.unbondingEras).forEach(([, amount]) => {
+              pooledStakingBalance = pooledStakingBalance.add(new BN(amount));
+            });
+          }
         }
       }
     }
@@ -120,7 +125,7 @@ async function subscribeWithSystemAccountPallet(addresses, chainInfo, networkAPI
     const free = total.sub(locked);
     callBack({
       tokenSlug: chainNativeTokenSlug,
-      free: free.toString(),
+      free: free.gte(BN_ZERO) ? free.toString() : '0',
       locked: locked.toString(),
       state: APIItemState.READY,
       substrateInfo: {
@@ -134,79 +139,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 = {};
@@ -250,10 +182,12 @@ 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: 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 = sumBN(balances.map(bal => new BN(bal || 0)));
         callBack({
@@ -263,10 +197,11 @@ function subscribePSP22Balance(addresses, chain, api, callBack) {
           state: 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 = state.getAssetByChainAndAsset(chain, [_AssetType.PSP22]);
   Object.entries(tokenList).forEach(([slug, tokenInfo]) => {
     psp22ContractMap[slug] = getPSP22ContractPromise(api, _getContractAddressOfToken(tokenInfo));
@@ -396,11 +331,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 BN(String(bdata === null || bdata === void 0 ? void 0 : bdata.balance) || '0');
+            const addressBalance = new BN(String(bdata === null || bdata === void 0 ? void 0 : bdata.balance).replaceAll(',', '') || '0');
 
             // @ts-ignore
             if (bdata !== null && bdata !== void 0 && bdata.isFrozen) {
@@ -454,114 +389,4 @@ export function subscribeEVMBalance(chain, addresses, evmApiMap, callback, token
     clearInterval(interval);
     unsub2 && unsub2();
   };
-}
-export 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 ? state.getAssetBySlug(tokenSlug) : state.getNativeTokenInfo(chain);
-  const chainInfo = state.getChainInfo(chain);
-
-  // Only EVM Address use with EVM network
-  if (Boolean(web3Api || _isChainEvmCompatible(chainInfo)) !== isEthereumAddress(address)) {
-    if (!isEthereumAddress(address)) {
-      return '0';
-    }
-  }
-
-  // web3Api support mean isEthereum Network support
-  if (web3Api) {
-    if (_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 (_getContractAddressOfToken(tokenInfo).length > 0) {
-        return '0';
-      }
-      const contract = getERC20Contract(chain, _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 (_isSmartContractToken(tokenInfo)) {
-        if (_getContractAddressOfToken(tokenInfo).length > 0) {
-          return '0';
-        }
-        const contractPromise = getPSP22ContractPromise(api, _getContractAddressOfToken(tokenInfo));
-        const balanceOf = await contractPromise.query['psp22::balanceOf'](address, {
-          gasLimit: -1
-        }, address);
-        return balanceOf.output ? balanceOf.output.toString() : '0';
-      } else if (_BALANCE_CHAIN_GROUP.genshiro.includes(chain)) {
-        var _balance$asPositive;
-        const onChainInfo = _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 (_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 = _getTokenOnChainAssetId(tokenInfo);
-        if (!_isNativeToken(tokenInfo)) {
-          // @ts-ignore
-          freeTokenBalance = balanceList.find(data => data[0] === assetId);
-        } else {
-          freeTokenBalance = balanceList[0];
-        }
-        return freeTokenBalance ? freeTokenBalance[1].positive.toString() : '0';
-      } else if (_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 (!_isNativeToken(tokenInfo) && _BALANCE_CHAIN_GROUP.statemine.includes(chain)) {
-        var _balanceInfo$balance;
-        const assetId = _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 (!_isNativeToken(tokenInfo) || _BALANCE_CHAIN_GROUP.kintsugi.includes(chain)) {
-        var _balance$free;
-        const onChainInfo = _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 (_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 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 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/koni/api/dotsama/transfer.js

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
+import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { _BALANCE_TOKEN_GROUP, _TRANSFER_CHAIN_GROUP, _TRANSFER_NOT_SUPPORTED_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isNativeToken, _isTokenWasmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
 import { BN } from '@polkadot/util';
@@ -58,15 +59,17 @@ export async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMa
       supportTransferAll: true
     };
   }
+
+  // TODO: need review
   if (_TRANSFER_CHAIN_GROUP.acala.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxCurrenciesSupported) {
     result.supportTransfer = true;
-    result.supportTransferAll = false;
+    result.supportTransferAll = true;
   } else if (_TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxTokensSupported) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
   } else if (_TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxEqBalancesSupported) {
     result.supportTransfer = true;
-    result.supportTransferAll = false;
+    result.supportTransferAll = true;
   } else if (_TRANSFER_CHAIN_GROUP.crab.includes(networkKey) && _BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol)) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
@@ -104,20 +107,16 @@ export const createTransferExtrinsic = async ({
 
   if (_isTokenWasmSmartContract(tokenInfo) && api.query.contracts) {
     const contractPromise = getPSP22ContractPromise(api, _getContractAddressOfToken(tokenInfo));
-    const transferQuery = await contractPromise.query['psp22::transfer'](from, {
-      gasLimit: -1
-    }, to, value, {});
-    const gasLimit = transferQuery.gasRequired.toString();
+    // @ts-ignore
+    const gasLimit = await getWasmContractGasLimit(api, from, 'psp22::transfer', contractPromise, {}, [from, value, {}]);
+
+    // @ts-ignore
     transfer = contractPromise.tx['psp22::transfer']({
       gasLimit
     }, to, value, {});
     transferAmount = value;
   } else if (_TRANSFER_CHAIN_GROUP.acala.includes(networkKey) && !_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, _getTokenOnChainInfo(tokenInfo), value);
-    }
+    transfer = api.tx.currencies.transfer(to, _getTokenOnChainInfo(tokenInfo), value);
   } else if (_TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxTokensSupported) {
     if (transferAll) {
       transfer = api.tx.tokens.transferAll(to, _getTokenOnChainInfo(tokenInfo), false);
@@ -125,11 +124,7 @@ export const createTransferExtrinsic = async ({
       transfer = api.tx.tokens.transfer(to, _getTokenOnChainInfo(tokenInfo), new BN(value));
     }
   } else if (_TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && !_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(_getTokenOnChainAssetId(tokenInfo), to, value);
-    }
+    transfer = api.tx.eqBalances.transfer([_getTokenOnChainAssetId(tokenInfo)], to, value);
   } else if (!_isNativeToken(tokenInfo) && (_TRANSFER_CHAIN_GROUP.crab.includes(networkKey) || _BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol))) {
     if (transferAll) {
       transfer = api.tx.kton.transferAll(to, false);

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

@@ -72,21 +72,21 @@ export class AcalaNftApi extends BaseNftApi {
     return (await this.substrateApi.api.query.ormlNFT.tokens(assetId.classId, assetId.tokenId)).toHuman();
   }
   async handleNft(address, params) {
-    // const start = performance.now();
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
+        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
-      const collectionNftIds = {};
+      const collectionIds = [];
+      const nftIds = [];
       await Promise.all(assetIds.map(async assetId => {
         const parsedClassId = this.parseTokenId(assetId.classId);
         const parsedTokenId = this.parseTokenId(assetId.tokenId);
-        if (collectionNftIds[parsedClassId]) {
-          collectionNftIds[parsedClassId].push(parsedTokenId);
-        } else {
-          collectionNftIds[parsedClassId] = [parsedTokenId];
+        if (!collectionIds.includes(parsedClassId)) {
+          collectionIds.push(parsedClassId);
         }
+        nftIds.push(parsedTokenId);
         const [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetails(parseInt(parsedClassId))]);
         const parsedNft = {
           id: parsedTokenId,
@@ -110,8 +110,8 @@ export class AcalaNftApi extends BaseNftApi {
         };
         params.updateItem(this.chain, parsedNft, address);
         params.updateCollection(this.chain, parsedCollection);
-        // params.updateReady(true);
       }));
+      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error('Failed to fetch acala nft', e);
     }

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

@@ -73,17 +73,18 @@ export class BitCountryNftApi extends BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
+        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
-      const collectionNftIds = {};
+      const collectionIds = [];
+      const nftIds = [];
       await Promise.all(assetIds.map(async assetId => {
         const parsedClassId = this.parseTokenId(assetId.classId);
         const parsedTokenId = this.parseTokenId(assetId.tokenId);
-        if (collectionNftIds[parsedClassId]) {
-          collectionNftIds[parsedClassId].push(parsedTokenId);
-        } else {
-          collectionNftIds[parsedClassId] = [parsedTokenId];
+        if (!collectionIds.includes(parsedClassId)) {
+          collectionIds.push(parsedClassId);
         }
+        nftIds.push(parsedTokenId);
         const [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetails(parsedClassId)]);
         const parsedNft = {
           id: parsedTokenId,
@@ -107,8 +108,8 @@ export class BitCountryNftApi extends BaseNftApi {
         };
         params.updateItem(this.chain, parsedNft, address);
         params.updateCollection(this.chain, parsedCollection);
-        // params.updateReady(true);
       }));
+      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error('Failed to fetch bit.country nft', e);
     }

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

@@ -75,6 +75,7 @@ export class EvmNftApi extends BaseNftApi {
     const contract = new this.evmApi.api.eth.Contract(_ERC721_ABI, smartContract);
     let ownItem = false;
     let collectionImage;
+    const nftOwnerMap = {};
     await Promise.all(this.addresses.map(async address => {
       if (!isEthereumAddress(address)) {
         return;
@@ -84,6 +85,7 @@ export class EvmNftApi extends BaseNftApi {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const balance = await contract.methods.balanceOf(address).call();
       if (Number(balance) === 0) {
+        nftParams.cleanUpNfts(this.chain, address, [smartContract], []);
         return;
       }
       const itemIndexes = [];
@@ -125,8 +127,9 @@ export class EvmNftApi extends BaseNftApi {
             }
           }
         }));
+        nftOwnerMap[address] = nftIds;
       } catch (e) {
-        console.error('evm nft error', e);
+        console.error('EVM NFT error', e);
       }
     }));
     if (ownItem) {
@@ -138,10 +141,11 @@ export class EvmNftApi extends BaseNftApi {
         originAsset: tokenInfo.slug
       };
       nftParams.updateCollection(this.chain, nftCollection);
-      // nftParams.updateReady(true);
+      Object.entries(nftOwnerMap).forEach(([owner, nftIds]) => {
+        nftParams.cleanUpNfts(this.chain, owner, [smartContract], nftIds);
+      });
     }
   }
-
   async handleNfts(params) {
     if (!this.evmContracts || this.evmContracts.length === 0) {
       return;

package/koni/api/nft/index.d.ts

@@ -17,6 +17,5 @@ export declare class NftHandler {
     setAddresses(addresses: string[]): void;
     private setupNftContracts;
     private setupApi;
-    handleNfts(nftContracts: _ChainAsset[], updateItem: (chain: string, data: NftItem, owner: string) => void, updateCollection: (chain: string, data: NftCollection) => void): Promise<void>;
-    parseAssetId(id: string): string;
+    handleNfts(nftContracts: _ChainAsset[], updateItem: (chain: string, data: NftItem, owner: string) => void, updateCollection: (chain: string, data: NftCollection) => void, cleanUpNfts: (chain: string, owner: string, collectionId: string[], nftIds: string[], ownNothing?: boolean) => void): Promise<void>;
 }

package/koni/api/nft/index.js

@@ -124,18 +124,15 @@ export 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();
-  }
 }

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

@@ -82,17 +82,18 @@ export class KaruraNftApi extends BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
+        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
-      const collectionNftIds = {};
+      const collectionIds = [];
+      const nftIds = [];
       await Promise.all(assetIds.map(async assetId => {
         const parsedClassId = this.parseTokenId(assetId.classId);
         const parsedTokenId = this.parseTokenId(assetId.tokenId);
-        if (collectionNftIds[parsedClassId]) {
-          collectionNftIds[parsedClassId].push(parsedTokenId);
-        } else {
-          collectionNftIds[parsedClassId] = [parsedTokenId];
+        if (!collectionIds.includes(parsedClassId)) {
+          collectionIds.push(parsedClassId);
         }
+        nftIds.push(parsedTokenId);
         const [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetails(parseInt(parsedClassId))]);
         const parsedNft = {
           id: parsedTokenId,
@@ -114,8 +115,8 @@ export class KaruraNftApi extends BaseNftApi {
         };
         params.updateItem(this.chain, parsedNft, address);
         params.updateCollection(this.chain, parsedCollection);
-        // params.updateReady(true);
       }));
+      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error('Failed to fetch karura nft', e);
     }

package/koni/api/nft/nft.d.ts

@@ -3,6 +3,7 @@ import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain
 export interface HandleNftParams {
     updateItem: (chain: string, data: NftItem, owner: string) => void;
     updateCollection: (chain: string, data: NftCollection) => void;
+    cleanUpNfts: (chain: string, owner: string, collectionId: string[], nftIds: string[], ownNothing?: boolean) => void;
 }
 export declare abstract class BaseNftApi {
     chain: string;

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

@@ -132,6 +132,7 @@ export class RmrkNftApi extends BaseNftApi {
       const kusamaAddress = reformatAddress(address, 2);
       allNfts = await this.getAllByAccount(kusamaAddress);
       if (allNfts.length <= 0) {
+        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionInfoUrl = [];
@@ -231,9 +232,18 @@ export class RmrkNftApi extends BaseNftApi {
           image: allCollectionMeta[item.collectionId] ? this.parseUrl(allCollectionMeta[item.collectionId].image) : null,
           chain: this.chain
         };
+        const nftIds = [];
+        allNfts.forEach(nft => {
+          const nftCollectionId = nft === null || nft === void 0 ? void 0 : nft.collectionId;
+          if (nftCollectionId === item.collectionId) {
+            nftIds.push(nft === null || nft === void 0 ? void 0 : nft.id);
+          }
+        });
         params.updateCollection(this.chain, parsedCollection);
-        // params.updateReady(true);
       });
+      const allCollectionIds = allCollections.map(item => item.collectionId);
+      const allNftIds = allNfts.map(nft => nft === null || nft === void 0 ? void 0 : nft.id);
+      params.cleanUpNfts(this.chain, address, allCollectionIds, allNftIds);
     } catch (e) {
       console.error('Failed to fetch rmrk nft', e);
     }

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

@@ -86,17 +86,18 @@ export default class StatemineNftApi extends BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
+        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
-      const collectionNftIds = {};
+      const collectionIds = [];
+      const nftIds = [];
       await Promise.all(assetIds.map(async assetId => {
         const parsedClassId = this.parseTokenId(assetId.classId);
         const parsedTokenId = this.parseTokenId(assetId.tokenId);
-        if (collectionNftIds[parsedClassId]) {
-          collectionNftIds[parsedClassId].push(parsedTokenId);
-        } else {
-          collectionNftIds[parsedClassId] = [parsedTokenId];
+        if (!collectionIds.includes(parsedClassId)) {
+          collectionIds.push(parsedClassId);
         }
+        nftIds.push(parsedTokenId);
         const [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetail(parseInt(parsedClassId))]);
         const parsedNft = {
           id: parsedTokenId,
@@ -115,8 +116,8 @@ export default class StatemineNftApi extends BaseNftApi {
           image: collectionMeta && collectionMeta.image ? this.parseUrl(collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.image) : undefined
         };
         params.updateCollection(this.chain, parsedCollection);
-        // params.updateReady(true);
       }));
+      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error('Failed to fetch statemine nft', e);
     }

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

@@ -133,6 +133,8 @@ export default class UniqueNftApi extends BaseNftApi {
           }
         }
       }));
+      const collectionIds = [];
+      let allNftIds = [];
       await Promise.all(allCollectionId.map(async collectionId => {
         const collectionIdStr = collectionId.toString();
 
@@ -140,6 +142,8 @@ export default class UniqueNftApi extends BaseNftApi {
         const collection = (await this.substrateApi.api.query.nft.collectionById(collectionId)).toJSON();
         collectionMap[collectionIdStr] = collection;
         const nftIds = Object.entries(nftMap).filter(item => item[1] === collectionId).map(item => item[0]);
+        collectionIds.push(collectionIdStr);
+        allNftIds = allNftIds.concat(nftIds);
         const parsedCollection = {
           collectionId: collectionIdStr,
           chain: this.chain
@@ -166,10 +170,10 @@ export default class UniqueNftApi extends BaseNftApi {
             }
             params.updateItem(this.chain, parsedItem, address);
             params.updateCollection(this.chain, parsedCollection);
-            // params.updateReady(true);
           }
         }));
       }));
+      params.cleanUpNfts(this.chain, address, collectionIds, allNftIds);
     } catch (e) {
       console.error('Failed to fetch unique nft', e);
     }

package/koni/api/nft/wasm_nft/index.d.ts

@@ -8,8 +8,6 @@ export declare class WasmNftApi extends BaseNftApi {
     private parseFeaturedTokenUri;
     private parseFeaturedNftImage;
     private parseFeaturedCollectionImage;
-    private getCollectionAttributes;
-    private processOnChainMetadata;
     private processOffChainMetadata;
     private getItemsByCollection;
     fetchNfts(params: HandleNftParams): Promise<number>;