@subwallet/extension-base 1.2.16-0 → 1.2.17-0

package/cjs/constants/staking.js

@@ -20,7 +20,8 @@ const PREDEFINED_EARNING_POOL = {
   kusama: [80],
   vara_network: [62, 29, 50],
   aleph: [82],
-  availTuringTest: [11]
+  availTuringTest: [11],
+  avail_mainnet: [4]
 };
 exports.PREDEFINED_EARNING_POOL = PREDEFINED_EARNING_POOL;
 const MAX_NOMINATIONS = '16';

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

@@ -26,6 +26,7 @@ exports.getRelayEraRewardMap = getRelayEraRewardMap;
 exports.getRelayMaxNominations = getRelayMaxNominations;
 exports.getRelayTopValidatorByPoints = getRelayTopValidatorByPoints;
 exports.getRelayValidatorPointsMap = getRelayValidatorPointsMap;
+exports.getRelayWaitingValidatorList = getRelayWaitingValidatorList;
 exports.getStakingAvailableActionsByChain = getStakingAvailableActionsByChain;
 exports.getStakingAvailableActionsByNominator = getStakingAvailableActionsByNominator;
 exports.getSupportedDaysByHistoryDepth = getSupportedDaysByHistoryDepth;
@@ -436,6 +437,20 @@ function getRelayBlockedValidatorList(validators) {
   }
   return blockValidatorList;
 }
+function getRelayWaitingValidatorList(validators) {
+  const waitingValidators = [];
+  for (const validator of validators) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    const validatorAddress = validator[0].toHuman()[0];
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    const validatorPrefs = validator[1].toHuman();
+    const isBlocked = validatorPrefs.blocked;
+    if (!isBlocked) {
+      waitingValidators.push(validatorAddress);
+    }
+  }
+  return waitingValidators;
+}
 function getRelayEraRewardMap(eraRewardPointArray, startEraForPoints) {
   const eraRewardMap = {};
   for (const item of eraRewardPointArray) {

package/cjs/packageInfo.js

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

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

@@ -320,11 +320,20 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const topValidatorList = (0, _utils.getRelayTopValidatorByPoints)(validatorPointsMap);
     const validators = _validators;
     const blockedValidatorList = (0, _utils.getRelayBlockedValidatorList)(validators);
+    const waitingValidatorList = (0, _utils.getRelayWaitingValidatorList)(validators);
+    const _waitingValidatorLedger = await chainApi.api.query.staking.ledger.multi(waitingValidatorList);
+    const waitingValidatorLedger = {};
+    if (_waitingValidatorLedger) {
+      waitingValidatorList.forEach((validator, i) => {
+        const validatorLedger = _waitingValidatorLedger[i].toPrimitive();
+        waitingValidatorLedger[validator] = new _bignumber.default(validatorLedger.total).toFixed();
+      });
+    }
     const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const bnTotalEraStake = new _util.BN(_totalEraStake.toString());
     const minBond = _minBond.toPrimitive();
-    const [totalStakeMap, allValidatorAddresses, validatorInfoList] = this.parseEraStakerData(_eraStakers, blockedValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
+    const [totalStakeMap, allValidatorAddresses, validatorInfoList] = this.parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorLedger, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
     const extraInfoMap = {};
     await Promise.all(allValidatorAddresses.map(async address => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -359,11 +368,15 @@ class RelayNativeStakingPoolHandler extends _base.default {
       const validatorStake = (0, _utils3.applyDecimal)(totalStakeMap[validator.address], decimals).toNumber();
       return (0, _utils.calculateTernoaValidatorReturn)(rewardPerValidator.toNumber(), validatorStake, commission);
     } else {
-      const bnValidatorStake = (0, _utils3.applyDecimal)(totalStakeMap[validator.address], decimals);
-      return (0, _utils.calculateValidatorStakedReturn)(totalApy, bnValidatorStake, bnAvgStake, commission);
+      if (!totalStakeMap[validator.address]) {
+        return totalApy;
+      } else {
+        const bnValidatorStake = (0, _utils3.applyDecimal)(totalStakeMap[validator.address], decimals);
+        return (0, _utils.calculateValidatorStakedReturn)(totalApy, bnValidatorStake, bnAvgStake, commission);
+      }
     }
   }
-  parseEraStakerData(_eraStakers, blockedValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
+  parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
     const totalStakeMap = {};
     const allValidatorAddresses = [];
     const validatorInfoList = [];
@@ -413,6 +426,27 @@ class RelayNativeStakingPoolHandler extends _base.default {
         });
       }
     }
+    for (const waitingValidator of Object.keys(waitingValidatorList)) {
+      if (!allValidatorAddresses.includes(waitingValidator)) {
+        allValidatorAddresses.push(waitingValidator);
+        validatorInfoList.push({
+          address: waitingValidator,
+          totalStake: waitingValidatorList[waitingValidator],
+          ownStake: waitingValidatorList[waitingValidator],
+          otherStake: '0',
+          nominatorCount: 0,
+          // to be added later
+          commission: 0,
+          expectedReturn: 0,
+          blocked: false,
+          isVerified: false,
+          minBond: minBond.toString(),
+          isCrowded: false,
+          eraRewardPoint: '0',
+          topQuartile: false
+        });
+      }
+    }
     return [totalStakeMap, allValidatorAddresses, validatorInfoList];
   }
   /* Get pool targets */

package/constants/staking.js

@@ -13,6 +13,7 @@ export const PREDEFINED_EARNING_POOL = {
   kusama: [80],
   vara_network: [62, 29, 50],
   aleph: [82],
-  availTuringTest: [11]
+  availTuringTest: [11],
+  avail_mainnet: [4]
 };
 export const MAX_NOMINATIONS = '16';

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

@@ -162,6 +162,7 @@ export declare function getSupportedDaysByHistoryDepth(erasPerDay: number, maxSu
 export declare function getRelayValidatorPointsMap(eraRewardMap: Record<string, PalletStakingEraRewardPoints>): Record<string, BigNumber>;
 export declare function getRelayTopValidatorByPoints(validatorPointsList: Record<string, BigNumber>): string[];
 export declare function getRelayBlockedValidatorList(validators: any[]): string[];
+export declare function getRelayWaitingValidatorList(validators: any[]): string[];
 export declare function getRelayEraRewardMap(eraRewardPointArray: Codec[], startEraForPoints: number): Record<string, PalletStakingEraRewardPoints>;
 export declare function getRelayMaxNominations(substrateApi: _SubstrateApi): Promise<string>;
 export declare const getMinStakeErrorMessage: (chainInfo: _ChainInfo, bnMinStake: BN) => string;

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

@@ -393,6 +393,20 @@ export function getRelayBlockedValidatorList(validators) {
   }
   return blockValidatorList;
 }
+export function getRelayWaitingValidatorList(validators) {
+  const waitingValidators = [];
+  for (const validator of validators) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    const validatorAddress = validator[0].toHuman()[0];
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    const validatorPrefs = validator[1].toHuman();
+    const isBlocked = validatorPrefs.blocked;
+    if (!isBlocked) {
+      waitingValidators.push(validatorAddress);
+    }
+  }
+  return waitingValidators;
+}
 export function getRelayEraRewardMap(eraRewardPointArray, startEraForPoints) {
   const eraRewardMap = {};
   for (const item of eraRewardPointArray) {

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.2.16-0",
+  "version": "1.2.17-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2010,10 +2010,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.75",
-    "@subwallet/extension-base": "^1.2.16-0",
-    "@subwallet/extension-chains": "^1.2.16-0",
-    "@subwallet/extension-dapp": "^1.2.16-0",
-    "@subwallet/extension-inject": "^1.2.16-0",
+    "@subwallet/extension-base": "^1.2.17-0",
+    "@subwallet/extension-chains": "^1.2.17-0",
+    "@subwallet/extension-dapp": "^1.2.17-0",
+    "@subwallet/extension-inject": "^1.2.17-0",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/keyvaluestorage": "^1.1.1",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.2.16-0'
+  version: '1.2.17-0'
 };

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

@@ -3,7 +3,7 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, ExtrinsicType, StakingTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
-import { calculateAlephZeroValidatorReturn, calculateChainStakedReturnV2, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getAvgValidatorEraReward, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getRelayBlockedValidatorList, getRelayEraRewardMap, getRelayMaxNominations, getRelayTopValidatorByPoints, getRelayValidatorPointsMap, getSupportedDaysByHistoryDepth } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { calculateAlephZeroValidatorReturn, calculateChainStakedReturnV2, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getAvgValidatorEraReward, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getRelayBlockedValidatorList, getRelayEraRewardMap, getRelayMaxNominations, getRelayTopValidatorByPoints, getRelayValidatorPointsMap, getRelayWaitingValidatorList, getSupportedDaysByHistoryDepth } 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, _UPDATED_RUNTIME_STAKING_GROUP, MaxEraRewardPointsEras } from '@subwallet/extension-base/services/earning-service/constants';
@@ -313,11 +313,20 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const topValidatorList = getRelayTopValidatorByPoints(validatorPointsMap);
     const validators = _validators;
     const blockedValidatorList = getRelayBlockedValidatorList(validators);
