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

package/cjs/koni/background/handlers/State.js

@@ -926,14 +926,7 @@ class KoniState {
         }
       })();
       promiseList.push(Promise.race([promise, timeoutPromise]).then(result => {
-        var _result$gasPrice, _result$maxFeePerGas, _result$maxPriorityFe, _result$baseGasFee;
-        return [slug, result ? {
-          ...result,
-          gasPrice: (_result$gasPrice = result.gasPrice) === null || _result$gasPrice === void 0 ? void 0 : _result$gasPrice.toString(),
-          maxFeePerGas: (_result$maxFeePerGas = result.maxFeePerGas) === null || _result$maxFeePerGas === void 0 ? void 0 : _result$maxFeePerGas.toString(),
-          maxPriorityFeePerGas: (_result$maxPriorityFe = result.maxPriorityFeePerGas) === null || _result$maxPriorityFe === void 0 ? void 0 : _result$maxPriorityFe.toString(),
-          baseGasFee: (_result$baseGasFee = result.baseGasFee) === null || _result$baseGasFee === void 0 ? void 0 : _result$baseGasFee.toString()
-        } : null];
+        return [slug, result || null];
       }));
     });
     return Object.fromEntries(await Promise.all(promiseList));

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.3.17-0'
+  version: '1.3.18-1'
 };
 exports.packageInfo = packageInfo;

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

@@ -214,7 +214,7 @@ const subscribeForeignAssetBalance = async _ref2 => {
   const unsubList = await Promise.all(Object.values(tokenMap).map(tokenInfo => {
     try {
       if ((0, _utils2._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/cjs/services/balance-service/index.js

@@ -289,6 +289,19 @@ 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/cjs/services/balance-service/transfer/smart-contract.js

@@ -13,44 +13,63 @@ var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils"
 var _wasm = require("@subwallet/extension-base/koni/api/contract-handler/wasm");
 var _utils2 = require("@subwallet/extension-base/koni/api/contract-handler/wasm/utils");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
-var _utils3 = require("@subwallet/extension-base/services/fee-service/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, web3Api) {
-  var _priority$maxFeePerGa, _priority$maxPriority;
-  const networkKey = chainInfo.slug;
-  const priority = await (0, _utils3.calculateGasFeeParams)(web3Api, networkKey);
+async function getEVMTransactionObject(_ref) {
+  let {
+    chain,
+    evmApi,
+    feeCustom: _feeCustom,
+    feeInfo: _feeInfo,
+    feeOption,
+    from,
+    to,
+    transferAll,
+    value
+  } = _ref;
+  const feeCustom = _feeCustom;
+  const feeInfo = _feeInfo;
+  const feeCombine = (0, _utils3.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 _bignumber.default(feeCombine.maxFeePerGas);
     estimateFee = maxFee.multipliedBy(gasLimit);
   } else {
-    estimateFee = new _bignumber.default(priority.gasPrice).multipliedBy(gasLimit);
+    estimateFee = new _bignumber.default(feeCombine.gasPrice || '0').multipliedBy(gasLimit);
   }
   transactionObject.value = transferAll ? new _bignumber.default(value).minus(estimateFee).toString() : value;
-  if (_constants.EVM_REFORMAT_DECIMALS.acala.includes(networkKey)) {
+  if (_constants.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()];
 }
-async function getERC20TransactionObject(assetAddress, chainInfo, from, to, value, transferAll, evmApi) {
-  var _priority$maxFeePerGa2, _priority$maxPriority2;
-  const networkKey = chainInfo.slug;
+async function getERC20TransactionObject(_ref2) {
+  let {
+    assetAddress,
+    evmApi,
+    feeCustom: _feeCustom,
+    feeInfo: _feeInfo,
+    feeOption,
+    from,
+    to,
+    transferAll,
+    value
+  } = _ref2;
   const erc20Contract = (0, _web.getERC20Contract)(assetAddress, evmApi);
+  const feeCustom = _feeCustom;
   let freeAmount = new _bignumber.default(0);
   let transferValue = value;
   if (transferAll) {
@@ -64,22 +83,19 @@ async function getERC20TransactionObject(assetAddress, chainInfo, from, to, valu
     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');
-  }), (0, _utils3.calculateGasFeeParams)(evmApi, networkKey)]);
+  });
+  const feeInfo = _feeInfo;
+  const feeCombine = (0, _utils3.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);
@@ -87,18 +103,16 @@ async function getERC20TransactionObject(assetAddress, chainInfo, from, to, valu
   }
   return [transactionObject, transferValue];
 }
-async function getERC721Transaction(web3Api, chain, contractAddress, senderAddress, recipientAddress, tokenId) {
-  var _priority$maxFeePerGa3, _priority$maxPriority3;
+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(_utils._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
-    }), (0, _utils3.calculateGasFeeParams)(web3Api, chain)]);
+    })]);
   } catch (e) {
     const error = e;
     if (error.message.includes('transfer to non ERC721Receiver implementer')) {
@@ -106,16 +120,16 @@ async function getERC721Transaction(web3Api, chain, contractAddress, senderAddre
     }
     throw error;
   }
+  const feeInfo = _feeInfo;
+  const feeCombine = (0, _utils3.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/cjs/services/balance-service/transfer/token.js

@@ -133,11 +133,12 @@ const getTransferMockTxFee = async (address, chainInfo, tokenInfo, api) => {
       };
       const gasLimit = await web3.api.eth.estimateGas(transaction);
       const priority = await (0, _utils4.calculateGasFeeParams)(web3, chainInfo.slug);
-      if (priority.baseGasFee) {
-        const maxFee = priority.maxFeePerGas;
-        estimatedFee = maxFee.multipliedBy(gasLimit);
+      const combinedFee = (0, _utils5.combineEthFee)(priority);
+      if (combinedFee.maxFeePerGas) {
+        const maxFee = combinedFee.maxFeePerGas;
+        estimatedFee = (0, _bignumber.default)(maxFee).multipliedBy(gasLimit);
       } else {
-        estimatedFee = new _bignumber.default(priority.gasPrice).multipliedBy(gasLimit);
+        estimatedFee = new _bignumber.default(combinedFee.gasPrice).multipliedBy(gasLimit);
       }
     } else if ((0, _utils3._isChainTonCompatible)(chainInfo) && (0, _utils3._isTokenTransferredByTon)(tokenInfo)) {
       const mockWalletContract = _uiKeyring.keyring.getPair(address).ton.currentContract;

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

@@ -12,8 +12,8 @@ exports.isAvailChainBridge = isAvailChainBridge;
 var _chainList = require("@subwallet/chain-list");
 var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
 var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
-var _utils2 = require("@subwallet/extension-base/services/fee-service/utils");
-var _utils3 = require("@subwallet/extension-base/services/inapp-notification-service/utils");
+var _utils2 = require("@subwallet/extension-base/services/inapp-notification-service/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -26,8 +26,7 @@ const AvailBridgeConfig = {
   AVAIL_DOMAIN: 1
 };
 exports.AvailBridgeConfig = AvailBridgeConfig;
-async function getAvailBridgeTxFromEth(originChainInfo, sender, recipient, value, evmApi) {
-  var _priority$maxFeePerGa, _priority$maxPriority;
+async function getAvailBridgeTxFromEth(originChainInfo, sender, recipient, value, evmApi, fee, feeCustom, feeOption) {
   const availBridgeContractAddress = (0, _utils.getAvailBridgeGatewayContract)(originChainInfo.slug);
   const ABI = getAvailBridgeAbi(originChainInfo.slug);
   const availBridgeContract = (0, _web.getWeb3Contract)(availBridgeContractAddress, evmApi, ABI);
@@ -35,19 +34,19 @@ async function getAvailBridgeTxFromEth(originChainInfo, sender, recipient, value
   // 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 (0, _utils2.calculateGasFeeParams)(evmApi, evmApi.chainSlug);
   const gasLimit = await sendAvail.estimateGas({
     from: sender
   });
+  const _feeCustom = feeCustom;
+  const feeInfo = fee;
+  const feeCombine = (0, _utils3.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
   };
 }
 async function getAvailBridgeExtrinsicFromAvail(recipient, sendingValue, substrateApi) {
@@ -118,12 +117,11 @@ async function getClaimProofOnEthereum(chainSlug, blockHash, transactionIndex) {
 function getAvailBridgeApi(chainSlug) {
   if (chainSlug === 'avail_mainnet' || chainSlug === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM) {
     // todo: add COMMON_CHAIN_SLUGS for AVAIL, AVAIL TURING
-    return _utils3.AVAIL_BRIDGE_API.AVAIL_MAINNET;
+    return _utils2.AVAIL_BRIDGE_API.AVAIL_MAINNET;
   }
-  return _utils3.AVAIL_BRIDGE_API.AVAIL_TESTNET;
+  return _utils2.AVAIL_BRIDGE_API.AVAIL_TESTNET;
 }
-async function getClaimTxOnEthereum(chainSlug, notification, evmApi) {
-  var _priority$maxFeePerGa2, _priority$maxPriority2;
+async function getClaimTxOnEthereum(chainSlug, notification, evmApi, feeInfo) {
   const availBridgeContractAddress = (0, _utils.getAvailBridgeGatewayContract)(chainSlug);
   const ABI = getAvailBridgeAbi(chainSlug);
   const availBridgeContract = (0, _web.getWeb3Contract)(availBridgeContractAddress, evmApi, ABI);
@@ -159,16 +157,14 @@ async function getClaimTxOnEthereum(chainSlug, notification, evmApi) {
   const gasLimit = await transfer.estimateGas({
     from: metadata.receiverAddress
   });
-  const priority = await (0, _utils2.calculateGasFeeParams)(evmApi, evmApi.chainSlug);
+  const feeCombine = (0, _utils3.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/cjs/services/balance-service/transfer/xcm/index.js

@@ -1,10 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getXcmMockTxFee = exports.createXcmExtrinsic = exports.createSnowBridgeExtrinsic = exports.createPolygonBridgeExtrinsic = exports.createAvailBridgeTxFromEth = exports.createAvailBridgeExtrinsicFromAvail = void 0;
+exports.createXcmExtrinsic = exports.createSnowBridgeExtrinsic = exports.createPolygonBridgeExtrinsic = exports.createAvailBridgeTxFromEth = exports.createAvailBridgeExtrinsicFromAvail = void 0;
 var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
 var _availBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge");
 var _polkadotXcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm");
@@ -14,26 +13,25 @@ var _xcmPallet = require("@subwallet/extension-base/services/balance-service/tra
 var _xTokens = require("@subwallet/extension-base/services/balance-service/transfer/xcm/xTokens");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _bignumber = _interopRequireDefault(require("bignumber.js"));
-var _util = require("@polkadot/util");
-var _utilCrypto = require("@polkadot/util-crypto");
 var _posBridge = require("./posBridge");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+// SnowBridge
 const createSnowBridgeExtrinsic = async _ref => {
   let {
-    chainInfoMap,
-    destinationTokenInfo,
+    destinationChain,
     evmApi,
+    feeCustom,
+    feeInfo,
+    feeOption,
+    originChain,
     originTokenInfo,
     recipient,
     sender,
     sendingValue
   } = _ref;
-  const originChainInfo = chainInfoMap[originTokenInfo.originChain];
-  const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
-  if (!(0, _xcmParser._isSnowBridgeXcm)(originChainInfo, destinationChainInfo)) {
+  if (!(0, _xcmParser._isSnowBridgeXcm)(originChain, destinationChain)) {
     throw new Error('This is not a valid SnowBridge transfer');
   }
   if (!evmApi) {
@@ -42,52 +40,51 @@ const createSnowBridgeExtrinsic = async _ref => {
   if (!sender) {
     throw Error('Sender is required');
   }
-  return (0, _snowBridge.getSnowBridgeEvmTransfer)(originTokenInfo, originChainInfo, destinationChainInfo, sender, recipient, sendingValue, evmApi);
+  return (0, _snowBridge.getSnowBridgeEvmTransfer)(originTokenInfo, originChain, destinationChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };
 exports.createSnowBridgeExtrinsic = createSnowBridgeExtrinsic;
 const createXcmExtrinsic = async _ref2 => {
   let {
-    chainInfoMap,
-    destinationTokenInfo,
+    destinationChain,
+    originChain,
     originTokenInfo,
     recipient,
     sendingValue,
     substrateApi
   } = _ref2;
-  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 = _constants._XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChainInfo.slug) && (0, _utils._isNativeToken)(originTokenInfo);
+  const polkadotXcmSpecialCases = _constants._XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChain.slug) && (0, _utils._isNativeToken)(originTokenInfo);
   if (_constants._XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
-    return (0, _polkadotXcm.getExtrinsicByPolkadotXcmPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+    return (0, _polkadotXcm.getExtrinsicByPolkadotXcmPallet)(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
   }
   if (_constants._XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
-    return (0, _xcmPallet.getExtrinsicByXcmPalletPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+    return (0, _xcmPallet.getExtrinsicByXcmPalletPallet)(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
   }
-  return (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+  return (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
 };
 exports.createXcmExtrinsic = createXcmExtrinsic;
 const createAvailBridgeTxFromEth = _ref3 => {
   let {
-    chainInfoMap,
     evmApi,
-    originTokenInfo,
+    feeCustom,
+    feeInfo,
+    feeOption,
+    originChain,
     recipient,
     sender,
     sendingValue
   } = _ref3;
-  const originChainInfo = chainInfoMap[originTokenInfo.originChain];
   if (!evmApi) {
     throw Error('Evm API is not available');
   }
   if (!sender) {
     throw Error('Sender is required');
   }
-  return (0, _availBridge.getAvailBridgeTxFromEth)(originChainInfo, sender, recipient, sendingValue, evmApi);
+  return (0, _availBridge.getAvailBridgeTxFromEth)(originChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };
 exports.createAvailBridgeTxFromEth = createAvailBridgeTxFromEth;
 const createAvailBridgeExtrinsicFromAvail = async _ref4 => {
@@ -104,18 +101,19 @@ const createAvailBridgeExtrinsicFromAvail = async _ref4 => {
 exports.createAvailBridgeExtrinsicFromAvail = createAvailBridgeExtrinsicFromAvail;
 const createPolygonBridgeExtrinsic = async _ref5 => {
   let {
-    chainInfoMap,
-    destinationTokenInfo,
+    destinationChain,
     evmApi,
+    feeCustom,
+    feeInfo,
+    feeOption,
+    originChain,
     originTokenInfo,
     recipient,
     sender,
     sendingValue
   } = _ref5;
-  const originChainInfo = chainInfoMap[originTokenInfo.originChain];
-  const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
-  const isPolygonBridgeXcm = (0, _xcmParser._isPolygonBridgeXcm)(originChainInfo, destinationChainInfo);
-  const isValidBridge = isPolygonBridgeXcm || (0, _xcmParser._isPosBridgeXcm)(originChainInfo, destinationChainInfo);
+  const isPolygonBridgeXcm = (0, _xcmParser._isPolygonBridgeXcm)(originChain, destinationChain);
+  const isValidBridge = isPolygonBridgeXcm || (0, _xcmParser._isPosBridgeXcm)(originChain, destinationChain);
   if (!isValidBridge) {
     throw new Error('This is not a valid PolygonBridge transfer');
   }
@@ -125,37 +123,8 @@ const createPolygonBridgeExtrinsic = async _ref5 => {
   if (!sender) {
     throw Error('Sender is required');
   }
-  const sourceChain = originChainInfo.slug;
+  const sourceChain = originChain.slug;
   const createExtrinsic = isPolygonBridgeXcm ? sourceChain === 'polygonzkEvm_cardona' || sourceChain === 'polygonZkEvm' ? _polygonBridge._createPolygonBridgeL2toL1Extrinsic : _polygonBridge._createPolygonBridgeL1toL2Extrinsic : sourceChain === 'polygon_amoy' || sourceChain === 'polygon' ? _posBridge._createPosBridgeL2toL1Extrinsic : _posBridge._createPosBridgeL1toL2Extrinsic;
-  return createExtrinsic(originTokenInfo, originChainInfo, sender, recipient, sendingValue, evmApi);
-};
-exports.createPolygonBridgeExtrinsic = createPolygonBridgeExtrinsic;
-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 = (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(fakeAddress)); // todo: move this
-
-    // mock receiving account from sender
-    const sender = (0, _utils._isChainEvmCompatible)(originChainInfo) ? evmAddress : substrateAddress;
-    const recipient = (0, _utils._isChainEvmCompatible)(destChainInfo) ? evmAddress : substrateAddress;
-    const mockTx = await createXcmExtrinsic({
-      chainInfoMap,
-      destinationTokenInfo,
-      originTokenInfo,
-      sender,
-      recipient,
-      sendingValue: '1000000000000000000',
-      substrateApi
-    });
-    const paymentInfo = await mockTx.paymentInfo(fakeAddress);
-    return new _bignumber.default((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 _bignumber.default(0);
-  }
+  return createExtrinsic(originTokenInfo, originChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };
-exports.getXcmMockTxFee = getXcmMockTxFee;
+exports.createPolygonBridgeExtrinsic = createPolygonBridgeExtrinsic;

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

@@ -13,7 +13,7 @@ var _chainList = require("@subwallet/chain-list");
 var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
 var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
-var _utils3 = require("@subwallet/extension-base/services/fee-service/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -27,8 +27,7 @@ const POLYGON_GAS_INDEXER = {
   TESTNET: 'https://gasstation.polygon.technology/zkevm/cardona'
 };
 exports.POLYGON_GAS_INDEXER = POLYGON_GAS_INDEXER;
-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 = (0, _utils.getPolygonBridgeContract)(originChainInfo.slug);
   const polygonBridgeContract = (0, _web.getWeb3Contract)(polygonBridgeContractAddress, evmApi, _utils._POLYGON_BRIDGE_ABI);
   const tokenContract = (0, _utils2._getContractAddressOfToken)(tokenInfo) || '0x0000000000000000000000000000000000000000'; // FOR Ethereum: use null address
@@ -40,28 +39,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 (0, _utils3.calculateGasFeeParams)(evmApi, evmApi.chainSlug);
+  const feeInfo = _feeInfo;
+  const feeCombine = (0, _utils3.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;
 }
-async function _createPolygonBridgeL1toL2Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi) {
-  return createPolygonBridgeTransaction(tokenInfo, originChainInfo, sender, recipientAddress, value, 1, evmApi);
+async function _createPolygonBridgeL1toL2Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi, feeInfo, feeCustom, feeOption) {
+  return createPolygonBridgeTransaction(tokenInfo, originChainInfo, sender, recipientAddress, value, 1, evmApi, feeInfo, feeCustom, feeOption);
 }
-async function _createPolygonBridgeL2toL1Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi) {
-  return createPolygonBridgeTransaction(tokenInfo, originChainInfo, sender, recipientAddress, value, 0, evmApi);
+async function _createPolygonBridgeL2toL1Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi, feeInfo, feeCustom, feeOption) {
+  return createPolygonBridgeTransaction(tokenInfo, originChainInfo, sender, recipientAddress, value, 0, evmApi, feeInfo, feeCustom, feeOption);
 }
-async function getClaimPolygonBridge(chainSlug, notification, evmApi) {
-  var _metadata$sourceNetwo, _metadata$counter, _priority$maxFeePerGa2, _priority$maxPriority2;
+async function getClaimPolygonBridge(chainSlug, notification, evmApi, feeInfo) {
+  var _metadata$sourceNetwo, _metadata$counter;
   const polygonBridgeContractAddress = (0, _utils.getPolygonBridgeContract)(chainSlug);
   const polygonBridgeContract = (0, _web.getWeb3Contract)(polygonBridgeContractAddress, evmApi, _utils._POLYGON_BRIDGE_ABI);
   const metadata = notification.metadata;
@@ -73,15 +71,13 @@ 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 (0, _utils3.calculateGasFeeParams)(evmApi, evmApi.chainSlug);
+  const feeCombine = (0, _utils3.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();