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

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

@@ -51,20 +51,22 @@ class RelayNativeStakingPoolHandler extends _base.default {
     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 / _constants._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 / _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _constants._STAKING_ERA_LENGTH_MAP.default; // Can be exactly calculate from babe.epochDuration * blockTime * staking.sessionsPerEra
 
       const supportedDays = (0, _utils.getSupportedDaysByHistoryDepth)(erasPerDay, parseInt(maxSupportedEras), parseInt(currentEra) / erasPerDay);
       const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
@@ -117,7 +119,8 @@ class RelayNativeStakingPoolHandler extends _base.default {
           // TODO recheck
           unstakingPeriod: unlockingPeriod,
           inflation: inflation
-        }
+        },
+        maxPoolMembers: unlimitedNominatorRewarded ? undefined : maxNominatorRewarded ? parseInt(maxNominatorRewarded) : undefined
       };
       callback(data);
     }));
@@ -151,7 +154,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
         let nominationStatus = _types.EarningStatus.NOT_EARNING;
         let eraStakerOtherList = [];
         let identity;
-        if (['kusama', 'polkadot', 'westend', 'availTuringTest'].includes(this.chain)) {
+        if (_constants2._UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
           // todo: review all relaychains later
           const [[_identity], _eraStaker] = await Promise.all([(0, _utils3.parseIdentity)(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress)]);
           identity = _identity;
@@ -303,9 +306,9 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const validatorInfoList = [];
     const maxEraRewardPointsEras = _constants2.MaxEraRewardPointsEras;
     const endEraForPoints = parseInt(activeEra) - 1;
-    let startEraForPoints = endEraForPoints - maxEraRewardPointsEras + 1;
+    let startEraForPoints = Math.max(endEraForPoints - maxEraRewardPointsEras + 1, 0);
     let _eraStakersPromise;
-    if (['kusama', 'polkadot', 'westend', 'availTuringTest'].includes(this.chain)) {
+    if (_constants2._UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
       // todo: review all relaychains later
       _eraStakersPromise = chainApi.api.query.staking.erasStakersOverview.entries(parseInt(currentEra));
     } else {
@@ -346,7 +349,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
       // 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;
@@ -354,16 +357,20 @@ class RelayNativeStakingPoolHandler extends _base.default {
         if (topValidatorList.includes(validatorAddress)) {
           isTopQuartile = true;
         }
-        const rawTotalStake = rawValidatorStat.total;
-        const rawOwnStake = rawValidatorStat.own;
-        const bnTotalStake = new _util.BN(rawTotalStake.replaceAll(',', ''));
-        const bnOwnStake = new _util.BN(rawOwnStake.replaceAll(',', ''));
+        const bnTotalStake = new _util.BN(rawValidatorStat.total);
+        const bnOwnStake = new _util.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 (_constants2._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/cjs/services/earning-service/handlers/nomination-pool/index.js

@@ -10,6 +10,7 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _constants2 = require("@subwallet/extension-base/services/earning-service/constants");
 var _types = require("@subwallet/extension-base/types");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -91,7 +92,8 @@ class NominationPoolHandler extends _base.default {
 
       const supportedDays = (0, _utils.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 = (0, _utils.getAvgValidatorEraReward)(supportedDays, _eraReward[0]);
       const lastTotalStaked = _lastTotalStaked.toString();
@@ -137,7 +139,8 @@ class NominationPoolHandler extends _base.default {
           // TODO recheck
           unstakingPeriod: unlockingPeriod,
           inflation: inflation
-        }
+        },
+        maxPoolMembers: maxPoolMembers || undefined
       };
       callback(data);
     }));
@@ -167,7 +170,7 @@ class NominationPoolHandler extends _base.default {
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
         let eraStakerOtherList = [];
-        if (['kusama', 'polkadot', 'westend', 'availTuringTest'].includes(this.chain)) {
+        if (_constants2._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);
@@ -327,13 +330,13 @@ class NominationPoolHandler extends _base.default {
     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 = (0, _utils.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();
@@ -342,6 +345,7 @@ class NominationPoolHandler extends _base.default {
       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,
@@ -350,7 +354,8 @@ class NominationPoolHandler extends _base.default {
         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/cjs/services/earning-service/service.js

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

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

@@ -65,7 +65,7 @@ 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
@@ -78,8 +78,16 @@ 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/cjs/services/price-service/index.js

@@ -68,17 +68,25 @@ 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.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][currencyKey || DEFAULT_CURRENCY]
@@ -87,8 +95,8 @@ 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;
@@ -119,7 +127,7 @@ 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/constants/staking.d.ts

@@ -1,2 +1,3 @@
 export declare const PREDEFINED_STAKING_POOL: Record<string, number>;
+export declare const PREDEFINED_EARNING_POOL: Record<string, number[]>;
 export declare const MAX_NOMINATIONS = "16";

package/constants/staking.js

@@ -8,4 +8,11 @@ export const PREDEFINED_STAKING_POOL = {
   aleph: 82,
   availTuringTest: 11
 };
+export const PREDEFINED_EARNING_POOL = {
+  polkadot: [39],
+  kusama: [80],
+  vara_network: [62, 29, 50],
+  aleph: [82],
+  availTuringTest: [11]
+};
 export const MAX_NOMINATIONS = '16';

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.61-0",
+  "version": "1.1.62-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -625,11 +625,6 @@
       "require": "./cjs/services/chain-service/handler/AbstractChainHandler.js",
       "default": "./services/chain-service/handler/AbstractChainHandler.js"
     },
-    "./services/chain-service/handler/chain-spec/goldberg": {
-      "types": "./services/chain-service/handler/chain-spec/goldberg.d.ts",
-      "require": "./cjs/services/chain-service/handler/chain-spec/goldberg.js",
-      "default": "./services/chain-service/handler/chain-spec/goldberg.js"
-    },
     "./services/chain-service/handler/EvmApi": {
       "types": "./services/chain-service/handler/EvmApi.d.ts",
       "require": "./cjs/services/chain-service/handler/EvmApi.js",
@@ -1874,17 +1869,17 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.58",
-    "@subwallet/extension-base": "^1.1.61-0",
-    "@subwallet/extension-chains": "^1.1.61-0",
-    "@subwallet/extension-dapp": "^1.1.61-0",
-    "@subwallet/extension-inject": "^1.1.61-0",
+    "@subwallet/chain-list": "0.2.59",
+    "@subwallet/extension-base": "^1.1.62-0",
+    "@subwallet/extension-chains": "^1.1.62-0",
+    "@subwallet/extension-dapp": "^1.1.62-0",
+    "@subwallet/extension-inject": "^1.1.62-0",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/sign-client": "^2.8.4",
     "@walletconnect/types": "^2.8.4",
     "@walletconnect/utils": "^2.8.4",
-    "avail-js-sdk": "^0.2.11",
+    "avail-js-sdk": "^0.2.12",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.1",
     "bn.js": "^5.2.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.1.61-0'
+  version: '1.1.62-0'
 };

package/services/chain-service/constants.js

@@ -10,7 +10,7 @@ export const API_MAX_RETRY = 2;
 export const _API_OPTIONS_CHAIN_GROUP = {
   acala: ['acala', 'karura', 'origintrail', 'kintsugi'],
   turing: ['turingStaging', 'turing'],
-  avail: ['kate', 'availTuringTest'],
+  avail: ['kate', 'availTuringTest', 'avail_mainnet'],
   goldberg: ['goldberg_testnet']
 };
 export const _PREDEFINED_SINGLE_MODES = {
@@ -91,7 +91,9 @@ export const _STAKING_ERA_LENGTH_MAP = {
   krest_network: 4,
   polimec: 6,
   enjin_relaychain: 24,
-  availTuringTest: 24
+  availTuringTest: 24,
+  polkadex: 24,
+  avail_mainnet: 24
 };
 export const _EXPECTED_BLOCK_TIME = {
   // in seconds
@@ -121,7 +123,8 @@ export const _EXPECTED_BLOCK_TIME = {
   calamari_test: 12,
   manta_network: 12,
   enjin_relaychain: 6,
-  availTuringTest: 20
+  availTuringTest: 20,
+  avail_mainnet: 20
 };
 export const _PARACHAIN_INFLATION_DISTRIBUTION = {
   moonbeam: {

package/services/chain-service/handler/SubstrateApi.js

@@ -9,14 +9,13 @@ import { getSubstrateConnectProvider } from '@subwallet/extension-base/services/
 import { DEFAULT_AUX } from '@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
-import { spec as availSpec } from 'avail-js-sdk';
+import { goldbergRpc, goldbergTypes, spec as availSpec } from 'avail-js-sdk';
 import { BehaviorSubject } from 'rxjs';
 import { ApiPromise, WsProvider } from '@polkadot/api';
 import { typesBundle } from '@polkadot/apps-config/api';
 import { TypeRegistry } from '@polkadot/types/create';
 import { formatBalance } from '@polkadot/util';
 import { defaults as addressDefaults } from '@polkadot/util-crypto/address/defaults';
-import goldbergSpec from "./chain-spec/goldberg.js";
 export class SubstrateApi {
   useLightClient = false;
   isApiReady = false;
@@ -93,9 +92,9 @@ export class SubstrateApi {
     } else if (_API_OPTIONS_CHAIN_GROUP.goldberg.includes(this.chainSlug)) {
       api = new ApiPromise({
         provider,
-        rpc: goldbergSpec.rpc,
-        types: goldbergSpec.types,
-        signedExtensions: goldbergSpec.signedExtensions,
+        rpc: goldbergRpc,
+        types: goldbergTypes,
+        signedExtensions: availSpec.signedExtensions,
         noInitWarn: true
       });
     } else {

package/services/chain-service/index.js

@@ -623,6 +623,14 @@ export class ChainService {
       endpoint,
       providerName
     } = this.getChainCurrentProviderByKey(chainInfo.slug);
+
+    /**
+     * Disable chain if not found provider
+     * */
+    if (!endpoint && !providerName) {
+      this.disableChain(chainInfo.slug);
+      return;
+    }
     const onUpdateStatus = status => {
       const slug = chainInfo.slug;
       this.updateChainConnectionStatus(slug, status);

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

@@ -455,6 +455,10 @@ export function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
     if (currentChainInfo) {
       needUpdate = true;
       currentChainInfo.extraInfo = latestChainInfo.extraInfo;
+      currentChainInfo.chainStatus = latestChainInfo.chainStatus;
+      if (Object.keys(currentChainInfo.providers).length === 0) {
+        currentChainInfo.chainStatus = _ChainStatus.INACTIVE;
+      }
     }
     if (needUpdate) {
       storedChainInfoList.push({

package/services/chain-service/utils/patch.js

@@ -5,7 +5,7 @@ import fetch from 'cross-fetch';
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
-const ChainListVersion = '0.2.57';
+const ChainListVersion = '0.2.59';
 export async function fetchPatchData(slug) {
   try {
     const fetchPromise = fetch(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);

package/services/earning-service/constants/chains.d.ts

@@ -13,6 +13,7 @@ export declare const _STAKING_CHAIN_GROUP: {
     krest_network: string[];
     manta: string[];
 };
+export declare const _UPDATED_RUNTIME_STAKING_GROUP: string[];
 export declare const MaxEraRewardPointsEras = 14;
 export declare const ST_LIQUID_TOKEN_ABI: Record<string, any>;
 export declare const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;

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

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export const _STAKING_CHAIN_GROUP = {
-  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet', 'availTuringTest'],
+  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari', 'manta_network', 'polimec'],
   astar: ['astar', 'shiden', 'shibuya'],
   amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum', 'krest_network'],
   // amplitude and kilt only share some common logic
   kilt: ['kilt', 'kilt_peregrine'],
-  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet', 'availTuringTest'],
+  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet'],
   bifrost: ['bifrost', 'bifrost_testnet'],
   aleph: ['aleph', 'alephTest'],
   // A0 has distinct tokenomics
@@ -18,6 +18,7 @@ export const _STAKING_CHAIN_GROUP = {
   krest_network: ['krest_network'],
   manta: ['manta_network']
 };
+export const _UPDATED_RUNTIME_STAKING_GROUP = ['kusama', 'polkadot', 'westend', 'availTuringTest', 'avail_mainnet'];
 export const MaxEraRewardPointsEras = 14;
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment

package/services/earning-service/handlers/native-staking/amplitude.d.ts

@@ -9,6 +9,8 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
     parseNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, delegatorState: ParachainStakingStakeOption[], unstakingInfo: Record<string, number>): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;
     subscribePoolPosition(useAddresses: string[], resultCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
     getPoolReward(useAddresses: string[], callBack: (rs: EarningRewardItem) => void): Promise<VoidFunction>;
+    getKrestPoolTargets(chainApi: _SubstrateApi): Promise<ValidatorInfo[]>;
+    getOtherPoolTargets(chainApi: _SubstrateApi): Promise<ValidatorInfo[]>;
     getPoolTargets(): Promise<ValidatorInfo[]>;
     get defaultSubmitStep(): YieldStepBaseInfo;
     createJoinExtrinsic(data: SubmitJoinNativeStaking, positionInfo?: YieldPositionInfo, bondDest?: string): Promise<[TransactionData, YieldTokenBaseInfo]>;

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

@@ -38,6 +38,7 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
     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;
@@ -49,6 +50,7 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
       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 = _STAKING_ERA_LENGTH_MAP[this.chain] || _STAKING_ERA_LENGTH_MAP.default; // in hours
       const blockDuration = roundTime / blockPerRound; // in hours
@@ -85,7 +87,8 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
           totalApy: undefined,
           // TODO recheck
           unstakingPeriod
-        }
+        },
+        maxPoolMembers: maxDelegatorsPerCollator ? parseInt(maxDelegatorsPerCollator) : undefined
       };
       callback(data);
     });
@@ -259,60 +262,97 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
 
   /* 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 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 BN(collatorInfo.total);
+      const bnOwnStake = new BN(collatorInfo.stake);
+      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+      const isFullDelegatorsSet = collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator);
+      let minDelegate = new BN(minDelegatorStake);
+      if (isFullDelegatorsSet) {
+        const delegatorAmounts = collatorInfo.delegators.map(delegator => new 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 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 BN(collatorInfo.total);
+      const bnOwnStake = new BN(collatorInfo.stake);
+      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+      const isFullDelegatorsSet = collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator);
+      let minDelegate = new BN(minDelegatorStake);
+      if (isFullDelegatorsSet) {
+        const delegatorAmounts = collatorInfo.delegators.map(delegator => new 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 (_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 BN(collatorInfo.total);
-        const bnOwnStake = new 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 BN(collatorInfo.total);
-        const bnOwnStake = new 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);
     }
   }