Skip to content

Backport new taproot descriptor template (BIP86)#1033

Merged
notmandatory merged 2 commits intobitcoindevkit:release/0.28from
notmandatory:feat/add-bip-86-template
Aug 2, 2023
Merged

Backport new taproot descriptor template (BIP86)#1033
notmandatory merged 2 commits intobitcoindevkit:release/0.28from
notmandatory:feat/add-bip-86-template

Conversation

@notmandatory
Copy link
Copy Markdown
Member

Description

This PR solves bitcoindevkit/bdk_wallet#169 for the release/0.28 branch. This PR adds a P2TR descriptor template and a BIP86 taproot descriptor template. With this, users can now create a taproot descriptor with templates.

Notes to the reviewers

The commit from #840 is cherry-picked from the master branch to the release/0.28 branch without any changes.

Changelog notice

Add taproot descriptor template (BIP-86).

Checklists

All Submissions:

  • I've signed all my commits
  • I followed the contribution guidelines
  • I ran cargo fmt and cargo clippy before committing

New Features:

  • I've added tests for the new feature
  • I've added docs for the new feature

This PR solves #836. This PR adds a P2TR
descriptor template and a BIP86 taproot
descriptor template. With this, users
can now create a taproot descriptor with templates.
@notmandatory notmandatory added this to the 0.28.1 milestone Jul 19, 2023
@notmandatory notmandatory changed the title Backport from master: "Create taproot descriptor template (BIP86)" Backport from master branch new taproot descriptor template (BIP86) Jul 19, 2023
@notmandatory notmandatory force-pushed the feat/add-bip-86-template branch from a208d38 to 7587f16 Compare July 19, 2023 03:37
@notmandatory notmandatory changed the title Backport from master branch new taproot descriptor template (BIP86) Backport new taproot descriptor template (BIP86) Jul 19, 2023
Copy link
Copy Markdown
Contributor

@vladimirfomene vladimirfomene left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Copy Markdown
Member

@danielabrozzoni danielabrozzoni left a comment

Choose a reason for hiding this comment

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

utACK 7587f16

@vladimirfomene just a heads up, you should explicitly write "ACK <commit_hash>" when reviewing, not just LGTM/approving etc. The reason for this is that we use this script to merge, which records in the merge commit who acked/nacked (see, for example, 8f38e96), and it's important to have all the reviewers and their explicit review in the merge commit (we should rely on git for recording certain info, and not on github)

@notmandatory notmandatory merged commit d0f7543 into bitcoindevkit:release/0.28 Aug 2, 2023
notmandatory added a commit to notmandatory/bdk that referenced this pull request Aug 3, 2023
Summary

This patch release backports (from the BDK 1.0 dev branch) a fix for a bug in the policy condition calculation and adds a new taproot single key descriptor template (BIP-86). The policy condition calculation bug can cause issues when a policy subtree fails due to missing info even if it's not selected when creating a new transaction, errors on unused policy paths are now ignored.

Fixed

- Backported bitcoindevkit#932 fix for policy condition calculation bitcoindevkit#1008

Added

-  Backported bitcoindevkit#840 taproot descriptor template (BIP-86) bitcoindevkit#1033
@notmandatory notmandatory deleted the feat/add-bip-86-template branch May 26, 2025 21:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants