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

package/cjs/constants/staking.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PREDEFINED_STAKING_POOL = exports.MAX_NOMINATIONS = void 0;
+exports.PREDEFINED_STAKING_POOL = exports.PREDEFINED_EARNING_POOL = exports.MAX_NOMINATIONS = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -15,5 +15,13 @@ const PREDEFINED_STAKING_POOL = {
   availTuringTest: 11
 };
 exports.PREDEFINED_STAKING_POOL = PREDEFINED_STAKING_POOL;
+const PREDEFINED_EARNING_POOL = {
+  polkadot: [39],
+  kusama: [80],
+  vara_network: [62, 29, 50],
+  aleph: [82],
+  availTuringTest: [11]
+};
+exports.PREDEFINED_EARNING_POOL = PREDEFINED_EARNING_POOL;
 const MAX_NOMINATIONS = '16';
 exports.MAX_NOMINATIONS = MAX_NOMINATIONS;

package/cjs/koni/background/handlers/Extension.js

@@ -3052,7 +3052,10 @@ class KoniExtension {
     let registry = new _types4.TypeRegistry();
     let isEvm = false;
     if ((0, _Extension.isJsonPayload)(payload)) {
-      // Get the metadata for the genesisHash
+      /**
+       *  Get the metadata for the genesisHash
+       *  @todo: need to handle case metadata store in db
+      */
       const currentMetadata = this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash);
 
       // set the registry before calling the sign function
@@ -3061,12 +3064,23 @@ class KoniExtension {
         registry.register(currentMetadata === null || currentMetadata === void 0 ? void 0 : currentMetadata.types);
       }
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
-      if (chainInfo && (_constants2._API_OPTIONS_CHAIN_GROUP.avail.includes(chainInfo.slug) || _constants2._API_OPTIONS_CHAIN_GROUP.goldberg.includes(chainInfo.slug))) {
-        const isChainActive = this.#koniState.getChainStateByKey(chainInfo.slug).active;
-        if (!isChainActive) {
-          reject(new Error('Please activate {{chain}} network before signing'.replaceAll('{{chain}}', chainInfo.name)));
-          return false;
-        } else {
+      if (!currentMetadata) {
+        /*
+        * Some networks must have metadata to signing,
+        * so if the chain not active (cannot use metadata from api), it must be rejected
+        *  */
+        if (chainInfo && (_constants2._API_OPTIONS_CHAIN_GROUP.avail.includes(chainInfo.slug) || _constants2._API_OPTIONS_CHAIN_GROUP.goldberg.includes(chainInfo.slug)) // The special case for chains that need metadata to signing
+        ) {
+          // For case the chain does not have any provider
+          if (!Object.keys(chainInfo.providers).length) {
+            reject(new Error('{{chain}} network does not have any provider to connect, please update metadata from dApp'.replaceAll('{{chain}}', chainInfo.name)));
+            return false;
+          }
+          const isChainActive = this.#koniState.getChainStateByKey(chainInfo.slug).active;
+          if (!isChainActive) {
+            reject(new Error('Please activate {{chain}} network before signing'.replaceAll('{{chain}}', chainInfo.name)));
+            return false;
+          }
           registry = this.#koniState.getSubstrateApi(chainInfo.slug).api.registry;
         }
       }

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.61-1'
+  version: '1.1.63-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/chain-service/constants.js

@@ -105,6 +105,7 @@ const _STAKING_ERA_LENGTH_MAP = {
   polimec: 6,
   enjin_relaychain: 24,
   availTuringTest: 24,
+  polkadex: 24,
   avail_mainnet: 24
 };
 exports._STAKING_ERA_LENGTH_MAP = _STAKING_ERA_LENGTH_MAP;

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

@@ -617,7 +617,9 @@ function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
           providerKey
         } = randomizeProvider(currentChainInfo.providers);
         currentChainState.currentProvider = providerKey;
-        needUpdateChainApiList.push(currentChainInfo);
+        if (currentChainState.active) {
+          needUpdateChainApiList.push(currentChainInfo);
+        }
       }
       needUpdate = true;
     }

