Skip to content

Conversation

@UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Dec 30, 2021

avoids extremely rare crashes when we have more than one conflict

@UdjinM6 UdjinM6 added this to the 18 milestone Dec 30, 2021
@github-actions
Copy link

This Pull Request may conflict if the Pull Requests below are merged first.

#4472
conflictable files: src/validation.cpp
#4612
conflictable files: src/validation.cpp
#4648
conflictable files: src/validation.cpp
#4532
conflictable files: src/validation.cpp
#4491
conflictable files: src/validation.cpp

@UdjinM6 UdjinM6 force-pushed the drop_all_confl_islocks branch from 688c934 to 47ef2f5 Compare January 4, 2022 15:33
PastaPastaPasta
PastaPastaPasta previously approved these changes Jan 4, 2022
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 for squash merge

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.

re-utACK for squash merge

@UdjinM6 UdjinM6 merged commit bd248d1 into dashpay:develop Jan 9, 2022
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Nov 16, 2023
* Drop all conflicting tx locks in ConnectBlock

* apply suggestions

* fix 🙈
gades pushed a commit to piratecash/pirate that referenced this pull request Dec 9, 2023
* Drop all conflicting tx locks in ConnectBlock

* apply suggestions

* fix 🙈
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.

2 participants