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

package/services/chain-service/index.js

@@ -471,31 +471,43 @@ export class ChainService {
     return duplicatedSlug;
   }
   async fetchLatestData(src, defaultValue) {
-    try {
-      const timeout = await new Promise(resolve => {
-        const id = setTimeout(() => {
-          clearTimeout(id);
-          resolve(null);
-        }, 1000);
-      });
-      let result = defaultValue;
-      const resp = (await Promise.race([timeout, fetch(src)])) || null;
-      if (!resp) {
-        return result;
-      }
-      if (resp.ok) {
-        try {
-          result = await resp.json();
-        } catch (err) {
-          console.warn('Error parsing latest data', src, err);
-        }
-      }
-      return result;
-    } catch (e) {
-      console.warn('Error fetching latest data', src, e);
-      return defaultValue;
-    }
+    return Promise.resolve(defaultValue);
+    // try {
+    //   const timeout = new Promise((resolve) => {
+    //     const id = setTimeout(() => {
+    //       clearTimeout(id);
+    //       resolve(null);
+    //     }, 1500);
+    //   });
+    //   let result = defaultValue;
+    //   const resp = await Promise.race([
+    //     timeout,
+    //     fetch(src)
+    //   ]) as Response || null;
+    //
+    //   if (!resp) {
+    //     console.warn('Error fetching latest data', src);
+    //
+    //     return result;
+    //   }
+    //
+    //   if (resp.ok) {
+    //     try {
+    //       result = await resp.json();
+    //       console.log('Fetched latest data', src);
+    //     } catch (err) {
+    //       console.warn('Error parsing latest data', src, err);
+    //     }
+    //   }
+    //
+    //   return result;
+    // } catch (e) {
+    //   console.warn('Error fetching latest data', src, e);
+    //
+    //   return defaultValue;
+    // }
   }
+
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
     const latestChainInfoMap = await this.fetchLatestData(_CHAIN_INFO_SRC, ChainInfoMap);
@@ -1181,13 +1193,12 @@ export class ChainService {
     }
     return this.assetSettingSubject.value;
   }
-  async updateAssetSetting(assetSlug, assetSetting) {
+  async updateAssetSetting(assetSlug, assetSetting, autoEnableNativeToken) {
     const currentAssetSettings = await this.getAssetSettings();
     let needUpdateSubject;
 
     // Update settings
     currentAssetSettings[assetSlug] = assetSetting;
-    this.setAssetSettings(currentAssetSettings);
     if (assetSetting.visible) {
       const assetInfo = this.getAssetBySlug(assetSlug);
       const chainState = this.getChainStateByKey(assetInfo.originChain);
@@ -1196,8 +1207,15 @@ export class ChainService {
       if (chainState && !chainState.active) {
         this.enableChain(chainState.slug);
         needUpdateSubject = true;
+        if (autoEnableNativeToken) {
+          const nativeAsset = this.getNativeTokenInfo(assetInfo.originChain);
+          currentAssetSettings[nativeAsset.slug] = {
+            visible: true
+          };
+        }
       }
     }
+    this.setAssetSettings(currentAssetSettings);
     return needUpdateSubject;
   }
   async updateAssetSettingByChain(chainSlug, visible) {
@@ -1220,4 +1238,35 @@ export class ChainService {
   async getAssetLogoMap() {
     return await this.fetchLatestData(_ASSET_LOGO_MAP_SRC, AssetLogoMap);
   }
+  resetWallet(resetAll) {
+    if (resetAll) {
+      this.setAssetSettings({});
+
+      // Disconnect chain
+      const activeChains = this.getActiveChainInfos();
+      for (const chain of Object.keys(activeChains)) {
+        if (!_DEFAULT_ACTIVE_CHAINS.includes(chain)) {
+          this.disableChain(chain);
+        }
+      }
+
+      // Remove custom chain
+      const allChains = this.getChainInfoMap();
+      for (const chain of Object.keys(allChains)) {
+        if (_isCustomChain(chain)) {
+          this.removeCustomChain(chain);
+        }
+      }
+
+      // Remove custom asset
+      const assetSettings = this.getAssetSettings();
+      const customToken = [];
+      for (const asset of Object.keys(assetSettings)) {
+        if (_isCustomAsset(asset)) {
+          customToken.push(asset);
+        }
+      }
+      this.deleteCustomAssets(customToken);
+    }
+  }
 }

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

@@ -18,4 +18,5 @@ export declare class KeyringService {
     get addresses(): SubjectInfo;
     get currentAccount(): CurrentAccountInfo;
     setCurrentAccount(currentAccountData: CurrentAccountInfo): void;
+    resetWallet(resetAll: boolean): void;
 }

package/services/keyring-service/index.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { CurrentAccountStore } from '@subwallet/extension-base/stores';
 import { keyring } from '@subwallet/ui-keyring';
 import { BehaviorSubject } from 'rxjs';
@@ -88,4 +89,12 @@ export class KeyringService {
     this.eventService.emit('account.updateCurrent', currentAccountData);
     this.currentAccountStore.set('CurrentAccountInfo', currentAccountData);
   }
+  resetWallet(resetAll) {
+    keyring.resetWallet(resetAll);
+    this.updateKeyringState();
+    this.currentAccountSubject.next({
+      address: ALL_ACCOUNT_KEY,
+      currentGenesisHash: null
+    });
+  }
 }

package/services/migration-service/index.js

@@ -11,8 +11,11 @@ export default class MigrationService {
   async run() {
     this.logger.log('Migrating...');
     const keys = Object.keys(MigrationScripts).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 = MigrationScripts[keys[i]];
         const key = keys[i];
         const name = JobClass.name;
@@ -30,9 +33,9 @@ export default class MigrationService {
             timestamp: new Date().getTime()
           });
         }
+      } catch (error) {
+        this.logger.error('Migration error: ', MigrationScripts[keys[i]].name, error);
       }
-    } catch (error) {
-      this.logger.error('Migration error: ', error);
     }
     this.logger.log('Migration done.');
   }

