forked from bitcoin/bitcoin
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
backport: Merge bitcoin#22359 #6025
Merged
Merged
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
vijaydasmp
changed the title
backport:
backport: Merge bitcoin#22630, 21500, 22359, 21800, 20233
May 16, 2024
vijaydasmp
force-pushed
the
bp23_5
branch
4 times, most recently
from
May 18, 2024 04:29
0cdeeef
to
4834ec2
Compare
vijaydasmp
changed the title
backport: Merge bitcoin#22630, 21500, 22359, 21800, 20233
backport: Merge bitcoin#22630, 21500, 22359, 21800
May 18, 2024
vijaydasmp
changed the title
backport: Merge bitcoin#22630, 21500, 22359, 21800
backport: Merge bitcoin#22630, 22359, 21800
May 18, 2024
vijaydasmp
force-pushed
the
bp23_5
branch
2 times, most recently
from
May 18, 2024 11:54
0759871
to
41a9cd3
Compare
vijaydasmp
changed the title
backport: Merge bitcoin#22630, 22359, 21800
backport: Merge bitcoin#22630, 22359
May 18, 2024
UdjinM6
requested changes
May 18, 2024
vijaydasmp
changed the title
backport: Merge bitcoin#22630, 22359
backport: Merge bitcoin#22359
May 20, 2024
UdjinM6
approved these changes
May 21, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK
Hello @knst @PastaPastaPasta requesting review |
PastaPastaPasta
approved these changes
May 24, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK e326bdb
…dToMempool when tx is not in the mempool fa6fd3d wallet: Properly set fInMempool in mempool notifications (MarcoFalke) Pull request description: A wallet method (like bumping the fee) might have set `fInMempool` to false because the transaction was removed from the mempool (See commit fa4e088). Avoid setting it back to true (incorrectly) in the validation interface background thread. Fixes bitcoin#22357 ACKs for top commit: ryanofsky: Code review ACK fa6fd3d. Only change since last review is extending workaround to `transactionRemovedFromMempool`. Since we know this workaround is imperfect and the goal of this PR is mainly to fix CI errors, I would probably be inclined to limit the workaround to as few places as possible where we have seen actual failures, instead of adding the workaround to as many places as possible, where there is some chance it might trigger new failures. But since this workaround is so straightforward and almost looks like a real fix, probably it doesn't matter. meshcollider: utACK fa6fd3d Tree-SHA512: d690136a577f1f532aa1fee80d3f6600ff7fc61286fbf564a53d7938d5ae52d33f0dbb0fef8b8c041a4970fb424f0b9f1ee7ce791e0ff8354e0000ecc9e22b84
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.
bitcoin backports