@subwallet/extension-base 1.3.39-0 → 1.3.40-0

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

@@ -39,10 +39,11 @@ var _acrossBridge = require("@subwallet/extension-base/services/balance-service/
 var _availBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge");
 var _polygonBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge");
 var _posBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge");
+var _utils5 = require("@subwallet/extension-base/services/balance-service/transfer/xcm/utils");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _types2 = require("@subwallet/extension-base/services/chain-service/types");
-var _utils5 = require("@subwallet/extension-base/services/chain-service/utils");
-var _utils6 = require("@subwallet/extension-base/services/fee-service/utils");
+var _utils6 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils7 = 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");
@@ -50,20 +51,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 _utils7 = require("@subwallet/extension-base/utils");
+var _utils8 = 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 _utils8 = require("@walletconnect/utils");
+var _utils9 = 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 _utils9 = require("../utils");
+var _utils10 = require("../utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -278,7 +279,7 @@ class KoniExtension {
     const accounts = keyringService.context.accounts;
     const transformedAccounts = Object.values(accounts);
     const responseData = {
-      accounts: transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils7.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [],
+      accounts: transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils8.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [],
       currentAccountProxy: currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.proxyId
     };
     const accountProxyMapObservable = keyringService.context.observable.accounts;
@@ -292,7 +293,7 @@ class KoniExtension {
         currentAccount
       } = _ref7;
       const transformedAccounts = Object.values(accountProxies);
-      responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils7.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [];
+      responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils8.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [];
       responseData.currentAccountProxy = currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.proxyId;
       cb(responseData);
     });
