Skip to content

Conversation

@UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Feb 6, 2021

A followup for #3924

Extracted from #3970

@UdjinM6 UdjinM6 marked this pull request as ready for review February 6, 2021 15:47
@UdjinM6 UdjinM6 added this to the 17 milestone Feb 6, 2021
Copy link

@xdustinface xdustinface left a comment

Choose a reason for hiding this comment

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

utACK

@PastaPastaPasta
Copy link
Member

Can you talk about the reasoning a bit? Why is Conflicting better than Invalid?

@UdjinM6
Copy link
Author

UdjinM6 commented Feb 11, 2021

@PastaPastaPasta see #3924 and #3926

Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK

@PastaPastaPasta PastaPastaPasta merged commit f5e74c8 into dashpay:develop Feb 14, 2021
@UdjinM6 UdjinM6 deleted the is_optim_5 branch July 1, 2021 21:57
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants