diff options
| author | fanquake <fanquake@gmail.com> | 2022-02-21 09:53:28 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-02-21 10:16:42 +0000 |
| commit | 72f97289c431d333bb7484f88c1b8b508d45c01d (patch) | |
| tree | deda032d8e46f94091688e5d45d8dad1ca40234b /src/base58.h | |
| parent | cf22191fd8cf7fae22e561e14b3a68e49e39b15c (diff) | |
| parent | 0683f377e1588758da86368f82efee765f89d890 (diff) | |
Merge bitcoin/bitcoin#24343: Add descriptor_tests covering tr(), and fix minor bugs
0683f377e1588758da86368f82efee765f89d890 Add tr() descriptor unit tests (Pieter Wuille)
4b2e31a7ae630e68735e9c8e32f1df422ef4aff0 Bugfix: make ToPrivateString work with x-only keys (Pieter Wuille)
18ad54c3b21804ad540631dd4527cbad6d6ccc75 Bugfix: set x-only flag when inferring pk() inside tr() (Pieter Wuille)
Pull request description:
This fixes two bugs in the current logic for `tr()` descriptors:
* ToPrivateString does not always work, because the provided private key may mismatch the parity of the x-only public key.
* The descriptors inferred for `pk()` inside `tr()` have the wrong x-only flag, leading to such descriptors generating the wrong scriptPubKey (roundtripping through ToString does fix it however, so this seems unobservable in the current code).
These were discovered while adding unit tests to descriptor_tests that cover various aspects of `tr()` descriptors, which are now also added here.
ACKs for top commit:
achow101:
ACK 0683f377e1588758da86368f82efee765f89d890
instagibbs:
ACK https://github.com/bitcoin/bitcoin/pull/24343/commits/0683f377e1588758da86368f82efee765f89d890
jonatack:
Code review ACK 0683f377e1588758da86368f82efee765f89d890
Tree-SHA512: fc0e11b45da53054a108effff2029d67b64e508b160a6e22e00c98b506c39ec12ccc95afd21ea68a6c691eb62930afc7af18908f2fa3a954d102afdc67bc355a
Diffstat (limited to 'src/base58.h')
0 files changed, 0 insertions, 0 deletions