@subwallet/extension-base 1.1.68-1 → 1.2.1

package/koni/background/handlers/index.js

@@ -2,78 +2,83 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { PORT_EXTENSION, PORT_MOBILE } from '@subwallet/extension-base/defaults';
-import { NftHandler } from '@subwallet/extension-base/koni/api/nft';
 import KoniExtension from '@subwallet/extension-base/koni/background/handlers/Extension';
 import Mobile from '@subwallet/extension-base/koni/background/handlers/Mobile';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import KoniTabs from '@subwallet/extension-base/koni/background/handlers/Tabs';
-
-// import Migration from '@subwallet/extension-base/koni/migration';
 import { assert } from '@polkadot/util';
-export const state = new KoniState();
-export const extension = new KoniExtension(state);
-export const tabs = new KoniTabs(state);
-export const mobile = new Mobile(state);
-export const nftHandler = new 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));
-
-export default function handlers({
-  id,
-  message,
-  request
-}, port, extensionPortName = PORT_EXTENSION) {
-  const isMobile = port.name === 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)}`);
+export class SWHandler {
+  get state() {
+    if (!this._state) {
+      this._state = new KoniState();
+    }
+    return this._state;
+  }
+  get extensionHandler() {
+    if (!this._extensionHandler) {
+      this._extensionHandler = new KoniExtension(this.state);
+    }
+    return this._extensionHandler;
+  }
+  get tabHandler() {
+    if (!this._tabsHandler) {
+      this._tabsHandler = new KoniTabs(this.state);
+    }
+    return this._tabsHandler;
+  }
+  get mobileHandler() {
+    if (!this._mobileHandler) {
+      this._mobileHandler = new Mobile(this.state);
+    }
+    return this._mobileHandler;
+  }
+  handle({
+    id,
+    message,
+    request
+  }, port) {
+    const isMobile = port.name === PORT_MOBILE;
+    const isExtension = port.name === PORT_EXTENSION;
+    const sender = port.sender;
+    // console.debug('Handle', message);
 
-    // between the start and the end of the promise, the user may have closed
-    // the tab, in which case port will be undefined
-    assert(port, 'Port has been disconnected');
-    port.postMessage({
-      id,
-      response,
-      sender: 'BACKGROUND'
-    });
-  }).catch(error => {
-    console.error(error);
-    console.log(`[err] ${source}:: ${error.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
+      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;
+  }
 }

package/koni/background/subscription.js

@@ -2,10 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { subscribeCrowdloan } from '@subwallet/extension-base/koni/api/dotsama/crowdloan';
-import { nftHandler } from '@subwallet/extension-base/koni/background/handlers';
+import { NftHandler } from '@subwallet/extension-base/koni/api/nft';
 import { COMMON_RELOAD_EVENTS } from '@subwallet/extension-base/services/event-service/types';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { logger as createLogger } from '@polkadot/util';
+const nftHandler = new NftHandler();
 export class KoniSubscription {
   subscriptionMap = {
     crowdloan: undefined,

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.68-1",
+  "version": "1.2.1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -59,16 +59,6 @@
       "require": "./cjs/background/errors/TransactionError.js",
       "default": "./background/errors/TransactionError.js"
     },
-    "./background/handlers": {
-      "types": "./background/handlers/index.d.ts",
-      "require": "./cjs/background/handlers/index.js",
-      "default": "./background/handlers/index.js"
-    },
-    "./background/handlers/Extension": {
-      "types": "./background/handlers/Extension.d.ts",
-      "require": "./cjs/background/handlers/Extension.js",
-      "default": "./background/handlers/Extension.js"
-    },
     "./background/handlers/helpers": {
       "types": "./background/handlers/helpers.d.ts",
       "require": "./cjs/background/handlers/helpers.js",
@@ -84,11 +74,6 @@
       "require": "./cjs/background/handlers/subscriptions.js",
       "default": "./background/handlers/subscriptions.js"
     },
-    "./background/handlers/Tabs": {
-      "types": "./background/handlers/Tabs.d.ts",
-      "require": "./cjs/background/handlers/Tabs.js",
-      "default": "./background/handlers/Tabs.js"
-    },
     "./background/KoniTypes": {
       "types": "./background/KoniTypes.d.ts",
       "require": "./cjs/background/KoniTypes.js",
@@ -444,11 +429,6 @@
       "require": "./cjs/koni/background/cron.js",
       "default": "./koni/background/cron.js"
     },
-    "./koni/background/events": {
-      "types": "./koni/background/events.d.ts",
-      "require": "./cjs/koni/background/events.js",
-      "default": "./koni/background/events.js"
-    },
     "./koni/background/handlers": {
       "types": "./koni/background/handlers/index.d.ts",
       "require": "./cjs/koni/background/handlers/index.js",
@@ -1025,6 +1005,11 @@
       "require": "./cjs/services/migration-service/scripts/MigrateNetworkSettings.js",
       "default": "./services/migration-service/scripts/MigrateNetworkSettings.js"
     },
+    "./services/migration-service/scripts/MigrateRemoveGenesisHash": {
+      "types": "./services/migration-service/scripts/MigrateRemoveGenesisHash.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateRemoveGenesisHash.js",
+      "default": "./services/migration-service/scripts/MigrateRemoveGenesisHash.js"
+    },
     "./services/migration-service/scripts/MigrateSettings": {
       "types": "./services/migration-service/scripts/MigrateSettings.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateSettings.js",
@@ -1285,6 +1270,11 @@
       "require": "./cjs/services/storage-service/db-stores/Crowdloan.js",
       "default": "./services/storage-service/db-stores/Crowdloan.js"
     },
+    "./services/storage-service/db-stores/KeyValue": {
+      "types": "./services/storage-service/db-stores/KeyValue.d.ts",
+      "require": "./cjs/services/storage-service/db-stores/KeyValue.js",
+      "default": "./services/storage-service/db-stores/KeyValue.js"
+    },
     "./services/storage-service/db-stores/MantaPay": {
       "types": "./services/storage-service/db-stores/MantaPay.d.ts",
       "require": "./cjs/services/storage-service/db-stores/MantaPay.js",
@@ -1585,6 +1575,16 @@
       "require": "./cjs/types/campaigns/unlock-dot.js",
       "default": "./types/campaigns/unlock-dot.js"
     },
+    "./types/common": {
+      "types": "./types/common/index.d.ts",
+      "require": "./cjs/types/common/index.js",
+      "default": "./types/common/index.js"
+    },
+    "./types/common/storage": {
+      "types": "./types/common/storage.d.ts",
+      "require": "./cjs/types/common/storage.js",
+      "default": "./types/common/storage.js"
+    },
     "./types/fee": {
       "types": "./types/fee/index.d.ts",
       "require": "./cjs/types/fee/index.js",
@@ -1760,6 +1760,11 @@
       "require": "./cjs/utils/eth/parseTransaction/base.js",
       "default": "./utils/eth/parseTransaction/base.js"
     },
+    "./utils/fetch": {
+      "types": "./utils/fetch.d.ts",
+      "require": "./cjs/utils/fetch.js",
+      "default": "./utils/fetch.js"
+    },
     "./utils/fetchEvmChainInfo": {
       "types": "./utils/fetchEvmChainInfo.d.ts",
       "require": "./cjs/utils/fetchEvmChainInfo.js",
@@ -1882,19 +1887,21 @@
     "@polkadot/ui-settings": "^3.6.6",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
+    "@polkadot/x-global": "^12.2.1",
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.64",
-    "@subwallet/extension-base": "^1.1.68-1",
-    "@subwallet/extension-chains": "^1.1.68-1",
-    "@subwallet/extension-dapp": "^1.1.68-1",
-    "@subwallet/extension-inject": "^1.1.68-1",
+    "@subwallet/chain-list": "0.2.65",
+    "@subwallet/extension-base": "^1.2.1",
+    "@subwallet/extension-chains": "^1.2.1",
+    "@subwallet/extension-dapp": "^1.2.1",
+    "@subwallet/extension-inject": "^1.2.1",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
-    "@walletconnect/sign-client": "^2.8.4",
-    "@walletconnect/types": "^2.8.4",
-    "@walletconnect/utils": "^2.8.4",
+    "@walletconnect/keyvaluestorage": "^1.1.1",
+    "@walletconnect/sign-client": "^2.11.3",
+    "@walletconnect/types": "^2.11.3",
+    "@walletconnect/utils": "^2.11.3",
     "avail-js-sdk": "^0.2.12",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.1",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.68-1'
+  version: '1.2.1'
 };

package/services/campaign-service/helpers.js

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

package/services/chain-service/index.js

@@ -3,7 +3,7 @@
 
 import { AssetLogoMap, AssetRefMap, ChainAssetMap, ChainInfoMap, ChainLogoMap, MultiChainAssetMap } from '@subwallet/chain-list';
 import { _AssetRefPath, _AssetType, _ChainStatus, _SubstrateChainType } from '@subwallet/chain-list/types';
-import { _DEFAULT_ACTIVE_CHAINS, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX, LATEST_CHAIN_DATA_FETCHING_INTERVAL } from '@subwallet/extension-base/services/chain-service/constants';
+import { _DEFAULT_ACTIVE_CHAINS, _ZK_ASSET_PREFIX, LATEST_CHAIN_DATA_FETCHING_INTERVAL } from '@subwallet/extension-base/services/chain-service/constants';
 import { EvmChainHandler } from '@subwallet/extension-base/services/chain-service/handler/EvmChainHandler';
 import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-service/handler/manta/MantaPrivateHandler';
 import { SubstrateChainHandler } from '@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler';
@@ -474,6 +474,7 @@ export class ChainService {
           needUpdateChainApiList,
           storedChainInfoList
         } = updateLatestChainInfo(this.dataMap, latestChainInfo);
+        console.log('here', needUpdateChainApiList, storedChainInfoList);
         this.dbService.bulkUpdateChainStore(storedChainInfoList).catch(console.error);
         this.updateChainSubscription();
         needUpdateChainApiList.forEach(chainInfo => {
@@ -577,6 +578,12 @@ export class ChainService {
             visible: true
           });
         }
+      } else {
+        if (originChain === 'avail_mainnet') {
+          await this.updateAssetSetting(assetSlug, {
+            visible: true
+          });
+        }
       }
     }
   }
