Bail out in few more places when blockchain is not synced yet (PIVX-P…

…roject#2888) * Bail out in few more places when blockchain is not synced yet * Apply review suggestion
panleone · Nov 10, 2024 · d9603ef · d9603ef
1 parent 08f29ba
commit d9603ef
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
@@ -15,6 +15,7 @@
 #include "quorums_commitment.h"
 #include "quorums_dkgsessionmgr.h"
 #include "shutdown.h"
+#include "tiertwo/tiertwo_sync_state.h"
 #include "univalue.h"
 #include "validation.h"
 
@@ -165,7 +166,7 @@ CQuorumManager::CQuorumManager(CEvoDB& _evoDb, CBLSWorker& _blsWorker, CDKGSessi
 
 void CQuorumManager::UpdatedBlockTip(const CBlockIndex* pindexNew, bool fInitialDownload)
 {
-    if (fInitialDownload || !activeMasternodeManager || !deterministicMNManager->IsDIP3Enforced(pindexNew->nHeight)) {
+    if (!g_tiertwo_sync_state.IsBlockchainSynced() || !activeMasternodeManager) {
         return;
     }
 

diff --git a/src/llmq/quorums_chainlocks.cpp b/src/llmq/quorums_chainlocks.cpp
@@ -13,6 +13,7 @@
 #include "scheduler.h"
 #include "spork.h"
 #include "sporkid.h"
+#include "tiertwo/tiertwo_sync_state.h"
 #include "validation.h"
 
 namespace llmq
@@ -207,15 +208,20 @@ void CChainLocksHandler::TrySignChainTip()
 {
     Cleanup();
 
+    if (!fMasterNode) {
+        return;
+    }
+
+    if (!g_tiertwo_sync_state.IsBlockchainSynced()) {
+        return;
+    }
+
     const CBlockIndex* pindex;
     {
         LOCK(cs_main);
         pindex = chainActive.Tip();
     }
 
-    if (!fMasterNode) {
-        return;
-    }
     if (!pindex->pprev) {
         return;
     }
@@ -440,6 +446,10 @@ bool CChainLocksHandler::InternalHasConflictingChainLock(int nHeight, const uint
 
 void CChainLocksHandler::Cleanup()
 {
+    if (!g_tiertwo_sync_state.IsBlockchainSynced()) {
+        return;
+    }
+
     {
         LOCK(cs);
         if (GetTimeMillis() - lastCleanupTime < CLEANUP_INTERVAL) {