@subwallet/extension-base 1.1.61-1 → 1.1.62-0

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

@@ -54,7 +54,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
     await defaultCallback();
     await chainApi.isReady;
     const unsub = await chainApi.api.query.parachainStaking.round(async _round => {
-      var _chainApi$api$consts, _chainApi$api$consts$, _chainApi$api$consts$2;
+      var _chainApi$api$consts, _chainApi$api$consts$, _chainApi$api$consts$2, _chainApi$api$consts$3, _chainApi$api$consts$4, _chainApi$api$query$p, _chainApi$api$query$p2;
       if (cancel) {
         unsub();
         return;
@@ -63,11 +63,14 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
       const round = parseRawNumber(roundObj.current);
       const maxDelegations = (_chainApi$api$consts = chainApi.api.consts) === null || _chainApi$api$consts === void 0 ? void 0 : (_chainApi$api$consts$ = _chainApi$api$consts.parachainStaking) === null || _chainApi$api$consts$ === void 0 ? void 0 : (_chainApi$api$consts$2 = _chainApi$api$consts$.maxDelegationsPerDelegator) === null || _chainApi$api$consts$2 === void 0 ? void 0 : _chainApi$api$consts$2.toString();
       const unstakingDelay = chainApi.api.consts.parachainStaking.delegationBondLessDelay.toString();
+      const maxTopDelegatorsPerCollator = (_chainApi$api$consts$3 = chainApi.api.consts.parachainStaking.maxTopDelegationsPerCandidate) === null || _chainApi$api$consts$3 === void 0 ? void 0 : _chainApi$api$consts$3.toPrimitive();
+      const maxDelegatorsPerCollator = (_chainApi$api$consts$4 = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator) === null || _chainApi$api$consts$4 === void 0 ? void 0 : _chainApi$api$consts$4.toPrimitive();
+      const maxPoolMembers = maxTopDelegatorsPerCollator || maxDelegatorsPerCollator || undefined;
       let _unvestedAllocation;
       if (chainApi.api.query.vesting && chainApi.api.query.vesting.totalUnvestedAllocation) {
         _unvestedAllocation = await chainApi.api.query.vesting.totalUnvestedAllocation();
       }
-      const [_totalStake, _totalIssuance, _inflation] = await Promise.all([chainApi.api.query.parachainStaking.staked(round), chainApi.api.query.balances.totalIssuance(), chainApi.api.query.parachainStaking.inflationConfig()]);
+      const [_totalStake, _totalIssuance, _inflation] = await Promise.all([(_chainApi$api$query$p = chainApi.api.query.parachainStaking) !== null && _chainApi$api$query$p !== void 0 && _chainApi$api$query$p.staked ? (_chainApi$api$query$p2 = chainApi.api.query.parachainStaking) === null || _chainApi$api$query$p2 === void 0 ? void 0 : _chainApi$api$query$p2.staked(round) : chainApi.api.query.parachainStaking.total(), chainApi.api.query.balances.totalIssuance(), chainApi.api.query.parachainStaking.inflationConfig()]);
       let unvestedAllocation;
       if (_unvestedAllocation) {
         const rawUnvestedAllocation = _unvestedAllocation.toString();
@@ -113,7 +116,8 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
           tvl: totalStake.toString(),
           unstakingPeriod: unstakingPeriod,
           inflation
-        }
+        },
+        maxPoolMembers
       };
       callback(data);
     });
@@ -266,102 +270,44 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
   /* Subscribe pool position */
 
   /* Get pool targets */
-
-  async getPoolTargets() {
+  async getMantaPoolTargets() {
+    var _this$chainInfo$subst;
     const apiProps = await this.substrateApi.isReady;
     const allCollators = [];
-    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 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()]);
+    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: 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];
+    // 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);
+        const maxNominatorRewarded = parseInt(maxDelegationPerCollator);
         allCollators.push({
           commission: 0,
-          expectedReturn: 0,
           address: collatorAddress,
           totalStake: bnTotalStake.toString(),
           ownStake: bnOwnStake.toString(),
@@ -371,28 +317,95 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
           isVerified: false,
           minBond: bnMinBond.toString(),
           chain: this.chain,
-          isCrowded: parseInt(maxDelegationPerCollator) > 0
+          isCrowded: collatorInfo.delegationCount ? collatorInfo.delegationCount >= maxNominatorRewarded : 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;
+    }
+    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);
       }
