@subwallet/extension-base 1.1.68-2 → 1.2.1

package/cjs/koni/background/handlers/State.js

@@ -32,7 +32,6 @@ var _PopupHandler = require("@subwallet/extension-base/services/request-service/
 var _SettingService = _interopRequireDefault(require("@subwallet/extension-base/services/setting-service/SettingService"));
 var _DatabaseService = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/DatabaseService"));
 var _subscanService = require("@subwallet/extension-base/services/subscan-service");
-var _subscanChainMap = require("@subwallet/extension-base/services/subscan-service/subscan-chain-map");
 var _swapService = require("@subwallet/extension-base/services/swap-service");
 var _transactionService = _interopRequireDefault(require("@subwallet/extension-base/services/transaction-service"));
 var _walletConnectService = _interopRequireDefault(require("@subwallet/extension-base/services/wallet-connect-service"));
@@ -101,7 +100,7 @@ class KoniState {
     this.keyringService = new _keyringService.KeyringService(this.eventService);
     this.notificationService = new _NotificationService.default();
     this.chainService = new _chainService.ChainService(this.dbService, this.eventService);
-    this.subscanService = new _subscanService.SubscanService(_subscanChainMap.SUBSCAN_API_CHAIN_MAP);
+    this.subscanService = _subscanService.SubscanService.getInstance();
     this.settingService = new _SettingService.default();
     this.requestService = new _requestService.default(this.chainService, this.settingService, this.keyringService);
     this.priceService = new _priceService.PriceService(this.dbService, this.eventService, this.chainService);
@@ -121,7 +120,7 @@ class KoniState {
     this.logger = (0, _util.logger)('State');
 
     // Init state
-    if (_utils3.TARGET_ENV !== 'mobile') {
+    if (_utils3.targetIsWeb) {
       this.init().catch(console.error);
     }
   }
@@ -1366,15 +1365,57 @@ class KoniState {
   async completeConfirmation(request) {
     return await this.requestService.completeConfirmation(request);
   }
-  onHandleRemindExportAccount() {
-    const remindStatus = _storage.SWStorage.instance.getItem(_constants.REMIND_EXPORT_ACCOUNT);
+  async onMV3Update() {
+    const migrationStatus = await _storage.SWStorage.instance.getItem('mv3_migration');
+    if (!migrationStatus || migrationStatus !== 'done') {
+      // Open migration tab
+      const url = `${chrome.runtime.getURL('index.html')}#/mv3-migration`;
+      await (0, _PopupHandler.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 _storage.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 _storage.SWStorage.instance.setItem('mv3_migration', 'done');
+
+    // Open expand page
+    const url = `${chrome.runtime.getURL('index.html')}#/welcome`;
+    (0, _helpers.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 _storage.SWStorage.instance.getItem(_constants.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`;
-          (0, _PopupHandler.openPopup)(url);
-          subscription.unsubscribe();
+          (0, _PopupHandler.openPopup)(url).then(_util.noop).catch(console.error).finally(() => subscription.unsubscribe());
         } else {
           setTimeout(() => {
             subscription.unsubscribe();
@@ -1384,8 +1425,22 @@ class KoniState {
       const subscription = this.keyringService.currentAccountSubject.subscribe(handleRemind);
     }
   }
+  async setStorageFromWS(_ref10) {
+    let {
+      key,
+      value
+    } = _ref10;
+    try {
+      const jsonData = JSON.stringify(value);
+      await _storage.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);
@@ -1472,7 +1527,6 @@ class KoniState {
     this.waitSleeping = null;
   }
   async _start() {
-    let isWakeup = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     // Wait sleep finish before start to avoid conflict
     this.generalStatus === _types.ServiceStatus.STOPPING && this.waitSleeping && (await this.waitSleeping);
 
@@ -1486,6 +1540,7 @@ class KoniState {
       await this.waitStarting;
       return;
     }
+    const isWakeup = this.generalStatus === _types.ServiceStatus.STOPPED;
     const starting = (0, _promise.createPromiseHandler)();
     this.generalStatus = _types.ServiceStatus.STARTING;
     this.waitStarting = starting.promise;
@@ -1505,7 +1560,7 @@ class KoniState {
     this.generalStatus = _types.ServiceStatus.STARTED;
   }
   async wakeup() {
-    await this._start(true);
+    await this._start();
   }
   cancelSubscription(id) {
     if ((0, _subscriptions.isSubscriptionRunning)(id)) {
@@ -1594,6 +1649,7 @@ 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);
     }
@@ -1761,12 +1817,12 @@ class KoniState {
       specVersion: parseInt((metadata === null || metadata === void 0 ? void 0 : metadata.specVersion) || '0')
     };
   }
-  getCrowdloanContributions(_ref10) {
+  getCrowdloanContributions(_ref11) {
     let {
       address,
       page,
       relayChain
-    } = _ref10;
+    } = _ref11;
     return this.subscanService.getCrowdloanContributions(relayChain, address, page);
   }
 }

package/cjs/koni/background/handlers/Tabs.js

@@ -217,7 +217,7 @@ class KoniTabs {
   redirectPhishingLanding(phishingWebsite) {
     const nonFragment = phishingWebsite.split('#')[0];
     const encodedWebsite = encodeURIComponent(nonFragment);
-    const url = `${chrome.extension.getURL('index.html')}#${_defaults.PHISHING_PAGE_REDIRECT}/${encodedWebsite}`;
+    const url = `${chrome.runtime.getURL('index.html')}#${_defaults.PHISHING_PAGE_REDIRECT}/${encodedWebsite}`;
     chrome.tabs.query({
       url: nonFragment
     }, tabs => {
@@ -978,6 +978,9 @@ 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/cjs/koni/background/handlers/index.js

@@ -4,10 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = handlers;
-exports.tabs = exports.state = exports.nftHandler = exports.mobile = exports.extension = void 0;
+exports.SWHandler = void 0;
 var _defaults = require("@subwallet/extension-base/defaults");
-var _nft = require("@subwallet/extension-base/koni/api/nft");
 var _Extension = _interopRequireDefault(require("@subwallet/extension-base/koni/background/handlers/Extension"));
 var _Mobile = _interopRequireDefault(require("@subwallet/extension-base/koni/background/handlers/Mobile"));
 var _State = _interopRequireDefault(require("@subwallet/extension-base/koni/background/handlers/State"));
@@ -16,78 +14,80 @@ var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// import Migration from '@subwallet/extension-base/koni/migration';
-
-const state = new _State.default();
-exports.state = state;
-const extension = new _Extension.default(state);
-exports.extension = extension;
-const tabs = new _Tabs.default(state);
-exports.tabs = tabs;
-const mobile = new _Mobile.default(state);
-exports.mobile = mobile;
-const nftHandler = new _nft.NftHandler();
-
-// Migration
-// async function makeSureStateReady () {
-//   const poll = (resolve: (value: unknown) => void) => {
-//     if (state.isReady()) {
-//       resolve(true);
-//     } else {
-//       console.log('Waiting for State is ready...');
-//       setTimeout(() => poll(resolve), 400);
-//     }
-//   };
-//
-//   return new Promise(poll);
-// }
-
-// makeSureStateReady().then(() => {
-//   const migration = new Migration(state);
-//
-//   migration.run().catch((err) => console.warn(err));
-// }).catch((e) => console.warn(e));
-exports.nftHandler = nftHandler;
-function handlers(_ref, port) {
-  let {
-    id,
-    message,
-    request
-  } = _ref;
-  let extensionPortName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _defaults.PORT_EXTENSION;
-  const isMobile = port.name === _defaults.PORT_MOBILE;
-  const isExtension = port.name === extensionPortName;
-  const sender = port.sender;
-  const from = isExtension ? 'extension' : sender.url || sender.tab && sender.tab.url || '<unknown>';
-  const source = `${from}: ${id}: ${message}`;
-
-  // console.log(` [in] ${source}`); // :: ${JSON.stringify(request)}`);
-
-  const promise = isMobile ? mobile.handle(id, message, request, port) : isExtension ? extension.handle(id, message, request, port) : tabs.handle(id, message, request, from, port);
-  promise.then(response => {
-    // console.log(`[out] ${source}`); // :: ${JSON.stringify(response)}`);
-
-    // between the start and the end of the promise, the user may have closed
-    // the tab, in which case port will be undefined
-    (0, _util.assert)(port, 'Port has been disconnected');
-    port.postMessage({
+class SWHandler {
+  get state() {
+    if (!this._state) {
+      this._state = new _State.default();
+    }
+    return this._state;
+  }
+  get extensionHandler() {
+    if (!this._extensionHandler) {
+      this._extensionHandler = new _Extension.default(this.state);
+    }
+    return this._extensionHandler;
+  }
+  get tabHandler() {
+    if (!this._tabsHandler) {
+      this._tabsHandler = new _Tabs.default(this.state);
+    }
+    return this._tabsHandler;
+  }
+  get mobileHandler() {
+    if (!this._mobileHandler) {
+      this._mobileHandler = new _Mobile.default(this.state);
+    }
+    return this._mobileHandler;
+  }
+  handle(_ref, port) {
+    let {
       id,
-      response,
-      sender: 'BACKGROUND'
-    });
-  }).catch(error => {
-    console.error(error);
-    console.log(`[err] ${source}:: ${error.message}`);
+      message,
+      request
+    } = _ref;
+    const isMobile = port.name === _defaults.PORT_MOBILE;
+    const isExtension = port.name === _defaults.PORT_EXTENSION;
+    const sender = port.sender;
+    // console.debug('Handle', message);
+
+    const from = isExtension ? 'extension' : (sender === null || sender === void 0 ? void 0 : sender.url) || (sender === null || sender === void 0 ? void 0 : sender.tab) && (sender === null || sender === void 0 ? void 0 : sender.tab.url) || '<unknown>';
+    const source = `${from}: ${id}: ${message}`;
+    const promise = isMobile ? this.mobileHandler.handle(id, message, request, port) : isExtension ? this.extensionHandler.handle(id, message, request, port) : this.tabHandler.handle(id, message, request, from, port);
+    promise.then(response => {
+      // console.log(`[out] ${source}`); // :: ${JSON.stringify(response)}`);
 
-    // only send message back to port if it's still connected
-    if (port) {
+      // between the start and the end of the promise, the user may have closed
+      // the tab, in which case port will be undefined
+      (0, _util.assert)(port, 'Port has been disconnected');
       port.postMessage({
-        error: error.message,
-        errorCode: error.code,
-        errorData: error.data,
         id,
+        response,
         sender: 'BACKGROUND'
       });
+    }).catch(error => {
+      console.error(error);
+      console.log(`[err] ${source}:: ${error.message}`);
+
+      // only send message back to port if it's still connected
+      if (port) {
+        port.postMessage({
+          error: error.message,
+          errorCode: error.code,
+          errorData: error.data,
+          id,
+          sender: 'BACKGROUND'
+        });
+      }
+    });
+  }
+
+  // Singleton
+
+  static get instance() {
+    if (!SWHandler._instance) {
+      SWHandler._instance = new SWHandler();
     }
-  });
-}
+    return SWHandler._instance;
+  }
+}
+exports.SWHandler = SWHandler;

package/cjs/koni/background/subscription.js

@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.KoniSubscription = void 0;
 var _crowdloan = require("@subwallet/extension-base/koni/api/dotsama/crowdloan");
-var _handlers = require("@subwallet/extension-base/koni/background/handlers");
+var _nft = require("@subwallet/extension-base/koni/api/nft");
 var _types = require("@subwallet/extension-base/services/event-service/types");
 var _utils = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+const nftHandler = new _nft.NftHandler();
 class KoniSubscription {
   subscriptionMap = {
     crowdloan: undefined,
@@ -105,11 +106,11 @@ class KoniSubscription {
   }
   initNftSubscription(addresses, substrateApiMap, evmApiMap, smartContractNfts, chainInfoMap) {
     var _this = this;
-    _handlers.nftHandler.setChainInfoMap(chainInfoMap);
-    _handlers.nftHandler.setDotSamaApiMap(substrateApiMap);
-    _handlers.nftHandler.setWeb3ApiMap(evmApiMap);
-    _handlers.nftHandler.setAddresses(addresses);
-    _handlers.nftHandler.handleNfts(smartContractNfts, function () {
+    nftHandler.setChainInfoMap(chainInfoMap);
+    nftHandler.setDotSamaApiMap(substrateApiMap);
+    nftHandler.setWeb3ApiMap(evmApiMap);
+    nftHandler.setAddresses(addresses);
+    nftHandler.handleNfts(smartContractNfts, function () {
       return _this.state.updateNftData(...arguments);
     }, function () {
       return _this.state.setNftCollection(...arguments);

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.68-2'
+  version: '1.2.1'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/campaign-service/helpers.js

@@ -27,7 +27,9 @@ const runCampaign = (notificationService, campaign) => {
             if (metadata) {
               const url = metadata.url;
               if (url) {
-                window.open(url);
+                chrome.tabs.create({
+                  url
+                }).catch(console.error);
               }
             }
             break;

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

@@ -497,6 +497,7 @@ class ChainService {
           needUpdateChainApiList,
           storedChainInfoList
         } = (0, _utils.updateLatestChainInfo)(this.dataMap, latestChainInfo);
+        console.log('here', needUpdateChainApiList, storedChainInfoList);
         this.dbService.bulkUpdateChainStore(storedChainInfoList).catch(console.error);
         this.updateChainSubscription();
         needUpdateChainApiList.forEach(chainInfo => {
@@ -601,6 +602,12 @@ class ChainService {
             visible: true
           });
         }
+      } else {
+        if (originChain === 'avail_mainnet') {
+          await this.updateAssetSetting(assetSlug, {
+            visible: true
+          });
+        }
       }
     }
   }
@@ -666,22 +673,18 @@ class ChainService {
       this.updateChainConnectionStatus(slug, status);
     };
     if (chainInfo.substrateInfo !== null && chainInfo.substrateInfo !== undefined) {
-      if (_constants._MANTA_ZK_CHAIN_GROUP.includes(chainInfo.slug) && _utils2.MODULE_SUPPORT.MANTA_ZK && this.mantaChainHandler) {
-        var _this$mantaChainHandl;
-        const apiPromise = await ((_this$mantaChainHandl = this.mantaChainHandler) === null || _this$mantaChainHandl === void 0 ? void 0 : _this$mantaChainHandl.initMantaPay(endpoint, chainInfo.slug));
-        const chainApi = await this.substrateChainHandler.initApi(chainInfo.slug, endpoint, {
-          providerName,
-          externalApiPromise: apiPromise,
-          onUpdateStatus
-        });
-        this.substrateChainHandler.setSubstrateApi(chainInfo.slug, chainApi);
-      } else {
-        const chainApi = await this.substrateChainHandler.initApi(chainInfo.slug, endpoint, {
-          providerName,
-          onUpdateStatus
-        });
-        this.substrateChainHandler.setSubstrateApi(chainInfo.slug, chainApi);
-      }
+      // if (_MANTA_ZK_CHAIN_GROUP.includes(chainInfo.slug) && MODULE_SUPPORT.MANTA_ZK && this.mantaChainHandler) {
+      //   const apiPromise = await this.mantaChainHandler?.initMantaPay(endpoint, chainInfo.slug);
+      //   const chainApi = await this.substrateChainHandler.initApi(chainInfo.slug, endpoint, { providerName, externalApiPromise: apiPromise, onUpdateStatus });
+      //
+      //   this.substrateChainHandler.setSubstrateApi(chainInfo.slug, chainApi);
+      // } else {
+      const chainApi = await this.substrateChainHandler.initApi(chainInfo.slug, endpoint, {
+        providerName,
+        onUpdateStatus
+      });
+      this.substrateChainHandler.setSubstrateApi(chainInfo.slug, chainApi);
+      // }
     }
 
     /**
@@ -1029,17 +1032,9 @@ class ChainService {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
     const latestAssetRegistry = filterAssetInfoMap(this.getChainInfoMap(), _chainList.ChainAssetMap);
     const availableChains = Object.values(this.dataMap.chainInfoMap).filter(info => info.chainStatus === _types._ChainStatus.ACTIVE).map(chainInfo => chainInfo.slug);
-
-    // Fill out zk assets from latestAssetRegistry if not supported
-    if (!_utils2.MODULE_SUPPORT.MANTA_ZK) {
-      Object.keys(latestAssetRegistry).forEach(slug => {
-        if ((0, _utils._isMantaZkAsset)(latestAssetRegistry[slug])) {
-          delete latestAssetRegistry[slug];
-        }
-      });
-    }
+    let finalAssetRegistry = {};
     if (storedAssetRegistry.length === 0) {
-      this.dataMap.assetRegistry = latestAssetRegistry;
+      finalAssetRegistry = latestAssetRegistry;
     } else {
       const mergedAssetRegistry = latestAssetRegistry;
       const parsedStoredAssetRegistry = {};
@@ -1081,9 +1076,23 @@ class ChainService {
           deprecatedAssets.push(storedAssetInfo.slug);
         }
       }
-      this.dataMap.assetRegistry = mergedAssetRegistry;
+      finalAssetRegistry = mergedAssetRegistry;
       await this.dbService.removeFromAssetStore(deprecatedAssets);
     }
+
+    // Fill out zk assets from finalAssetRegistry if not supported
+    if (!_utils2.MODULE_SUPPORT.MANTA_ZK) {
+      const zkAssets = [];
+      Object.entries(finalAssetRegistry).forEach(_ref14 => {
+        let [slug, assets] = _ref14;
+        if ((0, _utils._isMantaZkAsset)(assets)) {
+          zkAssets.push(slug);
+          delete finalAssetRegistry[slug];
+        }
+      });
+      await this.dbService.removeFromAssetStore(zkAssets);
+    }
+    this.dataMap.assetRegistry = finalAssetRegistry;
   }
   updateChainStateMapSubscription() {
     this.chainStateMapSubject.next(this.getChainStateMap());

package/cjs/services/chain-service/utils/patch.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fetchPatchData = fetchPatchData;
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -15,7 +13,7 @@ const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chai
 const ChainListVersion = '0.2.62';
 async function fetchPatchData(slug) {
   try {
-    const fetchPromise = (0, _crossFetch.default)(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);
+    const fetchPromise = fetch(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);
     const timeout = new Promise(resolve => {
       const id = setTimeout(() => {
         clearTimeout(id);

package/cjs/services/earning-service/handlers/liquid-staking/acala.js

@@ -9,7 +9,6 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _constants = require("@subwallet/extension-base/services/earning-service/constants");
 var _types = require("@subwallet/extension-base/types");
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _util = require("@polkadot/util");
 var _base = _interopRequireDefault(require("./base"));
 // Copyright 2019-2022 @subwallet/extension-base
@@ -50,7 +49,7 @@ class AcalaLiquidStakingPoolHandler extends _base.default {
   async getPoolStat() {
     const substrateApi = await this.substrateApi.isReady;
     const stakingMetaPromise = new Promise(function (resolve) {
-      (0, _crossFetch.default)(GRAPHQL_API, {
+      fetch(GRAPHQL_API, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json'

package/cjs/services/earning-service/handlers/liquid-staking/bifrost-manta.js

@@ -8,7 +8,6 @@ exports.default = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/types");
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _bifrost = _interopRequireDefault(require("./bifrost"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -38,14 +37,14 @@ class BifrostMantaLiquidStakingPoolHandler extends _bifrost.default {
   async getPoolStat() {
     const substrateApi = await this.substrateApi.isReady;
     const stakingMetaPromise = new Promise(function (resolve) {
-      (0, _crossFetch.default)(STATS_URL, {
+      fetch(STATS_URL, {
         method: 'GET'
       }).then(res => {
         resolve(res.json());
       }).catch(console.error);
     });
     const exchangeRatePromise = new Promise(function (resolve) {
-      (0, _crossFetch.default)(RATIO_URL, {
+      fetch(RATIO_URL, {
         method: 'GET'
       }).then(resp => {
         resolve(resp.json());

package/cjs/services/earning-service/handlers/liquid-staking/bifrost.js

@@ -12,7 +12,6 @@ var _constants2 = require("@subwallet/extension-base/services/earning-service/co
 var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _util = require("@polkadot/util");
 var _base = _interopRequireDefault(require("./base"));
 // Copyright 2019-2022 @subwallet/extension-base
@@ -53,14 +52,14 @@ class BifrostLiquidStakingPoolHandler extends _base.default {
   async getPoolStat() {
     const substrateApi = await this.substrateApi.isReady;
     const stakingMetaPromise = new Promise(function (resolve) {
-      (0, _crossFetch.default)(STATS_URL, {
+      fetch(STATS_URL, {
         method: 'GET'
       }).then(res => {
         resolve(res.json());
       }).catch(console.error);
     });
     const exchangeRatePromise = new Promise(function (resolve) {
-      (0, _crossFetch.default)(BIFROST_GRAPHQL_ENDPOINT, {
+      fetch(BIFROST_GRAPHQL_ENDPOINT, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json'

package/cjs/services/earning-service/handlers/liquid-staking/stella-swap.js

@@ -11,7 +11,6 @@ var _web = require("@subwallet/extension-base/koni/api/tokens/evm/web3");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/services/fee-service/utils");
 var _types = require("@subwallet/extension-base/types");
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _util = require("@polkadot/util");
 var _constants = require("../../constants");
 var _base = _interopRequireDefault(require("./base"));
@@ -63,7 +62,7 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
     const stakingContract = getStellaswapLiquidStakingContract(this.chain, (0, _utils._getContractAddressOfToken)(derivativeTokenInfo), evmApi);
     const aprPromise = new Promise(function (resolve) {
-      (0, _crossFetch.default)(APR_STATS_URL, {
+      fetch(APR_STATS_URL, {
         method: 'GET'
       }).then(res => {
         resolve(res.json());

package/cjs/services/earning-service/handlers/native-staking/astar.js

@@ -12,7 +12,6 @@ var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils")
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 var _basePara = _interopRequireDefault(require("./base-para"));
@@ -76,7 +75,7 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
     }
     await defaultCallback();
     const apyPromise = new Promise(resolve => {
-      (0, _crossFetch.default)(`https://api.astar.network/api/v1/${this.chain}/dapps-staking/apy`, {
+      fetch(`https://api.astar.network/api/v1/${this.chain}/dapps-staking/apy`, {
         method: 'GET'
       }).then(resp => {
         resolve(resp.json());
@@ -159,7 +158,7 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
     const nominationList = [];
     const unstakingList = [];
     const allDappsReq = new Promise(resolve => {
-      (0, _crossFetch.default)(`https://api.astar.network/api/v1/${chainInfo.slug}/dapps-staking/dapps`, {
+      fetch(`https://api.astar.network/api/v1/${chainInfo.slug}/dapps-staking/dapps`, {
         method: 'GET'
       }).then(resp => {
         resolve(resp.json());
@@ -306,7 +305,7 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
     const allDappsInfo = [];
     const maxStakerPerContract = (0, _utils2.parseRawNumber)(rawMaxStakerPerContract);
     const allDappsReq = new Promise(resolve => {
-      (0, _crossFetch.default)(`https://api.astar.network/api/v1/${this.chain}/dapps-staking/dapps`, {
+      fetch(`https://api.astar.network/api/v1/${this.chain}/dapps-staking/dapps`, {
         method: 'GET'
       }).then(resp => {
         resolve(resp.json());

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

@@ -39,7 +39,6 @@ class EventService extends _eventemitter.default {
   generateWaitPromise(eventType) {
     return new Promise(resolve => {
       this.once(eventType, isReady => {
-        console.log('===LOG generateWaitPromise eventType', eventType);
         resolve(isReady);
       });
     });