@subwallet/extension-base 1.2.31-0 → 1.2.33-0

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

@@ -1,7 +1,7 @@
 /// <reference types="chrome" />
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
-import { AddTokenRequestExternal, AmountData, ApiMap, AuthRequestV2, ChainStakingMetadata, ConfirmationsQueue, CrowdloanItem, CrowdloanJson, CurrentAccountInfo, EvmSendTransactionParams, ExternalRequestPromise, MantaPayConfig, MantaPaySyncState, NftCollection, NftItem, NftJson, NominatorMetadata, RequestAccountExportPrivateKey, RequestCheckPublicAndSecretKey, RequestConfirmationComplete, RequestCrowdloanContributions, RequestSettingsType, ResponseAccountExportPrivateKey, ResponseCheckPublicAndSecretKey, ServiceInfo, SingleModeJson, StakingItem, StakingJson, StakingRewardItem, StakingRewardJson, StakingType, UiSettings } from '@subwallet/extension-base/background/KoniTypes';
-import { AccountJson, RequestAuthorizeTab, RequestRpcSend, RequestRpcSubscribe, RequestRpcUnsubscribe, RequestSign, ResponseRpcListProviders, ResponseSigning } from '@subwallet/extension-base/background/types';
+import { AddTokenRequestExternal, AmountData, ApiMap, AuthRequestV2, ChainStakingMetadata, ConfirmationsQueue, ConfirmationsQueueTon, CrowdloanItem, CrowdloanJson, EvmSendTransactionParams, ExternalRequestPromise, MantaPayConfig, MantaPaySyncState, NftCollection, NftItem, NftJson, NominatorMetadata, RequestAccountExportPrivateKey, RequestConfirmationComplete, RequestConfirmationCompleteTon, RequestCrowdloanContributions, RequestSettingsType, ResponseAccountExportPrivateKey, ServiceInfo, SingleModeJson, StakingItem, StakingJson, StakingRewardItem, StakingRewardJson, StakingType, UiSettings } from '@subwallet/extension-base/background/KoniTypes';
+import { RequestAuthorizeTab, RequestRpcSend, RequestRpcSubscribe, RequestRpcUnsubscribe, RequestSign, ResponseRpcListProviders, ResponseSigning } from '@subwallet/extension-base/background/types';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import BuyService from '@subwallet/extension-base/services/buy-service';
 import CampaignService from '@subwallet/extension-base/services/campaign-service';