@@ -638,22 +645,18 @@ export class ChainService {
       this.updateChainConnectionStatus(slug, status);
     };
     if (chainInfo.substrateInfo !== null && chainInfo.substrateInfo !== undefined) {
-      if (_MANTA_ZK_CHAIN_GROUP.includes(chainInfo.slug) && 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);
+      // }
     }
 
     /**
@@ -1000,17 +1003,9 @@ export class ChainService {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
     const latestAssetRegistry = filterAssetInfoMap(this.getChainInfoMap(), ChainAssetMap);
     const availableChains = Object.values(this.dataMap.chainInfoMap).filter(info => info.chainStatus === _ChainStatus.ACTIVE).map(chainInfo => chainInfo.slug);
-
-    // Fill out zk assets from latestAssetRegistry if not supported
-    if (!MODULE_SUPPORT.MANTA_ZK) {
-      Object.keys(latestAssetRegistry).forEach(slug => {
-        if (_isMantaZkAsset(latestAssetRegistry[slug])) {
-          delete latestAssetRegistry[slug];
-        }
-      });
-    }
+    let finalAssetRegistry = {};
     if (storedAssetRegistry.length === 0) {
-      this.dataMap.assetRegistry = latestAssetRegistry;
+      finalAssetRegistry = latestAssetRegistry;
     } else {
       const mergedAssetRegistry = latestAssetRegistry;
       const parsedStoredAssetRegistry = {};
@@ -1052,9 +1047,22 @@ export 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 (!MODULE_SUPPORT.MANTA_ZK) {
+      const zkAssets = [];
+      Object.entries(finalAssetRegistry).forEach(([slug, assets]) => {
+        if (_isMantaZkAsset(assets)) {
+          zkAssets.push(slug);
+          delete finalAssetRegistry[slug];
+        }
+      });
+      await this.dbService.removeFromAssetStore(zkAssets);
+    }
+    this.dataMap.assetRegistry = finalAssetRegistry;
   }
   updateChainStateMapSubscription() {
     this.chainStateMapSubject.next(this.getChainStateMap());
@@ -1631,8 +1639,7 @@ export class ChainService {
     const chainInfoMap = this.getChainInfoMap();
     Object.values(chainInfoMap).forEach(i => {
       var _i$extraInfo;
-      const subscanSlug = i.slug === 'goldberg_testnet' ? 'avail-testnet' : (_i$extraInfo = i.extraInfo) === null || _i$extraInfo === void 0 ? void 0 : _i$extraInfo.subscanSlug; // Hotfix for Goldberg testnet
-
+      const subscanSlug = (_i$extraInfo = i.extraInfo) === null || _i$extraInfo === void 0 ? void 0 : _i$extraInfo.subscanSlug;
       if (!subscanSlug) {
         return;
       }

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

@@ -1,7 +1,6 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import fetch from 'cross-fetch';
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';

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

@@ -5,7 +5,6 @@ import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/K
 import { _getTokenOnChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import { fakeAddress } from '@subwallet/extension-base/services/earning-service/constants';
 import { EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
-import fetch from 'cross-fetch';
 import { BN, BN_TEN, BN_ZERO } from '@polkadot/util';
 import BaseLiquidStakingPoolHandler from "./base.js";
 const GRAPHQL_API = 'https://api.polkawallet.io/acala-liquid-staking-subql';

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

@@ -4,7 +4,6 @@
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _getAssetDecimals, _getTokenOnChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import { YieldStepType } from '@subwallet/extension-base/types';
-import fetch from 'cross-fetch';
 import BifrostLiquidStakingPoolHandler from "./bifrost.js";
 const STATS_URL = 'https://api.bifrost.app/api/site';
 const RATIO_URL = 'https://api.bifrost.app/api/omni/MANTA';

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

@@ -8,7 +8,6 @@ import { fakeAddress } from '@subwallet/extension-base/services/earning-service/
 import { EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
 import { reformatAddress } from '@subwallet/extension-base/utils';
 import BigNumber from 'bignumber.js';
-import fetch from 'cross-fetch';
 import { BN, BN_ZERO } from '@polkadot/util';
 import BaseLiquidStakingPoolHandler from "./base.js";
 const STATS_URL = 'https://api.bifrost.app/api/site';

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

@@ -7,7 +7,6 @@ import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/
 import { _getAssetDecimals, _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
-import fetch from 'cross-fetch';
 import { BN, BN_TEN, BN_ZERO } from '@polkadot/util';
 import { ST_LIQUID_TOKEN_ABI } from "../../constants/index.js";
 import BaseLiquidStakingPoolHandler from "./base.js";

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

@@ -7,7 +7,6 @@ import { getEarningStatusByNominations } from '@subwallet/extension-base/koni/ap
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, isUrl, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
-import fetch from 'cross-fetch';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 import BaseParaNativeStakingPoolHandler from "./base-para.js";

package/services/event-service/index.js

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

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

@@ -4,7 +4,6 @@
 import { ApolloClient, createHttpLink, gql, InMemoryCache } from '@apollo/client';
 import { ChainType, ExtrinsicStatus, ExtrinsicType, TransactionDirection } from '@subwallet/extension-base/background/KoniTypes';
 import { MAX_FETCH_PAGE_PER_SESSION, MIN__NUM_HISTORY_PER_ACCOUNT } from '@subwallet/extension-base/services/history-service/constants';
-import fetch from 'cross-fetch';
 import { isArray } from '@polkadot/util';
 import { decodeAddress, encodeAddress, isEthereumAddress } from '@polkadot/util-crypto';
 const MULTI_CHAIN_URL = 'https://squid.subsquid.io/multi-chain-tx/v/v1/graphql';

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

@@ -24,4 +24,5 @@ export declare class KeyringService {
     addInjectAccounts(accounts: InjectedAccountWithMeta[]): void;
     removeInjectAccounts(_addresses: string[]): void;
     resetWallet(resetAll: boolean): Promise<void>;
+    removeNoneHardwareGenesisHash(): void;
 }

package/services/keyring-service/index.js

@@ -179,4 +179,23 @@ export class KeyringService {
       currentGenesisHash: null
     });
   }
+  /* Reset */
+
+  /* Others */
+  removeNoneHardwareGenesisHash() {
+    const pairs = keyring.getPairs();
+    const needUpdatePairs = pairs.filter(({
+      meta: {
+        genesisHash,
+        isHardware
+      }
+    }) => !isHardware && genesisHash && genesisHash !== '');
+    needUpdatePairs.forEach(pair => {
+      keyring.saveAccountMeta(pair, {
+        ...pair.meta,
+        genesisHash: ''
+      });
+    });
+  }
+  /* Others */
 }

