@subwallet/extension-base 1.0.4-0 → 1.0.5-1

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.KeyringService = void 0;
+var _constants = require("@subwallet/extension-base/constants");
 var _stores = require("@subwallet/extension-base/stores");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _rxjs = require("rxjs");
@@ -46,7 +47,6 @@ class KeyringService {
 
         // Remove account
         removedAddresses.forEach(address => {
-          console.log('account.remove', address);
           this.eventService.emit('account.remove', address);
         });
       } else if (beforeAddresses.length < afterAddresses.length) {
@@ -54,7 +54,6 @@ class KeyringService {
 
         // Add account
         addedAddresses.forEach(address => {
-          console.log('account.add', address);
           this.eventService.emit('account.add', address);
         });
       } else {
@@ -95,5 +94,13 @@ class KeyringService {
     this.eventService.emit('account.updateCurrent', currentAccountData);
     this.currentAccountStore.set('CurrentAccountInfo', currentAccountData);
   }
+  resetWallet(resetAll) {
+    _uiKeyring.keyring.resetWallet(resetAll);
+    this.updateKeyringState();
+    this.currentAccountSubject.next({
+      address: _constants.ALL_ACCOUNT_KEY,
+      currentGenesisHash: null
+    });
+  }
 }
 exports.KeyringService = KeyringService;

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

@@ -17,10 +17,12 @@ class MigrationService {
     this.logger = (0, _util.logger)('Migration');
   }
   async run() {
-    this.logger.log('Migrating...');
     const keys = Object.keys(_scripts.default).sort((a, b) => a.localeCompare(b));
-    try {
-      for (let i = 0; i < keys.length; i++) {
+
+    // Await timeout 2s
+    await new Promise(resolve => setTimeout(resolve, 2000));
+    for (let i = 0; i < keys.length; i++) {
+      try {
         const JobClass = _scripts.default[keys[i]];
         const key = keys[i];
         const name = JobClass.name;
@@ -29,7 +31,6 @@ class MigrationService {
           key
         }).first();
         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({
@@ -38,11 +39,10 @@ class MigrationService {
             timestamp: new Date().getTime()
           });
         }
+      } catch (error) {
+        this.logger.error('Migration error: ', _scripts.default[keys[i]].name, error);
       }
-    } catch (error) {
-      this.logger.error('Migration error: ', error);
     }
-    this.logger.log('Migration done.');
   }
 }
 exports.default = MigrationService;

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

@@ -0,0 +1,39 @@
+"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"));
+// 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.getAuthorize(value => {
+          if (value) {
+            const key = 'app.stellaswap.com';
+            const stellaSwap = value[key];
+            if (stellaSwap) {
+              stellaSwap.currentEvmNetworkKey = 'moonbeam';
+              value[key] = stellaSwap;
+              this.state.setAuthorize(value, () => {
+                resolve();
+              });
+            } else {
+              resolve();
+            }
+          } else {
+            resolve();
+          }
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateSettings;

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

