wallet: Make a tr() descriptor by default #22364

achow101 · 2021-06-28T20:48:13Z

Make a tr() descriptor by default in descriptor wallets so that users will be able to make and use segwit v1 bech32m addresses.

DrahtBot · 2021-06-29T09:34:52Z

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

#23544 (rpc, wallet: addhdseed, infer seed when importing descriptor with xpub by Sjors)
#23417 (wallet, spkm: Move key management from DescriptorScriptPubKeyMan to wallet level KeyManager by achow101)
#22558 (psbt: Taproot fields for PSBT by achow101)
#22341 (rpc: add getxpub by Sjors)
#10102 (Multiprocess bitcoin by ryanofsky)

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.

Sjors · 2021-06-29T15:03:42Z

The first couple of commits can be merged earlier with a separate PR.

I should try how this interacts with #22260.

Also, it'd be nice to have this on Signet, so explictly check for that chain and then make a followup to do it on testnet and mainnet?

How do you want to go about upgrading existing descriptor wallets? Given that it's still marked experimental, having some manual RPC / wallet tool command would be fine I think. But with future soft-forks such an upgrade should be automatically, just like how we added Segwit addresses to existing wallets.

When I tried getting the master HD key to derive some new private keys in #22341 I got thoroughly confused. It might make more sense to store the seed in the main wallet payload rather than in each SPKman.

achow101 · 2021-07-21T02:13:13Z

The first commit was split to #22512

michaelfolkson · 2021-08-02T09:59:08Z

Concept ACK

I misunderstood what the "default" aspect of this PR was referring to. As explained to me in the July 30th Core wallet meeting there is no universal "default" descriptor in the wallet, just a default descriptor per address type. This PR is allowing a Taproot descriptor be constructed (and will be merged post Taproot activation) rather than constructing a Taproot descriptor as a universal "default" descriptor.

d9d3ec0 Consolidate XOnlyPubKey lookup hack (Andrew Chow) Pull request description: The places where we need to lookup information for a XOnlyPubKey currently implement a hack which makes both serializations of the full pubkey in order to try the CKeyIDs for the lookup functions. Instead of duplicating this everywhere it is needed, we can consolidate the CKeyID generation into a function, and then have wrappers around GetPubKey, GetKey, and GetKeyOrigin which takes the XOnlyPubKey, retrieves all of the CKeyIDs (using the new GetKeyIDs() function in XOnlyPubKey), and tries their respective underlying lookup function. Split from #22364 ACKs for top commit: S3RK: Code Review reACK d9d3ec0 Zero-1729: re-crACK d9d3ec0 theStack: re-ACK d9d3ec0 meshcollider: Code review + functional test run ACK d9d3ec0 Tree-SHA512: 21a7f6d37fad74483a38006f82b3558337fe9ed30e0b4392e6fff82c22251a42ac996b43f06cdaa9289ee34a768e181d87aa4208b5538e36ae4977954e1fa6a0

d9d3ec0 Consolidate XOnlyPubKey lookup hack (Andrew Chow) Pull request description: The places where we need to lookup information for a XOnlyPubKey currently implement a hack which makes both serializations of the full pubkey in order to try the CKeyIDs for the lookup functions. Instead of duplicating this everywhere it is needed, we can consolidate the CKeyID generation into a function, and then have wrappers around GetPubKey, GetKey, and GetKeyOrigin which takes the XOnlyPubKey, retrieves all of the CKeyIDs (using the new GetKeyIDs() function in XOnlyPubKey), and tries their respective underlying lookup function. Split from bitcoin#22364 ACKs for top commit: S3RK: Code Review reACK d9d3ec0 Zero-1729: re-crACK d9d3ec0 theStack: re-ACK d9d3ec0 meshcollider: Code review + functional test run ACK d9d3ec0 Tree-SHA512: 21a7f6d37fad74483a38006f82b3558337fe9ed30e0b4392e6fff82c22251a42ac996b43f06cdaa9289ee34a768e181d87aa4208b5538e36ae4977954e1fa6a0

Sjors · 2021-10-20T12:30:32Z

I made a branch that combines this PR with #22260, so you get bech32m addresses in the GUI for new descriptor wallets. It seems to work fine.

Given that this PR has to wait for Taproot, I suggest splitting off all commits except 449ce29. Code looks reasonable at first glance, though it's unclear to me what problem 9a86327 and cc1f4c9 are solving.

