@subwallet/extension-base 1.1.68-2 → 1.2.1

package/services/mint-campaign-service/campaigns/UnlockDotCampaign.js

@@ -1,8 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { isSameAddress } from '@subwallet/extension-base/utils';
-import axios from 'axios';
+import { fetchJson, isSameAddress } from '@subwallet/extension-base/utils';
 import { BehaviorSubject } from 'rxjs';
 import { MINT_HOST } from "../constants.js";
 export default class UnlockDotCampaign {
@@ -59,13 +58,13 @@ export default class UnlockDotCampaign {
         network
       }
     };
-    const response = await axios.request({
-      baseURL: this.#host,
-      url: '/api/mint/check',
+    const respData = await fetchJson(`${this.#host}/api/mint/check`, {
       method: 'POST',
-      data
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(data)
     });
-    const respData = response.data;
     if (respData.inMintingTime && respData.hasBalance && respData.validCampaign && respData.validCategory && respData.validUser && respData.notDuplicated && respData.requestId && respData.requestId > 1) {
       return respData.requestId;
     }
@@ -76,13 +75,13 @@ export default class UnlockDotCampaign {
       requestId: id,
       recipient: address
     };
-    const response = await axios.request({
-      baseURL: this.#host,
-      url: '/api/mint/submit',
+    return await fetchJson(`${this.#host}/api/mint/submit`, {
       method: 'POST',
-      data
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(data)
     });
-    return response.data;
   }
 
   // @ts-ignore
@@ -90,13 +89,10 @@ export default class UnlockDotCampaign {
     const params = {
       address
     };
-    const response = await axios.request({
-      baseURL: this.#host,
-      url: '/api/mint/fetch',
+    const data = await fetchJson(`${this.#host}/api/mint/check`, {
       method: 'GET',
       params: params
     });
-    const data = response.data;
     for (const item of data) {
       if (isSameAddress(item.address, address) && slug === item.mintCategory && item.status === 'success' && item.campaignId === this.#campaignId) {
         return item;
@@ -114,13 +110,13 @@ export default class UnlockDotCampaign {
         network
       }
     };
-    const response = await axios.request({
-      baseURL: this.#host,
-      url: '/api/mint/check',
+    const respData = await fetchJson(`${this.#host}/api/mint/check`, {
       method: 'POST',
-      data
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(data)
     });
-    const respData = response.data;
     if (respData.inMintingTime && respData.validCampaign && respData.validCategory && respData.validUser && respData.notDuplicated) {
       return true;
     }

package/services/notification-service/NotificationService.js

@@ -48,7 +48,9 @@ export default class NotificationService {
             if (onClick) {
               onClick();
             } else {
-              window.open(link);
+              chrome.tabs.create({
+                url: link
+              }).catch(console.error);
             }
           }
         });

package/services/price-service/coingecko.js

@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { staticData, StaticKey } from '@subwallet/extension-base/utils/staticData';
-import axios from 'axios';
 const DEFAULT_CURRENCY = 'USD';
 let useBackupApi = false;
 export const getExchangeRateMap = async () => {
   try {
-    const responseDataExchangeRate = (await axios.get('https://api-cache.subwallet.app/exchange-rate')).data || {};
+    const response = await fetch('https://api-cache.subwallet.app/exchange-rate');
+    const responseDataExchangeRate = (await response.json()) || {};
     const exchangeRateMap = Object.keys(responseDataExchangeRate.conversion_rates).reduce((map, exchangeKey) => {
       if (!staticData[StaticKey.CURRENCY_SYMBOL][exchangeKey]) {
         return map;
@@ -25,24 +25,24 @@ export const getExchangeRateMap = async () => {
   }
 };
 export const getPriceMap = async (priceIds, currency = 'USD') => {
-  var _rs, _rs2, _rs3;
+  var _rs, _rs2;
   const idStr = Array.from(priceIds).join(',');
   let rs;
   if (!useBackupApi) {
     try {
-      rs = await axios.get(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currency.toLowerCase()}&per_page=250&ids=${idStr}`);
+      rs = await fetch(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currency.toLowerCase()}&per_page=250&ids=${idStr}`);
     } catch (err) {
       useBackupApi = true;
     }
   }
   if (useBackupApi || ((_rs = rs) === null || _rs === void 0 ? void 0 : _rs.status) !== 200) {
     useBackupApi = true;
-    rs = await axios.get(`https://chain-data.subwallet.app/api/price/get?ids=${idStr}`);
+    rs = await fetch(`https://chain-data.subwallet.app/api/price/get?ids=${idStr}`);
   }
   if (((_rs2 = rs) === null || _rs2 === void 0 ? void 0 : _rs2.status) !== 200) {
     console.warn('Failed to get token price');
   }
-  const responseDataPrice = ((_rs3 = rs) === null || _rs3 === void 0 ? void 0 : _rs3.data) || [];
+  const responseDataPrice = (await rs.json()) || [];
   const currencyData = staticData[StaticKey.CURRENCY_SYMBOL][currency || DEFAULT_CURRENCY];
   const priceMap = {};
   const price24hMap = {};

package/services/price-service/index.js

@@ -36,8 +36,9 @@ export class PriceService {
     this.eventService = eventService;
     this.chainService = chainService;
     const updateCurrency = currentCurrency => {
-      const currency = SWStorage.instance.getItem(CURRENCY);
-      this.setCurrentCurrency(currency || currentCurrency || DEFAULT_CURRENCY);
+      SWStorage.instance.getItem(CURRENCY).then(currency => {
+        this.setCurrentCurrency(currency || currentCurrency || DEFAULT_CURRENCY);
+      }).catch(console.error);
     };
     this.init().then(() => this.getCurrentCurrency(updateCurrency)).catch(console.error);
   }
@@ -87,6 +88,9 @@ export class PriceService {
     } = this.rawPriceSubject.value;
     const exchangeRateData = this.rawExchangeRateMap.value;
     const currencyKey = currency || DEFAULT_CURRENCY;
+    if (Object.keys(this.rawPriceSubject.value).length === 0) {
+      return;
+    }
     if (Object.keys(exchangeRateData).length === 0) {
       return;
     }
@@ -126,7 +130,7 @@ export class PriceService {
 
     // Await 1s to get the latest exchange rate
     await new Promise(resolve => setTimeout(resolve, 300));
-    SWStorage.instance.setItem(CURRENCY, newCurrencyCode);
+    await SWStorage.instance.setItem(CURRENCY, newCurrencyCode);
     return true;
   }
   refreshPriceData(priceIds) {

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

@@ -1,5 +1,5 @@
 import RequestService from '@subwallet/extension-base/services/request-service';
-export declare function openPopup(url: string): void;
+export declare function openPopup(url: string): Promise<void>;
 export default class PopupHandler {
     #private;
     constructor(requestService: RequestService);

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

@@ -4,7 +4,7 @@
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { DEFAULT_NOTIFICATION_TYPE } from '@subwallet/extension-base/services/setting-service/constants';
 import { osName } from '@subwallet/extension-base/utils';
-const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
+const NOTIFICATION_URL = chrome.runtime.getURL('notification.html');
 const extraHeight = osName === 'Linux' ? 0 : 28;
 const extraWidth = osName === 'Windows' ? 16 : 0;
 const POPUP_WINDOW_OPTS = {
@@ -19,18 +19,17 @@ const NORMAL_WINDOW_OPTS = {
   type: 'normal',
   url: NOTIFICATION_URL
 };
-export function openPopup(url) {
-  chrome.windows.getCurrent(win => {
-    const popupOptions = {
-      ...POPUP_WINDOW_OPTS,
-      url
-    };
-    if (win) {
-      popupOptions.left = (win.left || 0) + (win.width || 0) - (popupOptions.width || 0) - 20;
-      popupOptions.top = (win.top || 0) + 110;
-    }
-    chrome.windows.create(popupOptions).catch(console.error);
-  });
+export async function openPopup(url) {
+  const win = await chrome.windows.getCurrent();
+  const popupOptions = {
+    ...POPUP_WINDOW_OPTS,
+    url
+  };
+  if (win) {
+    popupOptions.left = (win.left || 0) + (win.width || 0) - (popupOptions.width || 0) - 20;
+    popupOptions.top = (win.top || 0) + 110;
+  }
+  await chrome.windows.create(popupOptions);
 }
 export default class PopupHandler {
   #requestService;
@@ -50,8 +49,8 @@ export default class PopupHandler {
     const numRequests = this.#requestService.numRequests;
     const text = numRequests > 0 ? numRequests.toString() : '';
     withErrorLog(() => {
-      var _chrome$browserAction;
-      return (_chrome$browserAction = chrome.browserAction) === null || _chrome$browserAction === void 0 ? void 0 : _chrome$browserAction.setBadgeText({
+      var _chrome$action;
+      return (_chrome$action = chrome.action) === null || _chrome$action === void 0 ? void 0 : _chrome$action.setBadgeText({
         text
       });
     });

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

@@ -4,6 +4,7 @@ export default class SettingService {
     private readonly settingsStore;
     private readonly passPhishingStore;
     constructor();
+    private initSetting;
     getSubject(): Subject<RequestSettingsType>;
     getSettings(update: (value: RequestSettingsType) => void): void;
     setSettings(data: RequestSettingsType, callback?: () => void): void;

package/services/setting-service/SettingService.js

@@ -11,7 +11,10 @@ export default class SettingService {
   settingsStore = new SettingsStore();
   passPhishingStore = new PassPhishingStore();
   constructor() {
-    let old = SWStorage.instance.getItem(LANGUAGE) || 'en';
+    this.initSetting().catch(console.error);
+  }
+  async initSetting() {
+    let old = (await SWStorage.instance.getItem(LANGUAGE)) || 'en';
     const updateLanguage = ({
       language
     }) => {

package/services/setting-service/constants.js

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ThemeNames, WalletUnlockType } from '@subwallet/extension-base/background/KoniTypes';
-import { TARGET_ENV } from '@subwallet/extension-base/utils';
+import { targetIsExtension } from '@subwallet/extension-base/utils';
 export const DEFAULT_THEME = ThemeNames.DARK;
 export const DEFAULT_NOTIFICATION_TYPE = 'popup';
 export const DEFAULT_AUTO_LOCK_TIME = 15;
-export const DEFAULT_UNLOCK_TYPE = TARGET_ENV === 'extension' ? WalletUnlockType.ALWAYS_REQUIRED : WalletUnlockType.WHEN_NEEDED;
+export const DEFAULT_UNLOCK_TYPE = targetIsExtension ? WalletUnlockType.ALWAYS_REQUIRED : WalletUnlockType.WHEN_NEEDED;
 export const DEFAULT_CHAIN_PATROL_ENABLE = false;
 export const DEFAULT_LANGUAGE = 'en';
 export const DEFAULT_CURRENCY = 'usd';

package/services/setting-service/i18n/i18n.js

@@ -1,8 +1,6 @@
 // Copyright 2019-2022 @polkadot/extension-ui authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { LANGUAGE } from '@subwallet/extension-base/constants';
-import { SWStorage } from '@subwallet/extension-base/storage';
 import i18next from 'i18next';
 import Backend from "./Backend.js";
 i18next.use(Backend).init({
@@ -13,10 +11,10 @@ i18next.use(Backend).init({
     escapeValue: false
   },
   keySeparator: false,
-  lng: SWStorage.instance.getItem(LANGUAGE) || 'en',
+  lng: 'en',
   load: 'languageOnly',
   nsSeparator: false,
   returnEmptyString: false,
   returnNull: false
-}).catch(error => console.log('i18n: failure', error));
+}).catch(console.error);
 export default i18next;

package/services/storage-service/DatabaseService.js

@@ -21,7 +21,7 @@ export default class DatabaseService {
   constructor(eventService) {
     this.eventService = eventService;
     this.logger = createLogger('DB-Service');
-    this._db = new KoniDatabase();
+    this._db = KoniDatabase.getInstance();
     this._db.on('ready', () => {
       this.eventService.emit('database.ready', true);
     });

package/services/storage-service/databases/index.d.ts

@@ -2,6 +2,7 @@ import { _AssetRef, _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types'
 import { CampaignData, ChainStakingMetadata, CrowdloanItem, MetadataItem, NftCollection, NftItem, NominatorMetadata, PriceJson, StakingItem, TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
 import { BalanceItem, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
 import Dexie, { Table } from 'dexie';
+export declare const DEFAULT_DATABASE = "SubWalletDB_v2";
 export interface DefaultChainDoc {
     chain: string;
 }
@@ -19,6 +20,10 @@ export interface IChain extends _ChainInfo {
 }
 export interface ICrowdloanItem extends CrowdloanItem, DefaultAddressDoc, DefaultChainDoc {
 }
+export interface IKeyValue {
+    key: string;
+    value: string;
+}
 export interface INft extends NftItem, DefaultAddressDoc {
 }
 export interface ITransactionHistoryItem extends TransactionHistoryItem, DefaultAddressDoc, DefaultChainDoc {
@@ -53,7 +58,10 @@ export default class KoniDatabase extends Dexie {
     yieldPosition: Table<YieldPositionInfo, object>;
     mantaPay: Table<IMantaPayLedger, object>;
     campaign: Table<ICampaign, object>;
+    keyValue: Table<IKeyValue, object>;
     private schemaVersion;
     constructor(name?: string, schemaVersion?: number);
     private conditionalVersion;
+    static instance: KoniDatabase;
+    static getInstance(name?: string, schemaVersion?: number): KoniDatabase;
 }

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Dexie from 'dexie';
-const DEFAULT_DATABASE = 'SubWalletDB_v2';
+export const DEFAULT_DATABASE = 'SubWalletDB_v2';
 export default class KoniDatabase extends Dexie {
   constructor(name = DEFAULT_DATABASE, schemaVersion = 11) {
     super(name);
@@ -37,6 +37,9 @@ export default class KoniDatabase extends Dexie {
     this.conditionalVersion(5, {
       campaign: 'slug'
     });
+    this.conditionalVersion(6, {
+      keyValue: 'key'
+    });
   }
   conditionalVersion(version, schema, upgrade) {
     if (this.schemaVersion != null && this.schemaVersion < version) {
@@ -47,4 +50,13 @@ export default class KoniDatabase extends Dexie {
       dexieVersion.upgrade(upgrade);
     }
   }
+
+  // Singletons
+
+  static getInstance(name, schemaVersion) {
+    if (!KoniDatabase.instance) {
+      KoniDatabase.instance = new KoniDatabase(name, schemaVersion);
+    }
+    return KoniDatabase.instance;
+  }
 }

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

@@ -0,0 +1,4 @@
+import { IKeyValue } from '@subwallet/extension-base/services/storage-service/databases';
+import BaseStore from '@subwallet/extension-base/services/storage-service/db-stores/BaseStore';
+export default class KeyValueStore extends BaseStore<IKeyValue> {
+}

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

@@ -0,0 +1,5 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseStore from '@subwallet/extension-base/services/storage-service/db-stores/BaseStore';
+export default class KeyValueStore extends BaseStore {}

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

@@ -39,4 +39,6 @@ export declare class SubscanService {
     getRewardHistoryList(chain: string, address: string, page?: number): Promise<RewardHistoryListResponse>;
     getAccountRemarkEvents(chain: string, address: string): Promise<SubscanEventBaseItemData[]>;
     getExtrinsicParams(chain: string, extrinsicIndexes: string[], ordinal?: number): Promise<SubscanExtrinsicParam[]>;
+    private static _instance;
+    static getInstance(): SubscanService;
 }

package/services/subscan-service/index.js

@@ -3,8 +3,8 @@
 
 import { SWError } from '@subwallet/extension-base/background/errors/SWError';
 import { BASE_FETCH_ORDINAL_EVENT_DATA } from '@subwallet/extension-base/koni/api/nft/ordinal_nft/constants';
+import { SUBSCAN_API_CHAIN_MAP } from '@subwallet/extension-base/services/subscan-service/subscan-chain-map';
 import { wait } from '@subwallet/extension-base/utils';
-import fetch from 'cross-fetch';
 const QUERY_ROW = 100;
 export class SubscanService {
   callRate = 2; // limit per interval check
@@ -313,4 +313,13 @@ export class SubscanService {
       return jsonData.data;
     }, ordinal);
   }
+
+  // Singleton
+
+  static getInstance() {
+    if (!SubscanService._instance) {
+      SubscanService._instance = new SubscanService(SUBSCAN_API_CHAIN_MAP);
+    }
+    return SubscanService._instance;
+  }
 }

package/services/transaction-service/index.js

@@ -25,7 +25,7 @@ import { addHexPrefix } from 'ethereumjs-util';
 import { ethers } from 'ethers';
 import EventEmitter from 'eventemitter3';
 import { t } from 'i18next';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, interval as rxjsInterval } from 'rxjs';
 import { isHex } from '@polkadot/util';
 import { _TRANSFER_CHAIN_GROUP } from "../chain-service/constants.js";
 export default class TransactionService {
@@ -1000,8 +1000,8 @@ export default class TransactionService {
             // eslint-disable-next-line prefer-const
             let subscribe;
             const onComplete = () => {
-              var _subscribe, _subscribe$unsubscrib, _subscribe$unsubscrib2;
-              (_subscribe = subscribe) === null || _subscribe === void 0 ? void 0 : (_subscribe$unsubscrib = _subscribe.unsubscribe) === null || _subscribe$unsubscrib === void 0 ? void 0 : (_subscribe$unsubscrib2 = _subscribe$unsubscrib.call(_subscribe)) === null || _subscribe$unsubscrib2 === void 0 ? void 0 : _subscribe$unsubscrib2.then(console.debug).catch(console.debug);
+              var _subscribe, _subscribe$unsubscrib;
+              (_subscribe = subscribe) === null || _subscribe === void 0 ? void 0 : (_subscribe$unsubscrib = _subscribe.unsubscribe) === null || _subscribe$unsubscrib === void 0 ? void 0 : _subscribe$unsubscrib.call(_subscribe);
               delete this.watchTransactionSubscribes[id];
             };
             const onSuccess = rs => {
@@ -1026,7 +1026,7 @@ export default class TransactionService {
             const onCheck = () => {
               web3Api.eth.getTransactionReceipt(txHash).then(onSuccess).catch(onError);
             };
-            subscribe = web3Api.eth.subscribe('newBlockHeaders', onCheck);
+            subscribe = rxjsInterval(3000).subscribe(onCheck);
           });
         } else {
           this.removeTransaction(id);

package/services/wallet-connect-service/constants.js

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { EIP155_SIGNING_METHODS, POLKADOT_SIGNING_METHODS } from '@subwallet/extension-base/services/wallet-connect-service/types';
-import { isMobile } from '@subwallet/extension-base/utils';
+import { targetIsMobile } from '@subwallet/extension-base/utils';
 export const PROJECT_ID_EXTENSION = '6da34c0b48164d27681924dd9a46d6be';
 export const PROJECT_ID_MOBILE = '6da34c0b48164d27681924dd9a46d6be';
 export const RELAY_URL = 'wss://relay.walletconnect.com';
 export const DEFAULT_WALLET_CONNECT_OPTIONS = {
-  logger: 'debug',
-  projectId: !isMobile ? PROJECT_ID_EXTENSION : PROJECT_ID_MOBILE,
+  logger: 'error',
+  projectId: targetIsMobile ? PROJECT_ID_MOBILE : PROJECT_ID_EXTENSION,
   relayUrl: RELAY_URL,
   metadata: {
     name: 'SubWallet',

package/services/wallet-connect-service/helpers.js

@@ -55,10 +55,7 @@ export const isWalletConnectRequest = id => {
   return prefix === WALLET_CONNECT_REQUEST_KEY;
 };
 export const isProposalExpired = params => {
-  const timeNum = params.expiry;
-  const expireTime = new Date(timeNum > 10 ** 12 ? timeNum : timeNum * 1000);
-  const now = new Date();
-  return now.getTime() >= expireTime.getTime();
+  return params.expiryTimestamp * 1000 < Date.now();
 };
 export const isSupportWalletConnectNamespace = namespace => {
   return WALLET_CONNECT_SUPPORT_NAMESPACES.includes(namespace);

package/services/wallet-connect-service/index.d.ts

@@ -7,6 +7,8 @@ export default class WalletConnectService {
     #private;
     readonly sessionSubject: BehaviorSubject<SessionTypes.Struct[]>;
     constructor(koniState: KoniState, requestService: RequestService, option?: SignClientTypes.Options);
+    private haveData;
+    initClient(force?: boolean): Promise<void>;
     get sessions(): SessionTypes.Struct[];
     getSession(topic: string): SessionTypes.Struct;
     changeOption(newOption: Omit<SignClientTypes.Options, 'projectId'>): Promise<void>;

package/services/wallet-connect-service/index.js

@@ -16,14 +16,31 @@ import { EIP155_SIGNING_METHODS, POLKADOT_SIGNING_METHODS } from "./types.js";
 const storage = SWStorage.instance;
 const methodDOTRequire = [POLKADOT_SIGNING_METHODS.POLKADOT_SIGN_MESSAGE, POLKADOT_SIGNING_METHODS.POLKADOT_SIGN_TRANSACTION];
 const methodEVMRequire = [EIP155_SIGNING_METHODS.PERSONAL_SIGN, EIP155_SIGNING_METHODS.ETH_SIGN, EIP155_SIGNING_METHODS.ETH_SEND_TRANSACTION];
+class WCStorage {
+  async getEntries() {
+    const datas = await storage.getEntries();
+    return Promise.resolve(datas.filter(([key]) => key.startsWith('wc@')).map(([key, value]) => [key, JSON.parse(value)]));
+  }
+  async getItem(key) {
+    const data = await storage.getItem(key);
+    return data ? JSON.parse(data) : undefined;
+  }
+  async getKeys() {
+    return (await storage.keys()).filter(key => key.startsWith('wc@'));
+  }
+  async removeItem(key) {
+    return await storage.removeItem(key);
+  }
+  async setItem(key, value) {
+    return await storage.setItem(key, JSON.stringify(value));
+  }
+}
 var _requestService = /*#__PURE__*/_classPrivateFieldLooseKey("requestService");
 var _polkadotRequestHandler = /*#__PURE__*/_classPrivateFieldLooseKey("polkadotRequestHandler");
 var _eip155RequestHandler = /*#__PURE__*/_classPrivateFieldLooseKey("eip155RequestHandler");
 var _koniState = /*#__PURE__*/_classPrivateFieldLooseKey("koniState");
 var _client = /*#__PURE__*/_classPrivateFieldLooseKey("client");
 var _option = /*#__PURE__*/_classPrivateFieldLooseKey("option");
-var _haveData = /*#__PURE__*/_classPrivateFieldLooseKey("haveData");
-var _initClient = /*#__PURE__*/_classPrivateFieldLooseKey("initClient");
 var _updateSessions = /*#__PURE__*/_classPrivateFieldLooseKey("updateSessions");
 var _onSessionProposal = /*#__PURE__*/_classPrivateFieldLooseKey("onSessionProposal");
 var _onSessionRequest = /*#__PURE__*/_classPrivateFieldLooseKey("onSessionRequest");
@@ -50,13 +67,6 @@ export default class WalletConnectService {
     Object.defineProperty(this, _updateSessions, {
       value: _updateSessions2
     });
-    Object.defineProperty(this, _initClient, {
-      value: _initClient2
-    });
-    Object.defineProperty(this, _haveData, {
-      get: _get_haveData,
-      set: void 0
-    });
     Object.defineProperty(this, _requestService, {
       writable: true,
       value: void 0
@@ -84,10 +94,28 @@ export default class WalletConnectService {
     this.sessionSubject = new BehaviorSubject([]);
     _classPrivateFieldLooseBase(this, _koniState)[_koniState] = koniState;
     _classPrivateFieldLooseBase(this, _requestService)[_requestService] = requestService;
+    option.storage = new WCStorage();
     _classPrivateFieldLooseBase(this, _option)[_option] = option;
     _classPrivateFieldLooseBase(this, _polkadotRequestHandler)[_polkadotRequestHandler] = new PolkadotRequestHandler(this, requestService);
     _classPrivateFieldLooseBase(this, _eip155RequestHandler)[_eip155RequestHandler] = new Eip155RequestHandler(_classPrivateFieldLooseBase(this, _koniState)[_koniState], this);
-    _classPrivateFieldLooseBase(this, _initClient)[_initClient]().catch(console.error);
+    this.initClient().catch(console.error);
+  }
+  async haveData() {
+    const sessionStorage = await storage.getItem('wc@2:client:0.3//session');
+    const pairingStorage = await storage.getItem('wc@2:core:0.3//pairing');
+    const subscriptionStorage = await storage.getItem('wc@2:core:0.3//subscription');
+    const sessions = sessionStorage ? JSON.parse(sessionStorage) : [];
+    const pairings = pairingStorage ? JSON.parse(pairingStorage) : [];
+    const subscriptions = subscriptionStorage ? JSON.parse(subscriptionStorage) : [];
+    return !!sessions.length || !!pairings.length || !!subscriptions.length;
+  }
+  async initClient(force) {
+    _classPrivateFieldLooseBase(this, _removeListener)[_removeListener]();
+    if (force || (await this.haveData())) {
+      _classPrivateFieldLooseBase(this, _client)[_client] = await SignClient.init(_classPrivateFieldLooseBase(this, _option)[_option]);
+    }
+    _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions]();
+    _classPrivateFieldLooseBase(this, _createListener)[_createListener]();
   }
   get sessions() {
     var _classPrivateFieldLoo;
@@ -104,12 +132,12 @@ export default class WalletConnectService {
   }
   async changeOption(newOption) {
     _classPrivateFieldLooseBase(this, _option)[_option] = Object.assign({}, _classPrivateFieldLooseBase(this, _option)[_option], newOption);
-    await _classPrivateFieldLooseBase(this, _initClient)[_initClient]();
+    await this.initClient();
   }
   async connect(uri) {
     var _classPrivateFieldLoo3;
-    if (!_classPrivateFieldLooseBase(this, _haveData)[_haveData]) {
-      await _classPrivateFieldLooseBase(this, _initClient)[_initClient](true);
+    if (!(await this.haveData())) {
+      await this.initClient(true);
     }
     _classPrivateFieldLooseBase(this, _checkClient)[_checkClient]();
     await ((_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo3 === void 0 ? void 0 : _classPrivateFieldLoo3.pair({
@@ -182,7 +210,7 @@ export default class WalletConnectService {
         console.error(e);
       }
     }
-    await _classPrivateFieldLooseBase(this, _initClient)[_initClient]();
+    await this.initClient();
     _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions]();
   }
   async disconnect(topic) {
@@ -204,23 +232,6 @@ export default class WalletConnectService {
     }, []);
   }
 }
-function _get_haveData() {
-  const sessionStorage = storage.getItem('wc@2:client:0.3//session');
-  const pairingStorage = storage.getItem('wc@2:core:0.3//pairing');
-  const subscriptionStorage = storage.getItem('wc@2:core:0.3//subscription');
-  const sessions = sessionStorage ? JSON.parse(sessionStorage) : [];
-  const pairings = pairingStorage ? JSON.parse(pairingStorage) : [];
-  const subscriptions = subscriptionStorage ? JSON.parse(subscriptionStorage) : [];
-  return !!sessions.length || !!pairings.length || !!subscriptions.length;
-}
-async function _initClient2(force) {
-  _classPrivateFieldLooseBase(this, _removeListener)[_removeListener]();
-  if (force || _classPrivateFieldLooseBase(this, _haveData)[_haveData]) {
-    _classPrivateFieldLooseBase(this, _client)[_client] = await SignClient.init(_classPrivateFieldLooseBase(this, _option)[_option]);
-  }
-  _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions]();
-  _classPrivateFieldLooseBase(this, _createListener)[_createListener]();
-}
 function _updateSessions2() {
   this.sessionSubject.next(this.sessions);
 }

package/storage/index.d.ts

@@ -1,14 +1,24 @@
 export declare class SWStorage {
     private _storage;
+    private localStorage;
+    private kvDatabase;
+    private isReady;
+    private waitReadyHandler;
+    get waitReady(): Promise<SWStorage>;
     constructor();
-    setItem(key: string, value: string): void;
-    getItem(key: string): string | null;
-    removeItem(key: string): void;
-    clear(): void;
-    key(index: number): string | null;
-    length(index: number): string | null;
-    keys(): string[];
-    copy(): Record<string, string>;
-    sync(): void;
+    setItem(key: string, value: string): Promise<void>;
+    getEntries(): Promise<[string, string][]>;
+    setMap(map: Record<string, string>): Promise<void>;
+    getItem(key: string): Promise<string | null>;
+    getItems(keys: string[]): Promise<Array<string | null>>;
+    getMap(keys: string[]): Promise<Record<string, string | null>>;
+    removeItem(key: string): Promise<void>;
+    removeItems(keys: string[]): Promise<void>;
+    clear(): Promise<void>;
+    key(index: number): Promise<string | null>;
+    length(index: number): Promise<string | null>;
+    keys(): Promise<string[]>;
+    copy(): Promise<Record<string, string>>;
+    sync(): Promise<void>;
     static get instance(): SWStorage;
 }