@subwallet/extension-base 1.1.40-1 → 1.1.42-0

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

@@ -5,8 +5,8 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
 import { _getAssetDecimals, _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
-import { recalculateGasPrice } from '@subwallet/extension-base/utils/eth';
 import fetch from 'cross-fetch';
 import { BN, BN_TEN, BN_ZERO } from '@polkadot/util';
 import { ST_LIQUID_TOKEN_ABI } from "../../constants/index.js";
@@ -248,6 +248,7 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     return Promise.resolve([]);
   }
   async handleTokenApproveStep(data, path) {
+    var _priority$maxFeePerGa, _priority$maxPriority;
     const {
       address
     } = data;
@@ -266,14 +267,15 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     const gasLimit = await approveCall.estimateGas({
       from: address
     });
-    const _price = await evmApi.api.eth.getGasPrice();
-    const gasPrice = recalculateGasPrice(_price, this.chain);
+    const priority = await calculateGasFeeParams(evmApi, this.chain);
     const transactionObject = {
       from: address,
       to: _getContractAddressOfToken(inputTokenInfo),
       data: approveEncodedCall,
-      gasPrice: gasPrice,
-      gas: gasLimit
+      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()
     };
     const _data = {
       inputTokenSlug: inputTokenSlug,
@@ -289,6 +291,7 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     });
   }
   async handleSubmitStep(data, path) {
+    var _priority$maxFeePerGa2, _priority$maxPriority2;
     const {
       address,
       amount
@@ -307,14 +310,15 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     const gasLimit = await depositCall.estimateGas({
       from: address
     });
-    const _price = await evmApi.api.eth.getGasPrice();
-    const gasPrice = recalculateGasPrice(_price, this.chain);
+    const priority = await calculateGasFeeParams(evmApi, this.chain);
     const transactionObject = {
       from: address,
       to: _getContractAddressOfToken(derivativeTokenInfo),
       data: depositEncodedCall,
-      gasPrice: gasPrice,
-      gas: gasLimit
+      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()
     };
     return {
       txChain: this.chain,
@@ -334,6 +338,7 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     return Promise.reject(new TransactionError(BasicTxErrorType.UNSUPPORTED));
   }
   async handleYieldUnstake(amount, address, selectedTarget) {
+    var _priority$maxFeePerGa3, _priority$maxPriority3;
     const evmApi = this.evmApi;
     const derivativeTokenSlug = this.derivativeAssets[0];
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
@@ -348,14 +353,15 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     const gasLimit = await redeemCall.estimateGas({
       from: address
     });
-    const _price = await evmApi.api.eth.getGasPrice();
-    const gasPrice = recalculateGasPrice(_price, this.chain);
+    const priority = await calculateGasFeeParams(evmApi, this.chain);
     const transaction = {
       from: address,
       to: _getContractAddressOfToken(derivativeTokenInfo),
       data: redeemEncodedCall,
-      gasPrice: gasPrice,
-      gas: gasLimit
+      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()
     };
     return [ExtrinsicType.UNSTAKE_STDOT, transaction];
   }
@@ -365,6 +371,7 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
   /* Other actions */
 
   async handleYieldWithdraw(address, unstakingInfo) {
+    var _priority$maxFeePerGa4, _priority$maxPriority4;
     const evmApi = this.evmApi;
     const derivativeTokenSlug = this.derivativeAssets[0];
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
@@ -379,14 +386,15 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     const gasLimit = await withdrawCall.estimateGas({
       from: address
     });
-    const _price = await evmApi.api.eth.getGasPrice();
-    const gasPrice = recalculateGasPrice(_price, this.chain);
+    const priority = await calculateGasFeeParams(evmApi, this.chain);
     return {
       from: address,
       to: _getContractAddressOfToken(derivativeTokenInfo),
       data: withdrawEncodedCall,
-      gasPrice: gasPrice,
-      gas: gasLimit
+      gas: gasLimit,
+      gasPrice: priority.gasPrice,
+      maxFeePerGas: (_priority$maxFeePerGa4 = priority.maxFeePerGas) === null || _priority$maxFeePerGa4 === void 0 ? void 0 : _priority$maxFeePerGa4.toString(),
+      maxPriorityFeePerGas: (_priority$maxPriority4 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority4 === void 0 ? void 0 : _priority$maxPriority4.toString()
     }; // TODO: check tx history parsing
   }
 

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

@@ -141,12 +141,16 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
           const isClaimable = parseInt(unstakingBlock) - currentBlockNumber < 0;
           const remainingBlock = parseInt(unstakingBlock) - currentBlockNumber;
           const waitingTime = remainingBlock * blockDuration;
+          // const currentTimestampMs = Date.now();
+          // const targetTimestampMs = currentTimestampMs + waitingTime * 60 * 60 * 1000;
+
           unstakingBalance = unstakingAmount.toString();
           unstakingList.push({
             chain: chainInfo.slug,
             status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
             claimable: unstakingAmount.toString(),
             waitingTime,
+            // targetTimestampMs: targetTimestampMs,
             validatorAddress: undefined
           });
         }

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

@@ -18,8 +18,7 @@ export function getAstarWithdrawable(yieldPosition) {
   const unstakingInfo = {
     chain: yieldPosition.chain,
     status: UnstakingStatus.CLAIMABLE,
-    claimable: '0',
-    waitingTime: 0
+    claimable: '0'
   };
   let bnWithdrawable = BN_ZERO;
   for (const unstaking of yieldPosition.unstakings) {
@@ -200,14 +199,19 @@ export default class AstarNativeStakingPoolHandler extends BaseParaNativeStaking
         const isClaimable = unlockingChunk.unlockEra - parseInt(currentEra) < 0;
         const remainingEra = unlockingChunk.unlockEra - parseInt(currentEra);
         const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
+        // const currentTimestampMs = Date.now();
+        // const targetTimestampMs = currentTimestampMs + waitingTime * 60 * 60 * 1000;
+
         unstakingList.push({
           chain: chainInfo.slug,
           status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
           claimable: unlockingChunk.amount.toString(),
           waitingTime
+          // targetTimestampMs: targetTimestampMs
         });
       }
     }
+
     if (nominationList.length === 0 && unstakingList.length === 0) {
       return {
         balanceToken: this.nativeToken.slug,

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

@@ -5,11 +5,27 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { BasicTxErrorType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { getBondedValidators, getEarningStatusByNominations, getParaCurrentInflation, isUnstakeAll } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
+import { _STAKING_CHAIN_GROUP, MANTA_MIN_DELEGATION, MANTA_VALIDATOR_POINTS_PER_BLOCK } from '@subwallet/extension-base/services/earning-service/constants';
 import { parseIdentity } from '@subwallet/extension-base/services/earning-service/utils';
 import { EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
+import BigN from 'bignumber.js';
 import { BN, BN_ZERO } from '@polkadot/util';
 import BaseParaNativeStakingPoolHandler from "./base-para.js";
+function calculateMantaNominatorReturn(decimal, commission, totalActiveCollators, bnAnnualInflation, blocksPreviousRound, bnCollatorExpectedBlocksPerRound, bnCollatorTotalStaked, isCountCommission) {
+  const MIN_DELEGATION = new BigN(MANTA_MIN_DELEGATION);
+  const factor = new BigN(10).pow(decimal);
+  const annualInflation = bnAnnualInflation.dividedBy(factor);
+  const collatorTotalStaked = bnCollatorTotalStaked.dividedBy(factor);
+  const annualRewardsPerCollator = annualInflation.dividedBy(totalActiveCollators);
+  const adjustmentFactor = new BigN(blocksPreviousRound).dividedBy(bnCollatorExpectedBlocksPerRound);
+  const marginalReward = annualRewardsPerCollator.multipliedBy(MIN_DELEGATION).dividedBy(collatorTotalStaked.plus(MIN_DELEGATION));
+  let bnApy = new BigN(100).multipliedBy(adjustmentFactor).multipliedBy(marginalReward).dividedBy(MIN_DELEGATION);
+  if (isCountCommission) {
+    bnApy = new BigN((1 - commission) * 100).multipliedBy(adjustmentFactor).multipliedBy(marginalReward).dividedBy(MIN_DELEGATION);
+  }
+  return bnApy.toNumber();
+}
 export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingPoolHandler {
   /* Subscribe pool info */
 
@@ -137,13 +153,18 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
             const remainingEra = scheduledRequest.whenExecutable - currentRound;
             const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
             const claimable = Object.values(scheduledRequest.action)[0];
+            // const currentTimestampMs = Date.now();
+            // const targetTimestampMs = currentTimestampMs + waitingTime * 60 * 60 * 1000;
+
             unstakingMap[delegation.owner] = {
               chain: chainInfo.slug,
               status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
               validatorAddress: delegation.owner,
               claimable: claimable.toString(),
               waitingTime
+              // targetTimestampMs: targetTimestampMs
             };
+
             hasUnstaking = true;
             break; // only handle 1 scheduledRequest per collator
           }
@@ -246,52 +267,130 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
   async getPoolTargets() {
     const apiProps = await this.substrateApi.isReady;
     const allCollators = [];
-    const [_allCollators, _collatorCommission] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission()]);
-    const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
-    const rawCollatorCommission = _collatorCommission.toHuman();
-    const collatorCommission = parseFloat(rawCollatorCommission.split('%')[0]);
-    for (const collator of _allCollators) {
-      const _collatorAddress = collator[0].toHuman();
-      const collatorAddress = _collatorAddress[0];
-      const collatorInfo = collator[1].toPrimitive();
-      const bnTotalStake = new BN(collatorInfo.totalCounted);
-      const bnOwnStake = new BN(collatorInfo.bond);
-      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
-      const bnMinBond = new BN(collatorInfo.lowestTopDelegationAmount);
-      allCollators.push({
-        commission: 0,
-        expectedReturn: 0,
-        address: collatorAddress,
-        totalStake: bnTotalStake.toString(),
-        ownStake: bnOwnStake.toString(),
-        otherStake: bnOtherStake.toString(),
-        nominatorCount: collatorInfo.delegationCount,
-        blocked: false,
-        isVerified: false,
-        minBond: bnMinBond.toString(),
-        chain: this.chain,
-        isCrowded: parseInt(maxDelegationPerCollator) > 0
-      });
-    }
-    const extraInfoMap = {};
-    await Promise.all(allCollators.map(async collator => {
-      const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), parseIdentity(apiProps, collator.address)]);
-      const rawInfo = _info.toHuman();
-      const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
-      extraInfoMap[collator.address] = {
-        identity,
-        isVerified: isReasonable,
-        active
-      };
-    }));
-    for (const validator of allCollators) {
-      validator.blocked = !extraInfoMap[validator.address].active;
-      validator.identity = extraInfoMap[validator.address].identity;
-      validator.isVerified = extraInfoMap[validator.address].isVerified;
-      // @ts-ignore
-      validator.commission = collatorCommission;
+    if (_STAKING_CHAIN_GROUP.manta.includes(this.chain)) {
+      var _this$chainInfo$subst;
+      const DECIMAL = (_this$chainInfo$subst = this.chainInfo.substrateInfo) === null || _this$chainInfo$subst === void 0 ? void 0 : _this$chainInfo$subst.decimals;
+      const POINTS_PER_BLOCK = MANTA_VALIDATOR_POINTS_PER_BLOCK; // producing 1 block will get 20 points for validator
+
+      const [_allCollators, _collatorCommission, _allCollatorsPool, _selectedCollators, _round, _totalIssuance, _inflationConfig] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission(), apiProps.api.query.parachainStaking.candidatePool(), apiProps.api.query.parachainStaking.selectedCandidates(), apiProps.api.query.parachainStaking.round(), apiProps.api.query.balances.totalIssuance(), apiProps.api.query.parachainStaking.inflationConfig()]);
+
+      // noted: Annual Inflation = Total Issuance * Annual Inflation Percent
+      const round = _round.toPrimitive();
+      const totalIssuance = _totalIssuance.toString();
+      const inflationConfig = _inflationConfig.toHuman();
+      const annualInflationPercent = parseFloat(inflationConfig.annual.ideal.slice(0, -1)) / 100;
+      const bnAnnualInflation = new BigN(totalIssuance).multipliedBy(annualInflationPercent);
+
+      // noted: allCollatorsPool -> all candidate collators; selectedCollators -> candidate collators selected in current round
+      const allCollatorsPoolInfo = _allCollatorsPool.toPrimitive();
+      const allCollatorsPool = allCollatorsPoolInfo.map(collator => collator.owner.toString());
+      const selectedCollators = _selectedCollators.toPrimitive();
+      const totalActiveCollators = selectedCollators.length;
+      const bnCollatorExpectedBlocksPerRound = new BigN(round.length).dividedBy(allCollatorsPool.length);
+      const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
+      const rawCollatorCommission = _collatorCommission.toHuman();
+      const collatorCommission = parseFloat(rawCollatorCommission.split('%')[0]);
+      const collatorCommissionPercent = collatorCommission / 100;
+      for (const collator of _allCollators) {
+        const _collatorAddress = collator[0].toHuman();
+        const collatorAddress = _collatorAddress[0];
+        if (allCollatorsPool.includes(collatorAddress)) {
+          const collatorInfo = collator[1].toPrimitive();
+          const bnTotalStake = new BN(collatorInfo.totalCounted);
+          const bnOwnStake = new BN(collatorInfo.bond);
+          const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+          const bnMinBond = new BN(collatorInfo.lowestTopDelegationAmount);
+          allCollators.push({
+            commission: 0,
+            address: collatorAddress,
+            totalStake: bnTotalStake.toString(),
+            ownStake: bnOwnStake.toString(),
+            otherStake: bnOtherStake.toString(),
+            nominatorCount: collatorInfo.delegationCount,
+            blocked: false,
+            isVerified: false,
+            minBond: bnMinBond.toString(),
+            chain: this.chain,
+            isCrowded: parseInt(maxDelegationPerCollator) > 0
+          });
+        }
+      }
+      await Promise.all(allCollators.map(async collator => {
+        if (allCollatorsPool.includes(collator.address)) {
+          // noted: number of blocks = total points / points per block
+          const _collatorPoints = await apiProps.api.query.parachainStaking.awardedPts(parseInt(round.current) - 1, collator.address);
+          const collatorPoints = _collatorPoints.toPrimitive();
+          const blocksPreviousRound = collatorPoints / POINTS_PER_BLOCK;
+          collator.expectedReturn = calculateMantaNominatorReturn(DECIMAL, collatorCommissionPercent, totalActiveCollators, bnAnnualInflation, blocksPreviousRound, bnCollatorExpectedBlocksPerRound, new BigN(collator.totalStake), false);
+        }
+      }));
+      const extraInfoMap = {};
+      await Promise.all(allCollators.map(async collator => {
+        const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), parseIdentity(apiProps, collator.address)]);
+        const rawInfo = _info.toHuman();
+        const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
+        extraInfoMap[collator.address] = {
+          identity,
+          isVerified: isReasonable,
+          active
+        };
+      }));
+      for (const validator of allCollators) {
+        validator.blocked = !extraInfoMap[validator.address].active;
+        validator.identity = extraInfoMap[validator.address].identity;
+        validator.isVerified = extraInfoMap[validator.address].isVerified;
+        // @ts-ignore
+        validator.commission = collatorCommission;
+      }
+      return allCollators;
+    } else {
+      const [_allCollators, _collatorCommission] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission()]);
+      const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
+      const rawCollatorCommission = _collatorCommission.toHuman();
+      const collatorCommission = parseFloat(rawCollatorCommission.split('%')[0]);
+      for (const collator of _allCollators) {
+        const _collatorAddress = collator[0].toHuman();
+        const collatorAddress = _collatorAddress[0];
+        const collatorInfo = collator[1].toPrimitive();
+        const bnTotalStake = new BN(collatorInfo.totalCounted);
+        const bnOwnStake = new BN(collatorInfo.bond);
+        const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+        const bnMinBond = new BN(collatorInfo.lowestTopDelegationAmount);
+        allCollators.push({
+          commission: 0,
+          expectedReturn: 0,
+          address: collatorAddress,
+          totalStake: bnTotalStake.toString(),
+          ownStake: bnOwnStake.toString(),
+          otherStake: bnOtherStake.toString(),
+          nominatorCount: collatorInfo.delegationCount,
+          blocked: false,
+          isVerified: false,
+          minBond: bnMinBond.toString(),
+          chain: this.chain,
+          isCrowded: parseInt(maxDelegationPerCollator) > 0
+        });
+      }
+      const extraInfoMap = {};
+      await Promise.all(allCollators.map(async collator => {
+        const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), parseIdentity(apiProps, collator.address)]);
+        const rawInfo = _info.toHuman();
+        const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
+        extraInfoMap[collator.address] = {
+          identity,
+          isVerified: isReasonable,
+          active
+        };
+      }));
+      for (const validator of allCollators) {
+        validator.blocked = !extraInfoMap[validator.address].active;
+        validator.identity = extraInfoMap[validator.address].identity;
+        validator.isVerified = extraInfoMap[validator.address].isVerified;
+        // @ts-ignore
+        validator.commission = collatorCommission;
+      }
+      return allCollators;
     }
