@subwallet/extension-base 1.1.20-1 → 1.1.20-3

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

@@ -39,7 +39,7 @@ function subscribeAstarStakingMetadata(chain, substrateApi, callback) {
       // temporary fix for Astar, there's no limit for now
       maxWithdrawalRequestPerValidator: 1,
       // by default
-      allowCancelUnstaking: true,
+      allowCancelUnstaking: false,
       unstakingPeriod
     });
   });
@@ -75,7 +75,7 @@ async function getAstarStakingMetadata(chain, substrateApi) {
     // temporary fix for Astar, there's no limit for now
     maxWithdrawalRequestPerValidator: 1,
     // by default
-    allowCancelUnstaking: true,
+    allowCancelUnstaking: false,
     unstakingPeriod
   };
 }
@@ -114,7 +114,7 @@ async function subscribeAstarNominatorMetadata(chainInfo, address, substrateApi,
         nominationList.push({
           status: dappStakingStatus,
           chain: chainInfo.slug,
-          validatorAddress: dappAddress.toLowerCase(),
+          validatorAddress: (0, _utilCrypto.isEthereumAddress)(dappAddress) ? dappAddress.toLowerCase() : dappAddress,
           activeStake: currentStake,
           validatorMinStake: '0',
           validatorIdentity: dappInfo === null || dappInfo === void 0 ? void 0 : dappInfo.name,

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-1'
+  version: '1.1.20-3'
 };
 exports.packageInfo = packageInfo;

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

@@ -645,9 +645,11 @@ class ChainService {
     } else {
       const mergedChainInfoMap = latestChainInfoMap;
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
-        if (storedSlug in latestChainInfoMap) {
-          // check predefined chains first, keep setting for providers and currentProvider
-          // TODO: review merging providers
+        const chainInfo = latestChainInfoMap[storedSlug];
+
+        // Network is existed on change list
+        // check predefined chains first, keep setting for providers and currentProvider
+        if (chainInfo) {
           // Keep customer provider only
           const providers = {
             ...mergedChainInfoMap[storedSlug].providers
@@ -673,18 +675,20 @@ class ChainService {
               }
             }
           }
+          const hasProvider = Object.values(providers).length > 0;
+          const canActive = hasProvider && chainInfo.chainStatus === _types._ChainStatus.ACTIVE;
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: currentProvider,
             slug: storedSlug,
             connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
-            active: storedChainInfo.active
+            active: canActive && storedChainInfo.active
           };
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
-            active: storedChainInfo.active,
+            active: canActive && storedChainInfo.active,
             currentProvider: currentProvider
           });
-        } else {
+        } else if ((0, _utils._isCustomChain)(storedSlug)) {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
           // only custom chains are left
           // check custom chain duplicated with predefined chain => merge into predefined chain
@@ -731,6 +735,8 @@ class ChainService {
               currentProvider: storedChainInfo.currentProvider
             });
           }
+        } else {
+          // Todo: Remove chain from storage
         }
       }
 
