@subwallet/extension-base 1.3.26-0 → 1.3.27-1

package/cjs/koni/background/handlers/Extension.js

@@ -16,9 +16,10 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
 var _transfer = require("@subwallet/extension-base/core/logic-validation/transfer");
 var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
+var _utils = require("@subwallet/extension-base/core/utils");
 var _defaults = require("@subwallet/extension-base/defaults");
 var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
-var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
+var _utils2 = require("@subwallet/extension-base/koni/api/contract-handler/utils");
 var _domain = require("@subwallet/extension-base/koni/api/dotsama/domain");
 var _parseTransaction = require("@subwallet/extension-base/koni/api/dotsama/parseTransaction");
 var _config = require("@subwallet/extension-base/koni/api/nft/config");
@@ -26,9 +27,9 @@ var _transfer2 = require("@subwallet/extension-base/koni/api/nft/transfer");
 var _bonding = require("@subwallet/extension-base/koni/api/staking/bonding");
 var _paraChain = require("@subwallet/extension-base/koni/api/staking/bonding/paraChain");
 var _relayChain = require("@subwallet/extension-base/koni/api/staking/bonding/relayChain");
-var _utils2 = require("@subwallet/extension-base/koni/api/yield/helper/utils");
+var _utils3 = require("@subwallet/extension-base/koni/api/yield/helper/utils");
 var _consts = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/consts");
-var _utils3 = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils");
+var _utils4 = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils");
 var _cardanoTransfer = require("@subwallet/extension-base/services/balance-service/transfer/cardano-transfer");
 var _smartContract = require("@subwallet/extension-base/services/balance-service/transfer/smart-contract");
 var _token = require("@subwallet/extension-base/services/balance-service/transfer/token");
