@subwallet/extension-base 1.0.1 → 1.0.2-1b

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

@@ -1,11 +1,13 @@
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
 import { AssetSetting, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
 import { _ChainConnectionStatus, _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
+import { EventService } from '@subwallet/extension-base/services/event-service';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { BehaviorSubject, Subject } from 'rxjs';
 export declare class ChainService {
     private dataMap;
     private dbService;
+    private eventService;
     private lockChainInfoMap;
     private substrateChainHandler;
     private evmChainHandler;
@@ -18,7 +20,7 @@ export declare class ChainService {
     private assetSettingSubject;
     private logger;
     private refreshChainStateTimeout;
-    constructor(dbService: DatabaseService);
+    constructor(dbService: DatabaseService, eventService: EventService);
     getXcmRefMap(): Record<string, _AssetRef>;
     getEvmApi(slug: string): _EvmApi;
     getEvmApiMap(): Record<string, _EvmApi>;
@@ -50,7 +52,7 @@ export declare class ChainService {
     getChainInfoByKey(key: string): _ChainInfo;
     getActiveChainInfos(): Record<string, _ChainInfo>;
     getAssetBySlug(slug: string): _ChainAsset;
-    getFungibleTokensByChain(chainSlug: string): Record<string, _ChainAsset>;
+    getFungibleTokensByChain(chainSlug: string, checkActive?: boolean): Record<string, _ChainAsset>;
     getXcmEqualAssetByChain(destinationChainSlug: string, originTokenSlug: string): _ChainAsset | undefined;
     getAssetByChainAndType(chainSlug: string, assetTypes: _AssetType[]): Record<string, _ChainAsset>;
     getSmartContractNfts(): _ChainAsset[];
@@ -93,10 +95,10 @@ export declare class ChainService {
     private refreshChainStateInterval;
     private updateApiMapStatus;
     initAssetSettings(): Promise<void>;
-    setAssetSettings(assetSettings: Record<string, AssetSetting>): void;
+    setAssetSettings(assetSettings: Record<string, AssetSetting>, emitEvent?: boolean): void;
     getStoreAssetSettings(): Promise<Record<string, AssetSetting>>;
     getAssetSettings(): Promise<Record<string, AssetSetting>>;
-    updateAssetSetting(assetSlug: string, assetSetting: AssetSetting): Promise<void>;
+    updateAssetSetting(assetSlug: string, assetSetting: AssetSetting): Promise<boolean | undefined>;
     updateAssetSettingByChain(chainSlug: string, visible: boolean): Promise<void>;
     subscribeAssetSettings(): BehaviorSubject<Record<string, AssetSetting>>;
 }

package/services/chain-service/index.js

@@ -21,8 +21,6 @@ export class ChainService {
     assetRegistry: {},
     assetRefMap: {}
   };
-  // to save chain, token settings from user
-
   lockChainInfoMap = false; // prevent unwanted changes (edit, enable, disable) to chainInfoMap
 
   // TODO: consider BehaviorSubject
@@ -35,8 +33,9 @@ export class ChainService {
   // Todo: Update to new store indexed DB
   store = new AssetSettingStore();
   assetSettingSubject = new BehaviorSubject({});
-  constructor(dbService) {
+  constructor(dbService, eventService) {
     this.dbService = dbService;
+    this.eventService = eventService;
     this.substrateChainHandler = new SubstrateChainHandler();
     this.evmChainHandler = new EvmChainHandler();
     this.chainInfoMapSubject.next(this.dataMap.chainInfoMap);
@@ -208,10 +207,13 @@ export class ChainService {
   getAssetBySlug(slug) {
     return this.getAssetRegistry()[slug];
   }
-  getFungibleTokensByChain(chainSlug) {
+  getFungibleTokensByChain(chainSlug, checkActive = false) {
     const result = {};
+    const assetSettings = this.assetSettingSubject.value;
     Object.values(this.getAssetRegistry()).forEach(chainAsset => {
-      if (chainAsset.originChain === chainSlug && _isAssetFungibleToken(chainAsset)) {
+      var _assetSettings$chainA;
+      const _filterActive = !checkActive || ((_assetSettings$chainA = assetSettings[chainAsset.slug]) === null || _assetSettings$chainA === void 0 ? void 0 : _assetSettings$chainA.visible);
+      if (chainAsset.originChain === chainSlug && _isAssetFungibleToken(chainAsset) && _filterActive) {
         result[chainAsset.slug] = chainAsset;
       }
     });
@@ -275,6 +277,7 @@ export class ChainService {
     this.dbService.removeFromChainStore([slug]).catch(console.error);
     this.updateChainSubscription();
     this.lockChainInfoMap = false;
+    this.eventService.emit('chain.updateState', slug);
     return true;
   }
   resetChainInfoMap(excludedChains) {
@@ -308,6 +311,10 @@ export class ChainService {
         token.slug = `${_CUSTOM_PREFIX}${defaultSlug}`;
       }
     }
+    if (token.originChain && _isAssetFungibleToken(token)) {
+      var _this$getChainInfoByK;
+      token.hasValue = !((_this$getChainInfoByK = this.getChainInfoByKey(token.originChain)) !== null && _this$getChainInfoByK !== void 0 && _this$getChainInfoByK.isTestnet);
+    }
     const assetRegistry = this.getAssetRegistry();
     assetRegistry[token.slug] = token;
     this.dbService.updateAssetStore(token).catch(e => this.logger.error(e));
@@ -335,6 +342,9 @@ export class ChainService {
     this.dbService.removeFromBalanceStore(targetAssets).catch(e => this.logger.error(e));
     this.dbService.removeFromAssetStore(targetAssets).catch(e => this.logger.error(e));
     this.assetRegistrySubject.next(assetRegistry);
+    targetAssets.forEach(assetSlug => {
+      this.eventService.emit('asset.updateState', assetSlug);
+    });
   }
 
   // Business logic
@@ -404,6 +414,7 @@ export class ChainService {
       currentProvider: chainStateMap[chainSlug].currentProvider
     }).catch(console.error);
     this.lockChainInfoMap = false;
+    this.eventService.emit('chain.updateState', chainSlug);
     return true;
   }
   enableChain(chainSlug) {
@@ -438,6 +449,7 @@ export class ChainService {
     }).catch(console.error);
     this.updateChainStateMapSubscription();
     this.lockChainInfoMap = false;
+    this.eventService.emit('chain.updateState', chainSlug);
     return true;
   }
   checkExistedPredefinedChain(genesisHash, evmChainId) {
@@ -659,6 +671,8 @@ export class ChainService {
       ...targetChainInfo,
       active: targetChainState.active,
       currentProvider: targetChainState.currentProvider
+    }).then(() => {
+      this.eventService.emit('chain.updateState', chainSlug);
     }).catch(e => this.logger.error(e));
   }
   insertChain(params) {
@@ -743,6 +757,8 @@ export class ChainService {
       active: true,
       currentProvider: params.chainEditInfo.currentProvider,
       ...chainInfo
+    }).then(() => {
+      this.eventService.emit('chain.add', newChainSlug);
     }).catch(e => this.logger.error(e));
     return nativeTokenSlug;
   }
@@ -1086,12 +1102,24 @@ export class ChainService {
           };
         }
       });
-      this.setAssetSettings(assetSettings);
+      this.setAssetSettings(assetSettings, false);
+    }
+    this.eventService.emit('asset.ready', true);
+  }
+  setAssetSettings(assetSettings, emitEvent = true) {
+    const updateAssets = [];
+    if (emitEvent) {
+      Object.keys(assetSettings).forEach(slug => {
+        var _this$assetSettingSub;
+        if (((_this$assetSettingSub = this.assetSettingSubject.value[slug]) === null || _this$assetSettingSub === void 0 ? void 0 : _this$assetSettingSub.visible) !== assetSettings[slug].visible) {
+          updateAssets.push(slug);
+        }
+      });
     }
-    console.log('Done init asset settings');
-  }
-  setAssetSettings(assetSettings) {
     this.assetSettingSubject.next(assetSettings);
+    updateAssets.forEach(slug => {
+      this.eventService.emit('asset.updateState', slug);
+    });
     this.store.set('AssetSetting', assetSettings);
   }
   async getStoreAssetSettings() {
@@ -1108,6 +1136,7 @@ export class ChainService {
   }
   async updateAssetSetting(assetSlug, assetSetting) {
     const currentAssetSettings = await this.getAssetSettings();
+    let needUpdateSubject;
 
     // Update settings
     currentAssetSettings[assetSlug] = assetSetting;
@@ -1119,8 +1148,10 @@ export class ChainService {
       // if chain not enabled, then automatically enable
       if (chainState && !chainState.active) {
         this.enableChain(chainState.slug);
+        needUpdateSubject = true;
       }
     }
+    return needUpdateSubject;
   }
   async updateAssetSettingByChain(chainSlug, visible) {
     const storedAssetSettings = await this.getAssetSettings();

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

@@ -34,6 +34,7 @@ export declare function _getNftTypesSupportedByChain(chainInfo: _ChainInfo): _As
 export declare function _getTokenTypesSupportedByChain(chainInfo: _ChainInfo): _AssetType[];
 export declare function _getChainNativeTokenBasicInfo(chainInfo: _ChainInfo): BasicTokenInfo;
 export declare function _getChainNativeTokenSlug(chainInfo: _ChainInfo): string;
+export declare function _isLocalToken(tokenInfo: _ChainAsset): boolean;
 export declare function _isTokenEvmSmartContract(tokenInfo: _ChainAsset): boolean;
 export declare function _isTokenWasmSmartContract(tokenInfo: _ChainAsset): boolean;
 export declare function _isAssetSmartContractNft(assetInfo: _ChainAsset): boolean;

package/services/chain-service/utils.js

@@ -206,6 +206,9 @@ export function _getChainNativeTokenSlug(chainInfo) {
   }
   return `${chainInfo.slug}-${_AssetType.NATIVE}-${_getChainNativeTokenBasicInfo(chainInfo).symbol}`;
 }
+export function _isLocalToken(tokenInfo) {
+  return tokenInfo.assetType === _AssetType.LOCAL;
+}
 export function _isTokenEvmSmartContract(tokenInfo) {
   return [_AssetType.ERC721, _AssetType.ERC20].includes(tokenInfo.assetType);
 }

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

@@ -0,0 +1,22 @@
+import { EventItem, EventRegistry, EventType } from '@subwallet/extension-base/services/event-service/types';
+import EventEmitter from 'eventemitter3';
+export declare class EventService extends EventEmitter<EventRegistry> {
+    private lazyTime;
+    private timeoutId;
+    private pendingEvents;
+    private lazyEmitter;
+    readonly waitKeyringReady: Promise<boolean>;
+    readonly waitAccountReady: Promise<boolean>;
+    readonly waitChainReady: Promise<boolean>;
+    readonly waitAssetReady: Promise<boolean>;
+    constructor(options?: {
+        lazyTime: number;
+    });
+    private generateWaitPromise;
+    private setLazyTimeout;
+    private emitLazy;
+    onLazy(callback: (events: EventItem<EventType>[], eventTypes: EventType[]) => void): void;
+    offLazy(callback: (events: EventItem<EventType>[], eventTypes: EventType[]) => void): void;
+    onceLazy(callback: (events: EventItem<EventType>[], eventTypes: EventType[]) => void): void;
+    emit<T extends EventType>(eventType: T, ...args: EventEmitter.EventArgs<EventRegistry, T>): boolean;
+}

package/services/event-service/index.js

@@ -0,0 +1,63 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+// Stateless service handle runtime event on background
+
+import EventEmitter from 'eventemitter3';
+export class EventService extends EventEmitter {
+  pendingEvents = [];
+  lazyEmitter = new EventEmitter();
+  constructor(options = {
+    lazyTime: 300
+  }) {
+    super();
+    this.lazyTime = options.lazyTime;
+    this.timeoutId = null;
+    this.waitKeyringReady = this.generateWaitPromise('keyring.ready');
+    this.waitAccountReady = this.generateWaitPromise('account.ready');
+    this.waitChainReady = this.generateWaitPromise('chain.ready');
+    this.waitAssetReady = this.generateWaitPromise('asset.ready');
+  }
+  generateWaitPromise(eventType) {
+    return new Promise(resolve => {
+      this.once(eventType, isReady => {
+        resolve(isReady);
+      });
+    });
+  }
+  setLazyTimeout() {
+    if (this.timeoutId) {
+      clearTimeout(this.timeoutId);
+    }
+    this.timeoutId = setTimeout(() => {
+      this.emitLazy();
+    }, this.lazyTime);
+  }
+  emitLazy() {
+    try {
+      this.lazyEmitter.emit('lazy', this.pendingEvents, this.pendingEvents.map(e => e.type));
+    } catch (e) {
+      console.error('Get error in some listener of lazy event', e);
+    }
+    this.pendingEvents = [];
+    this.timeoutId = null;
+  }
+  onLazy(callback) {
+    this.lazyEmitter.on('lazy', callback);
+  }
+  offLazy(callback) {
+    this.lazyEmitter.off('lazy', callback);
+  }
+  onceLazy(callback) {
+    this.lazyEmitter.once('lazy', callback);
+  }
+  emit(eventType, ...args) {
+    console.debug('Emit event: ', eventType, ...args);
+    this.pendingEvents.push({
+      type: eventType,
+      data: args
+    });
+    this.setLazyTimeout();
+    return super.emit(eventType, ...args);
+  }
+}

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

@@ -0,0 +1,28 @@
+import { CurrentAccountInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { SWTransaction } from '@subwallet/extension-base/services/transaction-service/types';
+export interface EventRegistry {
+    'keyring.ready': [boolean];
+    'account.updateCurrent': [CurrentAccountInfo];
+    'account.ready': [boolean];
+    'account.add': [string];
+    'account.update': [string];
+    'account.remove': [string];
+    'chain.ready': [boolean];
+    'chain.add': [string];
+    'chain.updateState': [string];
+    'asset.ready': [boolean];
+    'asset.updateState': [string];
+    'transaction.done': [SWTransaction];
+    'transaction.failed': [SWTransaction | undefined];
+    'transaction.submitStaking': [string];
+    'transaction.transferNft': [SWTransaction | undefined];
+}
+export declare type EventType = keyof EventRegistry;
+export declare const COMMON_RELOAD_EVENTS: EventType[];
+export interface EventItem<T extends EventType> {
+    type: T;
+    data: EventRegistry[T];
+}
+export interface EventEmitterRegistry extends EventRegistry {
+    lazy: EventItem<EventType>[];
+}

package/services/event-service/types.js

@@ -0,0 +1,4 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+export const COMMON_RELOAD_EVENTS = ['account.updateCurrent', 'asset.updateState', 'account.add', 'chain.updateState', 'account.remove', 'chain.add'];

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

@@ -1,12 +1,14 @@
 import { TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
 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 HistoryService {
     private dbService;
     private chainService;
+    private eventService;
     private historySubject;
-    constructor(dbService: DatabaseService, chainService: ChainService);
+    constructor(dbService: DatabaseService, chainService: ChainService, eventService: EventService);
     private fetchPromise;
     private nextFetch;
     private fetchAndLoadHistories;
@@ -15,8 +17,8 @@ export declare class HistoryService {
     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>[]>>;
-    insertHistory(historyItem: TransactionHistoryItem): Promise<void>;
-    updateHistory(chain: string, extrinsicHash: string, historyItem: Partial<TransactionHistoryItem>): Promise<void>;
+    updateHistories(chain: string, extrinsicHash: string, updateData: Partial<TransactionHistoryItem>): Promise<void>;
+    insertHistories(historyItems: TransactionHistoryItem[]): Promise<void>;
     addHistoryItems(historyItems: TransactionHistoryItem[]): Promise<void>;
     removeHistoryByAddress(address: string): Promise<void>;
 }

package/services/history-service/index.js

@@ -2,25 +2,31 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { CRON_REFRESH_HISTORY_INTERVAL } from '@subwallet/extension-base/constants';
+import { keyring } from '@subwallet/ui-keyring';
 import { accounts } from '@subwallet/ui-keyring/observable/accounts';
 import { BehaviorSubject } from 'rxjs';
 import { fetchMultiChainHistories } from "./subsquid-multi-chain-history.js";
 export class HistoryService {
   historySubject = new BehaviorSubject([]);
-  constructor(dbService, chainService) {
+  constructor(dbService, chainService, eventService) {
     this.dbService = dbService;
     this.chainService = chainService;
-
+    this.eventService = eventService;
     // Load history from database
     this.dbService.getHistories().then(histories => {
       this.historySubject.next(histories);
     }).catch(console.error);
 
-    // Add some delay to avoid fetching many times when start extension background
-    setTimeout(() => {
-      // Create history interval and refresh it if changes accounts list
-      accounts.subject.subscribe(this.refreshHistoryInterval.bind(this));
-    }, 3333);
+    // 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);
   }
   fetchPromise = null;
   nextFetch = undefined;
@@ -43,8 +49,8 @@ export class HistoryService {
       record.fromName = accountMap[(_record$from = record.from) === null || _record$from === void 0 ? void 0 : _record$from.toLowerCase()];
       record.toName = accountMap[(_record$to = record.to) === null || _record$to === void 0 ? void 0 : _record$to.toLowerCase()];
     });
-    await this.dbService.upsertHistory(historyRecords);
-    return await this.dbService.getHistories();
+    await this.addHistoryItems(historyRecords);
+    return historyRecords;
   }
   async fetchHistories(addresses) {
     if (!this.fetchPromise) {
@@ -60,13 +66,16 @@ export class HistoryService {
     clearTimeout(this.nextFetch);
     this.invalidCache();
     this.getHistories().catch(console.error);
-    this.nextFetch = setTimeout(this.refreshHistoryInterval.bind(this), CRON_REFRESH_HISTORY_INTERVAL);
+    this.nextFetch = setTimeout(() => {
+      this.refreshHistoryInterval();
+    }, CRON_REFRESH_HISTORY_INTERVAL);
   }
   async getHistories() {
-    const addressList = Object.keys(accounts.subject.value);
-    if (!this.fetchPromise) {
-      const historyRecords = await this.fetchHistories(addressList);
-      this.historySubject.next(historyRecords);
+    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());
     }
     return this.historySubject.getValue();
   }
@@ -74,11 +83,7 @@ export class HistoryService {
     await this.getHistories();
     return this.historySubject;
   }
-  async insertHistory(historyItem) {
-    await this.dbService.upsertHistory([historyItem]);
-    this.historySubject.next(await this.dbService.getHistories());
-  }
-  async updateHistory(chain, extrinsicHash, historyItem) {
+  async updateHistories(chain, extrinsicHash, updateData) {
     const existedRecords = await this.dbService.getHistories({
       chain,
       extrinsicHash
@@ -86,15 +91,35 @@ export class HistoryService {
     const updatedRecords = existedRecords.map(r => {
       return {
         ...r,
-        ...historyItem
+        ...updateData
       };
     });
     await this.addHistoryItems(updatedRecords);
   }
-  async addHistoryItems(historyItems) {
+
+  // Insert history without check override origin 'app'
+  async insertHistories(historyItems) {
     await this.dbService.upsertHistory(historyItems);
     this.historySubject.next(await this.dbService.getHistories());
   }
+
+  // Insert history with check override origin 'app'
+  async addHistoryItems(historyItems) {
+    // Prevent override record with original is 'app'
+    const appRecords = this.historySubject.value.filter(item => item.origin === 'app');
+    const excludeKeys = appRecords.map(item => {
+      return `${item.chain}-${item.extrinsicHash}`;
+    });
+    const updateRecords = historyItems.filter(item => {
+      const key = `${item.chain}-${item.extrinsicHash}`;
+
+      // !excludeKeys.includes(key) && console.log('Cancel update', key);
+
+      return item.origin === 'app' || !excludeKeys.includes(key);
+    });
+    await this.dbService.upsertHistory(updateRecords);
+    this.historySubject.next(await this.dbService.getHistories());
+  }
   async removeHistoryByAddress(address) {
     await this.dbService.stores.transaction.removeAllByAddress(address);
     this.historySubject.next(await this.dbService.getHistories());

package/services/history-service/subsquid-multi-chain-history.js

@@ -57,11 +57,15 @@ function autoFormatAddress(address) {
     return '';
   }
 }
-function generateSignature({
-  r,
-  s,
-  v
-}) {
+function generateSignature(input) {
+  if (!input) {
+    return '';
+  }
+  const {
+    r,
+    s,
+    v
+  } = input;
   const rHex = r.startsWith('0x') ? r.slice(2) : r;
   const sHex = s.startsWith('0x') ? s.slice(2) : s;
   const vHex = parseInt(v).toString(16);
@@ -108,10 +112,15 @@ export function parseSubsquidTransactionData(address, type, historyItem, chainIn
         to = autoFormatAddress(parsedArgs.to);
         from = autoFormatAddress(parsedArgs.from);
         extrinsicHash = parsedArgs.transactionHash;
-        amount = transaction.value;
+        amount = transaction.value || '0';
         fee = (parseInt(transaction.gasPrice) * parseInt(transaction.gasLimit)).toString();
         signature = generateSignature(transaction.signature);
         success = extrinsic.success;
+
+        // Special fix for moonbeam
+        if ((historyItem.chainId === 'moonbeam' || historyItem.chainId === 'moonriver') && typeof amount === 'object') {
+          amount = amount[0];
+        }
         break;
       }
 
@@ -156,7 +165,7 @@ export function parseSubsquidTransactionData(address, type, historyItem, chainIn
   }
   return {
     address,
-    origin: MULTI_CHAIN_URL,
+    origin: 'subsquid',
     time: toTimestamp(historyItem.timestamp),
     chainType,
     from,
@@ -238,14 +247,14 @@ export async function fetchMultiChainHistories(addresses, chainMap, maxPage = 25
       console.warn(`Not found chain info for chain id: ${chainId}`);
       return;
     }
-    try {
-      usedAddresses.forEach(address => {
+    usedAddresses.forEach(address => {
+      try {
         const transactionData = parseSubsquidTransactionData(address, name, historyItem, chainInfo, parseData(args), parseData(_data));
         histories.push(transactionData);
-      });
-    } catch (e) {
-      console.warn('Parse transaction data failed', e);
-    }
+      } catch (e) {
+        console.warn('Parse transaction data failed', address, e);
+      }
+    });
   });
   return histories;
 }

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

@@ -0,0 +1,19 @@
+import { CurrentAccountInfo, KeyringState } from '@subwallet/extension-base/background/KoniTypes';
+import { EventService } from '@subwallet/extension-base/services/event-service';
+import { SubjectInfo } from '@subwallet/ui-keyring/observable/types';
+import { BehaviorSubject } from 'rxjs';
+export declare class KeyringService {
+    private readonly currentAccountStore;
+    readonly currentAccountSubject: BehaviorSubject<CurrentAccountInfo>;
+    readonly accountsSubject: BehaviorSubject<SubjectInfo>;
+    private beforeAccount;
+    readonly keyringStateSubject: BehaviorSubject<KeyringState>;
+    private eventService;
+    constructor(eventService: EventService);
+    private subscribeAccounts;
+    get keyringState(): KeyringState;
+    updateKeyringState(isReady?: boolean): void;
+    get accounts(): SubjectInfo;
+    get currentAccount(): CurrentAccountInfo;
+    setCurrentAccount(currentAccountData: CurrentAccountInfo): void;
+}

package/services/keyring-service/index.js

@@ -0,0 +1,93 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { CurrentAccountStore } from '@subwallet/extension-base/stores';
+import { keyring } from '@subwallet/ui-keyring';
+import { BehaviorSubject } from 'rxjs';
+export class KeyringService {
+  currentAccountStore = new CurrentAccountStore();
+  currentAccountSubject = new BehaviorSubject({
+    address: '',
+    currentGenesisHash: null
+  });
+  accountsSubject = keyring.accounts.subject;
+  beforeAccount = keyring.accounts.subject.value;
+  keyringStateSubject = new BehaviorSubject({
+    isReady: false,
+    hasMasterPassword: false,
+    isLocked: false
+  });
+  constructor(eventService) {
+    this.eventService = eventService;
+    this.currentAccountStore.get('CurrentAccountInfo', rs => {
+      this.currentAccountSubject.next(rs);
+    });
+    this.subscribeAccounts().catch(console.error);
+  }
+  async subscribeAccounts() {
+    // Wait until account ready
+    await new Promise(resolve => {
+      const onReady = () => {
+        this.eventService.off('account.ready', onReady);
+        resolve(true);
+      };
+      this.eventService.on('account.ready', onReady);
+    });
+    this.beforeAccount = {
+      ...this.accountsSubject.value
+    };
+    this.accountsSubject.subscribe(subjectInfo => {
+      // Check if accounts changed
+      const beforeAddresses = Object.keys(this.beforeAccount);
+      const afterAddresses = Object.keys(subjectInfo);
+      if (beforeAddresses.length > afterAddresses.length) {
+        const removedAddresses = beforeAddresses.filter(address => !afterAddresses.includes(address));
+
+        // Remove account
+        removedAddresses.forEach(address => {
+          console.log('account.remove', address);
+          this.eventService.emit('account.remove', address);
+        });
+      } else if (beforeAddresses.length < afterAddresses.length) {
+        const addedAddresses = afterAddresses.filter(address => !beforeAddresses.includes(address));
+
+        // Add account
+        addedAddresses.forEach(address => {
+          console.log('account.add', address);
+          this.eventService.emit('account.add', address);
+        });
+      } else {
+        // Handle case update later
+      }
+      this.beforeAccount = {
+        ...subjectInfo
+      };
+    });
+  }
+  get keyringState() {
+    return this.keyringStateSubject.value;
+  }
+  updateKeyringState(isReady = true) {
+    var _keyring$keyring, _keyring$keyring2;
+    if (!this.keyringState.isReady && isReady) {
+      this.eventService.emit('keyring.ready', true);
+      this.eventService.emit('account.ready', true);
+    }
+    this.keyringStateSubject.next({
+      hasMasterPassword: !!((_keyring$keyring = keyring.keyring) !== null && _keyring$keyring !== void 0 && _keyring$keyring.hasMasterPassword),
+      isLocked: !!((_keyring$keyring2 = keyring.keyring) !== null && _keyring$keyring2 !== void 0 && _keyring$keyring2.isLocked),
+      isReady: isReady
+    });
+  }
+  get accounts() {
+    return this.accountsSubject.value;
+  }
+  get currentAccount() {
+    return this.currentAccountSubject.value;
+  }
+  setCurrentAccount(currentAccountData) {
+    this.currentAccountSubject.next(currentAccountData);
+    this.eventService.emit('account.updateCurrent', currentAccountData);
+    this.currentAccountStore.set('CurrentAccountInfo', currentAccountData);
+  }
+}