Skip to content

Commit 906ecb8

Browse files
committed
Merge bitcoin#21238: A few descriptor improvements to prepare for Taproot support
0b188b7 Clean up context dependent checks in descriptor parsing (Pieter Wuille) 33275a9 refactor: move uncompressed-permitted logic into ParsePubkey* (Pieter Wuille) 17e006f refactor: split off subscript logic from ToStringHelper (Pieter Wuille) 6ba5dda Account for key cache indices in subexpressions (Pieter Wuille) 4441c6f Make DescriptorImpl support multiple subscripts (Pieter Wuille) a917478 refactor: move population of out.scripts from ExpandHelper to MakeScripts (Pieter Wuille) 84f3939 Remove support for subdescriptors expanding to multiple scripts (Pieter Wuille) Pull request description: These are a few refactors and non-invasive improvements to the descriptors code to prepare for adding Taproot descriptors. None of the commits change behavior in any way, except the last one which improves error reporting a bit. ACKs for top commit: S3RK: reACK 0b188b7 Sjors: re-ACK 0b188b7 achow101: re-ACK 0b188b7 Tree-SHA512: cb4e999134aa2bace0e13d4883454c65bcf1369e1c8585d93cc6444ddc245f3def5a628d58af7dab577e9d5a4a75d3bb46f766421fcc8cc5c85c01a11f148b3f
2 parents de77cbc + 0b188b7 commit 906ecb8

File tree

2 files changed

+113
-88
lines changed

2 files changed

+113
-88
lines changed

0 commit comments

Comments
 (0)