-    return allCollators;
   }
 
   /* Get pool targets */

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

@@ -4,7 +4,7 @@
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, ExtrinsicType, StakingTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import { calculateAlephZeroValidatorReturn, calculateChainStakedReturnV2, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getAvgValidatorEraReward, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getSupportedDaysByHistoryDepth } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
-import { _EXPECTED_BLOCK_TIME, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
+import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
 import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
 import { parseIdentity } from '@subwallet/extension-base/services/earning-service/utils';
@@ -122,9 +122,9 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
   /* Subscribe pool position */
 
   async parseNominatorMetadata(chainInfo, address, substrateApi, ledger, currentEra, minStake, _deriveSessionProgress) {
-    var _substrateApi$api$que7, _substrateApi$api$que8, _substrateApi$api$que9, _substrateApi$api$que10;
+    var _substrateApi$api$que7, _substrateApi$api$que8, _substrateApi$api$que9, _substrateApi$api$que10, _substrateApi$api$que11, _substrateApi$api$que12;
     const chain = chainInfo.slug;
-    const [_nominations, _bonded] = await Promise.all([(_substrateApi$api$que7 = substrateApi.api.query) === null || _substrateApi$api$que7 === void 0 ? void 0 : (_substrateApi$api$que8 = _substrateApi$api$que7.staking) === null || _substrateApi$api$que8 === void 0 ? void 0 : _substrateApi$api$que8.nominators(address), (_substrateApi$api$que9 = substrateApi.api.query) === null || _substrateApi$api$que9 === void 0 ? void 0 : (_substrateApi$api$que10 = _substrateApi$api$que9.staking) === null || _substrateApi$api$que10 === void 0 ? void 0 : _substrateApi$api$que10.bonded(address)]);
+    const [_nominations, _bonded, _activeEra] = await Promise.all([(_substrateApi$api$que7 = substrateApi.api.query) === null || _substrateApi$api$que7 === void 0 ? void 0 : (_substrateApi$api$que8 = _substrateApi$api$que7.staking) === null || _substrateApi$api$que8 === void 0 ? void 0 : _substrateApi$api$que8.nominators(address), (_substrateApi$api$que9 = substrateApi.api.query) === null || _substrateApi$api$que9 === void 0 ? void 0 : (_substrateApi$api$que10 = _substrateApi$api$que9.staking) === null || _substrateApi$api$que10 === void 0 ? void 0 : _substrateApi$api$que10.bonded(address), (_substrateApi$api$que11 = substrateApi.api.query) === null || _substrateApi$api$que11 === void 0 ? void 0 : (_substrateApi$api$que12 = _substrateApi$api$que11.staking) === null || _substrateApi$api$que12 === void 0 ? void 0 : _substrateApi$api$que12.activeEra()]);
     const unlimitedNominatorRewarded = substrateApi.api.consts.staking.maxExposurePageSize !== undefined;
     const _maxNominatorRewardedPerValidator = (substrateApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
@@ -181,21 +181,19 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       }
     }
     ledger.unlocking.forEach(unlockingChunk => {
-      // Calculate the remaining time for current era ending
-      const isClaimable = unlockingChunk.era - parseInt(currentEra) < 0;
-      const remainingEra = unlockingChunk.era - parseInt(currentEra);
-      const expectedBlockTime = _EXPECTED_BLOCK_TIME[chain];
-      const eraLength = _deriveSessionProgress.eraLength.toNumber();
-      const eraProgress = _deriveSessionProgress.eraProgress.toNumber();
-      const remainingSlots = eraLength - eraProgress;
-      const remainingHours = expectedBlockTime * remainingSlots / 60 / 60;
+      const activeEra = _activeEra.toPrimitive();
+      const era = parseInt(activeEra.index);
+      const startTimestampMs = parseInt(activeEra.start);
+      const remainingEra = unlockingChunk.era - era;
       const eraTime = _STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _STAKING_ERA_LENGTH_MAP.default; // in hours
-      const waitingTime = remainingEra * eraTime + remainingHours;
+      const remaningTimestampMs = remainingEra * eraTime * 60 * 60 * 1000;
+      const targetTimestampMs = startTimestampMs + remaningTimestampMs;
+      const isClaimable = targetTimestampMs - Date.now() <= 0;
       unstakingList.push({
         chain,
         status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
         claimable: unlockingChunk.value.toString(),
-        waitingTime: waitingTime
+        targetTimestampMs: targetTimestampMs
       });
     });
     return {
@@ -210,19 +208,19 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     };
   }
   async subscribePoolPosition(useAddresses, resultCallback) {
-    var _substrateApi$api$que11;
+    var _substrateApi$api$que13;
     let cancel = false;
     const substrateApi = await this.substrateApi.isReady;
     const defaultInfo = this.baseInfo;
     const chainInfo = this.chainInfo;
-    const unsub = await ((_substrateApi$api$que11 = substrateApi.api.query.staking) === null || _substrateApi$api$que11 === void 0 ? void 0 : _substrateApi$api$que11.ledger.multi(useAddresses, async ledgers => {
+    const unsub = await ((_substrateApi$api$que13 = substrateApi.api.query.staking) === null || _substrateApi$api$que13 === void 0 ? void 0 : _substrateApi$api$que13.ledger.multi(useAddresses, async ledgers => {
       if (cancel) {
         unsub();
         return;
       }
       if (ledgers) {
-        var _substrateApi$api$que12, _substrateApi$api$que13, _substrateApi$api$que14, _substrateApi$api$que15, _substrateApi$api$que16, _substrateApi$api$que17, _substrateApi$api$que18, _substrateApi$api$que19, _substrateApi$api$der, _substrateApi$api$der2;
-        const [_currentEra, _minimumActiveStake, _minNominatorBond, _deriveSessionProgress] = await Promise.all([(_substrateApi$api$que12 = substrateApi.api.query) === null || _substrateApi$api$que12 === void 0 ? void 0 : (_substrateApi$api$que13 = _substrateApi$api$que12.staking) === null || _substrateApi$api$que13 === void 0 ? void 0 : _substrateApi$api$que13.currentEra(), ((_substrateApi$api$que14 = substrateApi.api.query) === null || _substrateApi$api$que14 === void 0 ? void 0 : (_substrateApi$api$que15 = _substrateApi$api$que14.staking) === null || _substrateApi$api$que15 === void 0 ? void 0 : _substrateApi$api$que15.minimumActiveStake) && ((_substrateApi$api$que16 = substrateApi.api.query) === null || _substrateApi$api$que16 === void 0 ? void 0 : (_substrateApi$api$que17 = _substrateApi$api$que16.staking) === null || _substrateApi$api$que17 === void 0 ? void 0 : _substrateApi$api$que17.minimumActiveStake()), (_substrateApi$api$que18 = substrateApi.api.query) === null || _substrateApi$api$que18 === void 0 ? void 0 : (_substrateApi$api$que19 = _substrateApi$api$que18.staking) === null || _substrateApi$api$que19 === void 0 ? void 0 : _substrateApi$api$que19.minNominatorBond(), (_substrateApi$api$der = substrateApi.api.derive) === null || _substrateApi$api$der === void 0 ? void 0 : (_substrateApi$api$der2 = _substrateApi$api$der.session) === null || _substrateApi$api$der2 === void 0 ? void 0 : _substrateApi$api$der2.progress()]);
+        var _substrateApi$api$que14, _substrateApi$api$que15, _substrateApi$api$que16, _substrateApi$api$que17, _substrateApi$api$que18, _substrateApi$api$que19, _substrateApi$api$que20, _substrateApi$api$que21, _substrateApi$api$der, _substrateApi$api$der2;
+        const [_currentEra, _minimumActiveStake, _minNominatorBond, _deriveSessionProgress] = await Promise.all([(_substrateApi$api$que14 = substrateApi.api.query) === null || _substrateApi$api$que14 === void 0 ? void 0 : (_substrateApi$api$que15 = _substrateApi$api$que14.staking) === null || _substrateApi$api$que15 === void 0 ? void 0 : _substrateApi$api$que15.currentEra(), ((_substrateApi$api$que16 = substrateApi.api.query) === null || _substrateApi$api$que16 === void 0 ? void 0 : (_substrateApi$api$que17 = _substrateApi$api$que16.staking) === null || _substrateApi$api$que17 === void 0 ? void 0 : _substrateApi$api$que17.minimumActiveStake) && ((_substrateApi$api$que18 = substrateApi.api.query) === null || _substrateApi$api$que18 === void 0 ? void 0 : (_substrateApi$api$que19 = _substrateApi$api$que18.staking) === null || _substrateApi$api$que19 === void 0 ? void 0 : _substrateApi$api$que19.minimumActiveStake()), (_substrateApi$api$que20 = substrateApi.api.query) === null || _substrateApi$api$que20 === void 0 ? void 0 : (_substrateApi$api$que21 = _substrateApi$api$que20.staking) === null || _substrateApi$api$que21 === void 0 ? void 0 : _substrateApi$api$que21.minNominatorBond(), (_substrateApi$api$der = substrateApi.api.derive) === null || _substrateApi$api$der === void 0 ? void 0 : (_substrateApi$api$der2 = _substrateApi$api$der.session) === null || _substrateApi$api$der2 === void 0 ? void 0 : _substrateApi$api$der2.progress()]);
         const currentEra = _currentEra.toString();
         const minActiveStake = (_minimumActiveStake === null || _minimumActiveStake === void 0 ? void 0 : _minimumActiveStake.toString()) || '0';
         const minNominatorBond = _minNominatorBond.toString();

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

@@ -4,7 +4,7 @@
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { APIItemState, BasicTxErrorType, ChainType, ExtrinsicType, StakingTxErrorType, StakingType } from '@subwallet/extension-base/background/KoniTypes';
 import { calculateChainStakedReturnV2, calculateInflation, getAvgValidatorEraReward, getExistUnstakeErrorMessage, getMinStakeErrorMessage, getSupportedDaysByHistoryDepth, parsePoolStashAddress } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
-import { _EXPECTED_BLOCK_TIME, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
+import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
 import { EarningStatus, UnstakingStatus, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
@@ -150,7 +150,7 @@ export default class NominationPoolHandler extends BasePoolHandler {
     const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
     const poolsPalletId = substrateApi.api.consts.nominationPools.palletId.toString();
     const poolStashAccount = parsePoolStashAddress(substrateApi.api, 0, poolMemberInfo.poolId, poolsPalletId);
-    const [_nominations, _poolMetadata] = await Promise.all([substrateApi.api.query.staking.nominators(poolStashAccount), substrateApi.api.query.nominationPools.metadata(poolMemberInfo.poolId)]);
+    const [_nominations, _poolMetadata, _activeEra] = await Promise.all([substrateApi.api.query.staking.nominators(poolStashAccount), substrateApi.api.query.nominationPools.metadata(poolMemberInfo.poolId), substrateApi.api.query.staking.activeEra()]);
     const poolMetadata = _poolMetadata.toPrimitive();
     const nominations = _nominations.toJSON();
     const poolName = isHex(poolMetadata) ? hexToString(poolMetadata) : poolMetadata;
@@ -184,22 +184,20 @@ export default class NominationPoolHandler extends BasePoolHandler {
     const unstakings = [];
     let unstakingBalance = BN_ZERO;
     Object.entries(poolMemberInfo.unbondingEras).forEach(([unlockingEra, amount]) => {
-      // Calculate the remaining time for current era ending
-      const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) < 0;
-      const remainingEra = parseInt(unlockingEra) - parseInt(currentEra);
-      const expectedBlockTime = _EXPECTED_BLOCK_TIME[this.chain];
-      const eraLength = _deriveSessionProgress.eraLength.toNumber();
-      const eraProgress = _deriveSessionProgress.eraProgress.toNumber();
-      const remainingSlots = eraLength - eraProgress;
-      const remainingHours = expectedBlockTime * remainingSlots / 60 / 60;
+      const activeEra = _activeEra.toPrimitive();
+      const era = parseInt(activeEra.index);
+      const startTimestampMs = parseInt(activeEra.start);
+      const remainingEra = parseInt(unlockingEra) - era;
       const eraTime = _STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _STAKING_ERA_LENGTH_MAP.default; // in hours
-      const waitingTime = remainingEra * eraTime + remainingHours;
+      const remaningTimestampMs = remainingEra * eraTime * 60 * 60 * 1000;
+      const targetTimestampMs = startTimestampMs + remaningTimestampMs;
+      const isClaimable = targetTimestampMs - Date.now() <= 0;
       unstakingBalance = unstakingBalance.add(new BN(amount));
       unstakings.push({
         chain: chainInfo.slug,
         status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
         claimable: amount.toString(),
-        waitingTime: waitingTime
+        targetTimestampMs: targetTimestampMs
       });
     });
     const bnActiveStake = new BN(poolMemberInfo.points.toString());

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

@@ -19,6 +19,7 @@ export default abstract class BaseSpecialStakingPoolHandler extends BasePoolHand
     protected constructor(state: KoniState, chain: string);
     get metadataInfo(): Omit<SpecialYieldPoolMetadata, 'description'>;
     protected updateExchangeRate(rate: number): void;
+    /** Exchange rate before divine with decimals */
     protected getExchangeRate(): Promise<number>;
     get isPoolSupportAlternativeFee(): boolean;
     earlyValidate(request: RequestEarlyValidateYield): Promise<ResponseEarlyValidateYield>;

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

@@ -41,6 +41,8 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
     this.rate = rate;
     this.exchangeRatePromise.resolve(true);
   }
+
+  /** Exchange rate before divine with decimals */
   async getExchangeRate() {
     await this.exchangeRatePromise.promise;
     return this.rate;

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

@@ -18,12 +18,15 @@ export default class EarningService implements StoppableServiceInterface, Persis
     readonly yieldPositionListSubject: BehaviorSubject<YieldPositionInfo[]>;
     private dbService;
     private eventService;
+    private useOnlineCacheOnly;
     constructor(state: KoniState);
+    disableOnlineCacheOnly(): void;
     private initHandlers;
     startPromiseHandler: PromiseHandler<void>;
     stopPromiseHandler: PromiseHandler<void>;
     status: ServiceStatus;
     init(): Promise<void>;
+    private delayReloadTimeout;
     handleActions(): void;
     loadData(): Promise<void>;
     persistData(): Promise<void>;
@@ -36,7 +39,7 @@ export default class EarningService implements StoppableServiceInterface, Persis
     subscribeMinAmountPercent(): BehaviorSubject<Record<string, number>>;
     getMinAmountPercent(): Record<string, number>;
     getYieldPool(slug: string): Promise<YieldPoolInfo | undefined>;
-    subscribePoolsInfo(callback: (rs: YieldPoolInfo) => void): Promise<VoidFunction>;
+    subscribePoolsInfo(onlineData: Record<string, YieldPoolInfo>, callback: (rs: YieldPoolInfo) => void): Promise<VoidFunction>;
     private getYieldPoolInfoFromDB;
     subscribeYieldPoolInfo(): BehaviorSubject<Record<string, YieldPoolInfo>>;
     getYieldPoolInfo(): Promise<YieldPoolInfo[]>;