@subwallet/extension-base 1.1.28-beta.1 → 1.1.28-beta.2

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

@@ -24,7 +24,21 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
     let cancel = false;
     const chainApi = this.substrateApi;
     const nativeToken = this.nativeToken;
-    const defaultData = this.defaultInfo;
+    if (!this.isActive) {
+      const data = {
+        // TODO
+        ...this.baseInfo,
+        type: this.type,
+        metadata: {
+          ...this.metadataInfo,
+          description: this.getDescription()
+        }
+      };
+      callback(data);
+      return () => {
+        cancel = true;
+      };
+    }
     await chainApi.isReady;
     const unsub = await chainApi.api.query.parachainStaking.round(async _round => {
       var _chainApi$api$consts, _chainApi$api$consts$, _chainApi$api$consts$2;
@@ -59,12 +73,13 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
       const minToHuman = (0, _utils3.formatNumber)(minStake.toString(), nativeToken.decimals || 0, _utils3.balanceFormatter);
       const data = {
         // TODO
-        ...defaultData,
-        description: this.description.replaceAll('{{amount}}', minToHuman),
+        ...this.baseInfo,
         type: this.type,
         metadata: {
-          inputAsset: nativeToken.slug,
-          isAvailable: true,
+          ...this.metadataInfo,
+          description: this.getDescription(minToHuman)
+        },
+        statistic: {
           maxCandidatePerFarmer: parseInt(maxDelegations),
           maxWithdrawalRequestPerFarmer: 1,
           // by default
@@ -76,7 +91,6 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
           // not have
           tvl: totalStake.toString(),
           unstakingPeriod: unstakingPeriod,
-          allowCancelUnstaking: true,
           inflation
         }
       };
@@ -176,7 +190,7 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
   async subscribePoolPosition(useAddresses, resultCallback) {
     let cancel = false;
     const substrateApi = this.substrateApi;
-    const defaultInfo = this.defaultInfo;
+    const defaultInfo = this.baseInfo;
     const chainInfo = this.chainInfo;
     await substrateApi.isReady;
     const unsub = await substrateApi.api.query.parachainStaking.delegatorState.multi(useAddresses, async ledgers => {

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

@@ -29,7 +29,21 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const substrateApi = this.substrateApi;
     const chainInfo = this.chainInfo;
     const nativeToken = this.nativeToken;
-    const defaultData = this.defaultInfo;
+    if (!this.isActive) {
+      const data = {
+        // TODO
+        ...this.baseInfo,
+        type: this.type,
+        metadata: {
+          ...this.metadataInfo,
+          description: this.getDescription()
+        }
+      };
+      callback(data);
+      return () => {
+        cancel = true;
+      };
+    }
     await substrateApi.isReady;
     const unsub = await ((_substrateApi$api$que = substrateApi.api.query.staking) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.currentEra(async _currentEra => {
       var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
@@ -59,12 +73,13 @@ class RelayNativeStakingPoolHandler extends _base.default {
       const minToHuman = (0, _utils4.formatNumber)(minStake.toString(), nativeToken.decimals || 0, _utils4.balanceFormatter);
       const data = {
         // TODO
-        ...defaultData,
-        description: this.description.replaceAll('{{amount}}', minToHuman),
+        ...this.baseInfo,
         type: this.type,
         metadata: {
-          inputAsset: nativeToken.slug,
-          isAvailable: true,
+          ...this.metadataInfo,
+          description: this.getDescription(minToHuman)
+        },
+        statistic: {
           maxCandidatePerFarmer: parseInt(maxNominations),
           maxWithdrawalRequestPerFarmer: parseInt(maxUnlockingChunks),
           // TODO recheck
@@ -76,7 +91,6 @@ class RelayNativeStakingPoolHandler extends _base.default {
           totalApy: expectedReturn,
           // TODO recheck
           unstakingPeriod: unlockingPeriod,
-          allowCancelUnstaking: true,
           inflation: inflation
         }
       };
@@ -141,7 +155,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
     let stakingStatus = _types.EarningStatus.NOT_EARNING;
     const bnActiveStake = new _util.BN(activeStake);
     let waitingNominationCount = 0;
-    if (bnActiveStake.gte(minStake)) {
+    if (bnActiveStake.gte(minStake) && bnActiveStake.gt(_util.BN_ZERO)) {
       for (const nomination of nominationList) {
         if (nomination.status === _types.EarningStatus.EARNING_REWARD) {
           // only need 1 earning nomination to count
@@ -180,7 +194,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
     var _substrateApi$api$que19;
     let cancel = false;
     const substrateApi = await this.substrateApi.isReady;
-    const defaultInfo = this.defaultInfo;
+    const defaultInfo = this.baseInfo;
     const chainInfo = this.chainInfo;
     const unsub = await ((_substrateApi$api$que19 = substrateApi.api.query.staking) === null || _substrateApi$api$que19 === void 0 ? void 0 : _substrateApi$api$que19.ledger.multi(useAddresses, async ledgers => {
       if (cancel) {
@@ -232,7 +246,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const decimals = this.nativeToken.decimals || 0;
     const chainApi = await this.substrateApi.isReady;
     const poolInfo = await this.getPoolInfo();
-    if (!poolInfo) {
+    if (!poolInfo || !poolInfo.statistic) {
       return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR));
     }
     const _era = await chainApi.api.query.staking.currentEra();
@@ -299,13 +313,13 @@ class RelayNativeStakingPoolHandler extends _base.default {
       const commission = extraInfoMap[validator.address].commission;
       const bnValidatorStake = totalStakeMap[validator.address].div(bnDecimals);
       if (_constants2._STAKING_CHAIN_GROUP.aleph.includes(this.chain)) {
-        validator.expectedReturn = (0, _utils.calculateAlephZeroValidatorReturn)(poolInfo.metadata.totalApy, (0, _utils.getCommission)(commission));
+        validator.expectedReturn = (0, _utils.calculateAlephZeroValidatorReturn)(poolInfo.statistic.totalApy, (0, _utils.getCommission)(commission));
       } else if (_constants2._STAKING_CHAIN_GROUP.ternoa.includes(this.chain)) {
         const rewardPerValidator = new _util.BN(stakingRewards.sessionExtraRewardPayout).divn(allValidators.length).div(bnDecimals);
         const validatorStake = totalStakeMap[validator.address].div(bnDecimals).toNumber();
         validator.expectedReturn = (0, _utils.calculateTernoaValidatorReturn)(rewardPerValidator.toNumber(), validatorStake, (0, _utils.getCommission)(commission));
       } else {
-        validator.expectedReturn = (0, _utils.calculateValidatorStakedReturn)(poolInfo.metadata.totalApy, bnValidatorStake, bnAvgStake, (0, _utils.getCommission)(commission));
+        validator.expectedReturn = (0, _utils.calculateValidatorStakedReturn)(poolInfo.statistic.totalApy, bnValidatorStake, bnAvgStake, (0, _utils.getCommission)(commission));
       }
       validator.commission = parseFloat(commission.split('%')[0]);
       validator.blocked = extraInfoMap[validator.address].blocked;
@@ -332,16 +346,19 @@ class RelayNativeStakingPoolHandler extends _base.default {
       return Promise.resolve([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
     }
     const poolInfo = _poolInfo;
+    if (!poolInfo.statistic) {
+      return Promise.resolve([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+    }
     const errors = [];
     let bnTotalStake = new _util.BN(amount);
-    const bnMinStake = new _util.BN(poolInfo.metadata.minJoinPool);
+    const bnMinStake = new _util.BN(poolInfo.statistic.minJoinPool);
     const minStakeErrorMessage = (0, _utils.getMinStakeErrorMessage)(chainInfo, bnMinStake);
-    const maxValidatorErrorMessage = (0, _utils.getMaxValidatorErrorMessage)(chainInfo, poolInfo.metadata.maxCandidatePerFarmer);
+    const maxValidatorErrorMessage = (0, _utils.getMaxValidatorErrorMessage)(chainInfo, poolInfo.statistic.maxCandidatePerFarmer);
     if (!poolPosition || poolPosition.status === _types.EarningStatus.NOT_STAKING) {
       if (!bnTotalStake.gte(bnMinStake)) {
         errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
       }
-      if (selectedValidators.length > poolInfo.metadata.maxCandidatePerFarmer) {
+      if (selectedValidators.length > poolInfo.statistic.maxCandidatePerFarmer) {
         errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXCEED_MAX_NOMINATIONS, maxValidatorErrorMessage));
       }
       return errors;
@@ -351,7 +368,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
     }
-    if (selectedValidators.length > poolInfo.metadata.maxCandidatePerFarmer) {
+    if (selectedValidators.length > poolInfo.statistic.maxCandidatePerFarmer) {
       errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXCEED_MAX_NOMINATIONS, maxValidatorErrorMessage));
     }
     return errors;
@@ -444,7 +461,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const errors = [];
     const poolInfo = await this.getPoolInfo();
     const poolPosition = await this.getPoolPosition(address);
-    if (!poolInfo || !poolPosition || fastLeave) {
+    if (!poolInfo || !poolInfo.statistic || !poolPosition || fastLeave) {
       return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)];
     }
     if (fastLeave) {
@@ -452,8 +469,8 @@ class RelayNativeStakingPoolHandler extends _base.default {
     }
     const bnActiveStake = new _util.BN(poolPosition.activeStake);
     const bnRemainingStake = bnActiveStake.sub(new _util.BN(amount));
-    const minStake = new _util.BN(poolInfo.metadata.minJoinPool || '0');
-    const maxUnstake = poolInfo.metadata.maxWithdrawalRequestPerFarmer;
+    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/cjs/services/earning-service/handlers/nomination-pool/index.js

@@ -30,7 +30,12 @@ class NominationPoolHandler extends _base.default {
     this.slug = `${symbol}___nomination_pool___${_chainInfo.slug}`;
     this.name = `${tokenName} Nomination Pool`;
     this.shortName = _chainInfo.name.replaceAll(' Relay Chain', '');
-    this.description = `Start staking with just {{amount}} ${symbol}`;
+  }
+  getDescription() {
+    let amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '0';
+    const _chainAsset = this.nativeToken;
+    const symbol = _chainAsset.symbol;
+    return `Start staking with just {{amount}} ${symbol}`.replace('{{amount}}', amount);
   }
 
   /* Subscribe pool info */
@@ -41,7 +46,21 @@ class NominationPoolHandler extends _base.default {
     const substrateApi = this.substrateApi;
     const chainInfo = this.chainInfo;
     const nativeToken = this.nativeToken;
-    const defaultData = this.defaultInfo;
+    if (!this.isActive) {
+      const data = {
+        // TODO
+        ...this.baseInfo,
+        type: this.type,
+        metadata: {
+          ...this.metadataInfo,
+          description: this.getDescription()
+        }
+      };
+      callback(data);
+      return () => {
+        cancel = true;
+      };
+    }
     await substrateApi.isReady;
     const unsub = await ((_substrateApi$api$que = substrateApi.api.query.staking) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.currentEra(async _currentEra => {
       var _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4;
@@ -69,12 +88,13 @@ class NominationPoolHandler extends _base.default {
       const minToHuman = (0, _utils3.formatNumber)(minPoolJoin || '0', nativeToken.decimals || 0, _utils3.balanceFormatter);
       const data = {
         // TODO
-        ...defaultData,
-        description: this.description.replaceAll('{{amount}}', minToHuman),
+        ...this.baseInfo,
         type: this.type,
         metadata: {
-          inputAsset: nativeToken.slug,
-          isAvailable: true,
+          ...this.metadataInfo,
+          description: this.getDescription(minToHuman)
+        },
+        statistic: {
           maxCandidatePerFarmer: 1,
           maxWithdrawalRequestPerFarmer: parseInt(maxUnlockingChunks),
           // TODO recheck
@@ -87,7 +107,6 @@ class NominationPoolHandler extends _base.default {
           totalApy: expectedReturn,
           // TODO recheck
           unstakingPeriod: unlockingPeriod,
-          allowCancelUnstaking: false,
           inflation: inflation
         }
       };
@@ -178,7 +197,7 @@ class NominationPoolHandler extends _base.default {
     var _substrateApi$api$que5, _substrateApi$api$que6;
     let cancel = false;
     const substrateApi = this.substrateApi;
-    const defaultInfo = this.defaultInfo;
+    const defaultInfo = this.baseInfo;
     await substrateApi.isReady;
     const unsub = await ((_substrateApi$api$que5 = substrateApi.api.query) === null || _substrateApi$api$que5 === void 0 ? void 0 : (_substrateApi$api$que6 = _substrateApi$api$que5.nominationPools) === null || _substrateApi$api$que6 === void 0 ? void 0 : _substrateApi$api$que6.poolMembers.multi(useAddresses, async ledgers => {
       if (cancel) {
@@ -237,7 +256,7 @@ class NominationPoolHandler extends _base.default {
           const _unclaimedReward = await ((_substrateApi$api$cal = substrateApi.api.call) === null || _substrateApi$api$cal === void 0 ? void 0 : (_substrateApi$api$cal2 = _substrateApi$api$cal.nominationPoolsApi) === null || _substrateApi$api$cal2 === void 0 ? void 0 : _substrateApi$api$cal2.pendingRewards(address));
           if (_unclaimedReward) {
             callBack({
-              ...this.defaultInfo,
+              ...this.baseInfo,
               address: address,
               type: this.type,
               unclaimedReward: _unclaimedReward.toString(),
@@ -330,13 +349,14 @@ class NominationPoolHandler extends _base.default {
     }, fee];
   }
   async validateYieldJoin(data, path) {
+    var _poolInfo$statistic;
     const {
       address,
       amount,
       selectedPool
     } = data;
     const _poolInfo = await this.getPoolInfo();
-    if (!_poolInfo) {
+    if (!_poolInfo || !_poolInfo.statistic) {
       return Promise.resolve([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
     }
     const poolInfo = _poolInfo;
@@ -347,7 +367,7 @@ class NominationPoolHandler extends _base.default {
     // amount >= min stake
     const errors = [];
     let bnTotalStake = new _util.BN(amount);
-    const bnMinStake = new _util.BN(poolInfo.metadata.minJoinPool || '0');
+    const bnMinStake = new _util.BN(((_poolInfo$statistic = poolInfo.statistic) === null || _poolInfo$statistic === void 0 ? void 0 : _poolInfo$statistic.minJoinPool) || '0');
     const minStakeErrorMessage = (0, _utils.getMinStakeErrorMessage)(chainInfo, bnMinStake);
     const existUnstakeErrorMessage = (0, _utils.getExistUnstakeErrorMessage)(chainInfo.slug, _KoniTypes.StakingType.POOLED, true);
     if (selectedPool.state !== 'Open') {
@@ -430,7 +450,7 @@ class NominationPoolHandler extends _base.default {
     const errors = [];
     const poolInfo = await this.getPoolInfo();
     const poolPosition = await this.getPoolPosition(address);
-    if (!poolInfo || !poolPosition || fastLeave) {
+    if (!poolInfo || !poolPosition || fastLeave || !poolInfo.statistic) {
       return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)];
     }
     if (fastLeave) {
@@ -438,8 +458,8 @@ class NominationPoolHandler extends _base.default {
     }
     const bnActiveStake = new _util.BN(poolPosition.activeStake);
     const bnRemainingStake = bnActiveStake.sub(new _util.BN(amount));
-    const minStake = new _util.BN(poolInfo.metadata.minJoinPool || '0');
-    const maxUnstake = poolInfo.metadata.maxWithdrawalRequestPerFarmer;
+    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/cjs/services/earning-service/handlers/special.js

@@ -20,17 +20,24 @@ var _base = _interopRequireDefault(require("./base"));
 // SPDX-License-Identifier: Apache-2.0
 
 class BaseSpecialStakingPoolHandler extends _base.default {
+  /** Pool's type */
+
   /** Allow to create default unstake transaction */
   allowDefaultUnstake = false;
   /** Allow to create fast unstake transaction */
   allowFastUnstake = true;
-  get baseMetadata() {
+  get metadataInfo() {
     return {
       altInputAssets: this.altInputAsset,
       derivativeAssets: this.derivativeAssets,
       inputAsset: this.inputAsset,
       rewardAssets: this.rewardAssets,
-      feeAssets: this.feeAssets
+      feeAssets: this.feeAssets,
+      logo: this.logo,
+      shortName: this.shortName,
+      name: this.name,
+      isAvailable: true,
+      allowCancelUnstaking: false
     };
   }
   get isPoolSupportAlternativeFee() {
@@ -47,11 +54,25 @@ class BaseSpecialStakingPoolHandler extends _base.default {
   async subscribePoolInfo(callback) {
     let cancel = false;
     const getStatInterval = () => {
-      this.getPoolStat().then(rs => {
+      if (!this.isActive) {
         if (!cancel) {
+          const rs = {
+            ...this.baseInfo,
+            type: this.type,
+            metadata: {
+              ...this.metadataInfo,
+              description: this.getDescription()
+            }
+          };
           callback(rs);
         }
-      }).catch(console.error);
+      } else {
+        this.getPoolStat().then(rs => {
+          if (!cancel) {
+            callback(rs);
+          }
+        }).catch(console.error);
+      }
     };
     getStatInterval();
     const interval = setInterval(() => {
@@ -199,6 +220,9 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)];
     }
     const poolInfo = _poolInfo;
+    if (!poolInfo.statistic) {
+      return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)];
+    }
     const processValidation = {
       ok: true,
       status: _types.YieldValidationStatus.OK
@@ -220,7 +244,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.metadata.minJoinPool || '0'))) {
+    if (!bnAmount.gte(new _bn.default(poolInfo.statistic.minJoinPool || '0'))) {
       processValidation.failedStep = path.steps[id];
       processValidation.ok = false;
       processValidation.status = _types.YieldValidationStatus.NOT_ENOUGH_MIN_JOIN_POOL;
@@ -338,7 +362,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
   async validateYieldLeave(amount, address, fastLeave, selectedTarget) {
     const poolInfo = await this.getPoolInfo();
     const poolPosition = await this.getPoolPosition(address);
-    if (!poolInfo || !poolPosition) {
+    if (!poolInfo || !poolInfo.statistic || !poolPosition) {
       return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)];
     }
     if (!this.allowDefaultUnstake && !fastLeave) {
@@ -350,8 +374,8 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const errors = [];
     const bnActiveStake = new _bn.default(poolPosition.activeStake);
     const bnRemainingStake = bnActiveStake.sub(new _bn.default(amount));
-    const minStake = new _bn.default(poolInfo.metadata.minJoinPool || '0');
-    const maxUnstake = poolInfo.metadata.maxWithdrawalRequestPerFarmer;
+    const minStake = new _bn.default(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/cjs/services/earning-service/service.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,6 +9,8 @@ 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 _constants = require("@subwallet/extension-base/services/earning-service/constants");
+var _base = _interopRequireDefault(require("@subwallet/extension-base/services/earning-service/handlers/liquid-staking/base"));
+var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _rxjs = require("rxjs");
 var _handlers = require("./handlers");
@@ -20,12 +23,15 @@ class EarningService {
     ready: false,
     data: {}
   });
+  minAmountPercentSubject = new _rxjs.BehaviorSubject({});
   constructor(state) {
     this.state = state;
-    this.initHandlers();
+    this.initHandlers().catch(console.error);
   }
-  initHandlers() {
-    const chains = this.state.activeChainSlugs;
+  async initHandlers() {
+    await this.state.eventService.waitChainReady;
+    const chains = Object.keys(this.state.getChainInfoMap());
+    const minAmountPercent = {};
     for (const chain of chains) {
       const handlers = [];
       if (_constants._STAKING_CHAIN_GROUP.relay.includes(chain)) {
@@ -66,9 +72,15 @@ class EarningService {
         this.handlers[handler.slug] = handler;
       }
     }
+    for (const handler of Object.values(this.handlers)) {
+      if (handler.type === _types.YieldPoolType.LIQUID_STAKING) {
+        minAmountPercent[handler.slug] = handler.minAmountPercent;
+      }
+    }
+    minAmountPercent.default = _base.default.defaultMinAmountPercent;
+    this.minAmountPercentSubject.next(minAmountPercent);
   }
   getPoolHandler(slug) {
-    this.initHandlers();
     return this.handlers[slug];
   }
   isPoolSupportAlternativeFee(slug) {
@@ -79,25 +91,27 @@ class EarningService {
       throw new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR);
     }
   }
+  subscribeMinAmountPercent() {
+    return this.minAmountPercentSubject;
+  }
+  getMinAmountPercent() {
+    return this.minAmountPercentSubject.getValue();
+  }
 
   /* Subscribe pools' info */
 
   async subscribePoolsInfo(callback) {
     let cancel = false;
     await this.state.eventService.waitChainReady;
-    this.initHandlers();
-    const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
     for (const handler of Object.values(this.handlers)) {
-      if (activeChains.includes(handler.chain)) {
-        handler.subscribePoolInfo(callback).then(unsub => {
-          if (cancel) {
-            unsub();
-          } else {
-            unsubList.push(unsub);
-          }
-        }).catch(console.error);
-      }
+      handler.subscribePoolInfo(callback).then(unsub => {
+        if (cancel) {
+          unsub();
+        } else {
+          unsubList.push(unsub);
+        }
+      }).catch(console.error);
     }
     return () => {
       cancel = true;
@@ -114,7 +128,6 @@ class EarningService {
   async subscribePoolPositions(addresses, callback) {
     let cancel = false;
     await this.state.eventService.waitChainReady;
-    this.initHandlers();
     const [substrateAddresses, evmAddresses] = (0, _utils2.categoryAddresses)(addresses);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
@@ -156,7 +169,6 @@ class EarningService {
   async getPoolReward(addresses, callback) {
     let cancel = false;
     await this.state.eventService.waitChainReady;
-    this.initHandlers();
     const [substrateAddresses, evmAddresses] = (0, _utils2.categoryAddresses)(addresses);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
@@ -213,6 +225,18 @@ class EarningService {
 
   /* Join */
 
+  async earlyValidateJoin(request) {
+    await this.state.eventService.waitChainReady;
+    const {
+      slug
+    } = request;
+    const handler = this.getPoolHandler(slug);
+    if (handler) {
+      return handler.earlyValidate(request);
+    } else {
+      throw new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR);
+    }
+  }
   async generateOptimalSteps(params) {
     await this.state.eventService.waitChainReady;
     const {

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.calculateReward = calculateReward;
 exports.isActionFromValidator = isActionFromValidator;
+exports.isNominationPool = exports.isNativeStakingPool = exports.isLiquidPool = exports.isLendingPool = void 0;
 exports.parseIdentity = parseIdentity;
 var _constants = require("@subwallet/extension-base/services/earning-service/constants");
 var _types = require("@subwallet/extension-base/types");
@@ -108,4 +109,20 @@ function isActionFromValidator(stakingType, chain) {
     return true;
   }
   return false;
-}
+}
+const isNominationPool = pool => {
+  return pool.type === _types.YieldPoolType.NOMINATION_POOL;
+};
+exports.isNominationPool = isNominationPool;
+const isNativeStakingPool = pool => {
+  return pool.type === _types.YieldPoolType.NATIVE_STAKING;
+};
+exports.isNativeStakingPool = isNativeStakingPool;
+const isLiquidPool = pool => {
+  return pool.type === _types.YieldPoolType.LIQUID_STAKING;
+};
+exports.isLiquidPool = isLiquidPool;
+const isLendingPool = pool => {
+  return pool.type === _types.YieldPoolType.LENDING;
+};
+exports.isLendingPool = isLendingPool;

package/cjs/services/migration-service/scripts/databases/MigrateEarningHistory.js

@@ -0,0 +1,21 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateEarningHistory extends _Base.default {
+  async run() {
+    try {
+      await this.state.dbService.removeOldEarningData();
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateEarningHistory;

package/cjs/services/migration-service/scripts/databases/MigrateEarningVersion.js

@@ -0,0 +1,21 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateEarningVersion extends _Base.default {
+  async run() {
+    try {
+      await this.state.dbService.removeOldEarningData();
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateEarningVersion;

package/cjs/services/migration-service/scripts/index.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.EVERYTIME = void 0;
 var _DeleteEarningData = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData"));
 var _EnableEarningChains = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/EnableEarningChains"));
+var _MigrateEarningVersion = _interopRequireDefault(require("./databases/MigrateEarningVersion"));
 var _MigrateEthProvider = _interopRequireDefault(require("./providers/MigrateEthProvider"));
 var _MigratePioneerProvider = _interopRequireDefault(require("./providers/MigratePioneerProvider"));
 var _MigrateProvidersV1M1P = _interopRequireDefault(require("./providers/MigrateProvidersV1M1P24"));
@@ -48,7 +49,8 @@ var _default = {
   '1.1.17-01': _MigratePioneerProvider.default,
   '1.1.17-03': _EnableVaraChain.default,
   '1.1.24-01': _MigrateProvidersV1M1P.default,
-  '1.1.26-01': _MigratePolygonUSDCProvider.default
+  '1.1.26-01': _MigratePolygonUSDCProvider.default,
+  '1.1.28-01': _MigrateEarningVersion.default
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

package/cjs/services/storage-service/DatabaseService.js

@@ -288,6 +288,10 @@ class DatabaseService {
 
   /* Earning */
 
+  async removeOldEarningData() {
+    await this.stores.yieldPoolInfo.clear();
+    await this.stores.yieldPosition.clear();
+  }
   async updateYieldPoolStore(data) {
     await this.stores.yieldPoolInfo.upsert(data);
   }

package/cjs/services/transaction-service/index.js

@@ -532,7 +532,7 @@ class TransactionService {
       case _KoniTypes.ExtrinsicType.REDEEM_QDOT:
         {
           const data = (0, _utils2.parseTransactionData)(transaction.data);
-          const yieldPoolInfo = data.yieldPoolInfo;
+          const yieldPoolInfo = data.poolInfo;
           if (yieldPoolInfo.metadata.derivativeAssets) {
             const inputTokenSlug = yieldPoolInfo.metadata.inputAsset;
             const inputTokenInfo = this.state.chainService.getAssetBySlug(inputTokenSlug);
@@ -553,11 +553,11 @@ class TransactionService {
       case _KoniTypes.ExtrinsicType.REDEEM_VDOT:
         {
           const data = (0, _utils2.parseTransactionData)(transaction.data);
-          const yieldPoolInfo = data.yieldPoolInfo;
+          const yieldPoolInfo = data.poolInfo;
           if (yieldPoolInfo.metadata.derivativeAssets) {
             const derivativeTokenSlug = yieldPoolInfo.metadata.derivativeAssets[0];
             const derivativeTokenInfo = this.state.chainService.getAssetBySlug(derivativeTokenSlug);
-            const chainInfo = this.state.chainService.getChainInfoByKey(data.yieldPoolInfo.chain);
+            const chainInfo = this.state.chainService.getChainInfoByKey(data.poolInfo.chain);
             historyItem.amount = {
               value: data.amount,
               symbol: (0, _utils._getAssetSymbol)(derivativeTokenInfo),