@subwallet/extension-base 1.1.68-2 → 1.2.1

package/koni/api/nft/config.js

@@ -1,9 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { SWStorage } from '@subwallet/extension-base/storage';
-import { RuntimeInfo } from '@subwallet/extension-base/utils';
-import Bowser from 'bowser';
+import { isFirefox, RuntimeInfo } from '@subwallet/extension-base/utils';
 export const SINGULAR_V1_ENDPOINT = 'https://singular.rmrk-api.xyz/api/account-rmrk1/';
 export const SINGULAR_V2_ENDPOINT = 'https://singular.rmrk-api.xyz/api/account/';
 export const KANARIA_ENDPOINT = 'https://kanaria.rmrk.app/api/rmrk2/';
@@ -54,10 +52,6 @@ export const IPFS2_RMRK = 'https://ipfs2.rmrk.link/ipfs/'; // ????
 export const IPFS_ETH_ARAGON = 'https://ipfs.eth.aragon.network/ipfs/'; // 400
 export const SUBWALLET_IPFS = 'https://ipfs.subwallet.app/ipfs/'; // ???
 
-const detectFirefox = () => {
-  return (SWStorage.instance.getItem('browserInfo') || Bowser.getParser(window.navigator.userAgent).getBrowserName()).toLowerCase() === 'firefox';
-};
-const isFirefox = detectFirefox();
 export let SUPPORTED_NFT_NETWORKS;
 (function (SUPPORTED_NFT_NETWORKS) {
   SUPPORTED_NFT_NETWORKS["karura"] = "karura";

package/koni/api/nft/evm_nft/index.js

@@ -7,7 +7,6 @@ import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { _ERC721_ABI } from '@subwallet/extension-base/services/chain-service/helper';
 import { _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { isUrl } from '@subwallet/extension-base/utils';
-import fetch from 'cross-fetch';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 export class EvmNftApi extends BaseNftApi {
   evmContracts = [];

package/koni/api/nft/karura_nft/index.js

@@ -4,7 +4,6 @@
 import { getRandomIpfsGateway } from '@subwallet/extension-base/koni/api/nft/config';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { isUrl } from '@subwallet/extension-base/utils';
-import fetch from 'cross-fetch';
 export class KaruraNftApi extends BaseNftApi {
   // eslint-disable-next-line no-useless-constructor
   constructor(api, addresses, chain) {

package/koni/api/nft/ordinal_nft/index.d.ts

@@ -1,6 +1,8 @@
+import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
 import { BaseNftApi, HandleNftParams } from '../nft';
 export default class OrdinalNftApi extends BaseNftApi {
     subscanChain: string;
+    subscanService: SubscanService;
     constructor(addresses: string[], chain: string, subscanChain: string);
     handleNft(address: string, handleNftParams: HandleNftParams): Promise<void>;
     handleNfts(params: HandleNftParams): Promise<void>;

package/koni/api/nft/ordinal_nft/index.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ORDINAL_COLLECTION } from '@subwallet/extension-base/constants';
-import { state } from '@subwallet/extension-base/koni/background/handlers';
+import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
 import { BaseNftApi } from "../nft.js";
 const parseParamData = (param, event, chain, address) => {
   const ordinalData = JSON.parse(param.value);
@@ -43,12 +43,13 @@ export default class OrdinalNftApi extends BaseNftApi {
   constructor(addresses, chain, subscanChain) {
     super(chain, undefined, addresses);
     this.subscanChain = subscanChain;
+    this.subscanService = SubscanService.getInstance();
   }
   async handleNft(address, handleNftParams) {
-    const events = await state.subscanService.getAccountRemarkEvents(this.chain, address);
+    const events = await this.subscanService.getAccountRemarkEvents(this.subscanChain, address);
     if (events && events.length) {
       const extrinsicIds = events.map(data => data.extrinsic_index);
-      const extrinsicParams = await state.subscanService.getExtrinsicParams(this.chain, extrinsicIds);
+      const extrinsicParams = await this.subscanService.getExtrinsicParams(this.subscanChain, extrinsicIds);
       const items = [];
       for (const data of extrinsicParams) {
         const {

package/koni/api/nft/rmrk_nft/index.js

@@ -4,7 +4,6 @@
 import { RMRK_VER } from '@subwallet/extension-base/background/KoniTypes';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { isUrl, reformatAddress } from '@subwallet/extension-base/utils';
-import fetch from 'cross-fetch';
 import { SINGULAR_V1_COLLECTION_ENDPOINT, SINGULAR_V2_COLLECTION_ENDPOINT, SINGULAR_V2_ENDPOINT } from "../config.js";
 var RMRK_SOURCE;
 (function (RMRK_SOURCE) {

package/koni/api/nft/unique_network_nft/index.js

@@ -4,7 +4,6 @@
 import { OPAL_SCAN_ENDPOINT, QUARTZ_SCAN_ENDPOINT, UNIQUE_IPFS_GATEWAY, UNIQUE_SCAN_ENDPOINT } from '@subwallet/extension-base/koni/api/nft/config';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { baseParseIPFSUrl } from '@subwallet/extension-base/utils';
-import fetch from 'cross-fetch';
 import { decodeAddress, encodeAddress } from '@polkadot/util-crypto';
 export class UniqueNftApi extends BaseNftApi {
   constructor(chain, addresses) {

package/koni/api/nft/unique_nft/uniqueNftV2.js

@@ -3,7 +3,6 @@
 
 import { UNIQUE_SCAN_ENDPOINT } from '@subwallet/extension-base/koni/api/nft/config';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
-import fetch from 'cross-fetch';
 export class UniqueNftApiV2 extends BaseNftApi {
   endpoint = UNIQUE_SCAN_ENDPOINT;
 

package/koni/api/nft/vara_nft/index.js

@@ -3,7 +3,6 @@
 
 import { VARA_SCAN_ENDPOINT } from '@subwallet/extension-base/koni/api/nft/config';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
-import fetch from 'cross-fetch';
 import { hexAddPrefix, u8aToHex } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
 export class VaraNftApi extends BaseNftApi {

package/koni/api/nft/wasm_nft/index.js

@@ -9,8 +9,6 @@ import { getPSP34ContractPromise, getTokenUriMethod, isAzeroDomainNft, isPinkRob
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { isUrl } from '@subwallet/extension-base/utils';
-import axios from 'axios';
-import fetch from 'cross-fetch';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 
 // interface CollectionAttributes {
@@ -95,10 +93,8 @@ export class WasmNftApi extends BaseNftApi {
       return undefined;
     }
     const nftItemImageSrc = `${itemImageApiFromArtZero(this.chain)}?input=${parsedTokenUri}&size=500`;
-    const collectionImageUrl = await axios(nftItemImageSrc, {
-      method: 'GET'
-    });
-    return collectionImageUrl.data;
+    const collectionImageUrl = await fetch(nftItemImageSrc);
+    return await collectionImageUrl.text();
   }
   async parseFeaturedCollectionImage(smartContract) {
     const urlencoded = new URLSearchParams();
@@ -123,10 +119,8 @@ export class WasmNftApi extends BaseNftApi {
       return;
     }
     const collectionImageSrc = `${itemImageApiFromArtZero(this.chain)}?input=${parsedCollectionImage}&size=500`;
-    const collectionImageUrl = await axios(collectionImageSrc, {
-      method: 'GET'
-    });
-    return collectionImageUrl.data;
+    const collectionImageUrl = await fetch(collectionImageSrc);
+    return await collectionImageUrl.text();
   }
 
   // private async getCollectionAttributes (contractPromise: ContractPromise): Promise<CollectionAttributes> {

package/koni/api/staking/bonding/astar.js

@@ -6,7 +6,6 @@ import { getEarningStatusByNominations } from '@subwallet/extension-base/koni/ap
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
 import { isUrl, parseRawNumber } from '@subwallet/extension-base/utils';
-import fetch from 'cross-fetch';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 const convertAddress = address => {

package/koni/api/staking/subsquidStaking.js

@@ -4,8 +4,7 @@
 import { APIItemState, StakingType } from '@subwallet/extension-base/background/KoniTypes';
 import { INDEXER_SUPPORTED_STAKING_CHAINS, SUBSQUID_ENDPOINTS } from '@subwallet/extension-base/koni/api/staking/config';
 import { _getChainSubstrateAddressPrefix, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
-import { reformatAddress } from '@subwallet/extension-base/utils';
-import axios from 'axios';
+import { fetchJson, reformatAddress } from '@subwallet/extension-base/utils';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 const getSubsquidQuery = (account, chain) => {
   if (chain === 'moonbeam' || chain === 'moonriver' || chain === 'astar') {
@@ -44,16 +43,13 @@ const getSubsquidStaking = async (accounts, chain, chainInfoMap, callback) => {
           type: StakingType.NOMINATED,
           address: reformatAddress(account, 42)
         };
-        const resp = await axios({
-          url: SUBSQUID_ENDPOINTS[chain],
-          method: 'post',
-          data: {
-            query: getSubsquidQuery(parsedAccount, chain)
-          }
-        });
-        if (resp.status === 200) {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-          const respData = resp.data.data;
+        try {
+          const respData = await fetchJson(SUBSQUID_ENDPOINTS[chain], {
+            method: 'post',
+            data: {
+              query: getSubsquidQuery(parsedAccount, chain)
+            }
+          });
           const rewardItem = respData.stakerById;
           if (rewardItem) {
             const latestReward = rewardItem.rewards[0];
@@ -67,6 +63,8 @@ const getSubsquidStaking = async (accounts, chain, chainInfoMap, callback) => {
               stakingRewardItem.latestReward = latestReward.amount;
             }
           }
+        } catch (e) {
+          console.error(e);
         }
         if (stakingRewardItem.totalReward && parseFloat(stakingRewardItem.totalReward) > 0) {
           callback(stakingRewardItem);

package/koni/api/subquery/subquery.js

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ApolloClient, createHttpLink, InMemoryCache } from '@apollo/client';
-import fetch from 'cross-fetch';
 export function newApolloClient(uri) {
   return new ApolloClient({
     cache: new InMemoryCache(),

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

@@ -1,7 +1,11 @@
 /// <reference types="chrome" />
 import { MessageTypes, RequestTypes, ResponseAuthorizeList, ResponseType } from '@subwallet/extension-base/background/types';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
+import { SignerPayloadJSON, SignerPayloadRaw } from '@polkadot/types/types';
 import { Prefix } from '@polkadot/util-crypto/types';
+export declare const SEED_DEFAULT_LENGTH = 12;
+export declare const SEED_LENGTHS: number[];
+export declare function isJsonPayload(value: SignerPayloadJSON | SignerPayloadRaw): value is SignerPayloadJSON;
 export default class KoniExtension {
     #private;
     constructor(state: KoniState);

package/koni/background/handlers/Extension.js

@@ -5,7 +5,6 @@ import { Common } from '@ethereumjs/common';
 import { LegacyTransaction } from '@ethereumjs/tx';
 import { _AssetType } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { isJsonPayload, SEED_DEFAULT_LENGTH, SEED_LENGTHS } from '@subwallet/extension-base/background/handlers/Extension';
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { AccountExternalErrorCode, BasicTxErrorType, BasicTxWarningCode, CampaignDataType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, MantaPayEnableMessage, StakingTxErrorType, StakingType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
@@ -34,7 +33,7 @@ import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectN
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
 import { YieldPoolType } from '@subwallet/extension-base/types';
-import { BN_ZERO, convertSubjectInfoToAddresses, createTransactionFromRLP, isSameAddress, reformatAddress, signatureToHex, uniqueStringArray } from '@subwallet/extension-base/utils';
+import { BN_ZERO, convertSubjectInfoToAddresses, createTransactionFromRLP, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
 import { createPair } from '@subwallet/keyring';
@@ -66,13 +65,18 @@ const ACCOUNT_ALL_JSON = {
   address: ALL_ACCOUNT_KEY,
   name: 'All'
 };
+export const SEED_DEFAULT_LENGTH = 12;
+export const SEED_LENGTHS = [12, 15, 18, 21, 24];
+export function isJsonPayload(value) {
+  return value.genesisHash !== undefined;
+}
 export default class KoniExtension {
   #lockTimeOut = undefined;
   #koniState;
   #timeAutoLock = DEFAULT_AUTO_LOCK_TIME;
   #skipAutoLock = false;
-  #alwaysLock = false;
   #firstTime = true;
+  #alwaysLock = false;
   constructor(state) {
     this.#koniState = state;
     const updateTimeAutoLock = rs => {
@@ -103,7 +107,7 @@ export default class KoniExtension {
       SWStorage.instance.setItem(LATEST_SESSION, JSON.stringify({
         remind: true,
         timeCalculate: time
-      }));
+      })).catch(console.error);
     };
     this.#koniState.settingService.getSettings(updateTimeAutoLock);
     this.#koniState.settingService.getSubject().subscribe({
@@ -395,7 +399,7 @@ export default class KoniExtension {
         }
       }
     }
-    const url = `${chrome.extension.getURL('index.html')}#${path}${subPath || ''}${paramString}`;
+    const url = `${chrome.runtime.getURL('index.html')}#${path}${subPath || ''}${paramString}`;
     if (!ALLOWED_PATH.includes(path)) {
       console.error('Not allowed to open the url:', url);
       return false;
@@ -1369,7 +1373,16 @@ export default class KoniExtension {
     if (isPasswordValidated) {
       try {
         this._saveCurrentAccountAddress(address, () => {
-          keyring.restoreAccount(file, password, withMasterPassword);
+          var _newAccount$meta, _newAccount$meta2;
+          const newAccount = keyring.restoreAccount(file, password, withMasterPassword);
+
+          // genesisHash is not used in SubWallet => reset it to empty string
+          if ((_newAccount$meta = newAccount.meta) !== null && _newAccount$meta !== void 0 && _newAccount$meta.genesisHash && ((_newAccount$meta2 = newAccount.meta) === null || _newAccount$meta2 === void 0 ? void 0 : _newAccount$meta2.genesisHash) !== '') {
+            keyring.saveAccountMeta(newAccount, {
+              ...newAccount.meta,
+              genesisHash: ''
+            });
+          }
           this._addAddressToAuthList(address, isAllowed);
         });
         if (this.#alwaysLock) {
@@ -1394,6 +1407,7 @@ export default class KoniExtension {
       try {
         this._saveCurrentAccountAddress(ALL_ACCOUNT_KEY, () => {
           keyring.restoreAccounts(file, password);
+          this.#koniState.keyringService.removeNoneHardwareGenesisHash();
           this._addAddressesToAuthList(addressList, isAllowed);
         });
 
@@ -2893,7 +2907,8 @@ export default class KoniExtension {
   }) {
     try {
       keyring.unlockKeyring(password);
-      this.#koniState.initMantaPay(password).catch(console.error);
+      // this.#koniState.initMantaPay(password)
+      //   .catch(console.error);
     } catch (e) {
       return {
         errors: [e.message],
@@ -3580,7 +3595,7 @@ export default class KoniExtension {
   }
   async initSyncMantaPay(address) {
     var _this$koniState$chain3, _this$koniState$chain4, _this$koniState$chain5, _this$koniState$chain6;
-    if ((_this$koniState$chain3 = this.#koniState.chainService) !== null && _this$koniState$chain3 !== void 0 && (_this$koniState$chain4 = _this$koniState$chain3.mantaPay) !== null && _this$koniState$chain4 !== void 0 && _this$koniState$chain4.getSyncState().isSyncing) {
+    if ((_this$koniState$chain3 = this.#koniState.chainService) !== null && _this$koniState$chain3 !== void 0 && (_this$koniState$chain4 = _this$koniState$chain3.mantaPay) !== null && _this$koniState$chain4 !== void 0 && _this$koniState$chain4.getSyncState().isSyncing || !MODULE_SUPPORT.MANTA_ZK) {
       return;
     }
     this.#skipAutoLock = true;
@@ -4079,6 +4094,8 @@ export default class KoniExtension {
       }, this.#timeAutoLock * 60 * 1000);
     }
     switch (type) {
+      case 'pri(ping)':
+        return 'pong';
       /// Clone from PolkadotJs
       case 'pri(accounts.create.external)':
         return this.accountsCreateExternal(request);
@@ -4599,6 +4616,10 @@ export default class KoniExtension {
         return this.#koniState.dbService.importDB(request);
       case 'pri(database.exportJson)':
         return this.#koniState.dbService.getExportJson();
+      case 'pri(database.migrateLocalStorage)':
+        return this.#koniState.migrateMV3LocalStorage(request);
+      case 'pri(database.setLocalStorage)':
+        return this.#koniState.setStorageFromWS(request);
       /* Database */
 
       /* Swap service */

package/koni/background/handlers/Mobile.js

@@ -1,13 +1,13 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { state } from '@subwallet/extension-base/koni/background/handlers/index';
+import { SWHandler } from '@subwallet/extension-base/koni/background/handlers/index';
 import { SWStorage } from '@subwallet/extension-base/storage';
-import { listMerge } from '@subwallet/extension-base/utils';
+import { isSupportWindow, listMerge } from '@subwallet/extension-base/utils';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 export function isLocalStorageReset() {
   var _window;
-  if ((_window = window) !== null && _window !== void 0 && _window.localStorage) {
+  if (isSupportWindow && (_window = window) !== null && _window !== void 0 && _window.localStorage) {
     return !window.localStorage.getItem('keyring:subwallet');
   } else {
     return false;
@@ -15,7 +15,7 @@ export function isLocalStorageReset() {
 }
 export async function isIndexedDBReset() {
   try {
-    return (await state.dbService.stores.migration.table.count()) < 1;
+    return (await SWHandler.instance.state.dbService.stores.migration.table.count()) < 1;
   } catch (e) {
     return true;
   }
@@ -50,7 +50,9 @@ export default class Mobile {
   constructor(state) {
     this.state = state;
     if (!isLocalStorageReset()) {
-      this.lastRestoreData.storage = swStorage.copy();
+      swStorage.copy().then(data => {
+        this.lastRestoreData.storage = data;
+      }).catch(console.error);
     }
     (async () => {
       if (!(await isIndexedDBReset())) {
@@ -128,6 +130,7 @@ export default class Mobile {
     console.log('restartSubscriptionServices');
   }
   async _getLocalStorageExportData() {
+    await swStorage.waitReady;
     return Promise.resolve(JSON.stringify(swStorage.copy()));
   }
   async _getDexieExportData() {
@@ -177,7 +180,7 @@ export default class Mobile {
     if (storage) {
       const storageData = JSON.parse(storage);
       for (const key in storageData) {
-        swStorage.setItem(key, storageData[key]);
+        await swStorage.setItem(key, storageData[key]);
       }
     }
     if (indexedDB) {

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

@@ -24,7 +24,7 @@ import { SubscanService } from '@subwallet/extension-base/services/subscan-servi
 import { SwapService } from '@subwallet/extension-base/services/swap-service';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
-import { BalanceMap, EvmFeeInfo } from '@subwallet/extension-base/types';
+import { BalanceMap, EvmFeeInfo, StorageDataInterface } from '@subwallet/extension-base/types';
 import { MetadataDef, ProviderMeta } from '@subwallet/extension-inject/types';
 import SimpleKeyring from 'eth-simple-keyring';
 import { BehaviorSubject, Subject } from 'rxjs';
@@ -220,7 +220,12 @@ export default class KoniState {
     evmSendTransaction(id: string, url: string, networkKey: string, allowedAccounts: string[], transactionParams: EvmSendTransactionParams): Promise<string | undefined>;
     getConfirmationsQueueSubject(): BehaviorSubject<ConfirmationsQueue>;
     completeConfirmation(request: RequestConfirmationComplete): Promise<boolean>;
+    private onMV3Update;
+    migrateMV3LocalStorage(data: string): Promise<boolean>;
+    private onMV3Install;
+    onInstallOrUpdate(details: chrome.runtime.InstalledDetails): void;
     private onHandleRemindExportAccount;
+    setStorageFromWS({ key, value }: StorageDataInterface): Promise<boolean>;
     onCheckToRemindUser(): void;
     onInstall(): void;
     get activeNetworks(): Record<string, _ChainInfo>;

package/koni/background/handlers/State.js

@@ -28,13 +28,12 @@ import { openPopup } from '@subwallet/extension-base/services/request-service/ha
 import SettingService from '@subwallet/extension-base/services/setting-service/SettingService';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
-import { SUBSCAN_API_CHAIN_MAP } from '@subwallet/extension-base/services/subscan-service/subscan-chain-map';
 import { SwapService } from '@subwallet/extension-base/services/swap-service';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
-import { isAccountAll, stripUrl, TARGET_ENV, wait } from '@subwallet/extension-base/utils';
+import { isAccountAll, stripUrl, targetIsWeb, wait } from '@subwallet/extension-base/utils';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
@@ -44,7 +43,7 @@ import BN from 'bn.js';
 import SimpleKeyring from 'eth-simple-keyring';
 import { t } from 'i18next';
 import { Subject } from 'rxjs';
-import { assert, hexStripPrefix, hexToU8a, isHex, logger as createLogger, u8aToHex } from '@polkadot/util';
+import { assert, hexStripPrefix, hexToU8a, isHex, logger as createLogger, noop, u8aToHex } from '@polkadot/util';
 import { base64Decode, isEthereumAddress, keyExtractSuri } from '@polkadot/util-crypto';
 import { KoniCron } from "../cron.js";
 import { KoniSubscription } from "../subscription.js";
@@ -94,7 +93,7 @@ export default class KoniState {
     this.keyringService = new KeyringService(this.eventService);
     this.notificationService = new NotificationService();
     this.chainService = new ChainService(this.dbService, this.eventService);
-    this.subscanService = new SubscanService(SUBSCAN_API_CHAIN_MAP);
+    this.subscanService = SubscanService.getInstance();
     this.settingService = new SettingService();
     this.requestService = new RequestService(this.chainService, this.settingService, this.keyringService);
     this.priceService = new PriceService(this.dbService, this.eventService, this.chainService);
@@ -114,7 +113,7 @@ export default class KoniState {
     this.logger = createLogger('State');
 
     // Init state
-    if (TARGET_ENV !== 'mobile') {
+    if (targetIsWeb) {
       this.init().catch(console.error);
     }
   }
@@ -1343,15 +1342,57 @@ export default class KoniState {
   async completeConfirmation(request) {
     return await this.requestService.completeConfirmation(request);
   }
-  onHandleRemindExportAccount() {
-    const remindStatus = SWStorage.instance.getItem(REMIND_EXPORT_ACCOUNT);
+  async onMV3Update() {
+    const migrationStatus = await SWStorage.instance.getItem('mv3_migration');
+    if (!migrationStatus || migrationStatus !== 'done') {
+      // Open migration tab
+      const url = `${chrome.runtime.getURL('index.html')}#/mv3-migration`;
+      await openPopup(url);
+
+      // migrateMV3LocalStorage will be called when user open migration tab with data from localStorage on frontend
+    }
+  }
+
+  async migrateMV3LocalStorage(data) {
+    try {
+      const parsedData = JSON.parse(data);
+      parsedData.mv3_migration = 'done';
+      await SWStorage.instance.setMap(parsedData);
+
+      // Reload some services use SWStorage
+      // wallet connect
+      this.walletConnectService.initClient().catch(console.error);
+      return true;
+    } catch (e) {
+      console.error(e);
+      return false;
+    }
+  }
+  async onMV3Install() {
+    await SWStorage.instance.setItem('mv3_migration', 'done');
+
+    // Open expand page
+    const url = `${chrome.runtime.getURL('index.html')}#/welcome`;
+    withErrorLog(() => chrome.tabs.create({
+      url
+    }));
+  }
+  onInstallOrUpdate(details) {
+    // Open mv3 migration window
+    if (details.reason === 'install') {
+      this.onMV3Install().catch(console.error);
+    } else if (details.reason === 'update') {
+      this.onMV3Update().catch(console.error);
+    }
+  }
+  async onHandleRemindExportAccount() {
+    const remindStatus = await SWStorage.instance.getItem(REMIND_EXPORT_ACCOUNT);
     if (!remindStatus || !remindStatus.includes('done')) {
       const handleRemind = account => {
         if (account.address !== '') {
           // Open remind tab
           const url = `${chrome.runtime.getURL('index.html')}#/remind-export-account`;
-          openPopup(url);
-          subscription.unsubscribe();
+          openPopup(url).then(noop).catch(console.error).finally(() => subscription.unsubscribe());
         } else {
           setTimeout(() => {
             subscription.unsubscribe();
@@ -1361,8 +1402,21 @@ export default class KoniState {
       const subscription = this.keyringService.currentAccountSubject.subscribe(handleRemind);
     }
   }
+  async setStorageFromWS({
+    key,
+    value
+  }) {
+    try {
+      const jsonData = JSON.stringify(value);
+      await SWStorage.instance.setItem(key, jsonData);
+      return true;
+    } catch (e) {
+      console.error(e);
+      return false;
+    }
+  }
   onCheckToRemindUser() {
-    this.onHandleRemindExportAccount();
+    this.onHandleRemindExportAccount().catch(console.error);
   }
   onInstall() {
     // const singleModes = Object.values(_PREDEFINED_SINGLE_MODES);
@@ -1448,7 +1502,7 @@ export default class KoniState {
     this.generalStatus = ServiceStatus.STOPPED;
     this.waitSleeping = null;
   }
-  async _start(isWakeup = false) {
+  async _start() {
     // Wait sleep finish before start to avoid conflict
     this.generalStatus === ServiceStatus.STOPPING && this.waitSleeping && (await this.waitSleeping);
 
@@ -1462,6 +1516,7 @@ export default class KoniState {
       await this.waitStarting;
       return;
     }
+    const isWakeup = this.generalStatus === ServiceStatus.STOPPED;
     const starting = createPromiseHandler();
     this.generalStatus = ServiceStatus.STARTING;
     this.waitStarting = starting.promise;
@@ -1481,7 +1536,7 @@ export default class KoniState {
     this.generalStatus = ServiceStatus.STARTED;
   }
   async wakeup() {
-    await this._start(true);
+    await this._start();
   }
   cancelSubscription(id) {
     if (isSubscriptionRunning(id)) {
@@ -1570,6 +1625,7 @@ export default class KoniState {
     await this.dbService.resetWallet(resetAll);
     this.accountRefStore.set('refList', []);
     if (resetAll) {
+      await this.priceService.setPriceCurrency(DEFAULT_CURRENCY);
       this.settingService.resetWallet();
       await this.priceService.setPriceCurrency(DEFAULT_CURRENCY);
     }

package/koni/background/handlers/Tabs.js

@@ -182,7 +182,7 @@ export default class KoniTabs {
   redirectPhishingLanding(phishingWebsite) {
     const nonFragment = phishingWebsite.split('#')[0];
     const encodedWebsite = encodeURIComponent(nonFragment);
-    const url = `${chrome.extension.getURL('index.html')}#${PHISHING_PAGE_REDIRECT}/${encodedWebsite}`;
+    const url = `${chrome.runtime.getURL('index.html')}#${PHISHING_PAGE_REDIRECT}/${encodedWebsite}`;
     chrome.tabs.query({
       url: nonFragment
     }, tabs => {
@@ -927,6 +927,9 @@ export default class KoniTabs {
     if (type === 'pub(phishing.redirectIfDenied)') {
       return this.redirectIfPhishing(url);
     }
+
+    // Wait for account ready and chain ready
+    await Promise.all([this.#koniState.eventService.waitAccountReady, this.#koniState.eventService.waitChainReady]);
     if (type !== 'pub(authorize.tabV2)' && !this.isEvmPublicRequest(type, request)) {
       await this.#koniState.ensureUrlAuthorizedV2(url).catch(e => {
         if (type.startsWith('evm')) {

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

@@ -1,13 +1,19 @@
 /// <reference types="chrome" />
 import { MessageTypes, TransportRequestMessage } from '@subwallet/extension-base/background/types';
-import { NftHandler } from '@subwallet/extension-base/koni/api/nft';
 import KoniExtension from '@subwallet/extension-base/koni/background/handlers/Extension';
 import Mobile from '@subwallet/extension-base/koni/background/handlers/Mobile';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import KoniTabs from '@subwallet/extension-base/koni/background/handlers/Tabs';
-export declare const state: KoniState;
-export declare const extension: KoniExtension;
-export declare const tabs: KoniTabs;
-export declare const mobile: Mobile;
-export declare const nftHandler: NftHandler;
-export default function handlers<TMessageType extends MessageTypes>({ id, message, request }: TransportRequestMessage<TMessageType>, port: chrome.runtime.Port, extensionPortName?: string): void;
+export declare class SWHandler {
+    _state?: KoniState;
+    _extensionHandler?: KoniExtension;
+    _tabsHandler?: KoniTabs;
+    _mobileHandler?: Mobile;
+    get state(): KoniState;
+    get extensionHandler(): KoniExtension;
+    get tabHandler(): KoniTabs;
+    get mobileHandler(): Mobile;
+    handle<TMessageType extends MessageTypes>({ id, message, request }: TransportRequestMessage<TMessageType>, port: chrome.runtime.Port): void;
+    private static _instance;
+    static get instance(): SWHandler;
+}