@subwallet/extension-base 1.1.68-1 → 1.2.1

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

@@ -23,14 +23,37 @@ var _types = require("./types");
 const storage = _storage.SWStorage.instance;
 const methodDOTRequire = [_types.POLKADOT_SIGNING_METHODS.POLKADOT_SIGN_MESSAGE, _types.POLKADOT_SIGNING_METHODS.POLKADOT_SIGN_TRANSACTION];
 const methodEVMRequire = [_types.EIP155_SIGNING_METHODS.PERSONAL_SIGN, _types.EIP155_SIGNING_METHODS.ETH_SIGN, _types.EIP155_SIGNING_METHODS.ETH_SEND_TRANSACTION];
+class WCStorage {
+  async getEntries() {
+    const datas = await storage.getEntries();
+    return Promise.resolve(datas.filter(_ref => {
+      let [key] = _ref;
+      return key.startsWith('wc@');
+    }).map(_ref2 => {
+      let [key, value] = _ref2;
+      return [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__*/(0, _classPrivateFieldLooseKey2.default)("requestService");
 var _polkadotRequestHandler = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("polkadotRequestHandler");
 var _eip155RequestHandler = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("eip155RequestHandler");
 var _koniState = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("koniState");
 var _client = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("client");
 var _option = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("option");
-var _haveData = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("haveData");
-var _initClient = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("initClient");
 var _updateSessions = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("updateSessions");
 var _onSessionProposal = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("onSessionProposal");
 var _onSessionRequest = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("onSessionRequest");
@@ -58,13 +81,6 @@ 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
@@ -92,10 +108,28 @@ class WalletConnectService {
     this.sessionSubject = new _rxjs.BehaviorSubject([]);
     (0, _classPrivateFieldLooseBase2.default)(this, _koniState)[_koniState] = koniState;
     (0, _classPrivateFieldLooseBase2.default)(this, _requestService)[_requestService] = requestService;
+    option.storage = new WCStorage();
     (0, _classPrivateFieldLooseBase2.default)(this, _option)[_option] = option;
     (0, _classPrivateFieldLooseBase2.default)(this, _polkadotRequestHandler)[_polkadotRequestHandler] = new _PolkadotRequestHandler.default(this, requestService);
     (0, _classPrivateFieldLooseBase2.default)(this, _eip155RequestHandler)[_eip155RequestHandler] = new _Eip155RequestHandler.default((0, _classPrivateFieldLooseBase2.default)(this, _koniState)[_koniState], this);
-    (0, _classPrivateFieldLooseBase2.default)(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) {
+    (0, _classPrivateFieldLooseBase2.default)(this, _removeListener)[_removeListener]();
+    if (force || (await this.haveData())) {
+      (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client] = await _signClient.default.init((0, _classPrivateFieldLooseBase2.default)(this, _option)[_option]);
+    }
+    (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions]();
+    (0, _classPrivateFieldLooseBase2.default)(this, _createListener)[_createListener]();
   }
   get sessions() {
     var _classPrivateFieldLoo;
@@ -112,12 +146,12 @@ class WalletConnectService {
   }
   async changeOption(newOption) {
     (0, _classPrivateFieldLooseBase2.default)(this, _option)[_option] = Object.assign({}, (0, _classPrivateFieldLooseBase2.default)(this, _option)[_option], newOption);
-    await (0, _classPrivateFieldLooseBase2.default)(this, _initClient)[_initClient]();
+    await this.initClient();
   }
   async connect(uri) {
     var _classPrivateFieldLoo3;
-    if (!(0, _classPrivateFieldLooseBase2.default)(this, _haveData)[_haveData]) {
-      await (0, _classPrivateFieldLooseBase2.default)(this, _initClient)[_initClient](true);
+    if (!(await this.haveData())) {
+      await this.initClient(true);
     }
     (0, _classPrivateFieldLooseBase2.default)(this, _checkClient)[_checkClient]();
     await ((_classPrivateFieldLoo3 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo3 === void 0 ? void 0 : _classPrivateFieldLoo3.pair({
@@ -127,10 +161,10 @@ class WalletConnectService {
   async approveSession(result) {
     var _classPrivateFieldLoo4;
     (0, _classPrivateFieldLooseBase2.default)(this, _checkClient)[_checkClient]();
-    Object.entries(result.namespaces).forEach(_ref => {
+    Object.entries(result.namespaces).forEach(_ref3 => {
       let [namespace, {
         methods
-      }] = _ref;
+      }] = _ref3;
       methods = [...methods, ...this.findMethodsMissing(_constants.WALLET_CONNECT_EIP155_NAMESPACE === namespace ? methodEVMRequire : methodDOTRequire, methods)];
       result.namespaces[namespace].methods = methods;
     });
@@ -191,7 +225,7 @@ class WalletConnectService {
         console.error(e);
       }
     }
-    await (0, _classPrivateFieldLooseBase2.default)(this, _initClient)[_initClient]();
+    await this.initClient();
     (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions]();
   }
   async disconnect(topic) {
@@ -214,23 +248,6 @@ class WalletConnectService {
   }
 }
 exports.default = 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) {
-  (0, _classPrivateFieldLooseBase2.default)(this, _removeListener)[_removeListener]();
-  if (force || (0, _classPrivateFieldLooseBase2.default)(this, _haveData)[_haveData]) {
-    (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client] = await _signClient.default.init((0, _classPrivateFieldLooseBase2.default)(this, _option)[_option]);
-  }
-  (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions]();
-  (0, _classPrivateFieldLooseBase2.default)(this, _createListener)[_createListener]();
-}
 function _updateSessions2() {
   this.sessionSubject.next(this.sessions);
 }

package/cjs/storage/index.js

@@ -1,59 +1,156 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SWStorage = void 0;
+var _databases = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/databases"));
+var _promise = require("@subwallet/extension-base/utils/promise");
+var _xGlobal = require("@polkadot/x-global");
 // Copyright 2019-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+const hasLocalStorage = typeof localStorage !== 'undefined';
+
+// Create localStorage adaptor
 class SWStorage {
   _storage = {};
+  localStorage = hasLocalStorage ? localStorage : undefined;
+  kvDatabase = _databases.default.getInstance().keyValue;
+  isReady = false;
+  waitReadyHandler = (0, _promise.createPromiseHandler)();
+  get waitReady() {
+    return this.waitReadyHandler.promise;
+  }
   constructor() {
-    this.sync();
+    this.sync().then(() => {
+      this.isReady = true;
+      this.waitReadyHandler.resolve(this);
+    }).catch(console.error);
   }
-  setItem(key, value) {
+  async setItem(key, value) {
+    !this.isReady && (await this.waitReady);
     this._storage[key] = value;
-    localStorage.setItem(key, value);
+    if (this.localStorage) {
+      var _this$localStorage;
+      (_this$localStorage = this.localStorage) === null || _this$localStorage === void 0 ? void 0 : _this$localStorage.setItem(key, value);
+    } else {
+      this.kvDatabase.put({
+        key,
+        value
+      }).catch(console.error);
+    }
+  }
+  async getEntries() {
+    !this.isReady && (await this.waitReady);
+    return Object.entries(this._storage);
+  }
+  async setMap(map) {
+    !this.isReady && (await this.waitReady);
+    this._storage = {
+      ...this._storage,
+      ...map
+    };
+    if (this.localStorage) {
+      Object.entries(map).forEach(_ref => {
+        var _this$localStorage2;
+        let [key, value] = _ref;
+        (_this$localStorage2 = this.localStorage) === null || _this$localStorage2 === void 0 ? void 0 : _this$localStorage2.setItem(key, value);
+      });
+    } else {
+      const putList = Object.entries(map).map(_ref2 => {
+        let [key, value] = _ref2;
+        return {
+          key,
+          value
+        };
+      });
+      this.kvDatabase.bulkPut(putList).catch(console.error);
+    }
+  }
+  async getItem(key) {
+    !this.isReady && (await this.waitReady);
+    return this._storage[key] || null;
   }
-  getItem(key) {
-    return this._storage[key] || localStorage.getItem(key) || null;
+  async getItems(keys) {
+    !this.isReady && (await this.waitReady);
+    return keys.map(key => this._storage[key] || null);
   }
-  removeItem(key) {
+  async getMap(keys) {
+    !this.isReady && (await this.waitReady);
+    return keys.reduce((result, key) => {
+      result[key] = this._storage[key] || null;
+      return result;
+    }, {});
+  }
+  async removeItem(key) {
+    !this.isReady && (await this.waitReady);
     this._storage[key] && delete this._storage[key];
-    localStorage.removeItem(key);
+    if (this.localStorage) {
+      this.localStorage.removeItem(key);
+    } else {
+      this.kvDatabase.where({
+        key
+      }).delete().catch(console.error);
+    }
+  }
+  async removeItems(keys) {
+    !this.isReady && (await this.waitReady);
+    keys.forEach(key => {
+      this._storage[key] && delete this._storage[key];
+    });
+    if (this.localStorage) {
+      keys.forEach(key => {
+        this.localStorage && this.localStorage.removeItem(key);
+      });
+    } else {
+      this.kvDatabase.where('key').anyOf(keys).delete().catch(console.error);
+    }
   }
-  clear() {
+  async clear() {
+    !this.isReady && (await this.waitReady);
     this._storage = {};
-    localStorage.clear();
+    if (this.localStorage) {
+      this.localStorage.clear();
+    } else {
+      this.kvDatabase.clear().catch(console.error);
+    }
   }
-  key(index) {
+  async key(index) {
+    !this.isReady && (await this.waitReady);
     return Object.keys(this._storage)[index] || null;
   }
-  length(index) {
+  async length(index) {
+    !this.isReady && (await this.waitReady);
     return Object.keys(this._storage)[index] || null;
   }
 
   // Additional methods
-  keys() {
+  async keys() {
+    !this.isReady && (await this.waitReady);
     return Object.keys(this._storage) || [];
   }
-  copy() {
+  async copy() {
+    !this.isReady && (await this.waitReady);
     return JSON.parse(JSON.stringify(this._storage));
   }
-  sync() {
-    this._storage = JSON.parse(JSON.stringify(localStorage));
+  async sync() {
+    if (this.localStorage) {
+      this._storage = JSON.parse(JSON.stringify(this.localStorage));
+    } else {
+      const items = await this.kvDatabase.toArray();
+      this._storage = {};
+      items.forEach(item => {
+        this._storage[item.key] = item.value;
+      });
+    }
   }
   static get instance() {
-    // @ts-ignore
-    if (!window.SWStorage) {
-      console.log('SWStorage init');
-      // @ts-ignore
-      window.SWStorage = new SWStorage();
+    if (!_xGlobal.xglobal.SWStorage) {
+      _xGlobal.xglobal.SWStorage = new SWStorage();
     }
-
-    // @ts-ignore
-    return window.SWStorage;
+    return _xGlobal.xglobal.SWStorage;
   }
 }
 exports.SWStorage = SWStorage;

package/cjs/types/common/index.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _storage = require("./storage");
+Object.keys(_storage).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _storage[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _storage[key];
+    }
+  });
+});

package/cjs/types/common/storage.js

@@ -0,0 +1 @@
+"use strict";

package/cjs/types/index.js

@@ -79,4 +79,15 @@ Object.keys(_yield).forEach(function (key) {
       return _yield[key];
     }
   });
+});
+var _common = require("./common");
+Object.keys(_common).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _common[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _common[key];
+    }
+  });
 });

package/cjs/utils/environment.js

@@ -88,6 +88,6 @@ exports.targetIsWeb = targetIsWeb;
 const targetIsMobile = TARGET_ENV === 'mobile';
 exports.targetIsMobile = targetIsMobile;
 const MODULE_SUPPORT = {
-  MANTA_ZK: targetIsExtension
+  MANTA_ZK: false
 };
 exports.MODULE_SUPPORT = MODULE_SUPPORT;

package/cjs/utils/eth/parseTransaction/index.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.parseEvmRlp = exports.parseContractInput = exports.isContractAddress = void 0;
 var _helper = require("@subwallet/extension-base/services/chain-service/helper");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils2 = require("@subwallet/extension-base/utils");
 var _eth = require("@subwallet/extension-base/utils/eth");
 var _base = require("@subwallet/extension-base/utils/eth/parseTransaction/base");
-var _axios = _interopRequireDefault(require("axios"));
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -137,17 +137,15 @@ const parseContractInput = async (input, contractAddress, network) => {
   if (contractAddress && network) {
     if ((0, _utils._getEvmAbiExplorer)(network)) {
       try {
-        const res = await _axios.default.get((0, _utils._getEvmAbiExplorer)(network), {
+        const data = await (0, _utils2.fetchJson)((0, _utils._getEvmAbiExplorer)(network), {
           params: {
             address: contractAddress
           },
           timeout: 3000
         });
-
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        if (res.status === 200 && res.data.status === '1') {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-          const abi = res.data.result;
+        if (data.status === '1') {
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+          const abi = data.result;
           const temp = parseInputWithAbi(input, abi);
           if (temp) {
             return {
@@ -213,7 +211,7 @@ const parseEvmRlp = async (data, networkMap, evmApiMap) => {
     if (await isContractAddress(tx.to, evmApiMap[network.slug])) {
       if ((0, _utils._getEvmAbiExplorer)(network) !== '') {
         try {
-          const res = await _axios.default.get((0, _utils._getEvmAbiExplorer)(network), {
+          const data = await (0, _utils2.fetchJson)((0, _utils._getEvmAbiExplorer)(network), {
             params: {
               address: tx.to
             },
@@ -221,9 +219,9 @@ const parseEvmRlp = async (data, networkMap, evmApiMap) => {
           });
 
           // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-          if (res.status === 200 && res.data.status === '1') {
+          if (data.status === '1') {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-            const abi = res.data.result;
+            const abi = data.result;
             const temp = parseInputWithAbi(tx.data, abi);
             if (temp) {
               result.data = temp;

package/cjs/utils/fetch.js

@@ -0,0 +1,55 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchData = fetchData;
+exports.fetchJson = fetchJson;
+exports.fetchText = fetchText;
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+async function fetchData(url) {
+  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  const {
+    data,
+    params,
+    timeout,
+    ...fetchOptions
+  } = options;
+  let timeoutId;
+  if (timeout) {
+    const controller = new AbortController();
+    timeoutId = setTimeout(() => controller.abort(), timeout);
+    fetchOptions.signal = new AbortController().signal;
+  }
+  if (params) {
+    const urlParams = new URLSearchParams(params);
+    url = `${url}?${urlParams.toString()}`;
+  }
+  if (data) {
+    fetchOptions.headers = {
+      'Content-Type': 'application/json',
+      Accept: 'application/json',
+      ...fetchOptions.headers
+    };
+    fetchOptions.body = JSON.stringify(data);
+  }
+  const response = await fetch(url, fetchOptions);
+  if (!response.ok) {
+    throw new Error(`HTTP error! Status: ${response.status}`);
+  } else {
+    clearTimeout(timeoutId);
+  }
+  return response;
+}
+async function fetchJson(url) {
+  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  const response = await fetchData(url, options);
+  return await response.json();
+}
+async function fetchText(url) {
+  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  const response = await fetchData(url, options);
+  return await response.text();
+}

package/cjs/utils/fetchStaticCache.js

@@ -1,11 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fetchStaticCache = fetchStaticCache;
-var _axios = _interopRequireDefault(require("axios"));
+var _fetch = require("@subwallet/extension-base/utils/fetch");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -15,10 +14,9 @@ const fetchTarget = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://stat
 async function fetchStaticCache(slug, defaultData) {
   let timeout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 9000;
   try {
-    const rs = await _axios.default.get(`${fetchTarget}/${slug}`, {
+    return await (0, _fetch.fetchJson)(`${fetchTarget}/${slug}`, {
       timeout
     });
-    return rs.data;
   } catch (e) {
     return defaultData;
   }

package/cjs/utils/fetchStaticData.js

@@ -1,12 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fetchStaticData = fetchStaticData;
+var _fetch = require("@subwallet/extension-base/utils/fetch");
 var _staticData = require("@subwallet/extension-base/utils/staticData");
-var _axios = _interopRequireDefault(require("axios"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -14,10 +13,14 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'koni-dev';
 const fetchTarget = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
 async function fetchStaticData(slug, targetFile) {
+  let isJson = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   const fetchFile = targetFile || fetchTarget;
   try {
-    const rs = await _axios.default.get(`https://static-data.subwallet.app/${slug}/${fetchFile}`);
-    return rs.data;
+    if (isJson) {
+      return await (0, _fetch.fetchJson)(`https://static-data.subwallet.app/${slug}/${fetchFile}`);
+    } else {
+      return await (0, _fetch.fetchText)(`https://static-data.subwallet.app/${slug}/${fetchFile}`);
+    }
   } catch (e) {
     return _staticData.staticData[slug];
   }

package/cjs/utils/index.js

@@ -80,6 +80,30 @@ var _i18next = require("i18next");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 var _canDerive = require("./canDerive");
+var _mv = require("./mv3");
+Object.keys(_mv).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _mv[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _mv[key];
+    }
+  });
+});
+var _fetch = require("./fetch");
+Object.keys(_fetch).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _fetch[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _fetch[key];
+    }
+  });
+});
 var _account = require("./account");
 Object.keys(_account).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/cjs/utils/reportError.js

@@ -1,12 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.reportError = void 0;
 var _environment = require("@subwallet/extension-base/utils/environment");
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -23,7 +21,7 @@ const reportError = async (e, pathName) => {
     app_version: JSON.stringify(process.env.PKG_VERSION),
     current_routes: pathName
   };
-  await (0, _crossFetch.default)(_environment.TARGET_ENV === 'extension' ? EXTENSION_REPORT_ERROR_URL : WEBAPP_REPORT_ERROR_URL, {
+  await fetch(_environment.TARGET_ENV === 'extension' ? EXTENSION_REPORT_ERROR_URL : WEBAPP_REPORT_ERROR_URL, {
     method: 'POST',
     body: JSON.stringify(body)
   });

package/constants/storage.d.ts

@@ -1,4 +1,5 @@
 export declare const LANGUAGE = "current-language";
+export declare const DEFAULT_LANGUAGE = "en";
 export declare const CURRENCY = "current-currency";
 export declare const REMIND_EXPORT_ACCOUNT = "remind_export_account";
 export declare const LATEST_SESSION = "general.latest-session";

package/constants/storage.js

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export const LANGUAGE = 'current-language';
+export const DEFAULT_LANGUAGE = 'en';
 export const CURRENCY = 'current-currency';
 export const REMIND_EXPORT_ACCOUNT = 'remind_export_account';
 export const LATEST_SESSION = 'general.latest-session';

package/koni/api/dotsama/crowdloan.js

@@ -6,9 +6,8 @@ import { _FundStatus } from '@subwallet/chain-list/types';
 import { APIItemState, CrowdloanParaState } from '@subwallet/extension-base/background/KoniTypes';
 import { ACALA_REFRESH_CROWDLOAN_INTERVAL } from '@subwallet/extension-base/constants';
 import registry from '@subwallet/extension-base/koni/api/dotsama/typeRegistry';
-import { categoryAddresses, reformatAddress } from '@subwallet/extension-base/utils';
+import { categoryAddresses, fetchJson, reformatAddress } from '@subwallet/extension-base/utils';
 import { fetchStaticData } from '@subwallet/extension-base/utils/fetchStaticData';
-import axios from 'axios';
 import { BN } from '@polkadot/util';
 const STATUS_MAP = {
   [_FundStatus.IN_AUCTION]: CrowdloanParaState.ONGOING,
@@ -82,7 +81,7 @@ export const subscribeAcalaContributeInterval = (polkadotAddresses, fundInfo, ca
   const acalaContributionApi = 'https://api.polkawallet.io/acala-distribution-v2/crowdloan?account=';
   const getContributeInfo = () => {
     Promise.all(polkadotAddresses.map(polkadotAddress => {
-      return axios.get(`${acalaContributionApi}${polkadotAddress}`);
+      return fetchJson(`${acalaContributionApi}${polkadotAddress}`);
     })).then(resList => {
       let contribute = new BN(0);
       resList.forEach(res => {

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

@@ -4,7 +4,6 @@
 import { getRandomIpfsGateway } from '@subwallet/extension-base/koni/api/nft/config';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { isUrl } from '@subwallet/extension-base/utils';
-import fetch from 'cross-fetch';
 const acalaExternalBaseUrl = 'https://apps.acala.network/portfolio/nft/';
 export class AcalaNftApi extends BaseNftApi {
   // eslint-disable-next-line no-useless-constructor

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

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

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

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

package/koni/api/nft/bit.country/index.js

@@ -4,7 +4,6 @@
 import { BIT_AVATAR_API, BIT_COUNTRY_IPFS_SERVER, BIT_COUNTRY_LAND_ESTATE_METADATA_API } from '@subwallet/extension-base/koni/api/nft/config';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { isUrl } from '@subwallet/extension-base/utils';
-import fetch from 'cross-fetch';
 import { BN_ZERO, hexToBn } from '@polkadot/util';
 export class BitCountryNftApi extends BaseNftApi {
   constructor(api, addresses, chain) {