@subwallet/extension-base 1.1.28-beta.3 → 1.1.29-beta.0

package/cjs/packageInfo.js

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

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/services/earning-service/constants");
+var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -70,6 +71,13 @@ class BasePoolHandler {
       slug: this.slug
     };
   }
+  get maintainBalance() {
+    const decimals = this.nativeToken.decimals || 0;
+    const defaultMaintainBalance = new _util.BN(1).mul(_util.BN_TEN.pow(new _util.BN(decimals)));
+    const ed = new _util.BN(this.nativeToken.minAmount || '0');
+    const maintainBalance = ed.gt(defaultMaintainBalance) ? ed.mul(new _util.BN(1.5)) : defaultMaintainBalance;
+    return maintainBalance.toString();
+  }
   get metadataInfo() {
     return {
       name: this.name,
@@ -77,7 +85,9 @@ class BasePoolHandler {
       logo: this.logo,
       inputAsset: this.nativeToken.slug,
       isAvailable: true,
-      allowCancelUnstaking: false
+      allowCancelUnstaking: false,
+      maintainAsset: this.nativeToken.slug,
+      maintainBalance: this.maintainBalance
     };
   }
 

package/cjs/services/earning-service/handlers/lending/interlay.js

@@ -9,7 +9,6 @@ var _TransactionError = require("@subwallet/extension-base/background/errors/Tra
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/types");
-var _bn = _interopRequireDefault(require("bn.js"));
 var _util = require("@polkadot/util");
 var _constants = require("../../constants");
 var _base = _interopRequireDefault(require("./base"));
@@ -124,12 +123,19 @@ class InterlayLendingPoolHandler extends _base.default {
     const inputTokenSlug = this.inputAsset;
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
     const defaultFeeTokenSlug = this.feeAssets[0];
-    const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.loans.mint((0, _utils._getTokenOnChainInfo)(inputTokenInfo), params.amount).paymentInfo(_constants.fakeAddress);
-    const mintFeeInfo = _mintFeeInfo.toPrimitive();
-    return {
-      amount: mintFeeInfo.partialFee.toString(),
-      slug: defaultFeeTokenSlug
-    };
+    if (new _util.BN(params.amount).gt(_util.BN_ZERO)) {
+      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.loans.mint((0, _utils._getTokenOnChainInfo)(inputTokenInfo), params.amount).paymentInfo(_constants.fakeAddress);
+      const mintFeeInfo = _mintFeeInfo.toPrimitive();
+      return {
+        amount: mintFeeInfo.partialFee.toString(),
+        slug: defaultFeeTokenSlug
+      };
+    } else {
+      return {
+        amount: '0',
+        slug: defaultFeeTokenSlug
+      };
+    }
   }
   async handleSubmitStep(data, path) {
     const substrateApi = await this.substrateApi.isReady;
@@ -158,8 +164,8 @@ class InterlayLendingPoolHandler extends _base.default {
     if (!yieldPositionInfo) {
       return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS));
     }
-    const bnAmount = new _bn.default(amount);
-    const bnActiveBalance = new _bn.default(yieldPositionInfo.activeStake);
+    const bnAmount = new _util.BN(amount);
+    const bnActiveBalance = new _util.BN(yieldPositionInfo.activeStake);
     const redeemAll = bnAmount.eq(bnActiveBalance);
     const extrinsic = !redeemAll ? substrateApi.api.tx.loans.redeem((0, _utils._getTokenOnChainInfo)(inputTokenInfo), amount) : substrateApi.api.tx.loans.redeemAll((0, _utils._getTokenOnChainInfo)(inputTokenInfo));
     return [_KoniTypes.ExtrinsicType.REDEEM_QDOT, extrinsic];

package/cjs/services/earning-service/handlers/liquid-staking/acala.js

@@ -79,6 +79,7 @@ class AcalaLiquidStakingPoolHandler extends _base.default {
           apy: apy * 100,
           exchangeRate: latestExchangeRate / decimals
         }],
+        unstakingPeriod: 24 * 28,
         maxCandidatePerFarmer: 1,
         maxWithdrawalRequestPerFarmer: 1,
         minJoinPool: '50000000000',
@@ -146,12 +147,19 @@ class AcalaLiquidStakingPoolHandler extends _base.default {
   async getSubmitStepFee(params) {
     const poolOriginSubstrateApi = await this.substrateApi.isReady;
     const defaultFeeTokenSlug = this.feeAssets[0];
-    const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.homa.mint(params.amount).paymentInfo(_constants.fakeAddress);
-    const mintFeeInfo = _mintFeeInfo.toPrimitive();
-    return {
-      amount: mintFeeInfo.partialFee.toString(),
-      slug: defaultFeeTokenSlug
-    };
+    if (new _util.BN(params.amount).gt(_util.BN_ZERO)) {
+      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.homa.mint(params.amount).paymentInfo(_constants.fakeAddress);
+      const mintFeeInfo = _mintFeeInfo.toPrimitive();
+      return {
+        amount: mintFeeInfo.partialFee.toString(),
+        slug: defaultFeeTokenSlug
+      };
+    } else {
+      return {
+        amount: '0',
+        slug: defaultFeeTokenSlug
+      };
+    }
   }
   async handleSubmitStep(data, path) {
     const substrateApi = await this.substrateApi.isReady;

package/cjs/services/earning-service/handlers/liquid-staking/bifrost.js

@@ -81,6 +81,7 @@ class BifrostLiquidStakingPoolHandler extends _base.default {
           apy: parseFloat(vDOTStats.apyBase),
           exchangeRate: parseFloat(exchangeRate.data.slp_polkadot_ratio[0].ratio)
         }],
+        unstakingPeriod: 24 * 28,
         maxCandidatePerFarmer: 1,
         maxWithdrawalRequestPerFarmer: 1,
         minJoinPool: '5000000000',
@@ -222,12 +223,19 @@ class BifrostLiquidStakingPoolHandler extends _base.default {
     const inputTokenSlug = this.inputAsset;
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
     const defaultFeeTokenSlug = this.feeAssets[0];
-    const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.vtokenMinting.mint((0, _utils._getTokenOnChainInfo)(inputTokenInfo), params.amount, null).paymentInfo(_constants2.fakeAddress);
-    const mintFeeInfo = _mintFeeInfo.toPrimitive();
-    return {
-      amount: mintFeeInfo.partialFee.toString(),
-      slug: defaultFeeTokenSlug
-    };
+    if (new _util.BN(params.amount).gt(_util.BN_ZERO)) {
+      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.vtokenMinting.mint((0, _utils._getTokenOnChainInfo)(inputTokenInfo), params.amount, null).paymentInfo(_constants2.fakeAddress);
+      const mintFeeInfo = _mintFeeInfo.toPrimitive();
+      return {
+        amount: mintFeeInfo.partialFee.toString(),
+        slug: defaultFeeTokenSlug
+      };
+    } else {
+      return {
+        amount: '0',
+        slug: defaultFeeTokenSlug
+      };
+    }
   }
   async handleSubmitStep(data, path) {
     const substrateApi = await this.substrateApi.isReady;

package/cjs/services/earning-service/handlers/liquid-staking/parallel.js

@@ -70,6 +70,7 @@ class ParallelLiquidStakingPoolHandler extends _base.default {
           apy: apy * 100,
           exchangeRate: exchangeRate / decimals
         }],
+        unstakingPeriod: 24 * 28,
         maxCandidatePerFarmer: 1,
         maxWithdrawalRequestPerFarmer: 1,
         minJoinPool: '10000000000',
@@ -142,12 +143,19 @@ class ParallelLiquidStakingPoolHandler extends _base.default {
   async getSubmitStepFee(params) {
     const poolOriginSubstrateApi = await this.substrateApi.isReady;
     const defaultFeeTokenSlug = this.feeAssets[0];
-    const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.liquidStaking.stake(params.amount).paymentInfo(_constants.fakeAddress);
-    const mintFeeInfo = _mintFeeInfo.toPrimitive();
-    return {
-      amount: mintFeeInfo.partialFee.toString(),
-      slug: defaultFeeTokenSlug
-    };
+    if (new _util.BN(params.amount).gt(_util.BN_ZERO)) {
+      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.liquidStaking.stake(params.amount).paymentInfo(_constants.fakeAddress);
+      const mintFeeInfo = _mintFeeInfo.toPrimitive();
+      return {
+        amount: mintFeeInfo.partialFee.toString(),
+        slug: defaultFeeTokenSlug
+      };
+    } else {
+      return {
+        amount: '0',
+        slug: defaultFeeTokenSlug
+      };
+    }
   }
   async handleSubmitStep(data, path) {
     const substrateApi = await this.substrateApi.isReady;

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

@@ -10,7 +10,6 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _web = require("@subwallet/extension-base/koni/api/tokens/evm/web3");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/types");
-var _bn = require("bn.js");
 var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _util = require("@polkadot/util");
 var _constants = require("../../constants");
@@ -90,6 +89,7 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
           apr: aprObject.result,
           exchangeRate: exchangeRate
         }],
+        unstakingPeriod: 24 * 28,
         maxCandidatePerFarmer: 1,
         maxWithdrawalRequestPerFarmer: 1,
         minJoinPool: '0',
@@ -126,7 +126,7 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
           const unstakings = [];
           let unlockBalance = _util.BN_ZERO;
           if (parseInt(unbondedObject.unbonded) > 0) {
-            unlockBalance = unlockBalance.add(new _bn.BN(unbondedObject.unbonded));
+            unlockBalance = unlockBalance.add(new _util.BN(unbondedObject.unbonded));
             unstakings.push({
               chain: this.chain,
               claimable: unbondedObject.unbonded,
@@ -135,7 +135,7 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
             });
           }
           if (parseInt(unbondedObject.waiting) > 0) {
-            unlockBalance = unlockBalance.add(new _bn.BN(unbondedObject.waiting));
+            unlockBalance = unlockBalance.add(new _util.BN(unbondedObject.waiting));
             unstakings.push({
               chain: this.chain,
               claimable: unbondedObject.waiting,
@@ -144,7 +144,7 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
             });
           }
 
-          const totalBalance = new _bn.BN(balance).add(unlockBalance);
+          const totalBalance = new _util.BN(balance).add(unlockBalance);
           const result = {
             ...this.baseInfo,
             type: this.type,
@@ -214,18 +214,25 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
     const evmApi = this.evmApi;
     const derivativeTokenSlug = this.derivativeAssets[0];
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
-    const stakingContract = getStellaswapLiquidStakingContract(this.chain, (0, _utils._getContractAddressOfToken)(derivativeTokenInfo), evmApi);
+    if (new _util.BN(params.amount).gt(_util.BN_ZERO)) {
+      const stakingContract = getStellaswapLiquidStakingContract(this.chain, (0, _utils._getContractAddressOfToken)(derivativeTokenInfo), evmApi);
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-    const depositCall = stakingContract.methods.deposit(params.amount);
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+      const depositCall = stakingContract.methods.deposit(params.amount);
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-    const estimatedDepositGas = await depositCall.estimateGas();
-    const gasPrice = await evmApi.api.eth.getGasPrice();
-    return {
-      slug: this.feeAssets[0],
-      amount: (estimatedDepositGas * parseInt(gasPrice)).toString()
-    };
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+      const estimatedDepositGas = await depositCall.estimateGas();
+      const gasPrice = await evmApi.api.eth.getGasPrice();
+      return {
+        slug: this.feeAssets[0],
+        amount: (estimatedDepositGas * parseInt(gasPrice)).toString()
+      };
+    } else {
+      return {
+        slug: this.feeAssets[0],
+        amount: '0'
+      };
+    }
   }
   async generateOptimalPath(params) {
     const result = {

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

@@ -67,6 +67,9 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
           description: this.getDescription(minToHuman)
         },
         statistic: {
+          assetEarning: [{
+            slug: this.nativeToken.slug
+          }],
           maxCandidatePerFarmer: parseInt(maxDelegations),
           maxWithdrawalRequestPerFarmer: 1,
           // by default
@@ -288,13 +291,17 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
     const binaryAmount = new _util.BN(amount);
     const poolPosition = await this.getPoolPosition(address);
     const selectedValidatorInfo = targetValidators[0];
+
+    // eslint-disable-next-line @typescript-eslint/require-await
     const compoundResult = async extrinsic => {
       const tokenSlug = this.nativeToken.slug;
-      const feeInfo = await extrinsic.paymentInfo(address);
-      const fee = feeInfo.toPrimitive();
+      // const feeInfo = await extrinsic.paymentInfo(address);
+      // const fee = feeInfo.toPrimitive() as unknown as RuntimeDispatchInfo;
+
+      // Not use the fee to validate and to display on UI
       return [extrinsic, {
         slug: tokenSlug,
-        amount: fee.partialFee.toString()
+        amount: '0'
       }];
     };
     if (!poolPosition) {

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

@@ -74,7 +74,10 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
         method: 'GET'
       }).then(resp => {
         resolve(resp.json());
-      }).catch(console.error);
+      }).catch(e => {
+        console.error(e);
+        resolve(null);
+      });
     });
     const timeout = new Promise(resolve => {
       const id = setTimeout(() => {
@@ -110,6 +113,10 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
           description: this.getDescription(minToHuman)
         },
         statistic: {
+          assetEarning: [{
+            slug: this.nativeToken.slug,
+            apy: apyInfo !== null ? apyInfo : undefined
+          }],
           maxCandidatePerFarmer: 100,
           // temporary fix for Astar, there's no limit for now
           maxWithdrawalRequestPerFarmer: 1,
@@ -346,7 +353,6 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
   async createJoinExtrinsic(data, positionInfo) {
     let bondDest = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'Staked';
     const {
-      address,
       amount,
       selectedValidators: targetValidators
     } = data;
@@ -360,11 +366,13 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
     };
     const extrinsic = chainApi.api.tx.dappsStaking.bondAndStake(dappParam, binaryAmount);
     const tokenSlug = this.nativeToken.slug;
-    const feeInfo = await extrinsic.paymentInfo(address);
-    const fee = feeInfo.toPrimitive();
+    // const feeInfo = await extrinsic.paymentInfo(address);
+    // const fee = feeInfo.toPrimitive() as unknown as RuntimeDispatchInfo;
+
+    // Not use the fee to validate and to display on UI
     return [extrinsic, {
       slug: tokenSlug,
-      amount: fee.partialFee.toString()
+      amount: '0'
     }];
   }
 

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

@@ -80,6 +80,9 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
           description: this.getDescription(minToHuman)
         },
         statistic: {
+          assetEarning: [{
+            slug: this.nativeToken.slug
+          }],
           maxCandidatePerFarmer: parseInt(maxDelegations),
           maxWithdrawalRequestPerFarmer: 1,
           // by default
@@ -295,20 +298,23 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
 
   async createJoinExtrinsic(data, positionInfo) {
     const {
-      address,
       amount,
       selectedValidators
     } = data;
     const apiPromise = await this.substrateApi.isReady;
     const binaryAmount = new _util.BN(amount);
     const selectedCollatorInfo = selectedValidators[0];
+
+    // eslint-disable-next-line @typescript-eslint/require-await
     const compoundResult = async extrinsic => {
       const tokenSlug = this.nativeToken.slug;
-      const feeInfo = await extrinsic.paymentInfo(address);
-      const fee = feeInfo.toPrimitive();
+      // const feeInfo = await extrinsic.paymentInfo(address);
+      // const fee = feeInfo.toPrimitive() as unknown as RuntimeDispatchInfo;
+
+      // Not use the fee to validate and to display on UI
       return [extrinsic, {
         slug: tokenSlug,
-        amount: fee.partialFee.toString()
+        amount: '0'
       }];
     };
     if (!positionInfo) {

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

@@ -80,6 +80,10 @@ class RelayNativeStakingPoolHandler extends _base.default {
           description: this.getDescription(minToHuman)
         },
         statistic: {
+          assetEarning: [{
+            slug: this.nativeToken.slug,
+            apy: expectedReturn
+          }],
           maxCandidatePerFarmer: parseInt(maxNominations),
           maxWithdrawalRequestPerFarmer: parseInt(maxUnlockingChunks),
           // TODO recheck
@@ -390,16 +394,21 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const validatorParamList = targetValidators.map(validator => {
       return validator.address;
     });
+
+    // eslint-disable-next-line @typescript-eslint/require-await
     const compoundTransactions = async (bondTx, nominateTx) => {
       const extrinsic = chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
-      const fees = await Promise.all([bondTx.paymentInfo(address), nominateTx.paymentInfo(address)]);
-      const totalFee = fees.reduce((previousValue, currentItem) => {
-        const fee = currentItem.toPrimitive();
-        return previousValue + fee.partialFee;
-      }, 0);
+      // const fees = await Promise.all([bondTx.paymentInfo(address), nominateTx.paymentInfo(address)]);
+      // const totalFee = fees.reduce((previousValue, currentItem) => {
+      //   const fee = currentItem.toPrimitive() as unknown as RuntimeDispatchInfo;
+      //
+      //   return previousValue + fee.partialFee;
+      // }, 0);
+
+      // Not use the fee to validate and to display on UI
       return [extrinsic, {
         slug: tokenSlug,
-        amount: totalFee.toString()
+        amount: '0'
       }];
     };
     if (!positionInfo) {
@@ -429,18 +438,20 @@ class RelayNativeStakingPoolHandler extends _base.default {
       }
     }
     if (bondTx && !nominateTx) {
-      const feeInfo = await bondTx.paymentInfo(address);
-      const fee = feeInfo.toPrimitive();
+      // const feeInfo = await bondTx.paymentInfo(address);
+      // const fee = feeInfo.toPrimitive() as unknown as RuntimeDispatchInfo;
+
       return [bondTx, {
         slug: tokenSlug,
-        amount: fee.partialFee.toString()
+        amount: '0'
       }];
     } else if (nominateTx && !bondTx) {
-      const feeInfo = await nominateTx.paymentInfo(address);
-      const fee = feeInfo.toPrimitive();
+      // const feeInfo = await nominateTx.paymentInfo(address);
+      // const fee = feeInfo.toPrimitive() as unknown as RuntimeDispatchInfo;
+
       return [nominateTx, {
         slug: tokenSlug,
-        amount: fee.partialFee.toString()
+        amount: '0'
       }];
     }
     if (bondTx && nominateTx) {

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

@@ -95,6 +95,10 @@ class NominationPoolHandler extends _base.default {
           description: this.getDescription(minToHuman)
         },
         statistic: {
+          assetEarning: [{
+            slug: this.nativeToken.slug,
+            apy: expectedReturn
+          }],
           maxCandidatePerFarmer: 1,
           maxWithdrawalRequestPerFarmer: parseInt(maxUnlockingChunks),
           // TODO recheck
@@ -387,7 +391,6 @@ class NominationPoolHandler extends _base.default {
   }
   async createJoinExtrinsic(data, positionInfo) {
     const {
-      address,
       amount,
       selectedPool: {
         id: selectedPoolId
@@ -395,13 +398,17 @@ class NominationPoolHandler extends _base.default {
     } = data;
     const chainApi = await this.substrateApi.isReady;
     const bnActiveStake = new _util.BN((positionInfo === null || positionInfo === void 0 ? void 0 : positionInfo.activeStake) || '0');
+
+    // eslint-disable-next-line @typescript-eslint/require-await
     const compoundResult = async extrinsic => {
       const tokenSlug = this.nativeToken.slug;
-      const feeInfo = await extrinsic.paymentInfo(address);
-      const fee = feeInfo.toPrimitive();
+      // const feeInfo = await extrinsic.paymentInfo(address);
+      // const fee = feeInfo.toPrimitive() as unknown as RuntimeDispatchInfo;
+
+      // Not use the fee to validate and to display on UI
       return [extrinsic, {
         slug: tokenSlug,
-        amount: fee.partialFee.toString()
+        amount: '0'
       }];
     };
     if (bnActiveStake.gt(_util.BN_ZERO)) {

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

@@ -12,7 +12,6 @@ var _xcm = require("@subwallet/extension-base/koni/api/xcm");
 var _utils = require("@subwallet/extension-base/koni/api/yield/helper/utils");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/types");
-var _bn = _interopRequireDefault(require("bn.js"));
 var _i18next = require("i18next");
 var _util = require("@polkadot/util");
 var _base = _interopRequireDefault(require("./base"));
@@ -37,7 +36,9 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       shortName: this.shortName,
       name: this.name,
       isAvailable: true,
-      allowCancelUnstaking: false
+      allowCancelUnstaking: false,
+      maintainAsset: this.nativeToken.slug,
+      maintainBalance: this.maintainBalance
     };
   }
   get isPoolSupportAlternativeFee() {
@@ -122,17 +123,17 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       address,
       amount
     } = params;
-    const bnAmount = new _bn.default(amount);
+    const bnAmount = new _util.BN(amount);
     const inputTokenSlug = this.inputAsset; // assume that the pool only has 1 input token, will update later
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
     const inputTokenBalance = await this.state.balanceService.getTokenFreeBalance(address, inputTokenInfo.originChain, inputTokenSlug);
-    const bnInputTokenBalance = new _bn.default(inputTokenBalance.value);
+    const bnInputTokenBalance = new _util.BN(inputTokenBalance.value);
     if (!bnInputTokenBalance.gte(bnAmount)) {
       if (this.altInputAsset) {
         const altInputTokenSlug = this.altInputAsset;
         const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
         const altInputTokenBalance = await this.state.balanceService.getTokenFreeBalance(address, altInputTokenInfo.originChain, altInputTokenSlug);
-        const bnAltInputTokenBalance = new _bn.default(altInputTokenBalance.value || '0');
+        const bnAltInputTokenBalance = new _util.BN(altInputTokenBalance.value || '0');
         if (bnAltInputTokenBalance.gt(_util.BN_ZERO)) {
           const step = {
             metadata: {
@@ -197,15 +198,15 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       ok: true,
       status: _types.YieldValidationStatus.OK
     };
-    const bnAmount = new _bn.default(params.amount);
+    const bnAmount = new _util.BN(params.amount);
     const altInputTokenSlug = this.altInputAsset || '';
     const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
     const altInputTokenBalance = await this.state.balanceService.getTokenFreeBalance(params.address, altInputTokenInfo.originChain, altInputTokenSlug);
     const missingAmount = bnAmount.sub(bnInputTokenBalance); // TODO: what if input token is not LOCAL ??
-    const xcmFee = new _bn.default(path.totalFee[1].amount || '0');
+    const xcmFee = new _util.BN(path.totalFee[1].amount || '0');
     const xcmAmount = missingAmount.add(xcmFee);
-    const bnAltInputTokenBalance = new _bn.default(altInputTokenBalance.value || '0');
-    const altInputTokenMinAmount = new _bn.default(altInputTokenInfo.minAmount || '0');
+    const bnAltInputTokenBalance = new _util.BN(altInputTokenBalance.value || '0');
+    const altInputTokenMinAmount = new _util.BN(altInputTokenInfo.minAmount || '0');
     if (!bnAltInputTokenBalance.sub(xcmAmount).gte(altInputTokenMinAmount)) {
       processValidation.failedStep = path.steps[1];
       processValidation.ok = false;
@@ -230,13 +231,13 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const feeTokenSlug = path.totalFee[id].slug;
     const feeTokenInfo = this.state.getAssetBySlug(feeTokenSlug);
     const defaultFeeTokenSlug = this.feeAssets[0];
-    const bnAmount = new _bn.default(params.amount);
+    const bnAmount = new _util.BN(params.amount);
     if (this.feeAssets.length === 1 && feeTokenSlug === defaultFeeTokenSlug) {
       var _path$totalFee$id;
-      const bnFeeAmount = new _bn.default(((_path$totalFee$id = path.totalFee[id]) === null || _path$totalFee$id === void 0 ? void 0 : _path$totalFee$id.amount) || '0');
+      const bnFeeAmount = new _util.BN(((_path$totalFee$id = path.totalFee[id]) === null || _path$totalFee$id === void 0 ? void 0 : _path$totalFee$id.amount) || '0');
       const feeTokenBalance = await this.state.balanceService.getTokenFreeBalance(params.address, feeTokenInfo.originChain, feeTokenSlug);
-      const bnFeeTokenBalance = new _bn.default(feeTokenBalance.value || '0');
-      const bnFeeTokenMinAmount = new _bn.default((feeTokenInfo === null || feeTokenInfo === void 0 ? void 0 : feeTokenInfo.minAmount) || '0');
+      const bnFeeTokenBalance = new _util.BN(feeTokenBalance.value || '0');
+      const bnFeeTokenMinAmount = new _util.BN((feeTokenInfo === null || feeTokenInfo === void 0 ? void 0 : feeTokenInfo.minAmount) || '0');
       if (!bnFeeTokenBalance.sub(bnFeeAmount).gte(bnFeeTokenMinAmount)) {
         processValidation.failedStep = path.steps[id];
         processValidation.ok = false;
@@ -244,7 +245,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
         return [new _TransactionError.TransactionError(_types.YieldValidationStatus.NOT_ENOUGH_FEE, processValidation.message, processValidation)];
       }
     }
-    if (!bnAmount.gte(new _bn.default(poolInfo.statistic.minJoinPool || '0'))) {
+    if (!bnAmount.gte(new _util.BN(poolInfo.statistic.minJoinPool || '0'))) {
       processValidation.failedStep = path.steps[id];
       processValidation.ok = false;
       processValidation.status = _types.YieldValidationStatus.NOT_ENOUGH_MIN_JOIN_POOL;
@@ -263,7 +264,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
     const balanceService = this.state.balanceService;
     const inputTokenBalance = await balanceService.getTokenFreeBalance(params.address, inputTokenInfo.originChain, inputTokenSlug);
-    const bnInputTokenBalance = new _bn.default(inputTokenBalance.value || '0');
+    const bnInputTokenBalance = new _util.BN(inputTokenBalance.value || '0');
     let isXcmOk = false;
     for (const step of path.steps) {
       const getErrors = async () => {
@@ -307,9 +308,9 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const destinationTokenInfo = this.state.getAssetBySlug(destinationTokenSlug);
     const substrateApi = this.state.getSubstrateApi(originChainInfo.slug);
     const inputTokenBalance = await this.state.balanceService.getTokenFreeBalance(address, destinationTokenInfo.originChain, destinationTokenSlug);
-    const bnInputTokenBalance = new _bn.default(inputTokenBalance.value);
-    const bnXcmFee = new _bn.default(xcmFee);
-    const bnAmount = new _bn.default(amount);
+    const bnInputTokenBalance = new _util.BN(inputTokenBalance.value);
+    const bnXcmFee = new _util.BN(xcmFee);
+    const bnAmount = new _util.BN(amount);
     const bnTotalAmount = bnAmount.sub(bnInputTokenBalance).add(bnXcmFee);
     const extrinsic = await (0, _xcm.createXcmExtrinsic)({
       chainInfoMap: this.state.getChainInfoMap(),
@@ -372,9 +373,9 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)];
     }
     const errors = [];
-    const bnActiveStake = new _bn.default(poolPosition.activeStake);
-    const bnRemainingStake = bnActiveStake.sub(new _bn.default(amount));
-    const minStake = new _bn.default(poolInfo.statistic.minJoinPool || '0');
+    const bnActiveStake = new _util.BN(poolPosition.activeStake);
+    const bnRemainingStake = bnActiveStake.sub(new _util.BN(amount));
+    const minStake = new _util.BN(poolInfo.statistic.minJoinPool || '0');
     const maxUnstake = poolInfo.statistic.maxWithdrawalRequestPerFarmer;
     if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(minStake))) {
       errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.INVALID_ACTIVE_STAKE));

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.28-beta.3",
+  "version": "1.1.29-beta.0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1695,11 +1695,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.32",
-    "@subwallet/extension-base": "^1.1.28-1",
-    "@subwallet/extension-chains": "^1.1.28-1",
-    "@subwallet/extension-dapp": "^1.1.28-1",
-    "@subwallet/extension-inject": "^1.1.28-1",
+    "@subwallet/chain-list": "0.2.33",
+    "@subwallet/extension-base": "^1.1.29-0",
+    "@subwallet/extension-chains": "^1.1.29-0",
+    "@subwallet/extension-dapp": "^1.1.29-0",
+    "@subwallet/extension-inject": "^1.1.29-0",
     "@subwallet/keyring": "^0.1.1",
     "@subwallet/ui-keyring": "^0.1.1",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.28-1'
+  version: '1.1.29-0'
 };

package/services/earning-service/handlers/base.d.ts

@@ -40,6 +40,7 @@ export default abstract class BasePoolHandler {
     protected get nativeToken(): _ChainAsset;
     protected get baseInfo(): Omit<BasePoolInfo, 'type'>;
     protected abstract getDescription(amount?: string): string;
+    protected get maintainBalance(): string;
     protected get metadataInfo(): Omit<BaseYieldPoolMetadata, 'description'>;
     /** Can mint when haven't enough native token (use input token for fee) */
     get isPoolSupportAlternativeFee(): boolean;

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

@@ -3,6 +3,8 @@
 
 import { ChainType } from '@subwallet/extension-base/background/KoniTypes';
 import { DEFAULT_YIELD_FIRST_STEP } from '@subwallet/extension-base/services/earning-service/constants';
+import { BN, BN_TEN } from '@polkadot/util';
+
 /**
  * @class BasePoolHandler
  * @description Base pool handler
@@ -64,6 +66,13 @@ export default class BasePoolHandler {
       slug: this.slug
     };
   }
+  get maintainBalance() {
+    const decimals = this.nativeToken.decimals || 0;
+    const defaultMaintainBalance = new BN(1).mul(BN_TEN.pow(new BN(decimals)));
+    const ed = new BN(this.nativeToken.minAmount || '0');
+    const maintainBalance = ed.gt(defaultMaintainBalance) ? ed.mul(new BN(1.5)) : defaultMaintainBalance;
+    return maintainBalance.toString();
+  }
   get metadataInfo() {
     return {
       name: this.name,
@@ -71,7 +80,9 @@ export default class BasePoolHandler {
       logo: this.logo,
       inputAsset: this.nativeToken.slug,
       isAvailable: true,
-      allowCancelUnstaking: false
+      allowCancelUnstaking: false,
+      maintainAsset: this.nativeToken.slug,
+      maintainBalance: this.maintainBalance
     };
   }
 

package/services/earning-service/handlers/lending/interlay.js

@@ -5,8 +5,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { BasicTxErrorType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _getTokenOnChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import { EarningStatus, YieldStepType } from '@subwallet/extension-base/types';
-import BN from 'bn.js';
-import { BN_ZERO } from '@polkadot/util';
+import { BN, BN_ZERO } from '@polkadot/util';
 import { fakeAddress } from "../../constants/index.js";
 import BaseLendingPoolHandler from "./base.js";
 export default class InterlayLendingPoolHandler extends BaseLendingPoolHandler {
@@ -117,12 +116,19 @@ export default class InterlayLendingPoolHandler extends BaseLendingPoolHandler {
     const inputTokenSlug = this.inputAsset;
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
     const defaultFeeTokenSlug = this.feeAssets[0];
-    const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.loans.mint(_getTokenOnChainInfo(inputTokenInfo), params.amount).paymentInfo(fakeAddress);
-    const mintFeeInfo = _mintFeeInfo.toPrimitive();
-    return {
-      amount: mintFeeInfo.partialFee.toString(),
-      slug: defaultFeeTokenSlug
-    };
+    if (new BN(params.amount).gt(BN_ZERO)) {
+      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.loans.mint(_getTokenOnChainInfo(inputTokenInfo), params.amount).paymentInfo(fakeAddress);
+      const mintFeeInfo = _mintFeeInfo.toPrimitive();
+      return {
+        amount: mintFeeInfo.partialFee.toString(),
+        slug: defaultFeeTokenSlug
+      };
+    } else {
+      return {
+        amount: '0',
+        slug: defaultFeeTokenSlug
+      };
+    }
   }
   async handleSubmitStep(data, path) {
     const substrateApi = await this.substrateApi.isReady;

package/services/earning-service/handlers/liquid-staking/acala.js

@@ -72,6 +72,7 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
           apy: apy * 100,
           exchangeRate: latestExchangeRate / decimals
         }],
+        unstakingPeriod: 24 * 28,
         maxCandidatePerFarmer: 1,
         maxWithdrawalRequestPerFarmer: 1,
         minJoinPool: '50000000000',
@@ -139,12 +140,19 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
   async getSubmitStepFee(params) {
     const poolOriginSubstrateApi = await this.substrateApi.isReady;
     const defaultFeeTokenSlug = this.feeAssets[0];
-    const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.homa.mint(params.amount).paymentInfo(fakeAddress);
-    const mintFeeInfo = _mintFeeInfo.toPrimitive();
-    return {
-      amount: mintFeeInfo.partialFee.toString(),
-      slug: defaultFeeTokenSlug
-    };
+    if (new BN(params.amount).gt(BN_ZERO)) {
+      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.homa.mint(params.amount).paymentInfo(fakeAddress);
+      const mintFeeInfo = _mintFeeInfo.toPrimitive();
+      return {
+        amount: mintFeeInfo.partialFee.toString(),
+        slug: defaultFeeTokenSlug
+      };
+    } else {
+      return {
+        amount: '0',
+        slug: defaultFeeTokenSlug
+      };
+    }
   }
   async handleSubmitStep(data, path) {
     const substrateApi = await this.substrateApi.isReady;

package/services/earning-service/handlers/liquid-staking/bifrost.js

@@ -74,6 +74,7 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
           apy: parseFloat(vDOTStats.apyBase),
           exchangeRate: parseFloat(exchangeRate.data.slp_polkadot_ratio[0].ratio)
         }],
+        unstakingPeriod: 24 * 28,
         maxCandidatePerFarmer: 1,
         maxWithdrawalRequestPerFarmer: 1,
         minJoinPool: '5000000000',
@@ -212,12 +213,19 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
     const inputTokenSlug = this.inputAsset;
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
     const defaultFeeTokenSlug = this.feeAssets[0];
-    const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.vtokenMinting.mint(_getTokenOnChainInfo(inputTokenInfo), params.amount, null).paymentInfo(fakeAddress);
-    const mintFeeInfo = _mintFeeInfo.toPrimitive();
-    return {
-      amount: mintFeeInfo.partialFee.toString(),
-      slug: defaultFeeTokenSlug
-    };
+    if (new BN(params.amount).gt(BN_ZERO)) {
+      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.vtokenMinting.mint(_getTokenOnChainInfo(inputTokenInfo), params.amount, null).paymentInfo(fakeAddress);
+      const mintFeeInfo = _mintFeeInfo.toPrimitive();
+      return {
+        amount: mintFeeInfo.partialFee.toString(),
+        slug: defaultFeeTokenSlug
+      };
+    } else {
+      return {
+        amount: '0',
+        slug: defaultFeeTokenSlug
+      };
+    }
   }
   async handleSubmitStep(data, path) {
     const substrateApi = await this.substrateApi.isReady;

package/services/earning-service/handlers/liquid-staking/parallel.js

@@ -63,6 +63,7 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
           apy: apy * 100,
           exchangeRate: exchangeRate / decimals
         }],
+        unstakingPeriod: 24 * 28,
         maxCandidatePerFarmer: 1,
         maxWithdrawalRequestPerFarmer: 1,
         minJoinPool: '10000000000',
@@ -135,12 +136,19 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
   async getSubmitStepFee(params) {
     const poolOriginSubstrateApi = await this.substrateApi.isReady;
     const defaultFeeTokenSlug = this.feeAssets[0];
-    const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.liquidStaking.stake(params.amount).paymentInfo(fakeAddress);
-    const mintFeeInfo = _mintFeeInfo.toPrimitive();
-    return {
-      amount: mintFeeInfo.partialFee.toString(),
-      slug: defaultFeeTokenSlug
-    };
+    if (new BN(params.amount).gt(BN_ZERO)) {
+      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.liquidStaking.stake(params.amount).paymentInfo(fakeAddress);
+      const mintFeeInfo = _mintFeeInfo.toPrimitive();
+      return {
+        amount: mintFeeInfo.partialFee.toString(),
+        slug: defaultFeeTokenSlug
+      };
+    } else {
+      return {
+        amount: '0',
+        slug: defaultFeeTokenSlug
+      };
+    }
   }
   async handleSubmitStep(data, path) {
     const substrateApi = await this.substrateApi.isReady;

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

@@ -6,9 +6,8 @@ import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension
 import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
 import { _getAssetDecimals, _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
-import { BN } from 'bn.js';
 import fetch from 'cross-fetch';
-import { BN_ZERO } from '@polkadot/util';
+import { BN, BN_ZERO } from '@polkadot/util';
 import { DEFAULT_YIELD_FIRST_STEP, ST_LIQUID_TOKEN_ABI } from "../../constants/index.js";
 import BaseLiquidStakingPoolHandler from "./base.js";
 export const getStellaswapLiquidStakingContract = (networkKey, assetAddress, evmApi, options = {}) => {
@@ -81,6 +80,7 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
           apr: aprObject.result,
           exchangeRate: exchangeRate
         }],
+        unstakingPeriod: 24 * 28,
         maxCandidatePerFarmer: 1,
         maxWithdrawalRequestPerFarmer: 1,
         minJoinPool: '0',
@@ -205,18 +205,25 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     const evmApi = this.evmApi;
     const derivativeTokenSlug = this.derivativeAssets[0];
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
-    const stakingContract = getStellaswapLiquidStakingContract(this.chain, _getContractAddressOfToken(derivativeTokenInfo), evmApi);
+    if (new BN(params.amount).gt(BN_ZERO)) {
+      const stakingContract = getStellaswapLiquidStakingContract(this.chain, _getContractAddressOfToken(derivativeTokenInfo), evmApi);
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-    const depositCall = stakingContract.methods.deposit(params.amount);
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+      const depositCall = stakingContract.methods.deposit(params.amount);
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-    const estimatedDepositGas = await depositCall.estimateGas();
-    const gasPrice = await evmApi.api.eth.getGasPrice();
-    return {
-      slug: this.feeAssets[0],
-      amount: (estimatedDepositGas * parseInt(gasPrice)).toString()
-    };
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+      const estimatedDepositGas = await depositCall.estimateGas();
+      const gasPrice = await evmApi.api.eth.getGasPrice();
+      return {
+        slug: this.feeAssets[0],
+        amount: (estimatedDepositGas * parseInt(gasPrice)).toString()
+      };
+    } else {
+      return {
+        slug: this.feeAssets[0],
+        amount: '0'
+      };
+    }
   }
   async generateOptimalPath(params) {
     const result = {

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

@@ -60,6 +60,9 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
           description: this.getDescription(minToHuman)
         },
         statistic: {
+          assetEarning: [{
+            slug: this.nativeToken.slug
+          }],
           maxCandidatePerFarmer: parseInt(maxDelegations),
           maxWithdrawalRequestPerFarmer: 1,
           // by default
@@ -280,13 +283,17 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
     const binaryAmount = new BN(amount);
     const poolPosition = await this.getPoolPosition(address);
     const selectedValidatorInfo = targetValidators[0];
+
+    // eslint-disable-next-line @typescript-eslint/require-await
     const compoundResult = async extrinsic => {
       const tokenSlug = this.nativeToken.slug;
-      const feeInfo = await extrinsic.paymentInfo(address);
-      const fee = feeInfo.toPrimitive();
+      // const feeInfo = await extrinsic.paymentInfo(address);
+      // const fee = feeInfo.toPrimitive() as unknown as RuntimeDispatchInfo;
+
+      // Not use the fee to validate and to display on UI
       return [extrinsic, {
         slug: tokenSlug,
-        amount: fee.partialFee.toString()
+        amount: '0'
       }];
     };
     if (!poolPosition) {

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

@@ -66,7 +66,10 @@ export default class AstarNativeStakingPoolHandler extends BaseParaNativeStaking
         method: 'GET'
       }).then(resp => {
         resolve(resp.json());
-      }).catch(console.error);
+      }).catch(e => {
+        console.error(e);
+        resolve(null);
+      });
     });
     const timeout = new Promise(resolve => {
       const id = setTimeout(() => {
@@ -102,6 +105,10 @@ export default class AstarNativeStakingPoolHandler extends BaseParaNativeStaking
           description: this.getDescription(minToHuman)
         },
         statistic: {
+          assetEarning: [{
+            slug: this.nativeToken.slug,
+            apy: apyInfo !== null ? apyInfo : undefined
+          }],
           maxCandidatePerFarmer: 100,
           // temporary fix for Astar, there's no limit for now
           maxWithdrawalRequestPerFarmer: 1,
@@ -337,7 +344,6 @@ export default class AstarNativeStakingPoolHandler extends BaseParaNativeStaking
   }
   async createJoinExtrinsic(data, positionInfo, bondDest = 'Staked') {
     const {
-      address,
       amount,
       selectedValidators: targetValidators
     } = data;
@@ -351,11 +357,13 @@ export default class AstarNativeStakingPoolHandler extends BaseParaNativeStaking
     };
     const extrinsic = chainApi.api.tx.dappsStaking.bondAndStake(dappParam, binaryAmount);
     const tokenSlug = this.nativeToken.slug;
-    const feeInfo = await extrinsic.paymentInfo(address);
-    const fee = feeInfo.toPrimitive();
+    // const feeInfo = await extrinsic.paymentInfo(address);
+    // const fee = feeInfo.toPrimitive() as unknown as RuntimeDispatchInfo;
+
+    // Not use the fee to validate and to display on UI
     return [extrinsic, {
       slug: tokenSlug,
-      amount: fee.partialFee.toString()
+      amount: '0'
     }];
   }
 

package/services/earning-service/handlers/native-staking/para-chain.js

@@ -73,6 +73,9 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
           description: this.getDescription(minToHuman)
         },
         statistic: {
+          assetEarning: [{
+            slug: this.nativeToken.slug
+          }],
           maxCandidatePerFarmer: parseInt(maxDelegations),
           maxWithdrawalRequestPerFarmer: 1,
           // by default
@@ -288,20 +291,23 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
 
   async createJoinExtrinsic(data, positionInfo) {
     const {
-      address,
       amount,
       selectedValidators
     } = data;
     const apiPromise = await this.substrateApi.isReady;
     const binaryAmount = new BN(amount);
     const selectedCollatorInfo = selectedValidators[0];
+
+    // eslint-disable-next-line @typescript-eslint/require-await
     const compoundResult = async extrinsic => {
       const tokenSlug = this.nativeToken.slug;
-      const feeInfo = await extrinsic.paymentInfo(address);
-      const fee = feeInfo.toPrimitive();
+      // const feeInfo = await extrinsic.paymentInfo(address);
+      // const fee = feeInfo.toPrimitive() as unknown as RuntimeDispatchInfo;
+
+      // Not use the fee to validate and to display on UI
       return [extrinsic, {
         slug: tokenSlug,
-        amount: fee.partialFee.toString()
+        amount: '0'
       }];
     };
     if (!positionInfo) {

package/services/earning-service/handlers/native-staking/relay-chain.js

@@ -73,6 +73,10 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
           description: this.getDescription(minToHuman)
         },
         statistic: {
+          assetEarning: [{
+            slug: this.nativeToken.slug,
+            apy: expectedReturn
+          }],
           maxCandidatePerFarmer: parseInt(maxNominations),
           maxWithdrawalRequestPerFarmer: parseInt(maxUnlockingChunks),
           // TODO recheck
@@ -382,16 +386,21 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const validatorParamList = targetValidators.map(validator => {
       return validator.address;
     });
+
+    // eslint-disable-next-line @typescript-eslint/require-await
     const compoundTransactions = async (bondTx, nominateTx) => {
       const extrinsic = chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
-      const fees = await Promise.all([bondTx.paymentInfo(address), nominateTx.paymentInfo(address)]);
-      const totalFee = fees.reduce((previousValue, currentItem) => {
-        const fee = currentItem.toPrimitive();
-        return previousValue + fee.partialFee;
-      }, 0);
+      // const fees = await Promise.all([bondTx.paymentInfo(address), nominateTx.paymentInfo(address)]);
+      // const totalFee = fees.reduce((previousValue, currentItem) => {
+      //   const fee = currentItem.toPrimitive() as unknown as RuntimeDispatchInfo;
+      //
+      //   return previousValue + fee.partialFee;
+      // }, 0);
+
+      // Not use the fee to validate and to display on UI
       return [extrinsic, {
         slug: tokenSlug,
-        amount: totalFee.toString()
+        amount: '0'
       }];
     };
     if (!positionInfo) {
@@ -421,18 +430,20 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       }
     }
     if (bondTx && !nominateTx) {
-      const feeInfo = await bondTx.paymentInfo(address);
-      const fee = feeInfo.toPrimitive();
+      // const feeInfo = await bondTx.paymentInfo(address);
+      // const fee = feeInfo.toPrimitive() as unknown as RuntimeDispatchInfo;
+
       return [bondTx, {
         slug: tokenSlug,
-        amount: fee.partialFee.toString()
+        amount: '0'
       }];
     } else if (nominateTx && !bondTx) {
-      const feeInfo = await nominateTx.paymentInfo(address);
-      const fee = feeInfo.toPrimitive();
+      // const feeInfo = await nominateTx.paymentInfo(address);
+      // const fee = feeInfo.toPrimitive() as unknown as RuntimeDispatchInfo;
+
       return [nominateTx, {
         slug: tokenSlug,
-        amount: fee.partialFee.toString()
+        amount: '0'
       }];
     }
     if (bondTx && nominateTx) {

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

@@ -87,6 +87,10 @@ export default class NominationPoolHandler extends BasePoolHandler {
           description: this.getDescription(minToHuman)
         },
         statistic: {
+          assetEarning: [{
+            slug: this.nativeToken.slug,
+            apy: expectedReturn
+          }],
           maxCandidatePerFarmer: 1,
           maxWithdrawalRequestPerFarmer: parseInt(maxUnlockingChunks),
           // TODO recheck
@@ -378,7 +382,6 @@ export default class NominationPoolHandler extends BasePoolHandler {
   }
   async createJoinExtrinsic(data, positionInfo) {
     const {
-      address,
       amount,
       selectedPool: {
         id: selectedPoolId
@@ -386,13 +389,17 @@ export default class NominationPoolHandler extends BasePoolHandler {
     } = data;
     const chainApi = await this.substrateApi.isReady;
     const bnActiveStake = new BN((positionInfo === null || positionInfo === void 0 ? void 0 : positionInfo.activeStake) || '0');
+
+    // eslint-disable-next-line @typescript-eslint/require-await
     const compoundResult = async extrinsic => {
       const tokenSlug = this.nativeToken.slug;
-      const feeInfo = await extrinsic.paymentInfo(address);
-      const fee = feeInfo.toPrimitive();
+      // const feeInfo = await extrinsic.paymentInfo(address);
+      // const fee = feeInfo.toPrimitive() as unknown as RuntimeDispatchInfo;
+
+      // Not use the fee to validate and to display on UI
       return [extrinsic, {
         slug: tokenSlug,
-        amount: fee.partialFee.toString()
+        amount: '0'
       }];
     };
     if (bnActiveStake.gt(BN_ZERO)) {

package/services/earning-service/handlers/special.d.ts

@@ -1,7 +1,8 @@
+/// <reference types="bn.js" />
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { BaseYieldStepDetail, HandleYieldStepData, OptimalYieldPath, OptimalYieldPathParams, SpecialYieldPoolInfo, SpecialYieldPoolMetadata, SubmitYieldJoinData, TransactionData, UnstakingInfo, YieldPoolInfo, YieldPoolTarget, YieldPoolType, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
-import BN from 'bn.js';
+import { BN } from '@polkadot/util';
 import BasePoolHandler from './base';
 export default abstract class BaseSpecialStakingPoolHandler extends BasePoolHandler {
     protected abstract altInputAsset: string;

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

@@ -8,9 +8,8 @@ import { createXcmExtrinsic } from '@subwallet/extension-base/koni/api/xcm';
 import { YIELD_POOL_STAT_REFRESH_INTERVAL } from '@subwallet/extension-base/koni/api/yield/helper/utils';
 import { _getChainNativeTokenSlug } from '@subwallet/extension-base/services/chain-service/utils';
 import { YieldStepType, YieldValidationStatus } from '@subwallet/extension-base/types';
-import BN from 'bn.js';
 import { t } from 'i18next';
-import { BN_ZERO, noop } from '@polkadot/util';
+import { BN, BN_ZERO, noop } from '@polkadot/util';
 import BasePoolHandler from "./base.js";
 export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
   /** Pool's type */
@@ -30,7 +29,9 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
       shortName: this.shortName,
       name: this.name,
       isAvailable: true,
-      allowCancelUnstaking: false
+      allowCancelUnstaking: false,
+      maintainAsset: this.nativeToken.slug,
+      maintainBalance: this.maintainBalance
     };
   }
   get isPoolSupportAlternativeFee() {

package/types/yield/info/chain/info.d.ts

@@ -28,6 +28,8 @@ export interface YieldAssetEarningStats {
  * @prop {boolean} isAvailable - Is the pool available?
  * @prop {string} inputAsset - Input token (slug)
  * @prop {boolean} allowCancelUnstaking - Allow canceling un-stake
+ * @prop {string} maintainAsset - Asset to maintain account's pool
+ * @prop {string} maintainBalance - Balance to maintain account's pool
  * */
 export interface BaseYieldPoolMetadata {
     /** Pool's description */
@@ -44,6 +46,10 @@ export interface BaseYieldPoolMetadata {
     isAvailable: boolean;
     /** Allow to cancel un-stake */
     allowCancelUnstaking: boolean;
+    /** Asset to maintain account's pool */
+    maintainAsset: string;
+    /** Balance to maintain account's pool */
+    maintainBalance: string;
 }
 /**
  * @interface NormalYieldPoolMetadata
@@ -80,6 +86,7 @@ export declare type YieldPoolMetadata = NormalYieldPoolMetadata | SpecialYieldPo
 /**
  * @interface BaseYieldPoolStatistic
  * @description Statistic data of pool
+ * @prop {YieldAssetEarningStats[]} assetEarning - Info for asset earning
  * @prop {number} maxCandidatePerFarmer - Max candidates per farmer
  * @prop {number} maxWithdrawalRequestPerFarmer - Max withdrawal request per farmer
  * @prop {string} minJoinPool - Min amount to join pool
@@ -89,6 +96,8 @@ export declare type YieldPoolMetadata = NormalYieldPoolMetadata | SpecialYieldPo
  * @prop {number} [totalApr] - Total apr of earning assets
  * */
 export interface BaseYieldPoolStatistic {
+    /** Info for asset earning */
+    assetEarning: YieldAssetEarningStats[];
     /** Max candidate per farmer  */
     maxCandidatePerFarmer: number;
     /** Max withdrawal request per farmer  */
@@ -122,14 +131,14 @@ export interface NormalYieldPoolStatistic extends BaseYieldPoolStatistic {
 /**
  * @interface SpecialYieldPoolStatistic
  * @extends BaseYieldPoolStatistic
- * @prop {YieldAssetEarningStats[]} assetEarning - Info for asset earning
  * @prop {string} minWithdrawal - Min amount for withdrawal request
+ * @prop {number} [unstakingPeriod] - Time to wait withdraw un-stake, in hour
  * */
 export interface SpecialYieldPoolStatistic extends BaseYieldPoolStatistic {
-    /** Info for asset earning */
-    assetEarning: YieldAssetEarningStats[];
     /** Min amount for withdrawal request */
     minWithdrawal: string;
+    /** Time to wait withdraw un-stake, in hour */
+    unstakingPeriod?: number;
 }
 export declare type YieldPoolStatistic = NormalYieldPoolStatistic | SpecialYieldPoolStatistic;
 /**