@subwallet/extension-base 1.1.31-beta.0 → 1.1.32-0

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

@@ -2,12 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-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 { 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 { _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';
@@ -48,7 +46,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 === EarningStatus.NOT_STAKING) {
+  if (!nominatorMetadata || nominatorMetadata.status === StakingStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
     }
@@ -89,17 +87,18 @@ export function validateParaChainBondingCondition(chainInfo, amount, selectedCol
 }
 export function subscribeParaChainStakingMetadata(chain, substrateApi, callback) {
   return substrateApi.api.query.parachainStaking.round(_round => {
-    var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$con3;
+    var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$con3, _substrateApi$api$con4, _substrateApi$api$con5, _substrateApi$api$con6;
     const roundObj = _round.toHuman();
     const round = parseRawNumber(roundObj.current);
     const maxDelegations = (_substrateApi$api$con = substrateApi.api.consts) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.parachainStaking) === null || _substrateApi$api$con2 === void 0 ? void 0 : (_substrateApi$api$con3 = _substrateApi$api$con2.maxDelegationsPerDelegator) === null || _substrateApi$api$con3 === void 0 ? void 0 : _substrateApi$api$con3.toString();
     const unstakingDelay = substrateApi.api.consts.parachainStaking.delegationBondLessDelay.toString();
     const unstakingPeriod = parseInt(unstakingDelay) * (_STAKING_ERA_LENGTH_MAP[chain] || _STAKING_ERA_LENGTH_MAP.default);
+    const minDelegatorStake = (_substrateApi$api$con4 = substrateApi.api.consts) === null || _substrateApi$api$con4 === void 0 ? void 0 : (_substrateApi$api$con5 = _substrateApi$api$con4.parachainStaking) === null || _substrateApi$api$con5 === void 0 ? void 0 : (_substrateApi$api$con6 = _substrateApi$api$con5.minDelegatorStk) === null || _substrateApi$api$con6 === void 0 ? void 0 : _substrateApi$api$con6.toString();
     callback(chain, {
       chain,
       type: StakingType.NOMINATED,
       era: round,
-      minStake: '0',
+      minStake: minDelegatorStake || '0',
       maxValidatorPerNominator: parseInt(maxDelegations),
       maxWithdrawalRequestPerValidator: 1,
       // by default
@@ -109,11 +108,13 @@ export function subscribeParaChainStakingMetadata(chain, substrateApi, callback)
   });
 }
 export async function getParaChainStakingMetadata(chain, substrateApi) {
+  var _chainApi$api$consts$, _chainApi$api$consts$2;
   const chainApi = await substrateApi.isReady;
   const _round = (await chainApi.api.query.parachainStaking.round()).toHuman();
   const round = parseRawNumber(_round.current);
   const maxDelegations = chainApi.api.consts.parachainStaking.maxDelegationsPerDelegator.toString();
   const unstakingDelay = chainApi.api.consts.parachainStaking.delegationBondLessDelay.toString();
+  const minDelegatorStake = (_chainApi$api$consts$ = chainApi.api.consts.parachainStaking) === null || _chainApi$api$consts$ === void 0 ? void 0 : (_chainApi$api$consts$2 = _chainApi$api$consts$.minDelegatorStk) === null || _chainApi$api$consts$2 === void 0 ? void 0 : _chainApi$api$consts$2.toString();
   let _unvestedAllocation;
   if (chainApi.api.query.vesting && chainApi.api.query.vesting.totalUnvestedAllocation) {
     _unvestedAllocation = await chainApi.api.query.vesting.totalUnvestedAllocation();
@@ -138,7 +139,7 @@ export async function getParaChainStakingMetadata(chain, substrateApi) {
     type: StakingType.NOMINATED,
     era: round,
     inflation,
-    minStake: '0',
+    minStake: minDelegatorStake || '0',
     maxValidatorPerNominator: parseInt(maxDelegations),
     maxWithdrawalRequestPerValidator: 1,
     // by default
@@ -159,7 +160,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 = EarningStatus.NOT_EARNING;
+    let delegationStatus = StakingStatus.NOT_EARNING;
 
     // parse unstaking info
     if (delegationScheduledRequests) {
@@ -187,7 +188,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 = EarningStatus.EARNING_REWARD;
+      delegationStatus = StakingStatus.EARNING_REWARD;
     }
     bnTotalActiveStake = bnTotalActiveStake.add(bnActiveStake);
     nominationList.push({
@@ -208,7 +209,7 @@ export async function subscribeParaChainNominatorMetadata(chainInfo, address, su
   //   nomination.validatorMinStake = collatorInfo.lowestTopDelegationAmount.toString();
   // }));
 
-  const stakingStatus = getEarningStatusByNominations(bnTotalActiveStake, nominationList);
+  const stakingStatus = getStakingStatusByNominations(bnTotalActiveStake, nominationList);
   return {
     chain: chainInfo.slug,
     type: StakingType.NOMINATED,
@@ -238,7 +239,7 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
       chain: chainInfo.slug,
       type: StakingType.NOMINATED,
       address,
-      status: EarningStatus.NOT_STAKING,
+      status: StakingStatus.NOT_STAKING,
       activeStake: '0',
       nominations: [],
       unstakings: []
@@ -253,7 +254,7 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
     const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
     const currentRound = roundInfo.current;
     let hasUnstaking = false;
-    let delegationStatus = EarningStatus.NOT_EARNING;
+    let delegationStatus = StakingStatus.NOT_EARNING;
 
     // parse unstaking info
     if (delegationScheduledRequests) {
@@ -281,7 +282,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 = EarningStatus.EARNING_REWARD;
+      delegationStatus = StakingStatus.EARNING_REWARD;
     }
     bnTotalActiveStake = bnTotalActiveStake.add(bnActiveStake);
     nominationList.push({
@@ -298,7 +299,7 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
     const collatorInfo = _collatorInfo.toPrimitive();
     nomination.validatorMinStake = collatorInfo.lowestTopDelegationAmount.toString();
   }));
-  const stakingStatus = getEarningStatusByNominations(bnTotalActiveStake, nominationList);
+  const stakingStatus = getStakingStatusByNominations(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, NominatorMetadata, UnstakingInfo, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainStakingMetadata, NominationPoolInfo, NominatorMetadata, UnstakingInfo, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { PalletNominationPoolsPoolMember } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 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,14 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { StakingTxErrorType, StakingType } from '@subwallet/extension-base/background/KoniTypes';
+import { StakingStatus, StakingTxErrorType, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
 import { MAX_NOMINATIONS } from '@subwallet/extension-base/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 { 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 { _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';
@@ -61,7 +58,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 === EarningStatus.NOT_STAKING) {
+  if (!nominatorMetadata || nominatorMetadata.status === StakingStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
     }
@@ -120,12 +117,12 @@ export function subscribeRelayChainStakingMetadata(chainInfo, substrateApi, call
   });
 }
 export async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
-  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$;
+  var _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$ = 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 maxNominations = chainApi.api.consts.staking.maxNominations.toString();
   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))]);
@@ -196,7 +193,7 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
   if (nominations) {
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
-      let nominationStatus = EarningStatus.NOT_EARNING;
+      let nominationStatus = StakingStatus.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) => {
@@ -207,10 +204,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 = EarningStatus.WAITING;
+        nominationStatus = StakingStatus.WAITING;
       } else if (topNominators.slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator).includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if address in top nominators
-        nominationStatus = EarningStatus.EARNING_REWARD;
+        nominationStatus = StakingStatus.EARNING_REWARD;
       }
       nominationList.push({
         chain,
@@ -222,20 +219,20 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
     }));
   }
 
-  let stakingStatus = EarningStatus.NOT_EARNING;
+  let stakingStatus = StakingStatus.NOT_EARNING;
   const bnActiveStake = new BN(activeStake);
   let waitingNominationCount = 0;
   if (bnActiveStake.gte(minStake)) {
     for (const nomination of nominationList) {
-      if (nomination.status === EarningStatus.EARNING_REWARD) {
+      if (nomination.status === StakingStatus.EARNING_REWARD) {
         // only need 1 earning nomination to count
-        stakingStatus = EarningStatus.EARNING_REWARD;
-      } else if (nomination.status === EarningStatus.WAITING) {
+        stakingStatus = StakingStatus.EARNING_REWARD;
+      } else if (nomination.status === StakingStatus.WAITING) {
         waitingNominationCount += 1;
       }
     }
     if (waitingNominationCount === nominationList.length) {
-      stakingStatus = EarningStatus.WAITING;
+      stakingStatus = StakingStatus.WAITING;
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
@@ -296,7 +293,7 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
     return {
       chain,
       type: StakingType.NOMINATED,
-      status: EarningStatus.NOT_STAKING,
+      status: StakingStatus.NOT_STAKING,
       address: address,
       activeStake: '0',
       nominations: [],
@@ -309,7 +306,7 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
   if (nominations) {
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
-      let nominationStatus = EarningStatus.NOT_EARNING;
+      let nominationStatus = StakingStatus.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) => {
@@ -320,10 +317,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 = EarningStatus.WAITING;
+        nominationStatus = StakingStatus.WAITING;
       } else if (topNominators.slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator).includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
         // if address in top nominators
-        nominationStatus = EarningStatus.EARNING_REWARD;
+        nominationStatus = StakingStatus.EARNING_REWARD;
       }
       nominationList.push({
         chain,
@@ -335,20 +332,20 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
     }));
   }
 
-  let stakingStatus = EarningStatus.NOT_EARNING;
+  let stakingStatus = StakingStatus.NOT_EARNING;
   const bnActiveStake = new BN(activeStake);
   let waitingNominationCount = 0;
   if (bnActiveStake.gte(minStake)) {
     for (const nomination of nominationList) {
-      if (nomination.status === EarningStatus.EARNING_REWARD) {
+      if (nomination.status === StakingStatus.EARNING_REWARD) {
         // only need 1 earning nomination to count
-        stakingStatus = EarningStatus.EARNING_REWARD;
-      } else if (nomination.status === EarningStatus.WAITING) {
+        stakingStatus = StakingStatus.EARNING_REWARD;
+      } else if (nomination.status === StakingStatus.WAITING) {
         waitingNominationCount += 1;
       }
     }
     if (waitingNominationCount === nominationList.length) {
-      stakingStatus = EarningStatus.WAITING;
+      stakingStatus = StakingStatus.WAITING;
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
@@ -384,7 +381,7 @@ export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address,
   const poolMetadata = _poolMetadata.toPrimitive();
   const currentEra = _currentEra.toString();
   const nominations = _nominations.toJSON();
-  let stakingStatus = EarningStatus.NOT_EARNING;
+  let stakingStatus = StakingStatus.NOT_EARNING;
   const getPoolName = () => {
     if (poolMetadata.isUtf8) {
       return poolMetadata.toUtf8();
@@ -407,7 +404,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 = EarningStatus.EARNING_REWARD;
+        stakingStatus = StakingStatus.EARNING_REWARD;
       }
     }));
   }
@@ -442,7 +439,7 @@ export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address,
   });
   const bnActiveStake = new BN(poolMemberInfo.points.toString());
   if (!bnActiveStake.gt(BN_ZERO)) {
-    stakingStatus = EarningStatus.NOT_EARNING;
+    stakingStatus = StakingStatus.NOT_EARNING;
   }
   return {
     chain: chainInfo.slug,
@@ -473,14 +470,14 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
       chain: chainInfo.slug,
       type: StakingType.POOLED,
       address,
-      status: EarningStatus.NOT_STAKING,
+      status: StakingStatus.NOT_STAKING,
       activeStake: '0',
       nominations: [],
       // can only join 1 pool at a time
       unstakings: []
     };
   }
