Bump proto version and only send LLMQ related messages to v14 nodes (#…

…2780) * Bump PROTOCOL_VERSION to 70214 * Introduce LLMQS_PROTO_VERSION to avoid relaying to old nodes
dashpay · Mar 20, 2019 · 591b018 · 591b018
1 parent c360237
commit 591b018
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/llmq/quorums_chainlocks.cpp b/src/llmq/quorums_chainlocks.cpp
@@ -131,7 +131,7 @@ void CChainLocksHandler::ProcessNewChainLock(NodeId from, const llmq::CChainLock
         bestChainLock = clsig;
 
         CInv inv(MSG_CLSIG, hash);
-        g_connman->RelayInv(inv);
+        g_connman->RelayInv(inv, LLMQS_PROTO_VERSION);
 
         auto blockIt = mapBlockIndex.find(clsig.blockHash);
         if (blockIt == mapBlockIndex.end()) {

diff --git a/src/llmq/quorums_instantsend.cpp b/src/llmq/quorums_instantsend.cpp
@@ -673,7 +673,7 @@ void CInstantSendManager::ProcessInstantSendLock(NodeId from, const uint256& has
     }
 
     CInv inv(MSG_ISLOCK, hash);
-    g_connman->RelayInv(inv);
+    g_connman->RelayInv(inv, LLMQS_PROTO_VERSION);
 
     RemoveMempoolConflictsForLock(hash, islock);
     RetryLockTxs(islock.txid);

diff --git a/src/llmq/quorums_signing.cpp b/src/llmq/quorums_signing.cpp
@@ -519,7 +519,7 @@ void CSigningManager::ProcessRecoveredSig(NodeId nodeId, const CRecoveredSig& re
     }
 
     CInv inv(MSG_QUORUM_RECOVERED_SIG, recoveredSig.GetHash());
-    g_connman->RelayInv(inv);
+    g_connman->RelayInv(inv, LLMQS_PROTO_VERSION);
 
     for (auto& l : listeners) {
         l->HandleNewRecoveredSig(recoveredSig);

diff --git a/src/version.h b/src/version.h
@@ -11,7 +11,7 @@
  */
 
 
-static const int PROTOCOL_VERSION = 70213;
+static const int PROTOCOL_VERSION = 70214;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -47,4 +47,7 @@ static const int SHORT_IDS_BLOCKS_VERSION = 70209;
 //! introduction of DIP3/deterministic masternodes
 static const int DMN_PROTO_VERSION = 70213;
 
+//! introduction of LLMQs
+static const int LLMQS_PROTO_VERSION = 70214;
+
 #endif // BITCOIN_VERSION_H