@subwallet/extension-base 1.3.17-0 → 1.3.18-0

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.17-0",
+  "version": "1.3.18-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1091,6 +1091,11 @@
       "require": "./cjs/services/event-service/types.js",
       "default": "./services/event-service/types.js"
     },
+    "./services/fee-service/interfaces": {
+      "types": "./services/fee-service/interfaces.d.ts",
+      "require": "./cjs/services/fee-service/interfaces.js",
+      "default": "./services/fee-service/interfaces.js"
+    },
     "./services/fee-service/service": {
       "types": "./services/fee-service/service.d.ts",
       "require": "./cjs/services/fee-service/service.js",
@@ -2076,6 +2081,11 @@
       "require": "./cjs/types/balance/index.js",
       "default": "./types/balance/index.js"
     },
+    "./types/balance/transfer": {
+      "types": "./types/balance/transfer.d.ts",
+      "require": "./cjs/types/balance/transfer.js",
+      "default": "./types/balance/transfer.js"
+    },
     "./types/bridge": {
       "types": "./types/bridge/index.d.ts",
       "require": "./cjs/types/bridge/index.js",
@@ -2116,6 +2126,11 @@
       "require": "./cjs/types/fee/index.js",
       "default": "./types/fee/index.js"
     },
+    "./types/fee/base": {
+      "types": "./types/fee/base.d.ts",
+      "require": "./cjs/types/fee/base.js",
+      "default": "./types/fee/base.js"
+    },
     "./types/fee/evm": {
       "types": "./types/fee/evm.d.ts",
       "require": "./cjs/types/fee/evm.js",
@@ -2126,6 +2141,26 @@
       "require": "./cjs/types/fee/fee.js",
       "default": "./types/fee/fee.js"
     },
+    "./types/fee/option": {
+      "types": "./types/fee/option.d.ts",
+      "require": "./cjs/types/fee/option.js",
+      "default": "./types/fee/option.js"
+    },
+    "./types/fee/subscription": {
+      "types": "./types/fee/subscription.d.ts",
+      "require": "./cjs/types/fee/subscription.js",
+      "default": "./types/fee/subscription.js"
+    },
+    "./types/fee/substrate": {
+      "types": "./types/fee/substrate.d.ts",
+      "require": "./cjs/types/fee/substrate.js",
+      "default": "./types/fee/substrate.js"
+    },
+    "./types/fee/ton": {
+      "types": "./types/fee/ton.d.ts",
+      "require": "./cjs/types/fee/ton.js",
+      "default": "./types/fee/ton.js"
+    },
     "./types/metadata": {
       "types": "./types/metadata.d.ts",
       "require": "./cjs/types/metadata.js",
@@ -2361,6 +2396,21 @@
       "require": "./cjs/utils/eth/parseTransaction/base.js",
       "default": "./utils/eth/parseTransaction/base.js"
     },
+    "./utils/fee": {
+      "types": "./utils/fee/index.d.ts",
+      "require": "./cjs/utils/fee/index.js",
+      "default": "./utils/fee/index.js"
+    },
+    "./utils/fee/combine": {
+      "types": "./utils/fee/combine.d.ts",
+      "require": "./cjs/utils/fee/combine.js",
+      "default": "./utils/fee/combine.js"
+    },
+    "./utils/fee/transfer": {
+      "types": "./utils/fee/transfer.d.ts",
+      "require": "./cjs/utils/fee/transfer.js",
+      "default": "./utils/fee/transfer.js"
+    },
     "./utils/fetch": {
       "types": "./utils/fetch.d.ts",
       "require": "./cjs/utils/fetch.js",
@@ -2514,10 +2564,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.99-beta.14",
-    "@subwallet/extension-base": "^1.3.17-0",
-    "@subwallet/extension-chains": "^1.3.17-0",
-    "@subwallet/extension-dapp": "^1.3.17-0",
-    "@subwallet/extension-inject": "^1.3.17-0",
+    "@subwallet/extension-base": "^1.3.18-0",
+    "@subwallet/extension-chains": "^1.3.18-0",
+    "@subwallet/extension-dapp": "^1.3.18-0",
+    "@subwallet/extension-inject": "^1.3.18-0",
     "@subwallet/keyring": "^0.1.8-beta.0",
     "@subwallet/ui-keyring": "^0.1.8-beta.0",
     "@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.17-0'
+  version: '1.3.18-0'
 };