package/services/migration-service/scripts/MigrateRemoveGenesisHash.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateRemoveGenesisHash extends BaseMigrationJob {
+    run(): Promise<void>;
+}

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

@@ -0,0 +1,20 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateRemoveGenesisHash extends BaseMigrationJob {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        try {
+          this.state.keyringService.removeNoneHardwareGenesisHash();
+        } catch (e) {
+          console.error(e);
+        }
+        resolve();
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

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

@@ -3,6 +3,7 @@
 
 import AutoEnableSomeTokens from '@subwallet/extension-base/services/migration-service/scripts/databases/AutoEnableSomeTokens';
 import DeleteEarningData from '@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData';
+import MigrateRemoveGenesisHash from '@subwallet/extension-base/services/migration-service/scripts/MigrateRemoveGenesisHash';
 import MigrateTransactionHistoryBySymbol from '@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistoryBySymbol';
 import MigrateAssetSetting from "./databases/MigrateAssetSetting.js";
 import MigrateEarningVersion from "./databases/MigrateEarningVersion.js";
@@ -49,7 +50,8 @@ export default {
   '1.1.41-01': DeleteChainStaking,
   '1.1.46-01': AutoEnableSomeTokens,
   '1.1.62-01': MigrateAssetSetting,
-  '1.1.62-02': MigrateTransactionHistoryBySymbol
+  '1.1.62-02': MigrateTransactionHistoryBySymbol,
+  '1.2.69-01': MigrateRemoveGenesisHash
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };