fix: respect SENDDSQUEUE message, move DSQ relay into net processing / peerman #6426
+55
−23
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request has conflicts, please rebase. |
UdjinM6
requested changes
Nov 22, 2024
There was a problem hiding this comment.
[potential_deadlock_detected] POTENTIAL DEADLOCK DETECTED
Previous lock order was:
(2) 'm_nodes_mutex' in net.h:1383 (in thread 'scheduler')
(1) 'm_peer_mutex' in net_processing.cpp:1681 (in thread 'scheduler')
Current lock order is:
'NetEventsInterface::g_msgproc_mutex' in net.cpp:3976 (in thread 'msghand')
(1) 'm_peer_mutex' in net_processing.cpp:2292 (in thread 'msghand')
(2) 'm_nodes_mutex' in net.cpp:5102 (in thread 'msghand')
PastaPastaPasta
force-pushed
the
fix-respect-SendDSQUEUE-message
branch
from
22bad37
to
e97372d
Compare
UdjinM6
reviewed
Nov 22, 2024
…/ peerman in 6148, I broke the functionality where a peer must opt in / opt out of DSQUEUE messages. This was mostly ok, and not immediately detected, as with this bug, simply everyone would receive DSQ messages over inventory (or classically, old proto versions were not affected by this bug). But this still would result in quite a bit of wasted bandwidth for peers which may not care about DSQ at all. This commit should restore the prior functionality, where a node should send the SENDDSQUEUE message if they wish to receive DSQs. Once they've sent that, depending on their protocol version, they will either have the messages pushed to them as available, or on modern protocols, they will thereafter receive DSQs over the inventory system. NOTE: I also refactor the code in this commit, moving some network proccessing into.... wait for it... net_processing.cpp! This allowed us to remove some dependencies in coinjoin.h. DSQ messages are now relayed to peers by calling peer_manager.RelayDSQ
PastaPastaPasta
force-pushed
the
fix-respect-SendDSQUEUE-message
branch
from
e97372d
to
dafa736
Compare
UdjinM6
approved these changes
Nov 23, 2024
kwvg
approved these changes
Nov 25, 2024
knst
approved these changes
Nov 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue being fixed or feature implemented
in #6148, I broke the functionality where a peer must opt in / opt out of DSQUEUE messages. This was mostly ok, and not immediately detected, as with this bug, simply everyone would receive DSQ messages over inventory (or classically, old proto versions were not affected by this bug). But this still would result in quite a bit of wasted bandwidth for peers which may not care about DSQ at all.
What was done?
This commit should restore the prior functionality, where a node should send the SENDDSQUEUE message if they wish to receive DSQs. Once they've sent that, depending on their protocol version, they will either have the messages pushed to them as available, or on modern protocols, they will thereafter receive DSQs over the inventory system.
NOTE: I also refactor the code in this commit, moving some network proccessing into.... wait for it... net_processing.cpp! This allowed us to remove some dependencies in coinjoin.h. DSQ messages are now relayed to peers by calling peer_manager.RelayDSQ
How Has This Been Tested?
I have not yet mixed on testnet with this; we should include it in rc.2 and test
Breaking Changes
Slightly breaking for v22.0.x (so rc.1), as they in theory could be relying on this new logic of always receiving the DSQ inv. But I don't think anyone besides core is using this new protocol.
Checklist:
Go over all the following points, and put an
xin all the boxes that apply.