mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-01 16:53:52 +02:00
Merge bitcoin/bitcoin#22838: descriptors: Be able to specify change and receiving in a single descriptor string
a0abcbd382doc: Mention multipath specifier (Ava Chow)0019f61fc5tests: Test importing of multipath descriptors (Ava Chow)f97d5c137dwallet, rpc: Allow importdescriptors to import multipath descriptors (Ava Chow)32dcbca3fbrpc: Allow importmulti to import multipath descriptors correctly (Ava Chow)64dfe3ce4bwallet: Move internal to be per key when importing (Ava Chow)1692245525tests: Multipath descriptors for scantxoutset and deriveaddresses (Ava Chow)cddc0ba9a9rpc: Have deriveaddresses derive receiving and change (Ava Chow)360456cd22tests: Multipath descriptors for getdescriptorinfo (Ava Chow)a90eee444ctests: Add unit tests for multipath descriptors (Ava Chow)1bbf46e2dadescriptors: Change Parse to return vector of descriptors (Ava Chow)0d640c6f02descriptors: Have ParseKeypath handle multipath specifiers (Ava Chow)a5f39b1034descriptors: Change ParseScript to return vector of descriptors (Ava Chow)0d55deae15descriptors: Add DescriptorImpl::Clone (Ava Chow)7e86541f72descriptors: Add PubkeyProvider::Clone (Ava Chow) Pull request description: It is convenient to have a descriptor which specifies both receiving and change addresses in a single string. However, as discussed in https://github.com/bitcoin/bitcoin/issues/17190#issuecomment-895515768, it is not feasible to use a generic multipath specification like BIP 88 due to combinatorial blow up and that it would result in unexpected descriptors. To resolve that problem, this PR proposes a targeted solution which allows only a single pair of 2 derivation indexes to be inserted in the place of a single derivation index. So instead of two descriptor `wpkh(xpub.../0/0/*)` and `wpkh(xpub.../0/1/*)` to represent receive and change addresses, this could be written as `wpkh(xpub.../0/<0;1>/*)`. The multipath specifier is of the form `<NUM;NUM>`. Each `NUM` can have its own hardened specifier, e.g. `<0;1h>` is valid. The multipath specifier can also only appear in one path index in the derivation path. This results in the parser returning two descriptors. The first descriptor uses the first `NUM` in all pairs present, and the second uses the second `NUM`. In our implementation, if a multipath descriptor is not provided, a pair is still returned, but the second element is just `nullptr`. The wallet will not output the multipath descriptors (yet). Furthermore, when a multipath descriptor is imported, it is expanded to the two descriptors and each imported on its own, with the second descriptor being implicitly for internal (change) addresses. There is no change to how the wallet stores or outputs descriptors (yet). Note that the path specifier is different from what was proposed. It uses angle brackets and the semicolon because these are unused characters available in the character set and I wanted to avoid conflicts with characters already in use in descriptors. Closes #17190 ACKs for top commit: darosior: re-ACKa0abcbd382mjdietzx: reACKa0abcbd382pythcoiner: reACKa0abcbdfurszy: Code review ACKa0abcbdglozow: light code review ACKa0abcbd382Tree-SHA512: 84ea40b3fd1b762194acd021cae018c2f09b98e595f5e87de5c832c265cfe8a6d0bc4dae25785392fa90db0f6301ddf9aea787980a29c74f81d04b711ac446c2
This commit is contained in:
@@ -98,6 +98,7 @@ Descriptors consist of several types of expressions. The top level expression is
|
||||
- [WIF](https://en.bitcoin.it/wiki/Wallet_import_format) encoded private keys may be specified instead of the corresponding public key, with the same meaning.
|
||||
- `xpub` encoded extended public key or `xprv` encoded extended private key (as defined in [BIP 32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki)).
|
||||
- Followed by zero or more `/NUM` unhardened and `/NUM'` hardened BIP32 derivation steps.
|
||||
- No more than one of these derivation steps may be of the form `<NUM;NUM;...;NUM>` (including hardened indicators with either or both `NUM`). If such specifiers are included, the descriptor will be parsed as multiple descriptors where the first descriptor uses all of the first `NUM` in the pair, and the second descriptor uses the second `NUM` in the pair for all `KEY` expressions, and so on.
|
||||
- Optionally followed by a single `/*` or `/*'` final step to denote all (direct) unhardened or hardened children.
|
||||
- The usage of hardened derivation steps requires providing the private key.
|
||||
|
||||
@@ -257,6 +258,30 @@ Note how the first key is an xprv private key with a specific derivation path,
|
||||
while the other two are public keys.
|
||||
|
||||
|
||||
### Specifying receiving and change descriptors in one descriptor
|
||||
|
||||
Since receiving and change addresses are frequently derived from the same
|
||||
extended key(s) but with a single derivation index changed, it is convenient
|
||||
to be able to specify a descriptor that can derive at the two different
|
||||
indexes. Thus a single tuple of indexes is allowed in each derivation path
|
||||
following the extended key. When this descriptor is parsed, multiple descriptors
|
||||
will be produced, the first one will use the first index in the tuple for all
|
||||
key expressions, the second will use the second index, the third will use the
|
||||
third index, and so on..
|
||||
|
||||
For example, a descriptor of the form:
|
||||
|
||||
multi(2,xpub.../<0;1;2>/0/*,xpub.../<2;3;4>/*)
|
||||
|
||||
will expand to the two descriptors
|
||||
|
||||
multi(2,xpub.../0/0/*,xpub.../2/*)
|
||||
multi(2,xpub.../1/0/*,xpub.../3/*)
|
||||
multi(2,xpub.../2/0/*,xpub.../4*)
|
||||
|
||||
When this tuple contains only two elements, wallet implementations can use the
|
||||
first descriptor for receiving addresses and the second descriptor for change addresses.
|
||||
|
||||
### Compatibility with old wallets
|
||||
|
||||
In order to easily represent the sets of scripts currently supported by
|
||||
|
||||
Reference in New Issue
Block a user