Skip to content

refactor: drop dependency on net_processing for multiple consensus related objects #6934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 58 commits into
base: develop
Choose a base branch
from
Open

refactor: drop dependency on net_processing for multiple consensus related objects #6934

Show file tree
Hide file tree
Changes from 57 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
6e51477
feat: new abstract handler for net messages
knst Oct 26, 2025
ef09f46
refactor: use NetHandler for InstantSend
knst Oct 27, 2025
d500b50
refactor: stop extra net handlers before Active Signer stopped
knst Oct 27, 2025
f285d0a
part I refactor to net-instantsend
knst Oct 28, 2025
e68b53f
part II refactoring
knst Oct 28, 2025
e8f660c
net-processing - added start/stop/interrupt
knst Oct 28, 2025
8b720db
part III
knst Oct 28, 2025
229eb14
lint - update list of circular dependencies
knst Oct 28, 2025
51ec5ae
fixup crash during RemoveHandlers
knst Oct 28, 2025
6b0fab6
refactor: drop Qman from CInstantSendManager
knst Oct 28, 2025
6199e31
fixup RemoveHandlers
knst Oct 28, 2025
94c893a
add TODO for mempool in instantsend
knst Oct 28, 2025
6c80da6
fix handlers!!!
knst Oct 28, 2025
af72e3b
refactor: use new NetHandler for llmq/signing module. Almost done!
knst Oct 28, 2025
d326c7a
continue implementation for llmq/signing
knst Oct 29, 2025
589a8fb
lint - update circular after llmq/signing breakage
knst Oct 29, 2025
e38ffdc
refactor: move CCoinJoinQueue from coinjoin.h to common.h to drop dep…
knst Oct 29, 2025
ec8568e
Revert "refactor: move CCoinJoinQueue from coinjoin.h to common.h to …
knst Oct 29, 2025
3b94f80
refactor: break governance dependency over net_processing using NetGo…
knst Oct 29, 2025
dcca789
fix: removed duplicated checks if blockchain is synced
knst Oct 30, 2025
c6daa49
Revert "fix: removed duplicated checks if blockchain is synced"
knst Oct 30, 2025
cfa5a40
scheduler - fixups
knst Oct 30, 2025
5363ca2
perf: drop shared_ptr from GetCurrentVotes
knst Oct 30, 2025
bbac29f
refactor: drop unused includes from net.h and test/util/net.h to spee…
knst Oct 30, 2025
08630bb
refactor: rename masternode/sync to node/sync. It does nothing to mas…
knst Oct 30, 2025
b82ee2a
refactor: rename enum MASTERNODE_SYNC_* to NODE_SYNC_*
knst Oct 30, 2025
39127fe
refactor: use NetHandler part II in node/sync
knst Oct 30, 2025
b515a17
more fixes to make it compileable
knst Oct 30, 2025
985bd2a
more fixes + refactor: move DEFAULT_SYNC_MEMPOOL out
knst Oct 30, 2025
d7b5310
refactor: drop useless helper RequestGovernanceObjectVotes (2nd)
knst Oct 30, 2025
a046b8e
fixup for validation.h drop
knst Oct 30, 2025
d4e0247
drop helper FindGovernanceObjectInternal as useless
knst Oct 30, 2025
864adc2
final part net-governance; updated linter exception list
knst Oct 31, 2025
f927bd1
fixup for net_signing - missing cs_main
knst Oct 31, 2025
7ba94f9
refactor: move listener NotifyRecoveredSig from llmq/signing_share to…
knst Oct 31, 2025
7d90325
refactor: move working thread of signing shares to NetSigning
knst Nov 1, 2025
f850345
fix - disable active components while initializing chain for regtest …
knst Nov 1, 2025
a334a7b
refactor: simplify CEHFSignalsHandler::HandleNewRecoveredSig a bit
knst Nov 1, 2025
7e5fe82
refactor: drop dependency of net_processing on llmq/signing_shares by…
knst Nov 1, 2025
06d6dbe
continue refactoring net-processing & signing_shares
knst Nov 1, 2025
716ef84
refactor: move CSigSharesManager::RemoveBannedNodeStates inside NetSi…
knst Nov 1, 2025
7ef08a1
refactor: partially move CSigSharesManager::SignPendingSigShares to N…
knst Nov 2, 2025
a6f342b
refactor: move CSigSharesManager::ProcessPendingSigShares to NetSigning
knst Nov 2, 2025
a542fa0
refactor: removed duplicated code to handle a new recovered sig
knst Nov 2, 2025
dd9c366
refactor: dissolve CSigSharesManager::ProcessPendingSigShares
knst Nov 2, 2025
d3155bc
refactor: final drop of PeerManager from signing_shares + update linters
knst Nov 2, 2025
4af4e76
refactoring: minor cleanup of signing_shares.cpp
knst Nov 2, 2025
9fdcc8d
fixup for net-signing
knst Nov 2, 2025
b4d4e33
refactor: unify CollectPendingSigSharesToVerify and CollectPendingRec…
knst Nov 2, 2025
cf7d9c1
refactor: clean up a bit of duplicated code from signing_shares from …
knst Nov 2, 2025
a3270cf
still unify extra fix
knst Nov 2, 2025
3b101b9
refactor: drop duplicated argument with CSigManager from AsyncSyncIfM…
knst Nov 2, 2025
48e2979
fixup for remove-signing cleanup()
knst Nov 2, 2025
168e183
refactor: drop useless helper that used only once
knst Nov 2, 2025
6949034
refactor: remove duplicated code between ProcessMessageSigSharesInv a…
knst Nov 2, 2025
354c2df
refactor: removed duplicated code for request message for QSIGSHARESI…
knst Nov 2, 2025
d88afaa
one more todo
knst Nov 3, 2025
f1b5240
fixup typo in Makefile.am
knst Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@ BITCOIN_CORE_H = \
masternode/node.h \
masternode/meta.h \
masternode/payments.h \
masternode/sync.h \
masternode/utils.h \
memusage.h \
merkleblock.h \
Expand All @@ -296,6 +295,9 @@ BITCOIN_CORE_H = \
net.h \
net_permissions.h \
net_processing.h \
net_governance.h \
net_instantsend.h \
net_signing.h \
net_types.h \
netaddress.h \
netbase.h \
Expand All @@ -313,6 +315,7 @@ BITCOIN_CORE_H = \
node/miner.h \
node/minisketchwrapper.h \
node/psbt.h \
sync/sync.h \
Copy link

