@subwallet/extension-base 1.1.68-1 → 1.2.1

package/cjs/services/history-service/subsquid-multi-chain-history.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -10,7 +9,6 @@ exports.parseSubsquidTransactionData = parseSubsquidTransactionData;
 var _client = require("@apollo/client");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/services/history-service/constants");
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -21,7 +19,7 @@ const MultiChainTxClient = new _client.ApolloClient({
   cache: new _client.InMemoryCache(),
   link: (0, _client.createHttpLink)({
     uri: MULTI_CHAIN_URL,
-    fetch: _crossFetch.default
+    fetch: fetch
   })
 });
 const query = (0, _client.gql)`query transactionQuery($addresses: [String!], $olderThanId: String) {

package/cjs/services/keyring-service/index.js

@@ -186,5 +186,27 @@ class KeyringService {
       currentGenesisHash: null
     });
   }
+  /* Reset */
+
+  /* Others */
+  removeNoneHardwareGenesisHash() {
+    const pairs = _uiKeyring.keyring.getPairs();
+    const needUpdatePairs = pairs.filter(_ref => {
+      let {
+        meta: {
+          genesisHash,
+          isHardware
+        }
+      } = _ref;
+      return !isHardware && genesisHash && genesisHash !== '';
+    });
+    needUpdatePairs.forEach(pair => {
+      _uiKeyring.keyring.saveAccountMeta(pair, {
+        ...pair.meta,
+        genesisHash: ''
+      });
+    });
+  }
+  /* Others */
 }
 exports.KeyringService = KeyringService;

package/cjs/services/migration-service/scripts/MigrateRemoveGenesisHash.js

@@ -0,0 +1,28 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateRemoveGenesisHash extends _Base.default {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        try {
+          this.state.keyringService.removeNoneHardwareGenesisHash();
+        } catch (e) {
+          console.error(e);
+        }
+        resolve();
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateRemoveGenesisHash;

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.EVERYTIME = void 0;
 var _AutoEnableSomeTokens = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/databases/AutoEnableSomeTokens"));
 var _DeleteEarningData = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData"));
+var _MigrateRemoveGenesisHash = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateRemoveGenesisHash"));
 var _MigrateTransactionHistoryBySymbol = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistoryBySymbol"));
 var _MigrateAssetSetting = _interopRequireDefault(require("./databases/MigrateAssetSetting"));
 var _MigrateEarningVersion = _interopRequireDefault(require("./databases/MigrateEarningVersion"));
@@ -57,7 +58,8 @@ var _default = {
   '1.1.41-01': _DeleteChainStaking.default,
   '1.1.46-01': _AutoEnableSomeTokens.default,
   '1.1.62-01': _MigrateAssetSetting.default,
-  '1.1.62-02': _MigrateTransactionHistoryBySymbol.default
+  '1.1.62-02': _MigrateTransactionHistoryBySymbol.default,
+  '1.2.69-01': _MigrateRemoveGenesisHash.default
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

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

@@ -1,12 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _utils = require("@subwallet/extension-base/utils");
-var _axios = _interopRequireDefault(require("axios"));
 var _rxjs = require("rxjs");
 var _constants = require("../constants");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -68,13 +66,13 @@ class UnlockDotCampaign {
         network
       }
     };
-    const response = await _axios.default.request({
-      baseURL: this.#host,
-      url: '/api/mint/check',
+    const respData = await (0, _utils.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;
     }
@@ -85,13 +83,13 @@ class UnlockDotCampaign {
       requestId: id,
       recipient: address
     };
-    const response = await _axios.default.request({
-      baseURL: this.#host,
-      url: '/api/mint/submit',
+    return await (0, _utils.fetchJson)(`${this.#host}/api/mint/submit`, {
       method: 'POST',
-      data
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(data)
     });
-    return response.data;
   }
 
   // @ts-ignore