@@ -25,9 +25,8 @@ 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, StorageDataInterface } from '@subwallet/extension-base/types';
+import { EvmFeeInfo, RequestCheckPublicAndSecretKey, ResponseCheckPublicAndSecretKey, 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';
 import { JsonRpcResponse, ProviderInterface, ProviderInterfaceCallback } from '@polkadot/rpc-provider/types';
 declare type Providers = Record<string, {
@@ -38,7 +37,6 @@ export default class KoniState {
     private injectedProviders;
     private readonly providers;
     private readonly unsubscriptionMap;
-    private readonly accountRefStore;
     private externalRequest;
     private crowdloanMap;
     private crowdloanSubject;
@@ -90,9 +88,8 @@ export default class KoniState {
     rpcSubscribeConnected(_request: null, cb: ProviderInterfaceCallback, port: chrome.runtime.Port): void;
     rpcUnsubscribe(request: RequestRpcUnsubscribe, port: chrome.runtime.Port): Promise<boolean>;
     saveMetadata(meta: MetadataDef): void;
-    sign(url: string, request: RequestSign, account: AccountJson): Promise<ResponseSigning>;
+    sign(url: string, request: RequestSign): Promise<ResponseSigning>;
     get authSubjectV2(): BehaviorSubject<import("@subwallet/extension-base/background/types").AuthorizeRequest[]>;
-    generateDefaultBalanceMap(_addresses?: string[]): BalanceMap;
     private afterChainServiceInit;
     init(): Promise<void>;
     initMantaPay(password: string): Promise<void>;
@@ -106,7 +103,6 @@ export default class KoniState {
     subscribeEvmChainChange(): Subject<AuthUrls>;
     subscribeAuthorizeUrlSubject(): Subject<AuthUrls>;
     getAuthList(): Promise<AuthUrls>;
-    getAddressList(value?: boolean): Record<string, boolean>;
     authorizeUrlV2(url: string, request: RequestAuthorizeTab): Promise<boolean>;
     getNativeTokenInfo(networkKey: string): _ChainAsset;
     getChainInfo(networkKey: string): _ChainInfo;
@@ -137,13 +133,8 @@ export default class KoniState {
     resetStakingReward(): void;
     updateStakingReward(stakingRewardData: StakingRewardItem, callback?: (stakingRewardData: StakingRewardJson) => void): void;
     updateStakingRewardReady(ready: boolean): void;
-    getAccountRefMap(callback: (refMap: Record<string, Array<string>>) => void): void;
-    addAccountRef(addresses: string[], callback: () => void): void;
-    removeAccountRef(address: string, callback: () => void): void;
     getStakingReward(update: (value: StakingRewardJson) => void): void;
     subscribeStakingReward(): Subject<StakingRewardJson>;
-    setCurrentAccount(data: CurrentAccountInfo, callback?: () => void, preventOneAccount?: boolean): void;
-    setAccountTie(address: string, genesisHash: string | null): boolean;
     switchEvmNetworkByUrl(shortenUrl: string, networkKey: string): Promise<void>;
     addNetworkConfirm(id: string, url: string, networkData: _NetworkUpsertParams): Promise<null>;
     addTokenConfirm(id: string, url: string, tokenInfo: AddTokenRequestExternal): Promise<true>;
@@ -154,9 +145,6 @@ export default class KoniState {
     updateSetting<T extends keyof UiSettings>(key: T, value: UiSettings[T]): void;
     setShowBalance(value: boolean): void;
     subscribeSettingsSubject(): Subject<RequestSettingsType>;
-    getAccountAddress(): string | null;
-    getDecodedAddresses(address?: string): string[];
-    getAllAddresses(): string[];
     resetCrowdloanMap(newAddress: string): Promise<void>;
     resetStaking(newAddress: string): void;
     getCrowdloan(reset?: boolean): CrowdloanJson;
@@ -197,6 +185,8 @@ export default class KoniState {
     getSubstrateApi(networkKey: string): import("@subwallet/extension-base/services/chain-service/types")._SubstrateApi;
     getEvmApiMap(): Record<string, import("../../../services/chain-service/handler/EvmApi").EvmApi>;
     getEvmApi(networkKey: string): import("../../../services/chain-service/handler/EvmApi").EvmApi;
+    getTonApiMap(): Record<string, import("../../../services/chain-service/handler/TonApi").TonApi>;
+    getTonApi(networkKey: string): import("../../../services/chain-service/handler/TonApi").TonApi;
     getApiMap(): ApiMap;
     refreshSubstrateApi(key: string): boolean;
     refreshWeb3Api(key: string): void;
@@ -213,20 +203,23 @@ export default class KoniState {
     findChainIdGenesisHash(genesisHash?: string | null): number | undefined;
     findNetworkKeyByChainId(chainId?: number | null): [string | undefined, _ChainInfo | undefined];
     findSingleMode(genesisHash: string): SingleModeJson | undefined;
-    accountExportPrivateKey({ address, password }: RequestAccountExportPrivateKey): ResponseAccountExportPrivateKey;
-    checkPublicAndSecretKey({ publicKey, secretKey }: RequestCheckPublicAndSecretKey): ResponseCheckPublicAndSecretKey;
-    getEthKeyring(address: string, password: string): Promise<SimpleKeyring>;
+    accountExportPrivateKey(request: RequestAccountExportPrivateKey): ResponseAccountExportPrivateKey;
+    checkPublicAndSecretKey(request: RequestCheckPublicAndSecretKey): ResponseCheckPublicAndSecretKey;
     evmSign(id: string, url: string, method: string, params: any, topic?: string): Promise<string | undefined>;
     calculateAllGasFeeOnChain(activeEvmChains: string[], timeout?: number): Promise<Record<string, EvmFeeInfo | null>>;
     evmSendTransaction(id: string, url: string, transactionParams: EvmSendTransactionParams, networkKeyInit?: string, topic?: string): Promise<string | undefined>;
     getConfirmationsQueueSubject(): BehaviorSubject<ConfirmationsQueue>;
+    getConfirmationsQueueSubjectTon(): BehaviorSubject<ConfirmationsQueueTon>;
     completeConfirmation(request: RequestConfirmationComplete): Promise<boolean>;
+    completeConfirmationTon(request: RequestConfirmationCompleteTon): Promise<boolean>;
     private onMV3Update;
+    private storePreviousVersionData;
     migrateMV3LocalStorage(data: string): Promise<boolean>;
     private onMV3Install;
     onInstallOrUpdate(details: chrome.runtime.InstalledDetails): void;
     private onHandleRemindExportAccount;
     setStorageFromWS({ key, value }: StorageDataInterface): Promise<boolean>;
+    getStorageFromWS(key: string): Promise<string | null>;
     onCheckToRemindUser(): void;
     onInstall(): void;
     get activeNetworks(): Record<string, _ChainInfo>;

package/koni/background/handlers/State.js

@@ -4,8 +4,8 @@
 import { EvmProviderError } from '@subwallet/extension-base/background/errors/EvmProviderError';
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { isSubscriptionRunning, unsubscribe } from '@subwallet/extension-base/background/handlers/subscriptions';
-import { APIItemState, BasicTxErrorType, ChainType, EvmProviderErrorType, ExternalRequestPromiseStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, MANTA_PAY_BALANCE_INTERVAL, REMIND_EXPORT_ACCOUNT } from '@subwallet/extension-base/constants';
+import { APIItemState, ChainType, EvmProviderErrorType, ExternalRequestPromiseStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { MANTA_PAY_BALANCE_INTERVAL, REMIND_EXPORT_ACCOUNT } from '@subwallet/extension-base/constants';
 import { convertErrorFormat, generateValidationProcess, validationAuthMiddleware, validationAuthWCMiddleware, validationConnectMiddleware, validationEvmDataTransactionMiddleware, validationEvmSignMessageMiddleware } from '@subwallet/extension-base/core/logic-validation';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
@@ -34,31 +34,25 @@ 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, isManifestV3, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
+import { BasicTxErrorType } from '@subwallet/extension-base/types';
+import { isManifestV3, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
-import { decodePair } from '@subwallet/keyring/pair/decode';
 import { keyring } from '@subwallet/ui-keyring';
 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, noop, u8aToHex } from '@polkadot/util';
-import { base64Decode, isEthereumAddress, keyExtractSuri } from '@polkadot/util-crypto';
+import { assert, logger as createLogger, noop } from '@polkadot/util';
+import { isEthereumAddress } from '@polkadot/util-crypto';
 import { KoniCron } from "../cron.js";
 import { KoniSubscription } from "../subscription.js";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 const passworder = require('browser-passworder');
-const ETH_DERIVE_DEFAULT = '/m/44\'/60\'/0\'/0/0';
 const ERROR_CONFIRMATION_TYPE = ['errorConnectNetwork'];
 
 // List of providers passed into constructor. This is the list of providers
 // exposed by the extension.
 
-const getSuri = (seed, type) => {
-  return type === 'ethereum' ? `${seed}${ETH_DERIVE_DEFAULT}` : seed;
-};
 const generateDefaultCrowdloanMap = () => {
   const crowdloanMap = {};
   return crowdloanMap;
@@ -67,7 +61,6 @@ const DEFAULT_CURRENCY = 'USD';
 export default class KoniState {
   injectedProviders = new Map();
   unsubscriptionMap = {};
-  accountRefStore = new AccountRefStore();
   externalRequest = {};
   crowdloanMap = generateDefaultCrowdloanMap();
   crowdloanSubject = new Subject();
@@ -91,7 +84,7 @@ export default class KoniState {
     this.providers = providers;
     this.eventService = new EventService();
     this.dbService = new DatabaseService(this.eventService);
-    this.keyringService = new KeyringService(this.eventService);
+    this.keyringService = new KeyringService(this);
     this.notificationService = new NotificationService();
     this.chainService = new ChainService(this.dbService, this.eventService);
     this.subscanService = SubscanService.getInstance();
@@ -191,35 +184,12 @@ export default class KoniState {
   saveMetadata(meta) {
     this.requestService.saveMetadata(meta);
   }
-  sign(url, request, account) {
-    return this.requestService.sign(url, request, account);
+  sign(url, request) {
+    return this.requestService.sign(url, request);
   }
   get authSubjectV2() {
     return this.requestService.authSubjectV2;
   }
-  generateDefaultBalanceMap(_addresses) {
-    const balanceMap = {};
-    const activeChains = this.chainService.getActiveChainInfoMap();
-    const isAllAccount = isAccountAll(this.keyringService.currentAccount.address);
-    const addresses = _addresses || (isAllAccount ? Object.keys(this.keyringService.accounts) : [this.keyringService.currentAccount.address]);
-    addresses.forEach(address => {
-      const temp = {};
-      Object.values(activeChains).forEach(chainInfo => {
-        const chainAssetMap = this.chainService.getFungibleTokensByChain(chainInfo.slug);
-        Object.keys(chainAssetMap).forEach(assetSlug => {
-          temp[assetSlug] = {
-            address,
-            tokenSlug: assetSlug,
-            free: '',
-            locked: '',
-            state: APIItemState.PENDING
-          };
-        });
-      });
-      balanceMap[address] = temp;
-    });
-    return balanceMap;
-  }
   afterChainServiceInit() {
     this.subscanService.setSubscanChainMap(this.chainService.getSubscanChainMap());
   }
@@ -303,13 +273,6 @@ export default class KoniState {
   getAuthList() {
     return this.requestService.getAuthList();
   }
-  getAddressList(value = false) {
-    const addressList = Object.keys(this.keyringService.accounts);
-    return addressList.reduce((addressList, v) => ({
-      ...addressList,
-      [v]: value
-    }), {});
-  }
   async authorizeUrlV2(url, request) {
     return this.requestService.authorizeUrlV2(url, request);
   }
@@ -333,7 +296,7 @@ export default class KoniState {
     return this.dbService.getMantaPayConfig(chain);
   }
   async getStaking() {
-    const addresses = this.getDecodedAddresses();
+    const addresses = this.keyringService.context.getDecodedAddresses();
     const stakings = await this.dbService.getStakings(addresses, this.activeChainSlugs);
     return {
       ready: true,
@@ -393,7 +356,7 @@ export default class KoniState {
       nftList: [],
       total: 0
     })).catch(e => this.logger.warn(e));
-    const addresses = this.getDecodedAddresses(newAddress);
+    const addresses = this.keyringService.context.getDecodedAddresses(newAddress);
     this.dbService.subscribeNft(addresses, this.activeChainSlugs, nfts => {
       this.nftSubject.next({
         nftList: nfts,
@@ -412,7 +375,7 @@ export default class KoniState {
     this.dbService.cleanUpNft(chain, owner, collectionId, nftIds, ownNothing).catch(e => this.logger.warn(e));
   }
   async getNft() {
-    const addresses = this.getDecodedAddresses();
+    const addresses = this.keyringService.context.getDecodedAddresses();
     if (!addresses.length) {
       return;
     }
@@ -442,94 +405,12 @@ export default class KoniState {
     this.stakingRewardState.ready = ready;
     this.stakingRewardSubject.next(this.stakingRewardState);
   }
-  getAccountRefMap(callback) {
-    const refMap = {};
-    this.accountRefStore.get('refList', refList => {
-      if (refList) {
-        refList.forEach(accRef => {
-          accRef.forEach(acc => {
-            refMap[acc] = [...accRef].filter(r => !(r === acc));
-          });
-        });
-      }
-      callback(refMap);
-    });
-  }
-  addAccountRef(addresses, callback) {
-    this.accountRefStore.get('refList', refList => {
-      const newList = refList ? [...refList] : [];
-      newList.push(addresses);
-      this.accountRefStore.set('refList', newList, callback);
-    });
-  }
-  removeAccountRef(address, callback) {
-    this.accountRefStore.get('refList', refList => {
-      if (refList) {
-        refList.forEach(accRef => {
-          if (accRef.indexOf(address) > -1) {
-            accRef.splice(accRef.indexOf(address), 1);
-          }
-          if (accRef.length < 2) {
-            refList.splice(refList.indexOf(accRef), 1);
-          }
-        });
-        this.accountRefStore.set('refList', refList, () => {
-          callback();
-        });
-      } else {
-        callback();
-      }
-    });
-  }
   getStakingReward(update) {
     update(this.stakingRewardState);
   }
   subscribeStakingReward() {
     return this.stakingRewardSubject;
   }
-  setCurrentAccount(data, callback, preventOneAccount) {
-    const {
-      address,
-      currentGenesisHash
-    } = data;
-    const result = {
-      ...data
-    };
-    if (address === ALL_ACCOUNT_KEY) {
-      const pairs = keyring.getAccounts();
-      const pair = pairs[0];
-      const pairGenesisHash = (pair === null || pair === void 0 ? void 0 : pair.meta.genesisHash) || '';
-      if (pairs.length > 1 || !pair) {
-        result.allGenesisHash = currentGenesisHash || undefined;
-      } else {
-        if (!preventOneAccount) {
-          result.address = pair.address;
-          result.currentGenesisHash = pairGenesisHash || '';
-          result.allGenesisHash = pairGenesisHash || undefined;
-        } else {
-          result.allGenesisHash = currentGenesisHash || undefined;
-        }
-      }
-    }
-    this.keyringService.setCurrentAccount(result);
-    callback && callback();
-  }
-  setAccountTie(address, genesisHash) {
-    if (address !== ALL_ACCOUNT_KEY) {
-      const pair = keyring.getPair(address);
-      assert(pair, t('Unable to find account'));
-      keyring.saveAccountMeta(pair, {
-        ...pair.meta,
-        genesisHash
-      });
-    }
-    const accountInfo = this.keyringService.currentAccount;
-    if (address === accountInfo.address) {
-      accountInfo.currentGenesisHash = genesisHash || ALL_GENESIS_HASH;
-      this.setCurrentAccount(accountInfo);
-    }
-    return true;
-  }
   async switchEvmNetworkByUrl(shortenUrl, networkKey) {
     const authUrls = await this.getAuthList();
     const chainInfo = this.chainService.getChainInfoByKey(networkKey);
@@ -622,29 +503,6 @@ export default class KoniState {
   subscribeSettingsSubject() {
     return this.settingService.getSubject();
   }
-  getAccountAddress() {
-    const address = this.keyringService.currentAccount.address;
-    if (address === '') {
-      return null;
-    }
-    return address;
-  }
-  getDecodedAddresses(address) {
-    let checkingAddress = address;
-    if (!address) {
-      checkingAddress = this.getAccountAddress();
-    }
-    if (!checkingAddress) {
-      return [];
-    }
-    if (checkingAddress === ALL_ACCOUNT_KEY) {
-      return this.getAllAddresses();
-    }
-    return [checkingAddress];
-  }
-  getAllAddresses() {
-    return keyring.getAccounts().map(account => account.address);
-  }
   async resetCrowdloanMap(newAddress) {
     const defaultData = generateDefaultCrowdloanMap();
     const storedData = await this.getStoredCrowdloan(newAddress);
@@ -658,7 +516,7 @@ export default class KoniState {
     this.getStaking().then(data => {
       this.stakingSubject.next(data);
     }).catch(e => this.logger.warn(e));
-    const addresses = this.getDecodedAddresses(newAddress);
+    const addresses = this.keyringService.context.getDecodedAddresses(newAddress);
     this.dbService.subscribeStaking(addresses, this.activeChainSlugs, stakings => {
       this.stakingSubject.next({
         ready: true,
@@ -690,8 +548,8 @@ export default class KoniState {
     });
   }
   updateCrowdloanStore(networkKey, item) {
-    const currentAccountInfo = this.keyringService.currentAccount;
-    this.dbService.updateCrowdloanStore(networkKey, currentAccountInfo.address, item).catch(e => this.logger.warn(e));
+    const currentAccountInfo = this.keyringService.context.currentAccount;
+    this.dbService.updateCrowdloanStore(networkKey, currentAccountInfo.proxyId, item).catch(e => this.logger.warn(e));
   }
   subscribeCrowdloan() {
     return this.crowdloanSubject;
@@ -846,6 +704,12 @@ export default class KoniState {
   getEvmApi(networkKey) {
     return this.chainService.getEvmApi(networkKey);
   }
+  getTonApiMap() {
+    return this.chainService.getTonApiMap();
+  }
+  getTonApi(networkKey) {
+    return this.chainService.getTonApi(networkKey);
+  }
   getApiMap() {
     return {
       substrate: this.chainService.getSubstrateApiMap(),
@@ -863,7 +727,7 @@ export default class KoniState {
     return {
       chainInfoMap: this.chainService.getChainInfoMap(),
       chainApiMap: this.getApiMap(),
-      currentAccountInfo: this.keyringService.currentAccount,
+      currentAccountInfo: this.keyringService.context.currentAccount,
       assetRegistry: this.chainService.getAssetRegistry(),
       chainStateMap: this.chainService.getChainStateMap()
     };
@@ -970,75 +834,11 @@ export default class KoniState {
     }
     return Object.values(_PREDEFINED_SINGLE_MODES).find(item => item.networkKeys.includes(networkKey));
   }
-  accountExportPrivateKey({
-    address,
-    password
-  }) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    const exportedJson = keyring.backupAccount(keyring.getPair(address), password);
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    const decoded = decodePair(password, base64Decode(exportedJson.encoded), exportedJson.encoding.type);
-    return {
-      privateKey: u8aToHex(decoded.secretKey),
-      publicKey: u8aToHex(decoded.publicKey)
-    };
+  accountExportPrivateKey(request) {
+    return this.keyringService.context.accountExportPrivateKey(request);
   }
-  checkPublicAndSecretKey({
-    publicKey,
-    secretKey
-  }) {
-    try {
-      const _secret = hexStripPrefix(secretKey);
-      if (_secret.length === 64) {
-        const suri = `0x${_secret}`;
-        const {
-          phrase
-        } = keyExtractSuri(suri);
-        if (isHex(phrase) && isHex(phrase, 256)) {
-          const type = 'ethereum';
-          const address = keyring.createFromUri(getSuri(suri, type), {}, type).address;
-          return {
-            address: address,
-            isValid: true,
-            isEthereum: true
-          };
-        } else {
-          return {
-            address: '',
-            isValid: false,
-            isEthereum: true
-          };
-        }
-      }
-      const keyPair = keyring.keyring.addFromPair({
-        publicKey: hexToU8a(publicKey),
-        secretKey: hexToU8a(secretKey)
-      });
-      return {
-        address: keyPair.address,
-        isValid: true,
-        isEthereum: false
-      };
-    } catch (e) {
-      console.error(e);
-      return {
-        address: '',
-        isValid: false,
-        isEthereum: false
-      };
-    }
-  }
-  getEthKeyring(address, password) {
-    return new Promise(resolve => {
-      const {
-        privateKey
-      } = this.accountExportPrivateKey({
-        address,
-        password: password
-      });
-      const ethKeyring = new SimpleKeyring([privateKey]);
-      resolve(ethKeyring);
-    });
+  checkPublicAndSecretKey(request) {
+    return this.keyringService.context.checkPublicAndSecretKey(request);
   }
   async evmSign(id, url, method, params, topic) {
     let address = '';
@@ -1193,9 +993,15 @@ export default class KoniState {
   getConfirmationsQueueSubject() {
     return this.requestService.confirmationsQueueSubject;
   }
+  getConfirmationsQueueSubjectTon() {
+    return this.requestService.confirmationsQueueSubjectTon;
+  }
   async completeConfirmation(request) {
     return await this.requestService.completeConfirmation(request);
   }
+  async completeConfirmationTon(request) {
+    return await this.requestService.completeConfirmationTon(request);
+  }
   async onMV3Update() {
     const migrationStatus = await SWStorage.instance.getItem('mv3_migration');
     if (!migrationStatus || migrationStatus !== 'done') {
@@ -1210,6 +1016,18 @@ export default class KoniState {
       }
     }
   }
+  async storePreviousVersionData(details) {
+    if (details.reason === 'update') {
+      const previousVersion = details.previousVersion;
+      if (!previousVersion) {
+        return;
+      }
+      const storedData = await SWStorage.instance.getItem('previous_version');
+      if (!storedData || !storedData.includes(previousVersion)) {
+        await SWStorage.instance.setItem('previous_version', previousVersion);
+      }
+    }
+  }
   async migrateMV3LocalStorage(data) {
     try {
       const parsedData = JSON.parse(data);
@@ -1240,13 +1058,14 @@ export default class KoniState {
       this.onMV3Install().catch(console.error);
     } else if (details.reason === 'update') {
       this.onMV3Update().catch(console.error);
+      this.storePreviousVersionData(details).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 !== '') {
+        if (account.proxyId !== '') {
           // Open remind tab
           const url = `${chrome.runtime.getURL('index.html')}#/remind-export-account`;
           openPopup(url).then(noop).catch(console.error).finally(() => subscription.unsubscribe());
@@ -1256,7 +1075,7 @@ export default class KoniState {
           }, 3000);
         }
       };
-      const subscription = this.keyringService.currentAccountSubject.subscribe(handleRemind);
+      const subscription = this.keyringService.context.observable.currentAccount.subscribe(handleRemind);
     }
   }
   async setStorageFromWS({
@@ -1272,6 +1091,14 @@ export default class KoniState {
       return false;
     }
   }
+  async getStorageFromWS(key) {
+    try {
+      return await SWStorage.instance.getItem(key);
+    } catch (e) {
+      console.error(e);
+      return null;
+    }
+  }
   onCheckToRemindUser() {
     this.onHandleRemindExportAccount().catch(console.error);
   }
@@ -1440,7 +1267,7 @@ export default class KoniState {
     });
   }
   async reloadNft() {
-    const currentAddress = this.keyringService.currentAccount.address;
+    const currentAddress = this.keyringService.context.currentAccount.proxyId;
     await this.dbService.removeNftsByAddress(currentAddress);
     return await this.cron.reloadNft();
   }
@@ -1481,7 +1308,6 @@ export default class KoniState {
     // await this.handleResetBalance(ALL_ACCOUNT_KEY, true);
     await this.earningService.resetWallet();
     await this.dbService.resetWallet(resetAll);
-    this.accountRefStore.set('refList', []);
     if (resetAll) {
       await this.priceService.setPriceCurrency(DEFAULT_CURRENCY);
       this.settingService.resetWallet();
@@ -1601,7 +1427,7 @@ export default class KoniState {
   subscribeMantaPayBalance() {
     var _this$chainService27, _this$chainService27$;
     let interval;
-    (_this$chainService27 = this.chainService) === null || _this$chainService27 === void 0 ? void 0 : (_this$chainService27$ = _this$chainService27.mantaPay) === null || _this$chainService27$ === void 0 ? void 0 : _this$chainService27$.getMantaPayConfig(this.keyringService.currentAccount.address, _DEFAULT_MANTA_ZK_CHAIN).then(config => {
+    (_this$chainService27 = this.chainService) === null || _this$chainService27 === void 0 ? void 0 : (_this$chainService27$ = _this$chainService27.mantaPay) === null || _this$chainService27$ === void 0 ? void 0 : _this$chainService27$.getMantaPayConfig(this.keyringService.context.currentAccount.proxyId, _DEFAULT_MANTA_ZK_CHAIN).then(config => {
       if (config && config.enabled && config.isInitialSync) {
         this.getMantaZkBalance();
         interval = setInterval(this.getMantaZkBalance, MANTA_PAY_BALANCE_INTERVAL);

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

@@ -1,9 +1,8 @@
 /// <reference types="chrome" />
-import { AuthUrlInfo } from '@subwallet/extension-base/background/handlers/State';
 import { RequestAddPspToken } from '@subwallet/extension-base/background/KoniTypes';
 import { MessageTypes, RequestTypes, ResponseTypes } from '@subwallet/extension-base/background/types';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
-import { AuthUrls } from '@subwallet/extension-base/services/request-service/types';
+import { AuthUrlInfo, AuthUrls } from '@subwallet/extension-base/services/request-service/types';
 import { RequestArguments } from 'web3-core';
 export declare const chainPatrolCheckUrl: (url: string) => Promise<boolean>;
 export default class KoniTabs {
@@ -28,7 +27,7 @@ export default class KoniTabs {
     private createUnsubscriptionHandle;
     getAuthInfo(url: string, fromList?: AuthUrls): Promise<AuthUrlInfo | undefined>;
     private accountsListV2;
-    private accountsSubscribeV2;
+    private accountsSubstrateSubscribeV2;
     private accountsUnsubscribe;
     private authorizeV2;
     private getEvmCurrentAccount;