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

package/services/earning-service/handlers/liquid-staking/stella-swap.js

@@ -7,6 +7,7 @@ import { getERC20Contract, getERC20SpendingApprovalTx } from '@subwallet/extensi
 import { _getAssetDecimals, _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { BasicTxErrorType, EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
+import { combineEthFee } from '@subwallet/extension-base/utils';
 import { BN, BN_TEN, BN_ZERO } from '@polkadot/util';
 import { ST_LIQUID_TOKEN_ABI } from "../../constants/index.js";
 import BaseLiquidStakingPoolHandler from "./base.js";
@@ -271,7 +272,6 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     });
   }
   async handleSubmitStep(data, path) {
-    var _priority$maxFeePerGa, _priority$maxPriority;
     const {
       address,
       amount
@@ -291,14 +291,13 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
       from: address
     });
     const priority = await calculateGasFeeParams(evmApi, this.chain);
+    const feeCombine = combineEthFee(priority);
     const transactionObject = {
       from: address,
       to: _getContractAddressOfToken(derivativeTokenInfo),
       data: depositEncodedCall,
       gas: gasLimit,
-      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
     };
     return {
       txChain: this.chain,
@@ -318,7 +317,6 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     return Promise.reject(new TransactionError(BasicTxErrorType.UNSUPPORTED));
   }
   async handleYieldUnstake(amount, address, selectedTarget) {
-    var _priority$maxFeePerGa2, _priority$maxPriority2;
     const evmApi = this.evmApi;
     const derivativeTokenSlug = this.derivativeAssets[0];
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
@@ -334,14 +332,13 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
       from: address
     });
     const priority = await calculateGasFeeParams(evmApi, this.chain);
+    const feeCombine = combineEthFee(priority);
     const transaction = {
       from: address,
       to: _getContractAddressOfToken(derivativeTokenInfo),
       data: redeemEncodedCall,
       gas: gasLimit,
-      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
     };
     return [ExtrinsicType.UNSTAKE_STDOT, transaction];
   }
@@ -351,7 +348,6 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
   /* Other actions */
 
   async handleYieldWithdraw(address, unstakingInfo) {
-    var _priority$maxFeePerGa3, _priority$maxPriority3;
     const evmApi = this.evmApi;
     const derivativeTokenSlug = this.derivativeAssets[0];
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
@@ -367,14 +363,13 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
       from: address
     });
     const priority = await calculateGasFeeParams(evmApi, this.chain);
+    const feeCombine = combineEthFee(priority);
     return {
       from: address,
       to: _getContractAddressOfToken(derivativeTokenInfo),
       data: withdrawEncodedCall,
       gas: gasLimit,
-      gasPrice: priority.gasPrice,
-      maxFeePerGas: (_priority$maxFeePerGa3 = priority.maxFeePerGas) === null || _priority$maxFeePerGa3 === void 0 ? void 0 : _priority$maxFeePerGa3.toString(),
-      maxPriorityFeePerGas: (_priority$maxPriority3 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority3 === void 0 ? void 0 : _priority$maxPriority3.toString()
+      ...feeCombine
     }; // TODO: check tx history parsing
   }
 

package/services/earning-service/handlers/native-staking/tao.d.ts

@@ -1,11 +1,16 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import BaseParaStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/native-staking/base-para';
 import { BaseYieldPositionInfo, StakeCancelWithdrawalParams, SubmitJoinNativeStaking, TransactionData, UnstakingInfo, ValidatorInfo, YieldPoolInfo, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+export interface TaoStakeInfo {
+    hotkey: string;
+    stake: string;
+    netuid: number;
+}
 interface TaoStakingStakeOption {
     owner: string;
     amount: string;
-    identity: string;
 }
 export interface RawDelegateState {
     data: Array<{
@@ -30,6 +35,7 @@ interface Validator {
     take: string;
     apr: string;
 }
+export declare const getTaoToAlphaMapping: (substrateApi: _SubstrateApi) => Promise<Record<number, string>>;
 export declare const BITTENSOR_API_KEY_1: string;
 export declare const BITTENSOR_API_KEY_2: string;
 export declare const BITTENSOR_API_KEY_3: string;
@@ -42,7 +48,6 @@ export declare const BITTENSOR_API_KEY_9: string;
 export declare const BITTENSOR_API_KEY_10: string;
 export declare const bittensorApiKey: () => string;
 export declare function fetchDelegates(): Promise<ValidatorResponse>;
-export declare function fetchTaoDelegateState(address: string): Promise<RawDelegateState>;
 export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHandler {
     handleYieldWithdraw(address: string, unstakingInfo: UnstakingInfo): Promise<TransactionData>;
     handleYieldCancelUnstake(params: StakeCancelWithdrawalParams): Promise<TransactionData>;

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

@@ -11,6 +11,25 @@ import { reformatAddress } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { BN, BN_TEN, BN_ZERO } from '@polkadot/util';
 import { calculateReward } from "../../utils/index.js";
+export const getTaoToAlphaMapping = async substrateApi => {
+  const allSubnets = (await substrateApi.api.call.subnetInfoRuntimeApi.getAllDynamicInfo()).toJSON();
+  if (!allSubnets) {
+    return {};
+  }
+  return allSubnets.reduce((acc, subnet) => {
+    const netuid = subnet === null || subnet === void 0 ? void 0 : subnet.netuid;
+    const taoIn = subnet !== null && subnet !== void 0 && subnet.taoIn ? new BigN(subnet.taoIn) : new BigN(0);
+    const alphaIn = subnet !== null && subnet !== void 0 && subnet.alphaIn ? new BigN(subnet.alphaIn) : new BigN(0);
+    if (netuid === 0) {
+      acc[netuid] = '1';
+    } else if (alphaIn.gt(0)) {
+      acc[netuid] = taoIn.dividedBy(alphaIn).toString();
+    } else {
+      acc[netuid] = '1';
+    }
+    return acc;
+  }, {});
+};
 export const BITTENSOR_API_KEY_1 = process.env.BITTENSOR_API_KEY_1 || '';
 export const BITTENSOR_API_KEY_2 = process.env.BITTENSOR_API_KEY_2 || '';
 export const BITTENSOR_API_KEY_3 = process.env.BITTENSOR_API_KEY_3 || '';
@@ -27,7 +46,7 @@ function random(...keys) {
   return validKeys[randomIndex];
 }
 export const bittensorApiKey = () => {
-  return random(BITTENSOR_API_KEY_1, BITTENSOR_API_KEY_2, BITTENSOR_API_KEY_3, BITTENSOR_API_KEY_4, BITTENSOR_API_KEY_5, BITTENSOR_API_KEY_6);
+  return random(BITTENSOR_API_KEY_1, BITTENSOR_API_KEY_2, BITTENSOR_API_KEY_3, BITTENSOR_API_KEY_4, BITTENSOR_API_KEY_5, BITTENSOR_API_KEY_6, BITTENSOR_API_KEY_7, BITTENSOR_API_KEY_8, BITTENSOR_API_KEY_9, BITTENSOR_API_KEY_10);
 };
 
 /* Fetch data */
@@ -46,20 +65,22 @@ export async function fetchDelegates() {
     }).catch(console.error);
   });
 }
-export async function fetchTaoDelegateState(address) {
-  const apiKey = bittensorApiKey();
-  return new Promise(function (resolve) {
-    fetch(`https://api.taostats.io/api/stake_balance/latest/v1?coldkey=${address}`, {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `${apiKey}`
-      }
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
-}
+
+// export async function fetchTaoDelegateState (address: string): Promise<RawDelegateState> {
+//   const apiKey = bittensorApiKey();
+
+//   return new Promise(function (resolve) {
+//     fetch(`https://api.taostats.io/api/stake_balance/latest/v1?coldkey=${address}`, {
+//       method: 'GET',
+//       headers: {
+//         'Content-Type': 'application/json',
+//         Authorization: `${apiKey}`
+//       }
+//     }).then((resp) => {
+//       resolve(resp.json());
+//     }).catch(console.error);
+//   });
+// }
 
 /* Fetch data */
 
@@ -160,11 +181,12 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
           chain: chainInfo.slug,
           validatorAddress: delegate.owner,
           activeStake: activeStake,
-          validatorMinStake: minDelegatorStake,
-          validatorIdentity: delegate.identity
+          validatorMinStake: minDelegatorStake
+          // validatorIdentity: delegate.identity
         });
       }
     }
+
     const stakingStatus = getEarningStatusByNominations(allActiveStake, nominationList);
     return {
       status: stakingStatus,
@@ -192,9 +214,10 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
         bnTotalBalance = bnTotalBalance.add(bnStakeAmount);
         delegatorState.push({
           owner: testnetAddress,
-          amount: bnStakeAmount.toString(),
-          identity: testnetAddress
+          amount: bnStakeAmount.toString()
+          // identity: testnetAddress
         });
+
         rsCallback({
           ...defaultInfo,
           type: this.type,
@@ -217,20 +240,32 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
       await Promise.all(stakePromises);
     };
     const getMainnetPoolPosition = async () => {
-      const rawDelegateStateInfos = await Promise.all(useAddresses.map(address => fetchTaoDelegateState(address)));
-      if (rawDelegateStateInfos.length > 0) {
+      const rawDelegateStateInfos = await Promise.all(useAddresses.map(async address => (await substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkey(address)).toJSON()));
+      const price = await getTaoToAlphaMapping(this.substrateApi);
+      if (rawDelegateStateInfos && rawDelegateStateInfos.length > 0) {
         rawDelegateStateInfos.forEach((rawDelegateStateInfo, i) => {
           const owner = reformatAddress(useAddresses[i], 42);
           const delegatorState = [];
           let bnTotalBalance = BN_ZERO;
-          const delegateStateInfo = rawDelegateStateInfo.data;
+          const delegateStateInfo = rawDelegateStateInfo;
+          const totalDelegate = {};
           for (const delegate of delegateStateInfo) {
-            const name = delegate.hotkey_name || delegate.hotkey.ss58;
-            bnTotalBalance = bnTotalBalance.add(new BN(delegate.stake));
+            const hotkey = delegate.hotkey;
+            const netuid = delegate.netuid;
+            const stake = new BigN(delegate.stake);
+            const taoToAlphaPrice = price[netuid] ? new BigN(price[netuid]) : new BigN(1);
+            const taoStake = stake.multipliedBy(taoToAlphaPrice).toFixed(0).toString();
+            if (totalDelegate[hotkey]) {
+              totalDelegate[hotkey] = new BigN(totalDelegate[hotkey]).plus(taoStake).toString();
+            } else {
+              totalDelegate[hotkey] = taoStake;
+            }
+          }
+          for (const hotkey in totalDelegate) {
+            bnTotalBalance = bnTotalBalance.add(new BN(totalDelegate[hotkey]));
             delegatorState.push({
-              owner: delegate.hotkey.ss58,
-              amount: delegate.stake,
-              identity: name
+              owner: hotkey,
+              amount: totalDelegate[hotkey]
             });
           }
           if (delegateStateInfo && delegateStateInfo.length > 0) {
@@ -260,6 +295,61 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
         });
       }
     };
+
+    // const getMainnetPoolPosition = async () => {
+    //   const rawDelegateStateInfos = await Promise.all(
+    //     useAddresses.map((address) => fetchTaoDelegateState(address))
+    //   );
+
+    //   if (rawDelegateStateInfos.length > 0) {
+    //     rawDelegateStateInfos.forEach((rawDelegateStateInfo, i) => {
+    //       const owner = reformatAddress(useAddresses[i], 42);
+    //       const delegatorState: TaoStakingStakeOption[] = [];
+    //       let bnTotalBalance = BN_ZERO;
+    //       const delegateStateInfo = rawDelegateStateInfo.data;
+
+    //       for (const delegate of delegateStateInfo) {
+    //         const name = delegate.hotkey_name || delegate.hotkey.ss58;
+
+    //         bnTotalBalance = bnTotalBalance.add(new BN(delegate.stake));
+
+    //         delegatorState.push({
+    //           owner: delegate.hotkey.ss58,
+    //           amount: delegate.stake,
+    //           identity: name
+    //         });
+    //       }
+
+    //       if (delegateStateInfo && delegateStateInfo.length > 0) {
+    //         this.parseNominatorMetadata(chainInfo, owner, delegatorState)
+    //           .then((nominatorMetadata) => {
+    //             rsCallback({
+    //               ...defaultInfo,
+    //               ...nominatorMetadata,
+    //               address: owner,
+    //               type: this.type
+    //             });
+    //           })
+    //           .catch(console.error);
+    //       } else {
+    //         rsCallback({
+    //           ...defaultInfo,
+    //           type: this.type,
+    //           address: owner,
+    //           balanceToken: this.nativeToken.slug,
+    //           totalStake: '0',
+    //           activeStake: '0',
+    //           unstakeBalance: '0',
+    //           status: EarningStatus.NOT_STAKING,
+    //           isBondedBefore: false,
+    //           nominations: [],
+    //           unstakings: []
+    //         });
+    //       }
+    //     });
+    //   }
+    // };
+
     const getStakingPositionInterval = async () => {
       if (cancel) {
         return;
@@ -364,7 +454,7 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     const binaryAmount = new BN(amount);
     const selectedValidatorInfo = targetValidators[0];
     const hotkey = selectedValidatorInfo.address;
-    const extrinsic = chainApi.api.tx.subtensorModule.addStake(hotkey, binaryAmount);
+    const extrinsic = chainApi.api.tx.subtensorModule.addStake(hotkey, 0, binaryAmount);
     return [extrinsic, {
       slug: this.nativeToken.slug,
       amount: '0'
@@ -382,7 +472,7 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     if (!selectedTarget || !poolPosition) {
       return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
     }
-    const extrinsic = apiPromise.api.tx.subtensorModule.removeStake(selectedTarget, binaryAmount);
+    const extrinsic = apiPromise.api.tx.subtensorModule.removeStake(selectedTarget, 0, binaryAmount);
     return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 

package/services/earning-service/handlers/nomination-pool/index.js

@@ -83,7 +83,7 @@ export default class NominationPoolHandler extends BasePoolHandler {
 
       const supportedDays = getSupportedDaysByHistoryDepth(erasPerDay, parseInt(maxSupportedEras), parseInt(currentEra) / erasPerDay);
       const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
-      const [_maxPoolMember, _EraStakeInfo, _totalIssuance, _auctionCounter, _minPoolJoin, ..._eraReward] = await Promise.all([(_substrateApi$api$que2 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.maxPoolMembersPerPool(), substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que3 = substrateApi.api.query.auctions) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.auctionCounter(), (_substrateApi$api$que4 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minJoinBond(), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays.toString()).keys()].map(i => i + startEra))]);
+      const [_maxPoolMember, _EraStakeInfo, _totalIssuance, _auctionCounter, _minPoolJoin, ..._eraReward] = await Promise.all([(_substrateApi$api$que2 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.maxPoolMembersPerPool(), substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que3 = substrateApi.api.query.auctions) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.auctionCounter(), (_substrateApi$api$que4 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minJoinBond(), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays).keys()].map(i => i + startEra))]);
       const maxPoolMembers = _maxPoolMember ? parseInt(_maxPoolMember.toString()) : undefined;
       const [_totalEraStake, _lastTotalStaked] = _EraStakeInfo;
       const validatorEraReward = getAvgValidatorEraReward(supportedDays, _eraReward[0]);

package/services/earning-service/handlers/special.js

@@ -3,12 +3,13 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
+import { ALL_ACCOUNT_KEY, XCM_FEE_RATIO } from '@subwallet/extension-base/constants';
 import { YIELD_POOL_STAT_REFRESH_INTERVAL } from '@subwallet/extension-base/koni/api/yield/helper/utils';
 import { createXcmExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
-import { _getChainNativeTokenSlug } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetExistentialDeposit, _getAssetName, _getAssetSymbol, _getChainNativeTokenSlug } from '@subwallet/extension-base/services/chain-service/utils';
 import { BasicTxErrorType, YieldStepType, YieldValidationStatus } from '@subwallet/extension-base/types';
 import { createPromiseHandler, formatNumber } from '@subwallet/extension-base/utils';
+import { getId } from '@subwallet/extension-base/utils/getId';
 import { t } from 'i18next';
 import { BN, BN_TEN, BN_ZERO, noop } from '@polkadot/util';
 import BasePoolHandler from "./base.js";
@@ -73,17 +74,27 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
       value: '0'
     }), this.state.balanceService.getTransferableBalance(request.address, feeAssetInfo.originChain, feeAssetInfo.slug)]);
     const bnInputAssetBalance = new BN(inputAssetBalance.value);
-    const bnAltInputAssetBalance = new BN(altInputAssetBalance.value);
     const bnMinJoinPool = new BN(poolInfo.statistic.earningThreshold.join);
     const inputTokenInfo = this.state.chainService.getAssetBySlug(this.inputAsset);
     const altInputTokenInfo = this.state.chainService.getAssetBySlug(this.altInputAsset);
+    const existentialDeposit = new BN(_getAssetExistentialDeposit(altInputTokenInfo));
+    const bnAltInputAssetBalance = new BN(altInputAssetBalance.value);
     if (bnInputAssetBalance.add(bnAltInputAssetBalance).lt(bnMinJoinPool)) {
+      const missingAmount = bnMinJoinPool.sub(bnInputAssetBalance).sub(bnAltInputAssetBalance);
+      const isTheSame = missingAmount.toString() === bnMinJoinPool.toString();
       const originChain = this.state.getChainInfo(inputTokenInfo.originChain);
       const altChain = this.state.getChainInfo(altInputTokenInfo.originChain);
-      const parsedMinJoinPool = formatNumber(bnMinJoinPool.toString(), inputAssetInfo.decimals || 0);
+      const originSymbol = _getAssetSymbol(inputTokenInfo);
+      const altSymbol = _getAssetSymbol(altInputTokenInfo);
+      const originName = originChain.name;
+      const altName = altChain.name;
+      const parsedMinJoinPool = formatNumber(missingAmount.toString(), inputAssetInfo.decimals || 0);
+      const formatparsedMinJoinPool = isTheSame ? parsedMinJoinPool : Number(parsedMinJoinPool) + 0.01;
+      const parsedMinAltJoinPool = formatNumber(missingAmount.add(existentialDeposit).toString(), inputAssetInfo.decimals || 0);
+      const formatParsedMinAltJoinPool = isTheSame ? parsedMinAltJoinPool : Number(parsedMinAltJoinPool) + 0.01;
       return {
         passed: false,
-        errorMessage: `You need at least ${parsedMinJoinPool} ${inputTokenInfo.symbol} (${originChain.name}) or ${altInputTokenInfo.symbol} (${altChain.name}) to start earning`
+        errorMessage: `You need to deposit an additional ${formatparsedMinJoinPool} ${originSymbol} (${originName}) or ${formatParsedMinAltJoinPool} ${altSymbol} (${altName}) to start earning`
       };
     }
     if (this.feeAssets.length === 1) {
@@ -215,13 +226,18 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
             type: YieldStepType.XCM
           };
           const xcmOriginSubstrateApi = await this.state.getSubstrateApi(altInputTokenInfo.originChain).isReady;
+          const id = getId();
+          const feeInfo = await this.state.feeService.subscribeChainFee(id, altChainInfo.slug, 'substrate');
           const xcmTransfer = await createXcmExtrinsic({
+            sender: address,
             originTokenInfo: altInputTokenInfo,
             destinationTokenInfo: inputTokenInfo,
             sendingValue: bnAmount.toString(),
             recipient: address,
-            chainInfoMap: this.state.getChainInfoMap(),
-            substrateApi: xcmOriginSubstrateApi
+            destinationChain: this.chainInfo,
+            originChain: altChainInfo,
+            substrateApi: xcmOriginSubstrateApi,
+            feeInfo
           });
           const _xcmFeeInfo = await xcmTransfer.paymentInfo(address);
           const xcmFeeInfo = _xcmFeeInfo.toPrimitive();
@@ -281,16 +297,15 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
       processValidation.failedStep = path.steps[1];
       processValidation.ok = false;
       processValidation.status = YieldValidationStatus.NOT_ENOUGH_BALANCE;
+      const bnMaxXCM = new BN(altInputTokenBalance.value).sub(xcmFee.mul(new BN(XCM_FEE_RATIO)));
+      const inputTokenDecimal = _getAssetDecimals(inputTokenInfo);
       const maxBn = bnInputTokenBalance.add(new BN(altInputTokenBalance.value)).sub(xcmFee).sub(xcmFee);
       const maxValue = formatNumber(maxBn.toString(), inputTokenInfo.decimals || 0);
-      const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
-      const symbol = altInputTokenInfo.symbol;
-      const altNetwork = this.state.getChainInfo(altInputTokenInfo.originChain);
+      const maxXCMValue = formatNumber(bnMaxXCM.toString(), inputTokenDecimal);
+      const symbol = _getAssetSymbol(altInputTokenInfo);
       const inputNetworkName = this.chainInfo.name;
-      const altNetworkName = altNetwork.name;
-      const currentValue = formatNumber(bnInputTokenBalance.toString(), inputTokenInfo.decimals || 0);
-      const bnMaxXCM = new BN(altInputTokenBalance.value).sub(xcmFee).sub(xcmFee);
-      const maxXCMValue = formatNumber(bnMaxXCM.toString(), inputTokenInfo.decimals || 0);
+      const altNetworkName = _getAssetName(altInputTokenInfo);
+      const currentValue = formatNumber(bnInputTokenBalance.toString(), inputTokenDecimal);
       processValidation.message = t('You can only enter a maximum of {{maxValue}} {{symbol}}, which is {{currentValue}} {{symbol}} ({{inputNetworkName}}) and {{maxXCMValue}} {{symbol}} ({{altNetworkName}}). Lower your amount and try again.', {
         replace: {
           symbol,
@@ -419,13 +434,18 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
     const bnXcmFee = new BN(xcmFee);
     const bnAmount = new BN(amount);
     const bnTotalAmount = bnAmount.sub(bnInputTokenBalance).add(bnXcmFee);
+    const id = getId();
+    const feeInfo = await this.state.feeService.subscribeChainFee(id, originChainInfo.slug, 'substrate');
     const extrinsic = await createXcmExtrinsic({
-      chainInfoMap: this.state.getChainInfoMap(),
       destinationTokenInfo,
       originTokenInfo,
       recipient: address,
       sendingValue: bnTotalAmount.toString(),
-      substrateApi
+      substrateApi,
+      sender: address,
+      originChain: originChainInfo,
+      destinationChain: this.chainInfo,
+      feeInfo
     });
     const xcmData = {
       originNetworkKey: originChainInfo.slug,

package/services/fee-service/interfaces.d.ts

@@ -0,0 +1,5 @@
+export interface TokenHasBalanceInfo {
+    slug: string;
+    free: string;
+    rate: string;
+}

package/services/fee-service/interfaces.js

@@ -0,0 +1 @@
+export {};

package/services/fee-service/service.d.ts

@@ -1,12 +1,15 @@
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
-import { EvmFeeInfo } from '@subwallet/extension-base/types';
+import { EvmFeeInfo, FeeChainType, FeeInfo } from '@subwallet/extension-base/types';
 export default class FeeService {
     protected readonly state: KoniState;
     private evmFeeSubject;
     private useInfura;
+    private chainFeeSubscriptionMap;
     constructor(state: KoniState);
     changeMode(useInfura: boolean): void;
     private updateFees;
     private updateChainFee;
     subscribeFees(callback: (data: Record<string, EvmFeeInfo>) => void): () => void;
+    subscribeChainFee(id: string, chain: string, type: FeeChainType, callback?: (data: FeeInfo) => void): Promise<FeeInfo>;
+    unsubscribeChainFee(id: string, chain: string, type: FeeChainType): void;
 }

package/services/fee-service/service.js

@@ -6,6 +6,11 @@ import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-se
 import { BehaviorSubject } from 'rxjs';
 export default class FeeService {
   evmFeeSubject = new BehaviorSubject({});
+  chainFeeSubscriptionMap = {
+    evm: {},
+    substrate: {},
+    ton: {}
+  };
   constructor(state) {
     this.state = state;
     this.useInfura = true;
@@ -60,4 +65,110 @@ export default class FeeService {
       clearInterval(interval);
     };
   }
+  subscribeChainFee(id, chain, type, callback) {
+    return new Promise(resolve => {
+      const _callback = value => {
+        if (value) {
+          callback === null || callback === void 0 ? void 0 : callback(value);
+          resolve(value);
+        }
+      };
+      const feeSubscription = this.chainFeeSubscriptionMap[type][chain];
+      if (feeSubscription) {
+        const observer = feeSubscription.observer;
+        _callback(observer.getValue());
+
+        // If have callback, just subscribe
+        if (callback) {
+          const subscription = observer.subscribe({
+            next: _callback
+          });
+          this.chainFeeSubscriptionMap[type][chain].subscription[id] = () => {
+            if (!subscription.closed) {
+              subscription.unsubscribe();
+            }
+          };
+        }
+      } else {
+        const observer = new BehaviorSubject(undefined);
+        const subscription = observer.subscribe({
+          next: _callback
+        });
+        let cancel = false;
+        let interval;
+        const update = () => {
+          if (cancel) {
+            clearInterval(interval);
+          } else {
+            const api = this.state.getEvmApi(chain);
+            if (api) {
+              calculateGasFeeParams(api, chain).then(info => {
+                observer.next(info);
+              }).catch(e => {
+                console.warn(`Cannot get fee param for ${chain}`, e);
+                observer.next({
+                  type: 'evm',
+                  gasPrice: '0',
+                  baseGasFee: undefined,
+                  options: undefined
+                });
+              });
+            } else {
+              observer.next({
+                type: type,
+                busyNetwork: false,
+                options: {
+                  slow: {
+                    tip: '0'
+                  },
+                  average: {
+                    tip: '0'
+                  },
+                  fast: {
+                    tip: '0'
+                  },
+                  default: 'slow'
+                }
+              });
+              clearInterval(interval);
+            }
+          }
+        };
+        update();
+
+        // If have callback, just subscribe
+        if (callback) {
+          interval = setInterval(update, 15 * 1000);
+          const unsub = () => {
+            cancel = true;
+            observer.complete();
+            clearInterval(interval);
+          };
+          this.chainFeeSubscriptionMap[type][chain] = {
+            observer,
+            subscription: {
+              [id]: () => {
+                if (!subscription.closed) {
+                  subscription.unsubscribe();
+                }
+              }
+            },
+            unsubscribe: unsub
+          };
+        }
+      }
+    });
+  }
+  unsubscribeChainFee(id, chain, type) {
+    const subscription = this.chainFeeSubscriptionMap[type][chain];
+    if (subscription) {
+      const unsub = subscription.subscription[id];
+      unsub && unsub();
+      delete subscription.subscription[id];
+      if (Object.keys(subscription.subscription).length === 0) {
+        subscription.unsubscribe();
+        delete this.chainFeeSubscriptionMap[type][chain];
+      }
+    }
+  }
 }

package/services/fee-service/utils/index.d.ts

@@ -1,8 +1,14 @@
+import { _ChainAsset } from '@subwallet/chain-list/types';
 import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
-import { EvmFeeInfo, InfuraFeeInfo } from '@subwallet/extension-base/types';
-export declare const parseInfuraFee: (info: InfuraFeeInfo) => EvmFeeInfo;
+import { EvmEIP1559FeeOption, EvmFeeInfo, InfuraFeeInfo, InfuraThresholdInfo } from '@subwallet/extension-base/types';
+import BigN from 'bignumber.js';
+import { ApiPromise } from '@polkadot/api';
+export declare const FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE = 105;
+export declare const parseInfuraFee: (info: InfuraFeeInfo, threshold: InfuraThresholdInfo) => EvmFeeInfo;
 export declare const fetchInfuraFeeData: (chainId: number, infuraAuth?: string) => Promise<EvmFeeInfo | null>;
 export declare const fetchSubWalletFeeData: (chainId: number, networkKey: string) => Promise<EvmFeeInfo | null>;
 export declare const fetchOnlineFeeData: (chainId: number, networkKey: string, useInfura?: boolean) => Promise<EvmFeeInfo | null>;
 export declare const recalculateGasPrice: (_price: string, chain: string) => string;
+export declare const getEIP1559GasFee: (baseFee: BigN, maxPriorityFee: BigN, blockNumber: number, blockTime: number) => EvmEIP1559FeeOption;
 export declare const calculateGasFeeParams: (web3: _EvmApi, networkKey: string, useOnline?: boolean, useInfura?: boolean) => Promise<EvmFeeInfo>;
+export declare const calculateToAmountByReservePool: (api: ApiPromise, fromToken: _ChainAsset, toToken: _ChainAsset, fromAmount: string) => Promise<string>;