package/cjs/services/earning-service/constants/chains.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._STAKING_CHAIN_GROUP = exports.ST_LIQUID_TOKEN_ABI = exports.MaxEraRewardPointsEras = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = void 0;
+exports._UPDATED_RUNTIME_STAKING_GROUP = exports._STAKING_CHAIN_GROUP = exports.ST_LIQUID_TOKEN_ABI = exports.MaxEraRewardPointsEras = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = void 0;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -25,6 +25,8 @@ const _STAKING_CHAIN_GROUP = {
   manta: ['manta_network']
 };
 exports._STAKING_CHAIN_GROUP = _STAKING_CHAIN_GROUP;
+const _UPDATED_RUNTIME_STAKING_GROUP = ['kusama', 'polkadot', 'westend', 'availTuringTest', 'avail_mainnet'];
+exports._UPDATED_RUNTIME_STAKING_GROUP = _UPDATED_RUNTIME_STAKING_GROUP;
 const MaxEraRewardPointsEras = 14;
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment

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

@@ -45,6 +45,7 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
     await defaultCallback();
     const substrateApi = await this.substrateApi.isReady;
     const unsub = await substrateApi.api.query.parachainStaking.round(async _round => {
+      var _substrateApi$api$con;
       if (cancel) {
         unsub();
         return;
@@ -56,6 +57,7 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
       const unstakingDelay = substrateApi.api.consts.parachainStaking.stakeDuration.toString(); // in blocks
       const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
       const maxUnstakeRequests = substrateApi.api.consts.parachainStaking.maxUnstakeRequests.toPrimitive();
+      const maxDelegatorsPerCollator = (_substrateApi$api$con = substrateApi.api.consts.parachainStaking.maxDelegatorsPerCollator) === null || _substrateApi$api$con === void 0 ? void 0 : _substrateApi$api$con.toString();
       const blockPerRound = parseFloat(_blockPerRound);
       const roundTime = _constants._STAKING_ERA_LENGTH_MAP[this.chain] || _constants._STAKING_ERA_LENGTH_MAP.default; // in hours
       const blockDuration = roundTime / blockPerRound; // in hours
@@ -92,7 +94,8 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
           totalApy: undefined,
           // TODO recheck
           unstakingPeriod
-        }
+        },
+        maxPoolMembers: maxDelegatorsPerCollator ? parseInt(maxDelegatorsPerCollator) : undefined
       };
       callback(data);
     });
@@ -266,60 +269,97 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
 
   /* Get pool targets */
 