-      return allCollators;
+    }));
+    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;
+  }
+  async getParachainPoolTargets() {
+    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);
+      const maxNominatorRewarded = parseInt(maxDelegationPerCollator);
+      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: collatorInfo.delegationCount ? collatorInfo.delegationCount >= maxNominatorRewarded : 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;
+  }
+  async getPoolTargets() {
+    if (_STAKING_CHAIN_GROUP.manta.includes(this.chain)) {
+      return this.getMantaPoolTargets();
+    } else {
+      return this.getParachainPoolTargets();
     }
   }
 

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

@@ -6,7 +6,7 @@ import { BasicTxErrorType, ExtrinsicType, StakingTxErrorType } from '@subwallet/
 import { calculateAlephZeroValidatorReturn, calculateChainStakedReturnV2, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getAvgValidatorEraReward, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getSupportedDaysByHistoryDepth, getTopValidatorByPoints, getValidatorPointsMap } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 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, MaxEraRewardPointsEras } from '@subwallet/extension-base/services/earning-service/constants';
+import { _STAKING_CHAIN_GROUP, _UPDATED_RUNTIME_STAKING_GROUP, MaxEraRewardPointsEras } 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, reformatAddress } from '@subwallet/extension-base/utils';
@@ -44,20 +44,22 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     await defaultCallback();
     await substrateApi.isReady;
     const unsub = await ((_substrateApi$api$que = substrateApi.api.query.staking) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.currentEra(async _currentEra => {
-      var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$cal, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
+      var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$con3, _substrateApi$api$cal, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
       if (cancel) {
         unsub();
         return;
       }
       let maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '16';
+      const unlimitedNominatorRewarded = substrateApi.api.consts.staking.maxExposurePageSize !== undefined;
+      const maxNominatorRewarded = (_substrateApi$api$con3 = substrateApi.api.consts.staking.maxNominatorRewardedPerValidator) === null || _substrateApi$api$con3 === void 0 ? void 0 : _substrateApi$api$con3.toString();
       const _maxNominationsByNominationQuota = await ((_substrateApi$api$cal = substrateApi.api.call.stakingApi) === null || _substrateApi$api$cal === void 0 ? void 0 : _substrateApi$api$cal.nominationsQuota(0)); // todo: review param. Currently return constant for all param.
       const maxNominationsByNominationQuota = _maxNominationsByNominationQuota === null || _maxNominationsByNominationQuota === void 0 ? void 0 : _maxNominationsByNominationQuota.toString();
       maxNominations = maxNominationsByNominationQuota !== null && maxNominationsByNominationQuota !== void 0 ? maxNominationsByNominationQuota : maxNominations;
       const currentEra = _currentEra.toString();
       const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
       const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();
-      const maxSupportedEras = substrateApi.api.consts.staking.historyDepth.toString();
-      const erasPerDay = 24 / _STAKING_ERA_LENGTH_MAP[chainInfo.slug]; // Can be exactly calculate from babe.epochDuration * blockTime * staking.sessionsPerEra
+      const maxSupportedEras = substrateApi.api.consts.staking.historyDepth.toString(); // todo: handle case historyDepth undefined
+      const erasPerDay = 24 / _STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _STAKING_ERA_LENGTH_MAP.default; // Can be exactly calculate from babe.epochDuration * blockTime * staking.sessionsPerEra
 
       const supportedDays = getSupportedDaysByHistoryDepth(erasPerDay, parseInt(maxSupportedEras), parseInt(currentEra) / erasPerDay);
       const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
@@ -110,7 +112,8 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
           // TODO recheck
           unstakingPeriod: unlockingPeriod,
           inflation: inflation
-        }
+        },
+        maxPoolMembers: unlimitedNominatorRewarded ? undefined : maxNominatorRewarded ? parseInt(maxNominatorRewarded) : undefined
       };
       callback(data);
     }));
@@ -144,7 +147,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
         let nominationStatus = EarningStatus.NOT_EARNING;
         let eraStakerOtherList = [];
         let identity;
-        if (['kusama', 'polkadot', 'westend', 'availTuringTest', 'avail_mainnet'].includes(this.chain)) {
+        if (_UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
           // todo: review all relaychains later
           const [[_identity], _eraStaker] = await Promise.all([parseIdentity(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress)]);
           identity = _identity;
@@ -298,7 +301,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const endEraForPoints = parseInt(activeEra) - 1;
     let startEraForPoints = Math.max(endEraForPoints - maxEraRewardPointsEras + 1, 0);
     let _eraStakersPromise;
-    if (['kusama', 'polkadot', 'westend', 'availTuringTest', 'avail_mainnet'].includes(this.chain)) {
+    if (_UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
       // todo: review all relaychains later
       _eraStakersPromise = chainApi.api.query.staking.erasStakersOverview.entries(parseInt(currentEra));
     } else {
@@ -339,7 +342,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const rawValidatorInfo = item[0].toHuman();
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-      const rawValidatorStat = item[1].toHuman();
+      const rawValidatorStat = item[1].toPrimitive();
       const validatorAddress = rawValidatorInfo[1];
       if (!blockValidatorList.includes(validatorAddress)) {
         var _validatorPointsMap$v;
@@ -347,16 +350,20 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
         if (topValidatorList.includes(validatorAddress)) {
           isTopQuartile = true;
         }
-        const rawTotalStake = rawValidatorStat.total;
-        const rawOwnStake = rawValidatorStat.own;
-        const bnTotalStake = new BN(rawTotalStake.replaceAll(',', ''));
-        const bnOwnStake = new BN(rawOwnStake.replaceAll(',', ''));
+        const bnTotalStake = new BN(rawValidatorStat.total);
+        const bnOwnStake = new BN(rawValidatorStat.own);
         const otherStake = bnTotalStake.sub(bnOwnStake);
         totalStakeMap[validatorAddress] = bnTotalStake;
         let nominatorCount = 0;
-        if ('others' in rawValidatorStat) {
-          const others = rawValidatorStat.others;
-          nominatorCount = others.length;
+        if (_UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
+          nominatorCount = rawValidatorStat.nominatorCount;
+        } else {
+          if ('others' in rawValidatorStat) {
+            // todo: handle interfaces and types better
+            // @ts-ignore
+            const others = rawValidatorStat.others;
+            nominatorCount = others.length;
+          }
         }
         allValidators.push(validatorAddress);
         validatorInfoList.push({

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

@@ -6,6 +6,7 @@ import { APIItemState, BasicTxErrorType, ChainType, ExtrinsicType, StakingTxErro
 import { calculateChainStakedReturnV2, calculateInflation, getAvgValidatorEraReward, getExistUnstakeErrorMessage, getMinStakeErrorMessage, getSupportedDaysByHistoryDepth, parsePoolStashAddress } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
+import { _UPDATED_RUNTIME_STAKING_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
 import { EarningStatus, UnstakingStatus, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
@@ -83,7 +84,8 @@ export default class NominationPoolHandler extends BasePoolHandler {
 
       const supportedDays = getSupportedDaysByHistoryDepth(erasPerDay, parseInt(maxSupportedEras), parseInt(currentEra) / erasPerDay);
       const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
-      const [_EraStakeInfo, _totalIssuance, _auctionCounter, _minPoolJoin, ..._eraReward] = await Promise.all([substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que2 = substrateApi.api.query.auctions) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.auctionCounter(), (_substrateApi$api$que3 = substrateApi.api.query) === null || _substrateApi$api$que3 === void 0 ? void 0 : (_substrateApi$api$que4 = _substrateApi$api$que3.nominationPools) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minJoinBond(), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays).keys()].map(i => i + startEra))]);
+      const [_maxPoolMember, _EraStakeInfo, _totalIssuance, _auctionCounter, _minPoolJoin, ..._eraReward] = await Promise.all([(_substrateApi$api$que2 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.maxPoolMembersPerPool(), substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que3 = substrateApi.api.query.auctions) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.auctionCounter(), (_substrateApi$api$que4 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minJoinBond(), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays).keys()].map(i => i + startEra))]);
+      const maxPoolMembers = _maxPoolMember ? parseInt(_maxPoolMember.toString()) : undefined;
       const [_totalEraStake, _lastTotalStaked] = _EraStakeInfo;
       const validatorEraReward = getAvgValidatorEraReward(supportedDays, _eraReward[0]);
       const lastTotalStaked = _lastTotalStaked.toString();
@@ -129,7 +131,8 @@ export default class NominationPoolHandler extends BasePoolHandler {
           // TODO recheck
           unstakingPeriod: unlockingPeriod,
           inflation: inflation
-        }
+        },
+        maxPoolMembers: maxPoolMembers || undefined
       };
       callback(data);
     }));
@@ -159,7 +162,7 @@ export default class NominationPoolHandler extends BasePoolHandler {
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
         let eraStakerOtherList = [];
-        if (['kusama', 'polkadot', 'westend', 'availTuringTest', 'avail_mainnet'].includes(this.chain)) {
+        if (_UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
           // todo: review all relaychains later
           const _eraStaker = await substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress);
           eraStakerOtherList = _eraStaker.flatMap(paged => paged[1].toPrimitive().others);
@@ -318,13 +321,13 @@ export default class NominationPoolHandler extends BasePoolHandler {
     const nominationPools = [];
     const _allPoolsInfo = await substrateApi.api.query.nominationPools.reversePoolIdLookup.entries();
     await Promise.all(_allPoolsInfo.map(async _poolInfo => {
-      var _bondedPool$points;
+      var _substrateApi$api$que7, _bondedPool$points;
       const poolAddressList = _poolInfo[0].toHuman();
       const poolAddress = poolAddressList[0];
       const poolId = _poolInfo[1].toPrimitive();
       const poolsPalletId = substrateApi.api.consts.nominationPools.palletId.toString();
       const poolStashAccount = parsePoolStashAddress(substrateApi.api, 0, poolId, poolsPalletId);
-      const [_nominations, _bondedPool, _metadata, _minimumActiveStake] = await Promise.all([substrateApi.api.query.staking.nominators(poolStashAccount), substrateApi.api.query.nominationPools.bondedPools(poolId), substrateApi.api.query.nominationPools.metadata(poolId), substrateApi.api.query.staking.minimumActiveStake()]);
+      const [_nominations, _bondedPool, _metadata, _minimumActiveStake, _maxPoolMembers] = await Promise.all([substrateApi.api.query.staking.nominators(poolStashAccount), substrateApi.api.query.nominationPools.bondedPools(poolId), substrateApi.api.query.nominationPools.metadata(poolId), substrateApi.api.query.staking.minimumActiveStake(), (_substrateApi$api$que7 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que7 === void 0 ? void 0 : _substrateApi$api$que7.maxPoolMembersPerPool()]);
       const minimumActiveStake = _minimumActiveStake.toPrimitive();
       const nominations = _nominations.toJSON();
       const poolMetadata = _metadata.toPrimitive();
@@ -333,6 +336,7 @@ export default class NominationPoolHandler extends BasePoolHandler {
       const isPoolOpen = bondedPool.state === 'Open';
       const isPoolNominating = !!nominations && nominations.targets.length > 0;
       const isPoolEarningReward = bondedPool.points > minimumActiveStake;
+      const maxPoolMembers = _maxPoolMembers ? parseInt(_maxPoolMembers.toString()) : undefined;
       nominationPools.push({
         id: poolId,
         address: poolAddress,
@@ -341,7 +345,8 @@ export default class NominationPoolHandler extends BasePoolHandler {
         roles: bondedPool.roles,
         memberCounter: bondedPool.memberCounter,
         state: bondedPool.state,
-        isProfitable: isPoolOpen && isPoolNominating && isPoolEarningReward
+        isProfitable: isPoolOpen && isPoolNominating && isPoolEarningReward,
+        isCrowded: maxPoolMembers ? bondedPool.memberCounter >= maxPoolMembers : false
       });
     }));
     return nominationPools;

package/services/earning-service/service.js

@@ -33,7 +33,7 @@ export default class EarningService {
   yieldPositionSubject = new BehaviorSubject({});
   yieldPositionListSubject = new BehaviorSubject([]); // virtual list of yieldPositionSubject with filter values
 
-  useOnlineCacheOnly = true;
+  useOnlineCacheOnly = false;
   constructor(state) {
     this.state = state;
     this.dbService = state.dbService;

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

@@ -53,7 +53,7 @@ export async function parseIdentity(substrateApi, address, children) {
   if (substrateApi.api.query.identity) {
     let identity;
     const _parent = await substrateApi.api.query.identity.superOf(address);
-    const parentInfo = _parent.toHuman();
+    const parentInfo = _parent === null || _parent === void 0 ? void 0 : _parent.toHuman();
     if (parentInfo) {
       const [parentAddress, {
         Raw: data
@@ -66,8 +66,16 @@ export async function parseIdentity(substrateApi, address, children) {
         return [compactResult(rs), isReasonable];
       }
     }
+    let identityInfo;
     const _identity = await substrateApi.api.query.identity.identityOf(address);
-    const identityInfo = _identity.toHuman();
+    const identityOfMetadata = substrateApi.api.query.identity.identityOf.creator.meta;
+    const identityOfReturnType = substrateApi.api.registry.lookup.getName(identityOfMetadata.type.asMap.value);
+    if (identityOfReturnType === 'PalletIdentityRegistration') {
+      identityInfo = _identity.toHuman();
+    } else {
+      const _identityInfo = _identity === null || _identity === void 0 ? void 0 : _identity.toHuman();
+      identityInfo = _identityInfo ? _identityInfo[0] : undefined;
+    }
     if (identityInfo) {
       var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t, _identityInfo$judgeme;
       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;

package/services/price-service/index.js

@@ -61,17 +61,25 @@ export class PriceService {
     })();
   }
   async calculatePriceMap() {
-    const rawPrice = this.rawPriceSubject.value;
+    const {
+      price24hMap,
+      priceMap
+    } = this.rawPriceSubject.value;
     const exchangeRateData = this.rawExchangeRateMap.value;
     const currencyKey = this.currency.value;
-    if (Object.keys(rawPrice).length === 0) {
+    if (Object.keys(this.rawPriceSubject.value).length === 0) {
       return;
     }
     if (Object.keys(exchangeRateData).length === 0) {
       return;
     }
     const finalPriceMap = {
-      ...JSON.parse(JSON.stringify(rawPrice)),
+      priceMap: {
+        ...priceMap
+      },
+      price24hMap: {
+        ...price24hMap
+      },
       currency: currencyKey,
       exchangeRateMap: exchangeRateData,
       currencyData: staticData[StaticKey.CURRENCY_SYMBOL][currencyKey || DEFAULT_CURRENCY]
@@ -80,8 +88,8 @@ export class PriceService {
       return finalPriceMap;
     }
     Object.keys(finalPriceMap.price24hMap).forEach(key => {
-      finalPriceMap.price24hMap[key] = rawPrice.price24hMap[key] * exchangeRateData[currencyKey].exchange;
-      finalPriceMap.priceMap[key] = rawPrice.priceMap[key] * exchangeRateData[currencyKey].exchange;
+      finalPriceMap.price24hMap[key] *= exchangeRateData[currencyKey].exchange;
+      finalPriceMap.priceMap[key] *= exchangeRateData[currencyKey].exchange;
     });
     await this.dbService.updatePriceStore(finalPriceMap);
     return finalPriceMap;
@@ -112,7 +120,7 @@ export class PriceService {
     this.priceIds = priceIds || this.getPriceIds();
 
     // Update for tokens price
-    this.getTokenPrice(this.priceIds, this.priceSubject.value.currency).then(() => {
+    this.getTokenPrice(this.priceIds, DEFAULT_CURRENCY).then(() => {
       this.refreshPriceMapByAction();
     }).catch(e => {
       console.error(e);

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

@@ -226,6 +226,7 @@ export interface NominationYieldPoolInfo extends AbstractYieldPoolInfo {
     type: YieldPoolType.NOMINATION_POOL;
     metadata: NormalYieldPoolMetadata;
     statistic?: NormalYieldPoolStatistic;
+    maxPoolMembers?: number;
 }
 /**
  * @interface NativeYieldPoolInfo
@@ -237,6 +238,7 @@ export interface NativeYieldPoolInfo extends AbstractYieldPoolInfo {
     type: YieldPoolType.NATIVE_STAKING;
     metadata: NormalYieldPoolMetadata;
     statistic?: NormalYieldPoolStatistic;
+    maxPoolMembers?: number;
 }
 /**
  * Info of yield pool

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

@@ -5,6 +5,7 @@ export interface NominationPoolInfo extends Pick<PalletNominationPoolsBondedPool
     name?: string;
     bondedAmount: string;
     isProfitable: boolean;
+    isCrowded?: boolean;
 }
 export interface ValidatorInfo {
     address: string;

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

@@ -156,3 +156,9 @@ export interface RuntimeDispatchInfo {
     class: string;
     partialFee: number;
 }
+export interface SpStakingPagedExposureMetadata {
+    total: number;
+    own: number;
+    nominatorCount: number;
+    pageCount: number;
+}

package/utils/staticData/currencySymbol.json

@@ -1,11 +1,11 @@
 {
-  "USD": {"label": "United States Dollar", "symbol": "USD", "isPrefix": false},
-  "BRL": {"label": "Brazilian Real", "symbol": "BRL", "isPrefix": false},
-  "CNY": {"label": "Chinese Yuan", "symbol": "CNY", "isPrefix": false},
-  "EUR": {"label": "Euro", "symbol": "EUR", "isPrefix": false},
-  "GBP": {"label": "British Pound Sterling", "symbol": "GBP", "isPrefix": false},
-  "HKD": {"label": "Hong Kong Dollar", "symbol": "HKD", "isPrefix": false},
-  "JPY": {"label": "Japanese Yen", "symbol": "JPY", "isPrefix": false},
-  "RUB": {"label": "Russian Ruble", "symbol": "RUB", "isPrefix": false},
-  "VND": {"label": "Vietnamese Dong", "symbol": "VND", "isPrefix": false}
+  "USD": {"label": "United States Dollar", "symbol": "$", "isPrefix": true},
+  "BRL": {"label": "Brazilian Real", "symbol": "R$", "isPrefix": true},
+  "CNY": {"label": "Chinese Yuan", "symbol": "C¥", "isPrefix": true},
+  "EUR": {"label": "Euro", "symbol": "€", "isPrefix": true},
+  "GBP": {"label": "British Pound Sterling", "symbol": "£", "isPrefix": true},
+  "HKD": {"label": "Hong Kong Dollar", "symbol": "H$", "isPrefix": true},
+  "JPY": {"label": "Japanese Yen", "symbol": "¥", "isPrefix": true},
+  "RUB": {"label": "Russian Ruble", "symbol": "₽", "isPrefix": true},
+  "VND": {"label": "Vietnamese Dong", "symbol": "₫", "isPrefix": true}
 }