Skip to content

Commit d4202b5

Browse files
Merge #6761: refactor: move ChainLocks impl. to src/chainlock/ and split masternode logic out of manager source
fd8af9c refactor: abstract away ChainLocks parent implementation from signer (Kittywhiskers Van Gogh) 733f7d3 refactor: remove `Internal*()` function definitions, consolidate (Kittywhiskers Van Gogh) e742b7b refactor: remove need for mutual access to private members (Kittywhiskers Van Gogh) 74c1b28 refactor: separate masternode mode logic into dedicated manager class (Kittywhiskers Van Gogh) f469c46 refactor: inline single-use `ChainLocksSigningEnabled()` definition (Kittywhiskers Van Gogh) 7e0a3f8 refactor: move masternode mode logic to `chainlock/signer.{cpp,h}` (Kittywhiskers Van Gogh) 5663eac refactor: split `Cleanup()`'s masternode and non-masternode concerns (Kittywhiskers Van Gogh) ef15fee refactor: cleanup `src/chainlock/clsig.*`, move to dedicated namespace (Kittywhiskers Van Gogh) 021062c refactor: `llmq/chainlocks.{cpp,h}` > `chainlock/chainlock.{cpp,h}` (Kittywhiskers Van Gogh) f10912b refactor: `llmq/clsig.{cpp,h}` > `chainlock/clsig.{cpp,h}` (Kittywhiskers Van Gogh) Pull request description: ## Additional Information A continuation of [dash#6742](#6742), this pull request extends the same refactoring to ChainLocks, separating its masternode mode functionality to a dedicated signer object and migrating some definitions to the newly created `chainlock` namespace. Changes are mostly move-only except for decoupling, which should be behavior-identical. ## Breaking Changes None expected. ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK fd8af9c Tree-SHA512: b9de697d2c3d762824449972ce206ccfca9d878a9a8c1cf38efdb9223ee563dd7305a00ebd80ddb09bc8805133b8b5e45fbbc5e472d23b4bd710454c1048be22
2 parents a8f470a + fd8af9c commit d4202b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+662
-507
lines changed

src/Makefile.am

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ BITCOIN_CORE_H = \
150150
cachemultimap.h \
151151
blockfilter.h \
152152
chain.h \
153+
chainlock/chainlock.h \
154+
chainlock/clsig.h \
155+
chainlock/signing.h \
153156
chainparams.h \
154157
chainparamsbase.h \
155158
chainparamsseeds.h \
@@ -239,8 +242,6 @@ BITCOIN_CORE_H = \
239242
key_io.h \
240243
limitedmap.h \
241244
llmq/blockprocessor.h \
242-
llmq/chainlocks.h \
243-
llmq/clsig.h \
244245
llmq/commitment.h \
245246
llmq/context.h \
246247
llmq/debug.h \
@@ -456,6 +457,9 @@ libbitcoin_node_a_SOURCES = \
456457
blockencodings.cpp \
457458
blockfilter.cpp \
458459
chain.cpp \
460+
chainlock/chainlock.cpp \
461+
chainlock/clsig.cpp \
462+
chainlock/signing.cpp \
459463
coinjoin/coinjoin.cpp \
460464
coinjoin/context.cpp \
461465
coinjoin/server.cpp \
@@ -499,8 +503,6 @@ libbitcoin_node_a_SOURCES = \
499503
instantsend/lock.cpp \
500504
instantsend/signing.cpp \
501505
llmq/blockprocessor.cpp \
502-
llmq/chainlocks.cpp \
503-
llmq/clsig.cpp \
504506
llmq/commitment.cpp \
505507
llmq/context.cpp \
506508
llmq/debug.cpp \

src/bench/rpc_blockchain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#include <bench/bench.h>
66
#include <bench/data.h>
77

8+
#include <chainlock/chainlock.h>
89
#include <consensus/validation.h>
910
#include <instantsend/instantsend.h>
10-
#include <llmq/chainlocks.h>
1111
#include <llmq/context.h>
1212
#include <rpc/blockchain.h>
1313
#include <streams.h>

0 commit comments

Comments
 (0)