@subwallet/extension-base 1.1.68-2 → 1.2.1

package/cjs/koni/api/nft/ordinal_nft/index.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _constants = require("@subwallet/extension-base/constants");
-var _handlers = require("@subwallet/extension-base/koni/background/handlers");
+var _subscanService = require("@subwallet/extension-base/services/subscan-service");
 var _nft = require("../nft");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -49,12 +49,13 @@ class OrdinalNftApi extends _nft.BaseNftApi {
   constructor(addresses, chain, subscanChain) {
     super(chain, undefined, addresses);
     this.subscanChain = subscanChain;
+    this.subscanService = _subscanService.SubscanService.getInstance();
   }
   async handleNft(address, handleNftParams) {
-    const events = await _handlers.state.subscanService.getAccountRemarkEvents(this.chain, address);
+    const events = await this.subscanService.getAccountRemarkEvents(this.subscanChain, address);
     if (events && events.length) {
       const extrinsicIds = events.map(data => data.extrinsic_index);
-      const extrinsicParams = await _handlers.state.subscanService.getExtrinsicParams(this.chain, extrinsicIds);
+      const extrinsicParams = await this.subscanService.getExtrinsicParams(this.subscanChain, extrinsicIds);
       const items = [];
       for (const data of extrinsicParams) {
         const {

package/cjs/koni/api/nft/rmrk_nft/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,7 +7,6 @@ exports.RmrkNftApi = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _nft = require("@subwallet/extension-base/koni/api/nft/nft");
 var _utils = require("@subwallet/extension-base/utils");
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _config = require("../config");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -49,7 +47,7 @@ class RmrkNftApi extends _nft.BaseNftApi {
         return undefined;
       }
     }
-    return await (0, _crossFetch.default)(url, {
+    return await fetch(url, {
       method: 'GET'
     }).then(res => res.json());
   }
@@ -64,7 +62,7 @@ class RmrkNftApi extends _nft.BaseNftApi {
         source,
         url
       } = _ref;
-      let _data = await (0, _crossFetch.default)(url, {
+      let _data = await fetch(url, {
         method: 'GET'
       }).then(res => res.json());
       _data = _data.map(item => {
@@ -189,7 +187,7 @@ class RmrkNftApi extends _nft.BaseNftApi {
       const allCollectionMetaUrl = [];
       await Promise.all(collectionInfoUrl.map(async url => {
         try {
-          const data = await (0, _crossFetch.default)(url, {
+          const data = await fetch(url, {
             method: 'GET'
           }).then(resp => resp.json());
           const result = data[0];
@@ -213,7 +211,7 @@ class RmrkNftApi extends _nft.BaseNftApi {
         let data = {};
         try {
           if (item.url) {
-            data = await (0, _crossFetch.default)(item === null || item === void 0 ? void 0 : item.url, {
+            data = await fetch(item === null || item === void 0 ? void 0 : item.url, {
               method: 'GET'
             }).then(resp => resp.json());
           }

package/cjs/koni/api/nft/unique_network_nft/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,7 +7,6 @@ exports.UniqueNftApi = void 0;
 var _config = require("@subwallet/extension-base/koni/api/nft/config");
 var _nft = require("@subwallet/extension-base/koni/api/nft/nft");
 var _utils = require("@subwallet/extension-base/utils");
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -88,7 +86,7 @@ class UniqueNftApi extends _nft.BaseNftApi {
       // Opal address: Normal address
     }
 
-    const resp = await (0, _crossFetch.default)(endpoint, {
+    const resp = await fetch(endpoint, {
       method: 'post',
       headers: {
         'Content-Type': 'application/json'

package/cjs/koni/api/nft/unique_nft/uniqueNftV2.js

@@ -1,13 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UniqueNftApiV2 = void 0;
 var _config = require("@subwallet/extension-base/koni/api/nft/config");
 var _nft = require("@subwallet/extension-base/koni/api/nft/nft");
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -34,7 +32,7 @@ class UniqueNftApiV2 extends _nft.BaseNftApi {
 
   async getNftByAccount(address) {
     var _result$data;
-    const resp = await (0, _crossFetch.default)(this.endpoint, {
+    const resp = await fetch(this.endpoint, {
       method: 'post',
       headers: {
         'Content-Type': 'application/json'

package/cjs/koni/api/nft/vara_nft/index.js

@@ -1,13 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VaraNftApi = void 0;
 var _config = require("@subwallet/extension-base/koni/api/nft/config");
 var _nft = require("@subwallet/extension-base/koni/api/nft/nft");
-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
@@ -56,7 +54,7 @@ class VaraNftApi extends _nft.BaseNftApi {
   async getNftByAccount(address) {
     var _result$data, _result$data$accountB;
     const publicKey = (0, _util.hexAddPrefix)((0, _util.u8aToHex)((0, _utilCrypto.decodeAddress)(address)));
-    const resp = await (0, _crossFetch.default)(this.endpoint, {
+    const resp = await fetch(this.endpoint, {
       method: 'post',
       headers: {
         'Content-Type': 'application/json'

package/cjs/koni/api/nft/wasm_nft/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,8 +12,6 @@ var _wasm = require("@subwallet/extension-base/koni/api/tokens/wasm");
 var _utils2 = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
 var _utils3 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils4 = require("@subwallet/extension-base/utils");
-var _axios = _interopRequireDefault(require("axios"));
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -34,7 +31,7 @@ async function isArtZeroFeaturedCollection(networkKey, contractAddress) {
   const urlencoded = new URLSearchParams();
   urlencoded.append('collection_address', contractAddress);
   const collectionInfoPromise = new Promise(function (resolve) {
-    (0, _crossFetch.default)((0, _utils.collectionApiFromArtZero)(networkKey), {
+    fetch((0, _utils.collectionApiFromArtZero)(networkKey), {
       method: 'POST',
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded'
@@ -101,15 +98,13 @@ class WasmNftApi extends _nft.BaseNftApi {
       return undefined;
     }
     const nftItemImageSrc = `${(0, _utils.itemImageApiFromArtZero)(this.chain)}?input=${parsedTokenUri}&size=500`;
-    const collectionImageUrl = await (0, _axios.default)(nftItemImageSrc, {
-      method: 'GET'
-    });
-    return collectionImageUrl.data;
+    const collectionImageUrl = await fetch(nftItemImageSrc);
+    return await collectionImageUrl.text();
   }
   async parseFeaturedCollectionImage(smartContract) {
     const urlencoded = new URLSearchParams();
     urlencoded.append('collection_address', smartContract);
-    const resp = await (0, _crossFetch.default)((0, _utils.collectionDetailApiFromArtZero)(this.chain), {
+    const resp = await fetch((0, _utils.collectionDetailApiFromArtZero)(this.chain), {
       method: 'POST',
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded'
@@ -129,10 +124,8 @@ class WasmNftApi extends _nft.BaseNftApi {
       return;
     }
     const collectionImageSrc = `${(0, _utils.itemImageApiFromArtZero)(this.chain)}?input=${parsedCollectionImage}&size=500`;
-    const collectionImageUrl = await (0, _axios.default)(collectionImageSrc, {
-      method: 'GET'
-    });
-    return collectionImageUrl.data;
+    const collectionImageUrl = await fetch(collectionImageSrc);
+    return await collectionImageUrl.text();
   }
 
   // private async getCollectionAttributes (contractPromise: ContractPromise): Promise<CollectionAttributes> {
@@ -223,14 +216,14 @@ class WasmNftApi extends _nft.BaseNftApi {
     if (isFeatured) {
       const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
       if (parsedTokenUri) {
-        const resp = await (0, _crossFetch.default)(`${(0, _utils.ipfsApiFromArtZero)(this.chain)}?input=${parsedTokenUri}`);
+        const resp = await fetch(`${(0, _utils.ipfsApiFromArtZero)(this.chain)}?input=${parsedTokenUri}`);
         itemDetail = resp && resp.ok && (await resp.json());
       }
     } else {
       const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
       const detailUrl = this.parseUrl(parsedTokenUri);
       if (detailUrl) {
-        const resp = await (0, _crossFetch.default)(detailUrl);
+        const resp = await fetch(detailUrl);
         itemDetail = resp && resp.ok && (await resp.json());
       }
     }
@@ -282,14 +275,14 @@ class WasmNftApi extends _nft.BaseNftApi {
       if (_isFeatured) {
         const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
         if (parsedTokenUri) {
-          const resp = await (0, _crossFetch.default)(`${(0, _utils.ipfsApiFromArtZero)(this.chain)}?input=${parsedTokenUri}`);
+          const resp = await fetch(`${(0, _utils.ipfsApiFromArtZero)(this.chain)}?input=${parsedTokenUri}`);
           itemDetail = resp && resp.ok && (await resp.json());
         }
       } else {
         const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
         const detailUrl = this.parseUrl(parsedTokenUri);
         if (detailUrl) {
-          const resp = await (0, _crossFetch.default)(detailUrl);
+          const resp = await fetch(detailUrl);
           itemDetail = resp && resp.ok && (await resp.json());
           if (_domain.AZERO_DOMAIN_CONTRACTS.includes(contractPromise.address.toString())) {
             var _itemDetail;

package/cjs/koni/api/staking/bonding/astar.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -19,7 +18,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");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -30,7 +28,7 @@ const convertAddress = address => {
 };
 const fetchDApps = async network => {
   return new Promise(function (resolve) {
-    (0, _crossFetch.default)(`https://api.astar.network/api/v1/${network}/dapps-staking/dappssimple`, {
+    fetch(`https://api.astar.network/api/v1/${network}/dapps-staking/dappssimple`, {
       method: 'GET'
     }).then(resp => {
       resolve(resp.json());
@@ -59,7 +57,7 @@ function subscribeAstarStakingMetadata(chain, substrateApi, callback) {
 }
 async function getAstarStakingMetadata(chain, substrateApi) {
   const aprPromise = new Promise(function (resolve) {
-    (0, _crossFetch.default)(`https://api.astar.network/api/v1/${chain}/dapps-staking/apr`, {
+    fetch(`https://api.astar.network/api/v1/${chain}/dapps-staking/apr`, {
       method: 'GET'
     }).then(resp => {
       resolve(resp.json());

package/cjs/koni/api/staking/subsquidStaking.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,7 +8,6 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _config = require("@subwallet/extension-base/koni/api/staking/config");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
-var _axios = _interopRequireDefault(require("axios"));
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -51,16 +49,13 @@ const getSubsquidStaking = async (accounts, chain, chainInfoMap, callback) => {
           type: _KoniTypes.StakingType.NOMINATED,
           address: (0, _utils2.reformatAddress)(account, 42)
         };
-        const resp = await (0, _axios.default)({
-          url: _config.SUBSQUID_ENDPOINTS[chain],
-          method: 'post',
-          data: {
-            query: getSubsquidQuery(parsedAccount, chain)
-          }
-        });
-        if (resp.status === 200) {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-          const respData = resp.data.data;
+        try {
+          const respData = await (0, _utils2.fetchJson)(_config.SUBSQUID_ENDPOINTS[chain], {
+            method: 'post',
+            data: {
+              query: getSubsquidQuery(parsedAccount, chain)
+            }
+          });
           const rewardItem = respData.stakerById;
           if (rewardItem) {
             const latestReward = rewardItem.rewards[0];
@@ -74,6 +69,8 @@ const getSubsquidStaking = async (accounts, chain, chainInfoMap, callback) => {
               stakingRewardItem.latestReward = latestReward.amount;
             }
           }
+        } catch (e) {
+          console.error(e);
         }
         if (stakingRewardItem.totalReward && parseFloat(stakingRewardItem.totalReward) > 0) {
           callback(stakingRewardItem);

package/cjs/koni/api/subquery/subquery.js

@@ -1,12 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.newApolloClient = newApolloClient;
 var _client = require("@apollo/client");
-var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -15,7 +13,7 @@ function newApolloClient(uri) {
     cache: new _client.InMemoryCache(),
     link: (0, _client.createHttpLink)({
       uri: uri,
-      fetch: _crossFetch.default
+      fetch: fetch
     })
   });
 }

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

@@ -4,12 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.SEED_LENGTHS = exports.SEED_DEFAULT_LENGTH = void 0;
+exports.isJsonPayload = isJsonPayload;
 var _common = require("@ethereumjs/common");
 var _tx = require("@ethereumjs/tx");
 var _types = require("@subwallet/chain-list/types");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
-var _Extension = require("@subwallet/extension-base/background/handlers/Extension");
 var _helpers = require("@subwallet/extension-base/background/handlers/helpers");
 var _subscriptions = require("@subwallet/extension-base/background/handlers/subscriptions");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -76,13 +76,20 @@ const ACCOUNT_ALL_JSON = {
   address: _constants.ALL_ACCOUNT_KEY,
   name: 'All'
 };
+const SEED_DEFAULT_LENGTH = 12;
+exports.SEED_DEFAULT_LENGTH = SEED_DEFAULT_LENGTH;
+const SEED_LENGTHS = [12, 15, 18, 21, 24];
+exports.SEED_LENGTHS = SEED_LENGTHS;
+function isJsonPayload(value) {
+  return value.genesisHash !== undefined;
+}
 class KoniExtension {
   #lockTimeOut = undefined;
   #koniState;
   #timeAutoLock = _constants4.DEFAULT_AUTO_LOCK_TIME;
   #skipAutoLock = false;
-  #alwaysLock = false;
   #firstTime = true;
+  #alwaysLock = false;
   constructor(state) {
     this.#koniState = state;
     const updateTimeAutoLock = rs => {
@@ -113,7 +120,7 @@ class KoniExtension {
       _storage.SWStorage.instance.setItem(_constants.LATEST_SESSION, JSON.stringify({
         remind: true,
         timeCalculate: time
-      }));
+      })).catch(console.error);
     };
     this.#koniState.settingService.getSettings(updateTimeAutoLock);
     this.#koniState.settingService.getSubject().subscribe({
@@ -328,7 +335,7 @@ class KoniExtension {
   }
   seedCreate(_ref14) {
     let {
-      length = _Extension.SEED_DEFAULT_LENGTH,
+      length = SEED_DEFAULT_LENGTH,
       seed: _seed,
       type
     } = _ref14;
@@ -350,9 +357,9 @@ class KoniExtension {
       (0, _util.assert)((0, _util.isHex)(phrase, 256), (0, _i18next.t)('Invalid seed phrase. Please try again.'));
     } else {
       // sadly isHex detects as string, so we need a cast here
-      (0, _util.assert)(_Extension.SEED_LENGTHS.includes(phrase.split(' ').length), (0, _i18next.t)('Seed phrase needs to contain {{x}} words', {
+      (0, _util.assert)(SEED_LENGTHS.includes(phrase.split(' ').length), (0, _i18next.t)('Seed phrase needs to contain {{x}} words', {
         replace: {
-          x: _Extension.SEED_LENGTHS.join(', ')
+          x: SEED_LENGTHS.join(', ')
         }
       }));
       (0, _util.assert)((0, _utilCrypto.mnemonicValidate)(phrase), (0, _i18next.t)('Invalid seed phrase. Please try again.'));
@@ -422,7 +429,7 @@ class KoniExtension {
         }
       }
     }
-    const url = `${chrome.extension.getURL('index.html')}#${path}${subPath || ''}${paramString}`;
+    const url = `${chrome.runtime.getURL('index.html')}#${path}${subPath || ''}${paramString}`;
     if (!_defaults.ALLOWED_PATH.includes(path)) {
       console.error('Not allowed to open the url:', url);
       return false;
@@ -1287,7 +1294,7 @@ class KoniExtension {
   }
   seedCreateV2(_ref38) {
     let {
-      length = _Extension.SEED_DEFAULT_LENGTH,
+      length = SEED_DEFAULT_LENGTH,
       seed: _seed,
       types
     } = _ref38;
@@ -1313,9 +1320,9 @@ class KoniExtension {
       (0, _util.assert)((0, _util.isHex)(phrase, 256), (0, _i18next.t)('Invalid seed phrase. Please try again.'));
     } else {
       // sadly isHex detects as string, so we need a cast here
-      (0, _util.assert)(_Extension.SEED_LENGTHS.includes(phrase.split(' ').length), (0, _i18next.t)('Seed phrase needs to contain {{x}} words', {
+      (0, _util.assert)(SEED_LENGTHS.includes(phrase.split(' ').length), (0, _i18next.t)('Seed phrase needs to contain {{x}} words', {
         replace: {
-          x: _Extension.SEED_LENGTHS.join(', ')
+          x: SEED_LENGTHS.join(', ')
         }
       }));
       (0, _util.assert)((0, _utilCrypto.mnemonicValidate)(phrase), (0, _i18next.t)('Invalid seed phrase. Please try again.'));
@@ -1422,7 +1429,16 @@ class KoniExtension {
     if (isPasswordValidated) {
       try {
         this._saveCurrentAccountAddress(address, () => {
-          _uiKeyring.keyring.restoreAccount(file, password, withMasterPassword);
+          var _newAccount$meta, _newAccount$meta2;
+          const newAccount = _uiKeyring.keyring.restoreAccount(file, password, withMasterPassword);
+
+          // genesisHash is not used in SubWallet => reset it to empty string
+          if ((_newAccount$meta = newAccount.meta) !== null && _newAccount$meta !== void 0 && _newAccount$meta.genesisHash && ((_newAccount$meta2 = newAccount.meta) === null || _newAccount$meta2 === void 0 ? void 0 : _newAccount$meta2.genesisHash) !== '') {
+            _uiKeyring.keyring.saveAccountMeta(newAccount, {
+              ...newAccount.meta,
+              genesisHash: ''
+            });
+          }
           this._addAddressToAuthList(address, isAllowed);
         });
         if (this.#alwaysLock) {
@@ -1448,6 +1464,7 @@ class KoniExtension {
       try {
         this._saveCurrentAccountAddress(_constants.ALL_ACCOUNT_KEY, () => {
           _uiKeyring.keyring.restoreAccounts(file, password);
+          this.#koniState.keyringService.removeNoneHardwareGenesisHash();
           this._addAddressesToAuthList(addressList, isAllowed);
         });
 
@@ -2973,7 +2990,8 @@ class KoniExtension {
     } = _ref70;
     try {
       _uiKeyring.keyring.unlockKeyring(password);
-      this.#koniState.initMantaPay(password).catch(console.error);
+      // this.#koniState.initMantaPay(password)
+      //   .catch(console.error);
     } catch (e) {
       return {
         errors: [e.message],
@@ -3060,7 +3078,7 @@ class KoniExtension {
     } = request;
     let registry = new _types4.TypeRegistry();
     let isEvm = false;
-    if ((0, _Extension.isJsonPayload)(payload)) {
+    if (isJsonPayload(payload)) {
       /**
        *  Get the metadata for the genesisHash
        *  @todo: need to handle case metadata store in db
@@ -3682,7 +3700,7 @@ class KoniExtension {
   }
   async initSyncMantaPay(address) {
     var _this$koniState$chain3, _this$koniState$chain4, _this$koniState$chain5, _this$koniState$chain6;
-    if ((_this$koniState$chain3 = this.#koniState.chainService) !== null && _this$koniState$chain3 !== void 0 && (_this$koniState$chain4 = _this$koniState$chain3.mantaPay) !== null && _this$koniState$chain4 !== void 0 && _this$koniState$chain4.getSyncState().isSyncing) {
+    if ((_this$koniState$chain3 = this.#koniState.chainService) !== null && _this$koniState$chain3 !== void 0 && (_this$koniState$chain4 = _this$koniState$chain3.mantaPay) !== null && _this$koniState$chain4 !== void 0 && _this$koniState$chain4.getSyncState().isSyncing || !_utils4.MODULE_SUPPORT.MANTA_ZK) {
       return;
     }
     this.#skipAutoLock = true;
@@ -4185,6 +4203,8 @@ class KoniExtension {
       }, this.#timeAutoLock * 60 * 1000);
     }
     switch (type) {
+      case 'pri(ping)':
+        return 'pong';
       /// Clone from PolkadotJs
       case 'pri(accounts.create.external)':
         return this.accountsCreateExternal(request);
@@ -4705,6 +4725,10 @@ class KoniExtension {
         return this.#koniState.dbService.importDB(request);
       case 'pri(database.exportJson)':
         return this.#koniState.dbService.getExportJson();
+      case 'pri(database.migrateLocalStorage)':
+        return this.#koniState.migrateMV3LocalStorage(request);
+      case 'pri(database.setLocalStorage)':
+        return this.#koniState.setStorageFromWS(request);
       /* Database */
 
       /* Swap service */

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

@@ -16,7 +16,7 @@ var _promise = require("@subwallet/extension-base/utils/promise");
 
 function isLocalStorageReset() {
   var _window;
-  if ((_window = window) !== null && _window !== void 0 && _window.localStorage) {
+  if (_utils.isSupportWindow && (_window = window) !== null && _window !== void 0 && _window.localStorage) {
     return !window.localStorage.getItem('keyring:subwallet');
   } else {
     return false;
@@ -24,7 +24,7 @@ function isLocalStorageReset() {
 }
 async function isIndexedDBReset() {
   try {
-    return (await _index.state.dbService.stores.migration.table.count()) < 1;
+    return (await _index.SWHandler.instance.state.dbService.stores.migration.table.count()) < 1;
   } catch (e) {
     return true;
   }
@@ -59,7 +59,9 @@ class Mobile {
   constructor(state) {
     this.state = state;
     if (!isLocalStorageReset()) {
-      this.lastRestoreData.storage = swStorage.copy();
+      swStorage.copy().then(data => {
+        this.lastRestoreData.storage = data;
+      }).catch(console.error);
     }
     (async () => {
       if (!(await isIndexedDBReset())) {
@@ -141,6 +143,7 @@ class Mobile {
     console.log('restartSubscriptionServices');
   }
   async _getLocalStorageExportData() {
+    await swStorage.waitReady;
     return Promise.resolve(JSON.stringify(swStorage.copy()));
   }
   async _getDexieExportData() {
@@ -192,7 +195,7 @@ class Mobile {
     if (storage) {
       const storageData = JSON.parse(storage);
       for (const key in storageData) {
-        swStorage.setItem(key, storageData[key]);
+        await swStorage.setItem(key, storageData[key]);
       }
     }
     if (indexedDB) {