fix: Zcash transparent input loop + report duplicate key collision

1. zcash_sign_pczt(): Add Phase 3 transparent input signing loop.
   After Orchard action-ack loop, device may send ZcashTransparentSig
   requests for shielding transactions. New transparent_inputs parameter
   feeds inputs back. Without this, any transparent-to-shielded tx
   would throw "Unexpected response type".

2. generate-zoo-report.py: Key JUnit results by classname.name
   instead of bare test name. Prevents last-wins collision when
   multiple test modules define test_ping, test_sign, etc.
   Lookup falls back to bare name for backward compatibility.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: BitHighlander

keepkeylib/client.py

@@ -1625,11 +1625,13 @@ def zcash_sign_pczt(self, address_n, actions, account=None,
                         header_digest=None, transparent_digest=None,
                         sapling_digest=None, orchard_digest=None,
                         orchard_flags=None, orchard_value_balance=None,
-                        orchard_anchor=None):
+                        orchard_anchor=None, transparent_inputs=None):
         """Sign a Zcash Orchard shielded transaction via PCZT protocol.
 
-        Sends ZcashSignPCZT, then loops on ZcashPCZTActionAck feeding
-        actions one at a time, until the device returns ZcashSignedPCZT.
+        Phase 2: Sends ZcashSignPCZT, then loops on ZcashPCZTActionAck
+        feeding Orchard actions one at a time.
+        Phase 3: If transparent_inputs provided, handles ZcashTransparentSig
+        loop for transparent-to-shielded (shielding) transactions.
 
         Args:
             address_n: ZIP-32 derivation path [32', 133', account']
@@ -1682,7 +1684,7 @@ def zcash_sign_pczt(self, address_n, actions, account=None,
 
         resp = self.call(zcash_proto.ZcashSignPCZT(**kwargs))
 
-        # Ack loop: device asks for actions one at a time
+        # Phase 2: Orchard action-ack loop — device asks for actions one at a time
         while isinstance(resp, zcash_proto.ZcashPCZTActionAck):
             idx = resp.next_index
             if idx >= n_actions:
@@ -1692,6 +1694,21 @@ def zcash_sign_pczt(self, address_n, actions, account=None,
             action = actions[idx]
             resp = self.call(zcash_proto.ZcashPCZTAction(index=idx, **action))
 
+        # Phase 3: Transparent input signing — device sends back signatures
+        # and may request transparent inputs for shielding transactions
+        transparent_sigs = []
+        while isinstance(resp, zcash_proto.ZcashTransparentSig):
+            transparent_sigs.append(resp)
+            if not transparent_inputs:
+                raise Exception(
+                    "Device sent ZcashTransparentSig but no transparent_inputs provided")
+            if resp.input_index >= len(transparent_inputs):
+                raise Exception(
+                    "Device requested transparent input %d but only %d provided"
+                    % (resp.input_index, len(transparent_inputs)))
+            inp = transparent_inputs[resp.input_index]
+            resp = self.call(zcash_proto.ZcashTransparentInput(**inp))
+
         if isinstance(resp, proto.Failure):
             raise Exception("Zcash signing failed: %s" % resp.message)
 

scripts/generate-zoo-report.py

@@ -111,18 +111,20 @@ def parse_junit(junit_path):
     tree = ET.parse(junit_path)
     results = {}
     for tc in tree.iter('testcase'):
+        classname = tc.get('classname', '')
         name = tc.get('name', '')
+        key = '%s.%s' % (classname, name) if classname else name
         failure = tc.find('failure')
         error = tc.find('error')
         skip = tc.find('skipped')
         if failure is not None:
-            results[name] = 'FAIL'
+            results[key] = 'FAIL'
         elif error is not None:
-            results[name] = 'ERROR'
+            results[key] = 'ERROR'
         elif skip is not None:
-            results[name] = 'SKIP'
+            results[key] = 'SKIP'
         else:
-            results[name] = 'PASS'
+            results[key] = 'PASS'
     return results
 
 
@@ -276,7 +278,14 @@ def generate_html(screenshots, junit_results, output_path):
             for test_name, pngs in sorted(tests.items()):
                 test_counter[letter] += 1
                 idx = f"{letter}{test_counter[letter]}"
-                result = junit_results.get(test_name, 'UNKNOWN')
+                # Try classname.name first, fall back to bare name
+                result = 'UNKNOWN'
+                for key, val in junit_results.items():
+                    if key.endswith('.' + test_name):
+                        result = val
+                        break
+                else:
+                    result = junit_results.get(test_name, 'UNKNOWN')
                 status_class = 'pass' if result == 'PASS' else 'fail' if result in ('FAIL', 'ERROR') else ''
                 badge_class = 'pass' if result == 'PASS' else 'fail' if result in ('FAIL', 'ERROR') else 'skip'