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

package/cjs/services/fee-service/utils/index.js

@@ -4,9 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.recalculateGasPrice = exports.parseInfuraFee = exports.fetchSubWalletFeeData = exports.fetchOnlineFeeData = exports.fetchInfuraFeeData = exports.calculateGasFeeParams = void 0;
+exports.recalculateGasPrice = exports.parseInfuraFee = exports.getEIP1559GasFee = exports.fetchSubWalletFeeData = exports.fetchOnlineFeeData = exports.fetchInfuraFeeData = exports.calculateToAmountByReservePool = exports.calculateGasFeeParams = exports.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE = void 0;
 var _constants = require("@subwallet/extension-base/constants");
-var _utils = require("@subwallet/extension-base/utils");
+var _utils = require("@subwallet/extension-base/services/swap-service/handler/asset-hub/utils");
+var _utils2 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _polygonBridge = require("../../balance-service/transfer/xcm/polygonBridge");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -15,60 +16,79 @@ var _polygonBridge = require("../../balance-service/transfer/xcm/polygonBridge")
 const INFURA_API_KEY = process.env.INFURA_API_KEY || '';
 const INFURA_API_KEY_SECRET = process.env.INFURA_API_KEY_SECRET || '';
 const INFURA_AUTH = 'Basic ' + Buffer.from(INFURA_API_KEY + ':' + INFURA_API_KEY_SECRET).toString('base64');
-const parseInfuraFee = info => {
-  const base = new _bignumber.default(info.estimatedBaseFee).multipliedBy(_utils.BN_WEI);
-  const low = new _bignumber.default(info.low.suggestedMaxPriorityFeePerGas).multipliedBy(_utils.BN_WEI);
-  const busyNetwork = base.gt(_utils.BN_ZERO) ? low.dividedBy(base).gte(0.3) : false;
-  const data = !busyNetwork ? info.low : info.medium;
+const FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE = 105; // percentage
+exports.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE = FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE;
+const parseInfuraFee = (info, threshold) => {
+  const base = new _bignumber.default(info.estimatedBaseFee).multipliedBy(_utils2.BN_WEI);
+  const thresholdBN = new _bignumber.default(threshold.busyThreshold).multipliedBy(_utils2.BN_WEI);
+  const busyNetwork = thresholdBN.gte(_utils2.BN_ZERO) ? base.gt(thresholdBN) : false;
   return {
     busyNetwork,
     gasPrice: undefined,
-    baseGasFee: base,
-    maxFeePerGas: new _bignumber.default(data.suggestedMaxFeePerGas).multipliedBy(_utils.BN_WEI).integerValue(_bignumber.default.ROUND_UP),
-    maxPriorityFeePerGas: new _bignumber.default(data.suggestedMaxPriorityFeePerGas).multipliedBy(_utils.BN_WEI).integerValue(_bignumber.default.ROUND_UP)
+    baseGasFee: base.toFixed(0),
+    type: 'evm',
+    options: {
+      slow: {
+        maxFeePerGas: new _bignumber.default(info.low.suggestedMaxFeePerGas).multipliedBy(_utils2.BN_WEI).integerValue(_bignumber.default.ROUND_UP).toFixed(0),
+        maxPriorityFeePerGas: new _bignumber.default(info.low.suggestedMaxPriorityFeePerGas).multipliedBy(_utils2.BN_WEI).integerValue(_bignumber.default.ROUND_UP).toFixed(0),
+        maxWaitTimeEstimate: info.low.maxWaitTimeEstimate || 0,
+        minWaitTimeEstimate: info.low.minWaitTimeEstimate || 0
+      },
+      average: {
+        maxFeePerGas: new _bignumber.default(info.medium.suggestedMaxFeePerGas).multipliedBy(_utils2.BN_WEI).integerValue(_bignumber.default.ROUND_UP).toFixed(0),
+        maxPriorityFeePerGas: new _bignumber.default(info.medium.suggestedMaxPriorityFeePerGas).multipliedBy(_utils2.BN_WEI).integerValue(_bignumber.default.ROUND_UP).toFixed(0),
+        maxWaitTimeEstimate: info.medium.maxWaitTimeEstimate || 0,
+        minWaitTimeEstimate: info.medium.minWaitTimeEstimate || 0
+      },
+      fast: {
+        maxFeePerGas: new _bignumber.default(info.high.suggestedMaxFeePerGas).multipliedBy(_utils2.BN_WEI).integerValue(_bignumber.default.ROUND_UP).toFixed(0),
+        maxPriorityFeePerGas: new _bignumber.default(info.high.suggestedMaxPriorityFeePerGas).multipliedBy(_utils2.BN_WEI).integerValue(_bignumber.default.ROUND_UP).toFixed(0),
+        maxWaitTimeEstimate: info.high.maxWaitTimeEstimate || 0,
+        minWaitTimeEstimate: info.high.minWaitTimeEstimate || 0
+      },
+      default: busyNetwork ? 'average' : 'slow'
+    }
   };
 };
 exports.parseInfuraFee = parseInfuraFee;
 const fetchInfuraFeeData = async (chainId, infuraAuth) => {
-  return await new Promise(resolve => {
-    const baseUrl = 'https://gas.api.infura.io/networks/{{chainId}}/suggestedGasFees';
-    const url = baseUrl.replaceAll('{{chainId}}', chainId.toString());
-    fetch(url, {
-      method: 'GET',
-      headers: {
-        Authorization: infuraAuth || INFURA_AUTH
-      }
-    }).then(rs => {
-      return rs.json();
-    }).then(info => {
-      resolve(parseInfuraFee(info));
-    }).catch(e => {
-      console.warn(e);
-      resolve(null);
-    });
-  });
+  const baseUrl = 'https://gas.api.infura.io/networks/{{chainId}}/suggestedGasFees';
+  const baseThressholdUrl = 'https://gas.api.infura.io/networks/{{chainId}}/busyThreshold';
+  // const baseFeeHistoryUrl = 'https://gas.api.infura.io/networks/{{chainId}}/baseFeeHistory';
+  // const baseFeePercentileUrl = 'https://gas.api.infura.io/networks/{{chainId}}/baseFeePercentile';
+  const feeUrl = baseUrl.replaceAll('{{chainId}}', chainId.toString());
+  const thressholdUrl = baseThressholdUrl.replaceAll('{{chainId}}', chainId.toString());
+  try {
+    const [feeResp, thressholdResp] = await Promise.all([feeUrl, thressholdUrl].map(url => {
+      return fetch(url, {
+        method: 'GET',
+        headers: {
+          Authorization: INFURA_AUTH
+        }
+      });
+    }));
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const [feeInfo, thresholdInfo] = await Promise.all([feeResp.json(), thressholdResp.json()]);
+    return parseInfuraFee(feeInfo, thresholdInfo);
+  } catch (e) {
+    console.warn(e);
+    return null;
+  }
 };
 exports.fetchInfuraFeeData = fetchInfuraFeeData;
 const fetchSubWalletFeeData = async (chainId, networkKey) => {
   return await new Promise(resolve => {
     const baseUrl = 'https://api-cache.subwallet.app/sw-evm-gas/{{chain}}';
     const url = baseUrl.replaceAll('{{chain}}', networkKey);
+
+    // TODO: Update the logo to follow the new estimateFee format or move the logic to the backend
     fetch(url, {
       method: 'GET'
     }).then(rs => {
       return rs.json();
     }).then(info => {
-      if (info.gasPrice !== undefined) {
-        resolve(info);
-      } else {
-        resolve({
-          busyNetwork: info.busyNetwork,
-          gasPrice: info.gasPrice,
-          baseGasFee: new _bignumber.default(info.baseGasFee),
-          maxFeePerGas: new _bignumber.default(info.maxFeePerGas),
-          maxPriorityFeePerGas: new _bignumber.default(info.maxPriorityFeePerGas)
-        });
-      }
+      resolve(info);
     }).catch(e => {
       console.warn(e);
       resolve(null);
@@ -94,9 +114,20 @@ const recalculateGasPrice = (_price, chain) => {
   return needMulti ? new _bignumber.default(_price).multipliedBy(_constants.GAS_PRICE_RATIO).toFixed(0) : _price;
 };
 exports.recalculateGasPrice = recalculateGasPrice;
+const getEIP1559GasFee = (baseFee, maxPriorityFee, blockNumber, blockTime) => {
+  // https://www.blocknative.com/blog/eip-1559-fees
+  const maxFee = baseFee.multipliedBy(1.2).plus(maxPriorityFee);
+  return {
+    maxFeePerGas: maxFee.toFixed(0),
+    maxPriorityFeePerGas: maxPriorityFee.toFixed(0),
+    minWaitTimeEstimate: blockTime * (blockNumber - 2),
+    maxWaitTimeEstimate: blockTime * blockNumber
+  };
+};
+exports.getEIP1559GasFee = getEIP1559GasFee;
 const calculateGasFeeParams = async function (web3, networkKey) {
   let useOnline = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  let useInfura = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  let useInfura = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   if (useOnline) {
     try {
       const chainId = await web3.api.eth.getChainId();
@@ -113,19 +144,19 @@ const calculateGasFeeParams = async function (web3, networkKey) {
       const gasResponse = await fetch(`${gasDomain}`).then(res => res.json());
       const gasPriceInWei = gasResponse.standard * 1e9 + 200000;
       return {
+        type: 'evm',
         gasPrice: gasPriceInWei.toString(),
-        maxFeePerGas: undefined,
-        maxPriorityFeePerGas: undefined,
         baseGasFee: undefined,
-        busyNetwork: false
+        busyNetwork: false,
+        options: undefined
       };
     }
     const numBlock = 20;
-    const rewardPercent = [];
-    for (let i = 0; i <= 100; i = i + 5) {
-      rewardPercent.push(i);
-    }
+    const rewardPercent = [25, 50, 75];
     const history = await web3.api.eth.getFeeHistory(numBlock, 'latest', rewardPercent);
+    const currentBlock = history.oldestBlock - 1;
+    const [newBlock, oldBlock] = await Promise.all([web3.api.eth.getBlock(currentBlock), web3.api.eth.getBlock(currentBlock - numBlock)]);
+    const blockTime = Number((BigInt(newBlock.timestamp || 0) - BigInt(oldBlock.timestamp || 0)) / BigInt(numBlock) * BigInt(1000));
     const baseGasFee = new _bignumber.default(history.baseFeePerGas[history.baseFeePerGas.length - 1]); // Last element is latest
 
     const blocksBusy = history.reward.reduce((previous, rewards, currentIndex) => {
@@ -137,87 +168,42 @@ const calculateGasFeeParams = async function (web3, networkKey) {
       /*
       * True if priority >= 0.3 * base
       *  */
-      const blockIsBusy = baseBN.gt(_utils.BN_ZERO) ? priorityBN.dividedBy(baseBN).gte(0.3) ? 1 : 0 : 0; // Special for bsc, base fee = 0
+      const blockIsBusy = baseBN.gt(_utils2.BN_ZERO) ? priorityBN.dividedBy(baseBN).gte(0.3) ? 1 : 0 : 0; // Special for bsc, base fee = 0
 
       return previous + blockIsBusy;
     }, 0);
     const busyNetwork = blocksBusy >= numBlock / 2; // True, if half of block is busy
 
-    const maxPriorityFeePerGas = history.reward.reduce((previous, rewards) => {
-      let firstBN = _utils.BN_ZERO;
-      let firstIndex = 0;
-
-      /* Get first priority which greater than 0 */
-      for (let i = 0; i < rewards.length; i++) {
-        firstIndex = i;
-        const current = rewards[i];
-        const currentBN = new _bignumber.default(current);
-        if (currentBN.gt(_utils.BN_ZERO)) {
-          firstBN = currentBN;
-          break;
-        }
-      }
-      let secondBN = firstBN;
-
-      /* Get second priority which greater than first priority */
-      for (let i = firstIndex; i < rewards.length; i++) {
-        const current = rewards[i];
-        const currentBN = new _bignumber.default(current);
-        if (currentBN.gt(firstBN)) {
-          secondBN = currentBN;
-          break;
-        }
-      }
-      let current;
-      if (busyNetwork) {
-        current = secondBN.dividedBy(2).gte(firstBN) ? firstBN : secondBN; // second too larger than first (> 2 times), use first else use second
-      } else {
-        current = firstBN;
-      }
-      if (busyNetwork) {
-        /* Get max value */
-        return current.gte(previous) ? current : previous; // get max priority
-      } else {
-        /* Get min value which greater than 0 */
-        if (previous.eq(_utils.BN_ZERO)) {
-          return current; // get min priority
-        } else if (current.eq(_utils.BN_ZERO)) {
-          return previous;
-        }
-        return current.lte(previous) ? current : previous; // get min priority
-      }
-    }, _utils.BN_ZERO);
-    if (maxPriorityFeePerGas.eq(_utils.BN_ZERO)) {
-      const _price = await web3.api.eth.getGasPrice();
-      const gasPrice = recalculateGasPrice(_price, networkKey);
-      return {
-        gasPrice,
-        maxFeePerGas: undefined,
-        maxPriorityFeePerGas: undefined,
-        baseGasFee: undefined,
-        busyNetwork: false
-      };
-    }
-
-    /* Max gas = (base + priority) * 1.5 (if not busy or 2 when busy); */
-    const maxFeePerGas = baseGasFee.plus(maxPriorityFeePerGas).multipliedBy(busyNetwork ? 2 : 1.5).decimalPlaces(0);
+    const slowPriorityFee = history.reward.reduce((previous, rewards) => previous.plus(rewards[0]), _utils2.BN_ZERO).dividedBy(numBlock).decimalPlaces(0);
+    const averagePriorityFee = history.reward.reduce((previous, rewards) => previous.plus(rewards[1]), _utils2.BN_ZERO).dividedBy(numBlock).decimalPlaces(0);
+    const fastPriorityFee = history.reward.reduce((previous, rewards) => previous.plus(rewards[2]), _utils2.BN_ZERO).dividedBy(numBlock).decimalPlaces(0);
     return {
+      type: 'evm',
       gasPrice: undefined,
-      maxFeePerGas,
-      maxPriorityFeePerGas,
-      baseGasFee,
-      busyNetwork
+      baseGasFee: baseGasFee.toString(),
+      busyNetwork,
+      options: {
+        slow: getEIP1559GasFee(baseGasFee, slowPriorityFee, 10, blockTime),
+        average: getEIP1559GasFee(baseGasFee, averagePriorityFee, 5, blockTime),
+        fast: getEIP1559GasFee(baseGasFee, fastPriorityFee, 3, blockTime),
+        default: busyNetwork ? 'average' : 'slow'
+      }
     };
   } catch (e) {
     const _price = await web3.api.eth.getGasPrice();
     const gasPrice = recalculateGasPrice(_price, networkKey);
     return {
+      type: 'evm',
+      busyNetwork: false,
       gasPrice,
-      maxFeePerGas: undefined,
-      maxPriorityFeePerGas: undefined,
       baseGasFee: undefined,
-      busyNetwork: false
+      options: undefined
     };
   }
 };
-exports.calculateGasFeeParams = calculateGasFeeParams;
+exports.calculateGasFeeParams = calculateGasFeeParams;
+const calculateToAmountByReservePool = async (api, fromToken, toToken, fromAmount) => {
+  const reserve = await (0, _utils.getReserveForPool)(api, fromToken, toToken);
+  return (0, _utils.estimateTokensForPool)(fromAmount, reserve);
+};
+exports.calculateToAmountByReservePool = calculateToAmountByReservePool;

package/cjs/services/storage-service/db-stores/Balance.js

@@ -13,6 +13,9 @@ class BalanceStore extends _BaseStoreWithAddress.default {
   async getBalanceMapByAddresses(addresses) {
     return this.table.where('address').anyOf(addresses).toArray();
   }
+  async getBalanceHasAmount(address, chain) {
+    return this.table.filter(item => item.address === address && item.free !== '0' && item.tokenSlug.startsWith(chain)).toArray();
+  }
   async removeBySlugs(tokenSlugs) {
     return this.table.where('tokenSlug').anyOfIgnoreCase(tokenSlugs).delete();
   }

package/cjs/services/swap-service/handler/asset-hub/handler.js

@@ -15,6 +15,7 @@ var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
 var _types = require("@subwallet/extension-base/types");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
 var _swap2 = require("@subwallet/extension-base/types/swap");
+var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _baseHandler = require("../base-handler");
 var _router = require("./router");
@@ -24,14 +25,15 @@ var _router = require("./router");
 const PAH_LOW_LIQUIDITY_THRESHOLD = 0.15;
 class AssetHubSwapHandler {
   isReady = false;
-  constructor(chainService, balanceService, chain) {
+  constructor(chainService, balanceService, feeService, chain) {
     const chainInfo = chainService.getChainInfoByKey(chain);
     const providerSlug = chain === 'statemint' ? _swap2.SwapProviderId.POLKADOT_ASSET_HUB : chain === 'statemine' ? _swap2.SwapProviderId.KUSAMA_ASSET_HUB : _swap2.SwapProviderId.ROCOCO_ASSET_HUB;
     this.swapBaseHandler = new _baseHandler.SwapBaseHandler({
       balanceService,
       chainService,
       providerName: chainInfo.name,
-      providerSlug
+      providerSlug,
+      feeService
     });
     this.providerSlug = providerSlug;
     this.chain = chain;
@@ -82,6 +84,7 @@ class AssetHubSwapHandler {
     }
     try {
       const alternativeChainInfo = this.chainService.getChainInfoByKey(alternativeAsset.originChain);
+      const originalChainInfo = this.chainService.getChainInfoByKey(this.chain);
       const step = {
         metadata: {
           sendingValue: bnAmount.toString(),
@@ -92,13 +95,18 @@ class AssetHubSwapHandler {
         type: _serviceBase.CommonStepType.XCM
       };
       const xcmOriginSubstrateApi = await this.chainService.getSubstrateApi(alternativeAsset.originChain).isReady;
+      const id = (0, _getId.getId)();
+      const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee(id, alternativeChainInfo.slug, 'substrate');
       const xcmTransfer = await (0, _xcm.createXcmExtrinsic)({
         originTokenInfo: alternativeAsset,
         destinationTokenInfo: fromAsset,
         sendingValue: bnAmount.toString(),
         recipient: params.request.address,
-        chainInfoMap: this.chainService.getChainInfoMap(),
-        substrateApi: xcmOriginSubstrateApi
+        sender: params.request.address,
+        feeInfo: feeInfo,
+        substrateApi: xcmOriginSubstrateApi,
+        destinationChain: originalChainInfo,
+        originChain: alternativeChainInfo
       });
       const _xcmFeeInfo = await xcmTransfer.paymentInfo(params.request.address);
       const xcmFeeInfo = _xcmFeeInfo.toPrimitive();
@@ -185,12 +193,16 @@ class AssetHubSwapHandler {
     const alternativeAssetSlug = (0, _utils2.getSwapAlternativeAsset)(pair);
     const originAsset = this.chainService.getAssetBySlug(alternativeAssetSlug);
     const destinationAsset = this.chainService.getAssetBySlug(pair.from);
+    const originChain = this.chainService.getChainInfoByKey(originAsset.originChain);
+    const destinationChain = this.chainService.getChainInfoByKey(destinationAsset.originChain);
     const substrateApi = this.chainService.getSubstrateApi(originAsset.originChain);
     const chainApi = await substrateApi.isReady;
     const destinationAssetBalance = await this.balanceService.getTransferableBalance(params.address, destinationAsset.originChain, destinationAsset.slug);
     const xcmFee = params.process.totalFee[params.currentStep];
     const bnAmount = new _bignumber.default(params.quote.fromAmount);
     const bnDestinationAssetBalance = new _bignumber.default(destinationAssetBalance.value);
+    const id = (0, _getId.getId)();
+    const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee(id, originChain.slug, 'substrate');
     let bnTotalAmount = bnAmount.minus(bnDestinationAssetBalance);
     if ((0, _utils._isNativeToken)(originAsset)) {
       const bnXcmFee = new _bignumber.default(xcmFee.feeComponent[0].amount); // xcm fee is paid in native token but swap token is not always native token
@@ -202,8 +214,11 @@ class AssetHubSwapHandler {
       destinationTokenInfo: destinationAsset,
       sendingValue: bnTotalAmount.toString(),
       recipient: params.address,
-      chainInfoMap: this.chainService.getChainInfoMap(),
-      substrateApi: chainApi
+      substrateApi: chainApi,
+      sender: params.address,
+      originChain: originChain,
+      destinationChain: destinationChain,
+      feeInfo
     });
     const xcmData = {
       originNetworkKey: originAsset.originChain,

package/cjs/services/swap-service/handler/asset-hub/router.js

@@ -45,7 +45,7 @@ class AssetHubRouter {
     const reserves = await (0, _utils2.getReserveForPath)(api, paths);
     const amounts = (0, _utils2.estimateTokensForPath)(amount, reserves);
     const marketRate = (0, _utils2.estimateRateForPath)(reserves);
-    const marketRateAfter = (0, _utils2.estimateRateAfter)(amount, reserves);
+    const marketRateAfter = (0, _utils2.estimateRateAfterForPath)(amount, reserves);
     const priceImpactPct = (0, _utils2.estimatePriceImpactPct)(marketRate, marketRateAfter);
     const errors = [];
 

package/cjs/services/swap-service/handler/asset-hub/utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getReserveForPool = exports.getReserveForPath = exports.estimateTokensForPool = exports.estimateTokensForPath = exports.estimateRateForPath = exports.estimateRateAfter = exports.estimatePriceImpactPct = exports.estimateActualRate = exports.checkMinAmountForPool = exports.checkMinAmountForPath = exports.checkLiquidityForPool = exports.checkLiquidityForPath = exports.buildSwapExtrinsic = exports._getPoolInfo = void 0;
+exports.getReserveForPool = exports.getReserveForPath = exports.estimateTokensForPool = exports.estimateTokensForPath = exports.estimateRateForPath = exports.estimateRateAfterForPath = exports.estimatePriceImpactPct = exports.estimateActualRate = exports.checkMinAmountForPool = exports.checkMinAmountForPath = exports.checkLiquidityForPool = exports.checkLiquidityForPath = exports.buildSwapExtrinsic = exports._getPoolInfo = void 0;
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _swap = require("@subwallet/extension-base/types/swap");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -47,7 +47,7 @@ const getReserveForPath = async (api, paths) => {
 };
 exports.getReserveForPath = getReserveForPath;
 const estimateTokensForPool = (amount, reserves) => {
-  if (amount === '0') {
+  if (!amount || amount === '0') {
     return '0';
   }
   return new _bignumber.default(amount).times(reserves[1]).div(reserves[0]).integerValue(_bignumber.default.ROUND_DOWN).toString();
@@ -85,7 +85,7 @@ const estimateActualRate = (amount, reserves) => {
   return result.toString();
 };
 exports.estimateActualRate = estimateActualRate;
-const estimateRateAfter = (amount, reserves) => {
+const estimateRateAfterForPath = (amount, reserves) => {
   const m = new _bignumber.default(amount);
   const reserve = reserves[0];
   const x = new _bignumber.default(reserve[0]);
@@ -94,7 +94,7 @@ const estimateRateAfter = (amount, reserves) => {
   const result = x.plus(m).div(y.minus(n));
   return result.toString();
 };
-exports.estimateRateAfter = estimateRateAfter;
+exports.estimateRateAfterForPath = estimateRateAfterForPath;
 const estimatePriceImpactPct = (marketRate, marketRateAfter) => {
   const bnMarketRate = new _bignumber.default(marketRate);
   const bnActualRate = new _bignumber.default(marketRateAfter);

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

@@ -23,6 +23,7 @@ class SwapBaseHandler {
     let {
       balanceService,
       chainService,
+      feeService,
       providerName,
       providerSlug
     } = _ref;
@@ -30,6 +31,7 @@ class SwapBaseHandler {
     this.providerSlug = providerSlug;
     this.chainService = chainService;
     this.balanceService = balanceService;
+    this.feeService = feeService;
   }
 
   // public abstract getSwapQuote(request: SwapRequest): Promise<SwapQuote | SwapError>;

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

@@ -19,6 +19,7 @@ var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
 var _types = require("@subwallet/extension-base/types");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
 var _swap3 = require("@subwallet/extension-base/types/swap");
+var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -41,11 +42,12 @@ var CHAINFLIP_QUOTE_ERROR;
   CHAINFLIP_QUOTE_ERROR["InsufficientIngress"] = "amount is lower than estimated ingress fee";
 })(CHAINFLIP_QUOTE_ERROR || (CHAINFLIP_QUOTE_ERROR = {}));
 class ChainflipSwapHandler {
-  constructor(chainService, balanceService) {
-    let isTestnet = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  constructor(chainService, balanceService, feeService) {
+    let isTestnet = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
     this.swapBaseHandler = new _baseHandler.SwapBaseHandler({
       chainService,
       balanceService,
+      feeService,
       providerName: isTestnet ? 'Chainflip Testnet' : 'Chainflip',
       providerSlug: isTestnet ? _swap3.SwapProviderId.CHAIN_FLIP_TESTNET : _swap3.SwapProviderId.CHAIN_FLIP_MAINNET
     });
@@ -396,11 +398,30 @@ class ChainflipSwapHandler {
       });
       extrinsic = submittableExtrinsic;
     } else {
+      const id = (0, _getId.getId)();
+      const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee(id, chainInfo.slug, 'evm');
       if ((0, _utils._isNativeToken)(fromAsset)) {
-        const [transactionConfig] = await (0, _smartContract.getEVMTransactionObject)(chainInfo, address, depositAddressResponse.depositAddress, quote.fromAmount, false, this.chainService.getEvmApi(chainInfo.slug));
+        const [transactionConfig] = await (0, _smartContract.getEVMTransactionObject)({
+          chain: chainInfo.slug,
+          evmApi: this.chainService.getEvmApi(chainInfo.slug),
+          from: address,
+          to: depositAddressResponse.depositAddress,
+          value: quote.fromAmount,
+          feeInfo,
+          transferAll: false
+        });
         extrinsic = transactionConfig;
       } else {
-        const [transactionConfig] = await (0, _smartContract.getERC20TransactionObject)((0, _utils._getContractAddressOfToken)(fromAsset), chainInfo, address, depositAddressResponse.depositAddress, quote.fromAmount, false, this.chainService.getEvmApi(chainInfo.slug));
+        const [transactionConfig] = await (0, _smartContract.getERC20TransactionObject)({
+          assetAddress: (0, _utils._getContractAddressOfToken)(fromAsset),
+          chain: chainInfo.slug,
+          evmApi: this.chainService.getEvmApi(chainInfo.slug),
+          from: address,
+          to: depositAddressResponse.depositAddress,
+          value: quote.fromAmount,
+          feeInfo,
+          transferAll: false
+        });
         extrinsic = transactionConfig;
       }
     }

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

@@ -19,6 +19,7 @@ var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
 var _types2 = require("@subwallet/extension-base/types");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
 var _swap2 = require("@subwallet/extension-base/types/swap");
+var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -31,11 +32,12 @@ const HYDRADX_TESTNET_SUBWALLET_REFERRAL_ACCOUNT = '7LCt6dFqtxzdKVB2648jWW9d85do
 class HydradxHandler {
   isTestnet = true;
   isReady = false;
-  constructor(chainService, balanceService) {
-    let isTestnet = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  constructor(chainService, balanceService, feeService) {
+    let isTestnet = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
     this.swapBaseHandler = new _baseHandler.SwapBaseHandler({
       balanceService,
       chainService,
+      feeService,
       providerName: isTestnet ? 'Hydration Testnet' : 'Hydration',
       providerSlug: isTestnet ? _swap2.SwapProviderId.HYDRADX_TESTNET : _swap2.SwapProviderId.HYDRADX_MAINNET
     });
@@ -97,6 +99,7 @@ class HydradxHandler {
     }
     try {
       const alternativeChainInfo = this.chainService.getChainInfoByKey(alternativeAsset.originChain);
+      const destChainInfo = this.chainService.getChainInfoByKey(this.chain());
       const step = {
         metadata: {
           sendingValue: bnAmount.toString(),
@@ -107,13 +110,18 @@ class HydradxHandler {
         type: _serviceBase.CommonStepType.XCM
       };
       const xcmOriginSubstrateApi = await this.chainService.getSubstrateApi(alternativeAsset.originChain).isReady;
+      const id = (0, _getId.getId)();
+      const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee(id, alternativeAsset.originChain, 'substrate');
       const xcmTransfer = await (0, _xcm.createXcmExtrinsic)({
         originTokenInfo: alternativeAsset,
         destinationTokenInfo: fromAsset,
         sendingValue: bnAmount.toString(),
         recipient: params.request.address,
-        chainInfoMap: this.chainService.getChainInfoMap(),
-        substrateApi: xcmOriginSubstrateApi
+        substrateApi: xcmOriginSubstrateApi,
+        sender: params.request.address,
+        destinationChain: destChainInfo,
+        originChain: alternativeChainInfo,
+        feeInfo
       });
       const _xcmFeeInfo = await xcmTransfer.paymentInfo(params.request.address);
       const xcmFeeInfo = _xcmFeeInfo.toPrimitive();
@@ -305,6 +313,8 @@ class HydradxHandler {
     const alternativeAssetSlug = (0, _utils2.getSwapAlternativeAsset)(pair);
     const originAsset = this.chainService.getAssetBySlug(alternativeAssetSlug);
     const destinationAsset = this.chainService.getAssetBySlug(pair.from);
+    const originChain = this.chainService.getChainInfoByKey(originAsset.originChain);
+    const destinationChain = this.chainService.getChainInfoByKey(destinationAsset.originChain);
     const substrateApi = this.chainService.getSubstrateApi(originAsset.originChain);
     const chainApi = await substrateApi.isReady;
     const destinationAssetBalance = await this.balanceService.getTransferableBalance(params.address, destinationAsset.originChain, destinationAsset.slug);
@@ -317,13 +327,17 @@ class HydradxHandler {
 
       bnTotalAmount = bnTotalAmount.plus(bnXcmFee);
     }
+    const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee((0, _getId.getId)(), originAsset.originChain, 'substrate');
     const xcmTransfer = await (0, _xcm.createXcmExtrinsic)({
       originTokenInfo: originAsset,
       destinationTokenInfo: destinationAsset,
       sendingValue: bnTotalAmount.toString(),
       recipient: params.address,
-      chainInfoMap: this.chainService.getChainInfoMap(),
-      substrateApi: chainApi
+      substrateApi: chainApi,
+      sender: params.address,
+      destinationChain,
+      originChain,
+      feeInfo
     });
     const xcmData = {
       originNetworkKey: originAsset.originChain,

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

@@ -11,6 +11,7 @@ var _swap = require("@subwallet/extension-base/core/logic-validation/swap");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
+var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireWildcard(require("bignumber.js"));
 var _smartContract = require("../../balance-service/transfer/smart-contract");
 var _token = require("../../balance-service/transfer/token");
@@ -125,10 +126,11 @@ const createSwapRequest = async params => {
   };
 };
 class SimpleSwapHandler {
-  constructor(chainService, balanceService) {
+  constructor(chainService, balanceService, feeService) {
     this.swapBaseHandler = new _baseHandler.SwapBaseHandler({
       chainService,
       balanceService,
+      feeService,
       providerName: 'SimpleSwap',
       providerSlug: _types.SwapProviderId.SIMPLE_SWAP
     });
@@ -423,11 +425,29 @@ class SimpleSwapHandler {
       });
       extrinsic = submittableExtrinsic;
     } else {
+      const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee((0, _getId.getId)(), chainInfo.slug, 'evm');
       if ((0, _utils._isNativeToken)(fromAsset)) {
-        const [transactionConfig] = await (0, _smartContract.getEVMTransactionObject)(chainInfo, address, addressFrom, quote.fromAmount, false, this.chainService.getEvmApi(chainInfo.slug));
+        const [transactionConfig] = await (0, _smartContract.getEVMTransactionObject)({
+          evmApi: this.chainService.getEvmApi(chainInfo.slug),
+          transferAll: false,
+          value: quote.fromAmount,
+          from: address,
+          to: addressFrom,
+          chain: chainInfo.slug,
+          feeInfo
+        });
         extrinsic = transactionConfig;
       } else {
-        const [transactionConfig] = await (0, _smartContract.getERC20TransactionObject)((0, _utils._getContractAddressOfToken)(fromAsset), chainInfo, address, addressFrom, quote.fromAmount, false, this.chainService.getEvmApi(chainInfo.slug));
+        const [transactionConfig] = await (0, _smartContract.getERC20TransactionObject)({
+          assetAddress: (0, _utils._getContractAddressOfToken)(fromAsset),
+          chain: chainInfo.slug,
+          evmApi: this.chainService.getEvmApi(chainInfo.slug),
+          feeInfo,
+          from: address,
+          to: addressFrom,
+          value: quote.fromAmount,
+          transferAll: false
+        });
         extrinsic = transactionConfig;
       }
     }