chore: update planning test gates

Author: BitHighlander

keepkeylib/client.py

@@ -1661,14 +1661,18 @@ def ton_sign_tx(self, address_n, raw_tx):
 
     # ── Zcash Address Display ─────────────────────────────────
     @expect(zcash_proto.ZcashAddress)
-    def zcash_display_address(self, address_n, address, ak, nk, rivk,
-                              account=None, expected_seed_fingerprint=None):
+    def zcash_display_address(self, address_n, address=None, ak=None, nk=None,
+                              rivk=None, account=None,
+                              expected_seed_fingerprint=None):
         """Display a Zcash unified address on the device for user confirmation.
 
         Args:
             address_n: ZIP-32 derivation path [32', 133', account']
-            address: unified address string ("u1...")
-            ak, nk, rivk: 32-byte FVK components for verification
+            address: optional unified address string ("u1..."). If omitted,
+                the device derives the default Orchard-only UA from seed/account.
+            ak, nk, rivk: optional 32-byte FVK components for host-supplied
+                address verification. Required by firmware when address is
+                provided.
             account: account index (alternative to full path)
             expected_seed_fingerprint: optional 32-byte ZIP-32 §6.1 seed
                 fingerprint. If provided, device verifies the match before
@@ -1678,7 +1682,15 @@ def zcash_display_address(self, address_n, address, ak, nk, rivk,
             ZcashAddress with .address and .seed_fingerprint of the
             attesting device.
         """
-        kwargs = dict(address_n=address_n, address=address, ak=ak, nk=nk, rivk=rivk)
+        kwargs = dict(address_n=address_n)
+        if address is not None:
+            kwargs['address'] = address
+        if ak is not None:
+            kwargs['ak'] = ak
+        if nk is not None:
+            kwargs['nk'] = nk
+        if rivk is not None:
+            kwargs['rivk'] = rivk
         if account is not None:
             kwargs['account'] = account
         if expected_seed_fingerprint is not None:

scripts/generate-test-report.py

@@ -775,15 +775,15 @@ def parse_junit(path):
        'cause fund loss or invalid transactions on the block-lattice.',
        [])]),
 
