descriptors: taproot partial descriptors #30243

Eunovo · 2024-06-07T11:53:30Z

This PR adds support for rawnode() and rawleaf() under tr() descriptor discussed in #24114 and tr-rawnode-and-rawleaf

DrahtBot · 2024-06-07T11:53:33Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/30243.

Reviews

See the guideline for information on the review process.
A summary of reviews will appear here.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#32861 (Have createwalletdescriptor auto-detect an unused(KEY) by Sjors)
#32784 (wallet: derivehdkey RPC to get xpub at arbitrary path by Sjors)
#32652 (wallet: add codex32 argument to addhdkey by roconnor-blockstream)
#32471 (wallet/rpc: fix listdescriptors RPC fails to return descriptors with private key information when wallet contains descriptors missing any key by Eunovo)
#29136 (wallet: addhdkey RPC to add just keys to wallets via new unused(KEY) descriptor by achow101)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

LLM Linter (✨ experimental)

Possible typos and grammar issues:

“A struct hold information on a node taproot descriptor script tree” -> “A struct holding information on a node in a taproot descriptor script tree” [“hold” should be “holding”, and insert “in a” for clarity]

^{drahtbot_id_4_m}

DrahtBot · 2024-06-07T15:07:52Z

🚧 At least one of the CI tasks failed. Make sure to run all tests locally, according to the
documentation.

Possibly this is due to a silent merge conflict (the changes in this pull request being
incompatible with the current code in the target branch). If so, make sure to rebase on the latest
commit of the target branch.

Leave a comment here, if you need help tracking down a confusing failure.

