@subwallet/extension-base 1.3.70-2 → 1.3.72-0

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.70-2",
+  "version": "1.3.72-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1486,6 +1486,11 @@
       "require": "./cjs/services/migration-service/scripts/databases/MigrateAssetSetting20251107.js",
       "default": "./services/migration-service/scripts/databases/MigrateAssetSetting20251107.js"
     },
+    "./services/migration-service/scripts/databases/MigrateAssetSetting20251223": {
+      "types": "./services/migration-service/scripts/databases/MigrateAssetSetting20251223.d.ts",
+      "require": "./cjs/services/migration-service/scripts/databases/MigrateAssetSetting20251223.js",
+      "default": "./services/migration-service/scripts/databases/MigrateAssetSetting20251223.js"
+    },
     "./services/migration-service/scripts/databases/MigrateEarningHistory": {
       "types": "./services/migration-service/scripts/databases/MigrateEarningHistory.d.ts",
       "require": "./cjs/services/migration-service/scripts/databases/MigrateEarningHistory.js",
@@ -1631,6 +1636,11 @@
       "require": "./cjs/services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251107.js",
       "default": "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251107.js"
     },
+    "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251223": {
+      "types": "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251223.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251223.js",
+      "default": "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251223.js"
+    },
     "./services/migration-service/scripts/MigrateWalletReference": {
       "types": "./services/migration-service/scripts/MigrateWalletReference.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateWalletReference.js",
@@ -2026,6 +2036,16 @@
       "require": "./cjs/services/subscan-service/types.js",
       "default": "./services/subscan-service/types.js"
     },
+    "./services/substrate-proxy-service": {
+      "types": "./services/substrate-proxy-service/index.d.ts",
+      "require": "./cjs/services/substrate-proxy-service/index.js",
+      "default": "./services/substrate-proxy-service/index.js"
+    },
+    "./services/substrate-proxy-service/constant": {
+      "types": "./services/substrate-proxy-service/constant.d.ts",
+      "require": "./cjs/services/substrate-proxy-service/constant.js",
+      "default": "./services/substrate-proxy-service/constant.js"
+    },
     "./services/swap-service": {
       "types": "./services/swap-service/index.d.ts",
       "require": "./cjs/services/swap-service/index.js",
@@ -2521,6 +2541,16 @@
       "require": "./cjs/types/setting.js",
       "default": "./types/setting.js"
     },
