diff --git a/src/embit/descriptor/miniscript.py b/src/embit/descriptor/miniscript.py index 9783afc1..e445cc28 100644 --- a/src/embit/descriptor/miniscript.py +++ b/src/embit/descriptor/miniscript.py @@ -687,6 +687,8 @@ def __len__(self): def verify(self): super().verify() + if not self.taproot and len(self.args) - 1 > 20: + raise MiniscriptError("%s: at most 20 public keys are allowed" % self.NAME) if self.args[0].num < 1 or self.args[0].num > (len(self.args) - 1): raise MiniscriptError( "multi: 1 <= k <= %d, got %d" % ((len(self.args) - 1), self.args[0].num) diff --git a/tests/tests/test_descriptor.py b/tests/tests/test_descriptor.py index 2101227b..5ebfc8f1 100644 --- a/tests/tests/test_descriptor.py +++ b/tests/tests/test_descriptor.py @@ -2,7 +2,7 @@ from binascii import hexlify from embit.descriptor import Descriptor, Key from embit.descriptor.arguments import KeyHash, Number -from embit.descriptor.miniscript import OPERATORS, WRAPPERS +from embit.descriptor.miniscript import OPERATORS, WRAPPERS, Miniscript from embit.descriptor.errors import MiniscriptError from embit.descriptor.checksum import add_checksum, DescriptorError from embit.networks import NETWORKS @@ -10,6 +10,39 @@ class DescriptorTest(TestCase): + def test_legacy_multisig_key_limit(self): + keys = [ + hexlify( + ec.PrivateKey(i.to_bytes(32, "big")).get_public_key().sec() + ).decode() + for i in range(1, 22) + ] + for operator in ("multi", "sortedmulti"): + valid = "%s(2,%s)" % (operator, ",".join(keys[:20])) + miniscript = Miniscript.from_string(valid) + miniscript.verify() + self.assertEqual(miniscript.compile()[-1:], b"\xae") + + invalid = "%s(2,%s)" % (operator, ",".join(keys)) + with self.assertRaises(MiniscriptError): + Miniscript.from_string(invalid).verify() + with self.assertRaises(MiniscriptError): + Descriptor.from_string("wsh(%s)" % invalid) + + def test_taproot_multisig_can_exceed_twenty_keys(self): + keys = [ + hexlify( + ec.PrivateKey(i.to_bytes(32, "big")).get_public_key().xonly() + ).decode() + for i in range(1, 22) + ] + for operator in ("multi_a", "sortedmulti_a"): + miniscript = Miniscript.from_string( + "%s(2,%s)" % (operator, ",".join(keys)), taproot=True + ) + miniscript.verify() + self.assertEqual(miniscript.compile()[-1:], b"\x9c") + def test_desc_checksum(self): """Tests descriptor checksums""" desc = ( @@ -223,7 +256,6 @@ def test_descriptor_from_string_validation(self): for d in keys: Descriptor.from_string(d) - # invalid keys = [ # # LIANA_MINISCRIPT_DESCRIPTOR