@@ -312,10 +313,10 @@ class KoniExtension {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const combineFunction = async (chainInfoMap, accountProxyMap, _contacts) => {
       const accountProxies = Object.values(accountProxyMap);
-      const contacts = (0, _utils7.transformAddresses)(_contacts);
+      const contacts = (0, _utils8.transformAddresses)(_contacts);
       const chainInfo = chainInfoMap[chain];
       const substrateApi = this.#koniState.chainService.getSubstrateApi(chain);
-      const rs = await (0, _utils7._analyzeAddress)(data, accountProxies, contacts, chainInfo, substrateApi);
+      const rs = await (0, _utils8._analyzeAddress)(data, accountProxies, contacts, chainInfo, substrateApi);
       return {
         id,
         ...rs
@@ -355,7 +356,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, _utils7.transformAddresses)(subjectInfo);
+      const addresses = (0, _utils8.transformAddresses)(subjectInfo);
       const _new = JSON.stringify(addresses);
       if (old !== _new) {
         _cb({
@@ -372,7 +373,7 @@ class KoniExtension {
     });
     const subjectInfo = this.#koniState.keyringService.context.contacts;
     return {
-      addresses: (0, _utils7.transformAccounts)(subjectInfo)
+      addresses: (0, _utils8.transformAccounts)(subjectInfo)
     };
   }
 
@@ -385,7 +386,7 @@ class KoniExtension {
       chain
     } = _ref9;
     if ((0, _keyring.isAddress)(accountId)) {
-      const address = (0, _utils7.reformatAddress)(accountId);
+      const address = (0, _utils8.reformatAddress)(accountId);
       const account = _uiKeyring.keyring.getAccount(address);
       const contact = _uiKeyring.keyring.getAddress(address, 'address');
       if (account) {
@@ -431,7 +432,7 @@ class KoniExtension {
       meta
     } = _ref10;
     if ((0, _keyring.isAddress)(address)) {
-      const _address = (0, _utils7.reformatAddress)(address);
+      const _address = (0, _utils8.reformatAddress)(address);
       _uiKeyring.keyring.saveAddress(_address, meta);
       return true;
     } else {
@@ -447,7 +448,7 @@ class KoniExtension {
       address
     } = _ref11;
     if ((0, _keyring.isAddress)(address)) {
-      const _address = (0, _utils7.reformatAddress)(address);
+      const _address = (0, _utils8.reformatAddress)(address);
       _uiKeyring.keyring.forgetAddress(_address);
       return true;
     } else {
@@ -576,7 +577,7 @@ class KoniExtension {
   }
   getPairs() {
     const storedAccounts = this.#koniState.keyringService.context.pairs;
-    return (0, _utils7.transformAccounts)(storedAccounts);
+    return (0, _utils8.transformAccounts)(storedAccounts);
   }
   isAddressValidWithAuthType(address, accountAuthTypes) {
     const type = (0, _keyring.getKeypairTypeByAddress)(address);
@@ -694,7 +695,7 @@ class KoniExtension {
     const {
       promise,
       resolve
-    } = (0, _utils7.createPromiseHandler)();
+    } = (0, _utils8.createPromiseHandler)();
     const typeInfoMap = {
       substrate: 'substrateInfo',
       evm: 'evmInfo',
@@ -718,7 +719,7 @@ class KoniExtension {
         }
       }));
     }
-    if (chainInfo && !(0, _utils5._isChainEnabled)(chainState)) {
+    if (chainInfo && !(0, _utils6._isChainEnabled)(chainState)) {
       await this.enableChainWithPriorityAssets({
         chainSlug: networkKey,
         enableTokens: true
@@ -1201,7 +1202,7 @@ class KoniExtension {
       const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
       // Re-filter
-      cb(histories.filter(item => addresses.some(address => (0, _utils7.isSameAddress)(item.address, address))));
+      cb(histories.filter(item => addresses.some(address => (0, _utils8.isSameAddress)(item.address, address))));
     });
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
@@ -1210,7 +1211,7 @@ class KoniExtension {
     const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
     // Re-filter
-    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils7.isSameAddress)(item.address, address)));
+    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils8.isSameAddress)(item.address, address)));
   }
   subscribeHistoryByChainAndAddress(_ref32, id, port) {
     let {
@@ -1281,14 +1282,14 @@ class KoniExtension {
     const nativeTokenSlug = nativeTokenInfo.slug;
     const isTransferNativeToken = nativeTokenSlug === tokenSlug;
     const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNativeToken && tokenPayFeeSlug === tokenSlug;
-    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 isCustomTokenPayFeeAssetHub = tokenPayFeeSlug && !(0, _utils6._isNativeTokenBySlug)(tokenPayFeeSlug) && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain);
+    const isCustomTokenPayFeeHydration = tokenPayFeeSlug && !(0, _utils6._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, _utils5._getAssetSymbol)(transferTokenInfo),
-      decimals: (0, _utils5._getAssetDecimals)(transferTokenInfo)
+      symbol: (0, _utils6._getAssetSymbol)(transferTokenInfo),
+      decimals: (0, _utils6._getAssetDecimals)(transferTokenInfo)
     };
     let transaction;
     const transferTokenAvailable = await this.getAddressTransferableBalance({
@@ -1298,7 +1299,7 @@ class KoniExtension {
       extrinsicType
     });
     try {
-      if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils5._isTokenTransferredByEvm)(transferTokenInfo)) {
+      if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils6._isTokenTransferredByEvm)(transferTokenInfo)) {
         chainType = _KoniTypes.ChainType.EVM;
         const txVal = transferAll ? transferTokenAvailable.value : value || '0';
         const evmApi = this.#koniState.getEvmApi(chain);
@@ -1306,9 +1307,9 @@ class KoniExtension {
 
         // todo: refactor: merge getERC20TransactionObject & getEVMTransactionObject
         // Estimate with EVM API
-        if ((0, _utils5._isTokenEvmSmartContract)(transferTokenInfo) || (0, _utils5._isLocalToken)(transferTokenInfo)) {
+        if ((0, _utils6._isTokenEvmSmartContract)(transferTokenInfo) || (0, _utils6._isLocalToken)(transferTokenInfo)) {
           [transaction, transferAmount.value] = await (0, _smartContract.getERC20TransactionObject)({
-            assetAddress: (0, _utils5._getContractAddressOfToken)(transferTokenInfo),
+            assetAddress: (0, _utils6._getContractAddressOfToken)(transferTokenInfo),
             chain,
             evmApi,
             feeCustom,
@@ -1332,10 +1333,10 @@ class KoniExtension {
             value: txVal
           });
         }
-      } else if ((0, _utils5._isMantaZkAsset)(transferTokenInfo)) {
+      } else if ((0, _utils6._isMantaZkAsset)(transferTokenInfo)) {
         transaction = undefined;
         transferAmount.value = '0';
-      } else if ((0, _keyring.isTonAddress)(from) && (0, _keyring.isTonAddress)(to) && (0, _utils5._isTokenTransferredByTon)(transferTokenInfo)) {
+      } else if ((0, _keyring.isTonAddress)(from) && (0, _keyring.isTonAddress)(to) && (0, _utils6._isTokenTransferredByTon)(transferTokenInfo)) {
         chainType = _KoniTypes.ChainType.TON;
         const tonApi = this.#koniState.getTonApi(chain);
         [transaction, transferAmount.value] = await (0, _tonTransfer.createTonTransaction)({
@@ -1348,7 +1349,7 @@ class KoniExtension {
           // currently not used
           tonApi
         });
-      } else if ((0, _keyring.isCardanoAddress)(from) && (0, _keyring.isCardanoAddress)(to) && (0, _utils5._isTokenTransferredByCardano)(transferTokenInfo)) {
+      } else if ((0, _keyring.isCardanoAddress)(from) && (0, _keyring.isCardanoAddress)(to) && (0, _utils6._isTokenTransferredByCardano)(transferTokenInfo)) {
         chainType = _KoniTypes.ChainType.CARDANO;
         const cardanoApi = this.#koniState.getCardanoApi(chain);
         [transaction, transferAmount.value] = await (0, _cardanoTransfer.createCardanoTransaction)({
@@ -1400,7 +1401,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, _utils7.reformatAddress)(from), chain, tokenPayFeeSlug);
+        const nonNativeTokenPayFeeInfo = await this.#koniState.balanceService.getTokensHasBalance((0, _utils8.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));
@@ -1492,9 +1493,9 @@ class KoniExtension {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(errors);
     }
     const chainInfoMap = this.#koniState.getChainInfoMap();
-    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 isAvailBridgeFromEvm = (0, _utils6._isPureEvmChain)(chainInfoMap[originNetworkKey]) && (0, _availBridge.isAvailChainBridge)(destinationNetworkKey);
+    const isAvailBridgeFromAvail = (0, _availBridge.isAvailChainBridge)(originNetworkKey) && (0, _utils6._isPureEvmChain)(chainInfoMap[destinationNetworkKey]);
+    const isSnowBridgeEvmTransfer = (0, _utils6._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 isAcrossBridgeTransfer = (0, _acrossBridge._isAcrossChainBridge)(originNetworkKey, destinationNetworkKey);
@@ -1545,10 +1546,16 @@ class KoniExtension {
         feeInfo
       };
       extrinsic = await funcCreateExtrinsic(params);
-      let dryRunInfo;
       if (isSubstrateXcm) {
-        dryRunInfo = await (0, _xcm.dryRunXcmExtrinsicV2)(params);
-        xcmFeeDryRun = dryRunInfo.fee;
+        const xcmFeeInfo = await (0, _utils5.estimateXcmFee)({
+          fromChainInfo: params.originChain,
+          fromTokenInfo: params.originTokenInfo,
+          toChainInfo: params.destinationChain,
+          recipient: params.recipient,
+          sender: params.sender,
+          value: params.sendingValue
+        });
+        xcmFeeDryRun = (xcmFeeInfo === null || xcmFeeInfo === void 0 ? void 0 : xcmFeeInfo.origin.fee) || '0';
       }
       if (isAcrossBridgeTransfer) {
         const data = await (0, _acrossBridge.getAcrossQuote)(params);
@@ -1575,7 +1582,7 @@ class KoniExtension {
         }
         let isSendingTokenSufficient = false;
         let receiverSystemAccountInfo;
-        if (!(0, _utils5._isChainSubstrateCompatible)(chainInfoMap[destinationNetworkKey])) {
+        if (!(0, _utils6._isChainSubstrateCompatible)(chainInfoMap[destinationNetworkKey])) {
           return undefined;
         }
         const setting = {
@@ -1600,7 +1607,7 @@ class KoniExtension {
           extrinsicType
         });
         const receiverDestinationTokenKeepAliveBalance = BigInt(_receiverDestinationTokenKeepAliveBalance);
-        if (!(0, _utils5._isNativeToken)(destinationTokenInfo)) {
+        if (!(0, _utils6._isNativeToken)(destinationTokenInfo)) {
           const _receiverNativeTotal = await this.getAddressTotalBalance({
             address: to,
             networkKey: destinationNetworkKey,
@@ -1617,8 +1624,11 @@ class KoniExtension {
         receiverSystemAccountInfo, isSendingTokenSufficient);
         warning.length && inputTransaction.warnings.push(...warning);
         error.length && inputTransaction.errors.push(...error);
-        if (isSubstrateXcm && !dryRunInfo.success) {
-          inputTransaction.errors.push(new _TransactionError.TransactionError(_types3.BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again'));
+        if (isSubstrateXcm) {
+          const isDryRunSuccess = await (0, _xcm.dryRunXcmExtrinsicV2)(params);
+          if (!isDryRunSuccess) {
+            inputTransaction.errors.push(new _TransactionError.TransactionError(_types3.BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again'));
+          }
         }
       };
       eventsHandler = eventEmitter => {
@@ -1653,7 +1663,7 @@ class KoniExtension {
       data: inputData,
       extrinsicType,
       chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer && !isPosBridgeTransfer && !isAcrossBridgeTransfer ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM,
-      transferNativeAmount: (0, _utils5._isNativeToken)(originTokenInfo) ? value : '0',
+      transferNativeAmount: (0, _utils6._isNativeToken)(originTokenInfo) ? value : '0',
       ignoreWarnings,
       tokenPayFeeSlug,
       isTransferAll: transferAll,
@@ -1674,7 +1684,7 @@ class KoniExtension {
     } = request;
     const chainService = this.#koniState.chainService;
     const substrateApi = this.#koniState.getSubstrateApi(chain);
-    const address = (0, _utils7.reformatAddress)(_address);
+    const address = (0, _utils8.reformatAddress)(_address);
     const tokensHasBalanceInfoMap = await this.#koniState.balanceService.getTokensHasBalance(address, chain);
     const nativeTokenInfo = chainService.getNativeTokenInfo(chain);
     const nativeBalanceInfo = {
@@ -1733,7 +1743,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, _utils6.calculateToAmountByReservePool)(substrateApi.api, nativeTokenInfo, toTokenInfo, nativeTokenFeeAmount);
+    return await (0, _utils7.calculateToAmountByReservePool)(substrateApi.api, nativeTokenInfo, toTokenInfo, nativeTokenFeeAmount);
   }
   async evmNftSubmitTransaction(inputData) {
     const {
@@ -1864,10 +1874,10 @@ class KoniExtension {
   }
   async deleteCustomAsset(assetSlug) {
     const assetInfo = this.#koniState.getAssetBySlug(assetSlug);
-    if (assetInfo && (0, _utils5._isCustomAsset)(assetSlug)) {
-      if ((0, _utils5._isAssetSmartContractNft)(assetInfo)) {
+    if (assetInfo && (0, _utils6._isCustomAsset)(assetSlug)) {
+      if ((0, _utils6._isAssetSmartContractNft)(assetInfo)) {
         // check if deleting a smart contract NFT
-        await this.#koniState.deleteNftCollection(assetInfo.originChain, (0, _utils5._getContractAddressOfToken)(assetInfo));
+        await this.#koniState.deleteNftCollection(assetInfo.originChain, (0, _utils6._getContractAddressOfToken)(assetInfo));
       }
       this.#koniState.deleteCustomAssets([assetSlug]);
       return true;
@@ -1914,8 +1924,8 @@ class KoniExtension {
     } = request;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const transferTokenInfo = this.#koniState.chainService.getAssetBySlug(token);
-    const isTransferLocalTokenAndPayThatTokenAsFee = !(0, _utils5._isNativeToken)(transferTokenInfo) && !!tokenPayFeeSlug && tokenPayFeeSlug === token;
-    const isTransferNativeTokenAndPayLocalTokenAsFee = (0, _utils5._isNativeToken)(transferTokenInfo) && !!tokenPayFeeSlug && !(0, _utils5._isNativeTokenBySlug)(tokenPayFeeSlug);
+    const isTransferLocalTokenAndPayThatTokenAsFee = !(0, _utils6._isNativeToken)(transferTokenInfo) && !!tokenPayFeeSlug && tokenPayFeeSlug === token;
+    const isTransferNativeTokenAndPayLocalTokenAsFee = (0, _utils6._isNativeToken)(transferTokenInfo) && !!tokenPayFeeSlug && !(0, _utils6._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);
@@ -1924,7 +1934,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, _utils7.detectTransferTxType)(srcToken, srcChain, destChain);
+    const feeChainType = (0, _utils8.detectTransferTxType)(srcToken, srcChain, destChain);
     if (!destToken) {
       throw new Error('Destination token not found');
     }
@@ -1955,7 +1965,7 @@ class KoniExtension {
           fee,
           freeBalance
         } = _ref38;
-        (0, _utils7.calculateMaxTransferable)(id, _request, freeBalance, fee).then(cb).catch(console.error);
+        (0, _utils8.calculateMaxTransferable)(id, _request, freeBalance, fee).then(cb).catch(console.error);
       }
     });
     const [unsubBalance, freeBalance] = await (async () => {
@@ -1986,7 +1996,7 @@ class KoniExtension {
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    return (0, _utils7.calculateMaxTransferable)(id, _request, freeBalance, fee);
+    return (0, _utils8.calculateMaxTransferable)(id, _request, freeBalance, fee);
   }
   async subscribeAddressTransferableBalance(_ref39, id, port) {
     let {
@@ -2162,7 +2172,7 @@ class KoniExtension {
           continue;
         }
         const networkInfo = chainInfoMap[n];
-        if ((0, _utils5._isChainEvmCompatible)(networkInfo)) {
+        if ((0, _utils6._isChainEvmCompatible)(networkInfo)) {
           return networkInfo;
         }
       }
@@ -2173,7 +2183,7 @@ class KoniExtension {
         continue;
       }
       const networkInfo = chainInfoMap[n];
-      if ((0, _utils5._getEvmChainId)(networkInfo) === chainId) {
+      if ((0, _utils6._getEvmChainId)(networkInfo) === chainId) {
         return networkInfo;
       }
     }
@@ -2215,7 +2225,7 @@ class KoniExtension {
       withType: true
     })));
     const network = this.#koniState.getChainInfo(networkKey);
-    if ((0, _utils5._isChainEvmCompatible)(network)) {
+    if ((0, _utils6._isChainEvmCompatible)(network)) {
       signed = signed.substring(2);
     }
     return {
@@ -2251,7 +2261,7 @@ class KoniExtension {
       signed = await pair.evm.signMessage(data, 'personal_sign');
     } else {
       var _signedTranaction$r, _signedTranaction$s, _signedTranaction$v;
-      const tx = (0, _utils7.createTransactionFromRLP)(message);
+      const tx = (0, _utils8.createTransactionFromRLP)(message);
       if (!tx) {
         throw new Error((0, _i18next.t)('Failed to decode data. Please use a valid QR code'));
       }
@@ -2265,8 +2275,8 @@ class KoniExtension {
       };
       const common = _common.Common.custom({
         name: network.name,
-        networkId: (0, _utils5._getEvmChainId)(network),
-        chainId: (0, _utils5._getEvmChainId)(network)
+        networkId: (0, _utils6._getEvmChainId)(network),
+        chainId: (0, _utils6._getEvmChainId)(network)
       }, {
         hardfork: 'petersburg'
       });
@@ -2276,7 +2286,7 @@ class KoniExtension {
         common
       });
       const signedTranaction = _tx.LegacyTransaction.fromSerializedTx((0, _util.hexToU8a)(pair.evm.signTransaction(transaction)));
-      signed = (0, _utils7.signatureToHex)({
+      signed = (0, _utils8.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)) || ''
@@ -2325,7 +2335,7 @@ class KoniExtension {
     }
     const {
       decimals
-    } = (0, _utils5._getChainNativeTokenBasicInfo)(chainInfo);
+    } = (0, _utils6._getChainNativeTokenBasicInfo)(chainInfo);
     return await (0, _bonding.getValidatorsInfo)(chain, apiProps, decimals, chainStakingMetadata);
   }
   async getNominationPoolOptions(chain) {
@@ -2530,7 +2540,7 @@ class KoniExtension {
     const chainInfo = this.#koniState.getChainInfo(networkKey);
     const {
       decimals
-    } = (0, _utils5._getChainNativeTokenBasicInfo)(chainInfo);
+    } = (0, _utils6._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({
@@ -2710,12 +2720,12 @@ class KoniExtension {
     let registry = new _types5.TypeRegistry();
     if (isJsonPayload(payload)) {
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
-      const registries = await Promise.all([(0, _utils9.setupApiRegistry)(chainInfo, this.#koniState), (0, _utils9.setupDatabaseRegistry)(chainInfo, payload, this.#koniState), (0, _utils9.setupDappRegistry)(payload, this.#koniState)]);
+      const registries = await Promise.all([(0, _utils10.setupApiRegistry)(chainInfo, this.#koniState), (0, _utils10.setupDatabaseRegistry)(chainInfo, payload, this.#koniState), (0, _utils10.setupDappRegistry)(payload, this.#koniState)]);
       const validRegistries = registries.filter(item => !!(item !== null && item !== void 0 && item.registry));
       if (validRegistries.length === 0) {
         registry.setSignedExtensions(payload.signedExtensions);
       } else {
-        registry = (0, _utils9.getSuitableRegistry)(validRegistries, payload);
+        registry = (0, _utils10.getSuitableRegistry)(validRegistries, payload);
       }
     }
     const result = request.sign(registry, pair);
@@ -3013,12 +3023,12 @@ class KoniExtension {
         if (namespace.chains) {
           const unSupportChains = namespace.chains.filter(chain => !(0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap));
           if (unSupportChains.length) {
-            throw new Error((0, _utils8.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
+            throw new Error((0, _utils9.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
           }
           availableNamespaces[key] = namespace;
         }
       } else {
-        throw new Error((0, _utils8.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
+        throw new Error((0, _utils9.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
       }
     });
     Object.entries(optionalNamespaces).forEach(_ref59 => {
@@ -3053,7 +3063,7 @@ class KoniExtension {
           const [_namespace] = address.split(':');
           return _namespace === key;
         });
-        const chains = (0, _utils7.uniqueStringArray)(namespace.chains);
+        const chains = (0, _utils8.uniqueStringArray)(namespace.chains);
         namespaces[key] = {
           accounts,
           methods: namespace.methods,
@@ -3192,7 +3202,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 || !_utils7.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 || !_utils8.MODULE_SUPPORT.MANTA_ZK) {
       return;
     }
     this.#skipAutoLock = true;
@@ -3451,7 +3461,7 @@ class KoniExtension {
         };
         await this.#koniState.transactionService.createProcessIfNeed({
           id: processId,
-          address: (0, _utils7.reformatAddress)(address),
+          address: (0, _utils8.reformatAddress)(address),
           type: _types3.ProcessType.EARNING,
           combineInfo,
           currentStepId: step.stepId,
@@ -3937,7 +3947,7 @@ class KoniExtension {
         };
         await this.#koniState.transactionService.createProcessIfNeed({
           id: processId,
-          address: (0, _utils7.reformatAddress)(address),
+          address: (0, _utils8.reformatAddress)(address),
           type: _types3.ProcessType.SWAP,
           currentStepId: step.stepId,
           combineInfo,
@@ -4145,7 +4155,7 @@ class KoniExtension {
     if (!pair) {
       throw new Error('Pair not found');
     }
-    const signMode = (0, _utils7.getAccountSignMode)(address, pair.meta);
+    const signMode = (0, _utils8.getAccountSignMode)(address, pair.meta);
     if (signMode !== _types3.AccountSignMode.PASSWORD) {
       throw new Error('Account can not use this feature');
     }

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.39-0'
+  version: '1.3.40-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.dryRunXcmExtrinsicV2 = exports.createXcmExtrinsicV2 = exports.createXcmExtrinsic = exports.createSnowBridgeExtrinsic = exports.createPolygonBridgeExtrinsic = exports.createAvailBridgeTxFromEth = exports.createAvailBridgeExtrinsicFromAvail = exports.createAcrossBridgeExtrinsic = void 0;
-var _constants = require("@subwallet/extension-base/constants");
 var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
 var _availBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge");
 var _polkadotXcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm");
@@ -14,7 +13,7 @@ var _snowBridge = require("@subwallet/extension-base/services/balance-service/tr
 var _utils = require("@subwallet/extension-base/services/balance-service/transfer/xcm/utils");
 var _xcmPallet = require("@subwallet/extension-base/services/balance-service/transfer/xcm/xcmPallet");
 var _xTokens = require("@subwallet/extension-base/services/balance-service/transfer/xcm/xTokens");
-var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
+var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _subwalletApiSdk = _interopRequireDefault(require("@subwallet/subwallet-api-sdk"));
@@ -47,6 +46,8 @@ const createSnowBridgeExtrinsic = async _ref => {
   }
   return (0, _snowBridge.getSnowBridgeEvmTransfer)(originTokenInfo, originChain, destinationChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };
+
+// deprecated
 exports.createSnowBridgeExtrinsic = createSnowBridgeExtrinsic;
 const createXcmExtrinsic = async _ref2 => {
   let {
@@ -62,11 +63,11 @@ const createXcmExtrinsic = async _ref2 => {
   }
   const chainApi = await substrateApi.isReady;
   const api = chainApi.api;
-  const polkadotXcmSpecialCases = _constants2._XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChain.slug) && (0, _utils2._isNativeToken)(originTokenInfo);
-  if (_constants2._XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
+  const polkadotXcmSpecialCases = _constants._XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChain.slug) && (0, _utils2._isNativeToken)(originTokenInfo);
+  if (_constants._XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
     return (0, _polkadotXcm.getExtrinsicByPolkadotXcmPallet)(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
   }
-  if (_constants2._XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
+  if (_constants._XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
     return (0, _xcmPallet.getExtrinsicByXcmPalletPallet)(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
   }
   return (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
@@ -138,38 +139,28 @@ const createXcmExtrinsicV2 = async request => {
     return await (0, _utils.buildXcm)(request);
   } catch (e) {
     console.log('createXcmExtrinsicV2 error: ', e);
-    const errorMessage = e instanceof Error ? e.message : 'Unknown error occurred';
-    if ((0, _utils.isChainNotSupportPolkadotApi)(errorMessage)) {
-      return createXcmExtrinsic(request);
-    }
     return undefined;
   }
 };
 exports.createXcmExtrinsicV2 = createXcmExtrinsicV2;
 const dryRunXcmExtrinsicV2 = async request => {
   try {
-    return await (0, _utils.dryRunXcmV2)(request);
-  } catch (e) {
-    const errorMessage = e instanceof Error ? e.message : 'Unknown error occurred';
-    if ((0, _utils.isChainNotSupportDryRun)(errorMessage) || (0, _utils.isChainNotSupportPolkadotApi)(errorMessage)) {
-      const xcmTransfer = await createXcmExtrinsicV2(request);
-      if (!xcmTransfer) {
-        return {
-          success: false
-        };
+    const dryRunResult = await (0, _utils.dryRunXcm)(request);
+    const originDryRunResult = dryRunResult.origin;
+    if (originDryRunResult.success) {
+      const destinationDryRunResult = dryRunResult.destination;
+      if (destinationDryRunResult.success) {
+        return true;
       }
-      const _xcmFeeInfo = await xcmTransfer.paymentInfo(request.sender);
-      const xcmFeeInfo = _xcmFeeInfo.toPrimitive();
 
-      // skip dry run in this case
-      return {
-        success: true,
-        fee: Math.round(xcmFeeInfo.partialFee * _constants.XCM_MIN_AMOUNT_RATIO).toString()
-      };
+      // pass dry-run in these cases
+      return (0, _utils.isChainNotSupportDryRun)(destinationDryRunResult.failureReason) || (0, _utils.isChainNotSupportPolkadotApi)(destinationDryRunResult.failureReason);
     }
-    return {
-      success: false
-    };
+
+    // pass dry-run in these cases
+    return (0, _utils.isChainNotSupportDryRun)(originDryRunResult.failureReason) || (0, _utils.isChainNotSupportPolkadotApi)(originDryRunResult.failureReason);
+  } catch (e) {
+    return false;
   }
 };
 exports.dryRunXcmExtrinsicV2 = dryRunXcmExtrinsicV2;