@subwallet/extension-base 1.3.29-0 → 1.3.30-0

package/cjs/services/earning-service/handlers/native-staking/dtao.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAlphaToTaoMapping = exports.default = exports.DEFAULT_DTAO_MINBOND = void 0;
+exports.default = exports.DEFAULT_DTAO_MINBOND = void 0;
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
@@ -13,13 +13,11 @@ var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _basePara = _interopRequireDefault(require("@subwallet/extension-base/services/earning-service/handlers/native-staking/base-para"));
 var _types = require("@subwallet/extension-base/types");
 var _utils3 = require("@subwallet/extension-base/utils");
-var _bignumber = _interopRequireWildcard(require("bignumber.js"));
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _util = require("@polkadot/util");
 var _utils4 = require("../../utils");
 var _tao = require("./tao");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -28,24 +26,30 @@ const DEFAULT_DTAO_MINBOND = '600000';
 exports.DEFAULT_DTAO_MINBOND = DEFAULT_DTAO_MINBOND;
 const getAlphaToTaoMapping = async substrateApi => {
   const allSubnets = (await substrateApi.api.call.subnetInfoRuntimeApi.getAllDynamicInfo()).toJSON();
-  if (!allSubnets) {
+  if (!allSubnets || allSubnets.length === 0) {
     return {};
   }
-  return allSubnets.reduce((acc, subnet) => {
+  const result = Object.create(null);
+  for (const subnet of allSubnets) {
     const netuid = subnet === null || subnet === void 0 ? void 0 : subnet.netuid;
+    if (netuid === undefined) {
+      continue;
+    }
     const taoIn = subnet !== null && subnet !== void 0 && subnet.taoIn ? new _bignumber.default(subnet.taoIn) : new _bignumber.default(0);
     const alphaIn = subnet !== null && subnet !== void 0 && subnet.alphaIn ? new _bignumber.default(subnet.alphaIn) : new _bignumber.default(0);
-    if (netuid === 0) {
-      acc[netuid] = '1';
-    } else if (alphaIn.gt(0)) {
-      acc[netuid] = taoIn.dividedBy(alphaIn).toString();
-    } else {
-      acc[netuid] = '1';
-    }
-    return acc;
-  }, {});
+    result[netuid] = netuid === 0 || alphaIn.lte(0) ? '1' : taoIn.dividedBy(alphaIn).toString();
+  }
+  return result;
+};
+const getAlphaToTaoRate = async (substrateApi, netuid) => {
+  const subnetInfo = (await substrateApi.api.call.subnetInfoRuntimeApi.getDynamicInfo(netuid)).toJSON();
+  if (!subnetInfo) {
+    return '1';
+  }
+  const taoIn = subnetInfo.taoIn ? new _bignumber.default(subnetInfo.taoIn) : new _bignumber.default(0);
+  const alphaIn = subnetInfo.alphaIn ? new _bignumber.default(subnetInfo.alphaIn) : new _bignumber.default(0);
+  return netuid === 0 || alphaIn.lte(0) ? '1' : taoIn.dividedBy(alphaIn).toString();
 };
-exports.getAlphaToTaoMapping = getAlphaToTaoMapping;
 class SubnetTaoStakingPoolHandler extends _basePara.default {
   /* Unimplemented function  */
   handleYieldWithdraw(address, unstakingInfo) {
@@ -84,30 +88,40 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
   async getEarningSlippage(params) {
     const substrateApi = await this.substrateApi.isReady;
     const subnetInfo = (await substrateApi.api.call.subnetInfoRuntimeApi.getDynamicInfo(params.netuid)).toJSON();
-    const alphaIn = new _bignumber.BigNumber((subnetInfo === null || subnetInfo === void 0 ? void 0 : subnetInfo.alphaIn) || 0);
-    const taoIn = new _bignumber.BigNumber((subnetInfo === null || subnetInfo === void 0 ? void 0 : subnetInfo.taoIn) || 0);
+    const alphaIn = new _bignumber.default((subnetInfo === null || subnetInfo === void 0 ? void 0 : subnetInfo.alphaIn) || 0);
+    const taoIn = new _bignumber.default((subnetInfo === null || subnetInfo === void 0 ? void 0 : subnetInfo.taoIn) || 0);
     const k = alphaIn.multipliedBy(taoIn);
-    const value = new _bignumber.BigNumber(params.value);
+    const value = new _bignumber.default(params.value);
+    const rate = taoIn.dividedBy(alphaIn);
     if (params.type === _KoniTypes.ExtrinsicType.STAKING_BOND) {
       const newTaoIn = taoIn.plus(value);
       const newAlphaIn = k.dividedBy(newTaoIn);
       const alphaReturned = alphaIn.minus(newAlphaIn);
       const alphaIdeal = value.multipliedBy(alphaIn).dividedBy(taoIn);
       const slippage = alphaIdeal.minus(alphaReturned).dividedBy(alphaIdeal);
-      return slippage.toNumber();
+      return {
+        slippage: slippage.plus(0.0001).toNumber(),
+        rate: rate.toNumber()
+      };
     } else if (params.type === _KoniTypes.ExtrinsicType.STAKING_UNBOND) {
       const newAlphaIn = alphaIn.plus(value);
       const newTaoReserve = k.dividedBy(newAlphaIn);
       const taoReturned = taoIn.minus(newTaoReserve);
       const taoIdeal = value.multipliedBy(taoIn).dividedBy(alphaIn);
       const slippage = taoIdeal.minus(taoReturned).dividedBy(taoIdeal);
-      return slippage.toNumber();
+      return {
+        slippage: slippage.plus(0.0001).toNumber(),
+        rate: rate.toNumber()
+      };
     }
-    return 0;
+    return {
+      slippage: 0,
+      rate: 1
+    };
   }
   get maintainBalance() {
-    const ed = new _util.BN(this.nativeToken.minAmount || '0');
-    const calculateMaintainBalance = new _util.BN(15).mul(ed).div(_util.BN_TEN);
+    const ed = new _bignumber.default(this.nativeToken.minAmount || '0');
+    const calculateMaintainBalance = new _bignumber.default(15).multipliedBy(ed).dividedBy(10);
     const maintainBalance = calculateMaintainBalance;
     return maintainBalance.toString();
   }
@@ -134,7 +148,8 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
             symbol,
             ownerHotkey: dynInfo.ownerHotkey,
             maxAllowedValidators: extraInfo ? extraInfo.maxAllowedValidators : 0,
-            taoIn: dynInfo.taoIn
+            taoIn: dynInfo.taoIn,
+            taoInEmission: dynInfo.taoInEmission
           };
         });
         this.subnetData = mergedData;
