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

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

@@ -9,23 +9,22 @@ import { getSnowBridgeEvmTransfer } from '@subwallet/extension-base/services/bal
 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 { _isChainEvmCompatible, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
-import BigN from 'bignumber.js';
-import { u8aToHex } from '@polkadot/util';
-import { addressToEvm } from '@polkadot/util-crypto';
+import { _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { _createPosBridgeL1toL2Extrinsic, _createPosBridgeL2toL1Extrinsic } from "./posBridge.js";
+// SnowBridge
 export const createSnowBridgeExtrinsic = async ({
-  chainInfoMap,
-  destinationTokenInfo,
+  destinationChain,
   evmApi,
+  feeCustom,
+  feeInfo,
+  feeOption,
+  originChain,
   originTokenInfo,
   recipient,
   sender,
   sendingValue
 }) => {
-  const originChainInfo = chainInfoMap[originTokenInfo.originChain];
-  const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
-  if (!_isSnowBridgeXcm(originChainInfo, destinationChainInfo)) {
+  if (!_isSnowBridgeXcm(originChain, destinationChain)) {
     throw new Error('This is not a valid SnowBridge transfer');
   }
   if (!evmApi) {
@@ -34,48 +33,47 @@ export const createSnowBridgeExtrinsic = async ({
   if (!sender) {
     throw Error('Sender is required');
   }
-  return getSnowBridgeEvmTransfer(originTokenInfo, originChainInfo, destinationChainInfo, sender, recipient, sendingValue, evmApi);
+  return getSnowBridgeEvmTransfer(originTokenInfo, originChain, destinationChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };
 export const createXcmExtrinsic = async ({
-  chainInfoMap,
-  destinationTokenInfo,
+  destinationChain,
+  originChain,
   originTokenInfo,
   recipient,
   sendingValue,
   substrateApi
 }) => {
-  const originChainInfo = chainInfoMap[originTokenInfo.originChain];
-  const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
   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(originChainInfo.slug) && _isNativeToken(originTokenInfo);
+  const polkadotXcmSpecialCases = _XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChain.slug) && _isNativeToken(originTokenInfo);
   if (_XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
-    return getExtrinsicByPolkadotXcmPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+    return getExtrinsicByPolkadotXcmPallet(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
   }
   if (_XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
-    return getExtrinsicByXcmPalletPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+    return getExtrinsicByXcmPalletPallet(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
   }
-  return getExtrinsicByXtokensPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+  return getExtrinsicByXtokensPallet(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
 };
 export const createAvailBridgeTxFromEth = ({
-  chainInfoMap,
   evmApi,
-  originTokenInfo,
+  feeCustom,
+  feeInfo,
+  feeOption,
+  originChain,
   recipient,
   sender,
   sendingValue
 }) => {
-  const originChainInfo = chainInfoMap[originTokenInfo.originChain];
   if (!evmApi) {
     throw Error('Evm API is not available');
   }
   if (!sender) {
     throw Error('Sender is required');
   }
-  return getAvailBridgeTxFromEth(originChainInfo, sender, recipient, sendingValue, evmApi);
+  return getAvailBridgeTxFromEth(originChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };
 export const createAvailBridgeExtrinsicFromAvail = async ({
   recipient,
@@ -88,18 +86,19 @@ export const createAvailBridgeExtrinsicFromAvail = async ({
   return await getAvailBridgeExtrinsicFromAvail(recipient, sendingValue, substrateApi);
 };
 export const createPolygonBridgeExtrinsic = async ({
-  chainInfoMap,
-  destinationTokenInfo,
+  destinationChain,
   evmApi,
+  feeCustom,
+  feeInfo,
+  feeOption,
+  originChain,
   originTokenInfo,
   recipient,
   sender,
   sendingValue
 }) => {
-  const originChainInfo = chainInfoMap[originTokenInfo.originChain];
-  const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
-  const isPolygonBridgeXcm = _isPolygonBridgeXcm(originChainInfo, destinationChainInfo);
-  const isValidBridge = isPolygonBridgeXcm || _isPosBridgeXcm(originChainInfo, destinationChainInfo);
+  const isPolygonBridgeXcm = _isPolygonBridgeXcm(originChain, destinationChain);
+  const isValidBridge = isPolygonBridgeXcm || _isPosBridgeXcm(originChain, destinationChain);
   if (!isValidBridge) {
     throw new Error('This is not a valid PolygonBridge transfer');
   }
@@ -109,35 +108,7 @@ export const createPolygonBridgeExtrinsic = async ({
   if (!sender) {
     throw Error('Sender is required');
   }
-  const sourceChain = originChainInfo.slug;
+  const sourceChain = originChain.slug;
   const createExtrinsic = isPolygonBridgeXcm ? sourceChain === 'polygonzkEvm_cardona' || sourceChain === 'polygonZkEvm' ? _createPolygonBridgeL2toL1Extrinsic : _createPolygonBridgeL1toL2Extrinsic : sourceChain === 'polygon_amoy' || sourceChain === 'polygon' ? _createPosBridgeL2toL1Extrinsic : _createPosBridgeL1toL2Extrinsic;
-  return createExtrinsic(originTokenInfo, originChainInfo, sender, recipient, sendingValue, evmApi);
-};
-export const getXcmMockTxFee = async (substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo) => {
-  try {
-    var _paymentInfo$partialF;
-    const destChainInfo = chainInfoMap[destinationTokenInfo.originChain];
-    const originChainInfo = chainInfoMap[originTokenInfo.originChain];
-    const fakeAddress = '5DRewsYzhJqZXU3SRaWy1FSt5iDr875ao91aw5fjrJmDG4Ap'; // todo: move this
-    const substrateAddress = fakeAddress; // todo: move this
-    const evmAddress = u8aToHex(addressToEvm(fakeAddress)); // todo: move this
-
-    // mock receiving account from sender
-    const sender = _isChainEvmCompatible(originChainInfo) ? evmAddress : substrateAddress;
-    const recipient = _isChainEvmCompatible(destChainInfo) ? evmAddress : substrateAddress;
-    const mockTx = await createXcmExtrinsic({
-      chainInfoMap,
-      destinationTokenInfo,
-      originTokenInfo,
-      sender,
-      recipient,
-      sendingValue: '1000000000000000000',
-      substrateApi
-    });
-    const paymentInfo = await mockTx.paymentInfo(fakeAddress);
-    return new BigN((paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0');
-  } catch (e) {
-    console.error('error mocking xcm tx fee', e);
-    return new BigN(0);
-  }
+  return createExtrinsic(originTokenInfo, originChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };

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

@@ -1,6 +1,7 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { _EvmApi } 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 interface gasStation {
     safeLow: number;
@@ -15,8 +16,8 @@ export declare const POLYGON_GAS_INDEXER: {
     MAINNET: string;
     TESTNET: string;
 };
-export declare function _createPolygonBridgeL1toL2Extrinsic(tokenInfo: _ChainAsset, originChainInfo: _ChainInfo, sender: string, recipientAddress: string, value: string, evmApi: _EvmApi): Promise<TransactionConfig>;
-export declare function _createPolygonBridgeL2toL1Extrinsic(tokenInfo: _ChainAsset, originChainInfo: _ChainInfo, sender: string, recipientAddress: string, value: string, evmApi: _EvmApi): Promise<TransactionConfig>;
-export declare function getClaimPolygonBridge(chainSlug: string, notification: _NotificationInfo, evmApi: _EvmApi): Promise<TransactionConfig>;
+export declare function _createPolygonBridgeL1toL2Extrinsic(tokenInfo: _ChainAsset, originChainInfo: _ChainInfo, sender: string, recipientAddress: string, value: string, evmApi: _EvmApi, feeInfo: FeeInfo, feeCustom?: FeeCustom, feeOption?: FeeOption): Promise<TransactionConfig>;
+export declare function _createPolygonBridgeL2toL1Extrinsic(tokenInfo: _ChainAsset, originChainInfo: _ChainInfo, sender: string, recipientAddress: string, value: string, evmApi: _EvmApi, feeInfo: FeeInfo, feeCustom?: FeeCustom, feeOption?: FeeOption): Promise<TransactionConfig>;
+export declare function getClaimPolygonBridge(chainSlug: string, notification: _NotificationInfo, evmApi: _EvmApi, feeInfo: EvmFeeInfo): Promise<TransactionConfig>;
 export declare function isClaimedPolygonBridge(chainSlug: string, counter: number, sourceNetwork: number, evmApi: _EvmApi): Promise<any>;
 export declare function _isPolygonChainBridge(srcChain: string, destChain: string): boolean;

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

@@ -5,7 +5,7 @@ import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { getWeb3Contract } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
 import { _POLYGON_BRIDGE_ABI, getPolygonBridgeContract } from '@subwallet/extension-base/koni/api/contract-handler/utils';
 import { _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
-import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
+import { combineEthFee } from '@subwallet/extension-base/utils';
 export const POLYGON_PROOF_INDEXER = {
   MAINNET: 'https://api-gateway.polygon.technology/api/v3/proof/mainnet/merkle-proof',
   TESTNET: 'https://api-gateway.polygon.technology/api/v3/proof/testnet/merkle-proof'
@@ -14,8 +14,7 @@ export const POLYGON_GAS_INDEXER = {
   MAINNET: 'https://gasstation.polygon.technology/zkevm',
   TESTNET: 'https://gasstation.polygon.technology/zkevm/cardona'
 };
-async function createPolygonBridgeTransaction(tokenInfo, originChainInfo, sender, recipientAddress, value, destinationNetwork, evmApi) {
-  var _priority$maxFeePerGa, _priority$maxPriority;
+async function createPolygonBridgeTransaction(tokenInfo, originChainInfo, sender, recipientAddress, value, destinationNetwork, evmApi, _feeInfo, feeCustom, feeOption) {
   const polygonBridgeContractAddress = getPolygonBridgeContract(originChainInfo.slug);
   const polygonBridgeContract = getWeb3Contract(polygonBridgeContractAddress, evmApi, _POLYGON_BRIDGE_ABI);
   const tokenContract = _getContractAddressOfToken(tokenInfo) || '0x0000000000000000000000000000000000000000'; // FOR Ethereum: use null address
@@ -27,28 +26,27 @@ async function createPolygonBridgeTransaction(tokenInfo, originChainInfo, sender
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const transferCall = polygonBridgeContract.methods.bridgeAsset(destinationNetwork, recipientAddress, value, tokenContract, true, '0x');
   const transferEncodedCall = transferCall.encodeABI();
-  const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+  const feeInfo = _feeInfo;
+  const feeCombine = combineEthFee(feeInfo, feeOption, feeCustom);
   const transactionConfig = {
     from: sender,
     to: polygonBridgeContractAddress,
     value: value,
     data: transferEncodedCall,
-    gasPrice: priority.gasPrice,
-    maxFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
-    maxPriorityFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString()
+    ...feeCombine
   };
   const gasLimit = await evmApi.api.eth.estimateGas(transactionConfig).catch(() => 200000);
   transactionConfig.gas = gasLimit.toString();
   return transactionConfig;
 }
-export async function _createPolygonBridgeL1toL2Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi) {
-  return createPolygonBridgeTransaction(tokenInfo, originChainInfo, sender, recipientAddress, value, 1, evmApi);
+export async function _createPolygonBridgeL1toL2Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi, feeInfo, feeCustom, feeOption) {
+  return createPolygonBridgeTransaction(tokenInfo, originChainInfo, sender, recipientAddress, value, 1, evmApi, feeInfo, feeCustom, feeOption);
 }
-export async function _createPolygonBridgeL2toL1Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi) {
-  return createPolygonBridgeTransaction(tokenInfo, originChainInfo, sender, recipientAddress, value, 0, evmApi);
+export async function _createPolygonBridgeL2toL1Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi, feeInfo, feeCustom, feeOption) {
+  return createPolygonBridgeTransaction(tokenInfo, originChainInfo, sender, recipientAddress, value, 0, evmApi, feeInfo, feeCustom, feeOption);
 }
-export async function getClaimPolygonBridge(chainSlug, notification, evmApi) {
-  var _metadata$sourceNetwo, _metadata$counter, _priority$maxFeePerGa2, _priority$maxPriority2;
+export async function getClaimPolygonBridge(chainSlug, notification, evmApi, feeInfo) {
+  var _metadata$sourceNetwo, _metadata$counter;
   const polygonBridgeContractAddress = getPolygonBridgeContract(chainSlug);
   const polygonBridgeContract = getWeb3Contract(polygonBridgeContractAddress, evmApi, _POLYGON_BRIDGE_ABI);
   const metadata = notification.metadata;
@@ -60,15 +58,13 @@ export async function getClaimPolygonBridge(chainSlug, notification, evmApi) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const transferCall = polygonBridgeContract.methods.claimAsset(proof.merkle_proof, proof.rollup_merkle_proof, metadata.counter, proof.main_exit_root, proof.rollup_exit_root, metadata.originTokenNetwork, metadata.originTokenAddress, metadata.destinationNetwork, metadata.receiver, metadata.amounts[0], '0x');
   const transferEncodedCall = transferCall.encodeABI();
-  const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+  const feeCombine = combineEthFee(feeInfo);
   const transactionConfig = {
     from: metadata.userAddress,
     to: polygonBridgeContractAddress,
     value: '0',
     data: transferEncodedCall,
-    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
   };
   const gasLimit = await evmApi.api.eth.estimateGas(transactionConfig).catch(() => 200000);
   transactionConfig.gas = gasLimit.toString();

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

@@ -1,14 +1,15 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { _EvmApi } 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 POS_EXIT_PAYLOAD_INDEXER: {
     MAINNET: string;
     TESTNET: string;
 };
-export declare function _createPosBridgeL1toL2Extrinsic(tokenInfo: _ChainAsset, originChainInfo: _ChainInfo, sender: string, recipientAddress: string, value: string, evmApi: _EvmApi): Promise<TransactionConfig>;
-export declare function _createPosBridgeL2toL1Extrinsic(tokenInfo: _ChainAsset, originChainInfo: _ChainInfo, sender: string, recipientAddress: string, value: string, evmApi: _EvmApi): Promise<TransactionConfig>;
-export declare function getClaimPosBridge(chainSlug: string, notification: _NotificationInfo, evmApi: _EvmApi): Promise<TransactionConfig>;
+export declare function _createPosBridgeL1toL2Extrinsic(tokenInfo: _ChainAsset, originChainInfo: _ChainInfo, sender: string, recipientAddress: string, value: string, evmApi: _EvmApi, _feeInfo: FeeInfo, feeCustom?: FeeCustom, feeOption?: FeeOption): Promise<TransactionConfig>;
+export declare function _createPosBridgeL2toL1Extrinsic(tokenInfo: _ChainAsset, originChainInfo: _ChainInfo, sender: string, recipientAddress: string, value: string, evmApi: _EvmApi, _feeInfo: FeeInfo, feeCustom?: FeeCustom, feeOption?: FeeOption): Promise<TransactionConfig>;
+export declare function getClaimPosBridge(chainSlug: string, notification: _NotificationInfo, evmApi: _EvmApi, feeInfo: EvmFeeInfo): Promise<TransactionConfig>;
 export declare function isClaimedPosBridge(id: string, address: string, isTestnet: boolean): Promise<boolean>;
 export declare function _isPosChainBridge(srcChain: string, destChain: string): boolean;
 export declare function _isPosChainL2Bridge(srcChain: string, destChain: string): boolean;

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

@@ -4,59 +4,60 @@
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { getWeb3Contract } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
 import { _POS_BRIDGE_ABI, _POS_BRIDGE_L2_ABI, getPosL1BridgeContract, getPosL2BridgeContract } from '@subwallet/extension-base/koni/api/contract-handler/utils';
-import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { fetchPolygonBridgeTransactions } from '@subwallet/extension-base/services/inapp-notification-service/utils';
 import { BasicTxErrorType } from '@subwallet/extension-base/types';
+import { combineEthFee } from '@subwallet/extension-base/utils';
 export const POS_EXIT_PAYLOAD_INDEXER = {
   MAINNET: 'https://proof-generator.polygon.technology/api/v1/matic/exit-payload',
   TESTNET: 'https://proof-generator.polygon.technology/api/v1/amoy/exit-payload'
 };
-export async function _createPosBridgeL1toL2Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi) {
-  var _priority$maxFeePerGa, _priority$maxPriority;
+export async function _createPosBridgeL1toL2Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi, _feeInfo, feeCustom, feeOption) {
   const posBridgeContractAddress = getPosL1BridgeContract(originChainInfo.slug);
   const posBridgeContract = getWeb3Contract(posBridgeContractAddress, evmApi, _POS_BRIDGE_ABI);
+  const _feeCustom = feeCustom;
+  const feeInfo = _feeInfo;
+  const feeCombine = combineEthFee(feeInfo, feeOption, _feeCustom);
 
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const transferCall = posBridgeContract.methods.depositEtherFor(recipientAddress);
   const transferEncodedCall = transferCall.encodeABI();
-  const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+
+  // const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+
   const transactionConfig = {
     from: sender,
     to: posBridgeContractAddress,
     value: value,
     data: transferEncodedCall,
-    gasPrice: priority.gasPrice,
-    maxFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
-    maxPriorityFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString()
+    ...feeCombine
   };
   const gasLimit = await evmApi.api.eth.estimateGas(transactionConfig).catch(() => 200000);
   transactionConfig.gas = gasLimit.toString();
   return transactionConfig;
 }
-export async function _createPosBridgeL2toL1Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi) {
-  var _priority$maxFeePerGa2, _priority$maxPriority2;
+export async function _createPosBridgeL2toL1Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi, _feeInfo, feeCustom, feeOption) {
   const posBridgeContractAddress = getPosL2BridgeContract(originChainInfo.slug);
   const posBridgeContract = getWeb3Contract(posBridgeContractAddress, evmApi, _POS_BRIDGE_L2_ABI);
 
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const transferCall = posBridgeContract.methods.withdraw(value);
   const transferEncodedCall = transferCall.encodeABI();
-  const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+  const _feeCustom = feeCustom;
+  const feeInfo = _feeInfo;
+  const feeCombine = combineEthFee(feeInfo, feeOption, _feeCustom);
   const transactionConfig = {
     from: sender,
     to: posBridgeContractAddress,
     value: undefined,
     data: transferEncodedCall,
-    gasPrice: priority.gasPrice,
-    maxFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxFeePerGa2 = priority.maxFeePerGas) === null || _priority$maxFeePerGa2 === void 0 ? void 0 : _priority$maxFeePerGa2.toString(),
-    maxPriorityFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxPriority2 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority2 === void 0 ? void 0 : _priority$maxPriority2.toString()
+    ...feeCombine
   };
   const gasLimit = await evmApi.api.eth.estimateGas(transactionConfig).catch(() => 200000);
   transactionConfig.gas = gasLimit.toString();
   return transactionConfig;
 }
-export async function getClaimPosBridge(chainSlug, notification, evmApi) {
-  var _event$arguments, _event$arguments$, _event$arguments$$top, _priority$maxFeePerGa3, _priority$maxPriority3;
+export async function getClaimPosBridge(chainSlug, notification, evmApi, feeInfo) {
+  var _event$arguments, _event$arguments$, _event$arguments$$top;
   const posBridgeContractAddress = getPosL2BridgeContract(chainSlug);
   const posBridgeContract = getWeb3Contract(posBridgeContractAddress, evmApi, _POS_BRIDGE_L2_ABI);
   const metadata = notification.metadata;
@@ -83,15 +84,13 @@ export async function getClaimPosBridge(chainSlug, notification, evmApi) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const transferCall = posClaimContract.methods.exit(inputData.result);
   const transferEncodedCall = transferCall.encodeABI();
-  const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+  const feeCombine = combineEthFee(feeInfo);
   const transactionConfig = {
     from: metadata.userAddress,
     to: posClaimContractAddress,
     value: '0',
     data: transferEncodedCall,
-    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()
+    ...feeCombine
   };
   const gasLimit = await evmApi.api.eth.estimateGas(transactionConfig).catch(() => 200000);
   transactionConfig.gas = gasLimit.toString();

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

@@ -1,4 +1,5 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
+import { FeeCustom, FeeInfo, FeeOption } from '@subwallet/extension-base/types';
 import { TransactionConfig } from 'web3-core';
-export declare function getSnowBridgeEvmTransfer(tokenInfo: _ChainAsset, originChainInfo: _ChainInfo, destinationChainInfo: _ChainInfo, sender: string, recipientAddress: string, value: string, evmApi: _EvmApi): Promise<TransactionConfig>;
+export declare function getSnowBridgeEvmTransfer(tokenInfo: _ChainAsset, originChainInfo: _ChainInfo, destinationChainInfo: _ChainInfo, sender: string, recipientAddress: string, value: string, evmApi: _EvmApi, _feeInfo: FeeInfo, feeCustom?: FeeCustom, feeOption?: FeeOption): Promise<TransactionConfig>;

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

@@ -4,7 +4,7 @@
 import { getWeb3Contract } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
 import { _SNOWBRIDGE_GATEWAY_ABI, getSnowBridgeGatewayContract } from '@subwallet/extension-base/koni/api/contract-handler/utils';
 import { _getContractAddressOfToken, _getSubstrateParaId, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
-import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
+import { combineEthFee } from '@subwallet/extension-base/utils';
 import { u8aToHex } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
 async function getSendFeeToken(contract, tokenContract, destChainParaId, destinationFee) {
@@ -14,8 +14,7 @@ async function getSendFeeToken(contract, tokenContract, destChainParaId, destina
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
   return await quoteSendTokenFee.call();
 }
-export async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationChainInfo, sender, recipientAddress, value, evmApi) {
-  var _priority$maxFeePerGa, _priority$maxPriority;
+export async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationChainInfo, sender, recipientAddress, value, evmApi, _feeInfo, feeCustom, feeOption) {
   const snowBridgeContractAddress = getSnowBridgeGatewayContract(originChainInfo.slug);
   const snowBridgeContract = getWeb3Contract(snowBridgeContractAddress, evmApi, _SNOWBRIDGE_GATEWAY_ABI);
   const tokenContract = _getContractAddressOfToken(tokenInfo);
@@ -30,15 +29,16 @@ export async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, desti
   const transferCall = snowBridgeContract.methods.sendToken(tokenContract, destinationChainParaId, recipient, destinationFee, value);
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const transferEncodedCall = transferCall.encodeABI();
-  const [priority, sendTokenFee] = await Promise.all([calculateGasFeeParams(evmApi, evmApi.chainSlug), getSendFeeToken(snowBridgeContract, tokenContract, destinationChainParaId, destinationFee)]);
+  const feeInfo = _feeInfo;
+  const _feeCustom = feeCustom;
+  const feeCombine = combineEthFee(feeInfo, feeOption, _feeCustom);
+  const sendTokenFee = await getSendFeeToken(snowBridgeContract, tokenContract, destinationChainParaId, destinationFee);
   const transactionConfig = {
     from: sender,
     to: snowBridgeContractAddress,
     value: sendTokenFee,
     data: transferEncodedCall,
-    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
   };
   let gasLimit;
   try {

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

@@ -3,8 +3,8 @@
 
 export const STABLE_XCM_VERSION = 3;
 export function isUseTeleportProtocol(originChainInfo, destChainInfo, tokenSlug) {
-  const relayChainToSystemChain = ['polkadot'].includes(originChainInfo.slug) && ['statemint'].includes(destChainInfo.slug) || ['kusama'].includes(originChainInfo.slug) && ['statemine'].includes(destChainInfo.slug) || ['rococo'].includes(originChainInfo.slug) && ['rococo_assethub'].includes(destChainInfo.slug);
-  const systemChainToRelayChain = ['polkadot'].includes(destChainInfo.slug) && ['statemint'].includes(originChainInfo.slug) || ['kusama'].includes(destChainInfo.slug) && ['statemine'].includes(originChainInfo.slug) || ['rococo'].includes(destChainInfo.slug) && ['rococo_assethub'].includes(originChainInfo.slug);
+  const relayChainToSystemChain = ['polkadot'].includes(originChainInfo.slug) && ['statemint'].includes(destChainInfo.slug) || ['kusama'].includes(originChainInfo.slug) && ['statemine'].includes(destChainInfo.slug) || ['rococo'].includes(originChainInfo.slug) && ['rococo_assethub'].includes(destChainInfo.slug) || ['westend'].includes(originChainInfo.slug) && ['westend_assethub'].includes(destChainInfo.slug);
+  const systemChainToRelayChain = ['polkadot'].includes(destChainInfo.slug) && ['statemint'].includes(originChainInfo.slug) || ['kusama'].includes(destChainInfo.slug) && ['statemine'].includes(originChainInfo.slug) || ['rococo'].includes(destChainInfo.slug) && ['rococo_assethub'].includes(originChainInfo.slug) || ['westend'].includes(destChainInfo.slug) && ['westend_assethub'].includes(originChainInfo.slug);
   const isXcmMythos = originChainInfo.slug === 'mythos' && destChainInfo.slug === 'statemint' && tokenSlug === 'mythos-NATIVE-MYTH' || originChainInfo.slug === 'statemint' && destChainInfo.slug === 'mythos' && tokenSlug === 'statemint-LOCAL-MYTH';
   return relayChainToSystemChain || systemChainToRelayChain || isXcmMythos;
 }

package/services/chain-service/constants.js

@@ -30,7 +30,7 @@ export const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'hydradx_rococo', 'pendulum', 'amplitude', 'continuum_network'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain', 'westend_assethub'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],
@@ -266,9 +266,9 @@ export const _DEFAULT_MANTA_ZK_CHAIN = 'calamari';
 // XCM------------------------------------------------------------------------------------------------------------------
 
 export const _XCM_CHAIN_GROUP = {
-  polkadotXcm: ['statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos'],
+  polkadotXcm: ['statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos', 'westend_assethub'],
   polkadotXcmSpecialCases: ['astar', 'shiden'],
-  xcmPallet: ['polkadot', 'kusama', 'rococo']
+  xcmPallet: ['polkadot', 'kusama', 'rococo', 'westend']
   // default is xTokens pallet
 };
 

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
-import { AssetSetting, MetadataItem, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
+import { AssetSetting, MetadataItem, TokenPriorityDetails, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
 import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-service/handler/manta/MantaPrivateHandler';
 import { _ChainApiStatus, _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
 import { EventService } from '@subwallet/extension-base/services/event-service';
@@ -30,15 +30,18 @@ export declare class ChainService {
     private assetLogoMapSubject;
     private chainLogoMapSubject;
     private ledgerGenericAllowChainsSubject;
+    private priorityTokensSubject;
     private store;
     private assetSettingSubject;
     private logger;
     constructor(dbService: DatabaseService, eventService: EventService);
     get value(): {
         readonly ledgerGenericAllowChains: string[];
+        readonly priorityTokens: TokenPriorityDetails;
     };
     get observable(): {
         readonly ledgerGenericAllowChains: import("rxjs").Observable<string[]>;
+        readonly priorityTokens: import("rxjs").Observable<TokenPriorityDetails>;
     };
     subscribeSwapRefMap(): Subject<Record<string, _AssetRef>>;
     get xcmRefMap(): Record<string, _AssetRef>;
@@ -105,6 +108,7 @@ export declare class ChainService {
     handleLatestChainData(latestChainInfo: _ChainInfo[]): void;
     autoEnableTokens(): Promise<void>;
     handleLatestLedgerGenericAllowChains(latestledgerGenericAllowChains: string[]): void;
+    handleLatestPriorityTokens(latestPriorityTokens: TokenPriorityDetails): void;
     handleLatestData(): void;
     private initApis;
     initSingleApi(slug: string): Promise<boolean>;
@@ -118,6 +122,7 @@ export declare class ChainService {
     private fetchLatestChainData;
     private fetchLatestPriceIdsData;
     private fetchLatestLedgerGenericAllowChains;
+    private fetchLatestPriorityTokens;
     private initChains;
     private initAssetRegistry;
     private updateChainStateMapSubscription;

package/services/chain-service/index.js

@@ -47,6 +47,7 @@ export class ChainService {
   assetLogoMapSubject = new BehaviorSubject(AssetLogoMap);
   chainLogoMapSubject = new BehaviorSubject(ChainLogoMap);
   ledgerGenericAllowChainsSubject = new BehaviorSubject([]);
+  priorityTokensSubject = new BehaviorSubject({});
 
   // Todo: Update to new store indexed DB
   store = new AssetSettingStore();
@@ -70,17 +71,25 @@ export class ChainService {
   }
   get value() {
     const ledgerGenericAllowChains = this.ledgerGenericAllowChainsSubject;
+    const priorityTokens = this.priorityTokensSubject;
     return {
       get ledgerGenericAllowChains() {
         return ledgerGenericAllowChains.value;
+      },
+      get priorityTokens() {
+        return priorityTokens.value;
       }
     };
   }
   get observable() {
     const ledgerGenericAllowChains = this.ledgerGenericAllowChainsSubject;
+    const priorityTokens = this.priorityTokensSubject;
     return {
       get ledgerGenericAllowChains() {
         return ledgerGenericAllowChains.asObservable();
+      },
+      get priorityTokens() {
+        return priorityTokens.asObservable();
       }
     };
   }
@@ -581,6 +590,10 @@ export class ChainService {
     this.eventService.emit('ledger.ready', true);
     this.logger.log('Finished updating latest ledger generic allow chains');
   }
+  handleLatestPriorityTokens(latestPriorityTokens) {
+    this.priorityTokensSubject.next(latestPriorityTokens);
+    this.logger.log('Finished updating latest popular tokens');
+  }
   handleLatestData() {
     this.fetchLatestChainData().then(latestChainInfo => {
       this.lockChainInfoMap = true; // do not need to check current lockChainInfoMap because all remains action is fast enough and don't affect this feature.
@@ -598,6 +611,9 @@ export class ChainService {
     this.fetchLatestLedgerGenericAllowChains().then(latestledgerGenericAllowChains => {
       this.handleLatestLedgerGenericAllowChains(latestledgerGenericAllowChains);
     }).catch(console.error);
+    this.fetchLatestPriorityTokens().then(latestPriorityTokens => {
+      this.handleLatestPriorityTokens(latestPriorityTokens);
+    }).catch(console.error);
   }
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
@@ -859,6 +875,12 @@ export class ChainService {
   async fetchLatestLedgerGenericAllowChains() {
     return (await fetchStaticData('chains/ledger-generic-allow-chains')) || [];
   }
+  async fetchLatestPriorityTokens() {
+    return (await fetchStaticData('chain-assets/priority-tokens')) || {
+      tokenGroup: {},
+      token: {}
+    };
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
     const defaultChainInfoMap = filterChainInfoMap(ChainInfoMap, ignoredList);