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

package/koni/background/handlers/Extension.js

@@ -894,7 +894,7 @@ export default class KoniExtension {
   }
   async updateAssetSetting(params) {
     try {
-      await this.#koniState.chainService.updateAssetSetting(params.tokenSlug, params.assetSetting);
+      await this.#koniState.chainService.updateAssetSetting(params.tokenSlug, params.assetSetting, params.autoEnableNativeToken);
       this.#koniState.eventService.emit('asset.updateState', params.tokenSlug);
       return true;
     } catch (e) {
@@ -2386,6 +2386,11 @@ export default class KoniExtension {
       chainType: ChainType.SUBSTRATE
     });
   }
+
+  /// Keyring state
+
+  // Subscribe keyring state
+
   keyringStateSubscribe(id, port) {
     const cb = createSubscription(id, port);
     const keyringStateSubject = this.#koniState.keyringService.keyringStateSubject;
@@ -2396,6 +2401,9 @@ export default class KoniExtension {
     });
     return this.#koniState.keyringService.keyringState;
   }
+
+  // Change master password
+
   keyringChangeMasterPassword({
     createNew,
     newPassword,
@@ -2431,6 +2439,9 @@ export default class KoniExtension {
       errors: []
     };
   }
+
+  // Migrate password
+
   keyringMigrateMasterPassword({
     address,
     password
@@ -2449,6 +2460,9 @@ export default class KoniExtension {
       errors: []
     };
   }
+
+  // Unlock wallet
+
   keyringUnlock({
     password
   }) {
@@ -2466,11 +2480,17 @@ export default class KoniExtension {
       errors: []
     };
   }
+
+  // Lock wallet
+
   keyringLock() {
     keyring.lockAll();
     this.#koniState.updateKeyringState();
     clearTimeout(this.#lockTimeOut);
   }
+
+  // Export mnemonic
+
   keyringExportMnemonic({
     address,
     password
@@ -2482,6 +2502,25 @@ export default class KoniExtension {
     };
   }
 
+  // Reset wallet
+
+  async resetWallet({
+    resetAll
+  }) {
+    try {
+      await this.#koniState.resetWallet(resetAll);
+      return {
+        errors: [],
+        status: true
+      };
+    } catch (e) {
+      return {
+        errors: [e.message],
+        status: false
+      };
+    }
+  }
+
   /// Signing external request
   signingApprovePasswordV2({
     id
@@ -3154,6 +3193,8 @@ export default class KoniExtension {
         return this.keyringLock();
       case 'pri(keyring.export.mnemonic)':
         return this.keyringExportMnemonic(request);
+      case 'pri(keyring.reset)':
+        return await this.resetWallet(request);
 
       /// Signing external
       case 'pri(signing.approve.passwordV2)':

package/koni/background/handlers/State.d.ts

@@ -221,5 +221,6 @@ export default class KoniState {
     onAccountRemove(): void;
     reloadNft(): Promise<boolean>;
     reloadStaking(): Promise<boolean>;
+    resetWallet(resetAll: boolean): Promise<void>;
 }
 export {};

package/koni/background/handlers/State.js

@@ -1426,4 +1426,16 @@ export default class KoniState {
   async reloadStaking() {
     return await this.cron.reloadStaking();
   }
+  async resetWallet(resetAll) {
+    this.keyringService.resetWallet(resetAll);
+    this.requestService.resetWallet();
+    this.transactionService.resetWallet();
+    await this.dbService.resetWallet(resetAll);
+    this.accountRefStore.set('refList', []);
+    if (resetAll) {
+      this.settingService.resetWallet();
+    }
+    this.chainService.resetWallet(resetAll);
+    await this.chainService.init();
+  }
 }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.3-0",
+  "version": "1.0.4-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -530,10 +530,10 @@
       "require": "./cjs/services/chain-service/handler/types.js",
       "default": "./services/chain-service/handler/types.js"
     },
-    "./services/chain-service/heath-check": {
-      "types": "./services/chain-service/heath-check/index.d.ts",
-      "require": "./cjs/services/chain-service/heath-check/index.js",
-      "default": "./services/chain-service/heath-check/index.js"
+    "./services/chain-service/health-check": {
+      "types": "./services/chain-service/health-check/index.d.ts",
+      "require": "./cjs/services/chain-service/health-check/index.js",
+      "default": "./services/chain-service/health-check/index.js"
     },
     "./services/chain-service/helper": {
       "types": "./services/chain-service/helper/index.d.ts",
@@ -1225,6 +1225,11 @@
       "require": "./cjs/services/migration-service/scripts/ClearOldStorage.js",
       "default": "./services/migration-service/scripts/ClearOldStorage.js"
     },
+    "./services/migration-service/scripts/MigrateAuthUrls": {
+      "types": "./services/migration-service/scripts/MigrateAuthUrls.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateAuthUrls.js",
+      "default": "./services/migration-service/scripts/MigrateAuthUrls.js"
+    },
     "./services/migration-service/scripts/MigrateImportedToken": {
       "types": "./services/migration-service/scripts/MigrateImportedToken.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateImportedToken.js",
@@ -1649,7 +1654,7 @@
     "@polkadot/hw-ledger": "^10.1.9",
     "@polkadot/keyring": "^10.2.1",
     "@polkadot/networks": "^10.2.1",
-    "@polkadot/phishing": "^0.21.1",
+    "@polkadot/phishing": "^0.21.2",
     "@polkadot/react-identicon": "^2.9.14",
     "@polkadot/react-qr": "^2.9.14",
     "@polkadot/rpc-provider": "^9.10.3",
@@ -1667,12 +1672,12 @@
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.18",
     "@subwallet/chain-list": "^0.1.2",
-    "@subwallet/extension-base": "^1.0.3-0",
-    "@subwallet/extension-chains": "^1.0.3-0",
-    "@subwallet/extension-dapp": "^1.0.3-0",
-    "@subwallet/extension-inject": "^1.0.3-0",
+    "@subwallet/extension-base": "^1.0.4-1",
+    "@subwallet/extension-chains": "^1.0.4-1",
+    "@subwallet/extension-dapp": "^1.0.4-1",
+    "@subwallet/extension-inject": "^1.0.4-1",
     "@subwallet/keyring": "^0.0.5",
-    "@subwallet/ui-keyring": "^0.0.3",
+    "@subwallet/ui-keyring": "^0.0.7",
     "@unique-nft/types": "^0.6.0-4",
     "@zeitgeistpm/type-defs": "^0.10.0",
     "@zeroio/type-definitions": "^0.0.14",
@@ -1702,10 +1707,10 @@
     "protobufjs": "^7.1.2",
     "rlp": "^3.0.0",
     "rxjs": "^7.8.0",
-    "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"
+    "web3": "^1.10.0",
+    "web3-core": "^1.10.0",
+    "web3-core-helpers": "^1.10.0",
+    "web3-eth-contract": "^1.10.0",
+    "web3-utils": "^1.10.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.3-0'
+  version: '1.0.4-1'
 };

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

@@ -75,3 +75,9 @@ export declare const _XCM_TYPE: {
     PR: string;
 };
 export declare const _DEFAULT_ACTIVE_CHAINS: string[];
+export declare const _CHAIN_INFO_SRC: string;
+export declare const _CHAIN_ASSET_SRC: string;
+export declare const _ASSET_REF_SRC: string;
+export declare const _MULTI_CHAIN_ASSET_SRC: string;
+export declare const _CHAIN_LOGO_MAP_SRC: string;
+export declare const _ASSET_LOGO_MAP_SRC: string;

package/services/chain-service/constants.js

@@ -201,4 +201,13 @@ export const _XCM_TYPE = {
   PR: `${_SubstrateChainType.PARACHAIN}-${_SubstrateChainType.RELAYCHAIN}` // UMP
 };
 
-export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS];
+export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS];
+
+// TODO: review
+const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
+export const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
+export const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;
+export const _ASSET_REF_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;
+export const _MULTI_CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/MultiChainAsset.json`;
+export const _CHAIN_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainLogoMap.json`;
+export const _ASSET_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetLogoMap.json`;

package/services/chain-service/handler/SubstrateChainHandler.js

@@ -112,7 +112,7 @@ export class SubstrateChainHandler {
           name = nameResp.output ? nameObj.Ok || nameObj.ok : '';
           decimals = decimalsResp.output ? new BN(decimalsObj.Ok || decimalsObj.ok).toNumber() : 0;
           symbol = decimalsResp.output ? symbolObj.Ok || symbolObj.ok : '';
-          if (name === '' || symbol === '') {
+          if (!name || !symbol || typeof name === 'object' || typeof symbol === 'object') {
             contractError = true;
           }
           console.log('validate PSP22', name, symbol, decimals);

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

@@ -71,6 +71,7 @@ export declare class ChainService {
     enableChains(chainSlugs: string[]): boolean;
     disableChain(chainSlug: string): boolean;
     private checkExistedPredefinedChain;
+    private fetchLatestData;
     private initChains;
     private initAssetRegistry;
     private updateChainStateMapSubscription;
@@ -99,9 +100,10 @@ export declare class ChainService {
     setAssetSettings(assetSettings: Record<string, AssetSetting>, emitEvent?: boolean): void;
     getStoreAssetSettings(): Promise<Record<string, AssetSetting>>;
     getAssetSettings(): Promise<Record<string, AssetSetting>>;
-    updateAssetSetting(assetSlug: string, assetSetting: AssetSetting): Promise<boolean | undefined>;
+    updateAssetSetting(assetSlug: string, assetSetting: AssetSetting, autoEnableNativeToken?: boolean): Promise<boolean | undefined>;
     updateAssetSettingByChain(chainSlug: string, visible: boolean): Promise<void>;
     subscribeAssetSettings(): BehaviorSubject<Record<string, AssetSetting>>;
     getChainLogoMap(): Promise<Record<string, string>>;
     getAssetLogoMap(): Promise<Record<string, string>>;
+    resetWallet(resetAll: boolean): void;
 }

package/services/chain-service/index.js

@@ -3,7 +3,7 @@
 
 import { AssetLogoMap, AssetRefMap, ChainAssetMap, ChainInfoMap, ChainLogoMap, MultiChainAssetMap } from '@subwallet/chain-list';
 import { _AssetRefPath, _AssetType, _ChainStatus, _SubstrateChainType } from '@subwallet/chain-list/types';
-import { _DEFAULT_ACTIVE_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
+import { _ASSET_LOGO_MAP_SRC, _ASSET_REF_SRC, _CHAIN_ASSET_SRC, _CHAIN_INFO_SRC, _CHAIN_LOGO_MAP_SRC, _DEFAULT_ACTIVE_CHAINS, _MULTI_CHAIN_ASSET_SRC } 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';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
@@ -40,7 +40,6 @@ export class ChainService {
     this.chainInfoMapSubject.next(this.dataMap.chainInfoMap);
     this.chainStateMapSubject.next(this.dataMap.chainStateMap);
     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
-    this.multiChainAssetMapSubject.next(MultiChainAssetMap);
     this.xcmRefMapSubject.next(this.getXcmRefMap());
     this.logger = createLogger('chain-service');
     this.refreshChainStateInterval(3000, 6);
@@ -350,7 +349,9 @@ export class ChainService {
   // Business logic
   async init() {
     // TODO: reconsider the flow of initiation
-    this.dataMap.assetRefMap = AssetRefMap;
+    const [latestAssetRefMap, latestMultiChainAssetMap] = await Promise.all([this.fetchLatestData(_ASSET_REF_SRC, AssetRefMap), this.fetchLatestData(_MULTI_CHAIN_ASSET_SRC, MultiChainAssetMap)]);
+    this.multiChainAssetMapSubject.next(latestMultiChainAssetMap);
+    this.dataMap.assetRefMap = latestAssetRefMap;
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.chainStateMapSubject.next(this.getChainStateMap());
@@ -452,16 +453,16 @@ export class ChainService {
     this.eventService.emit('chain.updateState', chainSlug);
     return true;
   }
-  checkExistedPredefinedChain(genesisHash, evmChainId) {
+  checkExistedPredefinedChain(latestChainInfoMap, genesisHash, evmChainId) {
     let duplicatedSlug = '';
     if (genesisHash) {
-      Object.values(ChainInfoMap).forEach(chainInfo => {
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         if (chainInfo.substrateInfo && chainInfo.substrateInfo.genesisHash === genesisHash) {
           duplicatedSlug = chainInfo.slug;
         }
       });
     } else if (evmChainId) {
-      Object.values(ChainInfoMap).forEach(chainInfo => {
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         if (chainInfo.evmInfo && chainInfo.evmInfo.evmChainId === evmChainId) {
           duplicatedSlug = chainInfo.slug;
         }
@@ -469,8 +470,47 @@ export class ChainService {
     }
     return duplicatedSlug;
   }
+  async fetchLatestData(src, 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);
     const storedChainSettingMap = {};
     storedChainSettings.forEach(chainStoredSetting => {
       storedChainSettingMap[chainStoredSetting.slug] = chainStoredSetting;
@@ -479,8 +519,8 @@ export class ChainService {
     const deprecatedChains = [];
     const deprecatedChainMap = {};
     if (storedChainSettings.length === 0) {
-      this.dataMap.chainInfoMap = ChainInfoMap;
-      Object.values(ChainInfoMap).forEach(chainInfo => {
+      this.dataMap.chainInfoMap = latestChainInfoMap;
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         this.dataMap.chainStateMap[chainInfo.slug] = {
           currentProvider: Object.keys(chainInfo.providers)[0],
           slug: chainInfo.slug,
@@ -496,10 +536,10 @@ export class ChainService {
         });
       });
     } else {
-      const mergedChainInfoMap = ChainInfoMap;
+      const mergedChainInfoMap = latestChainInfoMap;
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
-        if (storedSlug in ChainInfoMap) {
-          // check predefined chains first, update providers and currentProvider
+        if (storedSlug in latestChainInfoMap) {
+          // check predefined chains first, keep setting for providers and currentProvider
           mergedChainInfoMap[storedSlug].providers = {
             ...storedChainInfo.providers,
             ...mergedChainInfoMap[storedSlug].providers
@@ -519,7 +559,7 @@ export class ChainService {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
           // only custom chains are left
           // check custom chain duplicated with predefined chain => merge into predefined chain
-          const duplicatedDefaultSlug = this.checkExistedPredefinedChain((_storedChainInfo$subs = storedChainInfo.substrateInfo) === null || _storedChainInfo$subs === void 0 ? void 0 : _storedChainInfo$subs.genesisHash, (_storedChainInfo$evmI = storedChainInfo.evmInfo) === null || _storedChainInfo$evmI === void 0 ? void 0 : _storedChainInfo$evmI.evmChainId);
+          const duplicatedDefaultSlug = this.checkExistedPredefinedChain(latestChainInfoMap, (_storedChainInfo$subs = storedChainInfo.substrateInfo) === null || _storedChainInfo$subs === void 0 ? void 0 : _storedChainInfo$subs.genesisHash, (_storedChainInfo$evmI = storedChainInfo.evmInfo) === null || _storedChainInfo$evmI === void 0 ? void 0 : _storedChainInfo$evmI.evmChainId);
           if (duplicatedDefaultSlug.length > 0) {
             // merge custom chain with existed chain
             mergedChainInfoMap[duplicatedDefaultSlug].providers = {
@@ -589,10 +629,11 @@ export class ChainService {
   }
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
+    const latestAssetRegistry = await this.fetchLatestData(_CHAIN_ASSET_SRC, ChainAssetMap);
     if (storedAssetRegistry.length === 0) {
-      this.dataMap.assetRegistry = ChainAssetMap;
+      this.dataMap.assetRegistry = latestAssetRegistry;
     } else {
-      const mergedAssetRegistry = ChainAssetMap;
+      const mergedAssetRegistry = latestAssetRegistry;
       const parsedStoredAssetRegistry = {};
       const deprecatedAssets = [];
 
@@ -614,7 +655,7 @@ export class ChainService {
       });
       for (const assetInfo of Object.values(parsedStoredAssetRegistry)) {
         let duplicated = false;
-        for (const defaultChainAsset of Object.values(ChainAssetMap)) {
+        for (const defaultChainAsset of Object.values(latestAssetRegistry)) {
           // case merge custom asset with default asset
           if (_isEqualSmartContractAsset(assetInfo, defaultChainAsset)) {
             duplicated = true;
@@ -1152,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);
@@ -1167,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) {
@@ -1186,9 +1233,40 @@ export class ChainService {
     return this.assetSettingSubject;
   }
   async getChainLogoMap() {
-    return Promise.resolve(ChainLogoMap);
+    return await this.fetchLatestData(_CHAIN_LOGO_MAP_SRC, ChainLogoMap);
   }
   async getAssetLogoMap() {
-    return Promise.resolve(AssetLogoMap);
+    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;
 }