Add versioned signatures for Sapling transactions

zcash_test_vectors/transaction.py

@@ -5,6 +5,7 @@
     Scalar as PallasScalar,
 )
 from .orchard.sinsemilla import group_hash as pallas_group_hash
+from .orchard_zsa.digests import NU7_TX_VERSION_BYTES
 from .sapling.generators import find_group_hash, SPENDING_KEY_BASE
 from .sapling.jubjub import (
     Fq,
@@ -516,10 +517,16 @@ def to_bytes(self, version_bytes, nVersionGroupId, nConsensusBranchId):
             for desc in self.vSpendsSapling: # vSpendProofsSapling
                 ret += bytes(desc.proof)
             for desc in self.vSpendsSapling: # vSpendAuthSigsSapling
+                if version_bytes == NU7_TX_VERSION_BYTES:
+                    ret += write_compact_size(len(desc.spendAuthSigInfo))
+                    ret += bytes(desc.spendAuthSigInfo)
                 ret += bytes(desc.spendAuthSig)
         for desc in self.vOutputsSapling: # vOutputProofsSapling
             ret += bytes(desc.proof)
         if hasSapling:
+            if version_bytes == NU7_TX_VERSION_BYTES:
+                ret += write_compact_size(len(self.bindingSigSaplingInfo))
+                ret += bytes(self.bindingSigSaplingInfo)
             ret += bytes(self.bindingSigSapling)
 
         return ret

zcash_test_vectors/transaction_v6.py

@@ -145,10 +145,13 @@ def __init__(self, rand, consensus_branch_id, sighash_info, have_orchard_zsa=Tru
         assert have_orchard_zsa or not have_burn
 
         # We cannot have issuance without an OrchardZSA bundle.
-        assert have_orchard_zsa or not have_issuance #TODO: VA: Combine this with the above?
+        assert have_orchard_zsa or not have_issuance
 
         # All Transparent, Sapling, and part of the Orchard Transaction Fields are initialized in the super class.
         super().__init__(rand, have_orchard_zsa)
+        for desc in self.vSpendsSapling:
+            desc.spendAuthSigInfo = sighash_info
+        self.bindingSigSaplingInfo = sighash_info
         self.bindingSigOrchardInfo = sighash_info
 
 

zcash_test_vectors/zip_0244.py

@@ -26,6 +26,8 @@
     SIGHASH_SINGLE,
 )
 
+from .zc_utils import write_compact_size
+
 
 # Transparent
 
@@ -57,16 +59,36 @@ def sapling_digest(tx):
 
     return digest.digest()
 
+SAPLING_AUTH_DIGEST_PERSONALIZAION = b'ZTxAuthSapliHash'
+
 def sapling_auth_digest(tx):
-    digest = blake2b(digest_size=32, person=b'ZTxAuthSapliHash')
+    digest = blake2b(digest_size=32, person=SAPLING_AUTH_DIGEST_PERSONALIZAION)
+
+    if len(tx.vSpendsSapling) + len(tx.vOutputsSapling) > 0:
+        for desc in tx.vSpendsSapling:
+            digest.update(bytes(desc.proof))
+        for desc in tx.vSpendsSapling:
+            digest.update(bytes(desc.spendAuthSig))
+        for desc in tx.vOutputsSapling:
+            digest.update(bytes(desc.proof))
+        digest.update(bytes(tx.bindingSigSapling))
+
+    return digest.digest()
+
+def sapling_auth_digest_v6(tx):
+    digest = blake2b(digest_size=32, person=SAPLING_AUTH_DIGEST_PERSONALIZAION)
 
     if len(tx.vSpendsSapling) + len(tx.vOutputsSapling) > 0:
         for desc in tx.vSpendsSapling:
             digest.update(bytes(desc.proof))
         for desc in tx.vSpendsSapling:
+            digest.update(write_compact_size(len(desc.spendAuthSigInfo)))
+            digest.update(bytes(desc.spendAuthSigInfo))
             digest.update(bytes(desc.spendAuthSig))
         for desc in tx.vOutputsSapling:
             digest.update(bytes(desc.proof))
+        digest.update(write_compact_size(len(tx.bindingSigSaplingInfo)))
+        digest.update(bytes(tx.bindingSigSaplingInfo))
         digest.update(bytes(tx.bindingSigSapling))
 
     return digest.digest()
@@ -222,11 +244,12 @@ def auth_digest(tx):
     )
 
     digest.update(transparent_scripts_digest(tx))
-    digest.update(sapling_auth_digest(tx))
     if tx.version_bytes() == NU7_TX_VERSION_BYTES:
+        digest.update(sapling_auth_digest_v6(tx))
         digest.update(orchard_zsa_auth_digest(tx))
         digest.update(issuance_auth_digest(tx))
     else:
+        digest.update(sapling_auth_digest(tx))
         digest.update(orchard_auth_digest(tx))
 
     return digest.digest()