@subwallet/extension-base 1.0.2-3 → 1.0.4-0

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.2-3",
+  "version": "1.0.4-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -495,6 +495,11 @@
       "require": "./cjs/services/balance-service/index.js",
       "default": "./services/balance-service/index.js"
     },
+    "./services/base/types": {
+      "types": "./services/base/types.d.ts",
+      "require": "./cjs/services/base/types.js",
+      "default": "./services/base/types.js"
+    },
     "./services/chain-service": {
       "types": "./services/chain-service/index.d.ts",
       "require": "./cjs/services/chain-service/index.js",
@@ -525,10 +530,10 @@
       "require": "./cjs/services/chain-service/handler/types.js",
       "default": "./services/chain-service/handler/types.js"
     },
-    "./services/chain-service/heath-check": {
-      "types": "./services/chain-service/heath-check/index.d.ts",
-      "require": "./cjs/services/chain-service/heath-check/index.js",
-      "default": "./services/chain-service/heath-check/index.js"
+    "./services/chain-service/health-check": {
+      "types": "./services/chain-service/health-check/index.d.ts",
+      "require": "./cjs/services/chain-service/health-check/index.js",
+      "default": "./services/chain-service/health-check/index.js"
     },
     "./services/chain-service/helper": {
       "types": "./services/chain-service/helper/index.d.ts",
@@ -1595,6 +1600,11 @@
       "require": "./cjs/utils/keyring.js",
       "default": "./utils/keyring.js"
     },
+    "./utils/promise": {
+      "types": "./utils/promise.d.ts",
+      "require": "./cjs/utils/promise.js",
+      "default": "./utils/promise.js"
+    },
     "./utils/request": {
       "types": "./utils/request.d.ts",
       "require": "./cjs/utils/request.js",
@@ -1604,7 +1614,7 @@
   "dependencies": {
     "@acala-network/api": "^4.1.8-2.3",
     "@acala-network/type-definitions": "^4.1.5",
-    "@apollo/client": "^3.7.3",
+    "@apollo/client": "^3.7.14",
     "@babel/runtime": "^7.20.6",
     "@bifrost-finance/type-definitions": "^1.7.2",
     "@crustio/type-definitions": "^1.3.0",
@@ -1639,7 +1649,7 @@
     "@polkadot/hw-ledger": "^10.1.9",
     "@polkadot/keyring": "^10.2.1",
     "@polkadot/networks": "^10.2.1",
-    "@polkadot/phishing": "^0.21.1",
+    "@polkadot/phishing": "^0.21.2",
     "@polkadot/react-identicon": "^2.9.14",
     "@polkadot/react-qr": "^2.9.14",
     "@polkadot/rpc-provider": "^9.10.3",
@@ -1656,11 +1666,11 @@
     "@sora-substrate/type-definitions": "^1.12.4",
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.18",
-    "@subwallet/chain-list": "^0.0.32",
-    "@subwallet/extension-base": "^1.0.2-3",
-    "@subwallet/extension-chains": "^1.0.2-3",
-    "@subwallet/extension-dapp": "^1.0.2-3",
-    "@subwallet/extension-inject": "^1.0.2-3",
+    "@subwallet/chain-list": "^0.1.2",
+    "@subwallet/extension-base": "^1.0.4-0",
+    "@subwallet/extension-chains": "^1.0.4-0",
+    "@subwallet/extension-dapp": "^1.0.4-0",
+    "@subwallet/extension-inject": "^1.0.4-0",
     "@subwallet/keyring": "^0.0.5",
     "@subwallet/ui-keyring": "^0.0.3",
     "@unique-nft/types": "^0.6.0-4",

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.0.2-3'
+  version: '1.0.4-0'
 };

package/services/base/types.d.ts

@@ -0,0 +1,34 @@
+import { PromiseHandler } from '@subwallet/extension-base/utils/promise';
+export declare enum ServiceStatus {
+    NOT_INITIALIZED = "not_initialized",
+    INITIALIZING = "initializing",
+    INITIALIZED = "initialized",
+    STARTED = "started",
+    STARTING = "starting",
+    STOPPED = "stopped",
+    STOPPING = "stopping"
+}
+export interface CoreServiceInterface {
+    status: ServiceStatus;
+    init: () => Promise<void>;
+    startPromiseHandler: PromiseHandler<void>;
+    start: () => Promise<void>;
+    waitForStarted: () => Promise<void>;
+}
+export interface StoppableServiceInterface extends CoreServiceInterface {
+    stopPromiseHandler: PromiseHandler<void>;
+    stop: () => Promise<void>;
+    waitForStopped: () => Promise<void>;
+}
+export interface PersistDataServiceInterface {
+    loadData: () => Promise<void>;
+    persistData: () => Promise<void>;
+}
+export interface SubscribeServiceInterface {
+    subscribe: () => Promise<void>;
+    unsubscribe: () => Promise<void>;
+}
+export interface CronServiceInterface {
+    startCron: () => Promise<void>;
+    stopCron: () => Promise<void>;
+}

package/services/base/types.js

@@ -0,0 +1,15 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+// 'init' | 'started' | 'starting' | 'stopped' | 'stopping'
+
+export let ServiceStatus;
+(function (ServiceStatus) {
+  ServiceStatus["NOT_INITIALIZED"] = "not_initialized";
+  ServiceStatus["INITIALIZING"] = "initializing";
+  ServiceStatus["INITIALIZED"] = "initialized";
+  ServiceStatus["STARTED"] = "started";
+  ServiceStatus["STARTING"] = "starting";
+  ServiceStatus["STOPPED"] = "stopped";
+  ServiceStatus["STOPPING"] = "stopping";
+})(ServiceStatus || (ServiceStatus = {}));

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

@@ -75,3 +75,9 @@ export declare const _XCM_TYPE: {
     PR: string;
 };
 export declare const _DEFAULT_ACTIVE_CHAINS: string[];
+export declare const _CHAIN_INFO_SRC: string;
+export declare const _CHAIN_ASSET_SRC: string;
+export declare const _ASSET_REF_SRC: string;
+export declare const _MULTI_CHAIN_ASSET_SRC: string;
+export declare const _CHAIN_LOGO_MAP_SRC: string;
+export declare const _ASSET_LOGO_MAP_SRC: string;

package/services/chain-service/constants.js

@@ -201,4 +201,13 @@ export const _XCM_TYPE = {
   PR: `${_SubstrateChainType.PARACHAIN}-${_SubstrateChainType.RELAYCHAIN}` // UMP
 };
 
-export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS];
+export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS];
+
+// TODO: review
+const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
+export const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
+export const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;
+export const _ASSET_REF_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;
+export const _MULTI_CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;
+export const _CHAIN_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainLogoMap.json`;
+export const _ASSET_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetLogoMap.json`;

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

