Skip to content

Commit 591b018

Browse files
authored
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
1 parent c360237 commit 591b018

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

src/llmq/quorums_chainlocks.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void CChainLocksHandler::ProcessNewChainLock(NodeId from, const llmq::CChainLock
131131
bestChainLock = clsig;
132132

133133
CInv inv(MSG_CLSIG, hash);
134-
g_connman->RelayInv(inv);
134+
g_connman->RelayInv(inv, LLMQS_PROTO_VERSION);
135135

136136
auto blockIt = mapBlockIndex.find(clsig.blockHash);
137137
if (blockIt == mapBlockIndex.end()) {

src/llmq/quorums_instantsend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ void CInstantSendManager::ProcessInstantSendLock(NodeId from, const uint256& has
673673
}
674674

675675
CInv inv(MSG_ISLOCK, hash);
676-
g_connman->RelayInv(inv);
676+
g_connman->RelayInv(inv, LLMQS_PROTO_VERSION);
677677

678678
RemoveMempoolConflictsForLock(hash, islock);
679679
RetryLockTxs(islock.txid);

src/llmq/quorums_signing.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ void CSigningManager::ProcessRecoveredSig(NodeId nodeId, const CRecoveredSig& re
519519
}
520520

521521
CInv inv(MSG_QUORUM_RECOVERED_SIG, recoveredSig.GetHash());
522-
g_connman->RelayInv(inv);
522+
g_connman->RelayInv(inv, LLMQS_PROTO_VERSION);
523523

524524
for (auto& l : listeners) {
525525
l->HandleNewRecoveredSig(recoveredSig);

src/version.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313

14-
static const int PROTOCOL_VERSION = 70213;
14+
static const int PROTOCOL_VERSION = 70214;
1515

1616
//! initial proto version, to be increased after version/verack negotiation
1717
static const int INIT_PROTO_VERSION = 209;
@@ -47,4 +47,7 @@ static const int SHORT_IDS_BLOCKS_VERSION = 70209;
4747
//! introduction of DIP3/deterministic masternodes
4848
static const int DMN_PROTO_VERSION = 70213;
4949

50+
//! introduction of LLMQs
51+
static const int LLMQS_PROTO_VERSION = 70214;
52+
5053
#endif // BITCOIN_VERSION_H

0 commit comments

Comments
 (0)