@@ -164,7 +179,8 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
           const netuid = subnet.netuid.toString().padStart(2, '0');
           const subnetSlug = `${this.slug}__subnet_${netuid.padStart(2, '0')}`;
           const subnetName = `${subnet.name || 'Unknown'} ${netuid}`;
-          const bnTaoIn = new _util.BN(subnet.taoIn);
+          const bnTaoIn = new _bignumber.default(subnet.taoIn);
+          const emission = new _bignumber.default(subnet.taoInEmission).dividedBy(new _bignumber.default(10).pow(new _bignumber.default(7)));
           const data = {
             ...this.baseInfo,
             type: this.type,
@@ -193,7 +209,8 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
               eraTime: 24,
               era: 0,
               unstakingPeriod: 1.2,
-              tvl: bnTaoIn.toString()
+              tvl: bnTaoIn.toString(),
+              totalApy: emission.toNumber()
             }
           };
           callback(data);
@@ -361,7 +378,7 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
   // eslint-disable-next-line @typescript-eslint/require-await
   async getDevnetPoolTargets() {
     const testnetDelegate = (await this.substrateApi.api.call.delegateInfoRuntimeApi.getDelegates()).toJSON();
-    const bnMinBond = new _util.BN(DEFAULT_DTAO_MINBOND);
+    const bnMinBond = new _bignumber.default(DEFAULT_DTAO_MINBOND);
     const filteredDelegates = testnetDelegate.filter(delegate => {
       return delegate.returnPer1000 !== 0;
     });
@@ -382,14 +399,14 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
   async getMainnetPoolTargets() {
     const _topValidator = await this.bittensorCache.get();
     const topValidator = _topValidator;
-    const bnMinBond = new _util.BN(DEFAULT_DTAO_MINBOND);
+    const bnMinBond = new _bignumber.default(DEFAULT_DTAO_MINBOND);
     const validatorList = topValidator.data;
     const validatorAddresses = Object.keys(validatorList);
     const results = await Promise.all(validatorAddresses.map(i => {
       const address = validatorList[i].hotkey.ss58;
-      const bnTotalStake = new _util.BN(validatorList[i].stake);
-      const bnOwnStake = new _util.BN(validatorList[i].validator_stake);
-      const otherStake = bnTotalStake.sub(bnOwnStake);
+      const bnTotalStake = new _bignumber.default(validatorList[i].stake);
+      const bnOwnStake = new _bignumber.default(validatorList[i].validator_stake);
+      const otherStake = bnTotalStake.minus(bnOwnStake);
       const nominatorCount = validatorList[i].nominators;
       const commission = validatorList[i].take;
       const roundedCommission = (parseFloat(commission) * 100).toFixed(0);
@@ -431,15 +448,18 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
     let bondDest = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'Staked';
     const {
       amount,
-      netuid,
-      selectedValidators: targetValidators
+      selectedValidators: targetValidators,
+      subnetData
     } = data;
+    const {
+      netuid,
+      slippage
+    } = subnetData;
     const chainApi = await this.substrateApi.isReady;
-    const binaryAmount = new _util.BN(amount);
-    const price = await getAlphaToTaoMapping(this.substrateApi);
-    const alphaToTaoPrice = new _bignumber.default(price[netuid]);
-    const limitPrice = alphaToTaoPrice.multipliedBy(10 ** (0, _utils2._getAssetDecimals)(this.nativeToken)).multipliedBy(1 + DEFAULT_BITTENSOR_SLIPPAGE);
-    const BNlimitPrice = new _util.BN(limitPrice.integerValue(_bignumber.BigNumber.ROUND_CEIL).toFixed());
+    const binaryAmount = new _bignumber.default(amount);
+    const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid));
+    const limitPrice = alphaToTaoPrice.multipliedBy(10 ** (0, _utils2._getAssetDecimals)(this.nativeToken)).multipliedBy(1 + (slippage || DEFAULT_BITTENSOR_SLIPPAGE));
+    const BNlimitPrice = new _bignumber.default(limitPrice.integerValue(_bignumber.default.ROUND_CEIL).toFixed());
     const selectedValidatorInfo = targetValidators[0];
     const hotkey = selectedValidatorInfo.address;
     const extrinsic = chainApi.api.tx.subtensorModule.addStakeLimit(hotkey, netuid, binaryAmount, BNlimitPrice, false);
@@ -456,7 +476,7 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
     const {
       amount
     } = data;
-    if (new _util.BN(amount).lt(new _util.BN(DEFAULT_DTAO_MINBOND))) {
+    if (new _bignumber.default(amount).lt(new _bignumber.default(DEFAULT_DTAO_MINBOND))) {
       return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)(`Insufficient stake. You need to stake at least ${(0, _utils3.formatNumber)(DEFAULT_DTAO_MINBOND, (0, _utils2._getAssetDecimals)(this.nativeToken))} ${(0, _utils2._getAssetSymbol)(this.nativeToken)} to earn rewards`))];
     }
     return baseErrors;
@@ -466,16 +486,15 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
 
   /* Leave pool action */
 
-  async handleYieldUnstake(amount, address, selectedTarget, netuid) {
+  async handleYieldUnstake(amount, address, selectedTarget, netuid, slippage) {
     const apiPromise = await this.substrateApi.isReady;
-    const binaryAmount = new _util.BN(amount);
-    const price = await getAlphaToTaoMapping(this.substrateApi);
-    const alphaToTaoPrice = new _bignumber.default(price[netuid]);
-    const limitPrice = alphaToTaoPrice.multipliedBy(10 ** (0, _utils2._getAssetDecimals)(this.nativeToken)).multipliedBy(1 - DEFAULT_BITTENSOR_SLIPPAGE);
-    const BNlimitPrice = new _util.BN(limitPrice.integerValue(_bignumber.BigNumber.ROUND_CEIL).toFixed());
     if (!selectedTarget) {
       return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS));
     }
+    const binaryAmount = new _bignumber.default(amount);
+    const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid || 0));
+    const limitPrice = alphaToTaoPrice.multipliedBy(10 ** (0, _utils2._getAssetDecimals)(this.nativeToken)).multipliedBy(1 - (slippage || DEFAULT_BITTENSOR_SLIPPAGE));
+    const BNlimitPrice = new _bignumber.default(limitPrice.integerValue(_bignumber.default.ROUND_CEIL).toFixed());
     const extrinsic = apiPromise.api.tx.subtensorModule.removeStakeLimit(selectedTarget, netuid, binaryAmount, BNlimitPrice, false);
     return [_KoniTypes.ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
@@ -489,10 +508,9 @@ class SubnetTaoStakingPoolHandler extends _basePara.default {
       return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS)];
     }
     const netuid = (_poolInfo$metadata$su = poolInfo.metadata.subnetData) === null || _poolInfo$metadata$su === void 0 ? void 0 : _poolInfo$metadata$su.netuid;