@@ -39,8 +40,8 @@ var _polygonBridge = require("@subwallet/extension-base/services/balance-service
 var _posBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _types2 = require("@subwallet/extension-base/services/chain-service/types");
-var _utils4 = require("@subwallet/extension-base/services/chain-service/utils");
-var _utils5 = require("@subwallet/extension-base/services/fee-service/utils");
+var _utils5 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils6 = require("@subwallet/extension-base/services/fee-service/utils");
 var _tokenPayFee = require("@subwallet/extension-base/services/fee-service/utils/tokenPayFee");
 var _constants3 = require("@subwallet/extension-base/services/request-service/constants");
 var _constants4 = require("@subwallet/extension-base/services/setting-service/constants");
@@ -48,20 +49,20 @@ var _helpers2 = require("@subwallet/extension-base/services/wallet-connect-servi
 var _storage = require("@subwallet/extension-base/storage");
 var _stores = require("@subwallet/extension-base/stores");
 var _types3 = require("@subwallet/extension-base/types");
-var _utils6 = require("@subwallet/extension-base/utils");
+var _utils7 = require("@subwallet/extension-base/utils");
 var _parseTransaction2 = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _keyring = require("@subwallet/keyring");
 var _types4 = require("@subwallet/keyring/types");
 var _uiKeyring = require("@subwallet/ui-keyring");
-var _utils7 = require("@walletconnect/utils");
+var _utils8 = require("@walletconnect/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _rxjs = require("rxjs");
 var _types5 = require("@polkadot/types");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
-var _utils8 = require("../utils");
+var _utils9 = require("../utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -276,7 +277,7 @@ class KoniExtension {
     const accounts = keyringService.context.accounts;
     const transformedAccounts = Object.values(accounts);
     const responseData = {
-      accounts: transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils6.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [],
+      accounts: transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils7.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [],
       currentAccountProxy: currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.proxyId
     };
     const accountProxyMapObservable = keyringService.context.observable.accounts;
@@ -290,7 +291,7 @@ class KoniExtension {
         currentAccount
       } = _ref7;
       const transformedAccounts = Object.values(accountProxies);
-      responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils6.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [];
+      responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils7.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [];
       responseData.currentAccountProxy = currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.proxyId;
       console.debug('subscriptionAccountGroups', responseData);
       cb(responseData);
@@ -311,10 +312,10 @@ class KoniExtension {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const combineFunction = async (chainInfoMap, accountProxyMap, _contacts) => {
       const accountProxies = Object.values(accountProxyMap);
-      const contacts = (0, _utils6.transformAddresses)(_contacts);
+      const contacts = (0, _utils7.transformAddresses)(_contacts);
       const chainInfo = chainInfoMap[chain];
       const substrateApi = this.#koniState.chainService.getSubstrateApi(chain);
-      const rs = await (0, _utils6._analyzeAddress)(data, accountProxies, contacts, chainInfo, substrateApi);
+      const rs = await (0, _utils7._analyzeAddress)(data, accountProxies, contacts, chainInfo, substrateApi);
       return {
         id,
         ...rs
@@ -354,7 +355,7 @@ class KoniExtension {
     const _cb = (0, _subscriptions.createSubscription)(id, port);
     let old = '';
     const subscription = this.#koniState.keyringService.context.observable.contacts.subscribe(subjectInfo => {
-      const addresses = (0, _utils6.transformAddresses)(subjectInfo);
+      const addresses = (0, _utils7.transformAddresses)(subjectInfo);
       const _new = JSON.stringify(addresses);
       if (old !== _new) {
         _cb({
@@ -371,7 +372,7 @@ class KoniExtension {
     });
     const subjectInfo = this.#koniState.keyringService.context.contacts;
     return {
-      addresses: (0, _utils6.transformAccounts)(subjectInfo)
+      addresses: (0, _utils7.transformAccounts)(subjectInfo)
     };
   }
 
@@ -384,7 +385,7 @@ class KoniExtension {
       chain
     } = _ref9;
     if ((0, _keyring.isAddress)(accountId)) {
-      const address = (0, _utils6.reformatAddress)(accountId);
+      const address = (0, _utils7.reformatAddress)(accountId);
       const account = _uiKeyring.keyring.getAccount(address);
       const contact = _uiKeyring.keyring.getAddress(address, 'address');
       if (account) {
@@ -430,7 +431,7 @@ class KoniExtension {
       meta
     } = _ref10;
     if ((0, _keyring.isAddress)(address)) {
-      const _address = (0, _utils6.reformatAddress)(address);
+      const _address = (0, _utils7.reformatAddress)(address);
       _uiKeyring.keyring.saveAddress(_address, meta);
       return true;
     } else {
@@ -446,7 +447,7 @@ class KoniExtension {
       address
     } = _ref11;
     if ((0, _keyring.isAddress)(address)) {
-      const _address = (0, _utils6.reformatAddress)(address);
+      const _address = (0, _utils7.reformatAddress)(address);
       _uiKeyring.keyring.forgetAddress(_address);
       return true;
     } else {
@@ -575,7 +576,7 @@ class KoniExtension {
   }
   getPairs() {
     const storedAccounts = this.#koniState.keyringService.context.pairs;
-    return (0, _utils6.transformAccounts)(storedAccounts);
+    return (0, _utils7.transformAccounts)(storedAccounts);
   }
   isAddressValidWithAuthType(address, accountAuthTypes) {
     const type = (0, _keyring.getKeypairTypeByAddress)(address);
@@ -1109,7 +1110,7 @@ class KoniExtension {
       const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
       // Re-filter
-      cb(histories.filter(item => addresses.some(address => (0, _utils6.isSameAddress)(item.address, address))));
+      cb(histories.filter(item => addresses.some(address => (0, _utils7.isSameAddress)(item.address, address))));
     });
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
@@ -1118,7 +1119,7 @@ class KoniExtension {
     const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
     // Re-filter
-    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils6.isSameAddress)(item.address, address)));
+    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils7.isSameAddress)(item.address, address)));
   }
   subscribeHistoryByChainAndAddress(_ref29, id, port) {
     let {
@@ -1147,7 +1148,7 @@ class KoniExtension {
       owner,
       spenderAddress
     } = params;
-    if (!(0, _utils.isSnowBridgeGatewayContract)(spenderAddress) && !(0, _utils.isAvailBridgeGatewayContract)(spenderAddress)) {
+    if (!(0, _utils2.isSnowBridgeGatewayContract)(spenderAddress) && !(0, _utils2.isAvailBridgeGatewayContract)(spenderAddress)) {
       throw new Error('Only SnowBridge and AvailBridge is supported'); // todo: support all ERC20 spending approval
     }
 
@@ -1189,14 +1190,14 @@ class KoniExtension {
     const nativeTokenSlug = nativeTokenInfo.slug;
     const isTransferNativeToken = nativeTokenSlug === tokenSlug;
     const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNativeToken && tokenPayFeeSlug === tokenSlug;
-    const isCustomTokenPayFeeAssetHub = tokenPayFeeSlug && !(0, _utils4._isNativeTokenBySlug)(tokenPayFeeSlug) && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain);
-    const isCustomTokenPayFeeHydration = tokenPayFeeSlug && !(0, _utils4._isNativeTokenBySlug)(tokenPayFeeSlug) && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain);
+    const isCustomTokenPayFeeAssetHub = tokenPayFeeSlug && !(0, _utils5._isNativeTokenBySlug)(tokenPayFeeSlug) && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain);
+    const isCustomTokenPayFeeHydration = tokenPayFeeSlug && !(0, _utils5._isNativeTokenBySlug)(tokenPayFeeSlug) && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain);
     const extrinsicType = isTransferNativeToken ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.TRANSFER_TOKEN;
     let chainType = _KoniTypes.ChainType.SUBSTRATE;
     const transferAmount = {
       value: '0',
-      symbol: (0, _utils4._getAssetSymbol)(transferTokenInfo),
-      decimals: (0, _utils4._getAssetDecimals)(transferTokenInfo)
+      symbol: (0, _utils5._getAssetSymbol)(transferTokenInfo),
+      decimals: (0, _utils5._getAssetDecimals)(transferTokenInfo)
     };
     let transaction;
     const transferTokenAvailable = await this.getAddressTransferableBalance({
@@ -1206,7 +1207,7 @@ class KoniExtension {
       extrinsicType
     });
     try {
-      if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils4._isTokenTransferredByEvm)(transferTokenInfo)) {
+      if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils5._isTokenTransferredByEvm)(transferTokenInfo)) {
         chainType = _KoniTypes.ChainType.EVM;
         const txVal = transferAll ? transferTokenAvailable.value : value || '0';
         const evmApi = this.#koniState.getEvmApi(chain);
@@ -1214,9 +1215,9 @@ class KoniExtension {
 
         // todo: refactor: merge getERC20TransactionObject & getEVMTransactionObject
         // Estimate with EVM API
-        if ((0, _utils4._isTokenEvmSmartContract)(transferTokenInfo) || (0, _utils4._isLocalToken)(transferTokenInfo)) {
+        if ((0, _utils5._isTokenEvmSmartContract)(transferTokenInfo) || (0, _utils5._isLocalToken)(transferTokenInfo)) {
           [transaction, transferAmount.value] = await (0, _smartContract.getERC20TransactionObject)({
-            assetAddress: (0, _utils4._getContractAddressOfToken)(transferTokenInfo),
+            assetAddress: (0, _utils5._getContractAddressOfToken)(transferTokenInfo),
             chain,
             evmApi,
             feeCustom,
@@ -1240,10 +1241,10 @@ class KoniExtension {
             value: txVal
           });
         }
-      } else if ((0, _utils4._isMantaZkAsset)(transferTokenInfo)) {
+      } else if ((0, _utils5._isMantaZkAsset)(transferTokenInfo)) {
         transaction = undefined;
         transferAmount.value = '0';
-      } else if ((0, _keyring.isTonAddress)(from) && (0, _keyring.isTonAddress)(to) && (0, _utils4._isTokenTransferredByTon)(transferTokenInfo)) {
+      } else if ((0, _keyring.isTonAddress)(from) && (0, _keyring.isTonAddress)(to) && (0, _utils5._isTokenTransferredByTon)(transferTokenInfo)) {
         chainType = _KoniTypes.ChainType.TON;
         const tonApi = this.#koniState.getTonApi(chain);
         [transaction, transferAmount.value] = await (0, _tonTransfer.createTonTransaction)({
@@ -1256,7 +1257,7 @@ class KoniExtension {
           // currently not used
           tonApi
         });
-      } else if ((0, _keyring.isCardanoAddress)(from) && (0, _keyring.isCardanoAddress)(to) && (0, _utils4._isTokenTransferredByCardano)(transferTokenInfo)) {
+      } else if ((0, _keyring.isCardanoAddress)(from) && (0, _keyring.isCardanoAddress)(to) && (0, _utils5._isTokenTransferredByCardano)(transferTokenInfo)) {
         chainType = _KoniTypes.ChainType.CARDANO;
         const cardanoApi = this.#koniState.getCardanoApi(chain);
         [transaction, transferAmount.value] = await (0, _cardanoTransfer.createCardanoTransaction)({
@@ -1300,7 +1301,7 @@ class KoniExtension {
     const additionalValidator = async inputTransaction => {
       let senderSendingTokenTransferable;
       let receiverSystemAccountInfo;
-      if (!(0, _utils4._isChainSubstrateCompatible)(chainInfo)) {
+      if (!(0, _utils5._isChainSubstrateCompatible)(chainInfo)) {
         return undefined;
       }
 
@@ -1308,7 +1309,7 @@ class KoniExtension {
       if (isCustomTokenPayFeeAssetHub || isCustomTokenPayFeeHydration) {
         var _inputTransaction$est, _nonNativeTokenPayFee;
         const nonNativeFee = BigInt(((_inputTransaction$est = inputTransaction.estimateFee) === null || _inputTransaction$est === void 0 ? void 0 : _inputTransaction$est.value) || '0'); // todo: estimateFee should be must-have, need to refactor interface
-        const nonNativeTokenPayFeeInfo = await this.#koniState.balanceService.getTokensHasBalance((0, _utils6.reformatAddress)(from), chain, tokenPayFeeSlug);
+        const nonNativeTokenPayFeeInfo = await this.#koniState.balanceService.getTokensHasBalance((0, _utils7.reformatAddress)(from), chain, tokenPayFeeSlug);
         const nonNativeTokenPayFeeBalance = BigInt(((_nonNativeTokenPayFee = nonNativeTokenPayFeeInfo[tokenPayFeeSlug]) === null || _nonNativeTokenPayFee === void 0 ? void 0 : _nonNativeTokenPayFee.free) || '0');
         if (nonNativeFee > nonNativeTokenPayFeeBalance) {
           inputTransaction.errors.push(new _TransactionError.TransactionError(_types3.BasicTxErrorType.NOT_ENOUGH_BALANCE));
@@ -1342,7 +1343,7 @@ class KoniExtension {
       const receiverSendingTokenKeepAliveBalance = BigInt(_receiverSendingTokenKeepAliveBalance);
       const amount = BigInt(transferAmount.value);
       const substrateApi = this.#koniState.getSubstrateApi(chain);
-      const isSendingTokenSufficient = await this.isSufficientToken(transferTokenInfo, substrateApi);
+      const isSendingTokenSufficient = await (0, _utils._isSufficientToken)(transferTokenInfo, substrateApi);
       const [warnings, errors] = (0, _transfer.additionalValidateTransferForRecipient)(transferTokenInfo, nativeTokenInfo, extrinsicType, receiverSendingTokenKeepAliveBalance, amount, senderSendingTokenTransferable, receiverSystemAccountInfo, isSendingTokenSufficient);
       warnings.length && inputTransaction.warnings.push(...warnings);
       errors.length && inputTransaction.errors.push(...errors);
@@ -1397,9 +1398,9 @@ class KoniExtension {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(errors);
     }
     const chainInfoMap = this.#koniState.getChainInfoMap();
-    const isAvailBridgeFromEvm = (0, _utils4._isPureEvmChain)(chainInfoMap[originNetworkKey]) && (0, _availBridge.isAvailChainBridge)(destinationNetworkKey);
-    const isAvailBridgeFromAvail = (0, _availBridge.isAvailChainBridge)(originNetworkKey) && (0, _utils4._isPureEvmChain)(chainInfoMap[destinationNetworkKey]);
-    const isSnowBridgeEvmTransfer = (0, _utils4._isPureEvmChain)(chainInfoMap[originNetworkKey]) && (0, _xcmParser._isSnowBridgeXcm)(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]) && !isAvailBridgeFromEvm;
+    const isAvailBridgeFromEvm = (0, _utils5._isPureEvmChain)(chainInfoMap[originNetworkKey]) && (0, _availBridge.isAvailChainBridge)(destinationNetworkKey);
+    const isAvailBridgeFromAvail = (0, _availBridge.isAvailChainBridge)(originNetworkKey) && (0, _utils5._isPureEvmChain)(chainInfoMap[destinationNetworkKey]);
+    const isSnowBridgeEvmTransfer = (0, _utils5._isPureEvmChain)(chainInfoMap[originNetworkKey]) && (0, _xcmParser._isSnowBridgeXcm)(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]) && !isAvailBridgeFromEvm;
     const isPolygonBridgeTransfer = (0, _polygonBridge._isPolygonChainBridge)(originNetworkKey, destinationNetworkKey);
     const isPosBridgeTransfer = (0, _posBridge._isPosChainBridge)(originNetworkKey, destinationNetworkKey);
     const isTransferNative = this.#koniState.getNativeTokenInfo(originNetworkKey).slug === tokenSlug;
@@ -1507,7 +1508,7 @@ class KoniExtension {
       data: inputData,
       extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_XCM,
       chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer && !isPosBridgeTransfer ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM,
-      transferNativeAmount: (0, _utils4._isNativeToken)(originTokenInfo) ? value : '0',
+      transferNativeAmount: (0, _utils5._isNativeToken)(originTokenInfo) ? value : '0',
       ignoreWarnings,
       tokenPayFeeSlug,
       isTransferAll: transferAll,
@@ -1527,7 +1528,7 @@ class KoniExtension {
     } = request;
     const chainService = this.#koniState.chainService;
     const substrateApi = this.#koniState.getSubstrateApi(chain);
-    const address = (0, _utils6.reformatAddress)(_address);
+    const address = (0, _utils7.reformatAddress)(_address);
     const tokensHasBalanceInfoMap = await this.#koniState.balanceService.getTokensHasBalance(address, chain);
     const nativeTokenInfo = chainService.getNativeTokenInfo(chain);
     const nativeBalanceInfo = {
@@ -1586,7 +1587,7 @@ class KoniExtension {
     const nativeTokenInfo = this.#koniState.chainService.getAssetBySlug(nativeTokenSlug);
     const toTokenInfo = this.#koniState.chainService.getAssetBySlug(toTokenSlug);
     const substrateApi = this.#koniState.chainService.getSubstrateApi(nativeTokenInfo.originChain);
-    return await (0, _utils5.calculateToAmountByReservePool)(substrateApi.api, nativeTokenInfo, toTokenInfo, nativeTokenFeeAmount);
+    return await (0, _utils6.calculateToAmountByReservePool)(substrateApi.api, nativeTokenInfo, toTokenInfo, nativeTokenFeeAmount);
   }
   async evmNftSubmitTransaction(inputData) {
     const {
@@ -1670,7 +1671,7 @@ class KoniExtension {
     const evmApi = this.#koniState.getEvmApi(data.originChain);
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    const tokenContract = new evmApi.api.eth.Contract(_utils._ERC721_ABI, (_data$metadata = data.metadata) === null || _data$metadata === void 0 ? void 0 : _data$metadata.contractAddress);
+    const tokenContract = new evmApi.api.eth.Contract(_utils2._ERC721_ABI, (_data$metadata = data.metadata) === null || _data$metadata === void 0 ? void 0 : _data$metadata.contractAddress);
     try {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
       await tokenContract.methods.tokenOfOwnerByIndex('0xB7fdD27a8Df011816205a6e3cAA097DC4D8C2C5d', 1).call();
@@ -1708,31 +1709,12 @@ class KoniExtension {
       };
     }
   }
-  async isSufficientToken(tokenInfo, substrateApi) {
-    let metadata;
-    if (_constants2.SUFFICIENT_CHAIN.includes(tokenInfo.originChain) && tokenInfo.assetType !== _types._AssetType.NATIVE) {
-      const assetId = (0, _utils4._isBridgedToken)(tokenInfo) ? (0, _utils4._getXcmAssetMultilocation)(tokenInfo) : (0, _utils4._getTokenOnChainAssetId)(tokenInfo);
-      const queryParams = {
-        section: 'query',
-        module: 'foreignAssets',
-        method: 'asset',
-        args: [assetId]
-      };
-      if (!(0, _utils4._isBridgedToken)(tokenInfo)) {
-        queryParams.module = 'assets';
-      }
-      metadata = await substrateApi.makeRpcQuery(queryParams);
-    } else {
-      return false;
-    }
-    return metadata.isSufficient;
-  }
   async deleteCustomAsset(assetSlug) {
     const assetInfo = this.#koniState.getAssetBySlug(assetSlug);
-    if (assetInfo && (0, _utils4._isCustomAsset)(assetSlug)) {
-      if ((0, _utils4._isAssetSmartContractNft)(assetInfo)) {
+    if (assetInfo && (0, _utils5._isCustomAsset)(assetSlug)) {
+      if ((0, _utils5._isAssetSmartContractNft)(assetInfo)) {
         // check if deleting a smart contract NFT
-        await this.#koniState.deleteNftCollection(assetInfo.originChain, (0, _utils4._getContractAddressOfToken)(assetInfo));
+        await this.#koniState.deleteNftCollection(assetInfo.originChain, (0, _utils5._getContractAddressOfToken)(assetInfo));
       }
       this.#koniState.deleteCustomAssets([assetSlug]);
       return true;
@@ -1778,8 +1760,8 @@ class KoniExtension {
     } = request;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const transferTokenInfo = this.#koniState.chainService.getAssetBySlug(token);
-    const isTransferLocalTokenAndPayThatTokenAsFee = !(0, _utils4._isNativeToken)(transferTokenInfo) && !!tokenPayFeeSlug && tokenPayFeeSlug === token;
-    const isTransferNativeTokenAndPayLocalTokenAsFee = (0, _utils4._isNativeToken)(transferTokenInfo) && !!tokenPayFeeSlug && !(0, _utils4._isNativeTokenBySlug)(tokenPayFeeSlug);
+    const isTransferLocalTokenAndPayThatTokenAsFee = !(0, _utils5._isNativeToken)(transferTokenInfo) && !!tokenPayFeeSlug && tokenPayFeeSlug === token;
+    const isTransferNativeTokenAndPayLocalTokenAsFee = (0, _utils5._isNativeToken)(transferTokenInfo) && !!tokenPayFeeSlug && !(0, _utils5._isNativeTokenBySlug)(tokenPayFeeSlug);
     const srcToken = token ? this.#koniState.chainService.getAssetBySlug(token) : this.#koniState.chainService.getNativeTokenInfo(chain);
     const destToken = _destChain !== chain ? this.#koniState.getXcmEqualAssetByChain(_destChain, srcToken.slug) : srcToken;
     const srcChain = this.#koniState.chainService.getChainInfoByKey(chain);
@@ -1788,7 +1770,7 @@ class KoniExtension {
     const extrinsicType = srcChain.slug !== destChain.slug ? _KoniTypes.ExtrinsicType.TRANSFER_XCM : _KoniTypes.ExtrinsicType.TRANSFER_BALANCE;
     const freeBalanceSubject = new _rxjs.Subject();
     const feeSubject = new _rxjs.Subject();
-    const feeChainType = (0, _utils6.detectTransferTxType)(srcToken, srcChain, destChain);
+    const feeChainType = (0, _utils7.detectTransferTxType)(srcToken, srcChain, destChain);
     if (!destToken) {
       throw new Error('Destination token not found');
     }
@@ -1817,7 +1799,7 @@ class KoniExtension {
           fee,
           freeBalance
         } = _ref34;
-        (0, _utils6.calculateMaxTransferable)(id, _request, freeBalance, fee).then(cb).catch(console.error);
+        (0, _utils7.calculateMaxTransferable)(id, _request, freeBalance, fee).then(cb).catch(console.error);
       }
     });
     const [unsubBalance, freeBalance] = await (async () => {
@@ -1848,7 +1830,7 @@ class KoniExtension {
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    return (0, _utils6.calculateMaxTransferable)(id, _request, freeBalance, fee);
+    return (0, _utils7.calculateMaxTransferable)(id, _request, freeBalance, fee);
   }
   async subscribeAddressTransferableBalance(_ref35, id, port) {
     let {
@@ -2024,7 +2006,7 @@ class KoniExtension {
           continue;
         }
         const networkInfo = chainInfoMap[n];
-        if ((0, _utils4._isChainEvmCompatible)(networkInfo)) {
+        if ((0, _utils5._isChainEvmCompatible)(networkInfo)) {
           return networkInfo;
         }
       }
@@ -2035,7 +2017,7 @@ class KoniExtension {
         continue;
       }
       const networkInfo = chainInfoMap[n];
-      if ((0, _utils4._getEvmChainId)(networkInfo) === chainId) {
+      if ((0, _utils5._getEvmChainId)(networkInfo) === chainId) {
         return networkInfo;
       }
     }
@@ -2077,7 +2059,7 @@ class KoniExtension {
       withType: true
     })));
     const network = this.#koniState.getChainInfo(networkKey);
-    if ((0, _utils4._isChainEvmCompatible)(network)) {
+    if ((0, _utils5._isChainEvmCompatible)(network)) {
       signed = signed.substring(2);
     }
     return {
@@ -2113,7 +2095,7 @@ class KoniExtension {
       signed = await pair.evm.signMessage(data, 'personal_sign');
     } else {
       var _signedTranaction$r, _signedTranaction$s, _signedTranaction$v;
-      const tx = (0, _utils6.createTransactionFromRLP)(message);
+      const tx = (0, _utils7.createTransactionFromRLP)(message);
       if (!tx) {
         throw new Error((0, _i18next.t)('Failed to decode data. Please use a valid QR code'));
       }
@@ -2127,8 +2109,8 @@ class KoniExtension {
       };
       const common = _common.Common.custom({
         name: network.name,
-        networkId: (0, _utils4._getEvmChainId)(network),
-        chainId: (0, _utils4._getEvmChainId)(network)
+        networkId: (0, _utils5._getEvmChainId)(network),
+        chainId: (0, _utils5._getEvmChainId)(network)
       }, {
         hardfork: 'petersburg'
       });
@@ -2138,7 +2120,7 @@ class KoniExtension {
         common
       });
       const signedTranaction = _tx.LegacyTransaction.fromSerializedTx((0, _util.hexToU8a)(pair.evm.signTransaction(transaction)));
-      signed = (0, _utils6.signatureToHex)({
+      signed = (0, _utils7.signatureToHex)({
         r: ((_signedTranaction$r = signedTranaction.r) === null || _signedTranaction$r === void 0 ? void 0 : _signedTranaction$r.toString(16)) || '',
         s: ((_signedTranaction$s = signedTranaction.s) === null || _signedTranaction$s === void 0 ? void 0 : _signedTranaction$s.toString(16)) || '',
         v: ((_signedTranaction$v = signedTranaction.v) === null || _signedTranaction$v === void 0 ? void 0 : _signedTranaction$v.toString(16)) || ''
@@ -2187,7 +2169,7 @@ class KoniExtension {
     }
     const {
       decimals
-    } = (0, _utils4._getChainNativeTokenBasicInfo)(chainInfo);
+    } = (0, _utils5._getChainNativeTokenBasicInfo)(chainInfo);
     return await (0, _bonding.getValidatorsInfo)(chain, apiProps, decimals, chainStakingMetadata);
   }
   async getNominationPoolOptions(chain) {
@@ -2392,7 +2374,7 @@ class KoniExtension {
     const chainInfo = this.#koniState.getChainInfo(networkKey);
     const {
       decimals
-    } = (0, _utils4._getChainNativeTokenBasicInfo)(chainInfo);
+    } = (0, _utils5._getChainNativeTokenBasicInfo)(chainInfo);
     const parsedAccountMinimum = parseFloat(accountMinimum) * 10 ** decimals;
     const extrinsic = await (0, _paraChain.getTuringCompoundExtrinsic)(dotSamaApi, address, collatorAddress, parsedAccountMinimum.toString(), bondedAmount);
     return await this.#koniState.transactionService.handleTransaction({
@@ -2572,11 +2554,11 @@ class KoniExtension {
     let registry = new _types5.TypeRegistry();
     if (isJsonPayload(payload)) {
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
-      const allRegistry = [(0, _utils8.setupApiRegistry)(chainInfo, this.#koniState), (0, _utils8.setupDatabaseRegistry)(await this.#koniState.chainService.getMetadataByHash(payload.genesisHash), chainInfo, payload), (0, _utils8.setupDappRegistry)(this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash), payload)].filter(item => item !== null && item.registry !== undefined);
+      const allRegistry = [(0, _utils9.setupApiRegistry)(chainInfo, this.#koniState), (0, _utils9.setupDatabaseRegistry)(await this.#koniState.chainService.getMetadataByHash(payload.genesisHash), chainInfo, payload), (0, _utils9.setupDappRegistry)(this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash), payload)].filter(item => item !== null && item.registry !== undefined);
       if (allRegistry.length === 0) {
         registry.setSignedExtensions(payload.signedExtensions);
       } else {
-        registry = (0, _utils8.getSuitableRegistry)(allRegistry, payload);
+        registry = (0, _utils9.getSuitableRegistry)(allRegistry, payload);
       }
     }
     const result = request.sign(registry, pair);
@@ -2872,12 +2854,12 @@ class KoniExtension {
         if (namespace.chains) {
           const unSupportChains = namespace.chains.filter(chain => !(0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap));
           if (unSupportChains.length) {
-            throw new Error((0, _utils7.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
+            throw new Error((0, _utils8.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
           }
           availableNamespaces[key] = namespace;
         }
       } else {
-        throw new Error((0, _utils7.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
+        throw new Error((0, _utils8.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
       }
     });
     Object.entries(optionalNamespaces).forEach(_ref55 => {
@@ -2912,7 +2894,7 @@ class KoniExtension {
           const [_namespace] = address.split(':');
           return _namespace === key;
         });
-        const chains = (0, _utils6.uniqueStringArray)(namespace.chains);
+        const chains = (0, _utils7.uniqueStringArray)(namespace.chains);
         namespaces[key] = {
           accounts,
           methods: namespace.methods,
@@ -3051,7 +3033,7 @@ class KoniExtension {
   }
   async initSyncMantaPay(address) {
     var _this$koniState$chain5, _this$koniState$chain6, _this$koniState$chain7, _this$koniState$chain8;
-    if ((_this$koniState$chain5 = this.#koniState.chainService) !== null && _this$koniState$chain5 !== void 0 && (_this$koniState$chain6 = _this$koniState$chain5.mantaPay) !== null && _this$koniState$chain6 !== void 0 && _this$koniState$chain6.getSyncState().isSyncing || !_utils6.MODULE_SUPPORT.MANTA_ZK) {
+    if ((_this$koniState$chain5 = this.#koniState.chainService) !== null && _this$koniState$chain5 !== void 0 && (_this$koniState$chain6 = _this$koniState$chain5.mantaPay) !== null && _this$koniState$chain6 !== void 0 && _this$koniState$chain6.getSyncState().isSyncing || !_utils7.MODULE_SUPPORT.MANTA_ZK) {
       return;
     }
     this.#skipAutoLock = true;
@@ -3093,7 +3075,7 @@ class KoniExtension {
       const tonApi = this.#koniState.getTonApi(chain);
       const state = await tonApi.getAccountState(address);
       const isActive = state === 'active';
-      const isBounceable = (0, _utils3.isBounceableAddress)(address);
+      const isBounceable = (0, _utils4.isBounceableAddress)(address);
       return !isActive && isBounceable;
     } catch (error) {
       console.error(`Failed to validate address ${address} on chain ${chain}:`, error);
@@ -3276,7 +3258,7 @@ class KoniExtension {
     } = submitData;
     const isPoolSupportAlternativeFee = this.#koniState.earningService.isPoolSupportAlternativeFee(inputData.data.slug);
     const poolHandler = this.#koniState.earningService.getPoolHandler(data.slug);
-    const isMintingStep = _utils2.YIELD_EXTRINSIC_TYPES.includes(extrinsicType);
+    const isMintingStep = _utils3.YIELD_EXTRINSIC_TYPES.includes(extrinsicType);
     const eventsHandler = eventEmitter => {
       if (onSend) {
         eventEmitter.on('send', onSend);
@@ -3310,7 +3292,7 @@ class KoniExtension {
         };
         await this.#koniState.transactionService.createProcessIfNeed({
           id: processId,
-          address: (0, _utils6.reformatAddress)(address),
+          address: (0, _utils7.reformatAddress)(address),
           type: _types3.ProcessType.EARNING,
           combineInfo,
           currentStepId: step.stepId,
@@ -3685,14 +3667,20 @@ class KoniExtension {
     ready = true;
     return this.#koniState.swapService.getSwapPairs();
   }
-  async generateOptimalProcess(request) {
-    return this.#koniState.swapService.generateOptimalProcess(request);
+  async getOptimalSwapProcessOnSelectQuote(request) {
+    return this.#koniState.swapService.generateOptimalProcessWithoutPath(request);
   }
   async handleSwapRequest(request) {
     return this.#koniState.swapService.handleSwapRequest(request);
   }
+  async handleSwapRequestV2(request) {
+    return this.#koniState.swapService.handleSwapRequestV2(request);
+  }
   async getLatestSwapQuote(swapRequest) {
-    return this.#koniState.swapService.getLatestQuotes(swapRequest);
+    const {
+      swapQuoteResponse
+    } = await this.#koniState.swapService.getLatestQuoteFromSwapRequest(swapRequest);
+    return swapQuoteResponse;
   }
   async validateSwapProcess(params) {
     return this.#koniState.swapService.validateSwapProcess(params);
@@ -3729,7 +3717,8 @@ class KoniExtension {
       address,
       process,
       selectedQuote: quote,
-      recipient
+      recipient,
+      currentStep: inputData.currentStep
     });
     if (swapValidations.length > 0) {
       if (step) {
@@ -3750,6 +3739,7 @@ class KoniExtension {
       }
       throw e;
     }
+    console.log('swap data', submitData);
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const {
@@ -3783,7 +3773,7 @@ class KoniExtension {
         };
         await this.#koniState.transactionService.createProcessIfNeed({
           id: processId,
-          address: (0, _utils6.reformatAddress)(address),
+          address: (0, _utils7.reformatAddress)(address),
           type: _types3.ProcessType.SWAP,
           currentStepId: step.stepId,
           combineInfo,
@@ -4018,7 +4008,7 @@ class KoniExtension {
     if (!pair) {
       throw new Error('Pair not found');
     }
-    const signMode = (0, _utils6.getAccountSignMode)(address, pair.meta);
+    const signMode = (0, _utils7.getAccountSignMode)(address, pair.meta);
     if (signMode !== _types3.AccountSignMode.PASSWORD) {
       throw new Error('Account can not use this feature');
     }
@@ -4800,10 +4790,12 @@ class KoniExtension {
       /* Swap service */
       case 'pri(swapService.subscribePairs)':
         return this.subscribeSwapPairs(id, port);
-      case 'pri(swapService.generateOptimalProcess)':
-        return this.generateOptimalProcess(request);
+      case 'pri(swapService.getOptimalProcessOnSelectQuote)':
+        return this.getOptimalSwapProcessOnSelectQuote(request);
       case 'pri(swapService.handleSwapRequest)':
         return this.handleSwapRequest(request);
+      case 'pri(swapService.handleSwapRequestV2)':
+        return this.handleSwapRequestV2(request);
       case 'pri(swapService.getLatestQuote)':
         return this.getLatestSwapQuote(request);
       case 'pri(swapService.validateSwapProcess)':

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.3.26-0'
+  version: '1.3.27-1'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/chain-service/utils/patch.js

@@ -11,7 +11,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
 const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
-const ChainListVersion = '0.2.101'; // update this when build chainlist
+const ChainListVersion = '0.2.102'; // update this when build chainlist
 
 // todo: move this interface to chainlist