@coderabbitai coderabbitai bot Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

Incorrect header path - should be node/sync.h.

The header path sync/sync.h is inconsistent with the corresponding source file node/sync.cpp added at Line 577 and the include paths used in other files (#include <node/sync.h>).

Apply this diff:

-  sync/sync.h \
+  node/sync.h \
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
sync/sync.h \
node/sync.h \
🤖 Prompt for AI Agents 
In src/Makefile.am around line 318, the listed header path "sync/sync.h" is
incorrect and must match the actual header location used by the source and
includes; update that entry to "node/sync.h" so the Makefile installs/refs the
correct header path and aligns with node/sync.cpp and other files that use
#include <node/sync.h>.

node/transaction.h \
node/txreconciliation.h \
node/interface_ui.h \
Expand Down Expand Up @@ -551,12 +554,14 @@ libbitcoin_node_a_SOURCES = \
masternode/node.cpp \
masternode/meta.cpp \
masternode/payments.cpp \
masternode/sync.cpp \
masternode/utils.cpp \
net.cpp \
netfulfilledman.cpp \
netgroup.cpp \
net_processing.cpp \
net_governance.cpp \
net_instantsend.cpp \
net_signing.cpp \
node/blockstorage.cpp \
node/caches.cpp \
node/chainstate.cpp \
Expand All @@ -569,6 +574,7 @@ libbitcoin_node_a_SOURCES = \
node/miner.cpp \
node/minisketchwrapper.cpp \
node/psbt.cpp \
node/sync.cpp \
node/transaction.cpp \
node/txreconciliation.cpp \
node/interface_ui.cpp \
Expand Down
2 changes: 1 addition & 1 deletion src/chainlock/chainlock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <instantsend/instantsend.h>
#include <llmq/quorums.h>
#include <masternode/sync.h>
#include <node/sync.h>
#include <spork.h>
#include <stats/client.h>

Expand Down
4 changes: 2 additions & 2 deletions src/chainlock/signing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <chainlock/clsig.h>
#include <instantsend/instantsend.h>
#include <llmq/signing_shares.h>
#include <masternode/sync.h>
#include <node/sync.h>
#include <spork.h>

using node::ReadBlockFromDisk;
Expand Down Expand Up @@ -141,7 +141,7 @@ void ChainLockSigner::TrySignChainTip(const llmq::CInstantSendManager& isman)
lastSignedMsgHash = msgHash;
}

m_shareman.AsyncSignIfMember(Params().GetConsensus().llmqTypeChainLocks, m_sigman, requestId, msgHash);
m_shareman.AsyncSignIfMember(Params().GetConsensus().llmqTypeChainLocks, requestId, msgHash);
}

void ChainLockSigner::EraseFromBlockHashTxidMap(const uint256& hash)
Expand Down
2 changes: 1 addition & 1 deletion src/coinjoin/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <core_io.h>
#include <evo/deterministicmns.h>
#include <masternode/meta.h>
#include <masternode/sync.h>
#include <node/sync.h>
#include <net.h>
#include <netmessagemaker.h>
#include <rpc/evo_util.h>
Expand Down
2 changes: 1 addition & 1 deletion src/coinjoin/coinjoin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <bls/bls.h>
#include <chainlock/chainlock.h>
#include <instantsend/instantsend.h>
#include <masternode/sync.h>
#include <node/sync.h>

#include <string>

Expand Down
2 changes: 1 addition & 1 deletion src/coinjoin/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <evo/deterministicmns.h>
#include <masternode/meta.h>
#include <masternode/node.h>
#include <masternode/sync.h>
#include <node/sync.h>
#include <net.h>
#include <netmessagemaker.h>
#include <net_processing.h>
Expand Down
2 changes: 1 addition & 1 deletion src/dsnotificationinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <llmq/dkgsessionmgr.h>
#include <llmq/ehf_signals.h>
#include <llmq/quorums.h>
#include <masternode/sync.h>
#include <node/sync.h>

CDSNotificationInterface::CDSNotificationInterface(CConnman& connman,
CDSTXManager& dstxman,
Expand Down
2 changes: 1 addition & 1 deletion src/evo/mnauth.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <llmq/utils.h>
#include <masternode/meta.h>
#include <masternode/node.h>
#include <masternode/sync.h>
#include <node/sync.h>
#include <net.h>
#include <netmessagemaker.h>
#include <util/time.h>
Expand Down
Loading
Loading