package/services/migration-service/scripts/MigrateAuthUrls.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateSettings extends BaseMigrationJob {
+    run(): Promise<void>;
+}

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

@@ -0,0 +1,31 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateSettings extends BaseMigrationJob {
+  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);
+    }
+  }
+}

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import AutoEnableChainsTokens from '@subwallet/extension-base/services/migration-service/scripts/AutoEnableChainsTokens';
+import MigrateAuthUrls from '@subwallet/extension-base/services/migration-service/scripts/MigrateAuthUrls';
 import MigrateImportedToken from '@subwallet/extension-base/services/migration-service/scripts/MigrateImportedToken';
 import MigrateNetworkSettings from '@subwallet/extension-base/services/migration-service/scripts/MigrateNetworkSettings';
 import MigrateSettings from '@subwallet/extension-base/services/migration-service/scripts/MigrateSettings';
@@ -12,6 +13,7 @@ export default {
   '1.0.1-20': MigrateImportedToken,
   '1.0.1-30': MigrateTransactionHistory,
   '1.0.1-40': AutoEnableChainsTokens,
-  '1.0.1-50': MigrateSettings
+  '1.0.1-50': MigrateSettings,
+  '1.0.1-60': MigrateAuthUrls
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/price-service/index.js

@@ -63,7 +63,6 @@ export class PriceService {
     await this.eventService.waitAssetReady;
     this.status = ServiceStatus.INITIALIZED;
     this.eventService.on('asset.updateState', eventHandler);
-    this.eventService.on('asset.updateState', eventHandler);
   }
   async loadData() {
     const data = await this.dbService.getPriceStore();

package/services/request-service/handler/AuthRequestHandler.d.ts

@@ -35,4 +35,5 @@ export default class AuthRequestHandler {
     get subscribeEvmChainChange(): Subject<AuthUrls>;
     get subscribeAuthorizeUrlSubject(): Subject<AuthUrls>;
     ensureUrlAuthorizedV2(url: string): Promise<boolean>;
+    resetWallet(): void;
 }

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

@@ -283,4 +283,11 @@ export default class AuthRequestHandler {
       });
     });
   }
+  resetWallet() {
+    for (const request of Object.values(this.#authRequestsV2)) {
+      request.reject(new Error('Reset wallet'));
+    }
+    this.authSubjectV2.next([]);
+    this.setAuthorize({});
+  }
 }

package/services/request-service/handler/EvmRequestHandler.d.ts

@@ -16,4 +16,5 @@ export default class EvmRequestHandler {
     private signTransaction;
     private decorateResult;
     completeConfirmation(request: RequestConfirmationComplete): Promise<boolean>;
+    resetWallet(): void;
 }

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

@@ -200,4 +200,25 @@ export default 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);
+  }
 }

package/services/request-service/handler/MetadataRequestHandler.d.ts

@@ -15,4 +15,5 @@ export default class MetadataRequestHandler {
     private updateIconMeta;
     private metaComplete;
     injectMetadata(url: string, request: MetadataDef): Promise<boolean>;
+    resetWallet(): void;
 }

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

@@ -72,4 +72,10 @@ export default class MetadataRequestHandler {
       this.#requestService.popupOpen();
     });
   }
+  resetWallet() {
+    for (const request of Object.values(this.#metaRequests)) {
+      request.reject(new Error('Reset wallet'));
+    }
+    this.metaSubject.next([]);
+  }
 }

package/services/request-service/handler/SubstrateRequestHandler.d.ts

@@ -14,4 +14,5 @@ export default class SubstrateRequestHandler {
     get numSubstrateRequests(): number;
     sign(url: string, request: RequestSign, account: AccountJson): Promise<ResponseSigning>;
     signTransaction(id: string, address: string, url: string, payload: SignerPayloadJSON): Promise<ResponseSigning>;
+    resetWallet(): void;
 }

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

@@ -91,4 +91,10 @@ export default class SubstrateRequestHandler {
       }
     });
   }
+  resetWallet() {
+    for (const request of Object.values(this.#substrateRequests)) {
+      request.reject(new Error('Reset wallet'));
+    }
+    this.signSubject.next([]);
+  }
 }

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