package/services/balance-service/helpers/subscribe/substrate/index.js

@@ -204,7 +204,7 @@ const subscribeForeignAssetBalance = async ({
   const unsubList = await Promise.all(Object.values(tokenMap).map(tokenInfo => {
     try {
       if (_isBridgedToken(tokenInfo)) {
-        const version = ['statemint', 'statemine'].includes(chainInfo.slug) ? 4 : 3;
+        const version = ['statemint', 'statemine', 'westend_assethub'].includes(chainInfo.slug) ? 4 : 3;
         const params = [{
           section: 'query',
           module: foreignAssetsAccountKey.split('_')[1],

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

@@ -70,6 +70,7 @@ export declare class BalanceService implements StoppableServiceInterface {
     getBalance(reset?: boolean): Promise<BalanceJson>;
     /** Get stored balance from db */
     getStoredBalance(address: string): Promise<BalanceItem[]>;
+    getTokensHasBalance(address: string, chain: string, tokenSlug?: string): Promise<Record<string, BalanceItem>>;
     handleResetBalance(forceRefresh?: boolean): Promise<void>;
     /**
      * Update value for balance map

package/services/balance-service/index.js

@@ -280,6 +280,19 @@ export class BalanceService {
   async getStoredBalance(address) {
     return await this.state.dbService.stores.balance.getBalanceMapByAddresses(address);
   }
+  async getTokensHasBalance(address, chain, tokenSlug) {
+    const balanceItems = await this.state.dbService.stores.balance.getBalanceHasAmount(address, chain);
+    const tokenHasBalanceInfoMap = {};
+    balanceItems.forEach(balanceItem => {
+      tokenHasBalanceInfoMap[balanceItem.tokenSlug] = balanceItem;
+    });
+    if (tokenSlug) {
+      return {
+        [tokenSlug]: tokenHasBalanceInfoMap[tokenSlug]
+      };
+    }
+    return tokenHasBalanceInfoMap;
+  }
   async handleResetBalance(forceRefresh) {
     if (forceRefresh) {
       this.balanceMap.setData({});

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

@@ -1,7 +1,27 @@
-import { _ChainInfo } from '@subwallet/chain-list/types';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
+import { FeeInfo, TransactionFee } from '@subwallet/extension-base/types';
 import { TransactionConfig } from 'web3-core';
-export declare function getEVMTransactionObject(chainInfo: _ChainInfo, from: string, to: string, value: string, transferAll: boolean, web3Api: _EvmApi): Promise<[TransactionConfig, string]>;
-export declare function getERC20TransactionObject(assetAddress: string, chainInfo: _ChainInfo, from: string, to: string, value: string, transferAll: boolean, evmApi: _EvmApi): Promise<[TransactionConfig, string]>;
-export declare function getERC721Transaction(web3Api: _EvmApi, chain: string, contractAddress: string, senderAddress: string, recipientAddress: string, tokenId: string): Promise<TransactionConfig>;
+interface TransferEvmProps extends TransactionFee {
+    chain: string;
+    from: string;
+    feeInfo: FeeInfo;
+    to: string;
+    transferAll: boolean;
+    value: string;
+    evmApi: _EvmApi;
+}
+export declare function getEVMTransactionObject({ chain, evmApi, feeCustom: _feeCustom, feeInfo: _feeInfo, feeOption, from, to, transferAll, value }: TransferEvmProps): Promise<[TransactionConfig, string]>;
+export declare function getERC20TransactionObject({ assetAddress, evmApi, feeCustom: _feeCustom, feeInfo: _feeInfo, feeOption, from, to, transferAll, value }: TransferERC20Props): Promise<[TransactionConfig, string]>;
+interface TransferERC20Props extends TransactionFee {
+    assetAddress: string;
+    chain: string;
+    evmApi: _EvmApi;
+    from: string;
+    feeInfo: FeeInfo;
+    to: string;
+    transferAll: boolean;
+    value: string;
+}
+export declare function getERC721Transaction(web3Api: _EvmApi, chain: string, contractAddress: string, senderAddress: string, recipientAddress: string, tokenId: string, _feeInfo: FeeInfo): Promise<TransactionConfig>;
 export declare function getPSP34TransferExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null>;
+export {};

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

@@ -6,41 +6,58 @@ import { _ERC721_ABI } from '@subwallet/extension-base/koni/api/contract-handler
 import { getPSP34ContractPromise } from '@subwallet/extension-base/koni/api/contract-handler/wasm';
 import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
 import { EVM_REFORMAT_DECIMALS } from '@subwallet/extension-base/services/chain-service/constants';
-import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
+import { combineEthFee } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
-export async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, web3Api) {
-  var _priority$maxFeePerGa, _priority$maxPriority;
-  const networkKey = chainInfo.slug;
-  const priority = await calculateGasFeeParams(web3Api, networkKey);
+export async function getEVMTransactionObject({
+  chain,
+  evmApi,
+  feeCustom: _feeCustom,
+  feeInfo: _feeInfo,
+  feeOption,
+  from,
+  to,
+  transferAll,
+  value
+}) {
+  const feeCustom = _feeCustom;
+  const feeInfo = _feeInfo;
+  const feeCombine = combineEthFee(feeInfo, feeOption, feeCustom);
   const transactionObject = {
     to: to,
     value: value,
     from: from,
-    gasPrice: priority.gasPrice,
-    maxFeePerGas: (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
-    maxPriorityFeePerGas: (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString()
+    ...feeCombine
   };
-  const gasLimit = await web3Api.api.eth.estimateGas(transactionObject);
+  const gasLimit = await evmApi.api.eth.estimateGas(transactionObject);
   transactionObject.gas = gasLimit;
   let estimateFee;
-  if (priority.baseGasFee) {
-    const maxFee = priority.maxFeePerGas;
+  if (feeCombine.maxFeePerGas) {
+    const maxFee = new BigN(feeCombine.maxFeePerGas);
     estimateFee = maxFee.multipliedBy(gasLimit);
   } else {
-    estimateFee = new BigN(priority.gasPrice).multipliedBy(gasLimit);
+    estimateFee = new BigN(feeCombine.gasPrice || '0').multipliedBy(gasLimit);
   }
   transactionObject.value = transferAll ? new BigN(value).minus(estimateFee).toString() : value;
-  if (EVM_REFORMAT_DECIMALS.acala.includes(networkKey)) {
+  if (EVM_REFORMAT_DECIMALS.acala.includes(chain)) {
     const numberReplace = 18 - 12;
     transactionObject.value = transactionObject.value.substring(0, transactionObject.value.length - 6) + new Array(numberReplace).fill('0').join('');
   }
   return [transactionObject, transactionObject.value.toString()];
 }
-export async function getERC20TransactionObject(assetAddress, chainInfo, from, to, value, transferAll, evmApi) {
-  var _priority$maxFeePerGa2, _priority$maxPriority2;
-  const networkKey = chainInfo.slug;
+export async function getERC20TransactionObject({
+  assetAddress,
+  evmApi,
+  feeCustom: _feeCustom,
+  feeInfo: _feeInfo,
+  feeOption,
+  from,
+  to,
+  transferAll,
+  value
+}) {
   const erc20Contract = getERC20Contract(assetAddress, evmApi);
+  const feeCustom = _feeCustom;
   let freeAmount = new BigN(0);
   let transferValue = value;
   if (transferAll) {
@@ -54,22 +71,19 @@ export async function getERC20TransactionObject(assetAddress, chainInfo, from, t
     return erc20Contract.methods.transfer(to, transferValue).encodeABI();
   }
   const transferData = generateTransferData(to, transferValue);
-  const [gasLimit, priority] = await Promise.all([
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-  erc20Contract.methods.transfer(to, transferValue).estimateGas({
+  const gasLimit = await erc20Contract.methods.transfer(to, transferValue).estimateGas({
     from
-  }).catch(() => {
-    throw Error('Unable to estimate fee for this transaction. Try again or contact support at agent@subwallet.app');
-  }), calculateGasFeeParams(evmApi, networkKey)]);
+  });
+  const feeInfo = _feeInfo;
+  const feeCombine = combineEthFee(feeInfo, feeOption, feeCustom);
   const transactionObject = {
     gas: gasLimit,
     from,
     value: '0',
     to: assetAddress,
     data: transferData,
-    gasPrice: priority.gasPrice,
-    maxFeePerGas: (_priority$maxFeePerGa2 = priority.maxFeePerGas) === null || _priority$maxFeePerGa2 === void 0 ? void 0 : _priority$maxFeePerGa2.toString(),
-    maxPriorityFeePerGas: (_priority$maxPriority2 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority2 === void 0 ? void 0 : _priority$maxPriority2.toString()
+    ...feeCombine
   };
   if (transferAll) {
     transferValue = freeAmount.toFixed(0);
@@ -77,18 +91,16 @@ export async function getERC20TransactionObject(assetAddress, chainInfo, from, t
   }
   return [transactionObject, transferValue];
 }
-export async function getERC721Transaction(web3Api, chain, contractAddress, senderAddress, recipientAddress, tokenId) {
-  var _priority$maxFeePerGa3, _priority$maxPriority3;
+export async function getERC721Transaction(web3Api, chain, contractAddress, senderAddress, recipientAddress, tokenId, _feeInfo) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   const contract = new web3Api.api.eth.Contract(_ERC721_ABI, contractAddress);
   let gasLimit;
-  let priority;
   try {
-    [gasLimit, priority] = await Promise.all([
+    [gasLimit] = await Promise.all([
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
     contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).estimateGas({
       from: senderAddress
-    }), calculateGasFeeParams(web3Api, chain)]);
+    })]);
   } catch (e) {
     const error = e;
     if (error.message.includes('transfer to non ERC721Receiver implementer')) {
@@ -96,16 +108,16 @@ export async function getERC721Transaction(web3Api, chain, contractAddress, send
     }
     throw error;
   }
+  const feeInfo = _feeInfo;
+  const feeCombine = combineEthFee(feeInfo);
   return {
     from: senderAddress,
-    gasPrice: priority.gasPrice,
-    maxFeePerGas: (_priority$maxFeePerGa3 = priority.maxFeePerGas) === null || _priority$maxFeePerGa3 === void 0 ? void 0 : _priority$maxFeePerGa3.toString(),
-    maxPriorityFeePerGas: (_priority$maxPriority3 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority3 === void 0 ? void 0 : _priority$maxPriority3.toString(),
     gas: gasLimit,
     to: contractAddress,
     value: '0x00',
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-    data: contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).encodeABI()
+    data: contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).encodeABI(),
+    ...feeCombine
   };
 }
 const mustFormatNumberReg = /^-?[0-9][0-9,.]+$/;

package/services/balance-service/transfer/token.js

@@ -9,7 +9,7 @@ import { estimateTonTxFee } from '@subwallet/extension-base/services/balance-ser
 import { _TRANSFER_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible, _isChainTonCompatible, _isNativeToken, _isTokenGearSmartContract, _isTokenTransferredByEvm, _isTokenTransferredByTon, _isTokenWasmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
-import { getGRC20ContractPromise, getVFTContractPromise } from '@subwallet/extension-base/utils';
+import { combineEthFee, getGRC20ContractPromise, getVFTContractPromise } from '@subwallet/extension-base/utils';
 import { keyring } from '@subwallet/ui-keyring';
 import { internal } from '@ton/core';
 import { Address } from '@ton/ton';
@@ -124,11 +124,12 @@ export const getTransferMockTxFee = async (address, chainInfo, tokenInfo, api) =
       };
       const gasLimit = await web3.api.eth.estimateGas(transaction);
       const priority = await calculateGasFeeParams(web3, chainInfo.slug);
-      if (priority.baseGasFee) {
-        const maxFee = priority.maxFeePerGas;
-        estimatedFee = maxFee.multipliedBy(gasLimit);
+      const combinedFee = combineEthFee(priority);
+      if (combinedFee.maxFeePerGas) {
+        const maxFee = combinedFee.maxFeePerGas;
+        estimatedFee = BigN(maxFee).multipliedBy(gasLimit);
       } else {
-        estimatedFee = new BigN(priority.gasPrice).multipliedBy(gasLimit);
+        estimatedFee = new BigN(combinedFee.gasPrice).multipliedBy(gasLimit);
       }
     } else if (_isChainTonCompatible(chainInfo) && _isTokenTransferredByTon(tokenInfo)) {
       const mockWalletContract = keyring.getPair(address).ton.currentContract;

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

@@ -1,6 +1,7 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { _NotificationInfo } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
+import { EvmFeeInfo, FeeCustom, FeeInfo, FeeOption } from '@subwallet/extension-base/types';
 import { TransactionConfig } from 'web3-core';
 export declare const AvailBridgeConfig: {
     ASSET_ID: string;
@@ -37,9 +38,9 @@ declare type Message = {
     to: string;
     messageType: string;
 };
-export declare function getAvailBridgeTxFromEth(originChainInfo: _ChainInfo, sender: string, recipient: string, value: string, evmApi: _EvmApi): Promise<TransactionConfig>;
+export declare function getAvailBridgeTxFromEth(originChainInfo: _ChainInfo, sender: string, recipient: string, value: string, evmApi: _EvmApi, fee: FeeInfo, feeCustom?: FeeCustom, feeOption?: FeeOption): Promise<TransactionConfig>;
 export declare function getAvailBridgeExtrinsicFromAvail(recipient: string, sendingValue: string, substrateApi: _SubstrateApi): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getClaimTxOnAvail(notification: _NotificationInfo, substrateApi: _SubstrateApi): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
-export declare function getClaimTxOnEthereum(chainSlug: string, notification: _NotificationInfo, evmApi: _EvmApi): Promise<TransactionConfig>;
+export declare function getClaimTxOnEthereum(chainSlug: string, notification: _NotificationInfo, evmApi: _EvmApi, feeInfo: EvmFeeInfo): Promise<TransactionConfig>;
 export declare function isAvailChainBridge(chainSlug: string): boolean;
 export {};

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

@@ -4,8 +4,8 @@
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { getWeb3Contract } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
 import { _AVAIL_BRIDGE_GATEWAY_ABI, _AVAIL_TEST_BRIDGE_GATEWAY_ABI, getAvailBridgeGatewayContract } from '@subwallet/extension-base/koni/api/contract-handler/utils';
-import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { AVAIL_BRIDGE_API } from '@subwallet/extension-base/services/inapp-notification-service/utils';
+import { combineEthFee } from '@subwallet/extension-base/utils';
 import { decodeAddress } from '@subwallet/keyring';
 import { u8aToHex } from '@polkadot/util';
 export const AvailBridgeConfig = {
@@ -14,8 +14,7 @@ export const AvailBridgeConfig = {
   // todo: check if these config can change later
   AVAIL_DOMAIN: 1
 };
-export async function getAvailBridgeTxFromEth(originChainInfo, sender, recipient, value, evmApi) {
-  var _priority$maxFeePerGa, _priority$maxPriority;
+export async function getAvailBridgeTxFromEth(originChainInfo, sender, recipient, value, evmApi, fee, feeCustom, feeOption) {
   const availBridgeContractAddress = getAvailBridgeGatewayContract(originChainInfo.slug);
   const ABI = getAvailBridgeAbi(originChainInfo.slug);
   const availBridgeContract = getWeb3Contract(availBridgeContractAddress, evmApi, ABI);
@@ -23,19 +22,19 @@ export async function getAvailBridgeTxFromEth(originChainInfo, sender, recipient
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
   const sendAvail = availBridgeContract.methods.sendAVAIL(_address, value);
   const transferData = sendAvail.encodeABI();
-  const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
   const gasLimit = await sendAvail.estimateGas({
     from: sender
   });
+  const _feeCustom = feeCustom;
+  const feeInfo = fee;
+  const feeCombine = combineEthFee(feeInfo, feeOption, _feeCustom);
   return {
     from: sender,
     to: availBridgeContractAddress,
     value: '0',
     data: transferData,
-    gasPrice: priority.gasPrice,
-    maxFeePerGas: (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
-    maxPriorityFeePerGas: (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString(),
-    gas: gasLimit
+    gas: gasLimit,
+    ...feeCombine
   };
 }
 export async function getAvailBridgeExtrinsicFromAvail(recipient, sendingValue, substrateApi) {
@@ -110,8 +109,7 @@ function getAvailBridgeApi(chainSlug) {
   }
   return AVAIL_BRIDGE_API.AVAIL_TESTNET;
 }
-export async function getClaimTxOnEthereum(chainSlug, notification, evmApi) {
-  var _priority$maxFeePerGa2, _priority$maxPriority2;
+export async function getClaimTxOnEthereum(chainSlug, notification, evmApi, feeInfo) {
   const availBridgeContractAddress = getAvailBridgeGatewayContract(chainSlug);
   const ABI = getAvailBridgeAbi(chainSlug);
   const availBridgeContract = getWeb3Contract(availBridgeContractAddress, evmApi, ABI);
@@ -147,16 +145,14 @@ export async function getClaimTxOnEthereum(chainSlug, notification, evmApi) {
   const gasLimit = await transfer.estimateGas({
     from: metadata.receiverAddress
   });
-  const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+  const feeCombine = combineEthFee(feeInfo);
   return {
     from: metadata.receiverAddress,
     to: availBridgeContractAddress,
     value: '0',
     data: transferData,
-    gasPrice: priority.gasPrice,
-    maxFeePerGas: (_priority$maxFeePerGa2 = priority.maxFeePerGas) === null || _priority$maxFeePerGa2 === void 0 ? void 0 : _priority$maxFeePerGa2.toString(),
-    maxPriorityFeePerGas: (_priority$maxPriority2 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority2 === void 0 ? void 0 : _priority$maxPriority2.toString(),
-    gas: gasLimit
+    gas: gasLimit,
+    ...feeCombine
   };
 }
 function getAddressMessage(notification) {

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

@@ -1,22 +1,23 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-import BigN from 'bignumber.js';
+import { FeeInfo, TransactionFee } from '@subwallet/extension-base/types';
 import { TransactionConfig } from 'web3-core';
 import { SubmittableExtrinsic } from '@polkadot/api/types';
 export declare type CreateXcmExtrinsicProps = {
-    originTokenInfo: _ChainAsset;
+    destinationChain: _ChainInfo;
     destinationTokenInfo: _ChainAsset;
+    evmApi?: _EvmApi;
+    originChain: _ChainInfo;
+    originTokenInfo: _ChainAsset;
     recipient: string;
+    sender: string;
     sendingValue: string;
-    evmApi?: _EvmApi;
     substrateApi?: _SubstrateApi;
-    chainInfoMap: Record<string, _ChainInfo>;
-    sender?: string;
-};
+    feeInfo: FeeInfo;
+} & TransactionFee;
 export declare type FunctionCreateXcmExtrinsic = (props: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'> | TransactionConfig>;
-export declare const createSnowBridgeExtrinsic: ({ chainInfoMap, destinationTokenInfo, evmApi, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
-export declare const createXcmExtrinsic: ({ chainInfoMap, destinationTokenInfo, originTokenInfo, recipient, sendingValue, substrateApi }: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'>>;
-export declare const createAvailBridgeTxFromEth: ({ chainInfoMap, evmApi, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
+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: ({ chainInfoMap, destinationTokenInfo, evmApi, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
-export declare const getXcmMockTxFee: (substrateApi: _SubstrateApi, chainInfoMap: Record<string, _ChainInfo>, originTokenInfo: _ChainAsset, destinationTokenInfo: _ChainAsset) => Promise<BigN>;
+export declare const createPolygonBridgeExtrinsic: ({ destinationChain, evmApi, feeCustom, feeInfo, feeOption, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;