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

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.2-1b",
+  "version": "1.0.2-3",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1639,7 +1639,7 @@
     "@polkadot/hw-ledger": "^10.1.9",
     "@polkadot/keyring": "^10.2.1",
     "@polkadot/networks": "^10.2.1",
-    "@polkadot/phishing": "^0.20.3",
+    "@polkadot/phishing": "^0.21.1",
     "@polkadot/react-identicon": "^2.9.14",
     "@polkadot/react-qr": "^2.9.14",
     "@polkadot/rpc-provider": "^9.10.3",
@@ -1656,11 +1656,11 @@
     "@sora-substrate/type-definitions": "^1.12.4",
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.18",
-    "@subwallet/chain-list": "^0.0.30",
-    "@subwallet/extension-base": "^1.0.2-1",
-    "@subwallet/extension-chains": "^1.0.2-1",
-    "@subwallet/extension-dapp": "^1.0.2-1",
-    "@subwallet/extension-inject": "^1.0.2-1",
+    "@subwallet/chain-list": "^0.0.32",
+    "@subwallet/extension-base": "^1.0.2-3",
+    "@subwallet/extension-chains": "^1.0.2-3",
+    "@subwallet/extension-dapp": "^1.0.2-3",
+    "@subwallet/extension-inject": "^1.0.2-3",
     "@subwallet/keyring": "^0.0.5",
     "@subwallet/ui-keyring": "^0.0.3",
     "@unique-nft/types": "^0.6.0-4",
@@ -1692,10 +1692,10 @@
     "protobufjs": "^7.1.2",
     "rlp": "^3.0.0",
     "rxjs": "^7.8.0",
-    "web3": "^1.8.1",
-    "web3-core": "^1.8.1",
-    "web3-core-helpers": "^1.8.1",
-    "web3-eth-contract": "^1.8.1",
-    "web3-utils": "^1.8.1"
+    "web3": "^1.9.0",
+    "web3-core": "^1.9.0",
+    "web3-core-helpers": "^1.9.0",
+    "web3-eth-contract": "^1.9.0",
+    "web3-utils": "^1.9.0"
   }
-}
+}

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.0.2-1'
+  version: '1.0.2-3'
 };

package/services/chain-service/handler/light-client/index.d.ts

@@ -1,20 +1,4 @@
-import { ScProvider } from '@polkadot/rpc-provider';
-import { ProviderInterface, ProviderInterfaceCallback, ProviderInterfaceEmitCb, ProviderInterfaceEmitted } from '@polkadot/rpc-provider/types';
+import { ProviderInterface } from '@polkadot/rpc-provider/types';
 export declare const relayChainSpecs: Record<string, string>;
 export declare const paraChainSpecs: Record<string, string>;
-export declare class ProviderPlaceholder implements ProviderInterface {
-    private readonly providerPromise;
-    private provider?;
-    constructor(providerPromise: Promise<ScProvider>);
-    get hasSubscriptions(): boolean;
-    get isClonable(): boolean;
-    get isConnected(): boolean;
-    clone(): ProviderInterface;
-    connect(): Promise<void>;
-    disconnect(): Promise<void>;
-    on(type: ProviderInterfaceEmitted, sub: ProviderInterfaceEmitCb): () => void;
-    send<T = any>(method: string, params: unknown[], isCacheable?: boolean): Promise<T>;
-    subscribe(type: string, method: string, params: unknown[], cb: ProviderInterfaceCallback): Promise<number | string>;
-    unsubscribe(type: string, method: string, id: number | string): Promise<boolean>;
-}
 export declare function getSubstrateConnectProvider(specLink: string): ProviderInterface;

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

@@ -16,7 +16,7 @@ export const paraChainSpecs = {
   'kusama/tinkernet': `${sourceFolderUrl}kusama/tinkernet.json`,
   'polkadot/astar': `${sourceFolderUrl}polkadot/astar.json`
 };
-export class ProviderPlaceholder {
+class ProviderPlaceholder {
   constructor(providerPromise) {
     this.providerPromise = providerPromise;
     providerPromise.then(provider => {

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

@@ -19,7 +19,6 @@ export declare class ChainService {
     private store;
     private assetSettingSubject;
     private logger;
-    private refreshChainStateTimeout;
     constructor(dbService: DatabaseService, eventService: EventService);
     getXcmRefMap(): Record<string, _AssetRef>;
     getEvmApi(slug: string): _EvmApi;
@@ -92,8 +91,10 @@ export declare class ChainService {
     refreshEvmApi(slug: string): void;
     stopAllChainApis(): Promise<void[]>;
     resumeAllChainApis(): Promise<void[]>;
+    private refreshChainStateTimeout;
+    private refreshChainStateTimes;
     private refreshChainStateInterval;
-    private updateApiMapStatus;
+    updateApiMapStatus(): Promise<void>;
     initAssetSettings(): Promise<void>;
     setAssetSettings(assetSettings: Record<string, AssetSetting>, emitEvent?: boolean): void;
     getStoreAssetSettings(): Promise<Record<string, AssetSetting>>;

package/services/chain-service/index.js

@@ -3,7 +3,6 @@
 
 import { AssetRefMap, ChainAssetMap, ChainInfoMap, MultiChainAssetMap } from '@subwallet/chain-list';
 import { _AssetRefPath, _AssetType, _ChainStatus, _SubstrateChainType } from '@subwallet/chain-list/types';
-import { CRON_GET_API_MAP_STATUS } from '@subwallet/extension-base/constants';
 import { _DEFAULT_ACTIVE_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
 import { EvmChainHandler } from '@subwallet/extension-base/services/chain-service/handler/EvmChainHandler';
 import { SubstrateChainHandler } from '@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler';
@@ -44,7 +43,7 @@ export class ChainService {
     this.multiChainAssetMapSubject.next(MultiChainAssetMap);
     this.xcmRefMapSubject.next(this.getXcmRefMap());
     this.logger = createLogger('chain-service');
-    this.refreshChainStateInterval(3000);
+    this.refreshChainStateInterval(3000, 6);
   }
 
   // Getter
@@ -407,7 +406,7 @@ export 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,
@@ -961,21 +960,23 @@ export 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 (_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
       };
     }
@@ -989,7 +990,7 @@ export class ChainService {
       name,
       decimals,
       symbol,
-      isExist,
+      isExist: !!existedToken,
       contractError
     };
   }
@@ -1039,19 +1040,26 @@ export class ChainService {
 
     return this.substrateChainHandler.resumeAllApis();
   }
-
-  // Interval update api status
-  refreshChainStateInterval(delay = 0) {
+  refreshChainStateTimeout = undefined;
+  refreshChainStateTimes = 0;
+  refreshChainStateInterval(delay = 0, times) {
     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();
-      }, 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();
@@ -1062,24 +1070,30 @@ export class ChainService {
         update = true;
       }
     }
-    Object.entries(chainStateMap).forEach(([chain, chainState]) => {
-      if (chainState.active) {
-        if (substrateApiMap[chain]) {
-          const api = substrateApiMap[chain];
-          if (api) {
-            updateState(chainState, _ChainConnectionStatus.CONNECTED);
-            return;
-          }
-        } else if (evmApiMap[chain]) {
-          const api = evmApiMap[chain];
-          if (api) {
-            updateState(chainState, _ChainConnectionStatus.CONNECTED);
-            return;
+    const promiseList = Object.entries(chainStateMap).map(async ([chain, chainState]) => {
+      try {
+        if (chainState.active) {
+          if (substrateApiMap[chain]) {
+            const api = substrateApiMap[chain];
+            if (api.isApiConnected) {
+              updateState(chainState, _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, _ChainConnectionStatus.CONNECTED);
+              return;
+            }
           }
         }
+        updateState(chainState, _ChainConnectionStatus.DISCONNECTED);
+      } catch (e) {
+        updateState(chainState, _ChainConnectionStatus.DISCONNECTED);
       }
-      updateState(chainState, _ChainConnectionStatus.DISCONNECTED);
     });
+    await Promise.all(promiseList);
     if (update) {
       console.log('Update chain connection state');
       this.chainStateMapSubject.next(chainStateMap);

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

@@ -104,6 +104,7 @@ export interface _SmartContractTokenInfo {
 }
 export interface _ValidateCustomAssetResponse extends _SmartContractTokenInfo {
     isExist: boolean;
+    existedSlug?: string;
 }
 export declare const _FUNGIBLE_CONTRACT_STANDARDS: _AssetType[];
 export declare const _NFT_CONTRACT_STANDARDS: _AssetType[];

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

@@ -1,14 +1,16 @@
 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 { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { BehaviorSubject } from 'rxjs';
 export declare class HistoryService {
     private dbService;
     private chainService;
     private eventService;
+    private keyringService;
     private historySubject;
-    constructor(dbService: DatabaseService, chainService: ChainService, eventService: EventService);
+    constructor(dbService: DatabaseService, chainService: ChainService, eventService: EventService, keyringService: KeyringService);
     private fetchPromise;
     private nextFetch;
     private fetchAndLoadHistories;

package/services/history-service/index.js

@@ -3,15 +3,15 @@
 
 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, 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);
@@ -40,7 +40,7 @@ export class HistoryService {
     const historyRecords = await fetchMultiChainHistories(addresses, chainMap);
 
     // Fill additional info
-    const accountMap = Object.entries(accounts.subject.value).reduce((map, [address, account]) => {
+    const accountMap = Object.entries(this.keyringService.accounts).reduce((map, [address, account]) => {
       map[address.toLowerCase()] = account.json.meta.name || address;
       return map;
     }, {});

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

@@ -111,7 +111,7 @@ export function parseSubsquidTransactionData(address, type, historyItem, chainIn
         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/services/keyring-service/index.d.ts

@@ -3,17 +3,19 @@ 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 eventService;
     private readonly currentAccountStore;
     readonly currentAccountSubject: BehaviorSubject<CurrentAccountInfo>;
-    readonly accountsSubject: BehaviorSubject<SubjectInfo>;
+    readonly addressesSubject: BehaviorSubject<SubjectInfo>;
+    readonly accountSubject: 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 addresses(): SubjectInfo;
     get currentAccount(): CurrentAccountInfo;
     setCurrentAccount(currentAccountData: CurrentAccountInfo): void;
 }

package/services/keyring-service/index.js

@@ -10,8 +10,9 @@ export class KeyringService {
     address: '',
     currentGenesisHash: null
   });
-  accountsSubject = keyring.accounts.subject;
-  beforeAccount = keyring.accounts.subject.value;
+  addressesSubject = keyring.addresses.subject;
+  accountSubject = keyring.accounts.subject;
+  beforeAccount = this.accountSubject.value;
   keyringStateSubject = new BehaviorSubject({
     isReady: false,
     hasMasterPassword: false,
@@ -20,23 +21,17 @@ export 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);
@@ -80,7 +75,10 @@ export 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/services/request-service/handler/AuthRequestHandler.d.ts

@@ -2,17 +2,19 @@ import { _ChainInfo } from '@subwallet/chain-list/types';
 import { AuthRequestV2 } from '@subwallet/extension-base/background/KoniTypes';
 import { AccountAuthType, AuthorizeRequest, RequestAuthorizeTab } from '@subwallet/extension-base/background/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
+import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import RequestService from '@subwallet/extension-base/services/request-service';
 import { AuthUrls } from '@subwallet/extension-base/services/request-service/types';
 import { BehaviorSubject, Subject } from 'rxjs';
 export default class AuthRequestHandler {
     #private;
+    private keyringService;
     private readonly authorizeStore;
     private authorizeCached;
     private readonly authorizeUrlSubject;
     private readonly evmChainSubject;
     readonly authSubjectV2: BehaviorSubject<AuthorizeRequest[]>;
-    constructor(requestService: RequestService, chainService: ChainService);
+    constructor(requestService: RequestService, chainService: ChainService, keyringService: KeyringService);
     private stripUrl;
     private getAddressList;
     get numAuthRequestsV2(): number;

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

@@ -6,7 +6,6 @@ import { PREDEFINED_CHAIN_DAPP_CHAIN_MAP } from '@subwallet/extension-base/servi
 import AuthorizeStore from '@subwallet/extension-base/stores/Authorize';
 import { getDomainFromUrl } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
-import { accounts } from '@subwallet/ui-keyring/observable/accounts';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { assert } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
@@ -20,7 +19,8 @@ export default class AuthRequestHandler {
   authorizeUrlSubject = new Subject();
   evmChainSubject = new Subject();
   authSubjectV2 = new BehaviorSubject([]);
-  constructor(requestService, chainService) {
+  constructor(requestService, chainService, keyringService) {
+    this.keyringService = keyringService;
     this.#requestService = requestService;
     this.#chainService = chainService;
   }
@@ -30,7 +30,7 @@ export default class AuthRequestHandler {
     return parts[2];
   }
   getAddressList(value = false) {
-    const addressList = Object.keys(accounts.subject.value);
+    const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({
       ...addressList,
       [v]: value
@@ -101,8 +101,10 @@ export default 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/services/request-service/handler/EvmRequestHandler.js

@@ -67,16 +67,7 @@ export default 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;
@@ -127,7 +118,8 @@ export default class EvmRequestHandler {
       data: toBuffer(config.data)
     };
     const common = Common.custom({
-      chainId: config.chainId
+      chainId: config.chainId,
+      defaultHardfork: 'petersburg'
     });
 
     // @ts-ignore
@@ -140,11 +132,15 @@ export default class EvmRequestHandler {
     const {
       estimateGas,
       from,
-      gasPrice
+      gas,
+      gasPrice,
+      value
     } = transaction;
     const pair = keyring.getPair(from);
     const params = {
       ...transaction,
+      gas: anyNumberToBN(gas).toNumber(),
+      value: anyNumberToBN(value).toNumber(),
       gasPrice: anyNumberToBN(gasPrice).toNumber(),
       gasLimit: anyNumberToBN(estimateGas).toNumber()
       // nonce: await web3.eth.getTransactionCount(from) // Todo: fill this value from transaction service

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

@@ -1,6 +1,7 @@
 import { AuthRequestV2, ConfirmationDefinitions, ConfirmationsQueue, ConfirmationsQueueItemOptions, ConfirmationType, RequestConfirmationComplete } from '@subwallet/extension-base/background/KoniTypes';
 import { AccountAuthType, AccountJson, AuthorizeRequest, MetadataRequest, RequestAuthorizeTab, RequestSign, ResponseSigning, SigningRequest } from '@subwallet/extension-base/background/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
+import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import { AuthUrls, MetaRequest } from '@subwallet/extension-base/services/request-service/types';
 import SettingService from '@subwallet/extension-base/services/setting-service/SettingService';
 import { MetadataDef } from '@subwallet/extension-inject/types';
@@ -8,8 +9,9 @@ import { BehaviorSubject, Subject } from 'rxjs';
 import { SignerPayloadJSON } from '@polkadot/types/types/extrinsic';
 export default class RequestService {
     #private;
+    private keyringService;
     readonly settingService: SettingService;
-    constructor(chainService: ChainService, settingService: SettingService);
+    constructor(chainService: ChainService, settingService: SettingService, keyringService: KeyringService);
     get numAllRequests(): number;
     updateIconV2(shouldClose?: boolean): void;
     getAddressList(value?: boolean): Record<string, boolean>;

package/services/request-service/index.js

@@ -6,7 +6,6 @@ import EvmRequestHandler from '@subwallet/extension-base/services/request-servic
 import MetadataRequestHandler from '@subwallet/extension-base/services/request-service/handler/MetadataRequestHandler';
 import PopupHandler from '@subwallet/extension-base/services/request-service/handler/PopupHandler';
 import SubstrateRequestHandler from '@subwallet/extension-base/services/request-service/handler/SubstrateRequestHandler';
-import { accounts } from '@subwallet/ui-keyring/observable/accounts';
 export default class RequestService {
   // Common
   #chainService;
@@ -17,12 +16,13 @@ export default class RequestService {
   #evmRequestHandler;
 
   // Common
-  constructor(chainService, settingService) {
+  constructor(chainService, settingService, keyringService) {
+    this.keyringService = keyringService;
     this.#chainService = chainService;
     this.settingService = settingService;
     this.#popupHandler = new PopupHandler(this);
     this.#metadataRequestHandler = new MetadataRequestHandler(this);
-    this.#authRequestHandler = new AuthRequestHandler(this, this.#chainService);
+    this.#authRequestHandler = new AuthRequestHandler(this, this.#chainService, this.keyringService);
     this.#substrateRequestHandler = new SubstrateRequestHandler(this);
     this.#evmRequestHandler = new EvmRequestHandler(this);
 
@@ -36,7 +36,7 @@ export default class RequestService {
     this.#popupHandler.updateIconV2(shouldClose);
   }
   getAddressList(value = false) {
-    const addressList = Object.keys(accounts.subject.value);
+    const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({
       ...addressList,
       [v]: value
@@ -51,7 +51,16 @@ export default 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

package/services/storage-service/DatabaseService.d.ts

@@ -45,7 +45,7 @@ export default class DatabaseService {
     deleteNftCollection(chain: string, collectionId: string): Promise<void>;
     getAllNftCollection(chainHashes?: string[]): import("dexie").PromiseExtended<NftCollection[]>;
     subscribeNft(addresses: string[], chainHashes?: string[], callback?: (nfts: INft[]) => void): Subscription;
-    cleanUpNft(chain: string, owner: string, collectionId: string, nftIds: string[]): Promise<number>;
+    cleanUpNft(chain: string, owner: string, collectionIds: string[], nftIds: string[], ownNothing?: boolean): Promise<number>;
     getNft(addresses: string[], chainHashes?: string[]): Promise<INft[]>;
     addNft(address: string, nft: NftItem): Promise<unknown>;
     handleNftTransfer(chain: string, addresses: string[], nftItem: NftItem): import("dexie").PromiseExtended<number>;

package/services/storage-service/DatabaseService.js

@@ -123,8 +123,8 @@ export default class DatabaseService {
   }
   async upsertHistory(histories) {
     // this.logger.log('Updating transaction histories');
-
-    return this.stores.transaction.bulkUpsert(histories);
+    const cleanedHistory = histories.filter(x => x && x.address && x.chain && x.extrinsicHash);
+    return this.stores.transaction.bulkUpsert(cleanedHistory);
   }
 
   // NFT Collection
@@ -149,9 +149,12 @@ export default class DatabaseService {
     });
     return this.nftSubscription;
   }
-  async cleanUpNft(chain, owner, collectionId, nftIds) {
-    const result = await this.stores.nft.cleanUpNfts(chain, reformatAddress(owner, 42), collectionId, nftIds);
-    result > 0 && console.debug(`Clean up ${result} NFTs from collection ${collectionId} on chain ${chain} for owner ${owner}`);
+  async cleanUpNft(chain, owner, collectionIds, nftIds, ownNothing) {
+    if (ownNothing) {
+      return this.stores.nft.deleteNftsByChainAndOwner(chain, reformatAddress(owner, 42));
+    }
+    const result = await this.stores.nft.cleanUpNfts(chain, reformatAddress(owner, 42), collectionIds, nftIds);
+    result > 0 && console.debug(`Cleaned up ${result} NFTs on chain ${chain} for owner ${reformatAddress(owner, 42)}`, collectionIds, nftIds);
     return result;
   }
   async getNft(addresses, chainHashes) {

package/services/storage-service/db-stores/Nft.d.ts

@@ -4,7 +4,8 @@ import { INft } from '../databases';
 export default class NftStore extends BaseStoreWithAddressAndChain<INft> {
     getNft(addresses: string[], chainList?: string[]): import("dexie").PromiseExtended<INft[]>;
     subscribeNft(addresses: string[], chainList?: string[]): import("dexie").Observable<INft[]>;
-    cleanUpNfts(chain: string, address: string, collectionId: string, nftIds: string[]): import("dexie").PromiseExtended<number>;
+    cleanUpNfts(chain: string, address: string, collectionIds: string[], nftIds: string[]): import("dexie").PromiseExtended<number>;
+    deleteNftsByChainAndOwner(chain: string, address: string): import("dexie").PromiseExtended<number>;
     deleteNftByAddress(addresses: string[]): import("dexie").PromiseExtended<number>;
     deleteNftItem(chain: string, addresses: string[], nftItem: NftItem): import("dexie").PromiseExtended<number>;
     deleteNftsByCollection(chain: string, collectionId: string): import("dexie").PromiseExtended<number>;

package/services/storage-service/db-stores/Nft.js

@@ -15,12 +15,17 @@ export default class NftStore extends BaseStoreWithAddressAndChain {
   subscribeNft(addresses, chainList = []) {
     return liveQuery(() => this.getNft(addresses, chainList));
   }
-  cleanUpNfts(chain, address, collectionId, nftIds) {
+  cleanUpNfts(chain, address, collectionIds, nftIds) {
     return this.table.where({
       address,
-      chain,
-      collectionId
-    }).and(nft => !nftIds.includes(nft.id)).delete();
+      chain
+    }).and(nft => !collectionIds.includes(nft.collectionId) || collectionIds.includes(nft.collectionId) && !nftIds.includes(nft.id)).delete();
+  }
+  deleteNftsByChainAndOwner(chain, address) {
+    return this.table.where({
+      address,
+      chain
+    }).delete();
   }
   deleteNftByAddress(addresses) {
     return this.table.where('address').anyOfIgnoreCase(addresses).delete();