@@ -0,0 +1,30 @@
+"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 _constants = require("@subwallet/extension-base/services/setting-service/constants");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateAutoLock extends _Base.default {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        this.state.settingService.getSettings(currentSettings => {
+          this.state.settingService.setSettings({
+            ...currentSettings,
+            timeAutoLock: _constants.DEFAULT_AUTO_LOCK_TIME
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateAutoLock;

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

@@ -0,0 +1,30 @@
+"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 _constants = require("@subwallet/extension-base/services/setting-service/constants");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateChainPatrol extends _Base.default {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        this.state.settingService.getSettings(currentSettings => {
+          this.state.settingService.setSettings({
+            ...currentSettings,
+            enableChainPatrol: _constants.DEFAULT_CHAIN_PATROL_ENABLE
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateChainPatrol;

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

@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.EVERYTIME = void 0;
 var _AutoEnableChainsTokens = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/AutoEnableChainsTokens"));
+var _MigrateAuthUrls = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateAuthUrls"));
+var _MigrateAutoLock = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateAutoLock"));
+var _MigrateChainPatrol = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateChainPatrol"));
 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"));
@@ -20,7 +23,10 @@ var _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
+  '1.0.1-50': _MigrateSettings.default,
+  '1.0.1-60': _MigrateAuthUrls.default,
+  '1.0.3-01': _MigrateAutoLock.default,
+  '1.0.3-02': _MigrateChainPatrol.default
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

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

@@ -45,7 +45,7 @@ const getTokenPrice = async function (priceIds) {
       price24hMap
     };
   } catch (err) {
-    console.error('Failed to get token price', err);
+    console.error(err);
     throw err;
   }
 };

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

@@ -40,7 +40,6 @@ class PriceService {
   }
   refreshPriceData(priceIds) {
     clearTimeout(this.refreshTimeout);
-    console.log('Refresh Price Data');
     this.priceIds = priceIds || this.getPriceIds();
 
     // Update for tokens price
@@ -69,7 +68,6 @@ class PriceService {
     await this.eventService.waitAssetReady;
     this.status = _types.ServiceStatus.INITIALIZED;
     this.eventService.on('asset.updateState', eventHandler);
-    this.eventService.on('asset.updateState', eventHandler);
   }
   async loadData() {
     const data = await this.dbService.getPriceStore();
@@ -80,7 +78,6 @@ class PriceService {
   }
   startPromiseHandler = (0, _promise.createPromiseHandler)();
   async start() {
-    console.debug('Start price service');
     try {
       this.startPromiseHandler = (0, _promise.createPromiseHandler)();
       this.status = _types.ServiceStatus.STARTING;
@@ -97,7 +94,6 @@ class PriceService {
   }
   stopPromiseHandler = (0, _promise.createPromiseHandler)();
   async stop() {
-    console.debug('Stop price service');
     try {
       this.status = _types.ServiceStatus.STOPPING;
       this.stopPromiseHandler = (0, _promise.createPromiseHandler)();

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

@@ -79,7 +79,7 @@ class AuthRequestHandler {
       update(this.authorizeCached);
     } else {
       this.authorizeStore.get('authUrls', data => {
-        this.authorizeCached = data;
+        this.authorizeCached = data || {};
         update(this.authorizeCached);
       });
     }
@@ -298,5 +298,12 @@ class AuthRequestHandler {
       });
     });
   }
+  resetWallet() {
+    for (const request of Object.values(this.#authRequestsV2)) {
+      request.reject(new Error('Reset wallet'));
+    }
+    this.authSubjectV2.next([]);
+    this.setAuthorize({});
+  }
 }
 exports.default = AuthRequestHandler;

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

@@ -209,5 +209,26 @@ class EvmRequestHandler {
     }
     return true;
   }
+  resetWallet() {
+    const confirmations = this.confirmationsQueueSubject.getValue();
+    for (const [type, requests] of Object.entries(confirmations)) {
+      for (const confirmation of Object.values(requests)) {
+        const {
+          id
+        } = confirmation;
+        const {
+          resolver
+        } = this.confirmationsPromiseMap[id];
+        if (!resolver || !confirmation) {
+          console.error('Not found confirmation', type, id);
+        } else {
+          resolver.reject(new Error('Reset wallet'));
+        }
+        delete this.confirmationsPromiseMap[id];
+        delete confirmations[type][id];
+      }
+    }
+    this.confirmationsQueueSubject.next(confirmations);
+  }
 }
 exports.default = EvmRequestHandler;

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

@@ -81,5 +81,11 @@ class MetadataRequestHandler {
       this.#requestService.popupOpen();
     });
   }
+  resetWallet() {
+    for (const request of Object.values(this.#metaRequests)) {
+      request.reject(new Error('Reset wallet'));
+    }
+    this.metaSubject.next([]);
+  }
 }
 exports.default = MetadataRequestHandler;

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

@@ -101,5 +101,11 @@ class SubstrateRequestHandler {
       }
     });
   }
+  resetWallet() {
+    for (const request of Object.values(this.#substrateRequests)) {
+      request.reject(new Error('Reset wallet'));
+    }
+    this.signSubject.next([]);
+  }
 }
 exports.default = SubstrateRequestHandler;

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

@@ -166,5 +166,11 @@ class RequestService {
   get numRequests() {
     return this.numMetaRequests + this.numAuthRequests + this.numSubstrateRequests + this.numEvmRequests;
   }
+  resetWallet() {
+    this.#authRequestHandler.resetWallet();
+    this.#substrateRequestHandler.resetWallet();
+    this.#evmRequestHandler.resetWallet();
+    this.#metadataRequestHandler.resetWallet();
+  }
 }
 exports.default = RequestService;

package/cjs/services/setting-service/SettingService.js

@@ -18,15 +18,7 @@ class SettingService {
   getSettings(update) {
     this.settingsStore.get('Settings', value => {
       if (!value) {
-        update({
-          // language: 'en',
-          browserConfirmationType: _constants.DEFAULT_NOTIFICATION_TYPE,
-          // isShowZeroBalance: true,
-          isShowBalance: false,
-          accountAllLogo: '',
-          theme: _constants.DEFAULT_THEME,
-          camera: false
-        });
+        update(_constants.DEFAULT_SETTING);
       } else {
         update(value);
       }
@@ -35,5 +27,8 @@ class SettingService {
   setSettings(data, callback) {
     this.settingsStore.set('Settings', data, callback);
   }
+  resetWallet() {
+    this.settingsStore.set('Settings', _constants.DEFAULT_SETTING);
+  }
 }
 exports.default = SettingService;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEFAULT_THEME = exports.DEFAULT_NOTIFICATION_TYPE = void 0;
+exports.DEFAULT_THEME = exports.DEFAULT_SETTING = exports.DEFAULT_NOTIFICATION_TYPE = exports.DEFAULT_CHAIN_PATROL_ENABLE = exports.DEFAULT_AUTO_LOCK_TIME = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -11,4 +11,20 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 const DEFAULT_THEME = _KoniTypes.ThemeNames.DARK;
 exports.DEFAULT_THEME = DEFAULT_THEME;
 const DEFAULT_NOTIFICATION_TYPE = 'popup';
-exports.DEFAULT_NOTIFICATION_TYPE = DEFAULT_NOTIFICATION_TYPE;
+exports.DEFAULT_NOTIFICATION_TYPE = DEFAULT_NOTIFICATION_TYPE;
+const DEFAULT_AUTO_LOCK_TIME = 15;
+exports.DEFAULT_AUTO_LOCK_TIME = DEFAULT_AUTO_LOCK_TIME;
+const DEFAULT_CHAIN_PATROL_ENABLE = false;
+exports.DEFAULT_CHAIN_PATROL_ENABLE = DEFAULT_CHAIN_PATROL_ENABLE;
+const DEFAULT_SETTING = {
+  // language: 'en',
+  browserConfirmationType: DEFAULT_NOTIFICATION_TYPE,
+  // isShowZeroBalance: true,
+  isShowBalance: false,
+  accountAllLogo: '',
+  theme: DEFAULT_THEME,
+  camera: false,
+  timeAutoLock: DEFAULT_AUTO_LOCK_TIME,
+  enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE
+};
+exports.DEFAULT_SETTING = DEFAULT_SETTING;

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

@@ -45,6 +45,7 @@ class DatabaseService {
       const rs = await this.stores.price.table.get('usd');
       return rs;
     } catch (e) {
+      this.logger.error(e);
       return undefined;
     }
   }
@@ -55,8 +56,6 @@ class DatabaseService {
   }
   async updateBalanceStore(address, item) {
     if (item.state === _KoniTypes.APIItemState.READY) {
-      // this.logger.log(`Updating balance for [${item.tokenSlug}]`);
-
       return this.stores.balance.upsert({
         address,
         ...item
@@ -64,23 +63,18 @@ class DatabaseService {
     }
   }
   async removeFromBalanceStore(assets) {
-    this.logger.log('Bulk removing AssetStore');
     return this.stores.balance.removeBySlugs(assets);
   }
 
   // Crowdloan
   async updateCrowdloanStore(chain, address, item) {
     if (item.state === _KoniTypes.APIItemState.READY && item.contribute !== '0') {
-      // this.logger.log(`Updating crowdloan for [${chain}]`);
-
       return this.stores.crowdloan.upsert({
         chain,
         address,
         ...item
       });
     } else {
-      // this.logger.debug(`Removing crowdloan for [${chain}]`);
-
       return this.stores.crowdloan.deleteByChainAndAddress(chain, address);
     }
   }
@@ -88,22 +82,16 @@ class DatabaseService {
   // Staking
   async updateStaking(chain, address, item) {
     if (item.state === _KoniTypes.APIItemState.READY) {
-      // this.logger.log(`Updating staking for [${chain}]`);
-
       return this.stores.staking.upsert(item);
     }
   }
   async getStakings(addresses, chains) {
-    // this.logger.log('Get Stakings: ', stakings);
-
     return this.stores.staking.getStakings(addresses, chains);
   }
   async getStakingsByChains(chains) {
     return this.stores.staking.getStakingsByChains(chains);
   }
   async getPooledStakings(addresses, chainHashes) {
-    // this.logger.log('Get Pooled Stakings: ', stakings);
-
     return this.stores.staking.getPooledStakings(addresses, chainHashes);
   }
   subscribeStaking(addresses, chainList, callback) {
@@ -129,12 +117,10 @@ class DatabaseService {
     return this.stores.transaction.queryHistory(query);
   }
   async upsertHistory(histories) {
-    // this.logger.log('Updating transaction histories');
     const cleanedHistory = histories.filter(x => x && x.address && x.chain && x.extrinsicHash);
     return this.stores.transaction.bulkUpsert(cleanedHistory);
   }
   async updateHistoryByNewExtrinsicHash(extrinsicHash, updateData) {
-    // this.logger.log('Updating transaction histories');
     const canUpdate = updateData && extrinsicHash;
     if (!canUpdate) {
       return;
@@ -146,8 +132,6 @@ class DatabaseService {
 
   // NFT Collection
   async addNftCollection(collection) {
-    // this.logger.log(`Updating NFT collection for [${collection.chain}]`);
-
     return this.stores.nftCollection.upsert(collection);
   }
   async deleteNftCollection(chain, collectionId) {
@@ -170,18 +154,12 @@ class DatabaseService {
     if (ownNothing) {
       return this.stores.nft.deleteNftsByChainAndOwner(chain, (0, _utils.reformatAddress)(owner, 42));
     }
-    const result = await this.stores.nft.cleanUpNfts(chain, (0, _utils.reformatAddress)(owner, 42), collectionIds, nftIds);
-    result > 0 && console.debug(`Cleaned up ${result} NFTs on chain ${chain} for owner ${(0, _utils.reformatAddress)(owner, 42)}`, collectionIds, nftIds);
-    return result;
+    return this.stores.nft.cleanUpNfts(chain, (0, _utils.reformatAddress)(owner, 42), collectionIds, nftIds);
   }
   async getNft(addresses, chainHashes) {
-    // this.logger.log('Get NFTs: ', nfts);
-
     return this.stores.nft.getNft(addresses, chainHashes);
   }
   async addNft(address, nft) {
-    // this.logger.log(`Updating NFT for [${nft.chain}]`);
-
     return this.stores.nft.upsert({
       ...nft,
       address
@@ -191,54 +169,36 @@ class DatabaseService {
     return this.stores.nft.deleteNftItem(chain, addresses, nftItem);
   }
   removeNfts(chain, address, collectionId, nftIds) {
-    // this.logger.log(`Remove NFTs [${nftIds.join(', ')}]`);
-
     return this.stores.nft.removeNfts(chain, address, collectionId, nftIds);
   }
 
   // Chain
   async updateChainStore(item) {
-    // this.logger.log(`Updating storageInfo for chain [${item.slug}]`);
-
     return this.stores.chain.upsert(item);
   }
   async bulkUpdateChainStore(data) {
-    // this.logger.log('Bulk updating ChainStore');
-
     return this.stores.chain.bulkUpsert(data);
   }
   async removeFromChainStore(chains) {
-    // this.logger.log('Bulk removing ChainStore');
-
     return this.stores.chain.removeChains(chains);
   }
   async getAllChainStore() {
-    // this.logger.log('Get all chains: ', allChains);
-
     return this.stores.chain.getAll();
   }
 
   // Asset
   async updateAssetStore(item) {
-    // this.logger.log(`Updating storageInfo for chainAsset [${item.originChain}]`);
-
     return this.stores.asset.upsert(item);
   }
   async getAllAssetStore() {
-    // this.logger.log('Get all stored assets: ', allAssets);
-
     return this.stores.asset.getAll();
   }
   async removeFromAssetStore(items) {
-    // this.logger.log('Bulk removing AssetStore');
-
     return this.stores.asset.removeAssets(items);
   }
 
   // Staking
   async updateChainStakingMetadata(item) {
-    // this.logger.log('Update ChainStakingMetadata: ', item.chain);
-
     return this.stores.chainStakingMetadata.upsert(item);
   }
   async getChainStakingMetadata() {
@@ -249,12 +209,24 @@ class DatabaseService {
     return this.stores.chainStakingMetadata.getByChainAndType(chain, type);
   }
   async updateNominatorMetadata(item) {
-    // this.logger.log('Update NominatorMetadata: ', item.address, item.chain);
-
     return this.stores.nominatorMetadata.upsert(item);
   }
   async getNominatorMetadata() {
     return this.stores.nominatorMetadata.getAll();
   }
+  async resetWallet(resetAll) {
+    return new Promise((resolve, reject) => {
+      const stores = [this.stores.balance, this.stores.nft, this.stores.nftCollection, this.stores.crowdloan, this.stores.staking, this.stores.transaction, this.stores.nominatorMetadata];
+      if (resetAll) {
+        stores.push(this.stores.chain, this.stores.asset);
+      }
+      const promises = stores.map(store => store.clear());
+      Promise.all(promises).then(() => {
+        resolve();
+      }).catch(e => {
+        reject(e);
+      });
+    });
+  }
 }
 exports.default = DatabaseService;

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] : 10;
+    let schemaVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 11;
     super(name);
     this.schemaVersion = schemaVersion;
     this.conditionalVersion(1, {

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

@@ -25,5 +25,8 @@ class BaseStore {
   remove(record) {
     return this.table.delete(record);
   }
+  clear() {
+    return this.table.clear();
+  }
 }
 exports.default = BaseStore;

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

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TRANSACTION_TIMEOUT = void 0;
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const TRANSACTION_TIMEOUT = 2 * 60 * 1000;
+exports.TRANSACTION_TIMEOUT = TRANSACTION_TIMEOUT;