fix: should not notify about mnlist changes while ConnectBlock isn't done yet #5711
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
knst
reviewed
Nov 16, 2023
| @@ -30,9 +31,9 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, const | |||
| bool ProcessSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex, CMNHFManager& mnhfManager, | |||
| llmq::CQuorumBlockProcessor& quorum_block_processor, const llmq::CChainLocksHandler& chainlock_handler, | |||
| const Consensus::Params& consensusParams, const CCoinsViewCache& view, bool fJustCheck, bool fCheckCbTxMerleRoots, | |||
| BlockValidationState& state) EXCLUSIVE_LOCKS_REQUIRED(cs_main); | |||
| BlockValidationState& state, std::optional<MNListUpdates>& updatesRet) EXCLUSIVE_LOCKS_REQUIRED(cs_main); | |||
There was a problem hiding this comment.
doesn't build on my machine: missing #include <optional>
UdjinM6
force-pushed
the
notify_mnlist_later
branch
from
94749be to
614822d
Compare
PastaPastaPasta
approved these changes
Nov 16, 2023
knst
reviewed
Nov 16, 2023
| @@ -1847,6 +1849,12 @@ DisconnectResult CChainState::DisconnectBlock(const CBlock& block, const CBlockI | |||
| view.SetBestBlock(pindex->pprev->GetBlockHash()); | |||
| m_evoDb.WriteBestBlock(pindex->pprev->GetBlockHash()); | |||
|
|
|||
| if (mnlist_updates_opt.has_value()) { | |||
| auto mnlu = mnlist_updates_opt.value(); | |||
| GetMainSignals().NotifyMasternodeListChanged(true, mnlu.old_list, mnlu.diff); | |||
There was a problem hiding this comment.
it is done under cs_main lock now; let me think a bit how to change it
There was a problem hiding this comment.
previously it was simply done deeper than now so there is no change imo
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Nov 16, 2023
…done yet (dashpay#5711) ## Issue being fixed or feature implemented `ConnectBlock` can fail after `ProcessSpecialTxsInBlock`, we shouldn't be notifying too early. Same for `DisconnectBlock` but that's less of an issue imo. ## What was done? Move notifications to the end of `ConnectBlock`/`DisconnectBlock`. There is no `connman` in `CChainState` and I don't want to pass it in updates struct so I changed `NotifyMasternodeListChanged` and used `connman` from `CDSNotificationInterface` instead. ## How Has This Been Tested? run unit test, run testnet qt wallet ## Breaking Changes ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_
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
ConnectBlockcan fail afterProcessSpecialTxsInBlock, we shouldn't be notifying too early. Same forDisconnectBlockbut that's less of an issue imo.What was done?
Move notifications to the end of
ConnectBlock/DisconnectBlock. There is noconnmaninCChainStateand I don't want to pass it in updates struct so I changedNotifyMasternodeListChangedand usedconnmanfromCDSNotificationInterfaceinstead.How Has This Been Tested?
run unit test, run testnet qt wallet
Breaking Changes
Checklist: