[0.1] Backport #4341 and cut 0.1.9 #4343
Open
Conversation
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
Electrum's `blockchain.scripthash.get_history` will return the *confirmed* history for any scripthash, but will then also append any matching entries from the mempool, with respective `height` fields set to 0 or -1 (depending on whether all inputs are confirmed or not). Unfortunately we previously only included a filter for confirmed `get_history` entries in the watched output case, and forgot to add such a check also when checking for watched transactions. This would have us treat the entry as confirmed, then failing on the `get_merkle` step which of course couldn't prove block inclusion. Here we simply fix this omission and skip entries that are still unconfirmed (e.g., unconfirmed funding transactions from 0conf channels). Signed-off-by: Elias Rohrer <dev@tnull.de> Backport of cc1eb16
|
I've assigned @wpaulino as a reviewer! |
TheBlueMatt
force-pushed
the
2026-01-0.1-electrum-fix
branch
from
e36a7b2 to
d78e8e9
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## 0.1 #4343 +/- ##
==========================================
- Coverage 87.49% 84.57% -2.93%
==========================================
Files 149 135 -14
Lines 101924 76539 -25385
Branches 101924 76539 -25385
==========================================
- Hits 89182 64732 -24450
+ Misses 10476 9766 -710
+ Partials 2266 2041 -225 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
TheBlueMatt
force-pushed
the
2026-01-0.1-electrum-fix
branch
5 times, most recently
from
983210c to
787b725
Compare
TheBlueMatt
force-pushed
the
2026-01-0.1-electrum-fix
branch
from
787b725 to
f1488d9
Compare
wpaulino
approved these changes
Jan 26, 2026
|
👋 The first review has been submitted! Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
While I was kinda hoping to also fix #4307 here, the upstream PR (#4342) is much too divergent to backport so instead I think we just don't bother fixing for 0.1.