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

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

@@ -31,7 +31,6 @@ var _AccountRef = _interopRequireDefault(require("@subwallet/extension-base/stor
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _decode = require("@subwallet/keyring/pair/decode");
 var _uiKeyring = require("@subwallet/ui-keyring");
-var _accounts = require("@subwallet/ui-keyring/observable/accounts");
 var _ethSimpleKeyring = _interopRequireDefault(require("eth-simple-keyring"));
 var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
@@ -93,10 +92,10 @@ class KoniState {
     this.notificationService = new _NotificationService.default();
     this.chainService = new _chainService.ChainService(this.dbService, this.eventService);
     this.settingService = new _SettingService.default();
-    this.requestService = new _requestService.default(this.chainService, this.settingService);
+    this.requestService = new _requestService.default(this.chainService, this.settingService, this.keyringService);
     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.eventService);
+    this.historyService = new _historyService.HistoryService(this.dbService, this.chainService, this.eventService, this.keyringService);
     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);
@@ -265,7 +264,7 @@ class KoniState {
   }
   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
@@ -369,8 +368,8 @@ class KoniState {
   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));
+  cleanUpNfts(chain, owner, collectionId, nftIds, ownNothing) {
+    this.dbService.cleanUpNft(chain, owner, collectionId, nftIds, ownNothing).catch(e => this.logger.warn(e));
   }
   async getNft() {
     const addresses = this.getDecodedAddresses();
@@ -545,7 +544,11 @@ class KoniState {
         isApproved
       } = _ref4;
       if (isApproved) {
-        await this.upsertChainInfo(networkData);
+        if (networkData.mode === 'insert') {
+          await this.upsertChainInfo(networkData);
+        } else {
+          // TODO: update existed network (need more discussion)
+        }
         return null;
       } else {
         throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.USER_REJECTED_REQUEST);
@@ -1009,8 +1012,9 @@ class KoniState {
       return [undefined, undefined];
     }
     const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref8 => {
+      var _chainInfo$evmInfo;
       let [networkKey, chainInfo] = _ref8;
-      return (0, _utils._getEvmChainId)(chainInfo) === chainId;
+      return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.evmChainId) === chainId;
     });
     if (rs) {
       return rs;
@@ -1248,17 +1252,23 @@ class KoniState {
       account: account,
       canSign: true
     };
+    const eType = transaction.value ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.EVM_EXECUTE;
+    const transactionData = {
+      ...transaction
+    };
+    if (eType === _KoniTypes.ExtrinsicType.TRANSFER_BALANCE) {
+      // @ts-ignore
+      transactionData.tokenSlug = this.chainService.getNativeTokenInfo(networkKey).slug;
+    }
 
-    // Todo: Convert this to handle transaction
+    // Custom handle this instead of general handler transaction
     const transactionEmitter = await this.transactionService.addTransaction({
       transaction: requestPayload,
       address: requestPayload.from,
       chain: networkKey,
       url,
-      data: {
-        ...transaction
-      },
-      extrinsicType: transaction.value ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.EVM_EXECUTE,
+      data: transactionData,
+      extrinsicType: eType,
       chainType: _KoniTypes.ChainType.EVM
     });
 
@@ -1386,7 +1396,7 @@ class KoniState {
         } = _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');
+        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) {

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

@@ -17,7 +17,6 @@ var _defaults = require("@subwallet/extension-base/defaults");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
-var _accounts = require("@subwallet/ui-keyring/observable/accounts");
 var _web = _interopRequireDefault(require("web3"));
 var _phishing = require("@polkadot/phishing");
 var _util = require("@polkadot/util");
@@ -220,14 +219,14 @@ class KoniTabs {
       anyType
     } = _ref10;
     const authInfo = await this.getAuthInfo(url);
-    return transformAccountsV2(_accounts.accounts.subject.getValue(), anyType, authInfo, accountAuthType);
+    return transformAccountsV2(this.#koniState.keyringService.accounts, anyType, authInfo, accountAuthType);
   }
   accountsSubscribeV2(url, _ref11, id, port) {
     let {
       accountAuthType
     } = _ref11;
     const cb = (0, _subscriptions.createSubscription)(id, port);
-    const subscription = _accounts.accounts.subject.subscribe(accounts => {
+    const subscription = this.#koniState.keyringService.accountSubject.subscribe(accounts => {
       this.getAuthInfo(url).then(authInfo => {
         cb(transformAccountsV2(accounts, false, authInfo, accountAuthType));
       }).catch(console.error);
@@ -253,7 +252,7 @@ class KoniTabs {
     let getAll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     return await new Promise(resolve => {
       this.getAuthInfo(url).then(authInfo => {
-        const allAccounts = _accounts.accounts.subject.getValue();
+        const allAccounts = this.#koniState.keyringService.accounts;
         const accountList = transformAccountsV2(allAccounts, false, authInfo, 'evm').map(a => a.address);
         let accounts = [];
         const address = this.#koniState.keyringService.currentAccount.address;
@@ -290,8 +289,8 @@ class KoniTabs {
         slug
       } = currentEvmNetwork;
       const evmApi = this.#koniState.getEvmApi(slug);
-      const web3 = evmApi.api;
-      if (web3.currentProvider instanceof _web.default.providers.WebsocketProvider) {
+      const web3 = evmApi === null || evmApi === void 0 ? void 0 : evmApi.api;
+      if ((web3 === null || web3 === void 0 ? void 0 : web3.currentProvider) instanceof _web.default.providers.WebsocketProvider) {
         if (!web3.currentProvider.connected) {
           console.log(`[Web3] ${slug} is disconnected, trying to connect...`);
           this.#koniState.refreshWeb3Api(slug);
@@ -378,12 +377,16 @@ class KoniTabs {
       contractAddress: input.options.address,
       originChain: chain
     });
-    if (validate.isExist) {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, 'Current token is existed');
-    } else if (validate.contractError) {
+
+    // Below code is comment because we will handle exited token in the ui-view
+    // if (validate.isExist) {
+    //   throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current token is existed');
+    // } else
+    if (validate.contractError) {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Contract address is invalid');
     }
     const tokenInfo = {
+      slug: validate === null || validate === void 0 ? void 0 : validate.existedSlug,
       type: tokenType,
       name: validate.name,
       contractAddress: input.options.address,
@@ -407,16 +410,38 @@ class KoniTabs {
       } = input[0];
       if (chainId) {
         const chainIdNum = parseInt(chainId, 16);
-        const [networkKey] = this.#koniState.findNetworkKeyByChainId(chainIdNum);
-        if (networkKey) {
+        const [existedNetworkSlug, existedChainInfo] = this.#koniState.findNetworkKeyByChainId(chainIdNum);
+        if (existedNetworkSlug && existedChainInfo && existedChainInfo !== null && existedChainInfo !== void 0 && existedChainInfo.evmInfo) {
+          const evmInfo = existedChainInfo.evmInfo;
+          const substrateInfo = existedChainInfo.substrateInfo;
+          const chainState = this.#koniState.getChainStateByKey(existedNetworkSlug);
+          await this.#koniState.addNetworkConfirm(id, url, {
+            mode: 'update',
+            chainSpec: {
+              evmChainId: evmInfo.evmChainId,
+              decimals: evmInfo.decimals,
+              existentialDeposit: evmInfo.existentialDeposit,
+              genesisHash: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.genesisHash) || '',
+              paraId: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.paraId) || null,
+              addressPrefix: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.addressPrefix) || 0
+            },
+            chainEditInfo: {
+              blockExplorer: blockExplorerUrls === null || blockExplorerUrls === void 0 ? void 0 : blockExplorerUrls[0],
+              slug: existedNetworkSlug,
+              currentProvider: chainState.currentProvider,
+              providers: existedChainInfo.providers,
+              symbol: evmInfo.symbol,
+              chainType: 'EVM',
+              name: existedChainInfo.name
+            }
+          });
           return await this.switchEvmChain(id, url, {
             method: 'wallet_switchEthereumChain',
             params: [{
               chainId
             }]
           });
-        }
-        if (rpcUrls && chainName) {
+        } else if (rpcUrls && chainName) {
           const filteredUrls = rpcUrls.filter(targetString => {
             let url;
             try {
@@ -457,6 +482,8 @@ class KoniTabs {
               name: chainInfo.name
             }
           });
+        } else {
+          throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Invalid provider');
         }
       }
     }
@@ -717,9 +744,8 @@ class KoniTabs {
       if (e.code) {
         throw e;
       } else {
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, e.message);
+        console.error(e);
+        throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, e === null || e === void 0 ? void 0 : e.toString());
       }
     }
   }

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.0.2-1'
+  version: '1.0.2-3'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/chain-service/handler/light-client/index.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ProviderPlaceholder = void 0;
 exports.getSubstrateConnectProvider = getSubstrateConnectProvider;
 exports.relayChainSpecs = exports.paraChainSpecs = void 0;
 var _rpcProvider = require("@polkadot/rpc-provider");
@@ -104,7 +103,6 @@ class ProviderPlaceholder {
     });
   }
 }
-exports.ProviderPlaceholder = ProviderPlaceholder;
 function getSubstrateConnectProvider(specLink) {
   const [relayName, paraName] = specLink.split('/');
   const relaySpec = relayChainSpecs[relayName];

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
@@ -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;
       }
     }
@@ -419,7 +418,7 @@ 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,
@@ -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]
           });
         }
@@ -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);

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.HistoryService = void 0;
 var _constants = require("@subwallet/extension-base/constants");
 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
@@ -14,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);
@@ -46,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;

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

@@ -121,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);

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/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
@@ -112,8 +112,10 @@ 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);
         }
       }
     }

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