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

package/services/chain-service/index.js

@@ -3,15 +3,15 @@
 
 import { AssetLogoMap, AssetRefMap, ChainAssetMap, ChainInfoMap, ChainLogoMap, MultiChainAssetMap } from '@subwallet/chain-list';
 import { _AssetRefPath, _AssetType, _ChainStatus, _SubstrateChainType } from '@subwallet/chain-list/types';
-import { _ASSET_LOGO_MAP_SRC, _ASSET_REF_SRC, _CHAIN_ASSET_SRC, _CHAIN_INFO_SRC, _CHAIN_LOGO_MAP_SRC, _DEFAULT_ACTIVE_CHAINS, _MANTA_ZK_CHAIN_GROUP, _MULTI_CHAIN_ASSET_SRC, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
+import { _DEFAULT_ACTIVE_CHAINS, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX, LATEST_CHAIN_DATA_FETCHING_INTERVAL } from '@subwallet/extension-base/services/chain-service/constants';
 import { EvmChainHandler } from '@subwallet/extension-base/services/chain-service/handler/EvmChainHandler';
 import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-service/handler/manta/MantaPrivateHandler';
 import { SubstrateChainHandler } from '@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
-import { _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey } from '@subwallet/extension-base/services/chain-service/utils';
+import { _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import AssetSettingStore from '@subwallet/extension-base/stores/AssetSetting';
-import { MODULE_SUPPORT } from '@subwallet/extension-base/utils';
+import { fetchStaticData, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
 import { BehaviorSubject, Subject } from 'rxjs';
 import Web3 from 'web3';
 import { logger as createLogger } from '@polkadot/util/logger';
@@ -213,9 +213,8 @@ export class ChainService {
   getActiveChainInfos() {
     const result = {};
     Object.values(this.getChainStateMap()).forEach(chainState => {
-      const chainInfo = this.getChainInfoByKey(chainState.slug);
-      if (chainState.active && chainInfo && chainInfo.chainStatus === _ChainStatus.ACTIVE) {
-        result[chainState.slug] = chainInfo;
+      if (chainState.active) {
+        result[chainState.slug] = this.getChainInfoByKey(chainState.slug);
       }
     });
     return result;
@@ -396,9 +395,8 @@ export class ChainService {
     await this.eventService.waitDatabaseReady;
 
     // TODO: reconsider the flow of initiation
-    const [latestAssetRefMap, latestMultiChainAssetMap] = await Promise.all([this.fetchLatestData(_ASSET_REF_SRC, AssetRefMap), this.fetchLatestData(_MULTI_CHAIN_ASSET_SRC, MultiChainAssetMap)]);
-    this.multiChainAssetMapSubject.next(latestMultiChainAssetMap);
-    this.dataMap.assetRefMap = latestAssetRefMap;
+    this.multiChainAssetMapSubject.next(MultiChainAssetMap);
+    this.dataMap.assetRefMap = AssetRefMap;
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.updateChainStateMapSubscription();
@@ -406,7 +404,54 @@ export class ChainService {
     this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
     await this.initApis();
     await this.initAssetSettings();
+    this.checkLatestData();
   }
+  checkLatestData() {
+    clearInterval(this.refreshLatestChainDataTimeOut);
+    this.refreshLatestChainDataTimeOut = setInterval(this.handleLatestData.bind(this), LATEST_CHAIN_DATA_FETCHING_INTERVAL);
+  }
+  stopCheckLatestChainData() {
+    clearInterval(this.refreshLatestChainDataTimeOut);
+  }
+  handleLatestProviderData(latestChainInfo) {
+    try {
+      if (latestChainInfo && latestChainInfo.length > 0) {
+        const {
+          needUpdateChainApiList,
+          storedChainInfoList
+        } = 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');
+    }
+  }
+  handleLatestPriceId(latestPriceIds) {
+    Object.entries(latestPriceIds).forEach(([slug, priceId]) => {
+      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.fetchLatestPriceIdsData().then((latestPriceIds) => {
+    //   this.handleLatestPriceId(latestPriceIds);
+    // }).catch(console.error);
+  }
+
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
     const chainStateMap = this.getChainStateMap();
@@ -562,8 +607,8 @@ export class ChainService {
     }
     return duplicatedSlug;
   }
-  async fetchLatestData(src, defaultValue) {
-    return Promise.resolve(defaultValue);
+  async fetchLatestChainData() {
+    return await fetchStaticData('chains');
     // try {
     //   const timeout = new Promise((resolve) => {
     //     const id = setTimeout(() => {
@@ -600,9 +645,13 @@ export class ChainService {
     // }
   }
 
+  // @ts-ignore
+  async fetchLatestPriceIdsData() {
+    return await fetchStaticData('chain-assets/price-map');
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
-    const latestChainInfoMap = await this.fetchLatestData(_CHAIN_INFO_SRC, ChainInfoMap);
+    const defaultChainInfoMap = ChainInfoMap;
     const storedChainSettingMap = {};
     storedChainSettings.forEach(chainStoredSetting => {
       storedChainSettingMap[chainStoredSetting.slug] = chainStoredSetting;
@@ -611,10 +660,13 @@ export 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
+        } = randomizeProvider(chainInfo.providers);
         this.dataMap.chainStateMap[chainInfo.slug] = {
-          currentProvider: Object.keys(chainInfo.providers)[0],
+          currentProvider: providerKey,
           slug: chainInfo.slug,
           connectionStatus: _ChainConnectionStatus.DISCONNECTED,
           active: _DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug)
@@ -624,15 +676,15 @@ export class ChainService {
         newStorageData.push({
           ...chainInfo,
           active: _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
@@ -647,23 +699,27 @@ export 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
+          } = 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;
+          // const providerValue = storedChainInfo.providers[selectedProvider] || '';
+
           const hasProvider = Object.values(providers).length > 0;
           const canActive = hasProvider && chainInfo.chainStatus === _ChainStatus.ACTIVE;
           this.dataMap.chainStateMap[storedSlug] = {
-            currentProvider: currentProvider,
+            currentProvider: selectedProvider,
             slug: storedSlug,
             connectionStatus: _ChainConnectionStatus.DISCONNECTED,
             active: canActive && storedChainInfo.active
@@ -671,13 +727,13 @@ export class ChainService {
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
             active: canActive && storedChainInfo.active,
-            currentProvider: currentProvider
+            currentProvider: selectedProvider
           });
         } else if (_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 = {
@@ -702,6 +758,7 @@ export class ChainService {
               slug: storedSlug,
               name: storedChainInfo.name,
               providers: storedChainInfo.providers,
+              // TODO: review
               evmInfo: storedChainInfo.evmInfo,
               substrateInfo: storedChainInfo.substrateInfo,
               isTestnet: storedChainInfo.isTestnet,
@@ -711,6 +768,7 @@ export class ChainService {
             };
             this.dataMap.chainStateMap[storedSlug] = {
               currentProvider: storedChainInfo.currentProvider,
+              // TODO: review
               slug: storedSlug,
               connectionStatus: _ChainConnectionStatus.DISCONNECTED,
               active: storedChainInfo.active
@@ -718,7 +776,7 @@ export class ChainService {
             newStorageData.push({
               ...mergedChainInfoMap[storedSlug],
               active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider
+              currentProvider: storedChainInfo.currentProvider // TODO: review
             });
           }
         } else {
@@ -750,7 +808,7 @@ export class ChainService {
   }
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
-    const latestAssetRegistry = await this.fetchLatestData(_CHAIN_ASSET_SRC, ChainAssetMap);
+    const latestAssetRegistry = ChainAssetMap;
     const availableChains = Object.values(this.dataMap.chainInfoMap).filter(info => info.chainStatus === _ChainStatus.ACTIVE).map(chainInfo => chainInfo.slug);
 
     // Fill out zk assets from latestAssetRegistry if not supported
@@ -1200,9 +1258,11 @@ export 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();
@@ -1337,10 +1397,10 @@ export class ChainService {
     return this.assetSettingSubject;
   }
   async getChainLogoMap() {
-    return await this.fetchLatestData(_CHAIN_LOGO_MAP_SRC, ChainLogoMap);
+    return Promise.resolve(ChainLogoMap);
   }
   async getAssetLogoMap() {
-    return await this.fetchLatestData(_ASSET_LOGO_MAP_SRC, AssetLogoMap);
+    return Promise.resolve(AssetLogoMap);
   }
   resetWallet(resetAll) {
     if (resetAll) {

package/services/chain-service/utils.d.ts

@@ -1,6 +1,7 @@
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
 import { BasicTokenInfo } from '@subwallet/extension-base/background/KoniTypes';
-import { _ChainState } from '@subwallet/extension-base/services/chain-service/types';
+import { _ChainState, _DataMap } from '@subwallet/extension-base/services/chain-service/types';
+import { IChain } from '@subwallet/extension-base/services/storage-service/databases';
 export declare function _isCustomChain(slug: string): boolean;
 export declare function _isCustomAsset(slug: string): boolean;
 export declare function _getCustomAssets(assetRegistry: Record<string, _ChainAsset>): Record<string, _ChainAsset>;
@@ -30,7 +31,6 @@ export declare function _getChainSubstrateAddressPrefix(chainInfo: _ChainInfo):
 export declare function _isChainSupportNativeNft(chainInfo: _ChainInfo): boolean;
 export declare function _isChainSupportEvmNft(chainInfo: _ChainInfo): boolean;
 export declare function _isChainSupportWasmNft(chainInfo: _ChainInfo): boolean;
-export declare const _isSupportOrdinal: (chain: string) => boolean;
 export declare function _getNftTypesSupportedByChain(chainInfo: _ChainInfo): _AssetType[];
 export declare function _getTokenTypesSupportedByChain(chainInfo: _ChainInfo): _AssetType[];
 export declare function _getChainNativeTokenBasicInfo(chainInfo: _ChainInfo): BasicTokenInfo;
@@ -67,3 +67,11 @@ export declare function _generateCustomProviderKey(index: number): string;
 export declare const findChainInfoByHalfGenesisHash: (chainMap: Record<string, _ChainInfo>, halfGenesisHash?: string) => _ChainInfo | null;
 export declare const findChainInfoByChainId: (chainMap: Record<string, _ChainInfo>, chainId?: number) => _ChainInfo | null;
 export declare function _isMantaZkAsset(chainAsset: _ChainAsset): boolean;
+export declare function randomizeProvider(providers: Record<string, string>, excludedKeys?: string[]): {
+    providerKey: string;
+    providerValue: string;
+};
+export declare function updateLatestChainInfo(currentDataMap: _DataMap, latestChainInfoList: _ChainInfo[]): {
+    storedChainInfoList: IChain[];
+    needUpdateChainApiList: _ChainInfo[];
+};

package/services/chain-service/utils.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { _AssetRefPath, _AssetType, _SubstrateChainType } from '@subwallet/chain-list/types';
+import { _AssetRefPath, _AssetType, _ChainStatus, _SubstrateChainType } from '@subwallet/chain-list/types';
 import { _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _CUSTOM_PREFIX, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
 import { isEthereumAddress } from '@polkadot/util-crypto';
@@ -92,7 +92,7 @@ export function _getTokenMinAmount(tokenInfo) {
   return tokenInfo.minAmount || '0';
 }
 export function _isChainEvmCompatible(chainInfo) {
-  return !!chainInfo.evmInfo;
+  return chainInfo.evmInfo !== undefined && chainInfo.evmInfo !== null;
 }
 export function _isNativeToken(tokenInfo) {
   return tokenInfo.assetType === _AssetType.NATIVE;
@@ -147,10 +147,6 @@ export function _isChainSupportWasmNft(chainInfo) {
   var _chainInfo$substrateI8, _chainInfo$substrateI9;
   return ((_chainInfo$substrateI8 = chainInfo.substrateInfo) === null || _chainInfo$substrateI8 === void 0 ? void 0 : (_chainInfo$substrateI9 = _chainInfo$substrateI8.supportSmartContract) === null || _chainInfo$substrateI9 === void 0 ? void 0 : _chainInfo$substrateI9.includes(_AssetType.PSP34)) || false;
 }
-export const _isSupportOrdinal = chain => {
-  const chains = ['polkadot', 'astar', 'bifrost_dot', 'moonbeam'];
-  return chains.includes(chain);
-};
 export function _getNftTypesSupportedByChain(chainInfo) {
   const result = [];
   if (chainInfo.substrateInfo && chainInfo.substrateInfo.supportSmartContract) {
@@ -362,4 +358,69 @@ export const findChainInfoByChainId = (chainMap, chainId) => {
 };
 export function _isMantaZkAsset(chainAsset) {
   return _MANTA_ZK_CHAIN_GROUP.includes(chainAsset.originChain) && chainAsset.symbol.startsWith(_ZK_ASSET_PREFIX);
+}
+export 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(_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
+  };
+}
+export 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(([providerKey, providerValue]) => {
+        if (providerValue !== null && providerValue !== void 0 && providerValue.startsWith('light') || providerKey !== null && providerKey !== void 0 && providerKey.startsWith(_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 === _ChainStatus.ACTIVE && (currentProviderNotFound || currentProviderUpdated)) {
+        const {
+          providerKey
+        } = randomizeProvider(currentChainInfo.providers);
+        currentChainState.currentProvider = providerKey;
+        needUpdateChainApiList.push(currentChainInfo);
+      }
+      storedChainInfoList.push({
+        ...currentChainInfo,
+        ...currentChainState
+      });
+    }
+  });
+  return {
+    storedChainInfoList,
+    needUpdateChainApiList
+  };
 }

package/services/event-service/index.d.ts

@@ -8,14 +8,12 @@ export declare class EventService extends EventEmitter<EventRegistry> {
     readonly waitDatabaseReady: Promise<boolean>;
     readonly waitKeyringReady: Promise<boolean>;
     readonly waitAccountReady: Promise<boolean>;
-    readonly waitInjectReady: Promise<boolean>;
     readonly waitChainReady: Promise<boolean>;
     readonly waitAssetReady: Promise<boolean>;
     readonly waitMigrateReady: Promise<boolean>;
     readonly waitCampaignReady: Promise<boolean>;
     readonly waitBuyTokenReady: Promise<boolean>;
     readonly waitBuyServiceReady: Promise<boolean>;
-    readonly waitEarningReady: Promise<boolean>;
     constructor();
     private generateWaitPromise;
     private setLazyTimeout;

package/services/event-service/index.js

@@ -3,7 +3,6 @@
 
 // Stateless service handle runtime event on background
 
-import { TARGET_ENV } from '@subwallet/extension-base/utils';
 import EventEmitter from 'eventemitter3';
 const DEFAULT_LAZY_TIME = 300;
 const LONG_LAZY_TIME = 900;
@@ -18,20 +17,16 @@ export class EventService extends EventEmitter {
     this.waitDatabaseReady = this.generateWaitPromise('database.ready');
     this.waitKeyringReady = this.generateWaitPromise('keyring.ready');
     this.waitAccountReady = this.generateWaitPromise('account.ready');
-    // TODO: Need to merge logic on web-runner file
-    this.waitInjectReady = TARGET_ENV === 'webapp' ? this.generateWaitPromise('inject.ready') : Promise.resolve(true);
     this.waitChainReady = this.generateWaitPromise('chain.ready');
     this.waitAssetReady = this.generateWaitPromise('asset.ready');
     this.waitMigrateReady = this.generateWaitPromise('migration.done');
     this.waitCampaignReady = this.generateWaitPromise('campaign.ready');
     this.waitBuyTokenReady = this.generateWaitPromise('buy.tokens.ready');
     this.waitBuyServiceReady = this.generateWaitPromise('buy.services.ready');
-    this.waitEarningReady = this.generateWaitPromise('earning.ready');
   }
   generateWaitPromise(eventType) {
     return new Promise(resolve => {
       this.once(eventType, isReady => {
-        console.log('===LOG generateWaitPromise eventType', eventType);
         resolve(isReady);
       });
     });

package/services/event-service/types.d.ts

@@ -5,20 +5,12 @@ export interface EventRegistry {
     'general.wakeup': [boolean];
     'crypto.ready': [boolean];
     'database.ready': [boolean];
-    /** Password state ready  */
     'keyring.ready': [boolean];
-    /** Update current account  */
     'account.updateCurrent': [CurrentAccountInfo];
-    /** Account list loaded  */
     'account.ready': [boolean];
-    /** Add a new account  */
     'account.add': [string];
-    /** Update account */
     'account.update': [string];
-    /** Remove a account  */
     'account.remove': [string];
-    /** Inject account done  */
-    'inject.ready': [boolean];
     'chain.ready': [boolean];
     'chain.add': [string];
     'chain.updateState': [string];
@@ -36,7 +28,6 @@ export interface EventRegistry {
     'campaign.ready': [boolean];
     'buy.tokens.ready': [boolean];
     'buy.services.ready': [boolean];
-    'earning.ready': [boolean];
 }
 export declare type EventType = keyof EventRegistry;
 export declare const COMMON_RELOAD_EVENTS: EventType[];

package/services/keyring-service/index.d.ts

@@ -10,7 +10,6 @@ export declare class KeyringService {
     readonly addressesSubject: BehaviorSubject<SubjectInfo>;
     readonly accountSubject: BehaviorSubject<SubjectInfo>;
     private beforeAccount;
-    private injected;
     readonly keyringStateSubject: BehaviorSubject<KeyringState>;
     constructor(eventService: EventService);
     private subscribeAccounts;
@@ -22,6 +21,6 @@ export declare class KeyringService {
     setCurrentAccount(currentAccountData: CurrentAccountInfo): void;
     lock(): void;
     addInjectAccounts(accounts: InjectedAccountWithMeta[]): void;
-    removeInjectAccounts(_addresses: string[]): void;
+    removeInjectAccounts(addresses: string[]): void;
     resetWallet(resetAll: boolean): Promise<void>;
 }

package/services/keyring-service/index.js

@@ -22,7 +22,6 @@ export class KeyringService {
   });
   constructor(eventService) {
     this.eventService = eventService;
-    this.injected = false;
     this.eventService.waitCryptoReady.then(() => {
       this.currentAccountStore.get('CurrentAccountInfo', rs => {
         rs && this.currentAccountSubject.next(rs);
@@ -134,19 +133,8 @@ export class KeyringService {
         currentGenesisHash: null
       });
     }
-    if (!this.injected) {
-      this.eventService.emit('inject.ready', true);
-      this.injected = true;
-    }
   }
-  removeInjectAccounts(_addresses) {
-    const addresses = _addresses.map(address => {
-      try {
-        return keyring.getPair(address).address;
-      } catch (error) {
-        return address;
-      }
-    });
+  removeInjectAccounts(addresses) {
     const currentAddress = this.currentAccountSubject.value.address;
     const afterAccounts = Object.keys(this.accounts).filter(address => addresses.indexOf(address) < 0);
     if (afterAccounts.length === 1) {
@@ -171,7 +159,7 @@ export class KeyringService {
     await new Promise(resolve => {
       setTimeout(() => {
         resolve();
-      }, 1500);
+      }, 500);
     });
     this.updateKeyringState();
     this.currentAccountSubject.next({

package/services/migration-service/scripts/MigrateLedgerAccount.js

@@ -11,7 +11,7 @@ export default class MigrateLedgerAccount extends BaseMigrationJob {
         const store = new AccountsStore();
         const update = (key, value) => {
           var _value$meta;
-          if (key.startsWith('account:') && value !== null && value !== void 0 && value.meta && isString((_value$meta = value.meta) === null || _value$meta === void 0 ? void 0 : _value$meta.originGenesisHash)) {
+          if (key.startsWith('account:') && value.meta && isString((_value$meta = value.meta) === null || _value$meta === void 0 ? void 0 : _value$meta.originGenesisHash)) {
             const newValue = {
               ...value
             };

package/services/migration-service/scripts/MigrateTransactionHistory.js

@@ -12,7 +12,7 @@ export default class MigrateTransactionHistory extends BaseMigrationJob {
     const chainInfoMap = state.getChainInfoMap();
     const assetList = Object.values(state.getAssetRegistry());
     try {
-      const db = new Dexie('SubWalletDB_v2');
+      const db = new Dexie('SubWalletDB');
       const dexieDB = await db.open();
       const transactionTable = dexieDB.table('transactions');
       const oldTransactionData = await transactionTable.toArray();

package/services/migration-service/scripts/index.js

@@ -1,8 +1,6 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import DeleteEarningData from '@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData';
-import MigrateEarningVersion from "./databases/MigrateEarningVersion.js";
 import MigrateEthProvider from "./providers/MigrateEthProvider.js";
 import MigratePioneerProvider from "./providers/MigratePioneerProvider.js";
 import MigrateProvidersV1M1P24 from "./providers/MigrateProvidersV1M1P24.js";
@@ -35,12 +33,9 @@ export default {
   '1.1.6-01': MigrateWalletReference,
   '1.1.7': DeleteChain,
   '1.1.13-01': MigrateTokenDecimals,
-  // '1.1.13-02-2': EnableEarningChains,
-  '1.1.13-03': DeleteEarningData,
   '1.1.17-01': MigratePioneerProvider,
   '1.1.17-03': EnableVaraChain,
   '1.1.24-01': MigrateProvidersV1M1P24,
-  '1.1.26-01': MigratePolygonUSDCProvider,
-  '1.1.28-01': MigrateEarningVersion
+  '1.1.26-01': MigratePolygonUSDCProvider
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/notification-service/NotificationService.js

@@ -33,7 +33,7 @@ export default class NotificationService {
       type: 'basic',
       title,
       message,
-      iconUrl: '/images/icon-128.png',
+      iconUrl: './images/icon-128.png',
       priority: 2,
       isClickable: !!link || !!onClick,
       buttons

package/services/storage-service/DatabaseService.d.ts

@@ -8,9 +8,7 @@ import ChainStakingMetadataStore from '@subwallet/extension-base/services/storag
 import MantaPayStore from '@subwallet/extension-base/services/storage-service/db-stores/MantaPay';
 import NominatorMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/NominatorMetadata';
 import { HistoryQuery } from '@subwallet/extension-base/services/storage-service/db-stores/Transaction';
-import YieldPoolStore from '@subwallet/extension-base/services/storage-service/db-stores/YieldPoolStore';
-import YieldPositionStore from '@subwallet/extension-base/services/storage-service/db-stores/YieldPositionStore';
-import { BalanceItem, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { BalanceItem } from '@subwallet/extension-base/types';
 import { Subscription } from 'dexie';
 import { DexieExportJsonStructure } from 'dexie-export-import';
 export declare const DEXIE_BACKUP_TABLES: string[];
@@ -29,8 +27,6 @@ export default class DatabaseService {
         metadata: MetadataStore;
         chain: ChainStore;
         asset: AssetStore;
-        yieldPoolInfo: YieldPoolStore;
-        yieldPosition: YieldPositionStore;
         chainStakingMetadata: ChainStakingMetadataStore;
         nominatorMetadata: NominatorMetadataStore;
         mantaPay: MantaPayStore;
@@ -39,7 +35,6 @@ export default class DatabaseService {
     private logger;
     private nftSubscription;
     private stakingSubscription;
-    private yieldInfoSubscription;
     constructor(eventService: EventService);
     updatePriceStore(priceData: PriceJson): Promise<void>;
     getPriceStore(): Promise<PriceJson | undefined>;
@@ -88,22 +83,6 @@ export default class DatabaseService {
     subscribeMantaPayConfig(chain: string, callback: (data: MantaPayConfig[]) => void): void;
     getMantaPayConfig(chain: string): Promise<any[]>;
     getMantaPayFirstConfig(chain: string): Promise<any>;
-    removeOldEarningData(): Promise<void>;
-    updateYieldPoolStore(data: YieldPoolInfo): Promise<void>;
-    updateYieldPoolsStore(data: YieldPoolInfo[]): Promise<void>;
-    deleteYieldPoolInfo(slugs: string[]): Promise<void>;
-    getYieldPools(): Promise<YieldPoolInfo[]>;
-    getYieldPoolStakingInfo(chain: string, poolType: YieldPoolType): Promise<YieldPoolInfo | undefined>;
-    getYieldPool(slug: string): Promise<YieldPoolInfo | undefined>;
-    getYieldPositionByAddressAndSlug(address: string, slug: string): Promise<YieldPositionInfo | undefined>;
-    subscribeYieldPoolInfo(chains: string[], callback: (data: YieldPoolInfo[]) => void): Subscription;
-    removeYieldPositionByAddresses(addresses: string[]): import("dexie").PromiseExtended<number>;
-    removeYieldPositionByChains(chains: string[]): import("dexie").PromiseExtended<number>;
-    updateYieldPosition(data: YieldPositionInfo): Promise<void>;
-    updateYieldPositions(data: YieldPositionInfo[]): Promise<void>;
-    getYieldPositionByAddress(addresses: string[]): Promise<YieldPositionInfo[]>;
-    subscribeYieldPosition(addresses: string[], callback: (data: YieldPositionInfo[]) => void): Subscription;
-    getYieldNominationPoolPosition(addresses: string[], chains: string[]): Promise<YieldPositionInfo[]>;
     getAllCampaign(): Promise<import("@subwallet/extension-base/background/KoniTypes").CampaignData[]>;
     subscribeProcessingCampaign(): import("dexie").Observable<import("@subwallet/extension-base/background/KoniTypes").CampaignData[]>;
     getProcessingCampaign(): Promise<import("@subwallet/extension-base/background/KoniTypes").CampaignData[]>;