@subwallet/extension-base 1.0.2-2 → 1.0.2-3

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

@@ -7,8 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ChainService = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
-var _constants = require("@subwallet/extension-base/constants");
-var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
+var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _EvmChainHandler = require("@subwallet/extension-base/services/chain-service/handler/EvmChainHandler");
 var _SubstrateChainHandler = require("@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler");
 var _types2 = require("@subwallet/extension-base/services/chain-service/handler/types");
@@ -51,7 +50,7 @@ class ChainService {
     this.multiChainAssetMapSubject.next(_chainList.MultiChainAssetMap);
     this.xcmRefMapSubject.next(this.getXcmRefMap());
     this.logger = (0, _logger.logger)('chain-service');
-    this.refreshChainStateInterval(3000);
+    this.refreshChainStateInterval(3000, 6);
   }
 
   // Getter
@@ -286,7 +285,7 @@ class ChainService {
     this.dbService.removeFromChainStore([slug]).catch(console.error);
     this.updateChainSubscription();
     this.lockChainInfoMap = false;
-    this.eventService.emit('chain.remove', slug);
+    this.eventService.emit('chain.updateState', slug);
     return true;
   }
   resetChainInfoMap(excludedChains) {
@@ -296,7 +295,7 @@ class ChainService {
     this.lockChainInfoMap = true;
     const chainStateMap = this.getChainStateMap();
     for (const [slug, chainState] of Object.entries(chainStateMap)) {
-      if (!_constants2._DEFAULT_ACTIVE_CHAINS.includes(slug) && !(excludedChains !== null && excludedChains !== void 0 && excludedChains.includes(slug))) {
+      if (!_constants._DEFAULT_ACTIVE_CHAINS.includes(slug) && !(excludedChains !== null && excludedChains !== void 0 && excludedChains.includes(slug))) {
         chainState.active = false;
       }
     }
@@ -352,7 +351,7 @@ class ChainService {
     this.dbService.removeFromAssetStore(targetAssets).catch(e => this.logger.error(e));
     this.assetRegistrySubject.next(assetRegistry);
     targetAssets.forEach(assetSlug => {
-      this.eventService.emit('asset.remove', assetSlug);
+      this.eventService.emit('asset.updateState', assetSlug);
     });
   }
 
@@ -419,14 +418,14 @@ class ChainService {
     this.lockChainInfoMap = true;
     chainStateMap[chainSlug].active = true;
     this.initApiForChain(chainInfo);
-    this.refreshChainStateInterval(1000);
+    this.refreshChainStateInterval(3000, 6);
     this.dbService.updateChainStore({
       ...chainInfo,
       active: true,
       currentProvider: chainStateMap[chainSlug].currentProvider
     }).catch(console.error);
     this.lockChainInfoMap = false;
-    this.eventService.emit('chain.enable', chainSlug);
+    this.eventService.emit('chain.updateState', chainSlug);
     return true;
   }
   enableChain(chainSlug) {
@@ -461,7 +460,7 @@ class ChainService {
     }).catch(console.error);
     this.updateChainStateMapSubscription();
     this.lockChainInfoMap = false;
-    this.eventService.emit('chain.disable', chainSlug);
+    this.eventService.emit('chain.updateState', chainSlug);
     return true;
   }
   checkExistedPredefinedChain(genesisHash, evmChainId) {
@@ -497,13 +496,13 @@ class ChainService {
           currentProvider: Object.keys(chainInfo.providers)[0],
           slug: chainInfo.slug,
           connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
-          active: _constants2._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug)
+          active: _constants._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug)
         };
 
         // create data for storage
         newStorageData.push({
           ...chainInfo,
-          active: _constants2._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug),
+          active: _constants._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug),
           currentProvider: Object.keys(chainInfo.providers)[0]
         });
       });
