fix(mempool): reconcile conflicts before insertion - #254
Draft
EddieHouston wants to merge 1 commit into
Draft
Conversation
EddieHouston
force-pushed
the
fix/mempool-conflict-reconciliation
branch
from
August 27, 2026 15:52
7b7b677 to
4356819
Compare
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
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.
Summary
Prevent submitted replacement transactions from temporarily coexisting with the transactions they replace in electrs' local mempool.
broadcast_rawandsubmit_packageimmediate-insertion paths through the sharedMempool::add()implementationThis prevents the inconsistent state tracked in #236, where
txstoreand history could contain two conflicting spenders whileedgescould represent only one.Fixes #236
Tests
cargo test --test rest test_rest_mempool_rbf_reconciled -- --nocapturecargo test --test rest -- --nocapture(26 passed)cargo check --testscargo check --tests --features liquidThe REST regressions verify immediately after both raw and package broadcast—before the next periodic mempool sync—that the replaced transaction is absent and the replacement is queryable.