Skip to content

descriptor: allow U type children for thresh() expressions #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 26, 2025
Merged

descriptor: allow U type children for thresh() expressions #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c294e0
descriptor: allow U type children for thresh() expressions
jgriffiths Mar 11, 2025
fde2ab1
add a test for thresh/U children from the reference impl
jgriffiths Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/ctest/test_descriptor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,16 @@ static const struct descriptor_test {
"02d7924d4f7d43ea965a465ae3095ff41131e5946f3c85f79e44adbcf8e27e080e",
"ks05yr6p"
},
/*
* Miniscript: https://bitcoin.sipa.be/miniscript/
*/
{
"miniscript - A 3-of-3 that turns into a 2-of-3 after 90 days",
"thresh(3,pk(key_1),s:pk(key_2),s:pk(key_3),sln:older(12960))",
WALLY_NETWORK_NONE, 0, 0, 0, NULL, WALLY_MINISCRIPT_ONLY,
"21038bc7431d9285a064b0328b6333f3a20b86664437b6de8f4e26e6bbdee258f048ac7c2103a22745365f673e658f0d25eb0afa9aaece858c6a48dfe37a67210c2e23da8ce7ac937c2103b428da420cd337c7208ed42c5331ebb407bb59ffbe3dc27936a227c619804284ac937c63006702a032b29268935387",
"2sw64huw"
},
/*
* Miniscript: Randomly generated test set that covers the majority of type and node type combinations
*/
Expand Down
2 changes: 1 addition & 1 deletion src/descriptor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@ static int verify_thresh(ms_ctx *ctx, ms_node *node)
for (child = top->next; child; child = child->next) {
const uint32_t expected_type = count ? TYPE_W : TYPE_B;

if (!child->builtin || (~child->type_properties & (expected_type | PROP_D | PROP_U)))
if (!child->builtin || (~child->type_properties & (expected_type | PROP_D)))
return WALLY_EINVAL;

if (~child->type_properties & PROP_E)
Expand Down
Loading