-    const price = await getAlphaToTaoMapping(this.substrateApi);
-    const minUnstake = new _bignumber.default(DEFAULT_DTAO_MINBOND).dividedBy(new _bignumber.default(price[netuid]));
-    console.log('minUnstake', minUnstake.dividedBy(10 ** (0, _utils2._getAssetDecimals)(this.nativeToken)).toString());
-    const formattedMinUnstake = minUnstake.dividedBy(1000000).integerValue(_bignumber.BigNumber.ROUND_CEIL).dividedBy(1000);
+    const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid || 0));
+    const minUnstake = new _bignumber.default(DEFAULT_DTAO_MINBOND).dividedBy(alphaToTaoPrice);
+    const formattedMinUnstake = minUnstake.dividedBy(1000000).integerValue(_bignumber.default.ROUND_CEIL).dividedBy(1000);
     if (new _bignumber.default(amount).lt(formattedMinUnstake.multipliedBy(10 ** (0, _utils2._getAssetDecimals)(this.nativeToken)))) {
       var _poolInfo$metadata$su2;
       return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)(`Amount too low. You need to unstake at least ${formattedMinUnstake.toString()} ${((_poolInfo$metadata$su2 = poolInfo.metadata.subnetData) === null || _poolInfo$metadata$su2 === void 0 ? void 0 : _poolInfo$metadata$su2.subnetSymbol) || ''}`))];

package/cjs/services/earning-service/handlers/native-staking/tao.js

@@ -82,7 +82,7 @@ class BittensorCache {
   async fetchData() {
     const apiKey = bittensorApiKey();
     try {
-      const resp = await fetch('https://api.taostats.io/api/validator/latest/v1?limit=200', {
+      const resp = await fetch('https://api.taostats.io/api/validator/latest/v1?limit=50', {
         method: 'GET',
         headers: {
           'Content-Type': 'application/json',
@@ -194,8 +194,17 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
         const minDelegatorStake = (await substrateApi.api.query.subtensorModule.nominatorMinRequiredStake()).toPrimitive() || 0;
         const maxValidatorPerNominator = (await substrateApi.api.query.subtensorModule.maxAllowedValidators(0)).toPrimitive();
         const taoIn = (await substrateApi.api.query.subtensorModule.subnetTAO(0)).toPrimitive();
+        const _topValidator = await this.bittensorCache.get();
+        const validators = _topValidator.data;
+        let highestApr = validators[0];
+        for (let i = 1; i < validators.length; i++) {
+          if (parseFloat(validators[i].apr) > parseFloat(highestApr.apr)) {
+            highestApr = validators[i];
+          }
+        }
         const bnTaoIn = new _util.BN(taoIn);
         const BNminDelegatorStake = new _bignumber.default(minDelegatorStake.toString());
+        const apr = this.chain === 'bittensor' ? Number(highestApr.apr) * 100 : 0;
         const data = {
           ...this.baseInfo,
           type: this.type,
@@ -217,7 +226,8 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
             eraTime: 24,
             era: 0,
             unstakingPeriod: 1.2,
-            tvl: bnTaoIn.toString()
+            tvl: bnTaoIn.toString(),
+            totalApy: apr
           }
         };
         callback(data);

package/cjs/services/earning-service/service.js

@@ -765,8 +765,9 @@ class EarningService {
     } = params;
     const handler = this.getPoolHandler(slug);
     const netuid = (_params$poolInfo$meta = params.poolInfo.metadata.subnetData) === null || _params$poolInfo$meta === void 0 ? void 0 : _params$poolInfo$meta.netuid;
+    const slippage = params.slippage;
     if (handler) {
-      return handler.handleYieldLeave(params.fastLeave, params.amount, params.address, params.selectedTarget, netuid);
+      return handler.handleYieldLeave(params.fastLeave, params.amount, params.address, params.selectedTarget, netuid, slippage);
     } else {
       return Promise.reject(new _TransactionError.TransactionError(_types2.BasicTxErrorType.INTERNAL_ERROR));
     }

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.recalculateGasPrice = exports.parseInfuraFee = exports.getEIP1559GasFee = exports.fetchSubWalletFeeData = exports.fetchOnlineFeeData = exports.fetchInfuraFeeData = exports.calculateToAmountByReservePool = exports.calculateGasFeeParams = exports.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE = void 0;
+exports.recalculateGasPrice = exports.parseInfuraFee = exports.getEIP1559GasFee = exports.fetchSubWalletFeeData = exports.fetchOnlineFeeData = exports.fetchInfuraFeeData = exports.enforceMinOneTip = 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/services/swap-service/handler/asset-hub/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
@@ -18,6 +18,7 @@ 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 FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE = 105; // percentage
 exports.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE = FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE;
+const EIP1559_MIN_PRIORITY_FEE = '1';
 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);
@@ -177,15 +178,18 @@ const calculateGasFeeParams = async function (web3, networkKey) {
     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);
+    if (slowPriorityFee.eq(0) && averagePriorityFee.eq(0) && fastPriorityFee.eq(0)) {
+      throw new Error('Fee rates are currently same for all levels');
+    }
     return {
       type: 'evm',
       gasPrice: undefined,
       baseGasFee: baseGasFee.toString(),
       busyNetwork,
       options: {
-        slow: getEIP1559GasFee(baseGasFee, slowPriorityFee, 10, blockTime),
-        average: getEIP1559GasFee(baseGasFee, averagePriorityFee, 5, blockTime),
-        fast: getEIP1559GasFee(baseGasFee, fastPriorityFee, 3, blockTime),
+        slow: enforceMinOneTip(getEIP1559GasFee(baseGasFee, slowPriorityFee, 10, blockTime)),
+        average: enforceMinOneTip(getEIP1559GasFee(baseGasFee, averagePriorityFee, 5, blockTime)),
+        fast: enforceMinOneTip(getEIP1559GasFee(baseGasFee, fastPriorityFee, 3, blockTime)),
         default: busyNetwork ? 'average' : 'slow'
       }
     };
@@ -202,6 +206,14 @@ const calculateGasFeeParams = async function (web3, networkKey) {
   }
 };
 exports.calculateGasFeeParams = calculateGasFeeParams;
+const enforceMinOneTip = feeOptionDetail => {
+  if (feeOptionDetail.maxPriorityFeePerGas === '0') {
+    feeOptionDetail.maxPriorityFeePerGas = EIP1559_MIN_PRIORITY_FEE;
+    return feeOptionDetail;
+  }
+  return feeOptionDetail;
+};
+exports.enforceMinOneTip = enforceMinOneTip;
 const calculateToAmountByReservePool = async (api, fromToken, toToken, fromAmount) => {
   const reserve = await (0, _utils.getReserveForPool)(api, fromToken, toToken);
   return (0, _utils.estimateTokensForPool)(fromAmount, reserve);

package/cjs/services/inapp-notification-service/index.js

@@ -13,8 +13,9 @@ var _constants2 = require("@subwallet/extension-base/services/earning-service/co
 var _consts = require("@subwallet/extension-base/services/inapp-notification-service/consts");
 var _interfaces = require("@subwallet/extension-base/services/inapp-notification-service/interfaces");
 var _utils = require("@subwallet/extension-base/services/inapp-notification-service/utils");
+var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
 var _types2 = require("@subwallet/extension-base/types");
-var _utils2 = require("@subwallet/extension-base/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -155,7 +156,7 @@ class InappNotificationService {
     const [comparedNotifications, remindTimeConfig] = await Promise.all([this.fetchNotificationsByParams({
       notificationTab: _interfaces.NotificationTab.ALL,
       proxyId
-    }), await (0, _remindNotificationTime.fetchLastestRemindNotificationTime)()]);
+    }), await (0, _remindNotificationTime.fetchLatestRemindNotificationTime)()]);
     for (const candidateNotification of notifications) {
       candidateNotification.title = candidateNotification.title.replace('{{accountName}}', accountName);
       if (this.passValidateNotification(candidateNotification, comparedNotifications, remindTimeConfig)) {
@@ -177,8 +178,8 @@ class InappNotificationService {
   }
   getCategorizedAddresses() {
     const addresses = this.keyringService.context.getAllAddresses();
-    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
-    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
+    const evmAddresses = (0, _utils3.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
+    const substrateAddresses = (0, _utils3.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     return {
       evmAddresses: evmAddresses,
       substrateAddresses: substrateAddresses
@@ -260,7 +261,7 @@ class InappNotificationService {
         address: address,
         // address is receiverAddress
         title: _consts.NotificationTitleMap[actionType].replace('{{tokenSymbol}}', symbol),
-        description: _consts.NotificationDescriptionMap[actionType]((0, _utils2.formatNumber)(amount, decimals), symbol),
+        description: _consts.NotificationDescriptionMap[actionType]((0, _utils3.formatNumber)(amount, decimals), symbol),
         time: timestamp,
         extrinsicType: _KoniTypes.ExtrinsicType.CLAIM_BRIDGE,
         isRead: false,
@@ -334,7 +335,7 @@ class InappNotificationService {
         id: `${actionType}___${_id}___${timestamp}`,
         address: address,
         title: _consts.NotificationTitleMap[actionType].replace('{{tokenSymbol}}', symbol),
-        description: _consts.NotificationDescriptionMap[actionType]((0, _utils2.formatNumber)(amounts[0], decimals), symbol),
+        description: _consts.NotificationDescriptionMap[actionType]((0, _utils3.formatNumber)(amounts[0], decimals), symbol),
         time: timestamp,
         extrinsicType: _KoniTypes.ExtrinsicType.CLAIM_BRIDGE,
         isRead: false,
@@ -356,12 +357,17 @@ class InappNotificationService {
       actionType = _interfaces.NotificationActionType.SWAP;
       extrinsicType = _KoniTypes.ExtrinsicType.SWAP;
       const combineInfo = process.combineInfo;
-      const fromAsset = this.chainService.getAssetBySlug(combineInfo.quote.pair.from);
-      const toAsset = this.chainService.getAssetBySlug(combineInfo.quote.pair.to);
-      const fromChain = this.chainService.getChainInfoByKey(fromAsset.originChain);
-      const toChain = this.chainService.getChainInfoByKey(toAsset.originChain);
+      const targetPair = (() => {
+        try {
+          return (0, _utils2.getTokenPairFromStep)(combineInfo.process.steps) || combineInfo.quote.pair;
+        } catch (e) {
+          return combineInfo.quote.pair;
+        }
+      })();
+      const fromAsset = this.chainService.getAssetBySlug(targetPair.from);
+      const toAsset = this.chainService.getAssetBySlug(targetPair.to);
       title = '[{{accountName}}]  SWAPPED {{fromAsset}}'.replace('{{fromAsset}}', fromAsset.symbol);
-      description = '{{fromAmount}} {{fromAsset}} on {{fromChain}} swapped for {{toAmount}} {{toAsset}} on {{toChain}}. Click to view details'.replace('{{fromAmount}}', (0, _utils2.formatNumber)(combineInfo.quote.fromAmount, fromAsset.decimals || 0)).replace('{{fromAsset}}', fromAsset.symbol).replace('{{fromChain}}', fromChain.name).replace('{{toAmount}}', (0, _utils2.formatNumber)(combineInfo.quote.toAmount, toAsset.decimals || 0)).replace('{{toAsset}}', toAsset.symbol).replace('{{toChain}}', toChain.name);
+      description = '{{fromAmount}} {{fromAsset}} swapped for {{toAmount}} {{toAsset}}. Click to view details'.replace('{{fromAmount}}', (0, _utils3.formatNumber)(combineInfo.quote.fromAmount, fromAsset.decimals || 0)).replace('{{fromAsset}}', fromAsset.symbol).replace('{{toAmount}}', (0, _utils3.formatNumber)(combineInfo.quote.toAmount, toAsset.decimals || 0)).replace('{{toAsset}}', toAsset.symbol);
     } else {
       actionType = _interfaces.NotificationActionType.EARNING;
       extrinsicType = _KoniTypes.ExtrinsicType.JOIN_YIELD_POOL; // Not used
@@ -395,11 +401,11 @@ class InappNotificationService {
           break;
       }
       title = '[{{accountName}}] STAKED {{asset}}'.replace('{{asset}}', asset.symbol);
-      description = '{{amount}} {{asset}} on {{chain}} staked via {{method}}. Click to view details'.replace('{{amount}}', (0, _utils2.formatNumber)(amount, asset.decimals || 0)).replace('{{asset}}', asset.symbol).replace('{{chain}}', chain.name).replace('{{method}}', method);
+      description = '{{amount}} {{asset}} on {{chain}} staked via {{method}}. Click to view details'.replace('{{amount}}', (0, _utils3.formatNumber)(amount, asset.decimals || 0)).replace('{{asset}}', asset.symbol).replace('{{chain}}', chain.name).replace('{{method}}', method);
     }
     const notification = {
       id: `${actionType}___${_id}___${timestamp}`,
-      address: (0, _utils2.reformatAddress)(address),
+      address: (0, _utils3.reformatAddress)(address),
       title,
       actionType,
       metadata: {