forked from bitcoin/bitcoin
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
refactor: move CDSTXManager
to NodeContext
, abstract wallet-only CoinJoin managers behind interface, s/CJContext/CJWalletManager/g
#6840
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.
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
Draft
kwvg
wants to merge
26
commits into
dashpay:develop
Choose a base branch
from
kwvg:cj_walletman
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or 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
The wallet should not concern itself with masternode mode state. Client side mixing is not available for masternodes and masternodes are no longer allowed to have the collateral in their own local wallet, drop it.
We don't initialize mn_activeman in TestingSetup so we don't need to set `connOptions.m_active_masternode`
ActiveContext is going to host all entities are part of masternode mode (i.e. used by a node if it is an active masternode) and is required to separate interactive (i.e. networking-driven) portions of consensus from portions that can be done non-interactively/offline.
Now that CCoinJoinServer is conditionally initialized, we can remove checks that assumed its unconditional existence.
CCoinJoinClientQueueManager is conditionally initialized, we will be deref'ing a nullptr if relay_txes is false.
We moved CCoinJoinServer to ActiveContext and 2/3 members of CJContext are conditionally initialized, let's move the unconditionally init'ed member out so we can conditionally initialize the whole object.
Currently a lot of non-wallet code is peppered with `ENABLE_WALLET` due to wallet-only CoinJoin managers, we need to contain them.
This should prevent ENABLE_WALLET from spilling out to files that include the header.
Now that we no longer assume that cj_ctx is always initialized, we can skip the whole process if we are in masternode mode.
As it's now a fixed value, we can drop it, yay!
CJContext is no longer just a context class, it's a lot more involved now and serves triple duty as also a notification interface and a layer of abstraction. Name reflects that it's the wallet-specific components of CoinJoin.
|
This pull request has conflicts, please rebase. |
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.
Additional Information
fMasternodeMode
global, create new context for masternode mode-only logic (ActiveContext
), move spun-off signers and EHF signals handler #6828{evo,llmq}/types.h
#6839Breaking Changes
None expected.
Checklist