Merge remote-tracking branch 'refs/remotes/origin/subwallet-dev' into webapp-dev

saltict · saltict · commit 411bb18f6f85 · 2024-05-22T14:35:07.000+07:00
diff --git a/package.json b/package.json
@@ -91,7 +91,7 @@
     "@polkadot/types-codec": "^11.0.3",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
-    "@subwallet/chain-list": "0.2.62",
+    "@subwallet/chain-list": "0.2.63",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/react-ui": "5.1.2-b77",
     "@subwallet/ui-keyring": "^0.1.5",
diff --git a/packages/extension-base/package.json b/packages/extension-base/package.json
@@ -51,7 +51,7 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.62",
+    "@subwallet/chain-list": "0.2.63",
     "@subwallet/extension-base": "^1.1.66-0",
     "@subwallet/extension-chains": "^1.1.66-0",
     "@subwallet/extension-dapp": "^1.1.66-0",
diff --git a/packages/extension-base/src/koni/background/cron.ts b/packages/extension-base/src/koni/background/cron.ts
@@ -3,7 +3,7 @@
 
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { ApiMap, ServiceInfo } from '@subwallet/extension-base/background/KoniTypes';
-import { CRON_REFRESH_NFT_INTERVAL, CRON_SYNC_MANTA_PAY } from '@subwallet/extension-base/constants';
+import { CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_NFT_INTERVAL, CRON_SYNC_MANTA_PAY } from '@subwallet/extension-base/constants';
 import { KoniSubscription } from '@subwallet/extension-base/koni/background/subscription';
 import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
 import { EventItem, EventType } from '@subwallet/extension-base/services/event-service/types';
@@ -129,6 +129,12 @@ export class KoniCron {
       (commonReload || needUpdateNft) && this.removeCron('refreshNft');
       commonReload && this.removeCron('refreshPoolingStakingReward');
 
+      if (chainUpdated) {
+        this.stopPoolInfo();
+        this.removeCron('fetchPoolInfo');
+        this.addCron('fetchPoolInfo', this.fetchPoolInfo, CRON_REFRESH_CHAIN_STAKING_METADATA);
+      }
+
       // Chains
       if (this.checkNetworkAvailable(serviceInfo)) { // only add cron jobs if there's at least 1 active network
         (commonReload || needUpdateNft) && this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
@@ -138,6 +144,8 @@ export class KoniCron {
 
     this.state.eventService.onLazy(this.eventHandler);
 
+    this.addCron('fetchPoolInfo', this.fetchPoolInfo, CRON_REFRESH_CHAIN_STAKING_METADATA);
+
     if (!currentAccountInfo?.address) {
       return;
     }
@@ -169,6 +177,7 @@ export class KoniCron {
     }
 
     this.removeAllCrons();
+    this.stopPoolInfo();
 
     this.status = 'stopped';
 
@@ -181,6 +190,14 @@ export class KoniCron {
     }
   };
 
+  fetchPoolInfo = () => {
+    this.state.earningService.runSubscribePoolsInfo().catch(console.error);
+  };
+
+  stopPoolInfo = () => {
+    this.state.earningService.runUnsubscribePoolsInfo();
+  };
+
   refreshNft = (address: string, apiMap: ApiMap, smartContractNfts: _ChainAsset[], chainInfoMap: Record<string, _ChainInfo>) => {
     return () => {
       this.subscriptions.subscribeNft(address, apiMap.substrate, apiMap.evm, smartContractNfts, chainInfoMap);
diff --git a/packages/extension-base/src/services/earning-service/service.ts b/packages/extension-base/src/services/earning-service/service.ts
@@ -244,7 +244,7 @@ export default class EarningService implements StoppableServiceInterface, Persis
     this.status = ServiceStatus.STARTING;
 
     // Start subscribe pools' info
-    await this.runSubscribePoolsInfo();
+    // await this.runSubscribePoolsInfo();
 
     // Start subscribe pools' position
     await this.runSubscribePoolsPosition();
@@ -276,7 +276,7 @@ export default class EarningService implements StoppableServiceInterface, Persis
     await this.persistData();
 
     // Stop subscribe pools' info
-    this.runUnsubscribePoolsInfo();
+    // this.runUnsubscribePoolsInfo();
 
     // Stop subscribe pools' position
     this.runUnsubscribePoolsPosition();
diff --git a/packages/extension-koni-ui/package.json b/packages/extension-koni-ui/package.json
@@ -34,7 +34,7 @@
     "@polkadot/util-crypto": "^12.6.2",
     "@ramonak/react-progress-bar": "^5.0.3",
     "@reduxjs/toolkit": "^1.9.1",
-    "@subwallet/chain-list": "0.2.62",
+    "@subwallet/chain-list": "0.2.63",
     "@subwallet/extension-base": "^1.1.66-0",
     "@subwallet/extension-chains": "^1.1.66-0",
     "@subwallet/extension-dapp": "^1.1.66-0",
diff --git a/packages/extension-koni-ui/src/hooks/common/useGetChainSlugsByCurrentAccount.ts b/packages/extension-koni-ui/src/hooks/common/useGetChainSlugsByCurrentAccount.ts
@@ -3,7 +3,7 @@
 
 import type { KeypairType } from '@polkadot/util-crypto/types';
 
-import { _ChainInfo } from '@subwallet/chain-list/types';
+import { _ChainInfo, _ChainStatus } from '@subwallet/chain-list/types';
 import { AccountJson } from '@subwallet/extension-base/background/types';
 import { _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { RootState } from '@subwallet/extension-koni-ui/stores';
@@ -18,7 +18,11 @@ import { isEthereumAddress } from '@polkadot/util-crypto';
 function getChainsAccountType (accountType: AccountType, chainInfoMap: Record<string, _ChainInfo>, accountNetworks?: string[]): string[] {
   const result: string[] = [];
 
-  Object.keys(chainInfoMap).forEach((chain) => {
+  for (const [chain, { chainStatus }] of Object.entries(chainInfoMap)) {
+    if (chainStatus !== _ChainStatus.ACTIVE) {
+      continue;
+    }
+
     if (accountNetworks) {
       if (accountNetworks.includes(chain)) {
         result.push(chain);
@@ -36,7 +40,7 @@ function getChainsAccountType (accountType: AccountType, chainInfoMap: Record<st
         }
       }
     }
-  });
+  }
 
   return result;
 }
diff --git a/packages/extension-web-ui/package.json b/packages/extension-web-ui/package.json
@@ -35,7 +35,7 @@
     "@polkadot/util-crypto": "^12.6.2",
     "@ramonak/react-progress-bar": "^5.0.3",
     "@reduxjs/toolkit": "^1.9.1",
-    "@subwallet/chain-list": "0.2.62",
+    "@subwallet/chain-list": "0.2.63",
     "@subwallet/extension-base": "^1.1.66-0",
     "@subwallet/extension-chains": "^1.1.66-0",
     "@subwallet/extension-dapp": "^1.1.66-0",
diff --git a/packages/extension-web-ui/src/hooks/common/useGetChainSlugsByCurrentAccount.ts b/packages/extension-web-ui/src/hooks/common/useGetChainSlugsByCurrentAccount.ts
@@ -3,7 +3,7 @@
 
 import type { KeypairType } from '@polkadot/util-crypto/types';
 
-import { _ChainInfo } from '@subwallet/chain-list/types';
+import { _ChainInfo, _ChainStatus } from '@subwallet/chain-list/types';
 import { AccountJson } from '@subwallet/extension-base/background/types';
 import { _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { RootState } from '@subwallet/extension-web-ui/stores';
@@ -18,7 +18,11 @@ import { isEthereumAddress } from '@polkadot/util-crypto';
 function getChainsAccountType (accountType: AccountType, chainInfoMap: Record<string, _ChainInfo>, accountNetworks?: string[]): string[] {
   const result: string[] = [];
 
-  Object.keys(chainInfoMap).forEach((chain) => {
+  for (const [chain, { chainStatus }] of Object.entries(chainInfoMap)) {
+    if (chainStatus !== _ChainStatus.ACTIVE) {
+      continue;
+    }
+
     if (accountNetworks) {
       if (accountNetworks.includes(chain)) {
         result.push(chain);
@@ -36,7 +40,7 @@ function getChainsAccountType (accountType: AccountType, chainInfoMap: Record<st
         }
       }
     }
-  });
+  }
 
   return result;
 }
diff --git a/packages/webapp/package.json b/packages/webapp/package.json
@@ -49,4 +49,4 @@
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.0.4"
   }
-}
+}
diff --git a/yarn.lock b/yarn.lock
@@ -6130,14 +6130,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@subwallet/chain-list@npm:0.2.62":
-  version: 0.2.62
-  resolution: "@subwallet/chain-list@npm:0.2.62"
+"@subwallet/chain-list@npm:0.2.63":
+  version: 0.2.63
+  resolution: "@subwallet/chain-list@npm:0.2.63"
   dependencies:
     "@polkadot/dev": 0.67.167
     "@polkadot/util": ^12.5.1
     eventemitter3: ^5.0.1
-  checksum: e3291cef981e99fdb43068c246dd0b0fc0a6e13dc49577e9353ba644b84835d96252b4fde5f0609f66cdff1698c21d893c1115ab929cc16a62e67ac44639fc58
+  checksum: 2329276f361d12f44ae457b626d790bb995533cbb0af4dc89e06e36bb22fa30fca994d2f7100df9bbea605a535b4a7f4ecedd1a3ff985693189f546a1fe2bc4a
   languageName: node
   linkType: hard
 
@@ -6176,7 +6176,7 @@ __metadata:
     "@reduxjs/toolkit": ^1.9.1
     "@sora-substrate/type-definitions": ^1.17.7
     "@substrate/connect": ^0.8.9
-    "@subwallet/chain-list": 0.2.62
+    "@subwallet/chain-list": 0.2.63
     "@subwallet/extension-base": ^1.1.66-0
     "@subwallet/extension-chains": ^1.1.66-0
     "@subwallet/extension-dapp": ^1.1.66-0
@@ -6307,7 +6307,7 @@ __metadata:
     "@polkadot/util-crypto": ^12.6.2
     "@ramonak/react-progress-bar": ^5.0.3
     "@reduxjs/toolkit": ^1.9.1
-    "@subwallet/chain-list": 0.2.62
+    "@subwallet/chain-list": 0.2.63
     "@subwallet/extension-base": ^1.1.66-0
     "@subwallet/extension-chains": ^1.1.66-0
     "@subwallet/extension-dapp": ^1.1.66-0
@@ -6440,7 +6440,7 @@ __metadata:
     "@polkadot/util-crypto": ^12.6.2
     "@ramonak/react-progress-bar": ^5.0.3
     "@reduxjs/toolkit": ^1.9.1
-    "@subwallet/chain-list": 0.2.62
+    "@subwallet/chain-list": 0.2.63
     "@subwallet/extension-base": ^1.1.66-0
     "@subwallet/extension-chains": ^1.1.66-0
     "@subwallet/extension-dapp": ^1.1.66-0

Original file line number	Diff line number	Diff line change
`@@ -49,4 +49,4 @@`
`49`	`49`	`"webpack-cli": "^5.1.4",`
`50`	`50`	`"webpack-dev-server": "^5.0.4"`
`51`	`51`	`}`
`52`		`-}`
	`52`	`+}`