Suggest rewording the PR title so it's more clear the tr() is created, but does not become the default. We could additionally mention in the release notes that creating a taproot address is possible using the console: getnewaddress label bech32m, and explain that the GUI doesn't do this automatically yet due to lack of broad bech32m support.

sipa · 2021-11-15T16:40:48Z

Concept ACK

laanwj · 2021-11-15T20:39:10Z

How do you want to go about upgrading existing descriptor wallets? Given that it's still marked experimental, having some manual RPC / wallet tool command would be fine I think. But with future soft-forks such an upgrade should be automatically, just like how we added Segwit addresses to existing wallets.

Same question (couldn't find an answer in this PR)—does this add the descriptor to existing wallets, or only to new ones? If not, what is the upgrade command, and should it be added to the release notes?

achow101 · 2021-11-15T20:58:58Z

Same question (couldn't find an answer in this PR)—does this add the descriptor to existing wallets, or only to new ones? If not, what is the upgrade command, and should it be added to the release notes?

This PR only applies to newly created descriptor wallets. Current wallet will need to be upgraded through some method that I haven't quite implemented yet. It will probably be some extension of upgradewallet and make use of #23417.

When expanding the scripts for a TRDescriptor, also store the pubkeys in the FlatSigningProvider.

maflcko · 2021-11-16T12:20:18Z

why not #22364 (comment) ?

src/script/signingprovider.cpp

achow101 · 2021-11-16T17:20:31Z

why not #22364 (comment) ?

Forgot, done now.

maflcko · 2021-11-17T08:28:43Z

Concept ACK 4868c9f

Sjors · 2021-11-17T13:19:02Z

re-utACK 4868c9f

meshcollider

Concept + code review ACK 4868c9f

gruve-p · 2021-11-22T08:44:32Z

ACK 4868c9f

fanquake · 2022-09-15T15:16:59Z

This was part of 23.0 and got a release note. Removing "Needs release note".

- some fixmes in this commit, related to invalid schnorr signatures which need investigation

DrahtBot added Descriptors Wallet labels Jun 28, 2021

DrahtBot mentioned this pull request Jun 29, 2021

A few follow-ups for taproot signing #22275

Merged

bitcoin deleted a comment Jun 29, 2021

This was referenced Jun 30, 2021

test: Implicitly sync after generate* to preempt races and intermittent test failures #20362

Closed

wallet, refactor: make DescriptorScriptPubKeyMan agnostic of internal flag #20191

Merged

achow101 force-pushed the default-tr-desc branch 2 times, most recently from d62dbd3 to 87580f6 Compare July 3, 2021 01:33

DrahtBot mentioned this pull request Jul 3, 2021

Multiprocess bitcoin #10102

Draft

achow101 force-pushed the default-tr-desc branch from 87580f6 to 087a59c Compare July 6, 2021 21:57

achow101 mentioned this pull request Jul 21, 2021

Consolidate XOnlyPubKey lookup hack #22512

Merged

This was referenced Jul 22, 2021

wallet: Decide which coin selection solution to use based on waste metric #22009

Merged

psbt: Taproot fields for PSBT #22558

Merged

test: Implicitly sync after generate* to preempt races and intermittent test failures #22567

Closed

This was referenced Aug 19, 2021

multiprocess: Add bitcoin-gui -ipcconnect option #19461

Draft

multiprocess: Add bitcoin-wallet -ipcconnect option #19460

Draft

achow101 force-pushed the default-tr-desc branch 2 times, most recently from 20ed3ab to b9f72b3 Compare September 1, 2021 21:53

sangaman mentioned this pull request Sep 23, 2021

feat: add initial p2tr output script support BitGo/bitcoinjs-lib#8

Merged

This was referenced Sep 29, 2021

test: update fee rate assertion helper in the functional test framework #23136

Merged

test: Fix intermitent failure in wallet_basic.py #23141

Closed

achow101 force-pushed the default-tr-desc branch from b9f72b3 to 5f89682 Compare October 1, 2021 21:31

Sjors mentioned this pull request Oct 20, 2021

Make descriptor wallets by default #23002

Merged

laanwj added this to the 23.0 milestone Nov 15, 2021

DrahtBot added the Needs rebase label Nov 16, 2021

Store pubkeys in TRDescriptor::MakeScripts

54b3699

When expanding the scripts for a TRDescriptor, also store the pubkeys in the FlatSigningProvider.

achow101 force-pushed the default-tr-desc branch from 407bab9 to c51aa4f Compare November 16, 2021 04:51

DrahtBot removed the Needs rebase label Nov 16, 2021

maflcko reviewed Nov 16, 2021

View reviewed changes

src/script/signingprovider.cpp Show resolved Hide resolved

achow101 added 3 commits November 16, 2021 12:20

Create a tr() descriptor bech32m DescriptorScriptPubKeyMan by default

8fb5784

Mention bech32m in -addresstype and -changetype help

d8abbe1

Extract Taproot internal keyid with GetKeyFromDestination

4868c9f

achow101 force-pushed the default-tr-desc branch from c51aa4f to 4868c9f Compare November 16, 2021 17:20

achow101 mentioned this pull request Nov 17, 2021

trezor: Implement Taproot support bitcoin-core/HWI#544

Merged

DrahtBot mentioned this pull request Nov 18, 2021

rpc, wallet: addhdseed, infer seed when importing descriptor with xpub #23544

Closed

meshcollider reviewed Nov 22, 2021

View reviewed changes

maflcko merged commit 47fe744 into bitcoin:master Nov 22, 2021

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Nov 22, 2021

Merge bitcoin#22364: wallet: Make a tr() descriptor by default

0150c8e

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Nov 23, 2021

Merge bitcoin#22364: wallet: Make a tr() descriptor by default

d6e373b

fanquake removed the Needs release note label Sep 15, 2022

Sjors mentioned this pull request Jan 19, 2023

wallet: Have the wallet store the key for automatically generated descriptors #26728

Closed

jamesdorfman added a commit to jamesdorfman/elements that referenced this pull request May 26, 2023

Merge 47fe744 into merged_master (Bitcoin PR bitcoin/bitcoin#22364)

03b8ae6

delta1 added a commit to delta1/elements that referenced this pull request May 29, 2023

Merge 47fe744 into merged_master (Bitcoin PR bitcoin/bitcoin#22364)

00f2e32

- some fixmes in this commit, related to invalid schnorr signatures which need investigation

bitcoin locked and limited conversation to collaborators Sep 15, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wallet: Make a tr() descriptor by default #22364

wallet: Make a tr() descriptor by default #22364

achow101 commented Jun 28, 2021 •

edited

Loading

DrahtBot commented Jun 29, 2021 •

edited

Loading

Sjors commented Jun 29, 2021 •

edited

Loading

achow101 commented Jul 21, 2021

michaelfolkson commented Aug 2, 2021

Sjors commented Oct 20, 2021 •

edited

Loading

sipa commented Nov 15, 2021

laanwj commented Nov 15, 2021

achow101 commented Nov 15, 2021

maflcko commented Nov 16, 2021

achow101 commented Nov 16, 2021

maflcko commented Nov 17, 2021

Sjors commented Nov 17, 2021

meshcollider left a comment •

edited

Loading

gruve-p commented Nov 22, 2021

fanquake commented Sep 15, 2022

wallet: Make a tr() descriptor by default #22364

wallet: Make a tr() descriptor by default #22364

Conversation

achow101 commented Jun 28, 2021 • edited Loading

DrahtBot commented Jun 29, 2021 • edited Loading

Conflicts

Sjors commented Jun 29, 2021 • edited Loading

achow101 commented Jul 21, 2021

michaelfolkson commented Aug 2, 2021

Sjors commented Oct 20, 2021 • edited Loading

sipa commented Nov 15, 2021

laanwj commented Nov 15, 2021

achow101 commented Nov 15, 2021

maflcko commented Nov 16, 2021

achow101 commented Nov 16, 2021

maflcko commented Nov 17, 2021

Sjors commented Nov 17, 2021

meshcollider left a comment • edited Loading

Choose a reason for hiding this comment

gruve-p commented Nov 22, 2021

fanquake commented Sep 15, 2022

achow101 commented Jun 28, 2021 •

edited

Loading

DrahtBot commented Jun 29, 2021 •

edited

Loading

Sjors commented Jun 29, 2021 •

edited

Loading

Sjors commented Oct 20, 2021 •

edited

Loading

meshcollider left a comment •

edited

Loading