@@ -51,4 +51,5 @@ export default class RequestService {
     addConfirmation<CT extends ConfirmationType>(id: string, url: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): Promise<ConfirmationDefinitions[CT][1]>;
     completeConfirmation(request: RequestConfirmationComplete): Promise<boolean>;
     get numRequests(): number;
+    resetWallet(): void;
 }

package/services/request-service/index.js

@@ -156,4 +156,10 @@ export default 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();
+  }
 }

package/services/setting-service/SettingService.d.ts

@@ -5,4 +5,5 @@ export default class SettingService {
     getSubject(): Subject<RequestSettingsType>;
     getSettings(update: (value: RequestSettingsType) => void): void;
     setSettings(data: RequestSettingsType, callback?: () => void): void;
+    resetWallet(): void;
 }

package/services/setting-service/SettingService.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import SettingsStore from '@subwallet/extension-base/stores/Settings';
-import { DEFAULT_NOTIFICATION_TYPE, DEFAULT_THEME } from "./constants.js";
+import { DEFAULT_SETTING } from "./constants.js";
 export default class SettingService {
   settingsStore = new SettingsStore();
   getSubject() {
@@ -11,15 +11,7 @@ export default class SettingService {
   getSettings(update) {
     this.settingsStore.get('Settings', value => {
       if (!value) {
-        update({
-          // language: 'en',
-          browserConfirmationType: DEFAULT_NOTIFICATION_TYPE,
-          // isShowZeroBalance: true,
-          isShowBalance: false,
-          accountAllLogo: '',
-          theme: DEFAULT_THEME,
-          camera: false
-        });
+        update(DEFAULT_SETTING);
       } else {
         update(value);
       }
@@ -28,4 +20,7 @@ export default class SettingService {
   setSettings(data, callback) {
     this.settingsStore.set('Settings', data, callback);
   }
+  resetWallet() {
+    this.settingsStore.set('Settings', DEFAULT_SETTING);
+  }
 }

package/services/setting-service/constants.d.ts

@@ -1,3 +1,4 @@
-import { BrowserConfirmationType, ThemeNames } from '@subwallet/extension-base/background/KoniTypes';
+import { BrowserConfirmationType, RequestSettingsType, ThemeNames } from '@subwallet/extension-base/background/KoniTypes';
 export declare const DEFAULT_THEME: ThemeNames;
 export declare const DEFAULT_NOTIFICATION_TYPE: BrowserConfirmationType;
+export declare const DEFAULT_SETTING: RequestSettingsType;

package/services/setting-service/constants.js

@@ -3,4 +3,13 @@
 
 import { ThemeNames } from '@subwallet/extension-base/background/KoniTypes';
 export const DEFAULT_THEME = ThemeNames.DARK;
-export const DEFAULT_NOTIFICATION_TYPE = 'popup';
+export const DEFAULT_NOTIFICATION_TYPE = 'popup';
+export const DEFAULT_SETTING = {
+  // language: 'en',
+  browserConfirmationType: DEFAULT_NOTIFICATION_TYPE,
+  // isShowZeroBalance: true,
+  isShowBalance: false,
+  accountAllLogo: '',
+  theme: DEFAULT_THEME,
+  camera: false
+};

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

@@ -63,4 +63,5 @@ export default class DatabaseService {
     getStakingMetadataByChain(chain: string, type?: StakingType): Promise<ChainStakingMetadata | undefined>;
     updateNominatorMetadata(item: NominatorMetadata): Promise<unknown>;
     getNominatorMetadata(): Promise<NominatorMetadata[]>;
+    resetWallet(resetAll: boolean): Promise<void>;
 }

package/services/storage-service/DatabaseService.js

@@ -248,4 +248,18 @@ export default class DatabaseService {
   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);
+      });
+    });
+  }
 }

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

@@ -4,7 +4,7 @@
 import Dexie from 'dexie';
 const DEFAULT_DATABASE = 'SubWalletDB_v2';
 export default class KoniDatabase extends Dexie {
-  constructor(name = DEFAULT_DATABASE, schemaVersion = 10) {
+  constructor(name = DEFAULT_DATABASE, schemaVersion = 11) {
     super(name);
     this.schemaVersion = schemaVersion;
     this.conditionalVersion(1, {

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

@@ -8,4 +8,5 @@ export default class BaseStore<T> {
     upsert(record: T): Promise<unknown>;
     bulkUpsert(records: T[]): Promise<unknown>;
     remove(record: T): Promise<void>;
+    clear(): Promise<void>;
 }

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

@@ -19,4 +19,7 @@ export default class BaseStore {
   remove(record) {
     return this.table.delete(record);
   }
+  clear() {
+    return this.table.clear();
+  }
 }

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

@@ -45,4 +45,5 @@ export default class TransactionService {
     generateHashPayload(chain: string, transaction: TransactionConfig): HexString;
     private signAndSendEvmTransaction;
     private signAndSendSubstrateTransaction;
+    resetWallet(): void;
 }

package/services/transaction-service/index.js

@@ -779,4 +779,7 @@ export default class TransactionService {
     });
     return emitter;
   }
+  resetWallet() {
+    this.transactionSubject.next({});
+  }
 }