+    const waitingValidatorList = getRelayWaitingValidatorList(validators);
+    const _waitingValidatorLedger = await chainApi.api.query.staking.ledger.multi(waitingValidatorList);
+    const waitingValidatorLedger = {};
+    if (_waitingValidatorLedger) {
+      waitingValidatorList.forEach((validator, i) => {
+        const validatorLedger = _waitingValidatorLedger[i].toPrimitive();
+        waitingValidatorLedger[validator] = new BigN(validatorLedger.total).toFixed();
+      });
+    }
     const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const bnTotalEraStake = new BN(_totalEraStake.toString());
     const minBond = _minBond.toPrimitive();
-    const [totalStakeMap, allValidatorAddresses, validatorInfoList] = this.parseEraStakerData(_eraStakers, blockedValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
+    const [totalStakeMap, allValidatorAddresses, validatorInfoList] = this.parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorLedger, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
     const extraInfoMap = {};
     await Promise.all(allValidatorAddresses.map(async address => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -352,11 +361,15 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       const validatorStake = applyDecimal(totalStakeMap[validator.address], decimals).toNumber();
       return calculateTernoaValidatorReturn(rewardPerValidator.toNumber(), validatorStake, commission);
     } else {
-      const bnValidatorStake = applyDecimal(totalStakeMap[validator.address], decimals);
-      return calculateValidatorStakedReturn(totalApy, bnValidatorStake, bnAvgStake, commission);
+      if (!totalStakeMap[validator.address]) {
+        return totalApy;
+      } else {
+        const bnValidatorStake = applyDecimal(totalStakeMap[validator.address], decimals);
+        return calculateValidatorStakedReturn(totalApy, bnValidatorStake, bnAvgStake, commission);
+      }
     }
   }
-  parseEraStakerData(_eraStakers, blockedValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
+  parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
     const totalStakeMap = {};
     const allValidatorAddresses = [];
     const validatorInfoList = [];
@@ -406,6 +419,27 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
         });
       }
     }
+    for (const waitingValidator of Object.keys(waitingValidatorList)) {
+      if (!allValidatorAddresses.includes(waitingValidator)) {
+        allValidatorAddresses.push(waitingValidator);
+        validatorInfoList.push({
+          address: waitingValidator,
+          totalStake: waitingValidatorList[waitingValidator],
+          ownStake: waitingValidatorList[waitingValidator],
+          otherStake: '0',
+          nominatorCount: 0,
+          // to be added later
+          commission: 0,
+          expectedReturn: 0,
+          blocked: false,
+          isVerified: false,
+          minBond: minBond.toString(),
+          isCrowded: false,
+          eraRewardPoint: '0',
+          topQuartile: false
+        });
+      }
+    }
     return [totalStakeMap, allValidatorAddresses, validatorInfoList];
   }
   /* Get pool targets */