@subwallet/extension-base 1.1.33-0 → 1.1.33-beta.0

package/koni/api/staking/bonding/astar.js

@@ -1,9 +1,10 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { getStakingStatusByNominations } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { StakingType } from '@subwallet/extension-base/background/KoniTypes';
+import { getEarningStatusByNominations } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
+import { EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
 import { isUrl, parseRawNumber } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
 import { BN, BN_ZERO } from '@polkadot/util';
@@ -99,7 +100,7 @@ export async function subscribeAstarNominatorMetadata(chainInfo, address, substr
       const currentStake = stakeList.slice(-1)[0].staked.toString() || '0';
       const bnCurrentStake = new BN(currentStake);
       if (bnCurrentStake.gt(BN_ZERO)) {
-        const dappStakingStatus = bnCurrentStake.gt(BN_ZERO) && bnCurrentStake.gte(new BN(minDelegatorStake)) ? StakingStatus.EARNING_REWARD : StakingStatus.NOT_EARNING;
+        const dappStakingStatus = bnCurrentStake.gt(BN_ZERO) && bnCurrentStake.gte(new BN(minDelegatorStake)) ? EarningStatus.EARNING_REWARD : EarningStatus.NOT_EARNING;
         bnTotalActiveStake = bnTotalActiveStake.add(bnCurrentStake);
         const dappInfo = dAppInfoMap[dappAddress];
         nominationList.push({
@@ -134,13 +135,13 @@ export async function subscribeAstarNominatorMetadata(chainInfo, address, substr
       chain: chainInfo.slug,
       type: StakingType.NOMINATED,
       address,
-      status: StakingStatus.NOT_STAKING,
+      status: EarningStatus.NOT_STAKING,
       activeStake: '0',
       nominations: [],
       unstakings: []
     };
   }
-  const stakingStatus = getStakingStatusByNominations(bnTotalActiveStake, nominationList);
+  const stakingStatus = getEarningStatusByNominations(bnTotalActiveStake, nominationList);
   return {
     chain: chainInfo.slug,
     type: StakingType.NOMINATED,
@@ -185,7 +186,7 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
       const currentStake = stakeList.slice(-1)[0].staked.toString() || '0';
       const bnCurrentStake = new BN(currentStake);
       if (bnCurrentStake.gt(BN_ZERO)) {
-        const dappStakingStatus = bnCurrentStake.gt(BN_ZERO) && bnCurrentStake.gte(new BN(minDelegatorStake)) ? StakingStatus.EARNING_REWARD : StakingStatus.NOT_EARNING;
+        const dappStakingStatus = bnCurrentStake.gt(BN_ZERO) && bnCurrentStake.gte(new BN(minDelegatorStake)) ? EarningStatus.EARNING_REWARD : EarningStatus.NOT_EARNING;
         bnTotalActiveStake = bnTotalActiveStake.add(bnCurrentStake);
         const dappInfo = dAppInfoMap[dappAddress];
         nominationList.push({
@@ -220,13 +221,13 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
       chain: chainInfo.slug,
       type: StakingType.NOMINATED,
       address,
-      status: StakingStatus.NOT_STAKING,
+      status: EarningStatus.NOT_STAKING,
       activeStake: '0',
       nominations: [],
       unstakings: []
     };
   }
-  const stakingStatus = getStakingStatusByNominations(bnTotalActiveStake, nominationList);
+  const stakingStatus = getEarningStatusByNominations(bnTotalActiveStake, nominationList);
   return {
     chain,
     type: StakingType.NOMINATED,

package/koni/api/staking/bonding/index.d.ts

@@ -11,7 +11,7 @@ export declare function getChainStakingMetadata(chainInfo: _ChainInfo, substrate
  * */
 export declare function getNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getValidatorsInfo(networkKey: string, substrateApi: _SubstrateApi, decimals: number, chainStakingMetadata: ChainStakingMetadata): Promise<ValidatorInfo[]>;
-export declare function getNominationPoolsInfo(chain: string, substrateApi: _SubstrateApi): Promise<import("@subwallet/extension-base/background/KoniTypes").NominationPoolInfo[]>;
+export declare function getNominationPoolsInfo(chain: string, substrateApi: _SubstrateApi): Promise<import("../../../../types").NominationPoolInfo[]>;
 export declare function getBondingExtrinsic(chainInfo: _ChainInfo, amount: string, selectedValidators: ValidatorInfo[], substrateApi: _SubstrateApi, address: string, nominatorMetadata?: NominatorMetadata): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getUnbondingExtrinsic(nominatorMetadata: NominatorMetadata, amount: string, chain: string, substrateApi: _SubstrateApi, selectedValidator?: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getWithdrawalExtrinsic(substrateApi: _SubstrateApi, chain: string, nominatorMetadata: NominatorMetadata, validatorAddress?: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;

package/koni/api/staking/bonding/index.js

@@ -6,10 +6,14 @@ import { getAmplitudeBondingExtrinsic, getAmplitudeClaimRewardExtrinsic, getAmpl
 import { getAstarBondingExtrinsic, getAstarClaimRewardExtrinsic, getAstarDappsInfo, getAstarNominatorMetadata, getAstarStakingMetadata, getAstarUnbondingExtrinsic, getAstarWithdrawalExtrinsic, subscribeAstarStakingMetadata } from '@subwallet/extension-base/koni/api/staking/bonding/astar';
 import { getParaBondingExtrinsic, getParaCancelWithdrawalExtrinsic, getParachainCollatorsInfo, getParaChainNominatorMetadata, getParaChainStakingMetadata, getParaUnbondingExtrinsic, getParaWithdrawalExtrinsic, subscribeParaChainStakingMetadata, validateParaChainBondingCondition, validateParaChainUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding/paraChain';
 import { getPoolingClaimRewardExtrinsic, getPoolingWithdrawalExtrinsic, getRelayBondingExtrinsic, getRelayCancelWithdrawalExtrinsic, getRelayChainNominatorMetadata, getRelayChainStakingMetadata, getRelayPoolsInfo, getRelayUnbondingExtrinsic, getRelayValidatorsInfo, getRelayWithdrawalExtrinsic, subscribeRelayChainStakingMetadata, validateRelayBondingCondition, validateRelayUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
-import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
+import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
+
 // all addresses must be converted to its chain format
 
 export function validateUnbondingCondition(nominatorMetadata, amount, chain, chainStakingMetadata, selectedValidator) {
+  if (nominatorMetadata.type === StakingType.LIQUID_STAKING) {
+    return [];
+  }
   if (_STAKING_CHAIN_GROUP.relay.includes(chain)) {
     return validateRelayUnbondingCondition(amount, chainStakingMetadata, nominatorMetadata);
   }

package/koni/api/staking/bonding/paraChain.js

@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, StakingStatus, StakingTxErrorType, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { getBondedValidators, getExistUnstakeErrorMessage, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getParaCurrentInflation, getStakingStatusByNominations, isUnstakeAll, parseIdentity } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { BasicTxErrorType, StakingTxErrorType, StakingType } from '@subwallet/extension-base/background/KoniTypes';
+import { getBondedValidators, getEarningStatusByNominations, getExistUnstakeErrorMessage, getMaxValidatorErrorMessage, getMinStakeErrorMessage, 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 { _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
+import { parseIdentity } from '@subwallet/extension-base/services/earning-service/utils';
+import { EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
 import { isSameAddress, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
@@ -46,7 +48,7 @@ export function validateParaChainBondingCondition(chainInfo, amount, selectedCol
   const minStakeErrorMessage = getMinStakeErrorMessage(chainInfo, bnMinStake);
   const maxValidatorErrorMessage = getMaxValidatorErrorMessage(chainInfo, chainStakingMetadata.maxValidatorPerNominator);
   const existUnstakeErrorMessage = getExistUnstakeErrorMessage(chainInfo.slug, nominatorMetadata === null || nominatorMetadata === void 0 ? void 0 : nominatorMetadata.type, true);
-  if (!nominatorMetadata || nominatorMetadata.status === StakingStatus.NOT_STAKING) {
+  if (!nominatorMetadata || nominatorMetadata.status === EarningStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
     }
@@ -160,7 +162,7 @@ export async function subscribeParaChainNominatorMetadata(chainInfo, address, su
     const minDelegation = collatorInfo === null || collatorInfo === void 0 ? void 0 : collatorInfo.lowestTopDelegationAmount.toString();
     const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
     let hasUnstaking = false;
-    let delegationStatus = StakingStatus.NOT_EARNING;
+    let delegationStatus = EarningStatus.NOT_EARNING;
 
     // parse unstaking info
     if (delegationScheduledRequests) {
@@ -188,7 +190,7 @@ export async function subscribeParaChainNominatorMetadata(chainInfo, address, su
     const bnUnstakeBalance = unstakingMap[delegation.owner] ? new BN(unstakingMap[delegation.owner].claimable) : BN_ZERO;
     const bnActiveStake = bnStake.sub(bnUnstakeBalance);
     if (bnActiveStake.gt(BN_ZERO) && bnActiveStake.gte(new BN(minDelegation))) {
-      delegationStatus = StakingStatus.EARNING_REWARD;
+      delegationStatus = EarningStatus.EARNING_REWARD;
     }
     bnTotalActiveStake = bnTotalActiveStake.add(bnActiveStake);
     nominationList.push({
@@ -209,7 +211,7 @@ export async function subscribeParaChainNominatorMetadata(chainInfo, address, su
   //   nomination.validatorMinStake = collatorInfo.lowestTopDelegationAmount.toString();
   // }));
 
-  const stakingStatus = getStakingStatusByNominations(bnTotalActiveStake, nominationList);
+  const stakingStatus = getEarningStatusByNominations(bnTotalActiveStake, nominationList);
   return {
     chain: chainInfo.slug,
     type: StakingType.NOMINATED,
@@ -239,7 +241,7 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
       chain: chainInfo.slug,
       type: StakingType.NOMINATED,
       address,
-      status: StakingStatus.NOT_STAKING,
+      status: EarningStatus.NOT_STAKING,
       activeStake: '0',
       nominations: [],
       unstakings: []
@@ -254,7 +256,7 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
     const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
     const currentRound = roundInfo.current;
     let hasUnstaking = false;
-    let delegationStatus = StakingStatus.NOT_EARNING;
+    let delegationStatus = EarningStatus.NOT_EARNING;
 
     // parse unstaking info
     if (delegationScheduledRequests) {
@@ -282,7 +284,7 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
     const bnUnstakeBalance = unstakingMap[delegation.owner] ? new BN(unstakingMap[delegation.owner].claimable) : BN_ZERO;
     const bnActiveStake = bnStake.sub(bnUnstakeBalance);
     if (bnActiveStake.gt(BN_ZERO) && bnActiveStake.gte(new BN(minDelegation))) {
-      delegationStatus = StakingStatus.EARNING_REWARD;
+      delegationStatus = EarningStatus.EARNING_REWARD;
     }
     bnTotalActiveStake = bnTotalActiveStake.add(bnActiveStake);
     nominationList.push({
@@ -299,7 +301,7 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
     const collatorInfo = _collatorInfo.toPrimitive();
     nomination.validatorMinStake = collatorInfo.lowestTopDelegationAmount.toString();
   }));
-  const stakingStatus = getStakingStatusByNominations(bnTotalActiveStake, nominationList);
+  const stakingStatus = getEarningStatusByNominations(bnTotalActiveStake, nominationList);
   return {
     chain,
     type: StakingType.NOMINATED,

package/koni/api/staking/bonding/relayChain.d.ts

@@ -1,8 +1,8 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { ChainStakingMetadata, NominationPoolInfo, NominatorMetadata, UnstakingInfo, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
-import { PalletNominationPoolsPoolMember } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { ChainStakingMetadata, NominatorMetadata, UnstakingInfo, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
+import { NominationPoolInfo, PalletNominationPoolsPoolMember } from '@subwallet/extension-base/types';
 import { Codec } from '@polkadot/types/types';
 export interface PalletStakingNominations {
     targets: string[];

package/koni/api/staking/bonding/relayChain.js

@@ -2,11 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { StakingStatus, StakingTxErrorType, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
+import { StakingTxErrorType, StakingType } from '@subwallet/extension-base/background/KoniTypes';
 import { MAX_NOMINATIONS } from '@subwallet/extension-base/constants';
-import { calculateAlephZeroValidatorReturn, calculateChainStakedReturn, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getCommission, getExistUnstakeErrorMessage, getMaxValidatorErrorMessage, getMinStakeErrorMessage, parseIdentity, parsePoolStashAddress } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
-import { _EXPECTED_BLOCK_TIME, _STAKING_CHAIN_GROUP, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
+import { calculateAlephZeroValidatorReturn, calculateChainStakedReturn, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getCommission, getExistUnstakeErrorMessage, getMaxValidatorErrorMessage, getMinStakeErrorMessage, 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 { _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';
+import { EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
 import { reformatAddress } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
@@ -58,7 +61,7 @@ export function validateRelayBondingCondition(chainInfo, amount, selectedValidat
   const bnMinStake = new BN(chainStakingMetadata.minStake);
   const minStakeErrorMessage = getMinStakeErrorMessage(chainInfo, bnMinStake);
   const maxValidatorErrorMessage = getMaxValidatorErrorMessage(chainInfo, chainStakingMetadata.maxValidatorPerNominator);
-  if (!nominatorMetadata || nominatorMetadata.status === StakingStatus.NOT_STAKING) {
+  if (!nominatorMetadata || nominatorMetadata.status === EarningStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
     }
@@ -117,12 +120,12 @@ export function subscribeRelayChainStakingMetadata(chainInfo, substrateApi, call
   });
 }
 export async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
-  var _chainApi$api$query$a, _chainApi$api$query, _chainApi$api$query$s, _chainApi$api$query2, _chainApi$api$query2$, _chainApi$api$query3, _chainApi$api$query3$;
+  var _chainApi$api$consts$, _chainApi$api$consts$2, _chainApi$api$query$a, _chainApi$api$query, _chainApi$api$query$s, _chainApi$api$query2, _chainApi$api$query2$, _chainApi$api$query3, _chainApi$api$query3$;
   const chain = chainInfo.slug;
   const chainApi = await substrateApi.isReady;
   const _era = await chainApi.api.query.staking.currentEra();
   const currentEra = _era.toString();
-  const maxNominations = chainApi.api.consts.staking.maxNominations.toString();
+  const maxNominations = ((_chainApi$api$consts$ = chainApi.api.consts.staking) === null || _chainApi$api$consts$ === void 0 ? void 0 : (_chainApi$api$consts$2 = _chainApi$api$consts$.maxNominations) === null || _chainApi$api$consts$2 === void 0 ? void 0 : _chainApi$api$consts$2.toString()) || '16'; // TODO
   const maxUnlockingChunks = chainApi.api.consts.staking.maxUnlockingChunks.toString();
   const unlockingEras = chainApi.api.consts.staking.bondingDuration.toString();
   const [_totalEraStake, _totalIssuance, _auctionCounter, _minimumActiveStake, _minNominatorBond, _minPoolJoin, _eraStakers] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.balances.totalIssuance(), (_chainApi$api$query$a = chainApi.api.query.auctions) === null || _chainApi$api$query$a === void 0 ? void 0 : _chainApi$api$query$a.auctionCounter(), ((_chainApi$api$query = chainApi.api.query) === null || _chainApi$api$query === void 0 ? void 0 : (_chainApi$api$query$s = _chainApi$api$query.staking) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.minimumActiveStake) && ((_chainApi$api$query2 = chainApi.api.query) === null || _chainApi$api$query2 === void 0 ? void 0 : (_chainApi$api$query2$ = _chainApi$api$query2.staking) === null || _chainApi$api$query2$ === void 0 ? void 0 : _chainApi$api$query2$.minimumActiveStake()), chainApi.api.query.staking.minNominatorBond(), (_chainApi$api$query3 = chainApi.api.query) === null || _chainApi$api$query3 === void 0 ? void 0 : (_chainApi$api$query3$ = _chainApi$api$query3.nominationPools) === null || _chainApi$api$query3$ === void 0 ? void 0 : _chainApi$api$query3$.minJoinBond(), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra))]);
@@ -193,7 +196,7 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
   if (nominations) {
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
-      let nominationStatus = StakingStatus.NOT_EARNING;
+      let nominationStatus = EarningStatus.NOT_EARNING;
       const [[identity], _eraStaker] = await Promise.all([parseIdentity(chainApi, validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
       const eraStaker = _eraStaker.toPrimitive();
       const sortedNominators = eraStaker.others.sort((a, b) => {
@@ -204,10 +207,10 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
       });
       if (!topNominators.includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if nominator has target but not in nominator list
-        nominationStatus = StakingStatus.WAITING;
+        nominationStatus = EarningStatus.WAITING;
       } else if (topNominators.slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator).includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if address in top nominators
-        nominationStatus = StakingStatus.EARNING_REWARD;
+        nominationStatus = EarningStatus.EARNING_REWARD;
       }
       nominationList.push({
         chain,
@@ -219,20 +222,20 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
     }));
   }
 
-  let stakingStatus = StakingStatus.NOT_EARNING;
+  let stakingStatus = EarningStatus.NOT_EARNING;
   const bnActiveStake = new BN(activeStake);
   let waitingNominationCount = 0;
   if (bnActiveStake.gte(minStake)) {
     for (const nomination of nominationList) {
-      if (nomination.status === StakingStatus.EARNING_REWARD) {
+      if (nomination.status === EarningStatus.EARNING_REWARD) {
         // only need 1 earning nomination to count
-        stakingStatus = StakingStatus.EARNING_REWARD;
-      } else if (nomination.status === StakingStatus.WAITING) {
+        stakingStatus = EarningStatus.EARNING_REWARD;
+      } else if (nomination.status === EarningStatus.WAITING) {
         waitingNominationCount += 1;
       }
     }
     if (waitingNominationCount === nominationList.length) {
-      stakingStatus = StakingStatus.WAITING;
+      stakingStatus = EarningStatus.WAITING;
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
@@ -293,7 +296,7 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
     return {
       chain,
       type: StakingType.NOMINATED,
-      status: StakingStatus.NOT_STAKING,
+      status: EarningStatus.NOT_STAKING,
       address: address,
       activeStake: '0',
       nominations: [],
@@ -306,7 +309,7 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
   if (nominations) {
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
-      let nominationStatus = StakingStatus.NOT_EARNING;
+      let nominationStatus = EarningStatus.NOT_EARNING;
       const [[identity], _eraStaker] = await Promise.all([parseIdentity(chainApi, validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
       const eraStaker = _eraStaker.toPrimitive();
       const sortedNominators = eraStaker.others.sort((a, b) => {
@@ -317,10 +320,10 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
       });
       if (!topNominators.includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if nominator has target but not in nominator list
-        nominationStatus = StakingStatus.WAITING;
+        nominationStatus = EarningStatus.WAITING;
       } else if (topNominators.slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator).includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if address in top nominators
-        nominationStatus = StakingStatus.EARNING_REWARD;
+        nominationStatus = EarningStatus.EARNING_REWARD;
       }
       nominationList.push({
         chain,
@@ -332,20 +335,20 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
     }));
   }
 
-  let stakingStatus = StakingStatus.NOT_EARNING;
+  let stakingStatus = EarningStatus.NOT_EARNING;
   const bnActiveStake = new BN(activeStake);
   let waitingNominationCount = 0;
   if (bnActiveStake.gte(minStake)) {
     for (const nomination of nominationList) {
-      if (nomination.status === StakingStatus.EARNING_REWARD) {
+      if (nomination.status === EarningStatus.EARNING_REWARD) {
         // only need 1 earning nomination to count
-        stakingStatus = StakingStatus.EARNING_REWARD;
-      } else if (nomination.status === StakingStatus.WAITING) {
+        stakingStatus = EarningStatus.EARNING_REWARD;
+      } else if (nomination.status === EarningStatus.WAITING) {
         waitingNominationCount += 1;
       }
     }
     if (waitingNominationCount === nominationList.length) {
-      stakingStatus = StakingStatus.WAITING;
+      stakingStatus = EarningStatus.WAITING;
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
@@ -381,7 +384,7 @@ export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address,
   const poolMetadata = _poolMetadata.toPrimitive();
   const currentEra = _currentEra.toString();
   const nominations = _nominations.toJSON();
-  let stakingStatus = StakingStatus.NOT_EARNING;
+  let stakingStatus = EarningStatus.NOT_EARNING;
   const getPoolName = () => {
     if (poolMetadata.isUtf8) {
       return poolMetadata.toUtf8();
@@ -404,7 +407,7 @@ export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address,
       }).slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator);
       if (topNominators.includes(reformatAddress(poolStashAccount, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if address in top nominators
-        stakingStatus = StakingStatus.EARNING_REWARD;
+        stakingStatus = EarningStatus.EARNING_REWARD;
       }
     }));
   }
@@ -439,7 +442,7 @@ export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address,
   });
   const bnActiveStake = new BN(poolMemberInfo.points.toString());
   if (!bnActiveStake.gt(BN_ZERO)) {
-    stakingStatus = StakingStatus.NOT_EARNING;
+    stakingStatus = EarningStatus.NOT_EARNING;
   }
   return {
     chain: chainInfo.slug,
@@ -470,14 +473,14 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
       chain: chainInfo.slug,
       type: StakingType.POOLED,
       address,
-      status: StakingStatus.NOT_STAKING,
+      status: EarningStatus.NOT_STAKING,
       activeStake: '0',
       nominations: [],
       // can only join 1 pool at a time
       unstakings: []
     };
   }
-  let stakingStatus = StakingStatus.NOT_EARNING;
+  let stakingStatus = EarningStatus.NOT_EARNING;
   const _poolMetadata = await chainApi.api.query.nominationPools.metadata(poolMemberInfo.poolId);
   const poolMetadata = _poolMetadata.toPrimitive();
   const getPoolName = () => {
@@ -505,7 +508,7 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
       }).slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator);
       if (topNominators.includes(reformatAddress(poolStashAccount, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if address in top nominators
-        stakingStatus = StakingStatus.EARNING_REWARD;
+        stakingStatus = EarningStatus.EARNING_REWARD;
       }
     }));
   }
@@ -532,7 +535,7 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
   });
   const bnActiveStake = new BN(poolMemberInfo.points.toString());
   if (!bnActiveStake.gt(BN_ZERO)) {
-    stakingStatus = StakingStatus.NOT_EARNING;
+    stakingStatus = EarningStatus.NOT_EARNING;
   }
   return {
     chain: chainInfo.slug,

package/koni/api/staking/bonding/utils.d.ts

@@ -1,16 +1,10 @@
 /// <reference types="bn.js" />
 import { _ChainInfo } from '@subwallet/chain-list/types';
-import { NominationInfo, NominatorMetadata, StakingStatus, StakingType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { NominationInfo, NominatorMetadata, StakingType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateInflationParams } from '@subwallet/extension-base/services/chain-service/constants';
-import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
+import { EarningStatus, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
 import { ApiPromise } from '@polkadot/api';
 import { BN } from '@polkadot/util';
-export interface PalletNominationPoolsPoolMember {
-    poolId: number;
-    points: number;
-    lasRecordedRewardCounter: number;
-    unbondingEras: Record<string, number>;
-}
 export interface PalletDappsStakingDappInfo {
     address: string;
     name: string;
@@ -71,15 +65,6 @@ export interface PalletParachainStakingDelegator {
     lessTotal: number;
     status: number;
 }
-export interface PalletStakingExposureItem {
-    who: string;
-    value: number;
-}
-export interface PalletStakingExposure {
-    total: number;
-    own: number;
-    others: PalletStakingExposureItem[];
-}
 export interface PalletIdentityRegistration {
     judgements: any[];
     deposit: number;
@@ -101,32 +86,12 @@ export interface PalletIdentityRegistration {
 export declare type PalletIdentitySuper = [string, {
     Raw: string;
 }];
-export interface ValidatorExtraInfo {
-    commission: string;
-    blocked: false;
-    identity?: string;
-    isVerified: boolean;
-}
 export interface Unlocking {
     remainingEras: BN;
     value: BN;
 }
-export interface TernoaStakingRewardsStakingRewardsData {
-    sessionEraPayout: string;
-    sessionExtraRewardPayout: string;
-}
 export declare function parsePoolStashAddress(api: ApiPromise, index: number, poolId: number, poolsPalletId: string): string;
 export declare function transformPoolName(input: string): string;
-/**
-  * @returns
-  * <p>
-  * [0] - identity
-  * </p>
-  * <p>
-  * [1] - isReasonable (isVerified)
-  * </p>
-  *  */
-export declare function parseIdentity(substrateApi: _SubstrateApi, address: string, children?: string): Promise<[string | undefined, boolean]>;
 export declare function getInflationParams(networkKey: string): _SubstrateInflationParams;
 export declare function calcInflationUniformEraPayout(totalIssuance: BN, yearlyInflationInTokens: number): number;
 export declare function calcInflationRewardCurve(minInflation: number, stakedFraction: number, idealStake: number, idealInterest: number, falloff: number): number;
@@ -164,6 +129,18 @@ export declare function getBondedValidators(nominations: NominationInfo[]): {
     bondedValidators: string[];
 };
 export declare function isUnstakeAll(selectedValidator: string, nominations: NominationInfo[], unstakeAmount: string): boolean;
+export declare enum YieldAction {
+    STAKE = "STAKE",
+    UNSTAKE = "UNSTAKE",
+    WITHDRAW = "WITHDRAW",
+    CLAIM_REWARD = "CLAIM_REWARD",
+    CANCEL_UNSTAKE = "CANCEL_UNSTAKE",
+    START_EARNING = "EARN",
+    WITHDRAW_EARNING = "WITHDRAW_EARNING",
+    CUSTOM_ACTION = "CUSTOM_ACTION"
+}
+export declare function getYieldAvailableActionsByType(yieldPoolInfo: YieldPoolInfo): YieldAction[];
+export declare function getYieldAvailableActionsByPosition(yieldPosition: YieldPositionInfo, yieldPoolInfo: YieldPoolInfo, unclaimedReward?: string): YieldAction[];
 export declare enum StakingAction {
     STAKE = "STAKE",
     UNSTAKE = "UNSTAKE",
@@ -175,7 +152,7 @@ export declare function getStakingAvailableActionsByChain(chain: string, type: S
 export declare function getStakingAvailableActionsByNominator(nominatorMetadata: NominatorMetadata, unclaimedReward?: string): StakingAction[];
 export declare function isActionFromValidator(stakingType: StakingType, chain: string): boolean;
 export declare function getWithdrawalInfo(nominatorMetadata: NominatorMetadata): UnstakingInfo | undefined;
-export declare function getStakingStatusByNominations(bnTotalActiveStake: BN, nominationList: NominationInfo[]): StakingStatus;
+export declare function getEarningStatusByNominations(bnTotalActiveStake: BN, nominationList: NominationInfo[]): EarningStatus;
 export declare function getValidatorLabel(chain: string): "dApp" | "Validator" | "Collator";
 export declare const getMinStakeErrorMessage: (chainInfo: _ChainInfo, bnMinStake: BN) => string;
 export declare const getMaxValidatorErrorMessage: (chainInfo: _ChainInfo, max: number) => string;