@subwallet/extension-base 1.1.33-beta.0 → 1.1.33-beta.1

package/background/KoniTypes.d.ts

@@ -371,16 +371,19 @@ export declare enum ExtrinsicType {
     MINT_SDOT = "earn.mint_sdot",
     MINT_QDOT = "earn.mint_qdot",
     MINT_STDOT = "earn.mint_stdot",
+    MINT_VMANTA = "earn.mint_vmanta",
     REDEEM_QDOT = "earn.redeem_qdot",
     REDEEM_VDOT = "earn.redeem_vdot",
     REDEEM_LDOT = "earn.redeem_ldot",
     REDEEM_SDOT = "earn.redeem_sdot",
     REDEEM_STDOT = "earn.redeem_stdot",
+    REDEEM_VMANTA = "earn.redeem_vmanta",
     UNSTAKE_QDOT = "earn.unstake_qdot",
     UNSTAKE_VDOT = "earn.unstake_vdot",
     UNSTAKE_LDOT = "earn.unstake_ldot",
     UNSTAKE_SDOT = "earn.unstake_sdot",
     UNSTAKE_STDOT = "earn.unstake_stdot",
+    UNSTAKE_VMANTA = "earn.unstake_vmanta",
     TOKEN_APPROVE = "evm.token_approve",
     EVM_EXECUTE = "evm.execute",
     UNKNOWN = "unknown"
@@ -407,16 +410,19 @@ export interface ExtrinsicDataTypeMap {
     [ExtrinsicType.MINT_QDOT]: SubmitYieldStepData;
     [ExtrinsicType.MINT_STDOT]: SubmitYieldStepData;
     [ExtrinsicType.MINT_STDOT]: SubmitYieldStepData;
+    [ExtrinsicType.MINT_VMANTA]: SubmitYieldStepData;
     [ExtrinsicType.UNSTAKE_VDOT]: RequestYieldLeave;
     [ExtrinsicType.UNSTAKE_QDOT]: RequestYieldLeave;
     [ExtrinsicType.UNSTAKE_LDOT]: RequestYieldLeave;
     [ExtrinsicType.UNSTAKE_SDOT]: RequestYieldLeave;
     [ExtrinsicType.UNSTAKE_STDOT]: RequestYieldLeave;
+    [ExtrinsicType.UNSTAKE_VMANTA]: RequestYieldLeave;
     [ExtrinsicType.REDEEM_VDOT]: RequestYieldLeave;
     [ExtrinsicType.REDEEM_QDOT]: RequestYieldLeave;
     [ExtrinsicType.REDEEM_LDOT]: RequestYieldLeave;
     [ExtrinsicType.REDEEM_SDOT]: RequestYieldLeave;
     [ExtrinsicType.REDEEM_STDOT]: RequestYieldLeave;
+    [ExtrinsicType.REDEEM_VMANTA]: RequestYieldLeave;
     [ExtrinsicType.TOKEN_APPROVE]: TokenApproveData;
     [ExtrinsicType.EVM_EXECUTE]: TransactionConfig;
     [ExtrinsicType.CROWDLOAN]: any;
@@ -470,16 +476,19 @@ export declare type TransactionAdditionalInfo = {
     [ExtrinsicType.TRANSFER_XCM]: XCMTransactionAdditionalInfo;
     [ExtrinsicType.SEND_NFT]: NFTTransactionAdditionalInfo;
     [ExtrinsicType.MINT_VDOT]: Pick<SubmitYieldStepData, 'derivativeTokenSlug' | 'exchangeRate' | 'slug'>;
+    [ExtrinsicType.MINT_VMANTA]: Pick<SubmitYieldStepData, 'derivativeTokenSlug' | 'exchangeRate' | 'slug'>;
     [ExtrinsicType.MINT_QDOT]: Pick<SubmitYieldStepData, 'derivativeTokenSlug' | 'exchangeRate' | 'slug'>;
     [ExtrinsicType.MINT_SDOT]: Pick<SubmitYieldStepData, 'derivativeTokenSlug' | 'exchangeRate' | 'slug'>;
     [ExtrinsicType.MINT_LDOT]: Pick<SubmitYieldStepData, 'derivativeTokenSlug' | 'exchangeRate' | 'slug'>;
     [ExtrinsicType.MINT_STDOT]: Pick<SubmitYieldStepData, 'derivativeTokenSlug' | 'exchangeRate' | 'slug'>;
     [ExtrinsicType.REDEEM_VDOT]: LeavePoolAdditionalData;
+    [ExtrinsicType.REDEEM_VMANTA]: LeavePoolAdditionalData;
     [ExtrinsicType.REDEEM_QDOT]: LeavePoolAdditionalData;
     [ExtrinsicType.REDEEM_SDOT]: LeavePoolAdditionalData;
     [ExtrinsicType.REDEEM_LDOT]: LeavePoolAdditionalData;
     [ExtrinsicType.REDEEM_STDOT]: LeavePoolAdditionalData;
     [ExtrinsicType.UNSTAKE_VDOT]: LeavePoolAdditionalData;
+    [ExtrinsicType.UNSTAKE_VMANTA]: LeavePoolAdditionalData;
     [ExtrinsicType.UNSTAKE_QDOT]: LeavePoolAdditionalData;
     [ExtrinsicType.UNSTAKE_SDOT]: LeavePoolAdditionalData;
     [ExtrinsicType.UNSTAKE_LDOT]: LeavePoolAdditionalData;

package/background/KoniTypes.js

@@ -81,16 +81,19 @@ export let ExtrinsicType;
   ExtrinsicType["MINT_SDOT"] = "earn.mint_sdot";
   ExtrinsicType["MINT_QDOT"] = "earn.mint_qdot";
   ExtrinsicType["MINT_STDOT"] = "earn.mint_stdot";
+  ExtrinsicType["MINT_VMANTA"] = "earn.mint_vmanta";
   ExtrinsicType["REDEEM_QDOT"] = "earn.redeem_qdot";
   ExtrinsicType["REDEEM_VDOT"] = "earn.redeem_vdot";
   ExtrinsicType["REDEEM_LDOT"] = "earn.redeem_ldot";
   ExtrinsicType["REDEEM_SDOT"] = "earn.redeem_sdot";
   ExtrinsicType["REDEEM_STDOT"] = "earn.redeem_stdot";
+  ExtrinsicType["REDEEM_VMANTA"] = "earn.redeem_vmanta";
   ExtrinsicType["UNSTAKE_QDOT"] = "earn.unstake_qdot";
   ExtrinsicType["UNSTAKE_VDOT"] = "earn.unstake_vdot";
   ExtrinsicType["UNSTAKE_LDOT"] = "earn.unstake_ldot";
   ExtrinsicType["UNSTAKE_SDOT"] = "earn.unstake_sdot";
   ExtrinsicType["UNSTAKE_STDOT"] = "earn.unstake_stdot";
+  ExtrinsicType["UNSTAKE_VMANTA"] = "earn.unstake_vmanta";
   ExtrinsicType["TOKEN_APPROVE"] = "evm.token_approve";
   ExtrinsicType["EVM_EXECUTE"] = "evm.execute";
   ExtrinsicType["UNKNOWN"] = "unknown";

package/cjs/background/KoniTypes.js

@@ -95,16 +95,19 @@ exports.ExtrinsicType = ExtrinsicType;
   ExtrinsicType["MINT_SDOT"] = "earn.mint_sdot";
   ExtrinsicType["MINT_QDOT"] = "earn.mint_qdot";
   ExtrinsicType["MINT_STDOT"] = "earn.mint_stdot";
+  ExtrinsicType["MINT_VMANTA"] = "earn.mint_vmanta";
   ExtrinsicType["REDEEM_QDOT"] = "earn.redeem_qdot";
   ExtrinsicType["REDEEM_VDOT"] = "earn.redeem_vdot";
   ExtrinsicType["REDEEM_LDOT"] = "earn.redeem_ldot";
   ExtrinsicType["REDEEM_SDOT"] = "earn.redeem_sdot";
   ExtrinsicType["REDEEM_STDOT"] = "earn.redeem_stdot";
+  ExtrinsicType["REDEEM_VMANTA"] = "earn.redeem_vmanta";
   ExtrinsicType["UNSTAKE_QDOT"] = "earn.unstake_qdot";
   ExtrinsicType["UNSTAKE_VDOT"] = "earn.unstake_vdot";
   ExtrinsicType["UNSTAKE_LDOT"] = "earn.unstake_ldot";
   ExtrinsicType["UNSTAKE_SDOT"] = "earn.unstake_sdot";
   ExtrinsicType["UNSTAKE_STDOT"] = "earn.unstake_stdot";
+  ExtrinsicType["UNSTAKE_VMANTA"] = "earn.unstake_vmanta";
   ExtrinsicType["TOKEN_APPROVE"] = "evm.token_approve";
   ExtrinsicType["EVM_EXECUTE"] = "evm.execute";
   ExtrinsicType["UNKNOWN"] = "unknown";

package/cjs/koni/api/yield/helper/utils.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -10,6 +11,8 @@ exports.syntheticSelectedValidators = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/types");
+var _utils2 = require("@subwallet/extension-base/utils");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -40,7 +43,7 @@ function convertDerivativeToOriginToken(amount, poolInfo, derivativeTokenInfo, o
   const derivativeDecimals = (0, _utils._getAssetDecimals)(derivativeTokenInfo);
   const originDecimals = (0, _utils._getAssetDecimals)(originTokenInfo);
   const exchangeRate = ((_poolInfo$statistic = poolInfo.statistic) === null || _poolInfo$statistic === void 0 ? void 0 : (_poolInfo$statistic$a = _poolInfo$statistic.assetEarning) === null || _poolInfo$statistic$a === void 0 ? void 0 : _poolInfo$statistic$a[0].exchangeRate) || 1;
-  const formattedAmount = parseInt(amount) / 10 ** derivativeDecimals; // TODO: decimals
-  const minAmount = formattedAmount * exchangeRate;
-  return Math.floor(minAmount * 10 ** originDecimals);
+  const formattedAmount = new _bignumber.default(amount).dividedBy(_utils2.BN_TEN.pow(derivativeDecimals)); // TODO: decimals
+  const minAmount = formattedAmount.multipliedBy(exchangeRate);
+  return minAmount.multipliedBy(_utils2.BN_TEN.pow(originDecimals)).toFixed(0);
 }

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._ZK_ASSET_PREFIX = exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
+exports._ZK_ASSET_PREFIX = exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -262,9 +262,11 @@ exports.EVM_PASS_CONNECT_STATUS = EVM_PASS_CONNECT_STATUS;
 const EVM_REFORMAT_DECIMALS = {
   acala: ['acala_evm', 'karura_evm']
 };
+exports.EVM_REFORMAT_DECIMALS = EVM_REFORMAT_DECIMALS;
+const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 30000;
 
 // TODO: review
-exports.EVM_REFORMAT_DECIMALS = EVM_REFORMAT_DECIMALS;
+exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = LATEST_CHAIN_DATA_FETCHING_INTERVAL;
 const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
 const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
 exports._CHAIN_INFO_SRC = _CHAIN_INFO_SRC;

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

@@ -64,7 +64,8 @@ class SubstrateApi {
     const apiOption = {
       provider,
       typesBundle: _api3.typesBundle,
-      registry: this.registry
+      registry: this.registry,
+      noInitWarn: true
     };
     if (this.metadata) {
       const metadata = this.metadata;
@@ -78,27 +79,31 @@ class SubstrateApi {
       api = externalApiPromise;
     } else if (_constants._API_OPTIONS_CHAIN_GROUP.acala.includes(this.chainSlug)) {
       api = new _api2.ApiPromise((0, _api.options)({
-        provider
+        provider,
+        noInitWarn: true
       }));
     } else if (_constants._API_OPTIONS_CHAIN_GROUP.turing.includes(this.chainSlug)) {
       api = new _api2.ApiPromise({
         provider,
         rpc: _types.rpc,
-        types: _types.types
+        types: _types.types,
+        noInitWarn: true
       });
     } else if (_constants._API_OPTIONS_CHAIN_GROUP.avail.includes(this.chainSlug)) {
       api = new _api2.ApiPromise({
         provider,
         rpc: _availJsSdk.spec.rpc,
         types: _availJsSdk.spec.types,
-        signedExtensions: _availJsSdk.spec.signedExtensions
+        signedExtensions: _availJsSdk.spec.signedExtensions,
+        noInitWarn: true
       });
     } else if (_constants._API_OPTIONS_CHAIN_GROUP.goldberg.includes(this.chainSlug)) {
       api = new _api2.ApiPromise({
         provider,
         rpc: _goldberg.default.rpc,
         types: _goldberg.default.types,
-        signedExtensions: _goldberg.default.signedExtensions
+        signedExtensions: _goldberg.default.signedExtensions,
+        noInitWarn: true
       });
     } else {
       api = new _api2.ApiPromise(apiOption);

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

@@ -410,9 +410,9 @@ class ChainService {
     await this.eventService.waitDatabaseReady;
 
     // TODO: reconsider the flow of initiation
-    const [latestAssetRefMap, latestMultiChainAssetMap] = await Promise.all([this.fetchLatestData(_constants._ASSET_REF_SRC, _chainList.AssetRefMap), this.fetchLatestData(_constants._MULTI_CHAIN_ASSET_SRC, _chainList.MultiChainAssetMap)]);
-    this.multiChainAssetMapSubject.next(latestMultiChainAssetMap);
-    this.dataMap.assetRefMap = latestAssetRefMap;
+    this.multiChainAssetMapSubject.next(_chainList.MultiChainAssetMap);
+    const storedAssetRefMap = await this.dbService.getAssetRefMap();
+    this.dataMap.assetRefMap = storedAssetRefMap && Object.values(storedAssetRefMap).length > 0 ? storedAssetRefMap : _chainList.AssetRefMap;
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.updateChainStateMapSubscription();
@@ -420,16 +420,81 @@ class ChainService {
     this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
     await this.initApis();
     await this.initAssetSettings();
+    this.checkLatestData();
   }
+  checkLatestData() {
+    clearInterval(this.refreshLatestChainDataTimeOut);
+    this.handleLatestData();
+    this.handleLatestData();
+    this.refreshLatestChainDataTimeOut = setInterval(this.handleLatestData.bind(this), _constants.LATEST_CHAIN_DATA_FETCHING_INTERVAL);
+  }
+  stopCheckLatestChainData() {
+    clearInterval(this.refreshLatestChainDataTimeOut);
+  }
+  handleLatestProviderData(latestChainInfo) {
+    try {
+      if (latestChainInfo && latestChainInfo.length > 0) {
+        const {
+          needUpdateChainApiList,
+          storedChainInfoList
+        } = (0, _utils.updateLatestChainInfo)(this.dataMap, latestChainInfo);
+        this.dbService.bulkUpdateChainStore(storedChainInfoList).catch(console.error);
+        this.updateChainSubscription();
+        needUpdateChainApiList.forEach(chainInfo => {
+          console.log('Updating chain API for', chainInfo.slug);
+          this.initApiForChain(chainInfo).catch(console.error);
+        });
+        this.logger.log('Finished updating latest RPC providers');
+      }
+    } catch (e) {
+      console.error('Error fetching latest chain data');
+    }
+  }
+  handleLatestBlockedAssetRef(latestBlockedAssetRefList) {
+    if (latestBlockedAssetRefList.length > 0) {
+      latestBlockedAssetRefList.forEach(blockedAssetRef => {
+        delete this.dataMap.assetRefMap[blockedAssetRef];
+      });
+    } else {
+      this.dataMap.assetRefMap = _chainList.AssetRefMap;
+    }
+    this.dbService.setAssetRef(this.dataMap.assetRefMap).catch(console.error);
+    this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
+    this.logger.log('Finished updating latest asset ref');
+  }
+  handleLatestPriceId(latestPriceIds) {
+    Object.entries(latestPriceIds).forEach(_ref3 => {
+      let [slug, priceId] = _ref3;
+      if (this.dataMap.assetRegistry[slug]) {
+        this.dataMap.assetRegistry[slug].priceId = priceId;
+      }
+    });
+    this.assetRegistrySubject.next(this.dataMap.assetRegistry);
+    this.eventService.emit('asset.updateState', '');
+    this.logger.log('Finished updating latest price IDs');
+  }
+  handleLatestData() {
+    this.fetchLatestChainData().then(latestChainInfo => {
+      this.handleLatestProviderData(latestChainInfo);
+    }).catch(console.error);
+    this.fetchLatestBlockedAssetRef().then(latestAssetRef => {
+      this.handleLatestBlockedAssetRef(latestAssetRef);
+    }).catch(console.error);
+
+    // this.fetchLatestPriceIdsData().then((latestPriceIds) => {
+    //   this.handleLatestPriceId(latestPriceIds);
+    // }).catch(console.error);
+  }
+
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
     const chainStateMap = this.getChainStateMap();
-    await Promise.all(Object.entries(chainInfoMap).filter(_ref3 => {
+    await Promise.all(Object.entries(chainInfoMap).filter(_ref4 => {
       var _chainStateMap$slug;
-      let [slug] = _ref3;
+      let [slug] = _ref4;
       return (_chainStateMap$slug = chainStateMap[slug]) === null || _chainStateMap$slug === void 0 ? void 0 : _chainStateMap$slug.active;
-    }).map(_ref4 => {
-      let [, chainInfo] = _ref4;
+    }).map(_ref5 => {
+      let [, chainInfo] = _ref5;
       try {
         return this.initApiForChain(chainInfo);
       } catch (e) {
@@ -578,8 +643,8 @@ class ChainService {
     }
     return duplicatedSlug;
   }
-  async fetchLatestData(src, defaultValue) {
-    return Promise.resolve(defaultValue);
+  async fetchLatestChainData() {
+    return await (0, _utils2.fetchStaticData)('chains');
     // try {
     //   const timeout = new Promise((resolve) => {
     //     const id = setTimeout(() => {
@@ -616,9 +681,16 @@ class ChainService {
     // }
   }
 
+  // @ts-ignore
+  async fetchLatestPriceIdsData() {
+    return await (0, _utils2.fetchStaticData)('chain-assets/price-map');
+  }
+  async fetchLatestBlockedAssetRef() {
+    return await (0, _utils2.fetchStaticData)('chain-assets/disabled-xcm-channels');
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
-    const latestChainInfoMap = await this.fetchLatestData(_constants._CHAIN_INFO_SRC, _chainList.ChainInfoMap);
+    const defaultChainInfoMap = _chainList.ChainInfoMap;
     const storedChainSettingMap = {};
     storedChainSettings.forEach(chainStoredSetting => {
       storedChainSettingMap[chainStoredSetting.slug] = chainStoredSetting;
@@ -627,10 +699,13 @@ class ChainService {
     const deprecatedChains = [];
     const deprecatedChainMap = {};
     if (storedChainSettings.length === 0) {
-      this.dataMap.chainInfoMap = latestChainInfoMap;
-      Object.values(latestChainInfoMap).forEach(chainInfo => {
+      this.dataMap.chainInfoMap = defaultChainInfoMap;
+      Object.values(defaultChainInfoMap).forEach(chainInfo => {
+        const {
+          providerKey
+        } = (0, _utils.randomizeProvider)(chainInfo.providers);
         this.dataMap.chainStateMap[chainInfo.slug] = {
-          currentProvider: Object.keys(chainInfo.providers)[0],
+          currentProvider: providerKey,
           slug: chainInfo.slug,
           connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
           active: _constants._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug)
@@ -640,15 +715,15 @@ class ChainService {
         newStorageData.push({
           ...chainInfo,
           active: _constants._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug),
-          currentProvider: Object.keys(chainInfo.providers)[0]
+          currentProvider: providerKey
         });
       });
     } else {
-      const mergedChainInfoMap = latestChainInfoMap;
+      const mergedChainInfoMap = defaultChainInfoMap;
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
-        const chainInfo = latestChainInfoMap[storedSlug];
+        const chainInfo = defaultChainInfoMap[storedSlug];
 
-        // Network is existed on change list
+        // Network existed on change list
         // check predefined chains first, keep setting for providers and currentProvider
         if (chainInfo) {
           // Keep customer provider only
@@ -663,23 +738,27 @@ class ChainService {
             }
           }
           mergedChainInfoMap[storedSlug].providers = providers;
-
-          // Merge current provider
-          let currentProvider = storedChainInfo.currentProvider;
-          const providerValue = storedChainInfo.providers[currentProvider] || '';
-          if (!providers[currentProvider]) {
-            currentProvider = Object.keys(providers)[0];
-            for (const [key, value] of Object.entries(providers)) {
-              if (providerValue === value) {
-                currentProvider = key;
-                break;
-              }
+          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;
+          // const providerValue = storedChainInfo.providers[selectedProvider] || '';
+
           const hasProvider = Object.values(providers).length > 0;
           const canActive = hasProvider && chainInfo.chainStatus === _types._ChainStatus.ACTIVE;
           this.dataMap.chainStateMap[storedSlug] = {
-            currentProvider: currentProvider,
+            currentProvider: selectedProvider,
             slug: storedSlug,
             connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
             active: canActive && storedChainInfo.active
@@ -687,13 +766,13 @@ class ChainService {
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
             active: canActive && storedChainInfo.active,
-            currentProvider: currentProvider
+            currentProvider: selectedProvider
           });
         } else if ((0, _utils._isCustomChain)(storedSlug)) {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
           // only custom chains are left
           // check custom chain duplicated with predefined chain => merge into predefined chain
-          const duplicatedDefaultSlug = this.checkExistedPredefinedChain(latestChainInfoMap, (_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);
+          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 = {
@@ -718,6 +797,7 @@ class ChainService {
               slug: storedSlug,
               name: storedChainInfo.name,
               providers: storedChainInfo.providers,
+              // TODO: review
               evmInfo: storedChainInfo.evmInfo,
               substrateInfo: storedChainInfo.substrateInfo,
               isTestnet: storedChainInfo.isTestnet,
@@ -727,6 +807,7 @@ class ChainService {
             };
             this.dataMap.chainStateMap[storedSlug] = {
               currentProvider: storedChainInfo.currentProvider,
+              // TODO: review
               slug: storedSlug,
               connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
               active: storedChainInfo.active
@@ -734,7 +815,7 @@ class ChainService {
             newStorageData.push({
               ...mergedChainInfoMap[storedSlug],
               active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider
+              currentProvider: storedChainInfo.currentProvider // TODO: review
             });
           }
         } else {
@@ -743,8 +824,8 @@ class ChainService {
       }
 
       // Fill in the missing chainState and storageData (new chains never before seen)
-      Object.entries(mergedChainInfoMap).forEach(_ref5 => {
-        let [slug, chainInfo] = _ref5;
+      Object.entries(mergedChainInfoMap).forEach(_ref6 => {
+        let [slug, chainInfo] = _ref6;
         if (!(slug in this.dataMap.chainStateMap)) {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
@@ -767,7 +848,7 @@ class ChainService {
   }
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
-    const latestAssetRegistry = await this.fetchLatestData(_constants._CHAIN_ASSET_SRC, _chainList.ChainAssetMap);
+    const latestAssetRegistry = _chainList.ChainAssetMap;
     const availableChains = Object.values(this.dataMap.chainInfoMap).filter(info => info.chainStatus === _types._ChainStatus.ACTIVE).map(chainInfo => chainInfo.slug);
 
     // Fill out zk assets from latestAssetRegistry if not supported
@@ -1217,9 +1298,11 @@ class ChainService {
   }
   async stopAllChainApis() {
     await Promise.all([this.substrateChainHandler.sleep(), this.evmChainHandler.sleep()]);
+    this.stopCheckLatestChainData();
   }
   async resumeAllChainApis() {
     await Promise.all([this.substrateChainHandler.wakeUp(), this.evmChainHandler.wakeUp()]);
+    this.checkLatestData();
   }
   checkAndUpdateStatusMapForChain(chainSlug) {
     const substrateApiMap = this.getSubstrateApiMap();
@@ -1355,10 +1438,10 @@ class ChainService {
     return this.assetSettingSubject;
   }
   async getChainLogoMap() {
-    return await this.fetchLatestData(_constants._CHAIN_LOGO_MAP_SRC, _chainList.ChainLogoMap);
+    return Promise.resolve(_chainList.ChainLogoMap);
   }
   async getAssetLogoMap() {
-    return await this.fetchLatestData(_constants._ASSET_LOGO_MAP_SRC, _chainList.AssetLogoMap);
+    return Promise.resolve(_chainList.AssetLogoMap);
   }
   resetWallet(resetAll) {
     if (resetAll) {

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

@@ -68,6 +68,8 @@ exports._isXcmPathSupported = _isXcmPathSupported;
 exports._parseAssetRefKey = _parseAssetRefKey;
 exports._parseMetadataForSmartContractAsset = _parseMetadataForSmartContractAsset;
 exports.findChainInfoByHalfGenesisHash = exports.findChainInfoByChainId = void 0;
+exports.randomizeProvider = randomizeProvider;
+exports.updateLatestChainInfo = updateLatestChainInfo;
 var _types = require("@subwallet/chain-list/types");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _types2 = require("@subwallet/extension-base/services/chain-service/types");
@@ -435,4 +437,70 @@ const findChainInfoByChainId = (chainMap, chainId) => {
 exports.findChainInfoByChainId = findChainInfoByChainId;
 function _isMantaZkAsset(chainAsset) {
   return _constants._MANTA_ZK_CHAIN_GROUP.includes(chainAsset.originChain) && chainAsset.symbol.startsWith(_constants._ZK_ASSET_PREFIX);
+}
+function randomizeProvider(providers, excludedKeys) {
+  if (Object.keys(providers).length === 0) {
+    return {
+      providerKey: '',
+      providerValue: ''
+    };
+  }
+  let isValid = false;
+  let selectedProviderKey = '';
+  let selectedProviderValue = '';
+  while (!isValid) {
+    var _selectedProviderValu, _selectedProviderKey;
+    const randomProvider = Math.floor(Math.random() * Object.keys(providers).length);
+    selectedProviderKey = Object.keys(providers)[randomProvider];
+    selectedProviderValue = providers[selectedProviderKey];
+    if (!((_selectedProviderValu = selectedProviderValue) !== null && _selectedProviderValu !== void 0 && _selectedProviderValu.startsWith('light')) && !((_selectedProviderKey = selectedProviderKey) !== null && _selectedProviderKey !== void 0 && _selectedProviderKey.startsWith(_types2._CUSTOM_PREFIX)) && !(excludedKeys !== null && excludedKeys !== void 0 && excludedKeys.includes(selectedProviderKey))) {
+      // if it's light client, then re-randomize
+      isValid = true;
+    }
+  }
+  return {
+    providerKey: selectedProviderKey,
+    providerValue: selectedProviderValue
+  };
+}
+function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
+  const currentChainInfoMap = currentDataMap.chainInfoMap;
+  const currentChainStateMap = currentDataMap.chainStateMap;
+  const storedChainInfoList = [];
+  const needUpdateChainApiList = [];
+  latestChainInfoList.forEach(latestChainInfo => {
+    const currentChainInfo = currentChainInfoMap[latestChainInfo.slug];
+    const currentChainState = currentChainStateMap[latestChainInfo.slug];
+    const currentChainProviderValue = currentChainInfo === null || currentChainInfo === void 0 ? void 0 : currentChainInfo.providers[currentChainState === null || currentChainState === void 0 ? void 0 : currentChainState.currentProvider];
+    if (currentChainInfo && currentChainState) {
+      const preservedProvider = {};
+      Object.entries(currentChainInfo.providers).forEach(_ref => {
+        let [providerKey, providerValue] = _ref;
+        if (providerValue !== null && providerValue !== void 0 && providerValue.startsWith('light') || providerKey !== null && providerKey !== void 0 && providerKey.startsWith(_types2._CUSTOM_PREFIX)) {
+          preservedProvider[providerKey] = providerValue;
+        }
+      });
+      currentChainInfo.providers = {
+        ...latestChainInfo.providers,
+        ...preservedProvider
+      };
+      const currentProviderNotFound = !Object.keys(currentChainInfo.providers).includes(currentChainState.currentProvider);
+      const currentProviderUpdated = Object.keys(currentChainInfo.providers).includes(currentChainState.currentProvider) && !Object.values(currentChainInfo.providers).includes(currentChainProviderValue);
+      if (currentChainInfo.chainStatus === _types._ChainStatus.ACTIVE && (currentProviderNotFound || currentProviderUpdated)) {
+        const {
+          providerKey
+        } = randomizeProvider(currentChainInfo.providers);
+        currentChainState.currentProvider = providerKey;
+        needUpdateChainApiList.push(currentChainInfo);
+      }
+      storedChainInfoList.push({
+        ...currentChainInfo,
+        ...currentChainState
+      });
+    }
+  });
+  return {
+    storedChainInfoList,
+    needUpdateChainApiList
+  };
 }

package/cjs/services/earning-service/handlers/liquid-staking/base.js

@@ -10,6 +10,7 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/koni/api/yield/helper/utils");
 var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _util = require("@polkadot/util");
 var _special = _interopRequireDefault(require("../special"));
@@ -38,7 +39,7 @@ class BaseLiquidStakingPoolHandler extends _special.default {
       return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS));
     }
     const formattedMinAmount = (0, _utils.convertDerivativeToOriginToken)(amount, poolInfo, derivativeTokenInfo, originTokenInfo);
-    return Math.floor(this.minAmountPercent * formattedMinAmount);
+    return new _bignumber.default(formattedMinAmount).multipliedBy(this.minAmountPercent).toFixed(0);
   }
   async validateYieldLeave(amount, address, fastLeave, selectedTarget) {
     const poolInfo = await this.getPoolInfo();