diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 17ef95b847668..619987d0cc6ab 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -2806,9 +2806,10 @@ bool ProcessMessage(CNode* pfrom, const std::string& msg_type, CDataStream& vRec connman->PushMessage(pfrom, msgMaker.Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion)); } - // Tell our peer that he should send us CoinJoin queue messages if (!fBlocksOnly) { + // Tell our peer that he should send us CoinJoin queue messages connman->PushMessage(pfrom, msgMaker.Make(NetMsgType::SENDDSQUEUE, true)); + // Tell our peer that he should send us intra-quorum messages if (llmq::CLLMQUtils::IsWatchQuorumsEnabled() && !pfrom->m_masternode_connection) { connman->PushMessage(pfrom, msgMaker.Make(NetMsgType::QWATCH)); } diff --git a/src/protocol.cpp b/src/protocol.cpp index 45f9782ff8787..8a839d5f33eda 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -174,6 +174,12 @@ const static std::string allNetMessageTypes[] = { NetMsgType::HEADERS2}; const static std::vector allNetMessageTypesVec(allNetMessageTypes, allNetMessageTypes+ARRAYLEN(allNetMessageTypes)); +/** Message types that are not allowed by blocks-relay-only policy. + * We do not want most of CoinJoin, DKG or LLMQ signing messages to be relayed + * to/from nodes via connections that were established in this mode. + * Make sure to keep this list up to date whenever a new message type is added. + * NOTE: Unlike the list above, this list is sorted alphabetically. + */ const static std::string netMessageTypesViolateBlocksOnly[] = { NetMsgType::DSACCEPT, NetMsgType::DSCOMPLETE,