[Core] Store disconnected blocks txes outside mempool during reorg#2268
Merged
random-zebra merged 1 commit intoPIVX-Project:masterfrom Apr 6, 2021
Merged
Conversation
random-zebra
force-pushed
the
202103_mempool-reorg-fix
branch
from
a83cdb5 to
b80ec44
Compare
>>> adapts bitcoin#9208 Rather than re-add disconnected block transactions back to the mempool immediately, store them in a separate disconnectpool for later processing, because we expect most such transactions to reappear in the chain that is still to be connected (and thus we can avoid the work of reprocessing those transactions through the mempool altogether).
random-zebra
force-pushed
the
202103_mempool-reorg-fix
branch
from
b80ec44 to
2ae953a
Compare
Author
|
Rebased, fixing conflict with #2290 just merged. |
Fuzzbawls
approved these changes
Apr 6, 2021
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.
Extracted from #2267.
This backports bitcoin#9208.
As highlighted by zcash/zcash#2951, this "performance improvement" actually includes a fix for the following bug:
This has additional consequences with special transactions (that's why it was discovered in #2267), as, during a reorg,
ProUp*transactions, included in the block, might not be resurrected in the mempool, due to the inconsistent state of chainActive.