@subwallet/extension-base 1.1.20-2 → 1.1.20-4

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.20-2'
+  version: '1.1.20-4'
 };
 exports.packageInfo = packageInfo;

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

@@ -766,6 +766,7 @@ class ChainService {
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
     const latestAssetRegistry = await this.fetchLatestData(_constants._CHAIN_ASSET_SRC, _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) {
@@ -800,14 +801,19 @@ class ChainService {
       });
       for (const storedAssetInfo of Object.values(parsedStoredAssetRegistry)) {
         let duplicated = false;
+        let deprecated = false;
         for (const defaultChainAsset of Object.values(latestAssetRegistry)) {
           // case merge custom asset with default asset
           if ((0, _utils._isEqualSmartContractAsset)(storedAssetInfo, defaultChainAsset)) {
             duplicated = true;
             break;
           }
+          if (availableChains.indexOf(storedAssetInfo.originChain) === -1) {
+            deprecated = true;
+            break;
+          }
         }
-        if (!duplicated) {
+        if (!duplicated && !deprecated) {
           mergedAssetRegistry[storedAssetInfo.slug] = storedAssetInfo;
         } else {
           deprecatedAssets.push(storedAssetInfo.slug);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.20-2",
+  "version": "1.1.20-4",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1307,11 +1307,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.20-beta.7",
-    "@subwallet/extension-base": "^1.1.20-2",
-    "@subwallet/extension-chains": "^1.1.20-2",
-    "@subwallet/extension-dapp": "^1.1.20-2",
-    "@subwallet/extension-inject": "^1.1.20-2",
+    "@subwallet/chain-list": "0.2.21",
+    "@subwallet/extension-base": "^1.1.20-4",
+    "@subwallet/extension-chains": "^1.1.20-4",
+    "@subwallet/extension-dapp": "^1.1.20-4",
+    "@subwallet/extension-inject": "^1.1.20-4",
     "@subwallet/keyring": "^0.1.1",
     "@subwallet/ui-keyring": "^0.1.1",
     "@walletconnect/sign-client": "^2.8.4",

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.20-2'
+  version: '1.1.20-4'
 };

package/services/chain-service/index.js

@@ -749,6 +749,7 @@ export class ChainService {
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
     const latestAssetRegistry = await this.fetchLatestData(_CHAIN_ASSET_SRC, 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) {
@@ -783,14 +784,19 @@ export class ChainService {
       });
       for (const storedAssetInfo of Object.values(parsedStoredAssetRegistry)) {
         let duplicated = false;
+        let deprecated = false;
         for (const defaultChainAsset of Object.values(latestAssetRegistry)) {
           // case merge custom asset with default asset
           if (_isEqualSmartContractAsset(storedAssetInfo, defaultChainAsset)) {
             duplicated = true;
             break;
           }
+          if (availableChains.indexOf(storedAssetInfo.originChain) === -1) {
+            deprecated = true;
+            break;
+          }
         }
-        if (!duplicated) {
+        if (!duplicated && !deprecated) {
           mergedAssetRegistry[storedAssetInfo.slug] = storedAssetInfo;
         } else {
           deprecatedAssets.push(storedAssetInfo.slug);