@subwallet/extension-base 1.0.1 → 1.0.2-1

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

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

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

@@ -1,12 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _util = require("@polkadot/util");
-var _scripts = _interopRequireDefault(require("./scripts"));
+var _scripts = _interopRequireWildcard(require("./scripts"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -21,23 +22,25 @@ class MigrationService {
     try {
       for (let i = 0; i < keys.length; i++) {
         const JobClass = _scripts.default[keys[i]];
+        const key = keys[i];
+        const name = JobClass.name;
         const check = await this.state.dbService.stores.migration.table.where({
-          name: JobClass.name,
-          key: keys[i]
+          name,
+          key
         }).first();
-        if (!check) {
-          const job = new JobClass(this.state);
+        if (!check || key.startsWith(_scripts.EVERYTIME)) {
           this.logger.log('Running script: ', JobClass.name);
+          const job = new JobClass(this.state);
           await job.run();
           await this.state.dbService.stores.migration.table.put({
-            key: keys[i],
-            name: JobClass.name,
-            timestamp: +new Date()
+            key,
+            name,
+            timestamp: new Date().getTime()
           });
         }
       }
     } catch (error) {
-      this.logger.warn('Migration error: ', error);
+      this.logger.error('Migration error: ', error);
     }
     this.logger.log('Migration done.');
   }

package/cjs/{koni/migration/scripts/RemoveWrongCrowdloan.js → services/migration-service/scripts/AutoEnableChainsTokens.js}

@@ -5,15 +5,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _Base = _interopRequireDefault(require("@subwallet/extension-base/koni/migration/Base"));
-var _databases = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/databases"));
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+var _uiKeyring = require("@subwallet/ui-keyring");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-class RemoveWrongCrowdloan extends _Base.default {
+class AutoEnableChainsTokens extends _Base.default {
   async run() {
-    const db = new _databases.default();
-    await db.crowdloans.clear();
+    const accounts = _uiKeyring.keyring.getAccounts();
+    await this.state.autoEnableChains(accounts.map(_ref => {
+      let {
+        address
+      } = _ref;
+      return address;
+    }));
   }
 }
-exports.default = RemoveWrongCrowdloan;
+exports.default = AutoEnableChainsTokens;

package/cjs/services/migration-service/scripts/MigrateNetworkSettings.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _types = require("@subwallet/chain-list/types");
 var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -12,28 +13,47 @@ var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/m
 class MigrateNetworkSettings extends _Base.default {
   async run() {
     const state = this.state;
-    return new Promise((resolve, reject) => {
-      chrome.storage.local.get('NetworkMap', function (items) {
-        if (items && items.NetworkMap) {
-          const networkMap = items.NetworkMap;
-          const enableList = [];
-          const stateMap = state.getChainStateMap();
-          Object.entries(networkMap).forEach(_ref => {
-            let [slug, chain] = _ref;
-            if (chain.active) {
-              const currentState = stateMap[slug];
+    const items = await new Promise(resolve => {
+      chrome.storage.local.get('NetworkMap', items => {
+        resolve(items);
+      });
+    });
+    const oldNetworkMap = items.NetworkMap;
+    const enableList = [];
+    const stateMap = state.getChainStateMap();
+    if (!oldNetworkMap) {
+      return;
+    }
+    Object.entries(oldNetworkMap).forEach(_ref => {
+      let [slug, chain] = _ref;
+      if (chain.active) {
+        const currentState = stateMap[slug];
+
+        // Ensure chain in the list and is not active
+        currentState && enableList.push(slug);
+      }
+    });
+    if (enableList.length > 0) {
+      state.chainService.enableChains(enableList);
 
-              // Ensure chain in the list and is not active
-              currentState && !currentState.active && enableList.push(slug);
-            }
-          });
-          if (enableList.length > 0) {
-            state.chainService.enableChains(enableList);
-          }
+      // Enable native token of these chains
+      const currentAssetSettings = await state.chainService.getAssetSettings();
+      const assetInfoMap = state.chainService.getAssetRegistry();
+      Object.entries(assetInfoMap).forEach(_ref2 => {
+        let [slug, assetInfo] = _ref2;
+        const assetSetting = currentAssetSettings[slug] || {};
+
+        // Enable native token of these chains
+        if (assetInfo.name && assetInfo.assetType === _types._AssetType.NATIVE && enableList.includes(assetInfo.originChain) && !assetSetting.visible) {
+          currentAssetSettings[slug] = {
+            visible: true
+          };
         }
-        resolve();
       });
-    });
+      state.chainService.setAssetSettings({
+        ...currentAssetSettings
+      });
+    }
   }
 }
 exports.default = MigrateNetworkSettings;

package/cjs/services/migration-service/scripts/MigrateSettings.js

@@ -0,0 +1,31 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+var _uiSettings = _interopRequireDefault(require("@polkadot/ui-settings"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateSettings extends _Base.default {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        this.state.settingService.getSettings(currentSettings => {
+          const isAccessCamera = _uiSettings.default.camera === 'on';
+          this.state.settingService.setSettings({
+            ...currentSettings,
+            camera: isAccessCamera
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateSettings;

package/cjs/services/migration-service/scripts/MigrateTransactionHistory.js

@@ -0,0 +1,72 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+var _dexie = _interopRequireDefault(require("dexie"));
+var _utilCrypto = require("@polkadot/util-crypto");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateTransactionHistory extends _Base.default {
+  async run() {
+    const state = this.state;
+    const chainInfoMap = state.getChainInfoMap();
+    const assetList = Object.values(state.getAssetRegistry());
+    try {
+      const db = new _dexie.default('SubWalletDB');
+      const dexieDB = await db.open();
+      const transactionTable = dexieDB.table('transactions');
+      const oldTransactionData = await transactionTable.toArray();
+      const newTransactionItems = [];
+      oldTransactionData.forEach(item => {
+        const chainInfo = chainInfoMap[item.networkKey];
+        if (!chainInfo) {
+          return;
+        }
+        const direction = item.action === 'send' ? _KoniTypes.TransactionDirection.SEND : _KoniTypes.TransactionDirection.RECEIVED;
+        const extrinsicType = item.changeSymbol === item.feeSymbol ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.TRANSFER_TOKEN;
+        const nativeAsset = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
+        const transferAsset = assetList.find(a => a.originChain === item.networkKey && a.symbol === item.changeSymbol) || nativeAsset;
+        const newItem = {
+          chain: item.networkKey,
+          origin: 'migration',
+          type: extrinsicType,
+          address: item.address,
+          extrinsicHash: item.extrinsicHash,
+          time: item.time,
+          status: item.isSuccess ? _KoniTypes.ExtrinsicStatus.SUCCESS : _KoniTypes.ExtrinsicStatus.FAIL,
+          from: direction === _KoniTypes.TransactionDirection.SEND ? item.address : '',
+          to: direction === _KoniTypes.TransactionDirection.RECEIVED ? item.address : '',
+          amount: {
+            value: item.change,
+            decimals: transferAsset.decimals || 18,
+            symbol: transferAsset.symbol
+          },
+          fee: {
+            value: item.fee,
+            decimals: nativeAsset.decimals,
+            symbol: nativeAsset.symbol
+          },
+          direction: direction,
+          chainType: (0, _utilCrypto.isEthereumAddress)(item.address) ? _KoniTypes.ChainType.EVM : _KoniTypes.ChainType.SUBSTRATE,
+          chainName: chainInfo.name,
+          blockNumber: 0,
+          blockHash: '',
+          data: '',
+          signature: ''
+        };
+        newTransactionItems.push(newItem);
+      });
+      await state.historyService.addHistoryItems(newTransactionItems);
+    } catch (e) {
+      this.logger.error(e);
+    }
+  }
+}
+exports.default = MigrateTransactionHistory;

package/cjs/services/migration-service/scripts/index.js

@@ -4,14 +4,23 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.EVERYTIME = void 0;
+var _AutoEnableChainsTokens = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/AutoEnableChainsTokens"));
 var _MigrateImportedToken = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateImportedToken"));
 var _MigrateNetworkSettings = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateNetworkSettings"));
+var _MigrateSettings = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateSettings"));
+var _MigrateTransactionHistory = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistory"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
+const EVERYTIME = '__everytime__';
+exports.EVERYTIME = EVERYTIME;
 var _default = {
-  '1.0.1-1': _MigrateNetworkSettings.default,
-  '1.0.1-2': _MigrateImportedToken.default
-  // '1.0.1-0': ClearOldStorage
+  '1.0.1-11': _MigrateNetworkSettings.default,
+  '1.0.1-20': _MigrateImportedToken.default,
+  '1.0.1-30': _MigrateTransactionHistory.default,
+  '1.0.1-40': _AutoEnableChainsTokens.default,
+  '1.0.1-50': _MigrateSettings.default
+  // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

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

@@ -9,16 +9,29 @@ var _axios = _interopRequireDefault(require("axios"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+let useBackupApi = false;
 const getTokenPrice = async function (priceIds) {
   let currency = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'usd';
   try {
+    var _res;
     const idStr = Array.from(priceIds).join(',');
-    // const res = await axios.get(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currency}&per_page=250&ids=${idStr}`);
-    const res = await _axios.default.get(`https://chain-data.subwallet.app/api/price/get?ids=${idStr}`);
+    let res;
+    if (!useBackupApi) {
+      try {
+        res = await _axios.default.get(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currency}&per_page=250&ids=${idStr}`);
+      } catch (err) {
+        useBackupApi = true;
+      }
+    }
+    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}`);
+    }
     if (res.status !== 200) {
       console.warn('Failed to get token price');
     }
-    const responseData = res.data;
+    const responseData = res.data || [];
     const priceMap = {};
     const price24hMap = {};
     responseData.forEach(val => {

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

@@ -19,27 +19,27 @@ const DEFAULT_PRICE_SUBJECT = {
 class PriceService {
   priceSubject = new _rxjs.BehaviorSubject(DEFAULT_PRICE_SUBJECT);
   priceIds = new Set();
-  constructor(serviceInfoSubject, dbService, chainService) {
+  constructor(dbService, eventService, chainService) {
     this.dbService = dbService;
+    this.eventService = eventService;
     this.chainService = chainService;
 
     // Fetch data from storage
     this.getPrice().catch(console.error);
+    const eventHandler = () => {
+      const newPriceIds = this.getPriceIds();
 
-    // Add some delay to avoid fetching many times when start extension background
-    // Subscribe service info to update price list
-    setTimeout(() => {
+      // Compare two set newPriceIds and this.priceIds
+      if (newPriceIds.size !== this.priceIds.size || !Array.from(newPriceIds).every(v => this.priceIds.has(v))) {
+        this.priceIds = newPriceIds;
+        this.refreshPriceData(this.priceIds);
+      }
+    };
+    this.eventService.waitAssetReady.then(() => {
       this.refreshPriceData();
-      serviceInfoSubject.subscribe(serviceInfo => {
-        const newPriceIds = this.getPriceIds();
-
-        // Compare two set newPriceIds and this.priceIds
-        if (newPriceIds.size !== this.priceIds.size || !Array.from(newPriceIds).every(v => this.priceIds.has(v))) {
-          this.priceIds = newPriceIds;
-          this.refreshPriceData(this.priceIds);
-        }
-      });
-    }, 3000);
+      this.eventService.on('asset.enable', eventHandler);
+      this.eventService.on('asset.update', eventHandler);
+    }).catch(console.error);
   }
   async getPrice() {
     const isReady = this.priceSubject.value.ready;
@@ -69,9 +69,7 @@ class PriceService {
       });
       this.dbService.updatePriceStore(rs).catch(console.error);
       console.log('Get Token Price From CoinGecko');
-    }).catch(e => {
-      // Pass
-    });
+    }).catch(console.error);
     this.refreshTimeout = setTimeout(this.refreshPriceData.bind(this), _constants.CRON_REFRESH_PRICE_INTERVAL);
   }
 }

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

@@ -3,9 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EXTENSION_REQUEST_URL = void 0;
+exports.PREDEFINED_CHAIN_DAPP_CHAIN_MAP = exports.EXTENSION_REQUEST_URL = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const EXTENSION_REQUEST_URL = 'extension';
-exports.EXTENSION_REQUEST_URL = EXTENSION_REQUEST_URL;
+exports.EXTENSION_REQUEST_URL = EXTENSION_REQUEST_URL;
+const PREDEFINED_CHAIN_DAPP_CHAIN_MAP = {
+  'portal.astar.network': ['astar', 'astarEvm'],
+  'apps.moonbeam.network': ['moonbeam', 'moonriver'],
+  'app.stellaswap.com': ['moonbeam']
+};
+exports.PREDEFINED_CHAIN_DAPP_CHAIN_MAP = PREDEFINED_CHAIN_DAPP_CHAIN_MAP;

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

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _constants = require("@subwallet/extension-base/services/request-service/constants");
 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");
@@ -89,9 +91,39 @@ class AuthRequestHandler {
       });
     });
   }
-  authCompleteV2 = (id, resolve, reject) => {
+  getDAppChainInfo(options) {
+    const chainInfoMaps = this.#chainService.getChainInfoMap();
+    const chainStateMap = this.#chainService.getChainStateMap();
+    let defaultChain = options.defaultChain;
+    const needEnableChains = [];
+    if (options.url) {
+      const domain = (0, _utils2.getDomainFromUrl)(options.url);
+      const predefinedSupportChains = _constants.PREDEFINED_CHAIN_DAPP_CHAIN_MAP[domain];
+      if (predefinedSupportChains) {
+        defaultChain = predefinedSupportChains[0];
+        options.autoActive && needEnableChains.push(...predefinedSupportChains);
+      }
+    }
+    let chainInfo;
+    if (['both', 'evm'].includes(options.accessType)) {
+      const evmChains = Object.values(chainInfoMaps).filter(_utils._isChainEvmCompatible);
+      chainInfo = (defaultChain ? chainInfoMaps[defaultChain] : evmChains.find(chain => {
+        var _chainStateMap$chain$;
+        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);
+        }
+      }
+    }
+    needEnableChains.length > 0 && this.#chainService.enableChains(needEnableChains);
+    return chainInfo;
+  }
+  authCompleteV2 = (id, url, resolve, reject) => {
     const isAllowedMap = this.getAddressList();
     const complete = (result, cb, accounts) => {
+      var _this$getDAppChainInf;
       const isAllowed = result === true;
       let isCancelled = false;
       if (!isAllowed && typeof result === 'object' && result.message === 'Cancelled') {
@@ -124,16 +156,11 @@ class AuthRequestHandler {
           isAllowedMap[acc] = true;
         });
       }
-      let defaultEvmNetworkKey;
-      if (accountAuthType === 'both' || accountAuthType === 'evm') {
-        const defaultChain = Object.values(this.#chainService.getChainInfoMap()).find(chainInfo => {
-          const chainState = this.#chainService.getChainStateByKey(chainInfo.slug);
-          return (0, _utils._isChainEvmCompatible)(chainInfo) && (0, _utils._isChainEnabled)(chainState);
-        });
-        if (defaultChain) {
-          defaultEvmNetworkKey = defaultChain.slug;
-        }
-      }
+      const defaultEvmNetworkKey = (_this$getDAppChainInf = this.getDAppChainInfo({
+        accessType: accountAuthType,
+        url,
+        autoActive: !isCancelled && isAllowed
+      })) === null || _this$getDAppChainInf === void 0 ? void 0 : _this$getDAppChainInf.slug;
       this.getAuthorize(value => {
         let authorizeList = {};
         if (value) {
@@ -224,7 +251,7 @@ class AuthRequestHandler {
     return new Promise((resolve, reject) => {
       const id = (0, _getId.getId)();
       this.#authRequestsV2[id] = {
-        ...this.authCompleteV2(id, resolve, reject),
+        ...this.authCompleteV2(id, url, resolve, reject),
         id,
         idStr,
         request,

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

@@ -104,6 +104,9 @@ class RequestService {
   getAuthRequestV2(id) {
     return this.#authRequestHandler.getAuthRequestV2(id);
   }
+  getDAppChainInfo(options) {
+    return this.#authRequestHandler.getDAppChainInfo(options);
+  }
   get subscribeEvmChainChange() {
     return this.#authRequestHandler.subscribeEvmChainChange;
   }

package/cjs/services/storage-service/DatabaseService.js

@@ -164,7 +164,7 @@ class DatabaseService {
     });
   }
   handleNftTransfer(chain, addresses, nftItem) {
-    return this.stores.nft.deleteNftByAddresses(chain, addresses, nftItem);
+    return this.stores.nft.deleteNftItem(chain, addresses, nftItem);
   }
   removeNfts(chain, address, collectionId, nftIds) {
     this.logger.log(`Remove NFTs [${nftIds.join(', ')}]`);

package/cjs/services/storage-service/databases/index.js

@@ -13,7 +13,7 @@ const DEFAULT_DATABASE = 'SubWalletDB_v2';
 class KoniDatabase extends _dexie.default {
   constructor() {
     let name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DEFAULT_DATABASE;
-    let schemaVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 9;
+    let schemaVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
     super(name);
     this.schemaVersion = schemaVersion;
     this.conditionalVersion(1, {

package/cjs/services/storage-service/db-stores/BaseStoreWithAddressAndChain.js

@@ -16,14 +16,8 @@ class BaseStoreWithAddressAndChain extends _BaseStore.default {
       [v.chain]: v
     }), {});
   }
-  removeAllByAddress(address, chain) {
-    const conditions = {
-      address
-    };
-    if (chain) {
-      conditions.chain = chain;
-    }
-    return this.table.where(conditions).delete();
+  removeAllByAddress(address) {
+    return this.table.where('address').equalsIgnoreCase(address).delete();
   }
   async getDataByAddressAsObject(address) {
     const data = await this.table.where('address').equals(address).toArray();

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

@@ -44,7 +44,10 @@ class NftStore extends _BaseStoreWithAddressAndChain.default {
       chain
     }).and(nft => !collectionIds.some(item => item === nft.collectionId));
   }
-  deleteNftByAddresses(chain, addresses, nftItem) {
+  deleteNftByAddress(addresses) {
+    return this.table.where('address').anyOfIgnoreCase(addresses).delete();
+  }
+  deleteNftItem(chain, addresses, nftItem) {
     return this.table.where('address').anyOfIgnoreCase(addresses).filter(storedItem => storedItem.chain === chain && storedItem.collectionId === nftItem.collectionId && storedItem.id === nftItem.id).delete();
   }
   deleteNftsByCollection(chain, collectionId) {