-  let stakingStatus = EarningStatus.NOT_EARNING;
+  let stakingStatus = StakingStatus.NOT_EARNING;
   const _poolMetadata = await chainApi.api.query.nominationPools.metadata(poolMemberInfo.poolId);
   const poolMetadata = _poolMetadata.toPrimitive();
   const getPoolName = () => {
@@ -508,7 +505,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 = EarningStatus.EARNING_REWARD;
+        stakingStatus = StakingStatus.EARNING_REWARD;
       }
     }));
   }
@@ -535,7 +532,7 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
   });
   const bnActiveStake = new BN(poolMemberInfo.points.toString());
   if (!bnActiveStake.gt(BN_ZERO)) {
-    stakingStatus = EarningStatus.NOT_EARNING;
+    stakingStatus = StakingStatus.NOT_EARNING;
   }
   return {
     chain: chainInfo.slug,

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

@@ -1,10 +1,16 @@
 /// <reference types="bn.js" />
 import { _ChainInfo } from '@subwallet/chain-list/types';
-import { NominationInfo, NominatorMetadata, StakingType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { NominationInfo, NominatorMetadata, StakingStatus, StakingType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateInflationParams } from '@subwallet/extension-base/services/chain-service/constants';
-import { EarningStatus, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/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;
@@ -61,6 +67,15 @@ 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;
@@ -82,12 +97,32 @@ 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;
@@ -125,18 +160,6 @@ 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",
@@ -148,7 +171,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 getEarningStatusByNominations(bnTotalActiveStake: BN, nominationList: NominationInfo[]): EarningStatus;
+export declare function getStakingStatusByNominations(bnTotalActiveStake: BN, nominationList: NominationInfo[]): StakingStatus;
 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;

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

@@ -1,16 +1,14 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { StakingType } from '@subwallet/extension-base/background/KoniTypes';
+import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
 import { getAstarWithdrawable } from '@subwallet/extension-base/koni/api/staking/bonding/astar';
-import { _KNOWN_CHAIN_INFLATION_PARAMS, _SUBSTRATE_DEFAULT_INFLATION_PARAMS } from '@subwallet/extension-base/services/chain-service/constants';
+import { _KNOWN_CHAIN_INFLATION_PARAMS, _STAKING_CHAIN_GROUP, _SUBSTRATE_DEFAULT_INFLATION_PARAMS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainNativeTokenBasicInfo } from '@subwallet/extension-base/services/chain-service/utils';
-import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
-import { EarningStatus, UnstakingStatus, YieldPoolType } from '@subwallet/extension-base/types';
-import { detectTranslate, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
+import { detectTranslate, isSameAddress, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
 import { t } from 'i18next';
-import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_THOUSAND, BN_ZERO, bnToU8a, stringToU8a, u8aConcat } from '@polkadot/util';
+import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_THOUSAND, BN_ZERO, bnToU8a, hexToString, isHex, stringToU8a, u8aConcat } from '@polkadot/util';
 export let PalletParachainStakingRequestType;
 (function (PalletParachainStakingRequestType) {
   PalletParachainStakingRequestType["REVOKE"] = "revoke";
@@ -29,6 +27,64 @@ export function parsePoolStashAddress(api, index, poolId, poolsPalletId) {
 export function transformPoolName(input) {
   return input.replace(/[^\x20-\x7E]/g, '');
 }
+
+/**
+  * @returns
+  * <p>
+  * [0] - identity
+  * </p>
+  * <p>
+  * [1] - isReasonable (isVerified)
+  * </p>
+  *  */
+export async function parseIdentity(substrateApi, address, children) {
+  const compactResult = rs => {
+    const result = [];
+    if (rs) {
+      result.push(rs);
+    }
+    if (children) {
+      result.push(children);
+    }
+    if (result.length > 0) {
+      return result.join('/');
+    } else {
+      return undefined;
+    }
+  };
+  if (substrateApi.api.query.identity) {
+    let identity;
+    const _parent = await substrateApi.api.query.identity.superOf(address);
+    const parentInfo = _parent.toHuman();
+    if (parentInfo) {
+      const [parentAddress, {
+        Raw: data
+      }] = parentInfo;
+      const child = isHex(data) ? hexToString(data) : data;
+      if (!isSameAddress(address, parentAddress)) {
+        const [rs, isReasonable] = await parseIdentity(substrateApi, parentAddress, child);
+        return [compactResult(rs), isReasonable];
+      }
+    }
+    const _identity = await substrateApi.api.query.identity.identityOf(address);
+    const identityInfo = _identity.toHuman();
+    if (identityInfo) {
+      var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t;
+      const displayName = (_identityInfo$info = identityInfo.info) === null || _identityInfo$info === void 0 ? void 0 : (_identityInfo$info$di = _identityInfo$info.display) === null || _identityInfo$info$di === void 0 ? void 0 : _identityInfo$info$di.Raw;
+      const web = (_identityInfo$info2 = identityInfo.info) === null || _identityInfo$info2 === void 0 ? void 0 : (_identityInfo$info2$w = _identityInfo$info2.web) === null || _identityInfo$info2$w === void 0 ? void 0 : _identityInfo$info2$w.Raw;
+      const riot = (_identityInfo$info3 = identityInfo.info) === null || _identityInfo$info3 === void 0 ? void 0 : (_identityInfo$info3$r = _identityInfo$info3.riot) === null || _identityInfo$info3$r === void 0 ? void 0 : _identityInfo$info3$r.Raw;
+      const twitter = (_identityInfo$info4 = identityInfo.info) === null || _identityInfo$info4 === void 0 ? void 0 : (_identityInfo$info4$t = _identityInfo$info4.twitter) === null || _identityInfo$info4$t === void 0 ? void 0 : _identityInfo$info4$t.Raw;
+      const isReasonable = identityInfo.judgements.length > 0;
+      if (displayName) {
+        identity = isHex(displayName) ? hexToString(displayName) : displayName;
+      } else {
+        identity = twitter || web || riot;
+      }
+      return [compactResult(identity), isReasonable];
+    }
+  }
+  return [undefined, false];
+}
 export function getInflationParams(networkKey) {
   return _KNOWN_CHAIN_INFLATION_PARAMS[networkKey] || _SUBSTRATE_DEFAULT_INFLATION_PARAMS;
 }
@@ -142,78 +198,6 @@ export function isUnstakeAll(selectedValidator, nominations, unstakeAmount) {
   }
   return isUnstakeAll;
 }
-export let YieldAction;
-(function (YieldAction) {
-  YieldAction["STAKE"] = "STAKE";
-  YieldAction["UNSTAKE"] = "UNSTAKE";
-  YieldAction["WITHDRAW"] = "WITHDRAW";
-  YieldAction["CLAIM_REWARD"] = "CLAIM_REWARD";
-  YieldAction["CANCEL_UNSTAKE"] = "CANCEL_UNSTAKE";
-  YieldAction["START_EARNING"] = "EARN";
-  YieldAction["WITHDRAW_EARNING"] = "WITHDRAW_EARNING";
-  YieldAction["CUSTOM_ACTION"] = "CUSTOM_ACTION";
-})(YieldAction || (YieldAction = {}));
-export function getYieldAvailableActionsByType(yieldPoolInfo) {
-  if ([YieldPoolType.NATIVE_STAKING, YieldPoolType.NOMINATION_POOL].includes(yieldPoolInfo.type)) {
-    if (yieldPoolInfo.type === YieldPoolType.NOMINATION_POOL) {
-      return [YieldAction.STAKE, YieldAction.CLAIM_REWARD, YieldAction.UNSTAKE, YieldAction.WITHDRAW];
-    }
-    const chain = yieldPoolInfo.chain;
-    if (_STAKING_CHAIN_GROUP.para.includes(chain)) {
-      return [YieldAction.STAKE, YieldAction.UNSTAKE, YieldAction.WITHDRAW, YieldAction.CANCEL_UNSTAKE];
-    } else if (_STAKING_CHAIN_GROUP.astar.includes(chain)) {
-      return [YieldAction.STAKE, YieldAction.CLAIM_REWARD, YieldAction.UNSTAKE, YieldAction.WITHDRAW];
-    } else if (_STAKING_CHAIN_GROUP.amplitude.includes(chain)) {
-      return [YieldAction.STAKE, YieldAction.UNSTAKE, YieldAction.WITHDRAW];
-    }
-  }
-  if (yieldPoolInfo.type === YieldPoolType.LENDING) {
-    return [YieldAction.START_EARNING, YieldAction.WITHDRAW_EARNING];
-  } else if (yieldPoolInfo.type === YieldPoolType.LIQUID_STAKING) {
-    return [YieldAction.START_EARNING, YieldAction.UNSTAKE, YieldAction.WITHDRAW];
-  }
-  return [YieldAction.STAKE, YieldAction.UNSTAKE, YieldAction.WITHDRAW, YieldAction.CANCEL_UNSTAKE];
-}
-export function getYieldAvailableActionsByPosition(yieldPosition, yieldPoolInfo, unclaimedReward) {
-  const result = [];
-  if ([YieldPoolType.NATIVE_STAKING, YieldPoolType.NOMINATION_POOL].includes(yieldPoolInfo.type)) {
-    result.push(YieldAction.STAKE);
-    const bnActiveStake = new BN(yieldPosition.activeStake);
-    if (yieldPosition.activeStake && bnActiveStake.gt(BN_ZERO)) {
-      result.push(YieldAction.UNSTAKE);
-      const isAstarNetwork = _STAKING_CHAIN_GROUP.astar.includes(yieldPosition.chain);
-      const isAmplitudeNetwork = _STAKING_CHAIN_GROUP.amplitude.includes(yieldPosition.chain);
-      const bnUnclaimedReward = new BN(unclaimedReward || '0');
-      if ((yieldPosition.type === YieldPoolType.NOMINATION_POOL || isAmplitudeNetwork) && bnUnclaimedReward.gt(BN_ZERO) || isAstarNetwork) {
-        result.push(YieldAction.CLAIM_REWARD);
-      }
-    }
-    if (yieldPosition.unstakings.length > 0) {
-      result.push(YieldAction.CANCEL_UNSTAKE);
-      const hasClaimable = yieldPosition.unstakings.some(unstaking => unstaking.status === UnstakingStatus.CLAIMABLE);
-      if (hasClaimable) {
-        result.push(YieldAction.WITHDRAW);
-      }
-    }
-  } else if (yieldPoolInfo.type === YieldPoolType.LIQUID_STAKING) {
-    result.push(YieldAction.START_EARNING);
-    const activeBalance = new BN(yieldPosition.activeStake || '0');
-    if (activeBalance.gt(BN_ZERO)) {
-      result.push(YieldAction.UNSTAKE);
-    }
-    const hasWithdrawal = yieldPosition.unstakings.some(unstakingInfo => unstakingInfo.status === UnstakingStatus.CLAIMABLE);
-    if (hasWithdrawal) {
-      result.push(YieldAction.WITHDRAW);
-    }
-
-    // TODO: check has unstakings to withdraw
-  } else {
-    result.push(YieldAction.START_EARNING);
-    result.push(YieldAction.WITHDRAW_EARNING); // TODO
-  }
-
-  return result;
-}
 export let StakingAction;
 (function (StakingAction) {
   StakingAction["STAKE"] = "STAKE";
@@ -257,7 +241,7 @@ export function getStakingAvailableActionsByNominator(nominatorMetadata, unclaim
   return result;
 }
 export function isActionFromValidator(stakingType, chain) {
-  if (stakingType === StakingType.POOLED || stakingType === StakingType.LIQUID_STAKING) {
+  if (stakingType === StakingType.POOLED) {
     return false;
   }
   if (_STAKING_CHAIN_GROUP.astar.includes(chain)) {
@@ -283,21 +267,21 @@ export function getWithdrawalInfo(nominatorMetadata) {
   }
   return result;
 }
-export function getEarningStatusByNominations(bnTotalActiveStake, nominationList) {
-  let stakingStatus = EarningStatus.EARNING_REWARD;
+export function getStakingStatusByNominations(bnTotalActiveStake, nominationList) {
+  let stakingStatus = StakingStatus.EARNING_REWARD;
   if (bnTotalActiveStake.isZero()) {
-    stakingStatus = EarningStatus.NOT_EARNING;
+    stakingStatus = StakingStatus.NOT_EARNING;
   } else {
     let invalidDelegationCount = 0;
     for (const nomination of nominationList) {
-      if (nomination.status === EarningStatus.NOT_EARNING) {
+      if (nomination.status === StakingStatus.NOT_EARNING) {
         invalidDelegationCount += 1;
       }
     }
     if (invalidDelegationCount > 0 && invalidDelegationCount < nominationList.length) {
-      stakingStatus = EarningStatus.PARTIALLY_EARNING;
+      stakingStatus = StakingStatus.PARTIALLY_EARNING;
     } else if (invalidDelegationCount === nominationList.length) {
-      stakingStatus = EarningStatus.NOT_EARNING;
+      stakingStatus = StakingStatus.NOT_EARNING;
     }
   }
   return stakingStatus;