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

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/constants/environment.d.ts

@@ -1,3 +1,4 @@
 export declare const isProductionMode: boolean;
 export declare const BACKEND_API_URL: string;
 export declare const BACKEND_PRICE_HISTORY_URL: string;
+export declare const SW_EXTERNAL_SERVICES_API: string;

package/constants/environment.js

@@ -5,4 +5,5 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 export const isProductionMode = PRODUCTION_BRANCHES.indexOf(branchName) > -1;
 export const BACKEND_API_URL = process.env.SUBWALLET_API || (isProductionMode ? 'https://sw-services.subwallet.app/api' : 'https://be-dev.subwallet.app/api');
-export const BACKEND_PRICE_HISTORY_URL = process.env.SUBWALLET_PRICE_HISTORY_API || (isProductionMode ? 'https://price-history.subwallet.app/api' : 'https://price-history-dev.subwallet.app/api');
+export const BACKEND_PRICE_HISTORY_URL = process.env.SUBWALLET_PRICE_HISTORY_API || (isProductionMode ? 'https://price-history.subwallet.app/api' : 'https://price-history-dev.subwallet.app/api');
+export const SW_EXTERNAL_SERVICES_API = process.env.SW_EXTERNAL_SERVICES_API || (isProductionMode ? 'https://external-services.subwallet.app' : 'https://external-services-dev.subwallet.app');

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';
@@ -1451,7 +1452,7 @@ export default class KoniExtension {
     const isPosBridgeTransfer = _isPosChainBridge(originNetworkKey, destinationNetworkKey);
     const isAcrossBridgeTransfer = _isAcrossChainBridge(originNetworkKey, destinationNetworkKey);
     const extrinsicType = ExtrinsicType.TRANSFER_XCM;
-    const isSubstrateXcm = !(isAvailBridgeFromEvm || isAvailBridgeFromAvail || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer);
+    const isSubstrateXcm = !(isAvailBridgeFromEvm || isAvailBridgeFromAvail || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer || isAcrossBridgeTransfer);
     const isTransferNative = this.#koniState.getNativeTokenInfo(originNetworkKey).slug === tokenSlug;
     const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNative && tokenSlug === tokenPayFeeSlug;
     let xcmFeeDryRun;
@@ -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);
@@ -1527,50 +1534,52 @@ export default class KoniExtension {
         }
         let isSendingTokenSufficient = false;
         let receiverSystemAccountInfo;
-        if (!_isChainSubstrateCompatible(chainInfoMap[destinationNetworkKey])) {
-          return undefined;
-        }
-        const setting = {
-          visible: true
-        };
-        await this.#koniState.chainService.updateAssetSetting(destinationTokenInfo.slug, setting, true);
-        const {
-          value: _senderTransferable
-        } = await this.getAddressTransferableBalance({
-          address: from,
-          networkKey: originNetworkKey,
-          token: originTokenInfo.slug
-        });
-        const senderTransferable = BigInt(_senderTransferable);
-        const sendingAmount = BigInt(value);
-        const {
-          value: _receiverDestinationTokenKeepAliveBalance
-        } = await this.getAddressTotalBalance({
-          address: to,
-          networkKey: destinationNetworkKey,
-          token: destinationTokenInfo.slug,
-          extrinsicType
-        });
-        const receiverDestinationTokenKeepAliveBalance = BigInt(_receiverDestinationTokenKeepAliveBalance);
-        if (!_isNativeToken(destinationTokenInfo)) {
-          const _receiverNativeTotal = await this.getAddressTotalBalance({
+        if (_isChainSubstrateCompatible(chainInfoMap[destinationNetworkKey])) {
+          const setting = {
+            visible: true
+          };
+          await this.#koniState.chainService.updateAssetSetting(destinationTokenInfo.slug, setting, true);
+          const {
+            value: _senderTransferable
+          } = await this.getAddressTransferableBalance({
+            address: from,
+            networkKey: originNetworkKey,
+            token: originTokenInfo.slug
+          });
+          const senderTransferable = BigInt(_senderTransferable);
+          const sendingAmount = BigInt(value);
+          const {
+            value: _receiverDestinationTokenKeepAliveBalance
+          } = await this.getAddressTotalBalance({
             address: to,
             networkKey: destinationNetworkKey,
-            token: destinationNativeTokenSlug,
+            token: destinationTokenInfo.slug,
             extrinsicType
           });
-          receiverSystemAccountInfo = _receiverNativeTotal.metadata;
+          const receiverDestinationTokenKeepAliveBalance = BigInt(_receiverDestinationTokenKeepAliveBalance);
+          if (!_isNativeToken(destinationTokenInfo)) {
+            const _receiverNativeTotal = await this.getAddressTotalBalance({
+              address: to,
+              networkKey: destinationNetworkKey,
+              token: destinationNativeTokenSlug,
+              extrinsicType
+            });
+            receiverSystemAccountInfo = _receiverNativeTotal.metadata;
+          }
+          const substrateApi = this.#koniState.getSubstrateApi(destinationNetworkKey);
+          const sufficientChain = this.#koniState.chainService.value.sufficientChains;
+          isSendingTokenSufficient = await _isSufficientToken(destinationTokenInfo, substrateApi, sufficientChain);
+          const [warning, error] = additionalValidateTransferForRecipient(destinationTokenInfo, destinationNativeTokenInfo, extrinsicType, receiverDestinationTokenKeepAliveBalance, sendingAmount, senderTransferable,
+          // different from sendingTokenInfo being passed in
+          receiverSystemAccountInfo, isSendingTokenSufficient);
+          warning.length && inputTransaction.warnings.push(...warning);
+          error.length && inputTransaction.errors.push(...error);
         }
-        const substrateApi = this.#koniState.getSubstrateApi(destinationNetworkKey);
-        const sufficientChain = this.#koniState.chainService.value.sufficientChains;
-        isSendingTokenSufficient = await _isSufficientToken(destinationTokenInfo, substrateApi, sufficientChain);
-        const [warning, error] = additionalValidateTransferForRecipient(destinationTokenInfo, destinationNativeTokenInfo, extrinsicType, receiverDestinationTokenKeepAliveBalance, sendingAmount, senderTransferable,
-        // different from sendingTokenInfo being passed in
-        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.39-0",
+  "version": "1.3.41-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2241,6 +2241,11 @@
       "require": "./cjs/types/common/storage.js",
       "default": "./types/common/storage.js"
     },
+    "./types/environment": {
+      "types": "./types/environment.d.ts",
+      "require": "./cjs/types/environment.js",
+      "default": "./types/environment.js"
+    },
     "./types/error": {
       "types": "./types/error.d.ts",
       "require": "./cjs/types/error.js",
@@ -2709,13 +2714,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.39-0",
-    "@subwallet/extension-chains": "^1.3.39-0",
-    "@subwallet/extension-dapp": "^1.3.39-0",
-    "@subwallet/extension-inject": "^1.3.39-0",
+    "@subwallet/chain-list": "0.2.105",
+    "@subwallet/extension-base": "^1.3.41-0",
+    "@subwallet/extension-chains": "^1.3.41-0",
+    "@subwallet/extension-dapp": "^1.3.41-0",
+    "@subwallet/extension-inject": "^1.3.41-0",
     "@subwallet/keyring": "^0.1.12",
-    "@subwallet/subwallet-api-sdk": "^1.3.39-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.41-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.39-0'
+  version: '1.3.41-0'
 };

package/services/balance-service/helpers/subscribe/evm.js

@@ -5,6 +5,7 @@ import { _AssetType } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
 import { ASTAR_REFRESH_BALANCE_INTERVAL, SUB_TOKEN_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
 import { getERC20Contract } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
+import { _BALANCE_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
 import { BN } from '@polkadot/util';
@@ -16,7 +17,11 @@ export function subscribeERC20Interval({
   evmApi
 }) {
   const chain = chainInfo.slug;
-  const tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.ERC20]);
+  let tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.ERC20]);
+  if (_BALANCE_CHAIN_GROUP.moonbeam.includes(chain)) {
+    const moonbeamLocal = filterAssetsByChainAndType(assetMap, chain, [_AssetType.LOCAL]);
+    tokenList = Object.assign({}, tokenList, moonbeamLocal);
+  }
   const erc20ContractMap = {};
   Object.entries(tokenList).forEach(([slug, tokenInfo]) => {
     erc20ContractMap[slug] = getERC20Contract(_getContractAddressOfToken(tokenInfo), evmApi);

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>;

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

@@ -1,13 +1,12 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
 import { _isAcrossBridgeXcm, _isPolygonBridgeXcm, _isPosBridgeXcm, _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getAvailBridgeExtrinsicFromAvail, getAvailBridgeTxFromEth } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { getExtrinsicByPolkadotXcmPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm';
 import { _createPolygonBridgeL1toL2Extrinsic, _createPolygonBridgeL2toL1Extrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
 import { getSnowBridgeEvmTransfer } from '@subwallet/extension-base/services/balance-service/transfer/xcm/snowBridge';
-import { buildXcm, dryRunXcmV2, isChainNotSupportDryRun, isChainNotSupportPolkadotApi } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
+import { buildXcm, dryRunXcm, isChainNotSupportDryRun, isChainNotSupportPolkadotApi } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 import { getExtrinsicByXcmPalletPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/xcmPallet';
 import { getExtrinsicByXtokensPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/xTokens';
 import { _XCM_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
@@ -39,6 +38,8 @@ export const createSnowBridgeExtrinsic = async ({
   }
   return getSnowBridgeEvmTransfer(originTokenInfo, originChain, destinationChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };
+
+// deprecated
 export const createXcmExtrinsic = async ({
   destinationChain,
   originChain,
@@ -121,37 +122,33 @@ export const createXcmExtrinsicV2 = async request => {
     return await buildXcm(request);
   } catch (e) {
     console.log('createXcmExtrinsicV2 error: ', e);
-    const errorMessage = e instanceof Error ? e.message : 'Unknown error occurred';
-    if (isChainNotSupportPolkadotApi(errorMessage)) {
-      return createXcmExtrinsic(request);
-    }
     return undefined;
   }
 };
 export const dryRunXcmExtrinsicV2 = async request => {
   try {
-    return await dryRunXcmV2(request);
-  } catch (e) {
-    const errorMessage = e instanceof Error ? e.message : 'Unknown error occurred';
-    if (isChainNotSupportDryRun(errorMessage) || isChainNotSupportPolkadotApi(errorMessage)) {
-      const xcmTransfer = await createXcmExtrinsicV2(request);
-      if (!xcmTransfer) {
-        return {
-          success: false
-        };
+    const dryRunResult = await dryRunXcm(request);
+    const originDryRunRs = dryRunResult.origin;
+    if (originDryRunRs.success) {
+      const {
+        assetHub,
+        bridgeHub,
+        destination
+      } = dryRunResult;
+      if ((assetHub === null || assetHub === void 0 ? void 0 : assetHub.success) === false || (bridgeHub === null || bridgeHub === void 0 ? void 0 : bridgeHub.success) === false || (destination === null || destination === void 0 ? void 0 : destination.success) === false) {
+        if ((destination === null || destination === void 0 ? void 0 : destination.success) === false) {
+          // pass dry-run in these cases
+          return isChainNotSupportDryRun(destination.failureReason) || isChainNotSupportPolkadotApi(destination.failureReason);
+        }
+        return false;
       }
-      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 * XCM_MIN_AMOUNT_RATIO).toString()
-      };
+      return true;
     }
-    return {
-      success: false
-    };
+
+    // pass dry-run in these cases
+    return isChainNotSupportDryRun(originDryRunRs.failureReason) || isChainNotSupportPolkadotApi(originDryRunRs.failureReason);
+  } catch (e) {
+    return false;
   }
 };
 export const createAcrossBridgeExtrinsic = async ({

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

@@ -1,14 +1,46 @@
-import { _ChainInfo } from '@subwallet/chain-list/types';
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { CreateXcmExtrinsicProps } from '@subwallet/extension-base/services/balance-service/transfer/xcm/index';
 import { SubmittableExtrinsic } from '@polkadot/api/types';
-export interface DryRunInfo {
-    success: boolean;
-    fee?: string;
+export declare type DryRunNodeFailure = {
+    success: false;
+    failureReason: string;
+};
+export declare type DryRunNodeSuccess = {
+    success: true;
+    fee: string;
+    forwardedXcms: any;
+};
+export declare type DryRunNodeResult = DryRunNodeSuccess | DryRunNodeFailure;
+export declare type DryRunResult = {
+    origin: DryRunNodeResult;
+    destination?: DryRunNodeResult;
+    assetHub?: DryRunNodeResult;
+    bridgeHub?: DryRunNodeResult;
+};
+interface GetXcmFeeRequest {
+    sender: string;
+    recipient: string;
+    value: string;
+    fromChainInfo: _ChainInfo;
+    toChainInfo: _ChainInfo;
+    fromTokenInfo: _ChainAsset;
 }
+export declare type XcmFeeType = 'dryRun' | 'paymentInfo';
+export interface XcmFeeDetail {
+    fee: string;
+    currency: string;
+    feeType: XcmFeeType;
+    dryRunError?: string;
+}
+export declare type GetXcmFeeResult = {
+    origin: XcmFeeDetail;
+    destination: XcmFeeDetail;
+};
 export declare function buildXcm(request: CreateXcmExtrinsicProps): Promise<SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
-export declare function dryRunXcm(request: CreateXcmExtrinsicProps): Promise<DryRunInfo>;
-export declare function dryRunXcmV2(request: CreateXcmExtrinsicProps): Promise<DryRunInfo>;
+export declare function dryRunXcm(request: CreateXcmExtrinsicProps): Promise<DryRunResult>;
+export declare function estimateXcmFee(request: GetXcmFeeRequest): Promise<GetXcmFeeResult | undefined>;
 export declare function isChainNotSupportPolkadotApi(str: string): boolean;
 export declare function isChainNotSupportDryRun(str: string): boolean;
 export declare const STABLE_XCM_VERSION = 3;
 export declare function isUseTeleportProtocol(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, tokenSlug?: string): boolean;
+export {};