@@ -584,11 +583,11 @@ class ChainService {
             currentProvider: Object.keys(chainInfo.providers)[0],
             slug,
             connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
-            active: _constants2._DEFAULT_ACTIVE_CHAINS.includes(slug)
+            active: _constants._DEFAULT_ACTIVE_CHAINS.includes(slug)
           };
           newStorageData.push({
             ...mergedChainInfoMap[slug],
-            active: _constants2._DEFAULT_ACTIVE_CHAINS.includes(slug),
+            active: _constants._DEFAULT_ACTIVE_CHAINS.includes(slug),
             currentProvider: Object.keys(chainInfo.providers)[0]
           });
         }
@@ -685,7 +684,7 @@ class ChainService {
       active: targetChainState.active,
       currentProvider: targetChainState.currentProvider
     }).then(() => {
-      this.eventService.emit('chain.update', chainSlug);
+      this.eventService.emit('chain.updateState', chainSlug);
     }).catch(e => this.logger.error(e));
   }
   insertChain(params) {
@@ -974,21 +973,23 @@ class ChainService {
   }
   async validateCustomToken(data) {
     const assetRegistry = this.getSmartContractTokens();
-    let isExist = false;
+    let existedToken;
     for (const token of Object.values(assetRegistry)) {
       var _token$metadata2;
       const contractAddress = token === null || token === void 0 ? void 0 : (_token$metadata2 = token.metadata) === null || _token$metadata2 === void 0 ? void 0 : _token$metadata2.contractAddress;
       if ((0, _utils._isEqualContractAddress)(contractAddress, data.contractAddress) && token.assetType === data.type && token.originChain === data.originChain) {
-        isExist = true;
+        existedToken = token;
         break;
       }
     }
-    if (isExist) {
+    if (existedToken) {
+      var _existedToken;
       return {
-        decimals: -1,
-        name: '',
-        symbol: '',
-        isExist,
+        decimals: existedToken.decimals || 0,
+        name: existedToken.name,
+        symbol: existedToken.symbol,
+        isExist: !!existedToken,
+        existedSlug: (_existedToken = existedToken) === null || _existedToken === void 0 ? void 0 : _existedToken.slug,
         contractError: false
       };
     }
@@ -1002,7 +1003,7 @@ class ChainService {
       name,
       decimals,
       symbol,
-      isExist,
+      isExist: !!existedToken,
       contractError
     };
   }
@@ -1052,20 +1053,28 @@ class ChainService {
 
     return this.substrateChainHandler.resumeAllApis();
   }
-
-  // Interval update api status
+  refreshChainStateTimeout = undefined;
+  refreshChainStateTimes = 0;
   refreshChainStateInterval() {
     let delay = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+    let times = arguments.length > 1 ? arguments[1] : undefined;
     clearTimeout(this.refreshChainStateTimeout);
     setTimeout(() => {
-      this.updateApiMapStatus();
+      if (times) {
+        this.refreshChainStateTimes = times;
+      }
+      this.refreshChainStateTimes -= 1;
+      if (this.refreshChainStateTimes < 0) {
+        return;
+      }
+      this.updateApiMapStatus().catch(console.error);
       this.refreshChainStateTimeout = setTimeout(() => {
-        this.updateApiMapStatus();
-        this.refreshChainStateInterval();
-      }, _constants.CRON_GET_API_MAP_STATUS);
+        this.updateApiMapStatus().catch(console.error);
+        this.refreshChainStateInterval(0);
+      }, 3000);
     }, delay);
   }
-  updateApiMapStatus() {
+  async updateApiMapStatus() {
     const substrateApiMap = this.getSubstrateApiMap();
     const evmApiMap = this.getEvmApiMap();
     const chainStateMap = this.getChainStateMap();
@@ -1076,25 +1085,31 @@ class ChainService {
         update = true;
       }
     }
-    Object.entries(chainStateMap).forEach(_ref4 => {
+    const promiseList = Object.entries(chainStateMap).map(async _ref4 => {
       let [chain, chainState] = _ref4;
-      if (chainState.active) {
-        if (substrateApiMap[chain]) {
-          const api = substrateApiMap[chain];
-          if (api) {
-            updateState(chainState, _types3._ChainConnectionStatus.CONNECTED);
-            return;
-          }
-        } else if (evmApiMap[chain]) {
-          const api = evmApiMap[chain];
-          if (api) {
-            updateState(chainState, _types3._ChainConnectionStatus.CONNECTED);
-            return;
+      try {
+        if (chainState.active) {
+          if (substrateApiMap[chain]) {
+            const api = substrateApiMap[chain];
+            if (api.isApiConnected) {
+              updateState(chainState, _types3._ChainConnectionStatus.CONNECTED);
+              return;
+            }
+          } else if (evmApiMap[chain]) {
+            var _api$api;
+            const api = evmApiMap[chain];
+            if (await (api === null || api === void 0 ? void 0 : (_api$api = api.api) === null || _api$api === void 0 ? void 0 : _api$api.eth.net.isListening())) {
+              updateState(chainState, _types3._ChainConnectionStatus.CONNECTED);
+              return;
+            }
           }
         }
+        updateState(chainState, _types3._ChainConnectionStatus.DISCONNECTED);
+      } catch (e) {
+        updateState(chainState, _types3._ChainConnectionStatus.DISCONNECTED);
       }
-      updateState(chainState, _types3._ChainConnectionStatus.DISCONNECTED);
     });
+    await Promise.all(promiseList);
     if (update) {
       console.log('Update chain connection state');
       this.chainStateMapSubject.next(chainStateMap);
@@ -1120,7 +1135,6 @@ class ChainService {
       this.setAssetSettings(assetSettings, false);
     }
     this.eventService.emit('asset.ready', true);
-    console.log('Done init asset settings');
   }
   setAssetSettings(assetSettings) {
     let emitEvent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
@@ -1135,7 +1149,7 @@ class ChainService {
     }
     this.assetSettingSubject.next(assetSettings);
     updateAssets.forEach(slug => {
-      this.eventService.emit(assetSettings[slug].visible ? 'asset.enable' : 'asset.disable', slug);
+      this.eventService.emit('asset.updateState', slug);
     });
     this.store.set('AssetSetting', assetSettings);
   }

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

@@ -42,7 +42,11 @@ class EventService extends _eventemitter.default {
     }, this.lazyTime);
   }
   emitLazy() {
-    this.lazyEmitter.emit('lazy', this.pendingEvents, this.pendingEvents.map(e => e.type));
+    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;
   }

package/cjs/services/event-service/types.js

@@ -1 +1,11 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.COMMON_RELOAD_EVENTS = void 0;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const COMMON_RELOAD_EVENTS = ['account.updateCurrent', 'asset.updateState', 'account.add', 'chain.updateState', 'account.remove', 'chain.add'];
+exports.COMMON_RELOAD_EVENTS = COMMON_RELOAD_EVENTS;

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

@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.HistoryService = void 0;
 var _constants = require("@subwallet/extension-base/constants");
-var _address = require("@subwallet/extension-base/utils/address");
 var _uiKeyring = require("@subwallet/ui-keyring");
-var _accounts = require("@subwallet/ui-keyring/observable/accounts");
 var _rxjs = require("rxjs");
 var _subsquidMultiChainHistory = require("./subsquid-multi-chain-history");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -15,10 +13,11 @@ var _subsquidMultiChainHistory = require("./subsquid-multi-chain-history");
 
 class HistoryService {
   historySubject = new _rxjs.BehaviorSubject([]);
-  constructor(dbService, chainService, eventService) {
+  constructor(dbService, chainService, eventService, keyringService) {
     this.dbService = dbService;
     this.chainService = chainService;
     this.eventService = eventService;
+    this.keyringService = keyringService;
     // Load history from database
     this.dbService.getHistories().then(histories => {
       this.historySubject.next(histories);
@@ -47,7 +46,7 @@ class HistoryService {
     const historyRecords = await (0, _subsquidMultiChainHistory.fetchMultiChainHistories)(addresses, chainMap);
 
     // Fill additional info
-    const accountMap = Object.entries(_accounts.accounts.subject.value).reduce((map, _ref) => {
+    const accountMap = Object.entries(this.keyringService.accounts).reduce((map, _ref) => {
       let [address, account] = _ref;
       map[address.toLowerCase()] = account.json.meta.name || address;
       return map;
@@ -57,7 +56,7 @@ 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()];
     });
-    this.dbService.upsertHistory(historyRecords).catch(console.error);
+    await this.addHistoryItems(historyRecords);
     return historyRecords;
   }
   async fetchHistories(addresses) {
@@ -82,8 +81,8 @@ class HistoryService {
     const addressList = _uiKeyring.keyring.getAccounts().map(a => a.address);
     const currentHistories = this.historySubject.value;
     if (!this.fetchPromise || currentHistories.length === 0) {
-      const historyRecords = await this.fetchHistories(addressList);
-      this.historySubject.next(historyRecords);
+      await this.fetchHistories(addressList);
+      this.historySubject.next(await this.dbService.getHistories());
     }
     return this.historySubject.getValue();
   }
@@ -91,10 +90,6 @@ class HistoryService {
     await this.getHistories();
     return this.historySubject;
   }
-  async insertHistories(historyItems) {
-    await this.dbService.upsertHistory(historyItems);
-    this.historySubject.next(await this.dbService.getHistories());
-  }
   async updateHistories(chain, extrinsicHash, updateData) {
     const existedRecords = await this.dbService.getHistories({
       chain,
@@ -108,14 +103,25 @@ class HistoryService {
     });
     await this.addHistoryItems(updatedRecords);
   }
+
+  // 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}-${(0, _address.quickFormatAddressToCompare)(item.address) || ''}-${item.extrinsicHash}`;
+      return `${item.chain}-${item.extrinsicHash}`;
     });
     const updateRecords = historyItems.filter(item => {
-      const key = `${item.chain}-${(0, _address.quickFormatAddressToCompare)(item.address) || ''}-${item.extrinsicHash}`;
+      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);

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

@@ -67,12 +67,15 @@ function autoFormatAddress(address) {
     return '';
   }
 }
-function generateSignature(_ref) {
-  let {
+function generateSignature(input) {
+  if (!input) {
+    return '';
+  }
+  const {
     r,
     s,
     v
-  } = _ref;
+  } = 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);
@@ -118,7 +121,7 @@ function parseSubsquidTransactionData(address, type, historyItem, chainInfo, arg
         const transaction = data.call.data.args.transaction.value;
         to = autoFormatAddress(parsedArgs.to);
         from = autoFormatAddress(parsedArgs.from);
-        extrinsicHash = parsedArgs.transactionHash;
+        extrinsicHash = parsedArgs.transactionHash || extrinsic.hash;
         amount = transaction.value || '0';
         fee = (parseInt(transaction.gasPrice) * parseInt(transaction.gasLimit)).toString();
         signature = generateSignature(transaction.signature);
@@ -255,14 +258,14 @@ async function fetchMultiChainHistories(addresses, chainMap) {
       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/cjs/services/keyring-service/index.js

@@ -16,8 +16,9 @@ class KeyringService {
     address: '',
     currentGenesisHash: null
   });
-  accountsSubject = _uiKeyring.keyring.accounts.subject;
-  beforeAccount = _uiKeyring.keyring.accounts.subject.value;
+  addressesSubject = _uiKeyring.keyring.addresses.subject;
+  accountSubject = _uiKeyring.keyring.accounts.subject;
+  beforeAccount = this.accountSubject.value;
   keyringStateSubject = new _rxjs.BehaviorSubject({
     isReady: false,
     hasMasterPassword: false,
@@ -26,23 +27,17 @@ class KeyringService {
   constructor(eventService) {
     this.eventService = eventService;
     this.currentAccountStore.get('CurrentAccountInfo', rs => {
-      this.currentAccountSubject.next(rs);
+      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);
-    });
+    await this.eventService.waitAccountReady;
     this.beforeAccount = {
-      ...this.accountsSubject.value
+      ...this.accountSubject.value
     };
-    this.accountsSubject.subscribe(subjectInfo => {
+    this.accountSubject.subscribe(subjectInfo => {
       // Check if accounts changed
       const beforeAddresses = Object.keys(this.beforeAccount);
       const afterAddresses = Object.keys(subjectInfo);
@@ -87,7 +82,10 @@ class KeyringService {
     });
   }
   get accounts() {
-    return this.accountsSubject.value;
+    return this.accountSubject.value;
+  }
+  get addresses() {
+    return this.addressesSubject.value;
   }
   get currentAccount() {
     return this.currentAccountSubject.value;

package/cjs/services/price-service/coingecko.js

@@ -24,7 +24,6 @@ const getTokenPrice = async function (priceIds) {
       }
     }
     if (useBackupApi || ((_res = res) === null || _res === void 0 ? void 0 : _res.status) !== 200) {
-      console.log('Use backup api for price');
       useBackupApi = true;
       res = await _axios.default.get(`https://chain-data.subwallet.app/api/price/get?ids=${idStr}`);
     }

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

@@ -37,8 +37,8 @@ class PriceService {
     };
     this.eventService.waitAssetReady.then(() => {
       this.refreshPriceData();
-      this.eventService.on('asset.enable', eventHandler);
-      this.eventService.on('asset.update', eventHandler);
+      this.eventService.on('asset.updateState', eventHandler);
+      this.eventService.on('asset.updateState', eventHandler);
     }).catch(console.error);
   }
   async getPrice() {
@@ -68,7 +68,6 @@ class PriceService {
         ready: true
       });
       this.dbService.updatePriceStore(rs).catch(console.error);
-      console.log('Get Token Price From CoinGecko');
     }).catch(console.error);
     this.refreshTimeout = setTimeout(this.refreshPriceData.bind(this), _constants.CRON_REFRESH_PRICE_INTERVAL);
   }

package/cjs/services/request-service/handler/AuthRequestHandler.js

@@ -10,7 +10,6 @@ var _constants = require("@subwallet/extension-base/services/request-service/con
 var _Authorize = _interopRequireDefault(require("@subwallet/extension-base/stores/Authorize"));
 var _utils2 = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
-var _accounts = require("@subwallet/ui-keyring/observable/accounts");
 var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
@@ -27,7 +26,8 @@ class AuthRequestHandler {
   authorizeUrlSubject = new _rxjs.Subject();
   evmChainSubject = new _rxjs.Subject();
   authSubjectV2 = new _rxjs.BehaviorSubject([]);
-  constructor(requestService, chainService) {
+  constructor(requestService, chainService, keyringService) {
+    this.keyringService = keyringService;
     this.#requestService = requestService;
     this.#chainService = chainService;
   }
@@ -38,7 +38,7 @@ class AuthRequestHandler {
   }
   getAddressList() {
     let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    const addressList = Object.keys(_accounts.accounts.subject.value);
+    const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({
       ...addressList,
       [v]: value
@@ -95,11 +95,11 @@ class AuthRequestHandler {
     const chainInfoMaps = this.#chainService.getChainInfoMap();
     const chainStateMap = this.#chainService.getChainStateMap();
     let defaultChain = options.defaultChain;
-    const needEnableChains = [];
+    let needEnableChains = [];
     if (options.url) {
       const domain = (0, _utils2.getDomainFromUrl)(options.url);
       const predefinedSupportChains = _constants.PREDEFINED_CHAIN_DAPP_CHAIN_MAP[domain];
-      if (predefinedSupportChains) {
+      if (!defaultChain && predefinedSupportChains) {
         defaultChain = predefinedSupportChains[0];
         options.autoActive && needEnableChains.push(...predefinedSupportChains);
       }
@@ -112,11 +112,17 @@ class AuthRequestHandler {
         return (_chainStateMap$chain$ = chainStateMap[chain.slug]) === null || _chainStateMap$chain$ === void 0 ? void 0 : _chainStateMap$chain$.active;
       })) || evmChains[0];
       if (options.autoActive) {
-        if (!needEnableChains.includes(chainInfo.slug)) {
-          needEnableChains.push(chainInfo.slug);
+        var _chainInfo;
+        if (!needEnableChains.includes((_chainInfo = chainInfo) === null || _chainInfo === void 0 ? void 0 : _chainInfo.slug)) {
+          var _chainInfo2;
+          needEnableChains.push((_chainInfo2 = chainInfo) === null || _chainInfo2 === void 0 ? void 0 : _chainInfo2.slug);
         }
       }
     }
+    needEnableChains = needEnableChains.filter(slug => {
+      var _chainStateMap$slug;
+      return !((_chainStateMap$slug = chainStateMap[slug]) !== null && _chainStateMap$slug !== void 0 && _chainStateMap$slug.active);
+    });
     needEnableChains.length > 0 && this.#chainService.enableChains(needEnableChains);
     return chainInfo;
   }

package/cjs/services/request-service/handler/EvmRequestHandler.js

@@ -76,16 +76,7 @@ class EvmRequestHandler {
     });
     this.confirmationsQueueSubject.next(confirmations);
     if (!isInternal) {
-      // Not open new popup and use existed
-      const popupList = this.#requestService.popup;
-      if (this.#requestService.popup.length > 0) {
-        // eslint-disable-next-line no-void
-        void chrome.windows.update(popupList[0], {
-          focused: true
-        });
-      } else {
-        this.#requestService.popupOpen();
-      }
+      this.#requestService.popupOpen();
     }
     this.#requestService.updateIconV2();
     return promise;
@@ -136,7 +127,8 @@ class EvmRequestHandler {
       data: (0, _ethereumjsUtil.toBuffer)(config.data)
     };
     const common = _common.default.custom({
-      chainId: config.chainId
+      chainId: config.chainId,
+      defaultHardfork: 'petersburg'
     });
 
     // @ts-ignore
@@ -149,11 +141,15 @@ class EvmRequestHandler {
     const {
       estimateGas,
       from,
-      gasPrice
+      gas,
+      gasPrice,
+      value
     } = transaction;
     const pair = _uiKeyring.default.getPair(from);
     const params = {
       ...transaction,
+      gas: (0, _eth.anyNumberToBN)(gas).toNumber(),
+      value: (0, _eth.anyNumberToBN)(value).toNumber(),
       gasPrice: (0, _eth.anyNumberToBN)(gasPrice).toNumber(),
       gasLimit: (0, _eth.anyNumberToBN)(estimateGas).toNumber()
       // nonce: await web3.eth.getTransactionCount(from) // Todo: fill this value from transaction service

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

@@ -10,7 +10,6 @@ var _EvmRequestHandler = _interopRequireDefault(require("@subwallet/extension-ba
 var _MetadataRequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/MetadataRequestHandler"));
 var _PopupHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/PopupHandler"));
 var _SubstrateRequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/SubstrateRequestHandler"));
-var _accounts = require("@subwallet/ui-keyring/observable/accounts");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -24,12 +23,13 @@ class RequestService {
   #evmRequestHandler;
 
   // Common
-  constructor(chainService, settingService) {
+  constructor(chainService, settingService, keyringService) {
+    this.keyringService = keyringService;
     this.#chainService = chainService;
     this.settingService = settingService;
     this.#popupHandler = new _PopupHandler.default(this);
     this.#metadataRequestHandler = new _MetadataRequestHandler.default(this);
-    this.#authRequestHandler = new _AuthRequestHandler.default(this, this.#chainService);
+    this.#authRequestHandler = new _AuthRequestHandler.default(this, this.#chainService, this.keyringService);
     this.#substrateRequestHandler = new _SubstrateRequestHandler.default(this);
     this.#evmRequestHandler = new _EvmRequestHandler.default(this);
 
@@ -44,7 +44,7 @@ class RequestService {
   }
   getAddressList() {
     let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    const addressList = Object.keys(_accounts.accounts.subject.value);
+    const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({
       ...addressList,
       [v]: value
@@ -59,7 +59,16 @@ class RequestService {
     this.#popupHandler.popupClose();
   }
   popupOpen() {
-    this.#popupHandler.popupOpen();
+    // Not open new popup and use existed
+    const popupList = this.#popupHandler.popup;
+    if (popupList && popupList.length > 0) {
+      var _chrome$windows$updat;
+      (_chrome$windows$updat = chrome.windows.update(popupList[0], {
+        focused: true
+      })) === null || _chrome$windows$updat === void 0 ? void 0 : _chrome$windows$updat.catch(console.error);
+    } else {
+      this.#popupHandler.popupOpen();
+    }
   }
 
   // Metadata