fix(signing): cover ZIP-229 and ambiguous message acks

Author: BitHighlander

tests/test_msg_mayachain_signtx.py

@@ -9,7 +9,9 @@
 from ecdsa.util import sigdecode_string
 
 import keepkeylib.messages_pb2 as proto
+import keepkeylib.messages_mayachain_pb2 as mayachain_proto
 import keepkeylib.types_pb2 as proto_types
+from keepkeylib.client import CallException
 from keepkeylib.tools import parse_path
 from keepkeylib.signed_metadata import eth_sighash_legacy, keccak256
 
@@ -54,6 +56,28 @@ def recover_eth_signer(sig_r, sig_s, sig_v, digest, chain_id):
 
 class TestMsgMayaChainSignTx(common.KeepKeyTest):
 
+    def test_ack_rejects_send_and_deposit_together(self):
+        """An unused deposit submessage must not suppress the signed tx memo."""
+        self.requires_firmware("7.15.0")
+        self.requires_fullFeature()
+        self.setup_mnemonic_nopin_nopassphrase()
+
+        response = self.client.call(mayachain_proto.MayachainSignTx(
+            address_n=parse_path(DEFAULT_BIP32_PATH), account_number=92,
+            chain_id="mayachain", fee_amount=3000, gas=200000,
+            memo="SWAP:BTC.BTC:bc1qreviewthismemo", sequence=3,
+            msg_count=1, testnet=False))
+        self.assertIsInstance(response, mayachain_proto.MayachainMsgRequest)
+
+        with self.assertRaises(CallException):
+            self.client.call(mayachain_proto.MayachainMsgAck(
+                send=mayachain_proto.MayachainMsgSend(
+                    to_address="maya1jvt443rvhq5h8yrna55yjysvhtju0el7mdujp3",
+                    amount=10000, denom="cacao"),
+                deposit=mayachain_proto.MayachainMsgDeposit(
+                    asset="MAYA.CACAO", amount=1, memo="unused",
+                    signer="maya1ls33ayg26kmltw7jjy55p32ghjna09zp7z4etj")))
+
     def _maya_send_digest(self, account_number, chain_id, fee, gas, memo,
                           amount, from_address, to_address, sequence):
         """SHA256 of the amino StdSignDoc exactly as mayachain.c streams it.

tests/test_msg_thorchain_signtx.py

@@ -120,6 +120,28 @@ def test_legacy_rune_does_not_send_unknown_field(self):
 
 class TestMsgThorChainSignTx(common.KeepKeyTest):
 
+    def test_ack_rejects_send_and_deposit_together(self):
+        """An unused deposit submessage must not alter the send review flow."""
+        self.requires_fullFeature()
+        self.requires_firmware("7.15.0")
+        self.setup_mnemonic_nopin_nopassphrase()
+
+        response = self.client.call(thorchain_proto.ThorchainSignTx(
+            address_n=parse_path(DEFAULT_BIP32_PATH), account_number=92,
+            chain_id="thorchain", fee_amount=3000, gas=200000,
+            memo="SWAP:BTC.BTC:bc1qreviewthismemo", sequence=3,
+            msg_count=1, testnet=False))
+        self.assertIsInstance(response, thorchain_proto.ThorchainMsgRequest)
+
+        with self.assertRaises(CallException):
+            self.client.call(thorchain_proto.ThorchainMsgAck(
+                send=thorchain_proto.ThorchainMsgSend(
+                    to_address="thor1jvt443rvhq5h8yrna55yjysvhtju0el7ldnwwy",
+                    amount=10000, denom="rune"),
+                deposit=thorchain_proto.ThorchainMsgDeposit(
+                    asset="THOR.RUNE", amount=1, memo="unused",
+                    signer="thor1ls33ayg26kmltw7jjy55p32ghjna09zp6z69y8")))
+
     def test_thorchain_sign_tx(self):
         self.requires_fullFeature()
         self.requires_firmware("7.0.2")

tests/test_msg_zcash_sign_pczt_device.py

@@ -168,10 +168,11 @@ def sign_kwargs(actions, ironwood=False, **overrides):
         # victim's note, reusing an approved action's alpha so the one emitted
         # RedPallas signature verified in both bundles.
         #
-        # ZIP-244 empty-bundle digest: BLAKE2b-256 of the empty string
-        # personalized "ZTxIdOrchardHash". The device now requires exactly this.
+        # ZIP-229 v6 empty-bundle digest: BLAKE2b-256 of the empty string
+        # personalized "ZTxIdOrchardH_v6". The v5/ZIP-244
+        # "ZTxIdOrchardHash" value is a different digest.
         kwargs['orchard_digest'] = bytes.fromhex(
-            '9fbe4ed13b0c08e671c11a3407d84e1117cd45028a2eee1b9feae78b48a6e2c1')
+            'a3367d2fdea2910159fc5026e9bf1fccd3e28ce5e6de46bfb71587230eea9515')
     kwargs.update(overrides)
     return kwargs
 
@@ -319,7 +320,7 @@ def test_ironwood_rejects_a_non_empty_orchard_bundle(self):
         """
         actions = [note_action(CMX_IRONWOOD)]
         kwargs = sign_kwargs(actions, ironwood=True)
-        # Anything but the ZIP-244 empty-bundle digest must be refused.
+        # Anything but the ZIP-229 v6 empty-bundle digest must be refused.
         kwargs['orchard_digest'] = bytes([0x11]) * 32
 
         with self.assertRaises(Exception) as caught: