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

package/cjs/koni/background/handlers/State.js

@@ -15,15 +15,18 @@ var _balanceService = require("@subwallet/extension-base/services/balance-servic
 var _chainService = require("@subwallet/extension-base/services/chain-service");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _eventService = require("@subwallet/extension-base/services/event-service");
 var _historyService = require("@subwallet/extension-base/services/history-service");
+var _keyringService = require("@subwallet/extension-base/services/keyring-service");
 var _migrationService = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service"));
 var _NotificationService = _interopRequireDefault(require("@subwallet/extension-base/services/notification-service/NotificationService"));
 var _priceService = require("@subwallet/extension-base/services/price-service");
 var _requestService = _interopRequireDefault(require("@subwallet/extension-base/services/request-service"));
 var _SettingService = _interopRequireDefault(require("@subwallet/extension-base/services/setting-service/SettingService"));
 var _DatabaseService = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/DatabaseService"));
+var _subscanService = require("@subwallet/extension-base/services/subscan-service");
+var _subscanChainMap = require("@subwallet/extension-base/services/subscan-service/subscan-chain-map");
 var _transactionService = _interopRequireDefault(require("@subwallet/extension-base/services/transaction-service"));
-var _stores = require("@subwallet/extension-base/stores");
 var _AccountRef = _interopRequireDefault(require("@subwallet/extension-base/stores/AccountRef"));
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _decode = require("@subwallet/keyring/pair/decode");
@@ -62,16 +65,8 @@ const generateDefaultCrowdloanMap = () => {
 class KoniState {
   injectedProviders = new Map();
   unsubscriptionMap = {};
-  currentAccountStore = new _stores.CurrentAccountStore();
   accountRefStore = new _AccountRef.default();
-  keyringStateSubject = new _rxjs.Subject();
   externalRequest = {};
-  keyringState = {
-    isReady: false,
-    isLocked: true,
-    hasMasterPassword: false
-  };
-  serviceInfoSubject = new _rxjs.Subject();
   balanceMap = {};
   balanceSubject = new _rxjs.Subject();
   crowdloanMap = generateDefaultCrowdloanMap();
@@ -88,19 +83,21 @@ class KoniState {
   };
   lazyMap = {};
   ready = false;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   constructor() {
     let providers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     this.providers = providers;
     this.dbService = new _DatabaseService.default();
+    this.eventService = new _eventService.EventService();
+    this.subscanService = new _subscanService.SubscanService();
+    this.keyringService = new _keyringService.KeyringService(this.eventService);
     this.notificationService = new _NotificationService.default();
-    this.chainService = new _chainService.ChainService(this.dbService);
+    this.chainService = new _chainService.ChainService(this.dbService, this.eventService);
     this.settingService = new _SettingService.default();
     this.requestService = new _requestService.default(this.chainService, this.settingService);
-    this.priceService = new _priceService.PriceService(this.serviceInfoSubject, this.dbService, this.chainService);
+    this.priceService = new _priceService.PriceService(this.dbService, this.eventService, this.chainService);
     this.balanceService = new _balanceService.BalanceService(this.chainService);
-    this.historyService = new _historyService.HistoryService(this.dbService, this.chainService);
-    this.transactionService = new _transactionService.default(this.chainService, this.requestService, this.balanceService, this.historyService, this.notificationService, this.dbService);
+    this.historyService = new _historyService.HistoryService(this.dbService, this.chainService, this.eventService);
+    this.transactionService = new _transactionService.default(this.chainService, this.eventService, this.requestService, this.balanceService, this.historyService, this.notificationService, this.dbService);
     this.migrationService = new _migrationService.default(this);
     this.subscription = new _subscription.KoniSubscription(this, this.dbService);
     this.cron = new _cron.KoniCron(this, this.subscription, this.dbService);
@@ -208,8 +205,10 @@ class KoniState {
     await this.chainService.init();
     await this.migrationService.run();
     this.startSubscription();
-    this.updateServiceInfo();
+    this.eventService.emit('chain.ready', true);
     this.onReady();
+    this.onAccountAdd();
+    this.onAccountRemove();
     this.logger.log('Done init state');
   }
   startSubscription() {
@@ -229,15 +228,10 @@ class KoniState {
   isReady() {
     return this.ready;
   }
-  getKeyringState() {
-    return this.keyringState;
-  }
-  subscribeKeyringState() {
-    return this.keyringStateSubject;
-  }
-  setKeyringState(data, callback) {
-    this.keyringStateSubject.next(data);
-    this.keyringState = data;
+  updateKeyringState() {
+    let isReady = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+    let callback = arguments.length > 1 ? arguments[1] : undefined;
+    this.keyringService.updateKeyringState(isReady);
     callback && callback();
   }
   lazyNext = (key, callback) => {
@@ -296,7 +290,7 @@ class KoniState {
     return this.dbService.getNominatorMetadata();
   }
   async getStaking() {
-    const addresses = await this.getDecodedAddresses();
+    const addresses = this.getDecodedAddresses();
     const stakings = await this.dbService.getStakings(addresses, this.activeChainSlugs);
     return {
       ready: true,
@@ -314,7 +308,7 @@ class KoniState {
     return addresses;
   }
   async getPooledStakingRecordsByAddress(addresses) {
-    return await this.dbService.getPooledStakings(addresses, this.activeChainSlugs);
+    return this.dbService.getPooledStakings(addresses, this.activeChainSlugs);
   }
 
   // TODO: delete later
@@ -355,12 +349,12 @@ class KoniState {
   subscribeNftCollection() {
     return this.dbService.stores.nftCollection.subscribeNftCollection(this.activeChainSlugs);
   }
-  async resetNft(newAddress) {
+  resetNft(newAddress) {
     this.getNft().then(data => this.nftSubject.next(data || {
       nftList: [],
       total: 0
     })).catch(e => this.logger.warn(e));
-    const addresses = await this.getDecodedAddresses(newAddress);
+    const addresses = this.getDecodedAddresses(newAddress);
     this.dbService.subscribeNft(addresses, this.activeChainSlugs, nfts => {
       this.nftSubject.next({
         nftList: nfts,
@@ -372,14 +366,14 @@ class KoniState {
     this.dbService.addNft(address, nftData).catch(e => this.logger.warn(e));
     callback && callback(nftData);
   }
-  removeNfts(chain, address, collectionId, nftIds) {
-    return this.dbService.removeNfts(chain, address, collectionId, nftIds);
-  }
   deleteNftCollection(chain, collectionId) {
     return this.dbService.deleteNftCollection(chain, collectionId);
   }
+  cleanUpNfts(chain, owner, collectionId, nftIds) {
+    this.dbService.cleanUpNft(chain, owner, collectionId, nftIds).catch(e => this.logger.warn(e));
+  }
   async getNft() {
-    const addresses = await this.getDecodedAddresses();
+    const addresses = this.getDecodedAddresses();
     if (!addresses.length) {
       return;
     }
@@ -453,9 +447,6 @@ class KoniState {
   subscribeStakingReward() {
     return this.stakingRewardSubject;
   }
-  getCurrentAccount(update) {
-    this.currentAccountStore.get('CurrentAccountInfo', update);
-  }
   setCurrentAccount(data, callback) {
     const {
       address,
@@ -465,9 +456,9 @@ class KoniState {
       ...data
     };
     if (address === _constants.ALL_ACCOUNT_KEY) {
-      const pairs = _uiKeyring.keyring.getPairs();
+      const pairs = _uiKeyring.keyring.getAccounts();
       const pair = pairs[0];
-      const pairGenesisHash = pair.meta.genesisHash;
+      const pairGenesisHash = (pair === null || pair === void 0 ? void 0 : pair.meta.genesisHash) || '';
       if (pairs.length > 1 || !pair) {
         result.allGenesisHash = currentGenesisHash || undefined;
       } else {
@@ -476,10 +467,8 @@ class KoniState {
         result.allGenesisHash = pairGenesisHash || undefined;
       }
     }
-    this.currentAccountStore.set('CurrentAccountInfo', result, () => {
-      this.updateServiceInfo();
-      callback && callback();
-    });
+    this.keyringService.setCurrentAccount(result);
+    callback && callback();
   }
   setAccountTie(address, genesisHash) {
     if (address !== _constants.ALL_ACCOUNT_KEY) {
@@ -490,12 +479,11 @@ class KoniState {
         genesisHash
       });
     }
-    this.getCurrentAccount(accountInfo => {
-      if (address === accountInfo.address) {
-        accountInfo.currentGenesisHash = genesisHash || _constants.ALL_GENESIS_HASH;
-        this.setCurrentAccount(accountInfo);
-      }
-    });
+    const accountInfo = this.keyringService.currentAccount;
+    if (address === accountInfo.address) {
+      accountInfo.currentGenesisHash = genesisHash || _constants.ALL_GENESIS_HASH;
+      this.setCurrentAccount(accountInfo);
+    }
     return true;
   }
   async switchEvmNetworkByUrl(shortenUrl, networkKey) {
@@ -518,9 +506,7 @@ class KoniState {
     const {
       address,
       currentGenesisHash
-    } = await new Promise(resolve => {
-      this.getCurrentAccount(resolve);
-    });
+    } = this.keyringService.currentAccount;
     return this.requestService.addConfirmation(id, url, 'switchNetworkRequest', {
       networkKey,
       address: changeAddress
@@ -638,35 +624,28 @@ class KoniState {
   subscribeSettingsSubject() {
     return this.settingService.getSubject();
   }
-  subscribeCurrentAccount() {
-    return this.currentAccountStore.getSubject();
-  }
   getAccountAddress() {
-    return new Promise((resolve, reject) => {
-      this.getCurrentAccount(account => {
-        if (account) {
-          resolve(account.address);
-        } else {
-          resolve(null);
-        }
-      });
-    });
+    const address = this.keyringService.currentAccount.address;
+    if (address === '') {
+      return null;
+    }
+    return address;
   }
-  async getDecodedAddresses(address) {
+  getDecodedAddresses(address) {
     let checkingAddress = address;
     if (!address) {
-      checkingAddress = await this.getAccountAddress();
+      checkingAddress = this.getAccountAddress();
     }
     if (!checkingAddress) {
       return [];
     }
     if (checkingAddress === _constants.ALL_ACCOUNT_KEY) {
-      return Object.keys(_accounts.accounts.subject.value);
+      return this.getAllAddresses();
     }
     return [checkingAddress];
   }
   getAllAddresses() {
-    return Object.keys(_accounts.accounts.subject.value);
+    return _uiKeyring.keyring.getAccounts().map(account => account.address);
   }
   removeInactiveChainBalances(balanceMap) {
     const activeBalanceMap = {};
@@ -693,7 +672,7 @@ class KoniState {
     const items = await this.dbService.stores.balance.getBalanceMapByAddress(address);
     return items || {};
   }
-  async switchAccount(newAddress) {
+  async handleSwitchAccount(newAddress) {
     await Promise.all([this.resetBalanceMap(newAddress), this.resetCrowdloanMap(newAddress)]);
   }
   async resetBalanceMap(newAddress) {
@@ -715,11 +694,11 @@ class KoniState {
     };
     this.publishCrowdloan(true);
   }
-  async resetStaking(newAddress) {
+  resetStaking(newAddress) {
     this.getStaking().then(data => {
       this.stakingSubject.next(data);
     }).catch(e => this.logger.warn(e));
-    const addresses = await this.getDecodedAddresses(newAddress);
+    const addresses = this.getDecodedAddresses(newAddress);
     this.dbService.subscribeStaking(addresses, this.activeChainSlugs, stakings => {
       this.stakingSubject.next({
         ready: true,
@@ -738,9 +717,8 @@ class KoniState {
     });
   }
   updateBalanceStore(item) {
-    this.getCurrentAccount(currentAccountInfo => {
-      this.dbService.updateBalanceStore(currentAccountInfo.address, item).catch(e => this.logger.warn(e));
-    });
+    const currentAccountInfo = this.keyringService.currentAccount;
+    this.dbService.updateBalanceStore(currentAccountInfo.address, item).catch(e => this.logger.warn(e));
   }
   subscribeBalance() {
     return this.balanceSubject;
@@ -769,16 +747,12 @@ class KoniState {
     });
   }
   updateCrowdloanStore(networkKey, item) {
-    this.getCurrentAccount(currentAccountInfo => {
-      this.dbService.updateCrowdloanStore(networkKey, currentAccountInfo.address, item).catch(e => this.logger.warn(e));
-    });
+    const currentAccountInfo = this.keyringService.currentAccount;
+    this.dbService.updateCrowdloanStore(networkKey, currentAccountInfo.address, item).catch(e => this.logger.warn(e));
   }
   subscribeCrowdloan() {
     return this.crowdloanSubject;
   }
-  getAllPriceIds() {
-    return this.chainService.getAllPriceIds();
-  }
   getSmartContractNfts() {
     return this.chainService.getSmartContractNfts();
   }
@@ -836,12 +810,13 @@ class KoniState {
       await this.chainService.updateAssetSetting(tokenSlug, {
         visible: true
       });
+      this.eventService.emit('asset.updateState', tokenSlug);
+    } else {
+      this.eventService.emit('asset.updateState', tokenSlug);
     }
-    this.updateServiceInfo();
   }
   deleteCustomAssets(targetTokens) {
     this.chainService.deleteCustomAssets(targetTokens);
-    this.updateServiceInfo();
   }
   async validateCustomChain(provider, existedChainSlug) {
     return await this.chainService.validateCustomChain(provider, existedChainSlug);
@@ -864,14 +839,12 @@ class KoniState {
       await this.chainService.updateAssetSetting(newNativeTokenSlug, {
         visible: true
       });
+      this.eventService.emit('asset.updateState', newNativeTokenSlug);
     }
-    this.updateServiceInfo();
     return true;
   }
   removeCustomChain(networkKey) {
-    const result = this.chainService.removeCustomChain(networkKey);
-    this.updateServiceInfo();
-    return result;
+    return this.chainService.removeCustomChain(networkKey);
   }
 
   // TODO: avoids turning off chains related to ledger account
@@ -897,30 +870,19 @@ class KoniState {
   async disableChain(chainSlug) {
     // const defaultChains = this.getDefaultNetworkKeys();
     await this.chainService.updateAssetSettingByChain(chainSlug, false);
-    const result = this.chainService.disableChain(chainSlug);
-    this.updateServiceInfo();
-    return result;
+    return this.chainService.disableChain(chainSlug);
   }
   async enableChain(chainSlug) {
     let enableTokens = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     if (enableTokens) {
       await this.chainService.updateAssetSettingByChain(chainSlug, true);
     }
-    const result = this.chainService.enableChain(chainSlug);
-    this.updateServiceInfo();
-    return result;
+    return this.chainService.enableChain(chainSlug);
   }
   resetDefaultChains() {
     const defaultChains = this.getDefaultNetworkKeys();
     return this.chainService.resetChainInfoMap(defaultChains);
   }
-  updateNetworkStatus(networkKey, status) {
-    const chainState = this.chainService.getChainStateByKey(networkKey);
-    if (chainState.connectionStatus === status) {
-      return;
-    }
-    this.chainService.setChainConnectionStatus(networkKey, status);
-  }
   getSubstrateApiMap() {
     return this.chainService.getSubstrateApiMap();
   }
@@ -946,20 +908,14 @@ class KoniState {
   refreshWeb3Api(key) {
     this.chainService.refreshEvmApi(key);
   }
-  subscribeServiceInfo() {
-    return this.serviceInfoSubject;
-  }
-  updateServiceInfo() {
-    this.logger.log('<---Update serviceInfo--->');
-    this.getCurrentAccount(value => {
-      this.serviceInfoSubject.next({
-        chainInfoMap: this.chainService.getChainInfoMap(),
-        chainApiMap: this.getApiMap(),
-        currentAccountInfo: value,
-        assetRegistry: this.chainService.getAssetRegistry(),
-        chainStateMap: this.chainService.getChainStateMap()
-      });
-    });
+  getServiceInfo() {
+    return {
+      chainInfoMap: this.chainService.getChainInfoMap(),
+      chainApiMap: this.getApiMap(),
+      currentAccountInfo: this.keyringService.currentAccount,
+      assetRegistry: this.chainService.getAssetRegistry(),
+      chainStateMap: this.chainService.getChainStateMap()
+    };
   }
   getExternalRequestMap() {
     return this.externalRequest;
@@ -1401,5 +1357,85 @@ class KoniState {
   createUnsubscriptionHandle(id, unsubscribe) {
     this.unsubscriptionMap[id] = unsubscribe;
   }
+  updateChainConnectionStatus(chain, status) {
+    this.chainService.setChainConnectionStatus(chain, status);
+  }
+  async autoEnableChains(addresses) {
+    const assetMap = this.chainService.getAssetRegistry();
+    const promiseList = addresses.map(address => {
+      return this.subscanService.getMultiChainBalance(address).catch(e => {
+        console.error(e);
+        return null;
+      });
+    });
+    const needEnableChains = [];
+    const needActiveTokens = [];
+    const currentAssetSettings = await this.chainService.getAssetSettings();
+    const chainMap = this.chainService.getChainInfoMap();
+    const balanceDataList = await Promise.all(promiseList);
+    balanceDataList.forEach(balanceData => {
+      balanceData && balanceData.forEach(_ref14 => {
+        var _currentAssetSettings;
+        let {
+          balance,
+          bonded,
+          category,
+          locked,
+          network,
+          symbol
+        } = _ref14;
+        const chain = _subscanChainMap.SUBSCAN_CHAIN_MAP_REVERSE[network];
+        const chainInfo = chain ? chainMap[chain] : null;
+        const balanceIsEmpty = (!balance || balance === '0') && !locked && locked === '0' && (!bonded || bonded === '0');
+
+        // Cancel if chain is not supported or is testnet or balance is 0
+        if (!chainInfo || chainInfo.isTestnet || balanceIsEmpty) {
+          return;
+        }
+        const tokenKey = `${chain}-${category === 'native' ? 'NATIVE' : 'LOCAL'}-${symbol.toUpperCase()}`;
+        if (assetMap[tokenKey] && !((_currentAssetSettings = currentAssetSettings[tokenKey]) !== null && _currentAssetSettings !== void 0 && _currentAssetSettings.visible)) {
+          needEnableChains.push(chain);
+          needActiveTokens.push(tokenKey);
+          currentAssetSettings[tokenKey] = {
+            visible: true
+          };
+        }
+      });
+    });
+    if (needActiveTokens.length) {
+      this.chainService.enableChains(needEnableChains);
+      this.chainService.setAssetSettings({
+        ...currentAssetSettings
+      });
+    }
+  }
+  onAccountAdd() {
+    this.eventService.on('account.add', address => {
+      this.autoEnableChains([address]).catch(this.logger.error);
+    });
+  }
+  onAccountRemove() {
+    this.eventService.on('account.remove', address => {
+      // Some separate service like historyService will listen to this event and remove inside that service
+
+      const stores = this.dbService.stores;
+
+      // Remove Balance
+      stores.balance.removeAllByAddress(address).catch(console.error);
+      stores.balance.removeAllByAddress(_constants.ALL_ACCOUNT_KEY).catch(console.error);
+
+      // Remove NFT
+      stores.nft.deleteNftByAddress([address]).catch(console.error);
+
+      // Remove Staking Data
+      stores.staking.removeAllByAddress(address).catch(console.error);
+    });
+  }
+  async reloadNft() {
+    return await this.cron.reloadNft();
+  }
+  async reloadStaking() {
+    return await this.cron.reloadStaking();
+  }
 }
 exports.default = KoniState;

package/cjs/koni/background/handlers/Tabs.js

@@ -256,32 +256,34 @@ class KoniTabs {
         const allAccounts = _accounts.accounts.subject.getValue();
         const accountList = transformAccountsV2(allAccounts, false, authInfo, 'evm').map(a => a.address);
         let accounts = [];
-        this.#koniState.getCurrentAccount(_ref12 => {
-          let {
-            address
-          } = _ref12;
-          if (address === _constants.ALL_ACCOUNT_KEY || !accountList.includes(address) || getAll) {
-            accounts = accountList;
-          } else if (address && accountList.includes(address)) {
-            accounts = [address];
-          }
-          resolve(accounts);
-        });
+        const address = this.#koniState.keyringService.currentAccount.address;
+        if (address === _constants.ALL_ACCOUNT_KEY || !accountList.includes(address) || getAll) {
+          accounts = accountList;
+        } else if (address && accountList.includes(address)) {
+          accounts = [address];
+        }
+        resolve(accounts);
       }).catch(console.error);
     });
   }
   async getEvmState(url) {
-    let currentEvmNetworkKey;
+    let currentChain;
+    let autoActiveChain = false;
     if (url) {
       const authInfo = await this.getAuthInfo(url);
-      currentEvmNetworkKey = authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentEvmNetworkKey;
-    }
-    let currentEvmNetwork = currentEvmNetworkKey ? this.#koniState.getChainInfo(currentEvmNetworkKey) : undefined;
-    if (currentEvmNetworkKey && !this.#koniState.getChainStateByKey(currentEvmNetworkKey).active) {
-      currentEvmNetwork = Object.values(this.#koniState.getChainInfoMap()).find(network => {
-        return network.evmInfo !== null && this.#koniState.getChainStateByKey(network.slug).active;
-      });
+      if (authInfo !== null && authInfo !== void 0 && authInfo.currentEvmNetworkKey) {
+        currentChain = authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentEvmNetworkKey;
+      }
+      if (authInfo !== null && authInfo !== void 0 && authInfo.isAllowed) {
+        autoActiveChain = true;
+      }
     }
+    const currentEvmNetwork = this.#koniState.requestService.getDAppChainInfo({
+      autoActive: autoActiveChain,
+      accessType: 'evm',
+      defaultChain: currentChain,
+      url
+    });
     if (currentEvmNetwork) {
       const {
         evmInfo,
@@ -293,13 +295,20 @@ class KoniTabs {
         if (!web3.currentProvider.connected) {
           console.log(`[Web3] ${slug} is disconnected, trying to connect...`);
           this.#koniState.refreshWeb3Api(slug);
+          let checkingNum = 0;
           const poll = resolve => {
+            checkingNum += 1;
             if (web3.currentProvider.connected) {
               console.log(`Network [${slug}] is connected.`);
               resolve(true);
             } else {
               console.log(`Connecting to network [${slug}]`);
-              setTimeout(() => poll(resolve), 400);
+              if (checkingNum < 10) {
+                setTimeout(() => poll(resolve), 900);
+              } else {
+                console.log(`Max retry, stop checking [${slug}]`);
+                resolve(false);
+              }
             }
           };
           await new Promise(poll);
@@ -327,10 +336,10 @@ class KoniTabs {
       date: new Date().getTime()
     }];
   }
-  async switchEvmChain(id, url, _ref13) {
+  async switchEvmChain(id, url, _ref12) {
     let {
       params
-    } = _ref13;
+    } = _ref12;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const chainId = params[0].chainId;
     const evmState = await this.getEvmState(url);
@@ -345,11 +354,11 @@ class KoniTabs {
     }
     return null;
   }
-  async addEvmToken(id, url, _ref14) {
+  async addEvmToken(id, url, _ref13) {
     var _input$type, _input$options, _input$options2;
     let {
       params
-    } = _ref14;
+    } = _ref13;
     const input = params;
     const _tokenType = (input === null || input === void 0 ? void 0 : (_input$type = input.type) === null || _input$type === void 0 ? void 0 : _input$type.toLowerCase()) || '';
     if (_tokenType !== 'erc20' && _tokenType !== 'erc721') {
@@ -384,10 +393,10 @@ class KoniTabs {
     };
     return await this.#koniState.addTokenConfirm(id, url, tokenInfo);
   }
-  async addEvmChain(id, url, _ref15) {
+  async addEvmChain(id, url, _ref14) {
     let {
       params
-    } = _ref15;
+    } = _ref14;
     const input = params;
     if (input && input.length > 0) {
       const {
@@ -481,7 +490,7 @@ class KoniTabs {
         currentAccountList = newAccountList;
       }
     };
-    const accountListSubscription = this.#koniState.subscribeCurrentAccount().subscribe(() => {
+    const accountListSubscription = this.#koniState.keyringService.currentAccountSubject.subscribe(() => {
       onCurrentAccountChanged().catch(console.error);
     });
 
@@ -531,11 +540,11 @@ class KoniTabs {
     const networkCheckInterval = setInterval(networkCheck, _constants.CRON_GET_API_MAP_STATUS);
     const provider = await this.getEvmProvider(url);
     const eventMap = {};
-    eventMap.data = _ref16 => {
+    eventMap.data = _ref15 => {
       let {
         method,
         params
-      } = _ref16;
+      } = _ref15;
       emitEvent('message', {
         type: method,
         data: params
@@ -544,8 +553,8 @@ class KoniTabs {
     eventMap.error = rs => {
       emitEvent('error', rs);
     };
-    Object.entries(eventMap).forEach(_ref17 => {
-      let [event, callback] = _ref17;
+    Object.entries(eventMap).forEach(_ref16 => {
+      let [event, callback] = _ref16;
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       (provider === null || provider === void 0 ? void 0 : provider.on) && (provider === null || provider === void 0 ? void 0 : provider.on(event, callback));
     });
@@ -559,8 +568,8 @@ class KoniTabs {
       if (this.evmEventEmitterMap[url][id]) {
         delete this.evmEventEmitterMap[url][id];
       }
-      Object.entries(eventMap).forEach(_ref18 => {
-        let [event, callback] = _ref18;
+      Object.entries(eventMap).forEach(_ref17 => {
+        let [event, callback] = _ref17;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         (provider === null || provider === void 0 ? void 0 : provider.removeListener) && (provider === null || provider === void 0 ? void 0 : provider.removeListener(event, callback));
       });
@@ -595,11 +604,11 @@ class KoniTabs {
     }
     return provider;
   }
-  async performWeb3Method(id, url, _ref19, callback) {
+  async performWeb3Method(id, url, _ref18, callback) {
     let {
       method,
       params
-    } = _ref19;
+    } = _ref18;
     const provider = await this.getEvmProvider(url);
     this.checkAndHandleProviderStatus(provider);
     return new Promise((resolve, reject) => {
@@ -624,11 +633,11 @@ class KoniTabs {
     const allowedAccounts = await this.getEvmCurrentAccount(url, true);
     return !!allowedAccounts.find(acc => acc.toLowerCase() === address.toLowerCase());
   }
-  async evmSign(id, url, _ref20) {
+  async evmSign(id, url, _ref19) {
     let {
       method,
       params
-    } = _ref20;
+    } = _ref19;
     const allowedAccounts = await this.getEvmCurrentAccount(url, true);
     const signResult = await this.#koniState.evmSign(id, url, method, params, allowedAccounts);
     if (signResult) {
@@ -637,10 +646,10 @@ class KoniTabs {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Have something wrong to sign message');
     }
   }
-  async evmSendTransaction(id, url, _ref21) {
+  async evmSendTransaction(id, url, _ref20) {
     let {
       params
-    } = _ref21;
+    } = _ref20;
     const transactionParams = params[0];
     const canUseAccount = transactionParams.from && this.canUseAccount(transactionParams.from, url);
     const evmState = await this.getEvmState(url);