+    "./types/substrateProxyAccount": {
+      "types": "./types/substrateProxyAccount/index.d.ts",
+      "require": "./cjs/types/substrateProxyAccount/index.js",
+      "default": "./types/substrateProxyAccount/index.js"
+    },
+    "./types/substrateProxyAccount/actions": {
+      "types": "./types/substrateProxyAccount/actions/index.d.ts",
+      "require": "./cjs/types/substrateProxyAccount/actions/index.js",
+      "default": "./types/substrateProxyAccount/actions/index.js"
+    },
     "./types/swap": {
       "types": "./types/swap/index.d.ts",
       "require": "./cjs/types/swap/index.js",
@@ -2943,22 +2973,22 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet-monorepos/subwallet-services-sdk": "0.1.14",
-    "@subwallet/chain-list": "0.2.122",
-    "@subwallet/extension-base": "^1.3.70-2",
-    "@subwallet/extension-chains": "^1.3.70-2",
-    "@subwallet/extension-dapp": "^1.3.70-2",
-    "@subwallet/extension-inject": "^1.3.70-2",
-    "@subwallet/keyring": "^0.1.13",
-    "@subwallet/ui-keyring": "^0.1.13",
+    "@subwallet/chain-list": "0.2.123",
+    "@subwallet/extension-base": "^1.3.72-0",
+    "@subwallet/extension-chains": "^1.3.72-0",
+    "@subwallet/extension-dapp": "^1.3.72-0",
+    "@subwallet/extension-inject": "^1.3.72-0",
+    "@subwallet/keyring": "^0.1.14",
+    "@subwallet/ui-keyring": "^0.1.14",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",
     "@ton/ton": "^15.0.0",
     "@walletconnect/keyvaluestorage": "^1.1.1",
-    "@walletconnect/sign-client": "2.21.5",
-    "@walletconnect/types": "2.21.5",
-    "@walletconnect/utils": "2.21.5",
+    "@walletconnect/sign-client": "^2.23.0",
+    "@walletconnect/types": "2.23.0",
+    "@walletconnect/utils": "2.23.0",
     "avail-js-sdk": "^0.2.12",
-    "axios": "^1.6.2",
+    "axios": "^1.13.2",
     "bignumber.js": "^9.1.1",
     "bitcoinjs-lib": "6.1.5",
     "bn.js": "^5.2.1",
@@ -2968,7 +2998,6 @@
     "cross-fetch": "^4.1.0",
     "dexie": "^3.2.2",
     "dexie-export-import": "^4.0.7",
-    "eth-simple-keyring": "^4.2.0",
     "ethereumjs-util": "^7.1.5",
     "ethers": "^6.4.2",
     "eventemitter3": "^5.0.0",
@@ -2979,19 +3008,19 @@
     "json-rpc-engine": "^6.1.0",
     "manta-extension-sdk": "^1.1.0",
     "moment": "^2.29.4",
-    "protobufjs": "^7.2.4",
+    "protobufjs": "^7.5.4",
     "rxjs": "^7.8.1",
     "sails-js": "^0.4.2",
     "sails-js-parser": "^0.4.2",
     "ts-md5": "^1.3.1",
     "tweetnacl": "^1.0.3",
     "uuid": "^9.0.0",
-    "web3": "^1.10.0",
-    "web3-core": "^1.10.0",
-    "web3-core-helpers": "^1.10.0",
-    "web3-core-subscriptions": "1.10.0",
-    "web3-eth": "1.10.0",
-    "web3-eth-contract": "^1.10.0",
-    "web3-utils": "^1.10.0"
+    "web3": "^1.10.4",
+    "web3-core": "^1.10.4",
+    "web3-core-helpers": "^1.10.4",
+    "web3-core-subscriptions": "1.10.4",
+    "web3-eth": "1.10.4",
+    "web3-eth-contract": "1.10.4",
+    "web3-utils": "1.10.4"
   }
 }

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.70-2'
+  version: '1.3.72-0'
 };

package/page/substrate/PostMessageProvider.js

@@ -4,6 +4,9 @@
 import EventEmitter from 'eventemitter3';
 import { isUndefined, logger } from '@polkadot/util';
 const l = logger('PostMessageProvider');
+
+// Same as https://github.com/polkadot-js/api/blob/57ca9a9c3204339e1e1f693fcacc33039868dc27/packages/rpc-provider/src/ws/Provider.ts#L17
+
 // External to class, this.# is not private enough (yet)
 let sendRequest;
 

package/services/balance-service/helpers/subscribe/cardano/utils.js

@@ -37,7 +37,6 @@ export async function retryCardanoTxStatus(fn, options) {
       await new Promise(resolve => setTimeout(resolve, options.delay)); // wait for delay period, then recall the fn()
     }
   }
-
   console.error('Cardano transaction timeout', lastError); // throw only last error, in case no successful result from fn()
 
   return false;

package/services/balance-service/helpers/subscribe/substrate/gear.js

@@ -59,7 +59,6 @@ export const subscribeGRC20Balance = ({
       }
     });
   };
-
   getTokenBalances();
   const interval = setInterval(getTokenBalances, SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
   return () => {
@@ -116,7 +115,6 @@ export const subscribeVftBalance = ({
       }
     });
   };
