Display miniscript and musig2 addresses on supported devices

hwilib/commands.py

@@ -42,6 +42,7 @@
     RegisteredDescriptor,
     parse_descriptor,
     MultisigDescriptor,
+    MusigPubkeyProvider,
     TRDescriptor,
     PKHDescriptor,
     PubkeyProvider,
@@ -511,7 +512,11 @@ def displayaddress(
                 return {"address": client.display_multisig_address(addr_type, descriptor)}
         is_wpkh = isinstance(descriptor, WPKHDescriptor)
         if isinstance(descriptor, PKHDescriptor) or is_wpkh or isinstance(descriptor, TRDescriptor):
+            if descriptor.subdescriptors:
+                raise BadArgumentError("tr() descriptors with a script tree require a registered BIP 388 policy; use --registration")
             pubkey = descriptor.pubkeys[0]
+            if isinstance(pubkey, MusigPubkeyProvider):
+                raise BadArgumentError("musig() addresses require a registered BIP 388 policy; use --registration")
             if pubkey.origin is None:
                 raise BadArgumentError(f"Descriptor missing origin info: {desc}")
             if pubkey.origin.fingerprint != client.get_master_fingerprint():

test/data/speculos-automation.json

@@ -33,7 +33,7 @@
             ]
         },
         {
-            "regexp": "^(Address|Review|Account name|Amount|External amounts|You spend|You receive|Confirm|The derivation|Derivation path|Reject if|The change path|Change path|Register wallet|Policy map|Key|Path|Public key|Our key|Their key|Unspendable key|Spend from|Spending policy|Primary spending path|Spending path|Transaction output|From account|Wallet name|Wallet policy|Descriptor template|Verify [Bb]itcoin|Output|Warning).*",
+            "regexp": "^(Address|Review|Account name|Amount|External amounts|You spend|You receive|Confirm|The derivation|Derivation path|Reject if|The change path|Change path|Register wallet|Policy map|Key|Path|Public key|Our key|Their key|Unspendable key|Spend from|Spending policy|Primary.*ing path|Spending path|Transaction output|From account|Wallet name|Wallet policy|Descriptor template|Verify [Bb]itcoin|Output|Warning).*",
             "actions": [
                 [ "button", 2, true ],
                 [ "button", 2, false ]

test/test_bitbox02.py

@@ -19,6 +19,8 @@
     TestGetKeypool,
     TestGetDescriptors,
     TestRegisterDescriptor,
+    TestSegwitMiniscriptDisplay,
+    TestTaprootMiniscriptDisplay,
     TestSignTx,
 )
 
@@ -40,6 +42,9 @@ def __init__(self, simulator):
         self.supports_xpub_ms_display = False
         self.supports_unsorted_ms = False
         self.supports_taproot = False
+        self.supports_segwit_miniscript = True
+        self.supports_taproot_miniscript = True
+        self.supports_musig2 = False
         self.strict_bip48 = False
         self.include_xpubs = True
         self.supports_device_multiple_multisig = True
@@ -138,6 +143,8 @@ def bitbox02_test_suite(simulator, bitcoind, interface):
         sorted=False,
         supports_multiple_policies=False,
     ))
+    suite.addTest(DeviceTestCase.parameterize(TestSegwitMiniscriptDisplay, bitcoind, emulator=dev_emulator, interface=interface))
+    suite.addTest(DeviceTestCase.parameterize(TestTaprootMiniscriptDisplay, bitcoind, emulator=dev_emulator, interface=interface))
 
     result = unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run(suite)
     return result.wasSuccessful()

test/test_coldcard.py

@@ -21,7 +21,11 @@
     TestDisplayAddress,
     TestGetKeypool,
     TestGetDescriptors,
+    TestMuSig2Display,
+    TestMuSig2MiniscriptDisplay,
     TestRegisterDescriptor,
+    TestSegwitMiniscriptDisplay,
+    TestTaprootMiniscriptDisplay,
     TestSignMessage,
     TestSignTx,
 )
@@ -63,6 +67,9 @@ def __init__(self, simulator, is_edge=False):
         self.supports_xpub_ms_display = False
         self.supports_unsorted_ms = False
         self.supports_taproot = is_edge
+        self.supports_segwit_miniscript = is_edge
+        self.supports_taproot_miniscript = is_edge
+        self.supports_musig2 = is_edge
         self.strict_bip48 = False
         self.include_xpubs = False
         self.supports_device_multiple_multisig = True
@@ -208,8 +215,12 @@ def coldcard_test_suite(simulator, bitcoind, interface, is_edge=False):
         returns_registration=False,
         supports_multiple_policies=is_edge,
     ))
+    suite.addTest(DeviceTestCase.parameterize(TestSegwitMiniscriptDisplay, bitcoind, emulator=dev_emulator, interface=interface))
     if is_edge:
         suite.addTest(DeviceTestCase.parameterize(TestColdcardEdgeDisplayAddress, bitcoind, emulator=dev_emulator, interface=interface))
+        suite.addTest(DeviceTestCase.parameterize(TestTaprootMiniscriptDisplay, bitcoind, emulator=dev_emulator, interface=interface))
+        suite.addTest(DeviceTestCase.parameterize(TestMuSig2Display, bitcoind, emulator=dev_emulator, interface=interface))
+        suite.addTest(DeviceTestCase.parameterize(TestMuSig2MiniscriptDisplay, bitcoind, emulator=dev_emulator, interface=interface))
 
     result = unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run(suite)
     return result.wasSuccessful()