@subwallet/extension-base 1.3.66-0 → 1.3.67-0

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

@@ -306,21 +306,6 @@ class SwapBaseHandler {
       txData: txData
     };
   }
-  async validateSetFeeTokenStep(params, stepIndex) {
-    if (!params.selectedQuote) {
-      return Promise.resolve([new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)]);
-    }
-    const feeInfo = params.process.totalFee[stepIndex];
-    const feeAmount = feeInfo.feeComponent[0];
-    const feeTokenInfo = this.chainService.getAssetBySlug(feeInfo.defaultFeeToken);
-    const feeTokenBalance = await this.balanceService.getTransferableBalance(params.address, feeTokenInfo.originChain, feeTokenInfo.slug);
-    const bnFeeTokenBalance = new _bignumber.default(feeTokenBalance.value);
-    const bnFeeAmount = new _bignumber.default(feeAmount.amount);
-    if (bnFeeAmount.gte(bnFeeTokenBalance)) {
-      return Promise.resolve([new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE)]);
-    }
-    return [];
-  }
   async validateBridgeStep(request) {
     const {
       bnBridgeAmount,
@@ -385,7 +370,7 @@ class SwapBaseHandler {
       const xcmRequest = {
         originTokenInfo: fromToken,
         destinationTokenInfo: toToken,
-        sendingValue: bnBridgeAmount.toString(),
+        sendingValue: bnBridgeAmount.toFixed(),
         recipient: receiver,
         substrateApi: substrateApi,
         sender: sender,
@@ -393,11 +378,23 @@ class SwapBaseHandler {
         originChain: fromChain,
         feeInfo
       };
-      const isDryRunSuccess = await (0, _xcm.dryRunXcmExtrinsicV2)(xcmRequest);
-
-      // temp skip dry-run for later step todo: wait for dry-run-predict
-      if (isFirstBridge && !isDryRunSuccess) {
-        return [new _TransactionError.TransactionError(_types.BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again')];
+      if (isFirstBridge) {
+        const isDryRunSuccess = await (0, _xcm.dryRunXcmExtrinsicV2)(xcmRequest, false);
+        if (!isDryRunSuccess) {
+          return [new _TransactionError.TransactionError(_types.BasicTxErrorType.UNABLE_TO_SEND, 'Swap amount too small. Increase amount and try again')];
+        }
+      } else {
+        const isDryRunPreviewSuccess = await (0, _xcm.dryRunXcmExtrinsicV2)(xcmRequest, true);
+        const originFee = await (0, _xcm.getXcmOriginFee)(xcmRequest);
+        if (originFee) {
+          const isBridgeTokenNativeBalanceEnough = bnFeeTokenBalance.gte(originFee);
+          if (!isBridgeTokenNativeBalanceEnough) {
+            return [new _TransactionError.TransactionError(_types.BasicTxErrorType.UNABLE_TO_SEND, 'Swap amount too small. Increase amount and try again')];
+          }
+        }
+        if (!isDryRunPreviewSuccess) {
+          return [new _TransactionError.TransactionError(_types.BasicTxErrorType.UNABLE_TO_SEND, 'Swap amount too small. Increase amount and try again')];
+        }
       }
     }
     return [];

package/cjs/utils/fee/transfer.js

@@ -202,9 +202,13 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
       var _tx$gas;
       // Calculate fee for evm transaction
       const tx = transaction;
-      const gasLimit = ((_tx$gas = tx.gas) === null || _tx$gas === void 0 ? void 0 : _tx$gas.toString()) || (await evmApi.api.eth.estimateGas(tx)).toString();
+      let gasLimit = ((_tx$gas = tx.gas) === null || _tx$gas === void 0 ? void 0 : _tx$gas.toString()) || (await evmApi.api.eth.estimateGas(tx)).toString();
       const _feeCustom = feeCustom;
       const combineFee = (0, _combine.combineEthFee)(fee, feeOption, _feeCustom);
+      if (srcChain.slug === 'energy_web_chain') {
+        gasLimit = _smartContract.gasSettingsForEWC.gasLimit.toString();
+        combineFee.maxFeePerGas = _smartContract.gasSettingsForEWC.maxFeePerGas;
+      }
       if (combineFee.maxFeePerGas) {
         estimatedFee = new _bignumber.default(combineFee.maxFeePerGas).multipliedBy(gasLimit).toFixed(0);
       } else {
@@ -396,7 +400,6 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
       funcCreateExtrinsic = _xcm.createAvailBridgeExtrinsicFromAvail;
     } else {
       funcCreateExtrinsic = _xcm.createXcmExtrinsicV2;
-      params.sendingValue = '1';
     }
     const extrinsic = await funcCreateExtrinsic(params);
 

package/core/substrate/xcm-parser.d.ts

@@ -1,52 +1,4 @@
-import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
-import { _Address } from '@subwallet/extension-base/background/KoniTypes';
-export declare function _getXcmDestWeight(originChainInfo: _ChainInfo): "Unlimited" | 5000000000;
-export declare function _getXcmBeneficiary(destChainInfo: _ChainInfo, recipient: _Address, version: number): {
-    [x: string]: {
-        parents: number;
-        interior: {
-            X1: {
-                AccountId32: {
-                    network: string | undefined;
-                    id: Uint8Array;
-                };
-                AccountKey20?: undefined;
-            } | {
-                AccountKey20: {
-                    network: string | undefined;
-                    key: string;
-                };
-                AccountId32?: undefined;
-            } | ({
-                AccountId32: {
-                    network: string | undefined;
-                    id: Uint8Array;
-                };
-                AccountKey20?: undefined;
-            } | {
-                AccountKey20: {
-                    network: string | undefined;
-                    key: string;
-                };
-                AccountId32?: undefined;
-            })[];
-        };
-    };
-};
-export declare function _getXcmMultiAssets(tokenInfo: _ChainAsset, value: string, version: number): {
-    [x: string]: {
-        id: Record<string, any>;
-        fun: {
-            Fungible: string;
-        };
-    }[];
-};
-export declare function _getXcmMultiLocation(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, version: number, recipient?: _Address): {
-    [x: string]: {
-        parents: number;
-        interior: unknown;
-    };
-};
+import { _ChainInfo } from '@subwallet/chain-list/types';
 export declare function _isXcmTransferUnstable(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): boolean;
 export declare function _getXcmUnstableWarning(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): string;
 export declare function _isXcmWithinSameConsensus(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;

package/core/substrate/xcm-parser.js

@@ -6,50 +6,7 @@ import { _isAcrossChainBridge } from '@subwallet/extension-base/services/balance
 import { isAvailChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { _isPolygonChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
 import { _isPosChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge';
-import { _getChainSubstrateAddressPrefix, _getEvmChainId, _getSubstrateParaId, _getSubstrateRelayParent, _getXcmAssetMultilocation, _isChainEvmCompatible, _isPureEvmChain, _isSubstrateParaChain } from '@subwallet/extension-base/services/chain-service/utils';
-import { decodeAddress, evmToAddress } from '@polkadot/util-crypto';
-const FOUR_INSTRUCTIONS_WEIGHT = 5000000000;
-const UNLIMITED_WEIGHT = 'Unlimited';
-export function _getXcmDestWeight(originChainInfo) {
-  if (['pioneer'].includes(originChainInfo.slug)) {
-    return FOUR_INSTRUCTIONS_WEIGHT;
-  }
-  return UNLIMITED_WEIGHT;
-}
-export function _getXcmBeneficiary(destChainInfo, recipient, version) {
-  const receiverLocation = version < 4 // from V4, X1 is also an array
-  ? _getRecipientLocation(destChainInfo, recipient, version) : [_getRecipientLocation(destChainInfo, recipient, version)];
-  return {
-    [`V${version}`]: {
-      parents: 0,
-      interior: {
-        X1: receiverLocation
-      }
-    }
-  };
-}
-export function _getXcmMultiAssets(tokenInfo, value, version) {
-  const assetId = _getAssetIdentifier(tokenInfo, version);
-  return {
-    [`V${version}`]: [{
-      id: assetId,
-      fun: {
-        Fungible: value
-      }
-    }]
-  };
-}
-export function _getXcmMultiLocation(originChainInfo, destChainInfo, version, recipient) {
-  const isWithinSameConsensus = _isXcmWithinSameConsensus(originChainInfo, destChainInfo);
-  const parents = _getMultiLocationParent(originChainInfo, isWithinSameConsensus);
-  const interior = _getMultiLocationInterior(destChainInfo, isWithinSameConsensus, version, recipient);
-  return {
-    [`V${version}`]: {
-      parents,
-      interior
-    }
-  };
-}
+import { _getSubstrateRelayParent, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
 export function _isXcmTransferUnstable(originChainInfo, destChainInfo, assetSlug) {
   return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo) || _isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug) || _isPolygonBridgeXcm(originChainInfo, destChainInfo) || _isPosBridgeXcm(originChainInfo, destChainInfo);
 }
@@ -133,123 +90,6 @@ export function _isAcrossBridgeXcm(originChainInfo, destChainInfo) {
 }
 // ---------------------------------------------------------------------------------------------------------------------
 
-function _getMultiLocationParent(originChainInfo, isWithinSameConsensus) {
-  let parent = 0; // how many hops up the hierarchy
-
-  if (_isSubstrateParaChain(originChainInfo)) {
-    parent += 1;
-  }
-  if (!isWithinSameConsensus) {
-    parent += 1;
-  }
-  return parent;
-}
-function _getMultiLocationInterior(destChainInfo, isWithinSameConsensus, version, recipient) {
-  const junctions = [];
-  if (isWithinSameConsensus) {
-    if (_isSubstrateParaChain(destChainInfo)) {
-      junctions.push({
-        Parachain: _getSubstrateParaId(destChainInfo)
-      });
-    }
-  } else {
-    junctions.push({
-      GlobalConsensus: _getGlobalConsensusJunction(destChainInfo, version)
-    });
-    if (_isSubstrateParaChain(destChainInfo)) {
-      junctions.push({
-        Parachain: _getSubstrateParaId(destChainInfo)
-      });
-    }
-  }
-  if (recipient) {
-    junctions.push(_getRecipientLocation(destChainInfo, recipient, version));
-  }
-  if (junctions.length === 0 && !recipient) {
-    return 'Here';
-  }
-  if (version < 4 && junctions.length === 1) {
-    return {
-      X1: junctions[0]
-    };
-  }
-  return {
-    [`X${junctions.length}`]: junctions
-  };
-}
-function _getGlobalConsensusJunction(destChainInfo, version) {
-  let chainSlug = destChainInfo.slug;
-  let evmChainId;
-  if (_isSubstrateParaChain(destChainInfo)) {
-    const relaySlug = _getSubstrateRelayParent(destChainInfo);
-    if (!relaySlug) {
-      throw Error('Parachain must have a parent chainSlug');
-    }
-    chainSlug = relaySlug;
-  } else {
-    evmChainId = _getEvmChainId(destChainInfo);
-  }
-  if (evmChainId) {
-    return {
-      Ethereum: {
-        chainId: evmChainId
-      }
-    };
-  }
-  switch (chainSlug) {
-    case COMMON_CHAIN_SLUGS.POLKADOT:
-      return version < 4 ? {
-        Polkadot: null
-      } : 'Polkadot';
-    case COMMON_CHAIN_SLUGS.KUSAMA:
-      return version < 4 ? {
-        Kusama: null
-      } : 'Kusama';
-    default:
-      return version < 4 ? {
-        Rococo: null
-      } : 'Rococo';
-  }
-}
-function _getRecipientLocation(destChainInfo, recipient, version) {
-  const network = _getNetworkByVersion(version);
-  if (destChainInfo.slug === COMMON_CHAIN_SLUGS.ASTAR_EVM) {
-    const ss58Address = evmToAddress(recipient, _getChainSubstrateAddressPrefix(destChainInfo)); // TODO: shouldn't pass addressPrefix directly
-
-    return {
-      AccountId32: {
-        network,
-        id: decodeAddress(ss58Address)
-      }
-    };
-  }
-  if (_isChainEvmCompatible(destChainInfo)) {
-    return {
-      AccountKey20: {
-        network,
-        key: recipient
-      }
-    };
-  }
-  return {
-    AccountId32: {
-      network,
-      id: decodeAddress(recipient)
-    }
-  };
-}
-function _getAssetIdentifier(tokenInfo, version) {
-  const _assetIdentifier = _getXcmAssetMultilocation(tokenInfo);
-  if (!_assetIdentifier) {
-    throw new Error('Asset must have multilocation');
-  }
-  const assetIdentifier = ['statemint-LOCAL-KSM', 'statemine-LOCAL-DOT'].includes(tokenInfo.slug) // todo: hotfix for ksm statemint recheck all chain
-  ? _assetIdentifier : _adaptX1Interior(_assetIdentifier, version);
-  return version >= 4 // from V4, Concrete is removed
-  ? assetIdentifier : {
-    Concrete: assetIdentifier
-  };
-}
 export function _adaptX1Interior(_assetIdentifier, version) {
   const assetIdentifier = structuredClone(_assetIdentifier);
   const interior = assetIdentifier.interior;
@@ -262,16 +102,4 @@ export function _adaptX1Interior(_assetIdentifier, version) {
     interior.X1 = interior.X1[0];
   }
   return assetIdentifier;
-}
-function _getNetworkByVersion(version) {
-  switch (version) {
-    case 1:
-    case 2:
-      return 'Any';
-    case 3:
-    case 4:
-      return undefined;
-    default:
-      return undefined;
-  }
 }

package/koni/background/handlers/Extension.js

@@ -1644,7 +1644,7 @@ export default class KoniExtension {
           error.length && inputTransaction.errors.push(...error);
         }
         if (isSubstrateXcm) {
-          const isDryRunSuccess = await dryRunXcmExtrinsicV2(params);
+          const isDryRunSuccess = await dryRunXcmExtrinsicV2(params, false);
           if (!isDryRunSuccess) {
             inputTransaction.errors.push(new TransactionError(BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again'));
           }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.66-0",
+  "version": "1.3.67-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -799,11 +799,6 @@
       "require": "./cjs/services/balance-service/transfer/xcm/availBridge.js",
       "default": "./services/balance-service/transfer/xcm/availBridge.js"
     },
-    "./services/balance-service/transfer/xcm/polkadotXcm": {
-      "types": "./services/balance-service/transfer/xcm/polkadotXcm.d.ts",
-      "require": "./cjs/services/balance-service/transfer/xcm/polkadotXcm.js",
-      "default": "./services/balance-service/transfer/xcm/polkadotXcm.js"
-    },
     "./services/balance-service/transfer/xcm/polygonBridge": {
       "types": "./services/balance-service/transfer/xcm/polygonBridge.d.ts",
       "require": "./cjs/services/balance-service/transfer/xcm/polygonBridge.js",
@@ -824,16 +819,6 @@
       "require": "./cjs/services/balance-service/transfer/xcm/utils.js",
       "default": "./services/balance-service/transfer/xcm/utils.js"
     },
-    "./services/balance-service/transfer/xcm/xcmPallet": {
-      "types": "./services/balance-service/transfer/xcm/xcmPallet.d.ts",
-      "require": "./cjs/services/balance-service/transfer/xcm/xcmPallet.js",
-      "default": "./services/balance-service/transfer/xcm/xcmPallet.js"
-    },
-    "./services/balance-service/transfer/xcm/xTokens": {
-      "types": "./services/balance-service/transfer/xcm/xTokens.d.ts",
-      "require": "./cjs/services/balance-service/transfer/xcm/xTokens.js",
-      "default": "./services/balance-service/transfer/xcm/xTokens.js"
-    },
     "./services/base/types": {
       "types": "./services/base/types.d.ts",
       "require": "./cjs/services/base/types.js",
@@ -2924,10 +2909,10 @@
     "@substrate/connect": "^0.8.9",
     "@subwallet-monorepos/subwallet-services-sdk": "0.1.13",
     "@subwallet/chain-list": "0.2.121",
-    "@subwallet/extension-base": "^1.3.66-0",
-    "@subwallet/extension-chains": "^1.3.66-0",
-    "@subwallet/extension-dapp": "^1.3.66-0",
-    "@subwallet/extension-inject": "^1.3.66-0",
+    "@subwallet/extension-base": "^1.3.67-0",
+    "@subwallet/extension-chains": "^1.3.67-0",
+    "@subwallet/extension-dapp": "^1.3.67-0",
+    "@subwallet/extension-inject": "^1.3.67-0",
     "@subwallet/keyring": "^0.1.13",
     "@subwallet/ui-keyring": "^0.1.13",
     "@ton/core": "^0.56.3",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.66-0'
+  version: '1.3.67-0'
 };

package/services/balance-service/transfer/smart-contract.d.ts

@@ -12,6 +12,10 @@ interface TransferEvmProps extends TransactionFee {
     fallbackFee?: boolean;
     data?: string;
 }
+export declare const gasSettingsForEWC: {
+    gasLimit: number;
+    maxFeePerGas: string;
+};
 export declare function getEVMTransactionObject(props: TransferEvmProps): Promise<[TransactionConfig, string, string]>;
 export declare function getERC20TransactionObject(props: TransferERC20Props): Promise<[TransactionConfig, string, string]>;
 interface TransferERC20Props extends TransactionFee {

package/services/balance-service/transfer/smart-contract.js

@@ -9,6 +9,11 @@ import { EVM_REFORMAT_DECIMALS } from '@subwallet/extension-base/services/chain-
 import { combineEthFee } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
+// hot fix gas settings for Energy Web Chain
+export const gasSettingsForEWC = {
+  gasLimit: 4900000,
+  maxFeePerGas: '10000000'
+};
 export async function getEVMTransactionObject(props) {
   const {
     chain,
@@ -23,10 +28,18 @@ export async function getEVMTransactionObject(props) {
     transferAll,
     value
   } = props;
+  const isEnergyWebChain = chain === 'energy_web_chain'; // hot fix gas settings for Energy Web Chain
+
   const feeCustom = _feeCustom;
   const feeInfo = _feeInfo;
   const feeCombine = combineEthFee(feeInfo, feeOption, feeCustom);
   let errorOnEstimateFee = '';
+  if (isEnergyWebChain) {
+    feeCombine.maxFeePerGas = gasSettingsForEWC.maxFeePerGas;
+    if (!feeCombine.maxPriorityFeePerGas || new BigN(feeCombine.maxPriorityFeePerGas).gt(feeCombine.maxFeePerGas)) {
+      feeCombine.maxPriorityFeePerGas = gasSettingsForEWC.maxFeePerGas;
+    }
+  }
   const transactionObject = {
     to,
     value,
@@ -34,16 +47,21 @@ export async function getEVMTransactionObject(props) {
     data,
     ...feeCombine
   };
-  const gasEstimate = await evmApi.api.eth.estimateGas(transactionObject).catch(e => {
-    console.log('Cannot estimate fee with native transfer on', chain, e);
-    if (fallbackFee) {
-      errorOnEstimateFee = e.message;
-      return 21000;
-    } else {
-      throw Error('Unable to estimate fee for this transaction. Edit fee and try again.');
-    }
-  });
-  const gasLimit = Math.floor(gasEstimate * 1.1); // 10% buffer for fluctuations
+  let gasLimit;
+  if (isEnergyWebChain) {
+    gasLimit = gasSettingsForEWC.gasLimit;
+  } else {
+    const gasEstimate = await evmApi.api.eth.estimateGas(transactionObject).catch(e => {
+      console.log('Cannot estimate fee with native transfer on', chain, e);
+      if (fallbackFee) {
+        errorOnEstimateFee = e.message;
+        return 21000;
+      } else {
+        throw Error('Unable to estimate fee for this transaction. Edit fee and try again.');
+      }
+    });
+    gasLimit = Math.floor(gasEstimate * 1.1); // 10% buffer for fluctuations
+  }
 
   transactionObject.gas = gasLimit;
   let estimateFee;
@@ -74,6 +92,8 @@ export async function getERC20TransactionObject(props) {
     transferAll,
     value
   } = props;
+  const isEnergyWebChain = chain === 'energy_web_chain'; // hot fix gas settings for Energy Web Chain
+
   const erc20Contract = getERC20Contract(assetAddress, evmApi);
   const feeCustom = _feeCustom;
   let freeAmount = new BigN(0);
@@ -89,21 +109,30 @@ export async function getERC20TransactionObject(props) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
     return erc20Contract.methods.transfer(to, transferValue).encodeABI();
   }
-  const transferData = generateTransferData(to, transferValue);
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-  const gasLimit = await erc20Contract.methods.transfer(to, transferValue).estimateGas({
-    from
-  }).catch(e => {
-    console.log('Cannot estimate fee with token contract', assetAddress, chain, e);
-    if (fallbackFee) {
-      errorOnEstimateFee = e.message;
-      return 70000;
-    } else {
-      throw Error('Unable to estimate fee for this transaction. Edit fee and try again.');
-    }
-  });
   const feeInfo = _feeInfo;
   const feeCombine = combineEthFee(feeInfo, feeOption, feeCustom);
+  const transferData = generateTransferData(to, transferValue);
+  let gasLimit;
+  if (isEnergyWebChain) {
+    gasLimit = gasSettingsForEWC.gasLimit;
+    feeCombine.maxFeePerGas = gasSettingsForEWC.maxFeePerGas;
+    if (!feeCombine.maxPriorityFeePerGas || new BigN(feeCombine.maxPriorityFeePerGas).gt(feeCombine.maxFeePerGas)) {
+      feeCombine.maxPriorityFeePerGas = gasSettingsForEWC.maxFeePerGas;
+    }
+  } else {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    gasLimit = await erc20Contract.methods.transfer(to, transferValue).estimateGas({
+      from
+    }).catch(e => {
+      console.log('Cannot estimate fee with token contract', assetAddress, chain, e);
+      if (fallbackFee) {
+        errorOnEstimateFee = e.message;
+        return 70000;
+      } else {
+        throw Error('Unable to estimate fee for this transaction. Edit fee and try again.');
+      }
+    });
+  }
   const transactionObject = {
     gas: gasLimit,
     from,

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

@@ -17,10 +17,10 @@ export declare type CreateXcmExtrinsicProps = {
 } & TransactionFee;
 export declare type FunctionCreateXcmExtrinsic = (props: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'> | TransactionConfig | undefined>;
 export declare const createSnowBridgeExtrinsic: ({ destinationChain, evmApi, feeCustom, feeInfo, feeOption, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
-export declare const createXcmExtrinsic: ({ destinationChain, originChain, originTokenInfo, recipient, sendingValue, substrateApi }: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'>>;
 export declare const createAvailBridgeTxFromEth: ({ evmApi, feeCustom, feeInfo, feeOption, originChain, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
 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<boolean>;
+export declare const dryRunXcmExtrinsicV2: (request: CreateXcmExtrinsicProps, isPreview?: boolean) => Promise<boolean>;
+export declare const getXcmOriginFee: (request: CreateXcmExtrinsicProps) => Promise<string | undefined>;
 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

@@ -3,14 +3,9 @@
 
 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, 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';
-import { _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { buildXcm, dryRunPreviewXcm, dryRunXcm, estimateXcmFee, isChainNotSupportDryRun, isChainNotSupportPolkadotApi } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 import { combineEthFee } from '@subwallet/extension-base/utils';
 import subwalletApiSdk from '@subwallet-monorepos/subwallet-services-sdk';
 import { _createPosBridgeL1toL2Extrinsic, _createPosBridgeL2toL1Extrinsic } from "./posBridge.js";
@@ -38,30 +33,6 @@ export const createSnowBridgeExtrinsic = async ({
   }
   return getSnowBridgeEvmTransfer(originTokenInfo, originChain, destinationChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };
-
-// deprecated
-export const createXcmExtrinsic = async ({
-  destinationChain,
-  originChain,
-  originTokenInfo,
-  recipient,
-  sendingValue,
-  substrateApi
-}) => {
-  if (!substrateApi) {
-    throw Error('Substrate API is not available');
-  }
-  const chainApi = await substrateApi.isReady;
-  const api = chainApi.api;
-  const polkadotXcmSpecialCases = _XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChain.slug) && _isNativeToken(originTokenInfo);
-  if (_XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
-    return getExtrinsicByPolkadotXcmPallet(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
-  }
-  if (_XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
-    return getExtrinsicByXcmPalletPallet(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
-  }
-  return getExtrinsicByXtokensPallet(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
-};
 export const createAvailBridgeTxFromEth = ({
   evmApi,
   feeCustom,
@@ -125,9 +96,9 @@ export const createXcmExtrinsicV2 = async request => {
     return undefined;
   }
 };
-export const dryRunXcmExtrinsicV2 = async request => {
+export const dryRunXcmExtrinsicV2 = async (request, isPreview = false) => {
   try {
-    const dryRunResult = await dryRunXcm(request);
+    const dryRunResult = isPreview ? await dryRunPreviewXcm(request) : await dryRunXcm(request);
     const originDryRunRs = dryRunResult.origin;
     if (originDryRunRs.success) {
       const {
@@ -157,6 +128,21 @@ export const dryRunXcmExtrinsicV2 = async request => {
     return false;
   }
 };
+export const getXcmOriginFee = async request => {
+  try {
+    const xcmFeeInfo = await estimateXcmFee({
+      fromChainInfo: request.originChain,
+      fromTokenInfo: request.originTokenInfo,
+      toChainInfo: request.destinationChain,
+      recipient: request.recipient,
+      sender: request.sender,
+      value: request.sendingValue
+    });
+    return xcmFeeInfo === null || xcmFeeInfo === void 0 ? void 0 : xcmFeeInfo.origin.fee;
+  } catch (e) {
+    return undefined;
+  }
+};
 export const createAcrossBridgeExtrinsic = async ({
   destinationChain,
   destinationTokenInfo,

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

@@ -44,9 +44,8 @@ export declare type GetXcmFeeResult = {
 };
 export declare function buildXcm(request: CreateXcmExtrinsicProps): Promise<SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function dryRunXcm(request: CreateXcmExtrinsicProps): Promise<DryRunResult>;
+export declare function dryRunPreviewXcm(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 {};