-
   getTokenBalances();
   const interval = setInterval(getTokenBalances, SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
   return () => {

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

@@ -13,7 +13,7 @@ import { _getTokensPalletLocked, _getTokensPalletTransferable } from '@subwallet
 import { _adaptX1Interior } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/contract-handler/wasm';
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
-import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
+import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX, USE_MULTILOCATION_INDEX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _checkSmartContractSupportByChain, _getAssetExistentialDeposit, _getAssetNetuid, _getChainExistentialDeposit, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getTokenTypesSupportedByChain, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { filterAlphaAssetsByChain, filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
@@ -343,7 +343,6 @@ const subscribePSP22Balance = ({
       }
     });
   };
-
   getTokenBalances();
   const interval = setInterval(getTokenBalances, SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
   return () => {
@@ -423,16 +422,27 @@ const subscribeAssetsAccountPallet = async ({
     }
   });
   const unsubList = await Promise.all(Object.values(tokenMap).map(tokenInfo => {
+    if (tokenInfo.slug === 'energy_web_x-LOCAL-stEWT') {
+      return timer(0, CRON_REFRESH_PRICE_INTERVAL).subscribe(() => {
+        const getEwtFrozenBalance = async () => {
+          const ewtTokenBalances = await queryEwtFrozenBalance(substrateApi, addresses, assetMap[tokenInfo.slug], extrinsicType);
+          callback(ewtTokenBalances);
+        };
+        getEwtFrozenBalance().catch(console.error);
+      });
+    }
     try {
       const assetIndex = _getTokenOnChainAssetId(tokenInfo);
-      if (assetIndex === '-1') {
+      if (assetIndex === '-1' && !USE_MULTILOCATION_INDEX.includes(chainInfo.slug)) {
         return undefined;
       }
+      const version = ['statemint', 'statemine', 'westend_assethub'].includes(chainInfo.slug) ? 4 : 3;
+      const index = USE_MULTILOCATION_INDEX.includes(chainInfo.slug) ? _adaptX1Interior(_getXcmAssetMultilocation(tokenInfo), version) : assetIndex;
       const params = [{
         section: 'query',
         module: assetsAccountKey.split('_')[1],
         method: assetsAccountKey.split('_')[2],
-        args: addresses.map(address => [assetIndex, address])
+        args: addresses.map(address => [index, address])
       }];
 
       // Get Token Balance
@@ -593,4 +603,37 @@ async function queryGigaTokenBalance(substrateApi, addresses, tokenInfo, extrins
       locked: totalLockedFromTransfer.toString()
     };
   }));
+}
+async function queryEwtFrozenBalance(substrateApi, addresses, tokenInfo, extrinsicType) {
+  const multilocation = _getXcmAssetMultilocation(tokenInfo);
+  return await Promise.all(addresses.map(async address => {
+    const [_frozenBalance, _balanceInfo] = await Promise.all([substrateApi.api.query.assetsFreezer.frozenBalances(multilocation, address), substrateApi.api.query.assets.account(multilocation, address)]);
+    const balanceInfo = _balanceInfo.toPrimitive();
+    if (!balanceInfo) {
+      // no balance info response
+      return {
+        address: address,
+        tokenSlug: tokenInfo.slug,
+        free: '0',
+        locked: '0',
+        state: APIItemState.READY
+      };
+    }
+    const transferableBalance = _getAssetsPalletTransferable(balanceInfo, _getAssetExistentialDeposit(tokenInfo), extrinsicType);
+    const totalLockedFromTransfer = _getAssetsPalletLocked(balanceInfo);
+    let freeBalance = transferableBalance;
+    let lockedBalance = totalLockedFromTransfer;
+    const frozenBalance = _frozenBalance.toPrimitive();
+    if (frozenBalance) {
+      freeBalance = transferableBalance - BigInt(frozenBalance);
+      lockedBalance = totalLockedFromTransfer + BigInt(frozenBalance);
+    }
+    return {
+      address: address,
+      tokenSlug: tokenInfo.slug,
+      free: freeBalance.toString(),
+      locked: lockedBalance.toString(),
+      state: APIItemState.READY
+    };
+  }));
 }

package/services/balance-service/helpers/subscribe/ton/utils.js

@@ -35,10 +35,8 @@ export async function retryTonTxStatus(fn, options) {
       await new Promise(resolve => setTimeout(resolve, options.delay)); // wait for delay period, then recall the fn()
     }
   }
-
   throw lastError; // throw only last error, in case no successful result from fn()
 }
-
 export function getMessageTxStatus(txByMsgInfo) {
   var _txDetailInfo$descrip, _txDetailInfo$descrip2, _txDetailInfo$descrip3, _txDetailInfo$descrip4, _txDetailInfo$descrip5, _txDetailInfo$descrip6, _txDetailInfo$out_msg, _txDetailInfo$out_msg2;
   const txDetailInfo = txByMsgInfo.transactions[0];
@@ -64,7 +62,6 @@ export async function getJettonTxStatus(tonApi, jettonTransferMsgHash) {
     const jettonInternalTransferTxInfoRaw = await tonApi.getTxByInMsg(jettonInternalTransferHash);
     return getMessageTxStatus(jettonInternalTransferTxInfoRaw); // Jetton Internal Transfer success -> Receiver successfully receiver fund!
   }
-
   return false;
 }
 export async function estimateTonTxFee(tonApi, messages, walletContract, _seqno) {

package/services/balance-service/index.d.ts

@@ -1,3 +1,4 @@
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { AmountData, DetectBalanceCache, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { RequestOptimalTransferProcess } from '@subwallet/extension-base/services/balance-service/helpers/process';
@@ -111,4 +112,11 @@ export declare class BalanceService implements StoppableServiceInterface {
     /** optimize token area **/
     enableOptimizeTokenPromise(): void;
     optimizeEnableTokens(): Promise<void>;
+    /** Return token slugs with balance in evm chain - only work with evm addresses & pure evm chains  **/
+    getEvmTokensBalanceByChain(address: string, chainSlug: string): Promise<string[]>;
+    /** Return token slugs with balance in substrate chain - only work with substrate chains that have subscanSlug **/
+    getSubstrateTokensBalanceByChain(address: string, chainSlug: string, assetsByChain: Record<string, _ChainAsset>): Promise<string[]>;
+    getCurrentAccountAddressByChain(chainInfo: _ChainInfo): string | undefined;
+    /** re-detect balance & enable custom, priority tokens when enabling chain again **/
+    updatePriorityAssetsByChain(chainSlug: string, visible: boolean): Promise<void>;
 }

package/services/balance-service/index.js

@@ -7,12 +7,12 @@ import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { _isXcmWithinSameConsensus } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getAcrossbridgeTransferProcessFromEvm, getDefaultTransferProcess, getSnowbridgeTransferProcessFromEvm } from '@subwallet/extension-base/services/balance-service/helpers/process';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
-import { _getChainNativeTokenSlug, _isCustomAsset, _isNativeToken, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getChainNativeTokenSlug, _isChainSubstrateCompatible, _isCustomAsset, _isCustomChain, _isNativeToken, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
 import DetectAccountBalanceStore from '@subwallet/extension-base/stores/DetectAccountBalance';
 import { BalanceType } from '@subwallet/extension-base/types';
 import { addLazy, createPromiseHandler, isAccountAll, waitTimeout } from '@subwallet/extension-base/utils';
 import { getKeypairTypeByAddress } from '@subwallet/keyring';
-import { EthereumKeypairTypes, SubstrateKeypairTypes } from '@subwallet/keyring/types';
+import { AllSubstrateKeypairTypes, EthereumKeypairTypes } from '@subwallet/keyring/types';
 import keyring from '@subwallet/ui-keyring';
 import subwalletApiSdk from '@subwallet-monorepos/subwallet-services-sdk';
 import BigN from 'bignumber.js';
@@ -458,7 +458,7 @@ export class BalanceService {
     const assetMap = this.state.chainService.getAssetRegistry();
     const promiseList = addresses.map(address => {
       const type = getKeypairTypeByAddress(address);
-      const typeValid = [...SubstrateKeypairTypes, ...EthereumKeypairTypes].includes(type);
+      const typeValid = [...AllSubstrateKeypairTypes, ...EthereumKeypairTypes].includes(type);
       if (typeValid) {
         return this.state.subscanService.getMultiChainBalance(address).catch(e => {
           console.error(e);
@@ -539,12 +539,10 @@ export class BalanceService {
           var _currentAssetSettings2;
           const chainSlug = tokenSlug.split('-')[0];
           const chainState = this.state.chainService.getChainStateByKey(chainSlug);
-          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === tokenSlug.toLowerCase());
-
-          // Cancel if chain is turned off by user
-          if (chainState && chainState.manualTurnOff) {
+          if (chainState !== null && chainState !== void 0 && chainState.manualTurnOff) {
             continue;
           }
+          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === tokenSlug.toLowerCase());
           if (existedKey && !((_currentAssetSettings2 = currentAssetSettings[existedKey]) !== null && _currentAssetSettings2 !== void 0 && _currentAssetSettings2.visible)) {
             needEnableChains.push(chainSlug);
             needActiveTokens.push(existedKey);
@@ -760,7 +758,7 @@ export class BalanceService {
       const assetMap = this.state.chainService.getAssetRegistry();
       const addresses = keyring.getPairs().map(account => account.address);
       const evmAddresses = addresses.filter(address => [...EthereumKeypairTypes].includes(getKeypairTypeByAddress(address)));
-      const substrateAddresses = addresses.filter(address => [...SubstrateKeypairTypes].includes(getKeypairTypeByAddress(address)));
+      const substrateAddresses = addresses.filter(address => [...AllSubstrateKeypairTypes].includes(getKeypairTypeByAddress(address)));
       const [nonZeroBalanceEvmToken, nonZeroBalanceSubstrateToken] = await Promise.all([this.evmDetectBalanceToken(evmAddresses), this.substrateDetectBalanceToken(substrateAddresses)]);
       const substrateDetectChain = this.substrateDetectBalanceChain();
       const evmDetectChain = await this.evmDetectBalanceChain();
@@ -788,5 +786,103 @@ export class BalanceService {
     }
   }
 
-  /** optimize token area **/
+  /** Return token slugs with balance in evm chain - only work with evm addresses & pure evm chains  **/
+  async getEvmTokensBalanceByChain(address, chainSlug) {
+    const tokenBalanceSlugs = await subwalletApiSdk.balanceDetectionApi.getSwEvmTokenBalanceByChain(address, chainSlug);
+    return tokenBalanceSlugs;
+  }
+
+  /** Return token slugs with balance in substrate chain - only work with substrate chains that have subscanSlug **/
+  async getSubstrateTokensBalanceByChain(address, chainSlug, assetsByChain) {
+    const tokenBalanceSlugs = [];
+    const balanceData = await this.state.subscanService.getMultiChainBalance(address);
+    if (!balanceData) {
+      return [];
+    }
+    for (const datum of balanceData) {
+      const {
+        balance,
+        bonded,
+        category,
+        locked,
+        network,
+        symbol
+      } = datum;
+      const chain = this.state.chainService.detectBalanceChainSlugMap[network];
+      if (chain !== chainSlug) {
+        continue;
+      }
+      const isBalanceEmpty = (!balance || balance === '0') && (!locked || locked === '0') && (!bonded || bonded === '0');
+      if (isBalanceEmpty) {
+        continue;
+      }
+      const tokenKey = `${chain}-${category === 'native' ? 'NATIVE' : 'LOCAL'}-${symbol.toUpperCase()}`;
+      const existedKey = Object.keys(assetsByChain).find(v => v.toLowerCase() === tokenKey.toLowerCase());
+      if (existedKey) {
+        tokenBalanceSlugs.push(existedKey);
+      }
+    }
+    return tokenBalanceSlugs;
+  }
+  getCurrentAccountAddressByChain(chainInfo) {
+    const proxyId = this.state.keyringService.context.currentAccount.proxyId;
+    const addresses = this.state.keyringService.context.addressesByProxyId(proxyId);
+    if (_isPureEvmChain(chainInfo)) {
+      const evmAddress = addresses.find(address => {
+        const type = getKeypairTypeByAddress(address);
+        return [...EthereumKeypairTypes].includes(type);
+      });
+      if (evmAddress) {
+        return evmAddress;
+      }
+    }
+    if (_isChainSubstrateCompatible(chainInfo)) {
+      const substrateAddress = addresses.find(address => {
+        const type = getKeypairTypeByAddress(address);
+        return [...AllSubstrateKeypairTypes, ...EthereumKeypairTypes].includes(type);
+      });
+      if (substrateAddress) {
+        return substrateAddress;
+      }
+    }
+    return undefined;
+  }
+
+  /** re-detect balance & enable custom, priority tokens when enabling chain again **/
+  async updatePriorityAssetsByChain(chainSlug, visible) {
+    const currentAssetSettings = await this.state.chainService.getAssetSettings();
+    const assetsByChain = this.state.chainService.getFungibleTokensByChain(chainSlug);
+    const priorityTokensMap = this.state.chainService.value.priorityTokens || {};
+    const chainInfo = this.state.chainService.getChainInfoByKey(chainSlug);
+    const address = this.getCurrentAccountAddressByChain(chainInfo);
+    const tokenSlugsWithBalance = [];
+    if (address && !_isCustomChain(chainInfo.slug)) {
+      if (_isPureEvmChain(chainInfo)) {
+        tokenSlugsWithBalance.push(...(await this.getEvmTokensBalanceByChain(address, chainSlug)));
+      } else if (_isChainSubstrateCompatible(chainInfo)) {
+        tokenSlugsWithBalance.push(...(await this.getSubstrateTokensBalanceByChain(address, chainSlug, assetsByChain)));
+      }
+    }
+    tokenSlugsWithBalance.forEach(tokenSlug => {
+      currentAssetSettings[tokenSlug] = {
+        visible: true
+      };
+    });
+    const priorityTokensList = priorityTokensMap.token && typeof priorityTokensMap.token === 'object' ? Object.keys(priorityTokensMap.token) : [];
+    for (const asset of Object.values(assetsByChain)) {
+      if (visible) {
+        const isPriorityToken = priorityTokensList.includes(asset.slug) || _isCustomAsset(asset.slug);
+        if (isPriorityToken || _isNativeToken(asset)) {
+          currentAssetSettings[asset.slug] = {
+            visible: true
+          };
+        }
+      } else {
+        currentAssetSettings[asset.slug] = {
+          visible: false
+        };
+      }
+    }
+    this.state.chainService.setAssetSettings(currentAssetSettings);
+  }
 }

package/services/balance-service/transfer/bitcoin-transfer.js

@@ -76,7 +76,6 @@ export async function createBitcoinTransaction(params) {
             script: pair.bitcoin.output,
             value: input.value // UTXO value in satoshis
           },
-
           tapInternalKey: pair.bitcoin.internalPubkey // X-only public key (32 bytes)
         });
       } else {

package/services/balance-service/transfer/smart-contract.js

@@ -62,7 +62,6 @@ export async function getEVMTransactionObject(props) {
     });
     gasLimit = Math.floor(gasEstimate * 1.1); // 10% buffer for fluctuations
   }
-
   transactionObject.gas = gasLimit;
   let estimateFee;
   if (feeCombine.maxFeePerGas) {

package/services/balance-service/transfer/token.d.ts

@@ -13,8 +13,4 @@ interface CreateTransferExtrinsicProps {
 }
 export declare const createSubstrateExtrinsic: ({ from, networkKey, substrateApi, to, tokenInfo, transferAll, value }: CreateTransferExtrinsicProps) => Promise<[SubmittableExtrinsic | null, string]>;
 export declare const getTransferMockTxFee: (address: string, chainInfo: _ChainInfo, tokenInfo: _ChainAsset, api: _SubstrateApi | _EvmApi | _TonApi) => Promise<BigN>;
-export declare const getAccountNetuidTokenInfo: (address: string, tokenInfo: _ChainAsset, substrateApi: _SubstrateApi) => Promise<{
-    isEnableTransferSubnet: boolean;
-    accountHotKey: string | undefined;
-}>;
 export {};

package/services/balance-service/transfer/token.js

@@ -3,10 +3,11 @@
 
 import { GearApi } from '@gear-js/api';
 import { _AssetType } from '@subwallet/chain-list/types';
+import { _adaptX1Interior } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/contract-handler/wasm';
 import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
 import { estimateTonTxFee } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils';
-import { _TRANSFER_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
+import { _TRANSFER_CHAIN_GROUP, USE_MULTILOCATION_INDEX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible, _isChainTonCompatible, _isGigaToken, _isNativeToken, _isTokenGearSmartContract, _isTokenTransferredByEvm, _isTokenTransferredByTon, _isTokenWasmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { combineEthFee, getGRC20ContractPromise, getVFTContractPromise } from '@subwallet/extension-base/utils';
@@ -25,7 +26,7 @@ export const createSubstrateExtrinsic = async ({
   transferAll,
   value
 }) => {
-  var _tokenInfo$metadata, _tokenInfo$metadata2;
+  var _tokenInfo$metadata;
   const api = substrateApi.api;
   const isDisableTransfer = (_tokenInfo$metadata = tokenInfo.metadata) === null || _tokenInfo$metadata === void 0 ? void 0 : _tokenInfo$metadata.isDisableTransfer;
   if (isDisableTransfer) {
@@ -94,7 +95,15 @@ export const createSubstrateExtrinsic = async ({
   } else if (_TRANSFER_CHAIN_GROUP.bitcountry.includes(networkKey) && !_isNativeToken(tokenInfo)) {
     transfer = api.tx.currencies.transfer(to, _getTokenOnChainInfo(tokenInfo), value);
   } else if (_TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !_isNativeToken(tokenInfo)) {
-    transfer = api.tx.assets.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
+    if (USE_MULTILOCATION_INDEX.includes(networkKey)) {
+      const version = ['statemint', 'statemine', 'westend_assethub'].includes(networkKey) ? 4 : 3;
+      const multilocationIndex = _adaptX1Interior(_getXcmAssetMultilocation(tokenInfo), version);
+
+      // @ts-ignore
+      transfer = api.tx.assets.transfer(multilocationIndex, to, value);
+    } else {
+      transfer = api.tx.assets.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
+    }
   } else if (_TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey) && isTxAssetsSupported) {
     transfer = api.tx.assets.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
   } else if (isTxBalancesSupported && _isNativeToken(tokenInfo)) {
@@ -112,18 +121,6 @@ export const createSubstrateExtrinsic = async ({
     }
   } else if (_TRANSFER_CHAIN_GROUP.truth.includes(networkKey)) {
     transfer = api.tx.assetManager.transfer(to, _getTokenOnChainInfo(tokenInfo), value);
-  } else if (_TRANSFER_CHAIN_GROUP.bittensor.includes(networkKey) && (_tokenInfo$metadata2 = tokenInfo.metadata) !== null && _tokenInfo$metadata2 !== void 0 && _tokenInfo$metadata2.netuid) {
-    var _tokenInfo$metadata3;
-    const {
-      accountHotKey,
-      isEnableTransferSubnet
-    } = await getAccountNetuidTokenInfo(from, tokenInfo, substrateApi);
-    const tokenNetuid = (_tokenInfo$metadata3 = tokenInfo.metadata) === null || _tokenInfo$metadata3 === void 0 ? void 0 : _tokenInfo$metadata3.netuid;
-    if (isEnableTransferSubnet && accountHotKey) {
-      transfer = api.tx.subtensorModule.transferStake(from, accountHotKey, tokenNetuid, tokenNetuid, value);
-    } else {
-      return [null, value];
-    }
   }
   return [transfer, transferAmount || value];
 };
@@ -158,7 +155,6 @@ export const getTransferMockTxFee = async (address, chainInfo, tokenInfo, api) =
         // estimate value
         bounce: false // anyMode
       });
-
       estimatedFee = new BigN((await estimateTonTxFee(tonApi, [mockMessage], mockWalletContract)).toString());
     } else {
       var _paymentInfo$partialF;
@@ -176,28 +172,9 @@ export const getTransferMockTxFee = async (address, chainInfo, tokenInfo, api) =
       const paymentInfo = await (mockTx === null || mockTx === void 0 ? void 0 : mockTx.paymentInfo(address));
       estimatedFee = new BigN((paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0'); // todo: should handle error case instead of setting fee to 0
     }
-
     return estimatedFee;
   } catch (e) {
     console.error('error mocking tx fee', e);
     return new BigN(0);
   }
-};
-export const getAccountNetuidTokenInfo = async (address, tokenInfo, substrateApi) => {
-  var _tokenInfo$metadata4;
-  const tokenNetuid = (_tokenInfo$metadata4 = tokenInfo.metadata) === null || _tokenInfo$metadata4 === void 0 ? void 0 : _tokenInfo$metadata4.netuid;
-  if (!tokenNetuid) {
-    return {
-      isEnableTransferSubnet: false,
-      accountHotKey: undefined
-    };
-  }
-  const [isTransferToggle, rawStakeInfoForColdKey] = await Promise.all([substrateApi.api.query.subtensorModule.transferToggle(tokenNetuid), substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkey(address)]);
-  const isEnableTransferSubnet = isTransferToggle.toPrimitive();
-  const taoStakeInfos = rawStakeInfoForColdKey.toPrimitive();
-  const accountHotKey = taoStakeInfos.find(value => value.netuid === tokenNetuid);
-  return {
-    isEnableTransferSubnet,
-    accountHotKey: accountHotKey === null || accountHotKey === void 0 ? void 0 : accountHotKey.hotkey
-  };
 };

package/services/balance-service/transfer/ton-transfer.js

@@ -56,7 +56,6 @@ async function createTonNativeTransaction({
     value: fromNano(value),
     bounce: false // todo: check and update the send bounced logic
   });
-
   const messagePayload = cellToBase64Str(messageRelaxedToCell(messages));
   const estimateExternalFee = await estimateTonTxFee(tonApi, [messages], walletContract);
   const transactionObject = {

package/services/balance-service/transfer/xcm/index.js

@@ -102,8 +102,6 @@ export const dryRunXcmExtrinsicV2 = async (request, isPreview = false) => {
     const originDryRunRs = dryRunResult.origin;
     if (originDryRunRs.success) {
       const {
-        assetHub,
-        bridgeHub,
         destination,
         hops
       } = dryRunResult;
@@ -112,12 +110,9 @@ export const dryRunXcmExtrinsicV2 = async (request, isPreview = false) => {
           return false;
         }
       }
-      if ((assetHub === null || assetHub === void 0 ? void 0 : assetHub.success) === false || (bridgeHub === null || bridgeHub === void 0 ? void 0 : bridgeHub.success) === false || (destination === null || destination === void 0 ? void 0 : destination.success) === false) {
-        if ((destination === null || destination === void 0 ? void 0 : destination.success) === false) {
-          // pass dry-run in these cases
-          return isChainNotSupportDryRun(destination.failureReason) || isChainNotSupportPolkadotApi(destination.failureReason);
-        }
-        return false;
+      if ((destination === null || destination === void 0 ? void 0 : destination.success) === false) {
+        // pass dry-run in these cases
+        return isChainNotSupportDryRun(destination.failureReason) || isChainNotSupportPolkadotApi(destination.failureReason);
       }
       return true;
     }

package/services/balance-service/transfer/xcm/snowBridge.js

@@ -57,7 +57,6 @@ export async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, desti
   } catch (e) {
     gasLimit = 200000; // todo: handle this better
   }
-
   transactionConfig.gas = gasLimit;
   return transactionConfig;
 }

package/services/balance-service/transfer/xcm/utils.d.ts

@@ -19,8 +19,6 @@ export declare type THopInfo = {
 export declare type DryRunResult = {
     origin: DryRunNodeResult;
     destination?: DryRunNodeResult;
-    assetHub?: DryRunNodeResult;
-    bridgeHub?: DryRunNodeResult;
     hops: THopInfo[];
 };
 interface GetXcmFeeRequest {

package/services/balance-service/transfer/xcm/utils.js

@@ -6,7 +6,7 @@ import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
 import { fetchFromProxyService } from '@subwallet/extension-base/utils';
 import BigNumber from 'bignumber.js';
 import { assert, compactToU8a, isHex, u8aConcat, u8aEq } from '@polkadot/util';
-const version = '/v4';
+const version = '/v5';
 const paraSpellApi = {
   buildXcm: `${version}/x-transfer`,
   feeXcm: `${version}/xcm-fee`,