Merge PR #25 "miniscript: multi() is expressive"

darosior · Jan 17, 2023 · d2f5d8f · d2f5d8f
2 parents 27f3ecf + 0e4c1db
commit d2f5d8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/bip380/miniscript/fragments.py b/bip380/miniscript/fragments.py
@@ -424,7 +424,7 @@ def __init__(self, k, keys):
         self.p = Property("Bndu")
         self.needs_sig = True
         self.is_forced = False
-        self.is_expressive = False
+        self.is_expressive = True
         self.is_nonmalleable = True
         self.abs_heightlocks = False
         self.rel_heightlocks = False

diff --git a/tests/test_miniscript.py b/tests/test_miniscript.py
@@ -1000,3 +1000,8 @@ def test_satisfaction_validity():
     ]:
         andv_frag = fragments.AndV(fragments.WrapV(pk_frag), h_frag(digest))
         sat_test(andv_frag, keypairs=pk_keypairs, preimages={digest: preimage})
+
+
+def test_multi_is_expressive():
+    frag = fragments.Node.from_str(f"or_b(pk({dummy_pk()}),a:multi(1,{dummy_pk()},{dummy_pk()}))")
+    assert frag.is_nonmalleable