Skip to content

psbt: clear the output tap tree for key-only descriptors - #115

Merged
apoelstra merged 1 commit into
ElementsProject:masterfrom
KyrylR:feature/clear-tap-tree
Nov 18, 2026
Merged

apoelstra merged 1 commit into
ElementsProject:masterfrom
KyrylR:feature/clear-tap-tree

Conversation

@KyrylR

@KyrylR KyrylR commented Oct 29, 2026

Copy link
Copy Markdown
Contributor

#112 should be merged first

Before this change, replacing an output's descriptor with a key-path-only eltr(K) left any previously written tree in place. The output would then advertise a script tree that its own internal key and script_pubkey no longer commit to.

Upstream rust-miniscript reached the same behaviour by a different route. Its master branch now writes *tap_tree = spend_info.to_tap_tree(); unconditionally, and to_tap_tree returns None when the tree is empty (src/descriptor/tr/spend_info.rs, merged in PR #815)

@KyrylR
KyrylR force-pushed the feature/clear-tap-tree branch from 85a560a to de14ac1 Compare October 29, 2026 12:34
@KyrylR
KyrylR force-pushed the feature/clear-tap-tree branch from de14ac1 to f652baf Compare November 10, 2026 10:42
@KyrylR
KyrylR marked this pull request as ready for review November 10, 2026 10:42
@KyrylR

KyrylR commented Nov 10, 2026

Copy link
Copy Markdown
Contributor Author

Rebased, ready for the review

@apoelstra apoelstra left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK f652baf; successfully ran local tests; though in future please split the unit test into a separate commit

@apoelstra
apoelstra merged commit 3fff570 into ElementsProject:master Nov 18, 2026
18 checks passed
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