+  async getKrestPoolTargets(chainApi) {
+    var _chainApi$api$consts$;
+    const _allCollators = await chainApi.api.query.parachainStaking.candidatePool.entries();
+    const minDelegatorStake = chainApi.api.consts.parachainStaking.minDelegatorStake.toString();
+    const maxDelegatorsPerCollator = (_chainApi$api$consts$ = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator) === null || _chainApi$api$consts$ === void 0 ? void 0 : _chainApi$api$consts$.toString();
+    const identityPromises = _allCollators.map(collator => {
+      const collatorInfo = collator[1].toPrimitive();
+      const address = collatorInfo.id;
+      return (0, _utils2.parseIdentity)(chainApi, address);
+    });
+    const identities = await Promise.all(identityPromises);
+    return _allCollators.map((_collator, i) => {
+      const [identity] = identities[i];
+      const collatorInfo = _collator[1].toPrimitive();
+      const bnTotalStake = new _util.BN(collatorInfo.total);
+      const bnOwnStake = new _util.BN(collatorInfo.stake);
+      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+      const isFullDelegatorsSet = collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator);
+      let minDelegate = new _util.BN(minDelegatorStake);
+      if (isFullDelegatorsSet) {
+        const delegatorAmounts = collatorInfo.delegators.map(delegator => new _util.BN(delegator.amount));
+        const sortedAmounts = delegatorAmounts.sort((a, b) => a.cmp(b));
+        const minDelegateInSet = sortedAmounts[0];
+        minDelegate = minDelegate.lt(minDelegateInSet) ? minDelegateInSet : minDelegate;
+      }
+      return {
+        address: collatorInfo.id,
+        totalStake: bnTotalStake.toString(),
+        ownStake: bnOwnStake.toString(),
+        otherStake: bnOtherStake.toString(),
+        nominatorCount: collatorInfo.delegators.length,
+        commission: 0,
+        blocked: false,
+        isVerified: false,
+        minBond: minDelegate.toString(),
+        chain: this.chain,
+        isCrowded: isFullDelegatorsSet,
+        identity
+      };
+    });
+  }
+  async getOtherPoolTargets(chainApi) {
+    const [_allCollators, _inflationConfig] = await Promise.all([chainApi.api.query.parachainStaking.candidatePool.entries(), chainApi.api.query.parachainStaking.inflationConfig()]);
+    const minDelegatorStake = chainApi.api.consts.parachainStaking.minDelegatorStake.toString();
+    const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
+    const inflationConfig = _inflationConfig.toHuman();
+    const rawDelegatorReturn = inflationConfig.delegator.rewardRate.annual;
+    const delegatorReturn = parseFloat(rawDelegatorReturn.split('%')[0]);
+    const identityPromises = _allCollators.map(collator => {
+      const collatorInfo = collator[1].toPrimitive();
+      const address = collatorInfo.id;
+      return (0, _utils2.parseIdentity)(chainApi, address);
+    });
+    const identities = await Promise.all(identityPromises);
+    return _allCollators.map((_collator, i) => {
+      const [identity] = identities[i];
+      const collatorInfo = _collator[1].toPrimitive();
+      const bnTotalStake = new _util.BN(collatorInfo.total);
+      const bnOwnStake = new _util.BN(collatorInfo.stake);
+      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+      const isFullDelegatorsSet = collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator);
+      let minDelegate = new _util.BN(minDelegatorStake);
+      if (isFullDelegatorsSet) {
+        const delegatorAmounts = collatorInfo.delegators.map(delegator => new _util.BN(delegator.amount));
+        const sortedAmounts = delegatorAmounts.sort((a, b) => a.cmp(b));
+        const minDelegateInSet = sortedAmounts[0];
+        minDelegate = minDelegate.lt(minDelegateInSet) ? minDelegateInSet : minDelegate;
+      }
+      return {
+        address: collatorInfo.id,
+        totalStake: bnTotalStake.toString(),
+        ownStake: bnOwnStake.toString(),
+        otherStake: bnOtherStake.toString(),
+        nominatorCount: collatorInfo.delegators.length,
+        commission: 0,
+        expectedReturn: delegatorReturn,
+        blocked: false,
+        isVerified: false,
+        minBond: minDelegate.toString(),
+        chain: this.chain,
+        isCrowded: isFullDelegatorsSet,
+        identity
+      };
+    });
+  }
   async getPoolTargets() {
     const chainApi = await this.substrateApi.isReady;
     if (_constants2._STAKING_CHAIN_GROUP.krest_network.includes(this.chain)) {
-      const _allCollators = await chainApi.api.query.parachainStaking.candidatePool.entries();
-      const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
-      const allCollators = [];
-      for (const _collator of _allCollators) {
-        const collatorInfo = _collator[1].toPrimitive();
-        const bnTotalStake = new _util.BN(collatorInfo.total);
-        const bnOwnStake = new _util.BN(collatorInfo.stake);
-        const bnOtherStake = bnTotalStake.sub(bnOwnStake);
-        allCollators.push({
-          address: collatorInfo.id,
-          totalStake: bnTotalStake.toString(),
-          ownStake: bnOwnStake.toString(),
-          otherStake: bnOtherStake.toString(),
-          nominatorCount: collatorInfo.delegators.length,
-          commission: 0,
-          blocked: false,
-          isVerified: false,
-          minBond: '0',
-          chain: this.chain,
-          isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
-        });
-      }
-      return allCollators;
+      return this.getKrestPoolTargets(chainApi);
     } else {
-      const [_allCollators, _inflationConfig] = await Promise.all([chainApi.api.query.parachainStaking.candidatePool.entries(), chainApi.api.query.parachainStaking.inflationConfig()]);
-      const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
-      const inflationConfig = _inflationConfig.toHuman();
-      const rawDelegatorReturn = inflationConfig.delegator.rewardRate.annual;
-      const delegatorReturn = parseFloat(rawDelegatorReturn.split('%')[0]);
-      const allCollators = [];
-      for (const _collator of _allCollators) {
-        const collatorInfo = _collator[1].toPrimitive();
-        const bnTotalStake = new _util.BN(collatorInfo.total);
-        const bnOwnStake = new _util.BN(collatorInfo.stake);
-        const bnOtherStake = bnTotalStake.sub(bnOwnStake);
-        allCollators.push({
-          address: collatorInfo.id,
-          totalStake: bnTotalStake.toString(),
-          ownStake: bnOwnStake.toString(),
-          otherStake: bnOtherStake.toString(),
-          nominatorCount: collatorInfo.delegators.length,
-          commission: 0,
-          expectedReturn: delegatorReturn,
-          blocked: false,
-          isVerified: false,
-          minBond: '0',
-          chain: this.chain,
-          isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
-        });
-      }
-      return allCollators;
+      return this.getOtherPoolTargets(chainApi);
     }
   }
 

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

