@subwallet/extension-base 1.1.33-beta.3 → 1.1.35-0

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

@@ -11,9 +11,8 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _amplitude = require("@subwallet/extension-base/koni/api/staking/bonding/amplitude");
 var _astar = require("@subwallet/extension-base/koni/api/staking/bonding/astar");
 var _paraChain = require("@subwallet/extension-base/koni/api/staking/bonding/paraChain");
+var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _constants = require("@subwallet/extension-base/services/earning-service/constants");
-var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
@@ -27,10 +26,14 @@ function getSingleStakingAmplitude(substrateApi, address, chainInfoMap, chain, s
     if (_constants._STAKING_CHAIN_GROUP.krest_network.includes(chain)) {
       const krestDelegatorState = _delegatorState.toPrimitive();
       const delegates = krestDelegatorState === null || krestDelegatorState === void 0 ? void 0 : krestDelegatorState.delegations;
-      delegatorState = delegatorState.concat(delegates);
+      if (delegates) {
+        delegatorState = delegatorState.concat(delegates);
+      }
     } else {
       const delegate = _delegatorState.toPrimitive();
-      delegatorState.push(delegate);
+      if (delegate) {
+        delegatorState.push(delegate);
+      }
     }
     const unstakingInfo = _unstaking.toPrimitive();
     const {
@@ -54,7 +57,7 @@ function getSingleStakingAmplitude(substrateApi, address, chainInfoMap, chain, s
         chain,
         type: _KoniTypes.StakingType.NOMINATED,
         address: owner,
-        status: _types.EarningStatus.NOT_STAKING,
+        status: _KoniTypes.StakingStatus.NOT_STAKING,
         activeStake: '0',
         nominations: [],
         unstakings: []
@@ -105,10 +108,14 @@ function getMultiStakingAmplitude(substrateApi, useAddresses, chainInfoMap, chai
         if (_constants._STAKING_CHAIN_GROUP.krest_network.includes(chain)) {
           const krestDelegatorState = _delegatorState.toPrimitive();
           const delegates = krestDelegatorState === null || krestDelegatorState === void 0 ? void 0 : krestDelegatorState.delegations;
-          delegatorState = delegatorState.concat(delegates);
+          if (delegates) {
+            delegatorState = delegatorState.concat(delegates);
+          }
         } else {
           const delegate = _delegatorState.toPrimitive();
-          delegatorState.push(delegate);
+          if (delegate) {
+            delegatorState.push(delegate);
+          }
         }
         const unstakingInfo = _unstakingStates[i].toPrimitive();
         if (!delegatorState && !unstakingInfo) {
@@ -128,7 +135,7 @@ function getMultiStakingAmplitude(substrateApi, useAddresses, chainInfoMap, chai
             chain,
             type: _KoniTypes.StakingType.NOMINATED,
             address: owner,
-            status: _types.EarningStatus.NOT_STAKING,
+            status: _KoniTypes.StakingStatus.NOT_STAKING,
             activeStake: '0',
             nominations: [],
             unstakings: []
@@ -251,7 +258,7 @@ function getParaStakingOnChain(substrateApi, useAddresses, chainInfoMap, chain,
             chain,
             type: _KoniTypes.StakingType.NOMINATED,
             address: owner,
-            status: _types.EarningStatus.NOT_STAKING,
+            status: _KoniTypes.StakingStatus.NOT_STAKING,
             activeStake: '0',
             nominations: [],
             unstakings: []
@@ -311,7 +318,7 @@ function getAstarStakingOnChain(substrateApi, useAddresses, chainInfoMap, chain,
             chain,
             type: _KoniTypes.StakingType.NOMINATED,
             address: owner,
-            status: _types.EarningStatus.NOT_STAKING,
+            status: _KoniTypes.StakingStatus.NOT_STAKING,
             activeStake: '0',
             nominations: [],
             unstakings: []

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

@@ -9,7 +9,6 @@ exports.getRelayStakingOnChain = getRelayStakingOnChain;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _relayChain = require("@subwallet/extension-base/koni/api/staking/bonding/relayChain");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
@@ -60,7 +59,7 @@ function getRelayStakingOnChain(substrateApi, useAddresses, chainInfoMap, chain,
           nominatorStateCallback({
             chain,
             type: _KoniTypes.StakingType.NOMINATED,
-            status: _types.EarningStatus.NOT_STAKING,
+            status: _KoniTypes.StakingStatus.NOT_STAKING,
             address: owner,
             activeStake: '0',
             nominations: [],
@@ -123,7 +122,7 @@ function getRelayPoolingOnChain(substrateApi, useAddresses, chainInfoMap, chain,
             chain,
             type: _KoniTypes.StakingType.POOLED,
             address: owner,
-            status: _types.EarningStatus.NOT_STAKING,
+            status: _KoniTypes.StakingStatus.NOT_STAKING,
             activeStake: '0',
             nominations: [],
             // can only join 1 pool at a time

package/cjs/koni/background/cron.js

@@ -8,6 +8,7 @@ var _constants = require("@subwallet/extension-base/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _rxjs = require("rxjs");
+var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -17,6 +18,7 @@ class KoniCron {
     this.subscriptions = subscriptions;
     this.dbService = dbService;
     this.state = state;
+    this.logger = (0, _util.logger)('Cron');
     // this.init();
   }
 
@@ -92,18 +94,18 @@ class KoniCron {
 
       // MantaPay
       reloadMantaPay && this.removeCron('syncMantaPay');
-      commonReload && this.removeCron('refreshPoolingStakingReward');
 
       // NFT
       (commonReload || needUpdateNft) && this.resetNft(address);
       (commonReload || needUpdateNft) && this.removeCron('refreshNft');
-      commonReload && this.removeCron('refreshPoolingStakingReward');
 
       // Chains
       if (this.checkNetworkAvailable(serviceInfo)) {
-        // only add cron jobs if there's at least 1 active network
+        // only add cron job if there's at least 1 active network
         (commonReload || needUpdateNft) && this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
         reloadMantaPay && this.addCron('syncMantaPay', this.syncMantaPay, _constants.CRON_SYNC_MANTA_PAY);
+      } else {
+        this.setStakingRewardReady();
       }
     };
     this.state.eventService.onLazy(this.eventHandler);
@@ -114,7 +116,10 @@ class KoniCron {
       this.resetNft(currentAccountInfo.address);
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
       // this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
+      this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
       this.addCron('syncMantaPay', this.syncMantaPay, _constants.CRON_SYNC_MANTA_PAY);
+    } else {
+      this.setStakingRewardReady();
     }
     this.status = 'running';
   };
@@ -149,6 +154,19 @@ class KoniCron {
   resetNft = newAddress => {
     this.state.resetNft(newAddress);
   };
+  refreshStakingReward = address => {
+    return () => {
+      this.subscriptions.subscribeStakingReward(address).catch(this.logger.error);
+    };
+  };
+  refreshStakingRewardFastInterval = address => {
+    return () => {
+      this.subscriptions.subscribeStakingRewardFastInterval(address).catch(this.logger.error);
+    };
+  };
+  setStakingRewardReady = () => {
+    this.state.updateStakingRewardReady(true);
+  };
   checkNetworkAvailable = serviceInfo => {
     return Object.keys(serviceInfo.chainApiMap.substrate).length > 0 || Object.keys(serviceInfo.chainApiMap.evm).length > 0;
   };