@@ -71,6 +71,7 @@ export declare class ChainService {
     enableChains(chainSlugs: string[]): boolean;
     disableChain(chainSlug: string): boolean;
     private checkExistedPredefinedChain;
+    private fetchLatestData;
     private initChains;
     private initAssetRegistry;
     private updateChainStateMapSubscription;
@@ -102,4 +103,6 @@ export declare class ChainService {
     updateAssetSetting(assetSlug: string, assetSetting: AssetSetting): Promise<boolean | undefined>;
     updateAssetSettingByChain(chainSlug: string, visible: boolean): Promise<void>;
     subscribeAssetSettings(): BehaviorSubject<Record<string, AssetSetting>>;
+    getChainLogoMap(): Promise<Record<string, string>>;
+    getAssetLogoMap(): Promise<Record<string, string>>;
 }

package/services/chain-service/index.js

@@ -1,9 +1,9 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AssetRefMap, ChainAssetMap, ChainInfoMap, MultiChainAssetMap } from '@subwallet/chain-list';
+import { AssetLogoMap, AssetRefMap, ChainAssetMap, ChainInfoMap, ChainLogoMap, MultiChainAssetMap } from '@subwallet/chain-list';
 import { _AssetRefPath, _AssetType, _ChainStatus, _SubstrateChainType } from '@subwallet/chain-list/types';
-import { _DEFAULT_ACTIVE_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
+import { _ASSET_LOGO_MAP_SRC, _ASSET_REF_SRC, _CHAIN_ASSET_SRC, _CHAIN_INFO_SRC, _CHAIN_LOGO_MAP_SRC, _DEFAULT_ACTIVE_CHAINS, _MULTI_CHAIN_ASSET_SRC } from '@subwallet/extension-base/services/chain-service/constants';
 import { EvmChainHandler } from '@subwallet/extension-base/services/chain-service/handler/EvmChainHandler';
 import { SubstrateChainHandler } from '@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
@@ -40,7 +40,6 @@ export class ChainService {
     this.chainInfoMapSubject.next(this.dataMap.chainInfoMap);
     this.chainStateMapSubject.next(this.dataMap.chainStateMap);
     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
-    this.multiChainAssetMapSubject.next(MultiChainAssetMap);
     this.xcmRefMapSubject.next(this.getXcmRefMap());
     this.logger = createLogger('chain-service');
     this.refreshChainStateInterval(3000, 6);
@@ -149,7 +148,8 @@ export class ChainService {
       priceId: '',
       slug: '',
       symbol: '',
-      hasValue: true
+      hasValue: true,
+      icon: ''
     };
     for (const assetInfo of Object.values(this.getAssetRegistry())) {
       if (assetInfo.assetType === _AssetType.NATIVE && assetInfo.originChain === chainSlug) {
@@ -349,7 +349,9 @@ export class ChainService {
   // Business logic
   async init() {
     // TODO: reconsider the flow of initiation
-    this.dataMap.assetRefMap = AssetRefMap;
+    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;
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.chainStateMapSubject.next(this.getChainStateMap());
@@ -451,16 +453,16 @@ export class ChainService {
     this.eventService.emit('chain.updateState', chainSlug);
     return true;
   }
-  checkExistedPredefinedChain(genesisHash, evmChainId) {
+  checkExistedPredefinedChain(latestChainInfoMap, genesisHash, evmChainId) {
     let duplicatedSlug = '';
     if (genesisHash) {
-      Object.values(ChainInfoMap).forEach(chainInfo => {
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         if (chainInfo.substrateInfo && chainInfo.substrateInfo.genesisHash === genesisHash) {
           duplicatedSlug = chainInfo.slug;
         }
       });
     } else if (evmChainId) {
-      Object.values(ChainInfoMap).forEach(chainInfo => {
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         if (chainInfo.evmInfo && chainInfo.evmInfo.evmChainId === evmChainId) {
           duplicatedSlug = chainInfo.slug;
         }
@@ -468,8 +470,35 @@ export class ChainService {
     }
     return duplicatedSlug;
   }
+  async fetchLatestData(src, defaultValue) {
+    try {
+      const timeout = await new Promise(resolve => {
+        const id = setTimeout(() => {
+          clearTimeout(id);
+          resolve(null);
+        }, 1000);
+      });
+      let result = defaultValue;
+      const resp = (await Promise.race([timeout, fetch(src)])) || null;
+      if (!resp) {
+        return result;
+      }
+      if (resp.ok) {
+        try {
+          result = await resp.json();
+        } catch (err) {
+          console.warn('Error parsing latest data', src, err);
+        }
+      }
+      return result;
+    } catch (e) {
+      console.warn('Error fetching latest data', src, e);
+      return defaultValue;
+    }
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
+    const latestChainInfoMap = await this.fetchLatestData(_CHAIN_INFO_SRC, ChainInfoMap);
     const storedChainSettingMap = {};
     storedChainSettings.forEach(chainStoredSetting => {
       storedChainSettingMap[chainStoredSetting.slug] = chainStoredSetting;
@@ -478,8 +507,8 @@ export class ChainService {
     const deprecatedChains = [];
     const deprecatedChainMap = {};
     if (storedChainSettings.length === 0) {
-      this.dataMap.chainInfoMap = ChainInfoMap;
-      Object.values(ChainInfoMap).forEach(chainInfo => {
+      this.dataMap.chainInfoMap = latestChainInfoMap;
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         this.dataMap.chainStateMap[chainInfo.slug] = {
           currentProvider: Object.keys(chainInfo.providers)[0],
           slug: chainInfo.slug,
@@ -495,10 +524,10 @@ export class ChainService {
         });
       });
     } else {
-      const mergedChainInfoMap = ChainInfoMap;
+      const mergedChainInfoMap = latestChainInfoMap;
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
-        if (storedSlug in ChainInfoMap) {
-          // check predefined chains first, update providers and currentProvider
+        if (storedSlug in latestChainInfoMap) {
+          // check predefined chains first, keep setting for providers and currentProvider
           mergedChainInfoMap[storedSlug].providers = {
             ...storedChainInfo.providers,
             ...mergedChainInfoMap[storedSlug].providers
@@ -518,7 +547,7 @@ export class ChainService {
           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((_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(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);
           if (duplicatedDefaultSlug.length > 0) {
             // merge custom chain with existed chain
             mergedChainInfoMap[duplicatedDefaultSlug].providers = {
@@ -546,7 +575,8 @@ export class ChainService {
               evmInfo: storedChainInfo.evmInfo,
               substrateInfo: storedChainInfo.substrateInfo,
               isTestnet: storedChainInfo.isTestnet,
-              chainStatus: storedChainInfo.chainStatus
+              chainStatus: storedChainInfo.chainStatus,
+              icon: storedChainInfo.icon
             };
             this.dataMap.chainStateMap[storedSlug] = {
               currentProvider: storedChainInfo.currentProvider,
@@ -587,10 +617,11 @@ export class ChainService {
   }
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
+    const latestAssetRegistry = await this.fetchLatestData(_CHAIN_ASSET_SRC, ChainAssetMap);
     if (storedAssetRegistry.length === 0) {
-      this.dataMap.assetRegistry = ChainAssetMap;
+      this.dataMap.assetRegistry = latestAssetRegistry;
     } else {
-      const mergedAssetRegistry = ChainAssetMap;
+      const mergedAssetRegistry = latestAssetRegistry;
       const parsedStoredAssetRegistry = {};
       const deprecatedAssets = [];
 
@@ -612,7 +643,7 @@ export class ChainService {
       });
       for (const assetInfo of Object.values(parsedStoredAssetRegistry)) {
         let duplicated = false;
-        for (const defaultChainAsset of Object.values(ChainAssetMap)) {
+        for (const defaultChainAsset of Object.values(latestAssetRegistry)) {
           // case merge custom asset with default asset
           if (_isEqualSmartContractAsset(assetInfo, defaultChainAsset)) {
             duplicated = true;
@@ -717,7 +748,8 @@ export class ChainService {
       substrateInfo,
       evmInfo,
       isTestnet: false,
-      chainStatus: _ChainStatus.ACTIVE
+      chainStatus: _ChainStatus.ACTIVE,
+      icon: '' // Todo: Allow update with custom chain
     };
 
     // insert new chainInfo
@@ -745,7 +777,8 @@ export class ChainService {
       priceId: params.chainEditInfo.priceId || null,
       slug: '',
       symbol: params.chainEditInfo.symbol,
-      hasValue: true
+      hasValue: true,
+      icon: ''
     });
 
     // update subscription
@@ -1181,4 +1214,10 @@ export class ChainService {
   subscribeAssetSettings() {
     return this.assetSettingSubject;
   }
+  async getChainLogoMap() {
+    return await this.fetchLatestData(_CHAIN_LOGO_MAP_SRC, ChainLogoMap);
+  }
+  async getAssetLogoMap() {
+    return await this.fetchLatestData(_ASSET_LOGO_MAP_SRC, AssetLogoMap);
+  }
 }

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

@@ -1,10 +1,11 @@
 import { TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
+import { CronServiceInterface, PersistDataServiceInterface, ServiceStatus, StoppableServiceInterface } from '@subwallet/extension-base/services/base/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { EventService } from '@subwallet/extension-base/services/event-service';
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { BehaviorSubject } from 'rxjs';
-export declare class HistoryService {
+export declare class HistoryService implements StoppableServiceInterface, PersistDataServiceInterface, CronServiceInterface {
     private dbService;
     private chainService;
     private eventService;
@@ -12,15 +13,33 @@ export declare class HistoryService {
     private historySubject;
     constructor(dbService: DatabaseService, chainService: ChainService, eventService: EventService, keyringService: KeyringService);
     private fetchPromise;
-    private nextFetch;
+    private interval;
     private fetchAndLoadHistories;
-    fetchHistories(addresses: string[]): Promise<TransactionHistoryItem<import("@subwallet/extension-base/background/KoniTypes").ExtrinsicType.TRANSFER_BALANCE>[]>;
-    invalidCache(): void;
-    refreshHistoryInterval(): void;
     getHistories(): Promise<TransactionHistoryItem<import("@subwallet/extension-base/background/KoniTypes").ExtrinsicType.TRANSFER_BALANCE>[]>;
     getHistorySubject(): Promise<BehaviorSubject<TransactionHistoryItem<import("@subwallet/extension-base/background/KoniTypes").ExtrinsicType.TRANSFER_BALANCE>[]>>;
     updateHistories(chain: string, extrinsicHash: string, updateData: Partial<TransactionHistoryItem>): Promise<void>;
+    updateHistoryByExtrinsicHash(extrinsicHash: string, updateData: Partial<TransactionHistoryItem>): Promise<void>;
     insertHistories(historyItems: TransactionHistoryItem[]): Promise<void>;
     addHistoryItems(historyItems: TransactionHistoryItem[]): Promise<void>;
     removeHistoryByAddress(address: string): Promise<void>;
+    status: ServiceStatus;
+    loadData(): Promise<void>;
+    persistData(): Promise<void>;
+    startCron(): Promise<void>;
+    stopCron(): Promise<void>;
+    startPromiseHandler: {
+        resolve: (value: void) => void;
+        reject: (reason?: unknown) => void;
+        promise: Promise<void>;
+    };
+    init(): Promise<void>;
+    start(): Promise<void>;
+    waitForStarted(): Promise<void>;
+    stopPromiseHandler: {
+        resolve: (value: void) => void;
+        reject: (reason?: unknown) => void;
+        promise: Promise<void>;
+    };
+    stop(): Promise<void>;
+    waitForStopped(): Promise<void>;
 }

package/services/history-service/index.js

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { CRON_REFRESH_HISTORY_INTERVAL } from '@subwallet/extension-base/constants';
+import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
+import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { keyring } from '@subwallet/ui-keyring';
 import { BehaviorSubject } from 'rxjs';
 import { fetchMultiChainHistories } from "./subsquid-multi-chain-history.js";
@@ -12,24 +14,10 @@ export class HistoryService {
     this.chainService = chainService;
     this.eventService = eventService;
     this.keyringService = keyringService;
-    // Load history from database
-    this.dbService.getHistories().then(histories => {
-      this.historySubject.next(histories);
-    }).catch(console.error);
-
-    // Wait for keyring and chain ready and start
-    Promise.all([this.eventService.waitKeyringReady, this.eventService.waitChainReady]).then(() => {
-      this.getHistories().catch(console.log);
-      this.eventService.on('account.add', () => {
-        this.refreshHistoryInterval();
-      });
-      this.eventService.on('account.remove', address => {
-        this.removeHistoryByAddress(address).catch(console.error);
-      });
-    }).catch(console.error);
+    this.init().catch(console.error);
   }
   fetchPromise = null;
-  nextFetch = undefined;
+  interval = undefined;
   async fetchAndLoadHistories(addresses) {
     if (!addresses || addresses.length === 0) {
       return [];
@@ -52,32 +40,16 @@ export class HistoryService {
     await this.addHistoryItems(historyRecords);
     return historyRecords;
   }
-  async fetchHistories(addresses) {
-    if (!this.fetchPromise) {
-      // Fetch another histories data data indexer and merge it with stored in database
-      this.fetchPromise = this.fetchAndLoadHistories(addresses);
-    }
-    return this.fetchPromise;
-  }
-  invalidCache() {
-    this.fetchPromise = null;
-  }
-  refreshHistoryInterval() {
-    clearTimeout(this.nextFetch);
-    this.invalidCache();
-    this.getHistories().catch(console.error);
-    this.nextFetch = setTimeout(() => {
-      this.refreshHistoryInterval();
-    }, CRON_REFRESH_HISTORY_INTERVAL);
-  }
   async getHistories() {
     const addressList = keyring.getAccounts().map(a => a.address);
-    const currentHistories = this.historySubject.value;
-    if (!this.fetchPromise || currentHistories.length === 0) {
-      await this.fetchHistories(addressList);
-      this.historySubject.next(await this.dbService.getHistories());
+    if (!this.fetchPromise) {
+      this.fetchPromise = (async () => {
+        await this.fetchAndLoadHistories(addressList);
+        const histories = await this.dbService.getHistories();
+        this.historySubject.next(histories);
+      })();
     }
-    return this.historySubject.getValue();
+    return Promise.resolve(this.historySubject.getValue());
   }
   async getHistorySubject() {
     await this.getHistories();
@@ -96,6 +68,10 @@ export class HistoryService {
     });
     await this.addHistoryItems(updatedRecords);
   }
+  async updateHistoryByExtrinsicHash(extrinsicHash, updateData) {
+    await this.dbService.updateHistoryByNewExtrinsicHash(extrinsicHash, updateData);
+    this.historySubject.next(await this.dbService.getHistories());
+  }
 
   // Insert history without check override origin 'app'
   async insertHistories(historyItems) {
@@ -124,4 +100,73 @@ export class HistoryService {
     await this.dbService.stores.transaction.removeAllByAddress(address);
     this.historySubject.next(await this.dbService.getHistories());
   }
+  status = ServiceStatus.NOT_INITIALIZED;
+  async loadData() {
+    const histories = await this.dbService.getHistories();
+    this.historySubject.next(histories);
+  }
+  async persistData() {
+    await this.dbService.upsertHistory(this.historySubject.value);
+  }
+  async startCron() {
+    await this.getHistories();
+    this.interval = setInterval(() => {
+      this.getHistories().catch(console.error);
+    }, CRON_REFRESH_HISTORY_INTERVAL);
+  }
+  stopCron() {
+    clearTimeout(this.interval);
+    this.fetchPromise = null;
+    return Promise.resolve();
+  }
+  startPromiseHandler = createPromiseHandler();
+  async init() {
+    this.status = ServiceStatus.INITIALIZING;
+    await this.loadData();
+    Promise.all([this.eventService.waitKeyringReady, this.eventService.waitChainReady]).then(() => {
+      this.getHistories().catch(console.log);
+      this.eventService.on('account.add', () => {
+        (async () => {
+          await this.stopCron();
+          await this.startCron();
+        })().catch(console.error);
+      });
+      this.eventService.on('account.remove', address => {
+        this.removeHistoryByAddress(address).catch(console.error);
+      });
+    }).catch(console.error);
+    this.status = ServiceStatus.INITIALIZED;
+  }
+  async start() {
+    try {
+      console.debug('Start history service');
+      this.startPromiseHandler = createPromiseHandler();
+      this.status = ServiceStatus.STARTING;
+      await this.startCron();
+      this.status = ServiceStatus.STARTED;
+      this.startPromiseHandler.resolve();
+    } catch (e) {
+      this.startPromiseHandler.reject(e);
+    }
+  }
+  waitForStarted() {
+    return this.startPromiseHandler.promise;
+  }
+  stopPromiseHandler = createPromiseHandler();
+  async stop() {
+    console.debug('Stop history service');
+    try {
+      this.stopPromiseHandler = createPromiseHandler();
+      this.status = ServiceStatus.STOPPING;
+      await this.persistData();
+      await this.stopCron();
+      this.stopPromiseHandler.resolve();
+      this.status = ServiceStatus.STOPPED;
+    } catch (e) {
+      this.stopPromiseHandler.reject(e);
+    }
+  }
+  waitForStopped() {
+    return this.stopPromiseHandler.promise;
+  }
 }

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

@@ -25,7 +25,8 @@ export default class MigrateImportedToken extends BaseMigrationJob {
                   originChain: item.chain,
                   priceId: null,
                   slug: '',
-                  symbol: item.symbol || ''
+                  symbol: item.symbol || '',
+                  icon: ''
                 });
               } catch (e) {
                 console.log(e);

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

@@ -1,9 +1,11 @@
 import { PriceJson } from '@subwallet/extension-base/background/KoniTypes';
+import { CronServiceInterface, PersistDataServiceInterface, ServiceStatus, StoppableServiceInterface } from '@subwallet/extension-base/services/base/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { EventService } from '@subwallet/extension-base/services/event-service';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { BehaviorSubject } from 'rxjs';
-export declare class PriceService {
+export declare class PriceService implements StoppableServiceInterface, PersistDataServiceInterface, CronServiceInterface {
+    status: ServiceStatus;
     private dbService;
     private eventService;
     private chainService;
@@ -15,4 +17,23 @@ export declare class PriceService {
     getPriceSubject(): BehaviorSubject<PriceJson>;
     getPriceIds(): Set<string>;
     refreshPriceData(priceIds?: Set<string>): void;
+    init(): Promise<void>;
+    loadData(): Promise<void>;
+    persistData(): Promise<void>;
+    startPromiseHandler: {
+        resolve: (value: void) => void;
+        reject: (reason?: unknown) => void;
+        promise: Promise<void>;
+    };
+    start(): Promise<void>;
+    startCron(): Promise<void>;
+    stopPromiseHandler: {
+        resolve: (value: void) => void;
+        reject: (reason?: unknown) => void;
+        promise: Promise<void>;
+    };
+    stop(): Promise<void>;
+    stopCron(): Promise<void>;
+    waitForStarted(): Promise<void>;
+    waitForStopped(): Promise<void>;
 }