@subwallet/extension-base 1.3.14-2 → 1.3.16-0

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

@@ -114,6 +114,10 @@ function calculateChainStakedReturn(inflation, totalEraStake, totalIssuance, net
   return stakedReturn;
 }
 function calculateChainStakedReturnV2(chainInfo, totalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, inflation, isCompound) {
+  if (chainInfo.slug === 'analog_timechain') {
+    // hotfix for analog
+    return 55;
+  }
   const DAYS_PER_YEAR = 365;
   const {
     decimals

package/cjs/packageInfo.js

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

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

@@ -59,6 +59,22 @@ class ChainOnlineService {
     }
     return true;
   }
+  mergeChainList(oldChainInfoMap, latestChainInfo) {
+    const rs = structuredClone(oldChainInfoMap);
+    for (const [slug, _info] of Object.entries(latestChainInfo)) {
+      var _rs$slug;
+      const {
+        providers: _providers,
+        ...info
+      } = _info;
+      const providers = Object.assign(((_rs$slug = rs[slug]) === null || _rs$slug === void 0 ? void 0 : _rs$slug.providers) || {}, _providers);
+      rs[slug] = {
+        ...info,
+        providers
+      };
+    }
+    return rs;
+  }
   async handleLatestPatch(latestPatch) {
     try {
       var _await$this$settingSe;
@@ -84,7 +100,7 @@ class ChainOnlineService {
 
         // 2. merge data map
         if (latestChainInfo && Object.keys(latestChainInfo).length > 0) {
-          chainInfoMap = Object.assign({}, oldChainInfoMap, latestChainInfo);
+          chainInfoMap = this.mergeChainList(oldChainInfoMap, latestChainInfo);
           const [currentChainStateKey, newChainKey] = [Object.keys(currentChainStateMap), Object.keys(chainInfoMap)];
           addedChain = newChainKey.filter(chain => !currentChainStateKey.includes(chain));
           addedChain.forEach(key => {

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

@@ -114,7 +114,8 @@ const _STAKING_ERA_LENGTH_MAP = {
   availTuringTest: 24,
   polkadex: 24,
   avail_mainnet: 24,
-  cere: 24
+  cere: 24,
+  analog_timechain: 12
 };
 exports._STAKING_ERA_LENGTH_MAP = _STAKING_ERA_LENGTH_MAP;
 const _EXPECTED_BLOCK_TIME = {

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

@@ -658,7 +658,7 @@ class ChainService {
     /**
      * Disable chain if not found provider
      * */
-    if (!endpoint && !providerName) {
+    if (!endpoint || !providerName) {
       this.disableChain(chainInfo.slug);
       return;
     }
@@ -919,6 +919,34 @@ class ChainService {
       });
     } else {
       const mergedChainInfoMap = defaultChainInfoMap;
+
+      // Reselect provider for chain
+      const updateCurrentProvider = function (providers, storedChainInfo, storeSlug, active) {
+        let forceFistProvider = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+        const manualTurnOff = !!storedChainInfo.manualTurnOff;
+        // For case only custom providers in list, randomize function will infinite loop, so force select first provider
+        const {
+          providerKey
+        } = forceFistProvider ? {
+          providerKey: Object.keys(providers)[0]
+        } : (0, _utils.randomizeProvider)(providers);
+        let selectedProvider = providerKey;
+        const storedProviderKey = storedChainInfo.currentProvider;
+        const storedProviderValue = storedChainInfo.providers[storedProviderKey] || '';
+        if (storedProviderValue !== null && storedProviderValue !== void 0 && storedProviderValue.startsWith('light') || storedProviderKey !== null && storedProviderKey !== void 0 && storedProviderKey.startsWith(_types3._CUSTOM_PREFIX)) {
+          const savedProviderKey = Object.keys(providers).find(key => providers[key] === storedProviderValue);
+          if (savedProviderKey) {
+            selectedProvider = savedProviderKey;
+          }
+        }
+        newStorageData.push({
+          ...mergedChainInfoMap[storeSlug],
+          active,
+          currentProvider: selectedProvider,
+          manualTurnOff
+        });
+        return selectedProvider;
+      };
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
         const chainInfo = defaultChainInfoMap[storedSlug];
         const manualTurnOff = !!storedChainInfo.manualTurnOff;
@@ -938,18 +966,6 @@ class ChainService {
             }
           }
           mergedChainInfoMap[storedSlug].providers = providers;
-          const {
-            providerKey
-          } = (0, _utils.randomizeProvider)(providers);
-          let selectedProvider = providerKey;
-          const storedProviderKey = storedChainInfo.currentProvider;
-          const storedProviderValue = storedChainInfo.providers[storedProviderKey] || '';
-          if (storedProviderValue !== null && storedProviderValue !== void 0 && storedProviderValue.startsWith('light') || storedProviderKey !== null && storedProviderKey !== void 0 && storedProviderKey.startsWith(_types3._CUSTOM_PREFIX)) {
-            const savedProviderKey = Object.keys(providers).find(key => providers[key] === storedProviderValue);
-            if (savedProviderKey) {
-              selectedProvider = savedProviderKey;
-            }
-          }
 
           // Merge current provider
           // let currentProvider = storedChainInfo.currentProvider;
@@ -957,6 +973,7 @@ class ChainService {
 
           const hasProvider = Object.values(providers).length > 0;
           const canActive = hasProvider && chainInfo.chainStatus === _types._ChainStatus.ACTIVE;
+          const selectedProvider = updateCurrentProvider(providers, storedChainInfo, storedSlug, canActive && storedChainInfo.active);
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: selectedProvider,
             slug: storedSlug,
@@ -964,12 +981,6 @@ class ChainService {
             manualTurnOff
           };
           this.updateChainConnectionStatus(storedSlug, _types3._ChainConnectionStatus.DISCONNECTED);
-          newStorageData.push({
-            ...mergedChainInfoMap[storedSlug],
-            active: canActive && storedChainInfo.active,
-            currentProvider: selectedProvider,
-            manualTurnOff
-          });
         } else if ((0, _utils._isCustomChain)(storedSlug)) {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
           // only custom chains are left
@@ -977,23 +988,19 @@ class ChainService {
           const duplicatedDefaultSlug = this.checkExistedPredefinedChain(defaultChainInfoMap, (_storedChainInfo$subs = storedChainInfo.substrateInfo) === null || _storedChainInfo$subs === void 0 ? void 0 : _storedChainInfo$subs.genesisHash, (_storedChainInfo$evmI = storedChainInfo.evmInfo) === null || _storedChainInfo$evmI === void 0 ? void 0 : _storedChainInfo$evmI.evmChainId);
           if (duplicatedDefaultSlug.length > 0) {
             // merge custom chain with existed chain
-            mergedChainInfoMap[duplicatedDefaultSlug].providers = {
+            const providers = {
               ...storedChainInfo.providers,
               ...mergedChainInfoMap[duplicatedDefaultSlug].providers
             };
+            mergedChainInfoMap[duplicatedDefaultSlug].providers = providers;
+            const selectedProvider = updateCurrentProvider(providers, storedChainInfo, duplicatedDefaultSlug, storedChainInfo.active);
             this.dataMap.chainStateMap[duplicatedDefaultSlug] = {
-              currentProvider: storedChainInfo.currentProvider,
+              currentProvider: selectedProvider,
               slug: duplicatedDefaultSlug,
               active: storedChainInfo.active,
               manualTurnOff
             };
             this.updateChainConnectionStatus(duplicatedDefaultSlug, _types3._ChainConnectionStatus.DISCONNECTED);
-            newStorageData.push({
-              ...mergedChainInfoMap[duplicatedDefaultSlug],
-              active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider,
-              manualTurnOff
-            });
             deprecatedChainMap[storedSlug] = duplicatedDefaultSlug;
             deprecatedChains.push(storedSlug);
           } else {
@@ -1012,38 +1019,21 @@ class ChainService {
               icon: storedChainInfo.icon,
               extraInfo: storedChainInfo.extraInfo
             };
+            const providers = storedChainInfo.providers;
+            // This case, providers are all custom providers, need force select first provider
+            const selectedProvider = updateCurrentProvider(providers, storedChainInfo, storedSlug, storedChainInfo.active, true);
             this.dataMap.chainStateMap[storedSlug] = {
-              currentProvider: storedChainInfo.currentProvider,
+              currentProvider: selectedProvider,
               // TODO: review
               slug: storedSlug,
               active: storedChainInfo.active,
               manualTurnOff
             };
             this.updateChainConnectionStatus(storedSlug, _types3._ChainConnectionStatus.DISCONNECTED);
-            newStorageData.push({
-              ...mergedChainInfoMap[storedSlug],
-              active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider,
-              // TODO: review
-              manualTurnOff
-            });
           }
         } else {
           var _storedChainInfo$bitc2;
           // added chain from patch
-          this.dataMap.chainStateMap[storedSlug] = {
-            currentProvider: storedChainInfo.currentProvider,
-            slug: storedSlug,
-            active: storedChainInfo.active,
-            manualTurnOff
-          };
-          this.updateChainConnectionStatus(storedSlug, _types3._ChainConnectionStatus.DISCONNECTED);
-          newStorageData.push({
-            ...storedChainSettingMap[storedSlug],
-            active: storedChainInfo.active,
-            currentProvider: storedChainInfo.currentProvider,
-            manualTurnOff
-          });
           mergedChainInfoMap[storedSlug] = {
             slug: storedSlug,
             name: storedChainInfo.name,
@@ -1057,6 +1047,15 @@ class ChainService {
             icon: storedChainInfo.icon,
             extraInfo: storedChainInfo.extraInfo
           };
+          const providers = storedChainInfo.providers;
+          const selectedProvider = updateCurrentProvider(providers, storedChainInfo, storedSlug, storedChainInfo.active);
+          this.dataMap.chainStateMap[storedSlug] = {
+            currentProvider: selectedProvider,
+            slug: storedSlug,
+            active: storedChainInfo.active,
+            manualTurnOff
+          };
+          this.updateChainConnectionStatus(storedSlug, _types3._ChainConnectionStatus.DISCONNECTED);
           deprecatedChainMap[storedSlug] = storedSlug; // todo: set a better name
         }
       }

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

@@ -14,7 +14,7 @@ const _STAKING_CHAIN_GROUP = {
   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', 'avail_mainnet', 'vara_testnet', 'cere'],
+  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet', 'vara_testnet', 'cere', 'analog_timechain'],
   bifrost: ['bifrost', 'bifrost_testnet'],
   aleph: ['aleph', 'alephTest'],
   // A0 has distinct tokenomics

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.bittensorApiKey = exports.BITTENSOR_API_KEY_6 = exports.BITTENSOR_API_KEY_5 = exports.BITTENSOR_API_KEY_4 = exports.BITTENSOR_API_KEY_3 = exports.BITTENSOR_API_KEY_2 = exports.BITTENSOR_API_KEY_1 = void 0;
+exports.default = exports.bittensorApiKey = exports.BITTENSOR_API_KEY_9 = exports.BITTENSOR_API_KEY_8 = exports.BITTENSOR_API_KEY_7 = exports.BITTENSOR_API_KEY_6 = exports.BITTENSOR_API_KEY_5 = exports.BITTENSOR_API_KEY_4 = exports.BITTENSOR_API_KEY_3 = exports.BITTENSOR_API_KEY_2 = exports.BITTENSOR_API_KEY_10 = exports.BITTENSOR_API_KEY_1 = void 0;
 exports.fetchDelegates = fetchDelegates;
 exports.fetchTaoDelegateState = fetchTaoDelegateState;
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
@@ -32,6 +32,14 @@ const BITTENSOR_API_KEY_5 = process.env.BITTENSOR_API_KEY_5 || '';
 exports.BITTENSOR_API_KEY_5 = BITTENSOR_API_KEY_5;
 const BITTENSOR_API_KEY_6 = process.env.BITTENSOR_API_KEY_6 || '';
 exports.BITTENSOR_API_KEY_6 = BITTENSOR_API_KEY_6;
+const BITTENSOR_API_KEY_7 = process.env.BITTENSOR_API_KEY_7 || '';
+exports.BITTENSOR_API_KEY_7 = BITTENSOR_API_KEY_7;
+const BITTENSOR_API_KEY_8 = process.env.BITTENSOR_API_KEY_8 || '';
+exports.BITTENSOR_API_KEY_8 = BITTENSOR_API_KEY_8;
+const BITTENSOR_API_KEY_9 = process.env.BITTENSOR_API_KEY_9 || '';
+exports.BITTENSOR_API_KEY_9 = BITTENSOR_API_KEY_9;
+const BITTENSOR_API_KEY_10 = process.env.BITTENSOR_API_KEY_10 || '';
+exports.BITTENSOR_API_KEY_10 = BITTENSOR_API_KEY_10;
 function random() {
   for (var _len = arguments.length, keys = new Array(_len), _key = 0; _key < _len; _key++) {
     keys[_key] = arguments[_key];
@@ -49,7 +57,7 @@ exports.bittensorApiKey = bittensorApiKey;
 async function fetchDelegates() {
   const apiKey = bittensorApiKey();
   return new Promise(function (resolve) {
-    fetch('https://api-prod-v2.taostats.io/api/validator/latest/v1', {
+    fetch('https://api.taostats.io/api/validator/latest/v1', {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
@@ -63,7 +71,7 @@ async function fetchDelegates() {
 async function fetchTaoDelegateState(address) {
   const apiKey = bittensorApiKey();
   return new Promise(function (resolve) {
-    fetch(`https://api-prod-v2.taostats.io/api/delegation/balance/latest/v1?nominator=${address}`, {
+    fetch(`https://api.taostats.io/api/stake_balance/latest/v1?coldkey=${address}`, {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
@@ -174,7 +182,8 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
           chain: chainInfo.slug,
           validatorAddress: delegate.owner,
           activeStake: activeStake,
-          validatorMinStake: minDelegatorStake
+          validatorMinStake: minDelegatorStake,
+          validatorIdentity: delegate.identity
         });
       }
     }
@@ -205,7 +214,8 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
         bnTotalBalance = bnTotalBalance.add(bnStakeAmount);
         delegatorState.push({
           owner: testnetAddress,
-          amount: bnStakeAmount.toString()
+          amount: bnStakeAmount.toString(),
+          identity: testnetAddress
         });
         rsCallback({
           ...defaultInfo,
@@ -237,10 +247,12 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
           let bnTotalBalance = _util.BN_ZERO;
           const delegateStateInfo = rawDelegateStateInfo.data;
           for (const delegate of delegateStateInfo) {
-            bnTotalBalance = bnTotalBalance.add(new _util.BN(delegate.balance));
+            const name = delegate.hotkey_name || delegate.hotkey.ss58;
+            bnTotalBalance = bnTotalBalance.add(new _util.BN(delegate.stake));
             delegatorState.push({
-              owner: delegate.delegate.ss58,
-              amount: delegate.balance.toString()
+              owner: delegate.hotkey.ss58,
+              amount: delegate.stake,
+              identity: name
             });
           }
           if (delegateStateInfo && delegateStateInfo.length > 0) {

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

@@ -91,7 +91,7 @@ class NominationPoolHandler extends _base.default {
 
       const supportedDays = (0, _utils.getSupportedDaysByHistoryDepth)(erasPerDay, parseInt(maxSupportedEras), parseInt(currentEra) / erasPerDay);
       const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
-      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 [_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.toString()).keys()].map(i => i + startEra))]);
       const maxPoolMembers = _maxPoolMember ? parseInt(_maxPoolMember.toString()) : undefined;
       const [_totalEraStake, _lastTotalStaked] = _EraStakeInfo;
       const validatorEraReward = (0, _utils.getAvgValidatorEraReward)(supportedDays, _eraReward[0]);

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

@@ -73,6 +73,10 @@ export function calculateChainStakedReturn(inflation, totalEraStake, totalIssuan
   return stakedReturn;
 }
 export function calculateChainStakedReturnV2(chainInfo, totalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, inflation, isCompound) {
+  if (chainInfo.slug === 'analog_timechain') {
+    // hotfix for analog
+    return 55;
+  }
   const DAYS_PER_YEAR = 365;
   const {
     decimals

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.14-2",
+  "version": "1.3.16-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2513,11 +2513,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.98",
-    "@subwallet/extension-base": "^1.3.14-2",
-    "@subwallet/extension-chains": "^1.3.14-2",
-    "@subwallet/extension-dapp": "^1.3.14-2",
-    "@subwallet/extension-inject": "^1.3.14-2",
+    "@subwallet/chain-list": "0.2.99-beta.14",
+    "@subwallet/extension-base": "^1.3.16-0",
+    "@subwallet/extension-chains": "^1.3.16-0",
+    "@subwallet/extension-dapp": "^1.3.16-0",
+    "@subwallet/extension-inject": "^1.3.16-0",
     "@subwallet/keyring": "^0.1.8-beta.0",
     "@subwallet/ui-keyring": "^0.1.8-beta.0",
     "@ton/core": "^0.56.3",

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.3.14-2'
+  version: '1.3.16-0'
 };

package/services/chain-online-service/index.d.ts

@@ -15,6 +15,7 @@ export declare class ChainOnlineService {
     constructor(chainService: ChainService, settingService: SettingService, eventService: EventService, dbService: DatabaseService);
     validatePatchWithHash(latestPatch: PatchInfo): boolean;
     validatePatchBeforeStore(candidateChainInfoMap: Record<string, _ChainInfo>, candidateAssetRegistry: Record<string, _ChainAsset>, latestPatch: PatchInfo): boolean;
+    mergeChainList(oldChainInfoMap: Record<string, _ChainInfo>, latestChainInfo: Record<string, _ChainInfo>): Record<string, _ChainInfo>;
     handleLatestPatch(latestPatch: PatchInfo): Promise<void>;
     private fetchLatestPatchData;
     handleLatestPatchData(): void;

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

@@ -53,6 +53,22 @@ export class ChainOnlineService {
     }
     return true;
   }
+  mergeChainList(oldChainInfoMap, latestChainInfo) {
+    const rs = structuredClone(oldChainInfoMap);
+    for (const [slug, _info] of Object.entries(latestChainInfo)) {
+      var _rs$slug;
+      const {
+        providers: _providers,
+        ...info
+      } = _info;
+      const providers = Object.assign(((_rs$slug = rs[slug]) === null || _rs$slug === void 0 ? void 0 : _rs$slug.providers) || {}, _providers);
+      rs[slug] = {
+        ...info,
+        providers
+      };
+    }
+    return rs;
+  }
   async handleLatestPatch(latestPatch) {
     try {
       var _await$this$settingSe;
@@ -78,7 +94,7 @@ export class ChainOnlineService {
 
         // 2. merge data map
         if (latestChainInfo && Object.keys(latestChainInfo).length > 0) {
-          chainInfoMap = Object.assign({}, oldChainInfoMap, latestChainInfo);
+          chainInfoMap = this.mergeChainList(oldChainInfoMap, latestChainInfo);
           const [currentChainStateKey, newChainKey] = [Object.keys(currentChainStateMap), Object.keys(chainInfoMap)];
           addedChain = newChainKey.filter(chain => !currentChainStateKey.includes(chain));
           addedChain.forEach(key => {

package/services/chain-service/constants.js

@@ -101,7 +101,8 @@ export const _STAKING_ERA_LENGTH_MAP = {
   availTuringTest: 24,
   polkadex: 24,
   avail_mainnet: 24,
-  cere: 24
+  cere: 24,
+  analog_timechain: 12
 };
 export const _EXPECTED_BLOCK_TIME = {
   // in seconds

package/services/chain-service/index.js

@@ -632,7 +632,7 @@ export class ChainService {
     /**
      * Disable chain if not found provider
      * */
-    if (!endpoint && !providerName) {
+    if (!endpoint || !providerName) {
       this.disableChain(chainInfo.slug);
       return;
     }
@@ -893,6 +893,33 @@ export class ChainService {
       });
     } else {
       const mergedChainInfoMap = defaultChainInfoMap;
+
+      // Reselect provider for chain
+      const updateCurrentProvider = (providers, storedChainInfo, storeSlug, active, forceFistProvider = false) => {
+        const manualTurnOff = !!storedChainInfo.manualTurnOff;
+        // For case only custom providers in list, randomize function will infinite loop, so force select first provider
+        const {
+          providerKey
+        } = forceFistProvider ? {
+          providerKey: Object.keys(providers)[0]
+        } : randomizeProvider(providers);
+        let selectedProvider = providerKey;
+        const storedProviderKey = storedChainInfo.currentProvider;
+        const storedProviderValue = storedChainInfo.providers[storedProviderKey] || '';
+        if (storedProviderValue !== null && storedProviderValue !== void 0 && storedProviderValue.startsWith('light') || storedProviderKey !== null && storedProviderKey !== void 0 && storedProviderKey.startsWith(_CUSTOM_PREFIX)) {
+          const savedProviderKey = Object.keys(providers).find(key => providers[key] === storedProviderValue);
+          if (savedProviderKey) {
+            selectedProvider = savedProviderKey;
+          }
+        }
+        newStorageData.push({
+          ...mergedChainInfoMap[storeSlug],
+          active,
+          currentProvider: selectedProvider,
+          manualTurnOff
+        });
+        return selectedProvider;
+      };
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
         const chainInfo = defaultChainInfoMap[storedSlug];
         const manualTurnOff = !!storedChainInfo.manualTurnOff;
@@ -912,18 +939,6 @@ export class ChainService {
             }
           }
           mergedChainInfoMap[storedSlug].providers = providers;
-          const {
-            providerKey
-          } = randomizeProvider(providers);
-          let selectedProvider = providerKey;
-          const storedProviderKey = storedChainInfo.currentProvider;
-          const storedProviderValue = storedChainInfo.providers[storedProviderKey] || '';
-          if (storedProviderValue !== null && storedProviderValue !== void 0 && storedProviderValue.startsWith('light') || storedProviderKey !== null && storedProviderKey !== void 0 && storedProviderKey.startsWith(_CUSTOM_PREFIX)) {
-            const savedProviderKey = Object.keys(providers).find(key => providers[key] === storedProviderValue);
-            if (savedProviderKey) {
-              selectedProvider = savedProviderKey;
-            }
-          }
 
           // Merge current provider
           // let currentProvider = storedChainInfo.currentProvider;
@@ -931,6 +946,7 @@ export class ChainService {
 
           const hasProvider = Object.values(providers).length > 0;
           const canActive = hasProvider && chainInfo.chainStatus === _ChainStatus.ACTIVE;
+          const selectedProvider = updateCurrentProvider(providers, storedChainInfo, storedSlug, canActive && storedChainInfo.active);
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: selectedProvider,
             slug: storedSlug,
@@ -938,12 +954,6 @@ export class ChainService {
             manualTurnOff
           };
           this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
-          newStorageData.push({
-            ...mergedChainInfoMap[storedSlug],
-            active: canActive && storedChainInfo.active,
-            currentProvider: selectedProvider,
-            manualTurnOff
-          });
         } else if (_isCustomChain(storedSlug)) {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
           // only custom chains are left
@@ -951,23 +961,19 @@ export class ChainService {
           const duplicatedDefaultSlug = this.checkExistedPredefinedChain(defaultChainInfoMap, (_storedChainInfo$subs = storedChainInfo.substrateInfo) === null || _storedChainInfo$subs === void 0 ? void 0 : _storedChainInfo$subs.genesisHash, (_storedChainInfo$evmI = storedChainInfo.evmInfo) === null || _storedChainInfo$evmI === void 0 ? void 0 : _storedChainInfo$evmI.evmChainId);
           if (duplicatedDefaultSlug.length > 0) {
             // merge custom chain with existed chain
-            mergedChainInfoMap[duplicatedDefaultSlug].providers = {
+            const providers = {
               ...storedChainInfo.providers,
               ...mergedChainInfoMap[duplicatedDefaultSlug].providers
             };
+            mergedChainInfoMap[duplicatedDefaultSlug].providers = providers;
+            const selectedProvider = updateCurrentProvider(providers, storedChainInfo, duplicatedDefaultSlug, storedChainInfo.active);
             this.dataMap.chainStateMap[duplicatedDefaultSlug] = {
-              currentProvider: storedChainInfo.currentProvider,
+              currentProvider: selectedProvider,
               slug: duplicatedDefaultSlug,
               active: storedChainInfo.active,
               manualTurnOff
             };
             this.updateChainConnectionStatus(duplicatedDefaultSlug, _ChainConnectionStatus.DISCONNECTED);
-            newStorageData.push({
-              ...mergedChainInfoMap[duplicatedDefaultSlug],
-              active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider,
-              manualTurnOff
-            });
             deprecatedChainMap[storedSlug] = duplicatedDefaultSlug;
             deprecatedChains.push(storedSlug);
           } else {
@@ -986,38 +992,21 @@ export class ChainService {
               icon: storedChainInfo.icon,
               extraInfo: storedChainInfo.extraInfo
             };
+            const providers = storedChainInfo.providers;
+            // This case, providers are all custom providers, need force select first provider
+            const selectedProvider = updateCurrentProvider(providers, storedChainInfo, storedSlug, storedChainInfo.active, true);
             this.dataMap.chainStateMap[storedSlug] = {
-              currentProvider: storedChainInfo.currentProvider,
+              currentProvider: selectedProvider,
               // TODO: review
               slug: storedSlug,
               active: storedChainInfo.active,
               manualTurnOff
             };
             this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
-            newStorageData.push({
-              ...mergedChainInfoMap[storedSlug],
-              active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider,
-              // TODO: review
-              manualTurnOff
-            });
           }
         } else {
           var _storedChainInfo$bitc2;
           // added chain from patch
-          this.dataMap.chainStateMap[storedSlug] = {
-            currentProvider: storedChainInfo.currentProvider,
-            slug: storedSlug,
-            active: storedChainInfo.active,
-            manualTurnOff
-          };
-          this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
-          newStorageData.push({
-            ...storedChainSettingMap[storedSlug],
-            active: storedChainInfo.active,
-            currentProvider: storedChainInfo.currentProvider,
-            manualTurnOff
-          });
           mergedChainInfoMap[storedSlug] = {
             slug: storedSlug,
             name: storedChainInfo.name,
@@ -1031,6 +1020,15 @@ export class ChainService {
             icon: storedChainInfo.icon,
             extraInfo: storedChainInfo.extraInfo
           };
+          const providers = storedChainInfo.providers;
+          const selectedProvider = updateCurrentProvider(providers, storedChainInfo, storedSlug, storedChainInfo.active);
+          this.dataMap.chainStateMap[storedSlug] = {
+            currentProvider: selectedProvider,
+            slug: storedSlug,
+            active: storedChainInfo.active,
+            manualTurnOff
+          };
+          this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
           deprecatedChainMap[storedSlug] = storedSlug; // todo: set a better name
         }
       }

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

@@ -8,7 +8,7 @@ export const _STAKING_CHAIN_GROUP = {
   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', 'avail_mainnet', 'vara_testnet', 'cere'],
+  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet', 'vara_testnet', 'cere', 'analog_timechain'],
   bifrost: ['bifrost', 'bifrost_testnet'],
   aleph: ['aleph', 'alephTest'],
   // A0 has distinct tokenomics

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

@@ -5,13 +5,15 @@ import { BaseYieldPositionInfo, StakeCancelWithdrawalParams, SubmitJoinNativeSta
 interface TaoStakingStakeOption {
     owner: string;
     amount: string;
+    identity: string;
 }
 export interface RawDelegateState {
     data: Array<{
-        delegate: {
+        hotkey_name: string;
+        hotkey: {
             ss58: string;
         };
-        balance: string;
+        stake: string;
     }>;
 }
 interface ValidatorResponse {
@@ -34,6 +36,10 @@ export declare const BITTENSOR_API_KEY_3: string;
 export declare const BITTENSOR_API_KEY_4: string;
 export declare const BITTENSOR_API_KEY_5: string;
 export declare const BITTENSOR_API_KEY_6: string;
+export declare const BITTENSOR_API_KEY_7: string;
+export declare const BITTENSOR_API_KEY_8: string;
+export declare const BITTENSOR_API_KEY_9: string;
+export declare const BITTENSOR_API_KEY_10: string;
 export declare const bittensorApiKey: () => string;
 export declare function fetchDelegates(): Promise<ValidatorResponse>;
 export declare function fetchTaoDelegateState(address: string): Promise<RawDelegateState>;

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

@@ -17,6 +17,10 @@ export const BITTENSOR_API_KEY_3 = process.env.BITTENSOR_API_KEY_3 || '';
 export const BITTENSOR_API_KEY_4 = process.env.BITTENSOR_API_KEY_4 || '';
 export const BITTENSOR_API_KEY_5 = process.env.BITTENSOR_API_KEY_5 || '';
 export const BITTENSOR_API_KEY_6 = process.env.BITTENSOR_API_KEY_6 || '';
+export const BITTENSOR_API_KEY_7 = process.env.BITTENSOR_API_KEY_7 || '';
+export const BITTENSOR_API_KEY_8 = process.env.BITTENSOR_API_KEY_8 || '';
+export const BITTENSOR_API_KEY_9 = process.env.BITTENSOR_API_KEY_9 || '';
+export const BITTENSOR_API_KEY_10 = process.env.BITTENSOR_API_KEY_10 || '';
 function random(...keys) {
   const validKeys = keys.filter(key => key);
   const randomIndex = Math.floor(Math.random() * validKeys.length);
@@ -31,7 +35,7 @@ export const bittensorApiKey = () => {
 export async function fetchDelegates() {
   const apiKey = bittensorApiKey();
   return new Promise(function (resolve) {
-    fetch('https://api-prod-v2.taostats.io/api/validator/latest/v1', {
+    fetch('https://api.taostats.io/api/validator/latest/v1', {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
@@ -45,7 +49,7 @@ export async function fetchDelegates() {
 export async function fetchTaoDelegateState(address) {
   const apiKey = bittensorApiKey();
   return new Promise(function (resolve) {
-    fetch(`https://api-prod-v2.taostats.io/api/delegation/balance/latest/v1?nominator=${address}`, {
+    fetch(`https://api.taostats.io/api/stake_balance/latest/v1?coldkey=${address}`, {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
@@ -156,7 +160,8 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
           chain: chainInfo.slug,
           validatorAddress: delegate.owner,
           activeStake: activeStake,
-          validatorMinStake: minDelegatorStake
+          validatorMinStake: minDelegatorStake,
+          validatorIdentity: delegate.identity
         });
       }
     }
@@ -187,7 +192,8 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
         bnTotalBalance = bnTotalBalance.add(bnStakeAmount);
         delegatorState.push({
           owner: testnetAddress,
-          amount: bnStakeAmount.toString()
+          amount: bnStakeAmount.toString(),
+          identity: testnetAddress
         });
         rsCallback({
           ...defaultInfo,
@@ -219,10 +225,12 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
           let bnTotalBalance = BN_ZERO;
           const delegateStateInfo = rawDelegateStateInfo.data;
           for (const delegate of delegateStateInfo) {
-            bnTotalBalance = bnTotalBalance.add(new BN(delegate.balance));
+            const name = delegate.hotkey_name || delegate.hotkey.ss58;
+            bnTotalBalance = bnTotalBalance.add(new BN(delegate.stake));
             delegatorState.push({
-              owner: delegate.delegate.ss58,
-              amount: delegate.balance.toString()
+              owner: delegate.hotkey.ss58,
+              amount: delegate.stake,
+              identity: name
             });
           }
           if (delegateStateInfo && delegateStateInfo.length > 0) {

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

@@ -83,7 +83,7 @@ export default class NominationPoolHandler extends BasePoolHandler {
 
       const supportedDays = getSupportedDaysByHistoryDepth(erasPerDay, parseInt(maxSupportedEras), parseInt(currentEra) / erasPerDay);
       const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
-      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 [_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.toString()).keys()].map(i => i + startEra))]);
       const maxPoolMembers = _maxPoolMember ? parseInt(_maxPoolMember.toString()) : undefined;
       const [_totalEraStake, _lastTotalStaked] = _EraStakeInfo;
       const validatorEraReward = getAvgValidatorEraReward(supportedDays, _eraReward[0]);