Skip to content

refactor: split off governance masternode-only logic to GovernanceSigner, drop Relay()s and use periodic relay instead, minor cleanup #6838

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

Merged
PastaPastaPasta merged 14 commits into from
Oct 20, 2025
Merged

refactor: split off governance masternode-only logic to GovernanceSigner, drop Relay()s and use periodic relay instead, minor cleanup #6838

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fefbe27
refactor: replace `Sign` functions with direct activeman call
kwvg Oct 6, 2025
2b74e15
refactor: move masternode mode logic to `governance/signing.cpp`
kwvg Oct 3, 2025
bd6af83
refactor: separate masternode mode logic into dedicated signer class
kwvg Oct 6, 2025
757ded3
refactor: remove need for access to private members
kwvg Oct 6, 2025
63448ff
refactor: abstract away parent implementation from signer
kwvg Sep 12, 2025
3811924
governance: drop `Relay()` from `CGovernance{Object,Vote}`
kwvg Sep 12, 2025
df589c7
governance: introduce task for relaying governance objects
kwvg Oct 6, 2025
e224991
governance: add lock annotations for `cs_relay`
kwvg Sep 7, 2025
4d96f5f
refactor: move `DoMaintenance()` inside `Schedule()`
kwvg Sep 10, 2025
1777919
refactor: use `std::chrono` for governance time constants
kwvg Oct 5, 2025
d19e1f3
fix: add `nullptr` check before using `FindGovernanceObject()` retval
kwvg Oct 4, 2025
c516fd3
refactor: apply review suggestions
kwvg Oct 4, 2025
700e069
refactor: cleanup headers and forward decls
kwvg Oct 6, 2025
b51cd1d
lint: apply most `clang-format` suggestions, update circular allowlist
kwvg Oct 6, 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
1 change: 0 additions & 1 deletion src/coinjoin/coinjoin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class CBlockIndex;
class ChainstateManager;
class CMasternodeSync;
class CTxMemPool;
class TxValidationState;

namespace llmq {
class CChainLocksHandler;
Expand Down
9 changes: 5 additions & 4 deletions src/governance/object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@
#include <governance/object.h>

#include <bls/bls.h>
#include <chainparams.h>
#include <core_io.h>
#include <evo/deterministicmns.h>
#include <governance/governance.h>
#include <governance/validators.h>
#include <index/txindex.h>
#include <masternode/meta.h>
#include <masternode/sync.h>
#include <net_processing.h>

Copy link
Copy Markdown
Collaborator

@knst knst Oct 20, 2025

Choose a reason for hiding this comment

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

nit: it's dash specific code; no need to split "dash" and "non-dash" related includes for easier backporting

#include <chainparams.h>
#include <core_io.h>
#include <index/txindex.h>
#include <logging.h>
#include <timedata.h>
#include <util/time.h>
#include <validation.h>
Expand Down
2 changes: 0 additions & 2 deletions src/governance/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ class CGovernanceObject;
class CGovernanceVote;
class ChainstateManager;
class CMasternodeMetaMan;
class CMasternodeSync;
class CNode;

extern RecursiveMutex cs_main;

Expand Down
1 change: 0 additions & 1 deletion src/governance/signing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <chainparams.h>
#include <logging.h>
#include <timedata.h>
#include <util/check.h>
#include <util/time.h>
#include <validation.h>

Expand Down
5 changes: 3 additions & 2 deletions src/governance/vote.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
#include <governance/vote.h>

#include <bls/bls.h>
#include <chainparams.h>
#include <evo/deterministicmns.h>
#include <evo/dmn_types.h>
#include <masternode/sync.h>
#include <messagesigner.h>
#include <net_processing.h>

#include <chainparams.h>
#include <logging.h>
#include <timedata.h>
#include <util/string.h>

Expand Down
2 changes: 0 additions & 2 deletions src/governance/vote.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
class CBLSPublicKey;
class CDeterministicMNList;
class CGovernanceVote;
class CMasternodeSync;
class CKey;
class CKeyID;

// INTENTION OF MASTERNODES REGARDING ITEM
Expand Down