instantsend: Mark blocks as conflicting when there is a CL vs IS conflict#3987
Merged
Conversation
… CL-ed block as conflicting and not as invalid
…block with conflicting IS-locks
Member
|
Can you talk about the reasoning a bit? Why is Conflicting better than Invalid? |
Author
|
@PastaPastaPasta see #3924 and #3926 |
gades
pushed a commit
to cosanta/cosanta-core
that referenced
this pull request
May 4, 2022
…lict (dashpay#3987) * instantsend: Mark a block with IS-locks which conflict with txes in a CL-ed block as conflicting and not as invalid * tests: Tweak feature_llmq_is_cl_conflicts.py to test CL overriding a block with conflicting IS-locks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
A followup for #3924
Extracted from #3970