Fixed header digest in zip_0244

Author: mariopil

zcash_test_vectors/transaction.py

@@ -417,18 +417,18 @@ def __bytes__(self):
 
 
 class TransactionV5(object):
-    def __init__(self, rand, consensus_branch_id, version_group_id):
+    def __init__(self, rand, consensus_branch_id):
         # Decide which transaction parts will be generated.
         flip_coins = rand.u8()
 
-        self.init_header(consensus_branch_id, version_group_id, rand)
+        self.init_header(consensus_branch_id, rand)
         self.init_transparent(rand, flip_coins)
         self.init_sapling(rand, flip_coins)
         self.init_orchard(rand, flip_coins)
 
-    def init_header(self, consensus_branch_id, version_group_id, rand):
+    def init_header(self, consensus_branch_id, rand):
         # Common Transaction Fields
-        self.nVersionGroupId = version_group_id
+        self.nVersionGroupId = NU5_VERSION_GROUP_ID
         self.nConsensusBranchId = consensus_branch_id
         self.nLockTime = rand.u32()
         self.nExpiryHeight = rand.u32() % TX_EXPIRY_HEIGHT_THRESHOLD
@@ -592,9 +592,9 @@ def orchard_bytes(self):
         return ret
 
 class TransactionV6(TransactionV5):
-    def init_header(self, consensus_branch_id, version_group_id, rand):
+    def init_header(self, consensus_branch_id, rand):
         # Common Transaction Fields
-        self.nVersionGroupId = version_group_id
+        self.nVersionGroupId = V6_VERSION_GROUP_ID
         self.nConsensusBranchId = consensus_branch_id
         self.nLockTime = rand.u32()
         self.nExpiryHeight = rand.u32() % TX_EXPIRY_HEIGHT_THRESHOLD
@@ -615,10 +615,10 @@ class Transaction(object):
     def __init__(self, rand, version, consensus_branch_id=None):
         if version == NU5_TX_VERSION:
             assert consensus_branch_id is not None
-            self.inner = TransactionV5(rand, consensus_branch_id, NU5_VERSION_GROUP_ID)
+            self.inner = TransactionV5(rand, consensus_branch_id)
         elif version == V6_TX_VERSION:
             assert consensus_branch_id is not None
-            self.inner = TransactionV6(rand, consensus_branch_id, V6_VERSION_GROUP_ID)
+            self.inner = TransactionV6(rand, consensus_branch_id)
         else:
             self.inner = LegacyTransaction(rand, version)
 

zcash_test_vectors/zip_0233.py

@@ -4,10 +4,7 @@
 from hashlib import blake2b
 import struct
 
-from .transaction import (
-    V6_VERSION_GROUP_ID,
-    TransactionV6,
-)
+from .transaction import TransactionV6
 from .output import render_args, render_tv, Some
 from .rand import Rand
 from .zip_0143 import (
@@ -35,7 +32,7 @@ def randbytes(l):
 
     test_vectors = []
     for _ in range(10):
-        tx = TransactionV6(rand, consensusBranchId, V6_VERSION_GROUP_ID)
+        tx = TransactionV6(rand, consensusBranchId)
 
         # Generate amounts and scriptCodes for each non-dummy transparent input.
         if tx.is_coinbase():

zcash_test_vectors/zip_0244.py

@@ -6,8 +6,6 @@
 
 from .transaction import (
     MAX_MONEY,
-    NU5_TX_VERSION,
-    NU5_VERSION_GROUP_ID,
     Script,
     TransactionV5,
 )
@@ -191,8 +189,6 @@ def header_digest(tx):
     digest.update(struct.pack('<I', tx.nExpiryHeight))
     if hasattr(tx, 'zip233Amount'):
         digest.update(struct.pack('<Q', tx.zip233Amount))
-    else:
-        digest.update(struct.pack('<Q', 0))
 
     return digest.digest()
 
@@ -357,7 +353,7 @@ def randbytes(l):
 
     test_vectors = []
     for _ in range(10):
-        tx = TransactionV5(rand, consensusBranchId, NU5_VERSION_GROUP_ID)
+        tx = TransactionV5(rand, consensusBranchId)
         txid = txid_digest(tx)
         auth = auth_digest(tx)