@@ -99,13 +97,10 @@ class UnlockDotCampaign {
     const params = {
       address
     };
-    const response = await _axios.default.request({
-      baseURL: this.#host,
-      url: '/api/mint/fetch',
+    const data = await (0, _utils.fetchJson)(`${this.#host}/api/mint/check`, {
       method: 'GET',
       params: params
     });
-    const data = response.data;
     for (const item of data) {
       if ((0, _utils.isSameAddress)(item.address, address) && slug === item.mintCategory && item.status === 'success' && item.campaignId === this.#campaignId) {
         return item;
@@ -123,13 +118,13 @@ class UnlockDotCampaign {
         network
       }
     };
-    const response = await _axios.default.request({
-      baseURL: this.#host,
-      url: '/api/mint/check',
+    const respData = await (0, _utils.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/cjs/services/notification-service/NotificationService.js

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

package/cjs/services/price-service/coingecko.js

@@ -1,12 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getPriceMap = exports.getExchangeRateMap = void 0;
 var _staticData = require("@subwallet/extension-base/utils/staticData");
-var _axios = _interopRequireDefault(require("axios"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -14,7 +12,8 @@ const DEFAULT_CURRENCY = 'USD';
 let useBackupApi = false;
 const getExchangeRateMap = async () => {
   try {
-    const responseDataExchangeRate = (await _axios.default.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.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][exchangeKey]) {
         return map;
@@ -33,25 +32,25 @@ const getExchangeRateMap = async () => {
 };
 exports.getExchangeRateMap = getExchangeRateMap;
 const getPriceMap = async function (priceIds) {
-  var _rs, _rs2, _rs3;
+  var _rs, _rs2;
   let currency = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'USD';
   const idStr = Array.from(priceIds).join(',');
   let rs;
   if (!useBackupApi) {
     try {
-      rs = await _axios.default.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.default.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.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][currency || DEFAULT_CURRENCY];
   const priceMap = {};
   const price24hMap = {};

package/cjs/services/price-service/index.js

@@ -42,8 +42,9 @@ class PriceService {
     this.eventService = eventService;
     this.chainService = chainService;
     const updateCurrency = currentCurrency => {
-      const currency = _storage.SWStorage.instance.getItem(_constants.CURRENCY);
-      this.setCurrentCurrency(currency || currentCurrency || DEFAULT_CURRENCY);
+      _storage.SWStorage.instance.getItem(_constants.CURRENCY).then(currency => {
+        this.setCurrentCurrency(currency || currentCurrency || DEFAULT_CURRENCY);
+      }).catch(console.error);
     };
     this.init().then(() => this.getCurrentCurrency(updateCurrency)).catch(console.error);
   }
@@ -94,6 +95,9 @@ 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;
     }
@@ -133,7 +137,7 @@ class PriceService {
 
     // Await 1s to get the latest exchange rate
     await new Promise(resolve => setTimeout(resolve, 300));
-    _storage.SWStorage.instance.setItem(_constants.CURRENCY, newCurrencyCode);
+    await _storage.SWStorage.instance.setItem(_constants.CURRENCY, newCurrencyCode);
     return true;
   }
   refreshPriceData(priceIds) {

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

@@ -11,7 +11,7 @@ var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
+const NOTIFICATION_URL = chrome.runtime.getURL('notification.html');
 const extraHeight = _utils.osName === 'Linux' ? 0 : 28;
 const extraWidth = _utils.osName === 'Windows' ? 16 : 0;
 const POPUP_WINDOW_OPTS = {
@@ -26,18 +26,17 @@ const NORMAL_WINDOW_OPTS = {
   type: 'normal',
   url: NOTIFICATION_URL
 };
-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);
-  });
+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);
 }
 class PopupHandler {
   #requestService;
@@ -57,8 +56,8 @@ class PopupHandler {
     const numRequests = this.#requestService.numRequests;
     const text = numRequests > 0 ? numRequests.toString() : '';
     (0, _helpers.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/cjs/services/setting-service/SettingService.js

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

package/cjs/services/setting-service/constants.js

@@ -15,7 +15,7 @@ const DEFAULT_NOTIFICATION_TYPE = 'popup';
 exports.DEFAULT_NOTIFICATION_TYPE = DEFAULT_NOTIFICATION_TYPE;
 const DEFAULT_AUTO_LOCK_TIME = 15;
 exports.DEFAULT_AUTO_LOCK_TIME = DEFAULT_AUTO_LOCK_TIME;
-const DEFAULT_UNLOCK_TYPE = _utils.TARGET_ENV === 'extension' ? _KoniTypes.WalletUnlockType.ALWAYS_REQUIRED : _KoniTypes.WalletUnlockType.WHEN_NEEDED;
+const DEFAULT_UNLOCK_TYPE = _utils.targetIsExtension ? _KoniTypes.WalletUnlockType.ALWAYS_REQUIRED : _KoniTypes.WalletUnlockType.WHEN_NEEDED;
 exports.DEFAULT_UNLOCK_TYPE = DEFAULT_UNLOCK_TYPE;
 const DEFAULT_CHAIN_PATROL_ENABLE = false;
 exports.DEFAULT_CHAIN_PATROL_ENABLE = DEFAULT_CHAIN_PATROL_ENABLE;

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _constants = require("@subwallet/extension-base/constants");
-var _storage = require("@subwallet/extension-base/storage");
 var _i18next = _interopRequireDefault(require("i18next"));
 var _Backend = _interopRequireDefault(require("./Backend"));
 // Copyright 2019-2022 @polkadot/extension-ui authors & contributors
@@ -20,11 +18,11 @@ _i18next.default.use(_Backend.default).init({
     escapeValue: false
   },
   keySeparator: false,
-  lng: _storage.SWStorage.instance.getItem(_constants.LANGUAGE) || 'en',
+  lng: 'en',
   load: 'languageOnly',
   nsSeparator: false,
   returnEmptyString: false,
   returnNull: false
-}).catch(error => console.log('i18n: failure', error));
+}).catch(console.error);
 var _default = _i18next.default;
 exports.default = _default;

package/cjs/services/storage-service/DatabaseService.js

@@ -29,7 +29,7 @@ class DatabaseService {
   constructor(eventService) {
     this.eventService = eventService;
     this.logger = (0, _util.logger)('DB-Service');
-    this._db = new _databases.default();
+    this._db = _databases.default.getInstance();
     this._db.on('ready', () => {
       this.eventService.emit('database.ready', true);
     });

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

@@ -4,12 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.DEFAULT_DATABASE = void 0;
 var _dexie = _interopRequireDefault(require("dexie"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const DEFAULT_DATABASE = 'SubWalletDB_v2';
+exports.DEFAULT_DATABASE = DEFAULT_DATABASE;
 class KoniDatabase extends _dexie.default {
   constructor() {
     let name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DEFAULT_DATABASE;
@@ -46,6 +47,9 @@ class KoniDatabase extends _dexie.default {
     this.conditionalVersion(5, {
       campaign: 'slug'
     });
+    this.conditionalVersion(6, {
+      keyValue: 'key'
+    });
   }
   conditionalVersion(version, schema, upgrade) {
     if (this.schemaVersion != null && this.schemaVersion < version) {
@@ -56,5 +60,14 @@ class KoniDatabase extends _dexie.default {
       dexieVersion.upgrade(upgrade);
     }
   }
+
+  // Singletons
+
+  static getInstance(name, schemaVersion) {
+    if (!KoniDatabase.instance) {
+      KoniDatabase.instance = new KoniDatabase(name, schemaVersion);
+    }
+    return KoniDatabase.instance;
+  }
 }
 exports.default = KoniDatabase;

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

@@ -0,0 +1,13 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _BaseStore = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/BaseStore"));
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class KeyValueStore extends _BaseStore.default {}
+exports.default = KeyValueStore;

package/cjs/services/subscan-service/index.js

@@ -1,14 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SubscanService = void 0;
 var _SWError = require("@subwallet/extension-base/background/errors/SWError");
 var _constants = require("@subwallet/extension-base/koni/api/nft/ordinal_nft/constants");
+var _subscanChainMap = require("@subwallet/extension-base/services/subscan-service/subscan-chain-map");
 var _utils = require("@subwallet/extension-base/utils");
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -48,7 +47,7 @@ class SubscanService {
     return `https://${subscanChain}.api.subscan.io/${path}`;
   }
   postRequest(url, body) {
-    return (0, _crossFetch.default)(url, {
+    return fetch(url, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json'
@@ -330,5 +329,14 @@ class SubscanService {
       return jsonData.data;
     }, ordinal);
   }
+
+  // Singleton
+
+  static getInstance() {
+    if (!SubscanService._instance) {
+      SubscanService._instance = new SubscanService(_subscanChainMap.SUBSCAN_API_CHAIN_MAP);
+    }
+    return SubscanService._instance;
+  }
 }
 exports.SubscanService = SubscanService;

package/cjs/services/transaction-service/index.js

@@ -1015,8 +1015,8 @@ 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 => {
@@ -1041,7 +1041,7 @@ class TransactionService {
             const onCheck = () => {
               web3Api.eth.getTransactionReceipt(txHash).then(onSuccess).catch(onError);
             };
-            subscribe = web3Api.eth.subscribe('newBlockHeaders', onCheck);
+            subscribe = (0, _rxjs.interval)(3000).subscribe(onCheck);
           });
         } else {
           this.removeTransaction(id);

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

@@ -16,8 +16,8 @@ exports.PROJECT_ID_MOBILE = PROJECT_ID_MOBILE;
 const RELAY_URL = 'wss://relay.walletconnect.com';
 exports.RELAY_URL = RELAY_URL;
 const DEFAULT_WALLET_CONNECT_OPTIONS = {
-  logger: 'debug',
-  projectId: !_utils.isMobile ? PROJECT_ID_EXTENSION : PROJECT_ID_MOBILE,
+  logger: 'error',
+  projectId: _utils.targetIsMobile ? PROJECT_ID_MOBILE : PROJECT_ID_EXTENSION,
   relayUrl: RELAY_URL,
   metadata: {
     name: 'SubWallet',

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

@@ -67,10 +67,7 @@ const isWalletConnectRequest = id => {
 };
 exports.isWalletConnectRequest = isWalletConnectRequest;
 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();
 };
 exports.isProposalExpired = isProposalExpired;
 const isSupportWalletConnectNamespace = namespace => {