@@ -760,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) {
@@ -794,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/cjs/services/history-service/index.js

@@ -11,7 +11,6 @@ var _recoverHistoryStatus = require("@subwallet/extension-base/services/history-
 var _promise = require("@subwallet/extension-base/utils/promise");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _rxjs = require("rxjs");
-var _subsquidMultiChainHistory = require("./subsquid-multi-chain-history");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -32,10 +31,12 @@ class HistoryService {
     if (!addresses || addresses.length === 0) {
       return [];
     }
-    const chainMap = this.chainService.getChainInfoMap();
 
     // Query data from subscan or any indexer
-    const historyRecords = await (0, _subsquidMultiChainHistory.fetchMultiChainHistories)(addresses, chainMap);
+    // const chainMap = this.chainService.getChainInfoMap();
+    // const historyRecords = await fetchMultiChainHistories(addresses, chainMap);
+    // Pause deprecated until have new update
+    const historyRecords = [];
 
     // Fill additional info
     const accountMap = Object.entries(this.keyringService.accounts).reduce((map, _ref) => {

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

@@ -23,7 +23,7 @@ export function subscribeAstarStakingMetadata(chain, substrateApi, callback) {
       // temporary fix for Astar, there's no limit for now
       maxWithdrawalRequestPerValidator: 1,
       // by default
-      allowCancelUnstaking: true,
+      allowCancelUnstaking: false,
       unstakingPeriod
     });
   });
@@ -59,7 +59,7 @@ export async function getAstarStakingMetadata(chain, substrateApi) {
     // temporary fix for Astar, there's no limit for now
     maxWithdrawalRequestPerValidator: 1,
     // by default
-    allowCancelUnstaking: true,
+    allowCancelUnstaking: false,
     unstakingPeriod
   };
 }
@@ -98,7 +98,7 @@ export async function subscribeAstarNominatorMetadata(chainInfo, address, substr
         nominationList.push({
           status: dappStakingStatus,
           chain: chainInfo.slug,
-          validatorAddress: dappAddress.toLowerCase(),
+          validatorAddress: isEthereumAddress(dappAddress) ? dappAddress.toLowerCase() : dappAddress,
           activeStake: currentStake,
           validatorMinStake: '0',
           validatorIdentity: dappInfo === null || dappInfo === void 0 ? void 0 : dappInfo.name,

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.20-1",
+  "version": "1.1.20-3",
   "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.5",
-    "@subwallet/extension-base": "^1.1.20-1",
-    "@subwallet/extension-chains": "^1.1.20-1",
-    "@subwallet/extension-dapp": "^1.1.20-1",
-    "@subwallet/extension-inject": "^1.1.20-1",
+    "@subwallet/chain-list": "0.2.20",
+    "@subwallet/extension-base": "^1.1.20-3",
+    "@subwallet/extension-chains": "^1.1.20-3",
+    "@subwallet/extension-dapp": "^1.1.20-3",
+    "@subwallet/extension-inject": "^1.1.20-3",
     "@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-1'
+  version: '1.1.20-3'
 };

package/services/chain-service/index.js

@@ -629,9 +629,11 @@ export class ChainService {
     } else {
       const mergedChainInfoMap = latestChainInfoMap;
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
-        if (storedSlug in latestChainInfoMap) {
-          // check predefined chains first, keep setting for providers and currentProvider
-          // TODO: review merging providers
+        const chainInfo = latestChainInfoMap[storedSlug];
+
+        // Network is existed on change list
+        // check predefined chains first, keep setting for providers and currentProvider
+        if (chainInfo) {
           // Keep customer provider only
           const providers = {
             ...mergedChainInfoMap[storedSlug].providers
@@ -657,18 +659,20 @@ export class ChainService {
               }
             }
           }
+          const hasProvider = Object.values(providers).length > 0;
+          const canActive = hasProvider && chainInfo.chainStatus === _ChainStatus.ACTIVE;
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: currentProvider,
             slug: storedSlug,
             connectionStatus: _ChainConnectionStatus.DISCONNECTED,
-            active: storedChainInfo.active
+            active: canActive && storedChainInfo.active
           };
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
-            active: storedChainInfo.active,
+            active: canActive && storedChainInfo.active,
             currentProvider: currentProvider
           });
-        } else {
+        } else if (_isCustomChain(storedSlug)) {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
           // only custom chains are left
           // check custom chain duplicated with predefined chain => merge into predefined chain
@@ -715,6 +719,8 @@ export class ChainService {
               currentProvider: storedChainInfo.currentProvider
             });
           }
+        } else {
+          // Todo: Remove chain from storage
         }
       }
 
@@ -743,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) {
@@ -777,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);

package/services/history-service/index.js

@@ -8,7 +8,6 @@ import { historyRecover, HistoryRecoverStatus } from '@subwallet/extension-base/
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { keyring } from '@subwallet/ui-keyring';
 import { BehaviorSubject } from 'rxjs';
-import { fetchMultiChainHistories } from "./subsquid-multi-chain-history.js";
 export class HistoryService {
   historySubject = new BehaviorSubject([]);
   #needRecoveryHistories = {};
@@ -26,10 +25,12 @@ export class HistoryService {
     if (!addresses || addresses.length === 0) {
       return [];
     }
-    const chainMap = this.chainService.getChainInfoMap();
 
     // Query data from subscan or any indexer
-    const historyRecords = await fetchMultiChainHistories(addresses, chainMap);
+    // const chainMap = this.chainService.getChainInfoMap();
+    // const historyRecords = await fetchMultiChainHistories(addresses, chainMap);
+    // Pause deprecated until have new update
+    const historyRecords = [];
 
     // Fill additional info
     const accountMap = Object.entries(this.keyringService.accounts).reduce((map, [address, account]) => {