Introduce SPORK_18_QUORUM_DEBUG_ENABLED to enable/disable LLMQ debug …

…messages
dashpay · Jan 9, 2019 · 352edbd · 352edbd
1 parent 324406b
commit 352edbd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/src/llmq/quorums_debug.cpp b/src/llmq/quorums_debug.cpp
@@ -9,6 +9,7 @@
 #include "net.h"
 #include "net_processing.h"
 #include "scheduler.h"
+#include "spork.h"
 #include "validation.h"
 
 #include "evo/deterministicmns.h"
@@ -121,6 +122,10 @@ CDKGDebugManager::CDKGDebugManager(CScheduler* scheduler)
 
 void CDKGDebugManager::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
 {
+    if (!sporkManager.IsSporkActive(SPORK_18_QUORUM_DEBUG_ENABLED)) {
+        return;
+    }
+
     if (strCommand == NetMsgType::QDEBUGSTATUS) {
         CDKGDebugStatus status;
         vRecv >> status;
@@ -237,6 +242,11 @@ UniValue CDKGDebugStatus::ToJson(int detailLevel) const
 bool CDKGDebugManager::AlreadyHave(const CInv& inv)
 {
     LOCK(cs);
+
+    if (!sporkManager.IsSporkActive(SPORK_18_QUORUM_DEBUG_ENABLED)) {
+        return true;
+    }
+
     return statuses.count(inv.hash) != 0;
 }
 
@@ -320,6 +330,9 @@ void CDKGDebugManager::SendLocalStatus()
     if (activeMasternodeInfo.proTxHash.IsNull()) {
         return;
     }
+    if (!sporkManager.IsSporkActive(SPORK_18_QUORUM_DEBUG_ENABLED)) {
+        return;
+    }
 
     CDKGDebugStatus status;
     {

diff --git a/src/spork.cpp b/src/spork.cpp
@@ -26,6 +26,7 @@ std::map<int, int64_t> mapSporkDefaults = {
     {SPORK_12_RECONSIDER_BLOCKS,             0},             // 0 BLOCKS
     {SPORK_16_INSTANTSEND_AUTOLOCKS,         4070908800ULL}, // OFF
     {SPORK_17_QUORUM_DKG_ENABLED,            4070908800ULL}, // OFF
+    {SPORK_18_QUORUM_DEBUG_ENABLED,          4070908800ULL}, // OFF
 };
 
 bool CSporkManager::SporkValueIsActive(int nSporkID, int64_t &nActiveValueRet) const
@@ -285,6 +286,7 @@ int CSporkManager::GetSporkIDByName(const std::string& strName)
     if (strName == "SPORK_12_RECONSIDER_BLOCKS")                return SPORK_12_RECONSIDER_BLOCKS;
     if (strName == "SPORK_16_INSTANTSEND_AUTOLOCKS")            return SPORK_16_INSTANTSEND_AUTOLOCKS;
     if (strName == "SPORK_17_QUORUM_DKG_ENABLED")               return SPORK_17_QUORUM_DKG_ENABLED;
+    if (strName == "SPORK_18_QUORUM_DEBUG_ENABLED")             return SPORK_18_QUORUM_DEBUG_ENABLED;
 
     LogPrint("spork", "CSporkManager::GetSporkIDByName -- Unknown Spork name '%s'\n", strName);
     return -1;
@@ -301,6 +303,7 @@ std::string CSporkManager::GetSporkNameByID(int nSporkID)
         case SPORK_12_RECONSIDER_BLOCKS:                return "SPORK_12_RECONSIDER_BLOCKS";
         case SPORK_16_INSTANTSEND_AUTOLOCKS:            return "SPORK_16_INSTANTSEND_AUTOLOCKS";
         case SPORK_17_QUORUM_DKG_ENABLED:               return "SPORK_17_QUORUM_DKG_ENABLED";
+        case SPORK_18_QUORUM_DEBUG_ENABLED:             return "SPORK_18_QUORUM_DEBUG_ENABLED";
         default:
             LogPrint("spork", "CSporkManager::GetSporkNameByID -- Unknown Spork ID %d\n", nSporkID);
             return "Unknown";

diff --git a/src/spork.h b/src/spork.h
@@ -25,9 +25,10 @@ static const int SPORK_9_SUPERBLOCKS_ENABLED                            = 10008;
 static const int SPORK_12_RECONSIDER_BLOCKS                             = 10011;
 static const int SPORK_16_INSTANTSEND_AUTOLOCKS                         = 10015;
 static const int SPORK_17_QUORUM_DKG_ENABLED                            = 10016;
+static const int SPORK_18_QUORUM_DEBUG_ENABLED                          = 10017;
 
 static const int SPORK_START                                            = SPORK_2_INSTANTSEND_ENABLED;
-static const int SPORK_END                                              = SPORK_17_QUORUM_DKG_ENABLED;
+static const int SPORK_END                                              = SPORK_18_QUORUM_DEBUG_ENABLED;
 
 extern std::map<int, int64_t> mapSporkDefaults;
 extern CSporkManager sporkManager;