_{Debug: https://github.com/bitcoin/bitcoin/runs/25939869075}

ajtowns

Seems okay to me. Presumably should update doc/descriptors.md though, and might also be nice to have some functional tests demonstrating it works end-to-end? (Add some examples to DESCS in wallet_miniscript.py maybe?

src/script/descriptor.cpp

Eunovo · 2024-06-11T11:45:50Z

Seems okay to me. Presumably should update doc/descriptors.md though, and might also be nice to have some functional tests demonstrating it works end-to-end? (Add some examples to DESCS in wallet_miniscript.py maybe?

@ajtowns I'll do that.

Eunovo · 2024-06-11T21:36:17Z

@ajtowns Thanks for the review. I added some examples to wallet_miniscript.py and updated descriptors.md

dergoegge · 2024-06-15T09:22:51Z

Found a crash in the mocked_descriptor_parse fuzz target, to reproduce:

$ echo "dHIoJUJELHJhd2xlYWYoQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCLEE3LCUyNywlQjcsJTIzLCVCZCwlRkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQmNGKSk=" | base64 --decode > pr30243-mocked_descriptor_parse.crash
$ FUZZ=mocked_descriptor_parse src/test/fuzz/fuzz pr30243-mocked_descriptor_parse.crash
fuzz: script/signingprovider.cpp:368: TaprootBuilder &TaprootBuilder::Add(int, Span<const unsigned char>, int, bool): Assertion `(leaf_version & ~TAPROOT_LEAF_MASK) == 0' failed.

Eunovo · 2024-06-15T09:49:06Z

Found a crash in the mocked_descriptor_parse fuzz target, to reproduce:

Thanks for this @dergoegge. I'll fix it

Eunovo · 2024-06-18T13:04:44Z

Found a crash in the mocked_descriptor_parse fuzz target, to reproduce:

$ echo "dHIoJUJELHJhd2xlYWYoQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCLEE3LCUyNywlQjcsJTIzLCVCZCwlRkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQmNGKSk=" | base64 --decode > pr30243-mocked_descriptor_parse.crash
$ FUZZ=mocked_descriptor_parse src/test/fuzz/fuzz pr30243-mocked_descriptor_parse.crash
fuzz: script/signingprovider.cpp:368: TaprootBuilder &TaprootBuilder::Add(int, Span<const unsigned char>, int, bool): Assertion `(leaf_version & ~TAPROOT_LEAF_MASK) == 0' failed.

@dergoegge Pushed 7efb115 to fix this

src/script/descriptor.cpp

src/test/descriptor_tests.cpp

brunoerg · 2024-07-11T09:37:24Z

You can squash some commits.

Eunovo · 2024-07-11T13:20:17Z

You can squash some commits.

Thanks @brunoerg. Done!

src/script/descriptor.cpp

doc/descriptors.md

Eunovo · 2025-03-24T11:37:19Z

Rebased on master 770d39a

changed Span to std::span

DrahtBot · 2025-05-01T03:26:04Z

🚧 At least one of the CI tasks failed.
_{Task previous releases, depends DEBUG: https://github.com/bitcoin/bitcoin/runs/39283280181}
_{LLM reason (✨ experimental): The CI failure is caused by compilation errors due to instantiating abstract classes that have pure virtual functions not implemented.}

Hints

Try to run the tests locally, according to the documentation. However, a CI failure may still
happen due to a number of reasons, for example:

Possibly due to a silent merge conflict (the changes in this pull request being
incompatible with the current code in the target branch). If so, make sure to rebase on the latest
commit of the target branch.
A sanitizer issue, which can only be found by compiling with the sanitizer and running the
affected test.
An intermittent issue.

Leave a comment here, if you need help tracking down a confusing failure.

Eunovo · 2025-05-06T09:55:40Z

Rebased on master.

DrahtBot · 2025-05-10T23:24:11Z

🚧 At least one of the CI tasks failed.
_{Task previous releases, depends DEBUG: https://github.com/bitcoin/bitcoin/runs/41705051946}
_{LLM reason (✨ experimental): (empty)}

Hints

Try to run the tests locally, according to the documentation. However, a CI failure may still
happen due to a number of reasons, for example:

Possibly due to a silent merge conflict (the changes in this pull request being
incompatible with the current code in the target branch). If so, make sure to rebase on the latest
commit of the target branch.
A sanitizer issue, which can only be found by compiling with the sanitizer and running the
affected test.
An intermittent issue.

Leave a comment here, if you need help tracking down a confusing failure.

Prepare TRDescriptor to add omitted branches and leaves with user-provided version

Eunovo marked this pull request as draft June 7, 2024 11:55

Eunovo force-pushed the tr-partial-descriptors branch from 6700dd3 to 9923fdc Compare June 7, 2024 15:07

DrahtBot added the CI failed label Jun 7, 2024

Eunovo marked this pull request as ready for review June 7, 2024 18:02

DrahtBot removed the CI failed label Jun 7, 2024

This was referenced Jun 8, 2024

wallet: addhdkey RPC to add just keys to wallets via new unused(KEY) descriptor #29136

Open

descriptors: Be able to specify change and receiving in a single descriptor string #22838

Merged

ajtowns reviewed Jun 11, 2024

View reviewed changes

src/script/descriptor.cpp Outdated Show resolved Hide resolved

Eunovo force-pushed the tr-partial-descriptors branch from 9923fdc to 6f10ab5 Compare June 11, 2024 21:16

DrahtBot added CI failed and removed CI failed labels Jun 28, 2024

brunoerg reviewed Jul 4, 2024

View reviewed changes

src/script/descriptor.cpp Show resolved Hide resolved

Eunovo requested review from ajtowns and brunoerg July 8, 2024 11:30

brunoerg reviewed Jul 10, 2024

View reviewed changes

src/test/descriptor_tests.cpp Outdated Show resolved Hide resolved

Eunovo requested a review from brunoerg July 11, 2024 07:47

Eunovo force-pushed the tr-partial-descriptors branch from 134ee16 to a945bc2 Compare July 11, 2024 13:19

brunoerg reviewed Jul 17, 2024

View reviewed changes

src/script/descriptor.cpp Outdated Show resolved Hide resolved

brunoerg reviewed Jul 17, 2024

View reviewed changes

src/script/descriptor.cpp Outdated Show resolved Hide resolved

brunoerg reviewed Jul 17, 2024

View reviewed changes

doc/descriptors.md Outdated Show resolved Hide resolved

brunoerg reviewed Jul 17, 2024

View reviewed changes

doc/descriptors.md Outdated Show resolved Hide resolved

Eunovo force-pushed the tr-partial-descriptors branch from b9c2be8 to b118fbd Compare March 24, 2025 10:09

Eunovo changed the title ~~Tr partial descriptors~~ descriptors: taproot partial descriptors Mar 24, 2025

DrahtBot added Descriptors and removed CI failed labels Mar 24, 2025

DrahtBot mentioned this pull request Apr 1, 2025

descriptor: handle listdescriptors(private=true) for descriptors having partial keys #32186

Closed

DrahtBot added the CI failed label May 1, 2025

Eunovo force-pushed the tr-partial-descriptors branch from b118fbd to be910db Compare May 6, 2025 08:04

DrahtBot removed the CI failed label May 6, 2025

DrahtBot added the CI failed label May 10, 2025

Eunovo force-pushed the tr-partial-descriptors branch from be910db to 36d72f8 Compare May 12, 2025 14:40

DrahtBot removed the CI failed label May 12, 2025

DrahtBot mentioned this pull request May 12, 2025

wallet/rpc: fix listdescriptors RPC fails to return descriptors with private key information when wallet contains descriptors missing any key #32471

Open

DrahtBot mentioned this pull request May 31, 2025

wallet: add codex32 argument to addhdkey #32652

Draft

DrahtBot mentioned this pull request Jun 11, 2025

Musig2 tests #32724

Open

DrahtBot mentioned this pull request Jun 20, 2025

wallet: derivehdkey RPC to get xpub at arbitrary path #32784

Draft

DrahtBot mentioned this pull request Jul 3, 2025

Have createwalletdescriptor auto-detect an unused(KEY) #32861

Draft

DrahtBot mentioned this pull request Jul 14, 2025

Silent Payments: Receiving #32966

Draft

furszy mentioned this pull request Jul 24, 2025

BIP draft: Raw() as subscript for descriptors bitcoin/bips#1721

Closed

DrahtBot added the Needs rebase label Jul 31, 2025

Eunovo added 4 commits August 1, 2025 11:56

descriptor: Add TaprootNode

ff3ab92

Prepare TRDescriptor to add omitted branches and leaves with user-provided version

descriptor: Implement rawnode() and rawleaf() partial descriptor

c9d1542

test: add e2e tests for rawnode() and rawleaf()

11fccf2

doc: Add reference for rawnode() and rawleaf()

9c4854f

Eunovo force-pushed the tr-partial-descriptors branch from 36d72f8 to 9c4854f Compare August 1, 2025 11:12

DrahtBot removed the Needs rebase label Aug 1, 2025

DrahtBot mentioned this pull request Aug 9, 2025

BIP360: Includes the following: #33163

Closed

descriptors: taproot partial descriptors #30243

Are you sure you want to change the base?

descriptors: taproot partial descriptors #30243

Conversation

Eunovo commented Jun 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DrahtBot commented Jun 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Coverage & Benchmarks

Reviews

Conflicts

LLM Linter (✨ experimental)

Uh oh!

DrahtBot commented Jun 7, 2024

Uh oh!

ajtowns left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Eunovo commented Jun 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Eunovo commented Jun 11, 2024

Uh oh!

dergoegge commented Jun 15, 2024

Uh oh!

Eunovo commented Jun 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Eunovo commented Jun 18, 2024

Uh oh!

Uh oh!

Uh oh!

brunoerg commented Jul 11, 2024

Uh oh!

Eunovo commented Jul 11, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Eunovo commented Mar 24, 2025

Uh oh!

DrahtBot commented May 1, 2025

Uh oh!

Eunovo commented May 6, 2025

Uh oh!

DrahtBot commented May 10, 2025

Uh oh!

Uh oh!

Eunovo commented Jun 7, 2024 •

edited

Loading

DrahtBot commented Jun 7, 2024 •

edited

Loading

Eunovo commented Jun 11, 2024 •

edited

Loading

Eunovo commented Jun 15, 2024 •

edited

Loading