@subwallet/extension-base 1.3.71-0 → 1.3.73-0

package/koni/background/handlers/Extension.js

@@ -1255,6 +1255,7 @@ export default class KoniExtension {
       feeCustom,
       feeOption,
       from,
+      signerSubstrateProxyAddress,
       to,
       tokenPayFeeSlug,
       tokenSlug,
@@ -1488,6 +1489,7 @@ export default class KoniExtension {
       isTransferAll: isTransferNativeToken ? transferAll : false,
       isTransferLocalTokenAndPayThatTokenAsFee,
       edAsWarning: isTransferNativeToken,
+      signerSubstrateProxyAddress,
       additionalValidator: additionalValidator
     });
   }
@@ -1499,6 +1501,7 @@ export default class KoniExtension {
       from,
       isPassConfirmation,
       originNetworkKey,
+      signerSubstrateProxyAddress,
       to,
       tokenPayFeeSlug,
       tokenSlug,
@@ -1694,7 +1697,8 @@ export default class KoniExtension {
       xcmFeeDryRun,
       errors,
       additionalValidator: additionalValidator,
-      eventsHandler: eventsHandler
+      eventsHandler: eventsHandler,
+      signerSubstrateProxyAddress
     });
   }
   async makeBitcoinDappTransferConfirmation(inputData) {
@@ -2334,7 +2338,8 @@ export default class KoniExtension {
         feeOptions: feeOptions,
         feeType,
         error,
-        id
+        id,
+        maxTransferableWithoutFee: freeBalance.value
       };
     };
     const subscription = combineLatest({
@@ -2418,7 +2423,8 @@ export default class KoniExtension {
     const {
       params,
       recipientAddress,
-      senderAddress
+      senderAddress,
+      signerSubstrateProxyAddress
     } = inputData;
     const isSendingSelf = isRecipientSelf(senderAddress, recipientAddress);
 
@@ -2439,7 +2445,8 @@ export default class KoniExtension {
         isSendingSelf
       },
       extrinsicType: ExtrinsicType.SEND_NFT,
-      chainType: ChainType.SUBSTRATE
+      chainType: ChainType.SUBSTRATE,
+      signerSubstrateProxyAddress
     });
     return {
       ...rs,
@@ -3313,8 +3320,6 @@ export default class KoniExtension {
       return await this.#koniState.reloadStaking();
     } else if (data === 'balance') {
       return await this.#koniState.reloadBalance();
-    } else if (data === 'crowdloan') {
-      return await this.#koniState.reloadCrowdloan();
     }
     return Promise.resolve(false);
   }
@@ -3742,7 +3747,8 @@ export default class KoniExtension {
       isPassConfirmation,
       onSend,
       path,
-      processId
+      processId,
+      signerSubstrateProxyAddress
     } = inputData;
     const {
       address
@@ -3873,6 +3879,7 @@ export default class KoniExtension {
       // change this depends on step
       chainType,
       resolveOnDone: !isLastStep,
+      signerSubstrateProxyAddress,
       transferNativeAmount,
       balanceType: balanceTypeForPool,
       skipFeeValidation: isMintingStep && isPoolSupportAlternativeFee,
@@ -3885,6 +3892,7 @@ export default class KoniExtension {
   async handleYieldLeave(params) {
     const {
       address,
+      signerSubstrateProxyAddress,
       slug
     } = params;
     const leaveValidation = await this.#koniState.earningService.validateYieldLeave(params);
@@ -3900,6 +3908,7 @@ export default class KoniExtension {
       data: params,
       // TODO
       extrinsicType,
+      signerSubstrateProxyAddress,
       chainType: (handler === null || handler === void 0 ? void 0 : handler.transactionChainType) || ChainType.SUBSTRATE
     });
   }
@@ -3976,6 +3985,7 @@ export default class KoniExtension {
   async yieldSubmitWithdrawal(params) {
     const {
       address,
+      signerSubstrateProxyAddress,
       slug
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
@@ -3989,6 +3999,7 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: params,
       extrinsicType: ExtrinsicType.STAKING_WITHDRAW,
+      signerSubstrateProxyAddress,
       chainType: (poolHandler === null || poolHandler === void 0 ? void 0 : poolHandler.transactionChainType) || ChainType.SUBSTRATE
     });
   }
@@ -3996,6 +4007,7 @@ export default class KoniExtension {
     const {
       address,
       selectedUnstaking,
+      signerSubstrateProxyAddress,
       slug
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
@@ -4010,12 +4022,14 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: params,
       extrinsicType: ExtrinsicType.STAKING_CANCEL_UNSTAKE,
+      signerSubstrateProxyAddress,
       chainType: (poolHandler === null || poolHandler === void 0 ? void 0 : poolHandler.transactionChainType) || ChainType.SUBSTRATE
     });
   }
   async yieldSubmitClaimReward(params) {
     const {
       address,
+      signerSubstrateProxyAddress,
       slug
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
@@ -4028,6 +4042,7 @@ export default class KoniExtension {
       chain: poolHandler.chain,
       transaction: extrinsic,
       data: params,
+      signerSubstrateProxyAddress,
       extrinsicType: ExtrinsicType.STAKING_CLAIM_REWARD,
       chainType: (poolHandler === null || poolHandler === void 0 ? void 0 : poolHandler.transactionChainType) || ChainType.SUBSTRATE
     });
@@ -4046,6 +4061,7 @@ export default class KoniExtension {
   async handleYieldChangeValidator(params) {
     const {
       address,
+      signerSubstrateProxyAddress,
       slug
     } = params;
     const poolHandler = this.#koniState.earningService.getPoolHandler(slug);
@@ -4058,6 +4074,7 @@ export default class KoniExtension {
       chain: poolHandler.chain,
       transaction: extrinsic,
       data: params,
+      signerSubstrateProxyAddress,
       extrinsicType: ExtrinsicType.CHANGE_EARNING_VALIDATOR,
       chainType: ChainType.SUBSTRATE
     });
@@ -4739,6 +4756,48 @@ export default class KoniExtension {
   pingSession(request) {
     return this.#koniState.keyringService.context.pingSession(request);
   }
+  getSubstrateProxyAccountGroup(request) {
+    return this.#koniState.substrateProxyAccountService.getSubstrateProxyAccountGroup(request);
+  }
+  async handleAddSubstrateProxyAccount(params) {
+    const {
+      address,
+      chain,
+      signerSubstrateProxyAddress
+    } = params;
+    const validationErrors = await this.#koniState.substrateProxyAccountService.validateAddSubstrateProxyAccount(params, signerSubstrateProxyAddress);
+    if (validationErrors.length > 0) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(validationErrors);
+    }
+    const extrinsic = await this.#koniState.substrateProxyAccountService.addSubstrateProxyAccounts(params);
+    return await this.#koniState.transactionService.handleTransaction({
+      address,
+      chain,
+      transaction: extrinsic,
+      data: params,
+      extrinsicType: ExtrinsicType.ADD_SUBSTRATE_PROXY_ACCOUNT,
+      chainType: ChainType.SUBSTRATE,
+      signerSubstrateProxyAddress
+    });
+  }
+  async handleRemoveSubstrateProxyAccount(params) {
+    const {
+      address,
+      chain,
+      signerSubstrateProxyAddress
+    } = params;
+    const extrinsic = await this.#koniState.substrateProxyAccountService.removeSubstrateProxyAccounts(params);
+    return await this.#koniState.transactionService.handleTransaction({
+      address,
+      chain,
+      transaction: extrinsic,
+      data: params,
+      extrinsicType: ExtrinsicType.REMOVE_SUBSTRATE_PROXY_ACCOUNT,
+      chainType: ChainType.SUBSTRATE,
+      signerSubstrateProxyAddress
+    });
+  }
+
   /* Migrate Unified Account */
 
   /* Open Gov */