-    # ===== 7.14 NEW FEATURES =====
-    ('V', 'EVM Clear-Signing', '7.14.0',
+    # ===== 7.15.1 NEW FEATURES =====
+    ('V', 'EVM Clear-Signing', '7.15.1',
      'NEW: Verified transaction metadata for EVM contracts. Host sends a signed blob with contract '
      'name, function, and decoded parameters. Device verifies blob signature against trusted key, '
-     'then shows human-readable details with VERIFIED icon. Blind-sign policy gating is deferred '
-     'to firmware 7.15+.',
+     'then shows human-readable details with VERIFIED icon. Blind-sign policy gating ships with '
+     'firmware 7.15.1+.',
      [
          'CLEAR-SIGN: Signed metadata -> verify signature -> VERIFIED icon + method + decoded args',
-         'BLIND SIGN: No metadata + AdvancedMode on -> contract data signed (no gate until 7.15+)',
+         'BLIND SIGN: No metadata + AdvancedMode on -> contract data signed after policy gate',
      ],
      [
          ('V1', 'test_msg_ethereum_clear_signing', 'test_valid_metadata_returns_verified',
@@ -808,7 +808,7 @@ def parse_junit(path):
          ('V8', 'test_msg_ethereum_signtx', 'test_ethereum_blind_sign_allowed',
           'Blind sign permitted (AdvancedMode ON)',
           'Contract data with AdvancedMode enabled. Device allows signing. '
-          'Blind-sign blocking deferred to 7.15+.',
+          'Blind-sign policy gating covered in 7.15.1+.',
           []),
      ]),
 

tests/test_msg_ethereum_clear_signing.py

@@ -411,7 +411,7 @@ class TestEthereumClearSigning(common.KeepKeyTest):
 
     def setUp(self):
         super().setUp()
-        self.requires_firmware("7.14.0")
+        self.requires_firmware("7.15.1")
         self.requires_message("EthereumTxMetadata")
         self.setup_mnemonic_nopin_nopassphrase()
 

tests/test_msg_ethereum_signtx.py

@@ -100,7 +100,7 @@ def test_ethereum_blind_sign_blocked(self):
 
         OLED shows 'Blind signing disabled' then Failure.
         """
-        self.requires_firmware("7.15.0")
+        self.requires_firmware("7.15.1")
         self.requires_fullFeature()
         self.setup_mnemonic_nopin_nopassphrase()
         self.client.apply_policy("AdvancedMode", 0)
@@ -124,7 +124,7 @@ def test_ethereum_blind_sign_allowed(self):
 
         OLED shows 'BLIND SIGNATURE' before signing.
         """
-        self.requires_firmware("7.14.0")
+        self.requires_firmware("7.15.1")
         self.requires_fullFeature()
         self.setup_mnemonic_nopin_nopassphrase()
         self.client.apply_policy("AdvancedMode", 1)

tests/test_msg_zcash_display_address.py

@@ -15,6 +15,11 @@
 # Hardened offset
 H = 0x80000000
 
+ORCHARD_ONLY_UA_ACCOUNT_0 = (
+    "u1uzslnccvrw4r2y2kgjz7fm477xcnzge9z45scm4e6l6c63ren0ru29teedxw5vxu7c8xch"
+    "p3ec2pu3wkgldc5zphwtm4w3fchcwrl26c"
+)
+
 
 class TestMsgZcashDisplayAddress(common.KeepKeyTest):
     """Test Zcash unified address display and verification."""
@@ -24,6 +29,20 @@ def setUp(self):
         self.requires_firmware("7.15.0")
         self.requires_message("ZcashDisplayAddress")
 
+    def test_zcash_display_address_device_derived(self):
+        """Device derives and displays the Orchard-only UA from seed/account."""
+        self.setup_mnemonic_allallall()
+
+        resp = self.client.zcash_display_address(
+            address_n=[H + 32, H + 133, H + 0],
+            account=0,
+        )
+
+        self.assertIsInstance(resp, zcash_proto.ZcashAddress)
+        self.assertEqual(resp.address, ORCHARD_ONLY_UA_ACCOUNT_0)
+        self.assertTrue(resp.HasField("seed_fingerprint"))
+        self.assertEqual(len(resp.seed_fingerprint), 32)
+
     def test_zcash_display_address_basic(self):
         """Verify a unified address using FVK components from the device."""
         self.setup_mnemonic_allallall()
@@ -37,23 +56,18 @@ def test_zcash_display_address_basic(self):
         self.assertIsNotNone(fvk_resp.nk)
         self.assertIsNotNone(fvk_resp.rivk)
 
-        # Use a placeholder unified address -- real address construction
-        # requires librustzcash (host-side). The firmware verifies the FVK
-        # matches its own derivation, not the address encoding.
-        # For a real test, construct a proper unified address externally.
-        resp = self.client.call(
-            zcash_proto.ZcashDisplayAddress(
-                address_n=[H + 32, H + 133, H + 0],
-                account=0,
-                address="u1placeholder",
-                ak=fvk_resp.ak,
-                nk=fvk_resp.nk,
-                rivk=fvk_resp.rivk,
-            )
+        resp = self.client.zcash_display_address(
+            address_n=[H + 32, H + 133, H + 0],
+            account=0,
+            address=ORCHARD_ONLY_UA_ACCOUNT_0,
+            ak=fvk_resp.ak,
+            nk=fvk_resp.nk,
+            rivk=fvk_resp.rivk,
         )
 
         # Device should verify FVK matches and return the address
         self.assertIsInstance(resp, zcash_proto.ZcashAddress)
+        self.assertEqual(resp.address, ORCHARD_ONLY_UA_ACCOUNT_0)
 
     def test_zcash_display_address_wrong_fvk_rejected(self):
         """Device rejects address when FVK doesn't match its own derivation."""
@@ -64,15 +78,13 @@ def test_zcash_display_address_wrong_fvk_rejected(self):
 
         # Send bogus FVK -- device should reject
         with pytest.raises(CallException):
-            self.client.call(
-                zcash_proto.ZcashDisplayAddress(
-                    address_n=[H + 32, H + 133, H + 0],
-                    account=0,
-                    address="u1placeholder",
-                    ak=b'\x00' * 32,
-                    nk=b'\x00' * 32,
-                    rivk=b'\x00' * 32,
-                )
+            self.client.zcash_display_address(
+                address_n=[H + 32, H + 133, H + 0],
+                account=0,
+                address=ORCHARD_ONLY_UA_ACCOUNT_0,
+                ak=b'\x00' * 32,
+                nk=b'\x00' * 32,
+                rivk=b'\x00' * 32,
             )