mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

miniscript: sanity asserts context in ComputeType

Browse Source
This commit is contained in:
Antoine Poinsot committed 2023-10-08 02:43:16 +02:00
1 parent e5aaa3d77a
commit 892436c7d5
1 file changed
+8 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/script/miniscript.cpp
+8 -2
View File
@@ -71,8 +71,10 @@ Type ComputeType(Fragment fragment, Type x, Type y, Type z, const std::vector<Ty
assert(n_keys == 1); assert(n_keys == 1);
} else if (fragment == Fragment::MULTI) { } else if (fragment == Fragment::MULTI) {
assert(n_keys >= 1 && n_keys <= MAX_PUBKEYS_PER_MULTISIG); assert(n_keys >= 1 && n_keys <= MAX_PUBKEYS_PER_MULTISIG);
assert(!IsTapscript(ms_ctx));
} else if (fragment == Fragment::MULTI_A) { } else if (fragment == Fragment::MULTI_A) {
assert(n_keys >= 1 && n_keys <= MAX_PUBKEYS_PER_MULTI_A); assert(n_keys >= 1 && n_keys <= MAX_PUBKEYS_PER_MULTI_A);
assert(IsTapscript(ms_ctx));
} else { } else {
assert(n_keys == 0); assert(n_keys == 0);
} }
@@ -215,8 +217,12 @@ Type ComputeType(Fragment fragment, Type x, Type y, Type z, const std::vector<Ty
((x << "h"_mst) && (y << "g"_mst)) || ((x << "h"_mst) && (y << "g"_mst)) ||
((x << "i"_mst) && (y << "j"_mst)) || ((x << "i"_mst) && (y << "j"_mst)) ||
((x << "j"_mst) && (y << "i"_mst)))); // k=k_x*k_y*k_z* !(g_x*h_y + h_x*g_y + i_x*j_y + j_x*i_y) ((x << "j"_mst) && (y << "i"_mst)))); // k=k_x*k_y*k_z* !(g_x*h_y + h_x*g_y + i_x*j_y + j_x*i_y)
case Fragment::MULTI: return "Bnudemsk"_mst; case Fragment::MULTI: {
case Fragment::MULTI_A: return "Budemsk"_mst; return "Bnudemsk"_mst;
}
case Fragment::MULTI_A: {
return "Budemsk"_mst;
}
case Fragment::THRESH: { case Fragment::THRESH: {
bool all_e = true; bool all_e = true;
bool all_m = true; bool all_m = true;