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

package/cjs/services/swap-service/handler/kyber-handler.js

@@ -22,44 +22,59 @@ var _baseHandler = require("./base-handler");
 const KYBER_CLIENT_ID = process.env.KYBER_CLIENT_ID || '';
 exports.KYBER_CLIENT_ID = KYBER_CLIENT_ID;
 const kyberUrl = 'https://aggregator-api.kyberswap.com';
-async function buildTxForSwap(params, chain) {
+async function buildTxForKyberSwap(params, chain) {
   const {
     recipient,
     sender,
     slippageTolerance
   } = params;
   let routeSummary = params.routeSummary;
+  console.log('routeSummary1', routeSummary);
   if (!routeSummary || !routeSummary.tokenIn || !routeSummary.tokenOut || !routeSummary.amountIn) {
-    const queryParams = new URLSearchParams({
-      tokenIn: routeSummary.tokenIn,
-      tokenOut: routeSummary.tokenOut,
-      amountIn: routeSummary.amountIn,
-      gasInclude: 'true'
-    });
-    const url = `${kyberUrl}/${chain}/api/v1/routes?${queryParams.toString()}`;
-    try {
-      var _routeData$data;
-      const res = await fetch(url, {
-        method: 'GET',
-        headers: {
-          'Content-Type': 'application/json',
-          'x-client-id': KYBER_CLIENT_ID,
-          accept: 'application/json'
-        }
-      });
-      const routeData = await res.json();
-      if (!routeData.success || !((_routeData$data = routeData.data) !== null && _routeData$data !== void 0 && _routeData$data.routeSummary)) {
-        return {
-          error: new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR, routeData.message)
-        };
+    return {
+      error: new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR, 'Invalid Route Summary')
+    };
+  }
+  const {
+    amountIn,
+    tokenIn,
+    tokenOut
+  } = routeSummary;
+  const queryParams = new URLSearchParams({
+    tokenIn,
+    tokenOut,
+    amountIn,
+    gasInclude: 'true'
+  });
+  const url = `${kyberUrl}/${chain}/api/v1/routes?${queryParams.toString()}`;
+  try {
+    var _routeData$data;
+    const res = await fetch(url, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'x-client-id': KYBER_CLIENT_ID,
+        accept: 'application/json'
       }
-      routeSummary = routeData.data.routeSummary;
-    } catch (error) {
-      console.error('Error:', error);
+    });
+    if (!res.ok) {
+      const errorText = await res.text();
+      return {
+        error: new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR, `Fetch Kyber routes failed: ${errorText}`)
+      };
+    }
+    const routeData = await res.json();
+    if (!((_routeData$data = routeData.data) !== null && _routeData$data !== void 0 && _routeData$data.routeSummary)) {
       return {
-        error: new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)
+        error: new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR, routeData.message)
       };
     }
+    routeSummary = routeData.data.routeSummary;
+  } catch (error) {
+    console.error('Error:', error);
+    return {
+      error: new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR, 'Unable to build Kyber swap transaction')
+    };
   }
   const body = {
     routeSummary,
@@ -69,6 +84,7 @@ async function buildTxForSwap(params, chain) {
     ignoreCappedSlippage: true,
     enableGasEstimation: true
   };
+  console.log('routeSummary2', routeSummary);
   try {
     const res = await fetch(`${kyberUrl}/${chain}/api/v1/route/build`, {
       method: 'POST',
@@ -280,7 +296,7 @@ class KyberHandler {
     const recipient = (0, _utils._reformatAddressWithChain)((_params$recipient = params.recipient) !== null && _params$recipient !== void 0 ? _params$recipient : sender, toChainInfo);
     const metadata = params.quote.metadata;
     const slippageTolerance = params.slippage * 10000;
-    const rawTx = await buildTxForSwap({
+    const rawTx = await buildTxForKyberSwap({
       routeSummary: metadata.routeSummary,
       sender: params.address,
       recipient,

package/cjs/services/swap-service/handler/simpleswap-handler.js

@@ -14,49 +14,82 @@ var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireWildcard(require("bignumber.js"));
 var _smartContract = require("../../balance-service/transfer/smart-contract");
 var _token = require("../../balance-service/transfer/token");
-var _utils3 = require("../utils");
 var _baseHandler = require("./base-handler");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const apiUrl = 'https://api.simpleswap.io';
+const apiUrl = 'https://api.simpleswap.io/v3';
 const simpleSwapApiKey = process.env.SIMPLE_SWAP_API_KEY || '';
 exports.simpleSwapApiKey = simpleSwapApiKey;
 const toBNString = (input, decimal) => {
   const raw = new _bignumber.BigNumber(input);
   return raw.shiftedBy(decimal).integerValue(_bignumber.BigNumber.ROUND_CEIL).toFixed();
 };
-const createSwapRequest = async params => {
-  const fromDecimals = (0, _utils._getAssetDecimals)(params.fromAsset);
-  const toDecimals = (0, _utils._getAssetDecimals)(params.toAsset);
-  const formatedAmount = (0, _utils2.formatNumber)(params.fromAmount, fromDecimals, s => s);
-  const requestBody = {
-    fixed: false,
-    currency_from: params.fromSymbol,
-    currency_to: params.toSymbol,
-    amount: formatedAmount,
-    // Convert to small number due to require of api
-    address_to: params.receiver,
-    extra_id_to: '',
-    user_refund_address: params.sender,
-    user_refund_extra_id: ''
-  };
-  const response = await fetch(`${apiUrl}/create_exchange?api_key=${simpleSwapApiKey}`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      Accept: 'application/json'
-    },
-    body: JSON.stringify(requestBody)
-  });
-  const depositAddressResponse = await response.json();
-  return {
-    id: depositAddressResponse.id,
-    addressFrom: depositAddressResponse.address_from,
-    amountTo: toBNString(depositAddressResponse.amount_to, toDecimals)
-  };
+const buildTxForSimpleSwap = async params => {
+  try {
+    const {
+      fromAmount,
+      fromAsset,
+      fromSymbol,
+      metadata,
+      receiver,
+      sender,
+      toAsset,
+      toSymbol
+    } = params;
+    const fromDecimals = (0, _utils._getAssetDecimals)(fromAsset);
+    const toDecimals = (0, _utils._getAssetDecimals)(toAsset);
+    const formattedAmount = (0, _utils2.formatNumber)(fromAmount, fromDecimals, s => s);
+    const requestBody = {
+      fixed: false,
+      tickerFrom: fromSymbol,
+      tickerTo: toSymbol,
+      amount: formattedAmount,
+      networkFrom: metadata.fromChainSymbol,
+      networkTo: metadata.toChainSymbol,
+      addressTo: receiver,
+      extraIdTo: '',
+      userRefundAddress: sender,
+      userRefundExtraId: ''
+    };
+    const response = await fetch(`${apiUrl}/exchanges`, {
+      method: 'POST',
+      headers: {
+        accept: 'application/json',
+        'Content-Type': 'application/json',
+        'x-api-key': simpleSwapApiKey
+      },
+      body: JSON.stringify(requestBody)
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      return {
+        error: new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR, `Unable to create simpleswap transaction: ${errorText}`)
+      };
+    }
+    const depositAddressResponse = await response.json();
+    const result = depositAddressResponse.result;
+    console.log('simpleswapID', result.id);
+    if (!(result !== null && result !== void 0 && result.id) || !result.addressFrom || !result.amountTo) {
+      return {
+        error: new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)
+      };
+    }
+    return {
+      data: {
+        id: result.id,
+        addressFrom: result.addressFrom,
+        amountTo: toBNString(result.amountTo, toDecimals)
+      }
+    };
+  } catch (err) {
+    console.error('Error:', err);
+    return {
+      error: new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)
+    };
+  }
 };
 class SimpleSwapHandler {
   constructor(chainService, balanceService, feeService) {
@@ -140,25 +173,31 @@ class SimpleSwapHandler {
     const chainType = (0, _utils._isChainSubstrateCompatible)(chainInfo) ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM;
     const sender = (0, _utils2._reformatAddressWithChain)(address, chainInfo);
     const receiver = (0, _utils2._reformatAddressWithChain)(recipient !== null && recipient !== void 0 ? recipient : sender, toChainInfo);
-    const fromSymbol = _utils3.SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING[fromAsset.slug];
-    const toSymbol = _utils3.SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING[toAsset.slug];
+    const fromSymbol = (0, _utils._getAssetSymbol)(fromAsset).toLowerCase();
+    const toSymbol = (0, _utils._getAssetSymbol)(toAsset).toLowerCase();
+    const metadata = quote.metadata;
     const {
       fromAmount
     } = quote;
-    const {
-      addressFrom,
-      amountTo,
-      id
-    } = await createSwapRequest({
+    const result = await buildTxForSimpleSwap({
       fromSymbol,
       toSymbol,
       fromAmount,
       fromAsset,
       receiver,
       sender,
-      toAsset
+      toAsset,
+      metadata
     });
-    console.log('simpleswap data', id, addressFrom);
+    if (result.error) {
+      console.error('Simple swap error:', result.error);
+      throw result.error;
+    }
+    const {
+      addressFrom,
+      amountTo,
+      id
+    } = result.data;
     if (!id || id.length === 0 || !addressFrom || addressFrom.length === 0) {
       throw new _SwapError.SwapError(_types.SwapErrorType.UNKNOWN);
     }

package/cjs/services/swap-service/utils.js

@@ -41,6 +41,8 @@ exports.CHAIN_FLIP_TESTNET_EXPLORER = CHAIN_FLIP_TESTNET_EXPLORER;
 const CHAIN_FLIP_MAINNET_EXPLORER = 'https://scan.chainflip.io';
 exports.CHAIN_FLIP_MAINNET_EXPLORER = CHAIN_FLIP_MAINNET_EXPLORER;
 const SIMPLE_SWAP_EXPLORER = 'https://simpleswap.io';
+
+// Deprecated
 exports.SIMPLE_SWAP_EXPLORER = SIMPLE_SWAP_EXPLORER;
 const SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING = {
   'bittensor-NATIVE-TAO': 'tao',

package/cjs/utils/fee/transfer.js

@@ -17,11 +17,12 @@ 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 _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _utils2 = require("@subwallet/extension-base/services/fee-service/utils");
+var _utils = require("@subwallet/extension-base/services/balance-service/transfer/xcm/utils");
+var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils3 = require("@subwallet/extension-base/services/fee-service/utils");
 var _tokenPayFee = require("@subwallet/extension-base/services/fee-service/utils/tokenPayFee");
 var _helpers = require("@subwallet/extension-base/services/transaction-service/helpers");
-var _utils3 = require("@subwallet/extension-base/utils");
+var _utils4 = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _util = require("@polkadot/util");
@@ -33,18 +34,18 @@ var _combine = require("./combine");
 const detectTransferTxType = (srcToken, srcChain, destChain) => {
   const isXcmTransfer = srcChain.slug !== destChain.slug;
   if (isXcmTransfer) {
-    const isAvailBridgeFromEvm = (0, _utils._isPureEvmChain)(srcChain) && (0, _availBridge.isAvailChainBridge)(destChain.slug);
-    const isSnowBridgeEvmTransfer = (0, _utils._isPureEvmChain)(srcChain) && (0, _xcmParser._isSnowBridgeXcm)(srcChain, destChain) && !isAvailBridgeFromEvm;
+    const isAvailBridgeFromEvm = (0, _utils2._isPureEvmChain)(srcChain) && (0, _availBridge.isAvailChainBridge)(destChain.slug);
+    const isSnowBridgeEvmTransfer = (0, _utils2._isPureEvmChain)(srcChain) && (0, _xcmParser._isSnowBridgeXcm)(srcChain, destChain) && !isAvailBridgeFromEvm;
     const isPolygonBridgeTransfer = (0, _polygonBridge._isPolygonChainBridge)(srcChain.slug, destChain.slug);
     const isPosBridgeTransfer = (0, _posBridge._isPosChainBridge)(srcChain.slug, destChain.slug);
     const isAcrossBridgeTransfer = (0, _acrossBridge._isAcrossChainBridge)(srcChain.slug, destChain.slug);
     return isAvailBridgeFromEvm || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer || isAcrossBridgeTransfer ? 'evm' : 'substrate';
   } else {
-    if ((0, _utils._isChainEvmCompatible)(srcChain) && (0, _utils._isTokenTransferredByEvm)(srcToken)) {
+    if ((0, _utils2._isChainEvmCompatible)(srcChain) && (0, _utils2._isTokenTransferredByEvm)(srcToken)) {
       return 'evm';
-    } else if ((0, _utils._isChainTonCompatible)(srcChain) && (0, _utils._isTokenTransferredByTon)(srcToken)) {
+    } else if ((0, _utils2._isChainTonCompatible)(srcChain) && (0, _utils2._isTokenTransferredByTon)(srcToken)) {
       return 'ton';
-    } else if ((0, _utils._isChainCardanoCompatible)(srcChain) && (0, _utils._isTokenTransferredByCardano)(srcToken)) {
+    } else if ((0, _utils2._isChainCardanoCompatible)(srcChain) && (0, _utils2._isTokenTransferredByCardano)(srcToken)) {
       return 'cardano';
     } else {
       return 'substrate';
@@ -70,7 +71,7 @@ const calculateMaxTransferable = async (id, request, freeBalance, fee) => {
   } else {
     maxTransferableAmount = await calculateTransferMaxTransferable(id, request, freeBalance, fee);
   }
-  maxTransferableAmount.feePercentageSpecialCase = _utils2.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE;
+  maxTransferableAmount.feePercentageSpecialCase = _utils3.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE;
   return maxTransferableAmount;
 };
 exports.calculateMaxTransferable = calculateMaxTransferable;
@@ -100,15 +101,15 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
   const substrateAddress = fakeAddress; // todo: move this
   const evmAddress = (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(fakeAddress)); // todo: move this
 
-  const recipient = (0, _utils._isChainEvmCompatible)(destChain) ? evmAddress : substrateAddress;
+  const recipient = (0, _utils2._isChainEvmCompatible)(destChain) ? evmAddress : substrateAddress;
   try {
     let transaction;
-    if ((0, _utilCrypto.isEthereumAddress)(address) && (0, _utilCrypto.isEthereumAddress)(recipient) && (0, _utils._isTokenTransferredByEvm)(srcToken)) {
+    if ((0, _utilCrypto.isEthereumAddress)(address) && (0, _utilCrypto.isEthereumAddress)(recipient) && (0, _utils2._isTokenTransferredByEvm)(srcToken)) {
       // todo: refactor: merge getERC20TransactionObject & getEVMTransactionObject
       // Estimate with EVM API
-      if ((0, _utils._isTokenEvmSmartContract)(srcToken) || (0, _utils._isLocalToken)(srcToken)) {
+      if ((0, _utils2._isTokenEvmSmartContract)(srcToken) || (0, _utils2._isLocalToken)(srcToken)) {
         [transaction,, error] = await (0, _smartContract.getERC20TransactionObject)({
-          assetAddress: (0, _utils._getContractAddressOfToken)(srcToken),
+          assetAddress: (0, _utils2._getContractAddressOfToken)(srcToken),
           chain: srcChain.slug,
           evmApi,
           feeCustom,
@@ -134,7 +135,7 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
           fallbackFee: true
         });
       }
-    } else if ((0, _keyring.isTonAddress)(address) && (0, _utils._isTokenTransferredByTon)(srcToken)) {
+    } else if ((0, _keyring.isTonAddress)(address) && (0, _utils2._isTokenTransferredByTon)(srcToken)) {
       [transaction] = await (0, _tonTransfer.createTonTransaction)({
         tokenInfo: srcToken,
         from: address,
@@ -145,7 +146,7 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
         // currently not used
         tonApi
       });
-    } else if ((0, _keyring.isCardanoAddress)(address) && (0, _utils._isTokenTransferredByCardano)(srcToken)) {
+    } else if ((0, _keyring.isCardanoAddress)(address) && (0, _utils2._isTokenTransferredByCardano)(srcToken)) {
       [transaction] = await (0, _cardanoTransfer.createCardanoTransaction)({
         tokenInfo: srcToken,
         from: address,
@@ -252,8 +253,8 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
   }
   if (isTransferLocalTokenAndPayThatTokenAsFee && feeChainType === 'substrate') {
     if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(srcChain.slug)) {
-      const estimatedFeeNative = (BigInt(estimatedFee) * BigInt(_utils2.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString();
-      const estimatedFeeLocal = await (0, _utils2.calculateToAmountByReservePool)(substrateApi.api, nativeToken, srcToken, estimatedFeeNative);
+      const estimatedFeeNative = (BigInt(estimatedFee) * BigInt(_utils3.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString();
+      const estimatedFeeLocal = await (0, _utils3.calculateToAmountByReservePool)(substrateApi.api, nativeToken, srcToken, estimatedFeeNative);
       maxTransferable = (0, _bignumber.default)(freeBalance.value).minus(estimatedFeeLocal);
     } else if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(srcChain.slug)) {
       const rate = await (0, _tokenPayFee.getHydrationRate)(address, nativeToken, srcToken);
@@ -269,14 +270,14 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
   } else if (isTransferNativeTokenAndPayLocalTokenAsFee) {
     maxTransferable = (0, _bignumber.default)(freeBalance.value);
   } else {
-    if (!(0, _utils._isNativeToken)(srcToken)) {
+    if (!(0, _utils2._isNativeToken)(srcToken)) {
       maxTransferable = (0, _bignumber.default)(freeBalance.value);
     } else {
       maxTransferable = (0, _bignumber.default)(freeBalance.value).minus(new _bignumber.default(estimatedFee));
     }
   }
   return {
-    maxTransferable: maxTransferable.gt(_utils3.BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0',
+    maxTransferable: maxTransferable.gt(_utils4.BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0',
     feeOptions: feeOptions,
     feeType: feeChainType,
     id: id,
@@ -305,9 +306,9 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
   let feeOptions;
   let maxTransferable;
   let error;
-  const isAvailBridgeFromEvm = (0, _utils._isPureEvmChain)(srcChain) && (0, _availBridge.isAvailChainBridge)(destChain.slug);
-  const isAvailBridgeFromAvail = (0, _availBridge.isAvailChainBridge)(srcChain.slug) && (0, _utils._isPureEvmChain)(destChain);
-  const isSnowBridgeEvmTransfer = (0, _utils._isPureEvmChain)(srcChain) && (0, _xcmParser._isSnowBridgeXcm)(srcChain, destChain) && !isAvailBridgeFromEvm;
+  const isAvailBridgeFromEvm = (0, _utils2._isPureEvmChain)(srcChain) && (0, _availBridge.isAvailChainBridge)(destChain.slug);
+  const isAvailBridgeFromAvail = (0, _availBridge.isAvailChainBridge)(srcChain.slug) && (0, _utils2._isPureEvmChain)(destChain);
+  const isSnowBridgeEvmTransfer = (0, _utils2._isPureEvmChain)(srcChain) && (0, _xcmParser._isSnowBridgeXcm)(srcChain, destChain) && !isAvailBridgeFromEvm;
   const isPolygonBridgeTransfer = (0, _polygonBridge._isPolygonChainBridge)(srcChain.slug, destChain.slug);
   const isPosBridgeTransfer = (0, _posBridge._isPosChainBridge)(srcChain.slug, destChain.slug);
   const isAcrossBridgeTransfer = (0, _acrossBridge._isAcrossChainBridge)(srcChain.slug, destChain.slug);
@@ -316,7 +317,7 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
   const substrateAddress = fakeAddress; // todo: move this
   const evmAddress = (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(fakeAddress)); // todo: move this
   const bnFreeBalance = new _bignumber.default(freeBalance.value);
-  const recipient = (0, _utils._isChainEvmCompatible)(destChain) ? evmAddress : substrateAddress;
+  const recipient = (0, _utils2._isChainEvmCompatible)(destChain) ? evmAddress : substrateAddress;
   if (!destToken) {
     throw Error('Destination token is not available');
   }
@@ -342,9 +343,9 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
     } else if (isAcrossBridgeTransfer) {
       funcCreateExtrinsic = _xcm.createAcrossBridgeExtrinsic;
       if ((0, _acrossBridge._isAcrossTestnetBridge)(srcChain.slug)) {
-        params.sendingValue = (0, _bignumber.default)(0.0037).shiftedBy((0, _utils._getAssetDecimals)(srcToken)).toFixed(0, 1);
+        params.sendingValue = (0, _bignumber.default)(0.0037).shiftedBy((0, _utils2._getAssetDecimals)(srcToken)).toFixed(0, 1);
       } else {
-        params.sendingValue = (0, _bignumber.default)(1).shiftedBy((0, _utils._getAssetDecimals)(srcToken)).toFixed(0, 1);
+        params.sendingValue = (0, _bignumber.default)(1).shiftedBy((0, _utils2._getAssetDecimals)(srcToken)).toFixed(0, 1);
       }
     } else if (isSnowBridgeEvmTransfer) {
       funcCreateExtrinsic = _xcm.createSnowBridgeExtrinsic;
@@ -379,8 +380,15 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
     } else if (feeChainType === 'substrate') {
       // Calculate fee for substrate transaction
       if (isSubstrateXcm) {
-        const estimatedFeeByDryRun = await (0, _xcm.dryRunXcmExtrinsicV2)(params);
-        estimatedFee = estimatedFeeByDryRun.fee || '0';
+        const xcmFeeInfo = await (0, _utils.estimateXcmFee)({
+          fromChainInfo: params.originChain,
+          fromTokenInfo: params.originTokenInfo,
+          toChainInfo: params.destinationChain,
+          recipient: params.recipient,
+          sender: params.sender,
+          value: params.sendingValue
+        });
+        estimatedFee = (xcmFeeInfo === null || xcmFeeInfo === void 0 ? void 0 : xcmFeeInfo.origin.fee) || '0';
       } else {
         try {
           var _paymentInfo$partialF2;
@@ -423,11 +431,11 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
     console.warn('Unable to estimate fee', e);
   }
   if (!destToken) {
-    maxTransferable = _utils3.BN_ZERO;
+    maxTransferable = _utils4.BN_ZERO;
   } else if (isTransferLocalTokenAndPayThatTokenAsFee && feeChainType === 'substrate') {
     if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(srcChain.slug)) {
-      const estimatedFeeNative = (BigInt(estimatedFee) * BigInt(_utils2.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString();
-      const estimatedFeeLocal = await (0, _utils2.calculateToAmountByReservePool)(substrateApi.api, nativeToken, srcToken, estimatedFeeNative);
+      const estimatedFeeNative = (BigInt(estimatedFee) * BigInt(_utils3.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString();
+      const estimatedFeeLocal = await (0, _utils3.calculateToAmountByReservePool)(substrateApi.api, nativeToken, srcToken, estimatedFeeNative);
       maxTransferable = bnFreeBalance.minus(estimatedFeeLocal);
     } else if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(srcChain.slug)) {
       const rate = await (0, _tokenPayFee.getHydrationRate)(address, nativeToken, srcToken);
@@ -443,18 +451,18 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
   } else if (isTransferNativeTokenAndPayLocalTokenAsFee) {
     maxTransferable = bnFreeBalance;
   } else {
-    if (!(0, _utils._isNativeToken)(srcToken)) {
+    if (!(0, _utils2._isNativeToken)(srcToken)) {
       maxTransferable = bnFreeBalance;
     } else {
       maxTransferable = bnFreeBalance.minus((0, _bignumber.default)(estimatedFee).multipliedBy(_constants.XCM_FEE_RATIO));
     }
   }
   if (isAvailBridgeFromAvail) {
-    const addedAmount = (0, _bignumber.default)(1).shiftedBy((0, _utils._getAssetDecimals)(srcToken));
+    const addedAmount = (0, _bignumber.default)(1).shiftedBy((0, _utils2._getAssetDecimals)(srcToken));
     maxTransferable = maxTransferable.minus(addedAmount);
   }
   return {
-    maxTransferable: maxTransferable.gt(_utils3.BN_ZERO) ? maxTransferable.toFixed(0) : '0',
+    maxTransferable: maxTransferable.gt(_utils4.BN_ZERO) ? maxTransferable.toFixed(0) : '0',
     feeOptions: feeOptions,
     feeType: feeChainType,
     id: id,

package/koni/background/handlers/Extension.js

@@ -34,6 +34,7 @@ import { _isAcrossChainBridge, getAcrossQuote } from '@subwallet/extension-base/
 import { getClaimTxOnAvail, getClaimTxOnEthereum, isAvailChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { _isPolygonChainBridge, getClaimPolygonBridge, isClaimedPolygonBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
 import { _isPosChainBridge, getClaimPosBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge';
+import { estimateXcmFee } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 import { _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _isAssetSmartContractNft, _isChainEnabled, _isChainEvmCompatible, _isChainSubstrateCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isNativeTokenBySlug, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByCardano, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/utils';
@@ -1497,10 +1498,16 @@ export default class KoniExtension {
         feeInfo
       };
       extrinsic = await funcCreateExtrinsic(params);
-      let dryRunInfo;
       if (isSubstrateXcm) {
-        dryRunInfo = await dryRunXcmExtrinsicV2(params);
-        xcmFeeDryRun = dryRunInfo.fee;
+        const xcmFeeInfo = await 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 getAcrossQuote(params);
@@ -1569,8 +1576,11 @@ export default 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(BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again'));
+        if (isSubstrateXcm) {
+          const isDryRunSuccess = await dryRunXcmExtrinsicV2(params);
+          if (!isDryRunSuccess) {
+            inputTransaction.errors.push(new TransactionError(BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again'));
+          }
         }
       };
       eventsHandler = eventEmitter => {

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.38-0",
+  "version": "1.3.40-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2709,13 +2709,13 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.104",
-    "@subwallet/extension-base": "^1.3.38-0",
-    "@subwallet/extension-chains": "^1.3.38-0",
-    "@subwallet/extension-dapp": "^1.3.38-0",
-    "@subwallet/extension-inject": "^1.3.38-0",
+    "@subwallet/chain-list": "0.2.105",
+    "@subwallet/extension-base": "^1.3.40-0",
+    "@subwallet/extension-chains": "^1.3.40-0",
+    "@subwallet/extension-dapp": "^1.3.40-0",
+    "@subwallet/extension-inject": "^1.3.40-0",
     "@subwallet/keyring": "^0.1.12",
-    "@subwallet/subwallet-api-sdk": "^1.3.38-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.40-0",
     "@subwallet/ui-keyring": "^0.1.12",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",

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

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

@@ -1,5 +1,4 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
-import { DryRunInfo } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { FeeInfo, TransactionFee } from '@subwallet/extension-base/types';
 import { TransactionConfig } from 'web3-core';
@@ -23,5 +22,5 @@ export declare const createAvailBridgeTxFromEth: ({ evmApi, feeCustom, feeInfo,
 export declare const createAvailBridgeExtrinsicFromAvail: ({ recipient, sendingValue, substrateApi }: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'>>;
 export declare const createPolygonBridgeExtrinsic: ({ destinationChain, evmApi, feeCustom, feeInfo, feeOption, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
 export declare const createXcmExtrinsicV2: (request: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'> | undefined>;
-export declare const dryRunXcmExtrinsicV2: (request: CreateXcmExtrinsicProps) => Promise<DryRunInfo>;
+export declare const dryRunXcmExtrinsicV2: (request: CreateXcmExtrinsicProps) => Promise<boolean>;
 export declare const createAcrossBridgeExtrinsic: ({ destinationChain, destinationTokenInfo, evmApi, feeCustom, feeInfo, feeOption, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;