@@ -61,7 +61,7 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
     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;
@@ -70,11 +70,14 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
       const round = (0, _utils3.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();
@@ -120,7 +123,8 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
           tvl: totalStake.toString(),
           unstakingPeriod: unstakingPeriod,
           inflation
-        }
+        },
+        maxPoolMembers
       };
       callback(data);
     });
@@ -273,102 +277,44 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
   /* Subscribe pool position */
 
   /* Get pool targets */
-
-  async getPoolTargets() {
+  async getMantaPoolTargets() {
+    var _this$chainInfo$subst;
     const apiProps = await this.substrateApi.isReady;
     const allCollators = [];
-    if (_constants2._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 = _constants2.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 = _constants2.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 _bignumber.default(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 _bignumber.default(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 _bignumber.default(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 _util.BN(collatorInfo.totalCounted);
-          const bnOwnStake = new _util.BN(collatorInfo.bond);
-          const bnOtherStake = bnTotalStake.sub(bnOwnStake);
-          const bnMinBond = new _util.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 _bignumber.default(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), (0, _utils2.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 _bignumber.default(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 _util.BN(collatorInfo.totalCounted);
         const bnOwnStake = new _util.BN(collatorInfo.bond);
         const bnOtherStake = bnTotalStake.sub(bnOwnStake);
         const bnMinBond = new _util.BN(collatorInfo.lowestTopDelegationAmount);
+        const maxNominatorRewarded = parseInt(maxDelegationPerCollator);
         allCollators.push({
           commission: 0,
-          expectedReturn: 0,
           address: collatorAddress,
           totalStake: bnTotalStake.toString(),
           ownStake: bnOwnStake.toString(),
@@ -378,28 +324,95 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
           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), (0, _utils2.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 _bignumber.default(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), (0, _utils2.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 _util.BN(collatorInfo.totalCounted);
+      const bnOwnStake = new _util.BN(collatorInfo.bond);
+      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+      const bnMinBond = new _util.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), (0, _utils2.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 (_constants2._STAKING_CHAIN_GROUP.manta.includes(this.chain)) {
+      return this.getMantaPoolTargets();
+    } else {
+      return this.getParachainPoolTargets();
     }
   }