@@ -4751,7 +4810,8 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: request,
       extrinsicType: ExtrinsicType.GOV_VOTE,
-      chainType: ChainType.SUBSTRATE
+      chainType: ChainType.SUBSTRATE,
+      signerSubstrateProxyAddress: request.signerSubstrateProxyAddress
     });
   }
   async handleRemoveVote(request) {
@@ -4762,7 +4822,8 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: request,
       extrinsicType: ExtrinsicType.GOV_UNVOTE,
-      chainType: ChainType.SUBSTRATE
+      chainType: ChainType.SUBSTRATE,
+      signerSubstrateProxyAddress: request.signerSubstrateProxyAddress
     });
   }
   async handleUnlockVote(request) {
@@ -4773,7 +4834,8 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: request,
       extrinsicType: ExtrinsicType.GOV_UNLOCK_VOTE,
-      chainType: ChainType.SUBSTRATE
+      chainType: ChainType.SUBSTRATE,
+      signerSubstrateProxyAddress: request.signerSubstrateProxyAddress
     });
   }
   async subscribeGovLockedInfo(id, port) {
@@ -5461,6 +5523,15 @@ export default class KoniExtension {
         return this.handleUnlockVote(request);
       case 'pri(openGov.subscribeGovLockedInfo)':
         return this.subscribeGovLockedInfo(id, port);
+
+      // Proxy
+      case 'pri(substrateProxyAccount.getGroupInfo)':
+        return this.getSubstrateProxyAccountGroup(request);
+      case 'pri(substrateProxyAccount.add)':
+        return this.handleAddSubstrateProxyAccount(request);
+      case 'pri(substrateProxyAccount.remove)':
+        return this.handleRemoveSubstrateProxyAccount(request);
+
       // Default
       default:
         throw new Error(`Unable to handle message of type ${type}`);

package/koni/background/handlers/State.d.ts

@@ -28,6 +28,7 @@ import { AuthUrls, MetaRequest, SignRequest } from '@subwallet/extension-base/se
 import SettingService from '@subwallet/extension-base/services/setting-service/SettingService';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
+import SubstrateProxyAccountService from '@subwallet/extension-base/services/substrate-proxy-service';
 import { SwapService } from '@subwallet/extension-base/services/swap-service';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
@@ -83,6 +84,7 @@ export default class KoniState {
     readonly inappNotificationService: InappNotificationService;
     readonly chainOnlineService: ChainOnlineService;
     readonly openGovService: OpenGovService;
+    readonly substrateProxyAccountService: SubstrateProxyAccountService;
     private generalStatus;
     private waitSleeping;
     private waitStarting;
@@ -265,7 +267,6 @@ export default class KoniState {
     reloadNft(): Promise<boolean>;
     reloadStaking(): Promise<boolean>;
     reloadBalance(): Promise<boolean>;
-    reloadCrowdloan(): Promise<boolean>;
     approvePassPhishingPage(_url: string): Promise<boolean>;
     saveEnvConfig<T extends keyof EnvConfig>(key: T, value: EnvConfig[T]): void;
     initEnvConfig(envConfig: EnvConfig): void;

package/koni/background/handlers/State.js

@@ -38,6 +38,7 @@ import { convertAssetToValue, convertValueToAsset, extractKeyHashesFromCollatera
 import SettingService from '@subwallet/extension-base/services/setting-service/SettingService';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
+import SubstrateProxyAccountService from '@subwallet/extension-base/services/substrate-proxy-service';
 import { SwapService } from '@subwallet/extension-base/services/swap-service';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
@@ -124,6 +125,7 @@ export default class KoniState {
     this.inappNotificationService = new InappNotificationService(this.dbService, this.keyringService, this.eventService, this.chainService);
     this.chainOnlineService = new ChainOnlineService(this.chainService, this.settingService, this.eventService, this.dbService);
     this.openGovService = new OpenGovService(this);
+    this.substrateProxyAccountService = new SubstrateProxyAccountService(this);
     this.subscription = new KoniSubscription(this, this.dbService);
     this.cron = new KoniCron(this, this.subscription, this.dbService);
     this.logger = createLogger('State');
@@ -1790,10 +1792,6 @@ export default class KoniState {
     await this.balanceService.reloadBalance();
     return true;
   }
-  async reloadCrowdloan() {
-    await this.subscription.reloadCrowdloan();
-    return true;
-  }
   async approvePassPhishingPage(_url) {
     return new Promise(resolve => {
       this.settingService.getPassPhishingList(value => {

package/koni/background/subscription.js

@@ -3,7 +3,6 @@
 
 import { subscribeCrowdloan } from '@subwallet/extension-base/koni/api/dotsama/crowdloan';
 import { NftHandler } from '@subwallet/extension-base/koni/api/nft';
-import { COMMON_RELOAD_EVENTS } from '@subwallet/extension-base/services/event-service/types';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { logger as createLogger } from '@polkadot/util';
 const nftHandler = new NftHandler();
@@ -41,26 +40,7 @@ export class KoniSubscription {
     }
   }
   async start() {
-    var _this$state$keyringSe;
     await Promise.all([this.state.eventService.waitCryptoReady, this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
-    const currentAddress = (_this$state$keyringSe = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.proxyId;
-    if (currentAddress) {
-      this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
-    }
-    this.eventHandler = (events, eventTypes) => {
-      var _serviceInfo$currentA;
-      const serviceInfo = this.state.getServiceInfo();
-      const needReload = eventTypes.some(eventType => COMMON_RELOAD_EVENTS.includes(eventType));
-      if (!needReload) {
-        return;
-      }
-      const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.proxyId;
-      if (!address) {
-        return;
-      }
-      this.subscribeCrowdloans(address, serviceInfo.chainApiMap.substrate);
-    };
-    this.state.eventService.onLazy(this.eventHandler.bind(this));
   }
   async stop() {
     if (this.eventHandler) {
@@ -106,8 +86,8 @@ export class KoniSubscription {
     nftHandler.handleNfts(smartContractNfts, (...args) => this.state.updateNftData(...args), (...args) => this.state.setNftCollection(...args)).catch(this.logger.log);
   }
   async reloadCrowdloan() {
-    var _this$state$keyringSe2;
-    const currentAddress = (_this$state$keyringSe2 = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe2 === void 0 ? void 0 : _this$state$keyringSe2.proxyId;
+    var _this$state$keyringSe;
+    const currentAddress = (_this$state$keyringSe = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.proxyId;
     this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
     await waitTimeout(1800);
   }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.71-0",
+  "version": "1.3.73-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",
@@ -2942,12 +2972,12 @@
     "@snowbridge/registry": "^0.2.0",
     "@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.71-0",
-    "@subwallet/extension-chains": "^1.3.71-0",
-    "@subwallet/extension-dapp": "^1.3.71-0",
-    "@subwallet/extension-inject": "^1.3.71-0",
+    "@subwallet-monorepos/subwallet-services-sdk": "0.1.16",
+    "@subwallet/chain-list": "0.2.123",
+    "@subwallet/extension-base": "^1.3.73-0",
+    "@subwallet/extension-chains": "^1.3.73-0",
+    "@subwallet/extension-dapp": "^1.3.73-0",
+    "@subwallet/extension-inject": "^1.3.73-0",
     "@subwallet/keyring": "^0.1.14",
     "@subwallet/ui-keyring": "^0.1.14",
     "@ton/core": "^0.56.3",

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.71-0'
+  version: '1.3.73-0'
 };

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';
@@ -422,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
@@ -592,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/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];
 };
@@ -180,22 +177,4 @@ export const getTransferMockTxFee = async (address, chainInfo, tokenInfo, api) =
     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/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/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`,