Parse ConsensusBranchId into NetworkUpgrade for transaction v5

zebra-chain/src/parameters/network_upgrade.rs

@@ -76,7 +76,7 @@ pub(crate) const TESTNET_ACTIVATION_HEIGHTS: &[(block::Height, NetworkUpgrade)]
 
 /// The Consensus Branch Id, used to bind transactions and blocks to a
 /// particular network upgrade.
-#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq)]
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct ConsensusBranchId(u32);
 
 impl From<ConsensusBranchId> for u32 {
@@ -85,6 +85,12 @@ impl From<ConsensusBranchId> for u32 {
     }
 }
 
+impl From<u32> for ConsensusBranchId {
+    fn from(branch_id: u32) -> ConsensusBranchId {
+        ConsensusBranchId(branch_id)
+    }
+}
+
 /// Network Upgrade Consensus Branch Ids.
 ///
 /// Branch ids are the same for mainnet and testnet. If there is a testnet

zebra-chain/src/transaction.rs

@@ -23,7 +23,7 @@ pub use sighash::HashType;
 
 use crate::{
     block,
-    parameters::NetworkUpgrade,
+    parameters::{ConsensusBranchId, NetworkUpgrade},
     primitives::{Bctv14Proof, Groth16Proof},
     sapling, sprout, transparent,
 };
@@ -97,6 +97,8 @@ pub enum Transaction {
     },
     /// A `version = 5` transaction, which supports `Sapling` and `Orchard`.
     V5 {
+        /// The Consensus branch ID for this transaction.
+        consensus_branch_id: ConsensusBranchId,
         /// The earliest time or block height that this transaction can be added to the
         /// chain.
         lock_time: LockTime,

zebra-chain/src/transaction/arbitrary.rs

@@ -6,7 +6,7 @@ use proptest::{arbitrary::any, array, collection::vec, option, prelude::*};
 use crate::{
     amount::Amount,
     block,
-    parameters::NetworkUpgrade,
+    parameters::{ConsensusBranchId, NetworkUpgrade},
     primitives::{Bctv14Proof, Groth16Proof, ZkSnarkProof},
     sapling, sprout, transparent, LedgerState,
 };
@@ -103,15 +103,24 @@ impl Transaction {
     /// Generate a proptest strategy for V5 Transactions
     pub fn v5_strategy(ledger_state: LedgerState) -> BoxedStrategy<Self> {
         (
+            any::<ConsensusBranchId>(),
             any::<LockTime>(),
             any::<block::Height>(),
             transparent::Input::vec_strategy(ledger_state, 10),
             vec(any::<transparent::Output>(), 0..10),
             option::of(any::<sapling::ShieldedData<sapling::SharedAnchor>>()),
         )
             .prop_map(
-                |(lock_time, expiry_height, inputs, outputs, sapling_shielded_data)| {
+                |(
+                    consensus_branch_id,
+                    lock_time,
+                    expiry_height,
+                    inputs,
+                    outputs,
+                    sapling_shielded_data,
+                )| {
                     Transaction::V5 {
+                        consensus_branch_id,
                         lock_time,
                         expiry_height,
                         inputs,
@@ -177,6 +186,16 @@ impl Arbitrary for LockTime {
     type Strategy = BoxedStrategy<Self>;
 }
 
+impl Arbitrary for ConsensusBranchId {
+    type Parameters = ();
+
+    fn arbitrary_with(_args: ()) -> Self::Strategy {
+        (any::<u32>()).prop_map(ConsensusBranchId::from).boxed()
+    }
+
+    type Strategy = BoxedStrategy<Self>;
+}
+
 impl<P: ZkSnarkProof + Arbitrary + 'static> Arbitrary for JoinSplitData<P> {
     type Parameters = ();
 

zebra-chain/src/transaction/serialize.rs

@@ -343,6 +343,7 @@ impl ZcashSerialize for Transaction {
             }
 
             Transaction::V5 {
+                consensus_branch_id,
                 lock_time,
                 expiry_height,
                 inputs,
@@ -356,6 +357,9 @@ impl ZcashSerialize for Transaction {
                 writer.write_u32::<LittleEndian>(5 | (1 << 31))?;
                 writer.write_u32::<LittleEndian>(TX_V5_VERSION_GROUP_ID)?;
 
+                // header: Write the nConsensusBranchId
+                writer.write_u32::<LittleEndian>(u32::from(*consensus_branch_id))?;
+
                 // transaction validity time and height limits
                 lock_time.zcash_serialize(&mut writer)?;
                 writer.write_u32::<LittleEndian>(expiry_height.0)?;
@@ -491,6 +495,8 @@ impl ZcashDeserialize for Transaction {
                 if id != TX_V5_VERSION_GROUP_ID {
                     return Err(SerializationError::Parse("expected TX_V5_VERSION_GROUP_ID"));
                 }
+                let consensus_branch_id =
+                    ConsensusBranchId::from(reader.read_u32::<LittleEndian>()?);
 
                 // transaction validity time and height limits
                 let lock_time = LockTime::zcash_deserialize(&mut reader)?;
@@ -514,6 +520,7 @@ impl ZcashDeserialize for Transaction {
                 }
 
                 Ok(Transaction::V5 {
+                    consensus_branch_id,
                     lock_time,
                     expiry_height,
                     inputs,

zebra-chain/src/transaction/tests/vectors.rs

@@ -2,6 +2,7 @@ use super::super::*;
 
 use crate::{
     block::{Block, MAX_BLOCK_BYTES},
+    parameters::NetworkUpgrade::Nu5,
     sapling::{PerSpendAnchor, SharedAnchor},
     serialization::{ZcashDeserialize, ZcashDeserializeInto, ZcashSerialize},
 };
@@ -105,6 +106,7 @@ fn empty_v5_round_trip() {
     zebra_test::init();
 
     let tx = Transaction::V5 {
+        consensus_branch_id: Nu5.branch_id().expect("nu5 has a branch id"),
         lock_time: LockTime::min_lock_time(),
         expiry_height: block::Height(0),
         inputs: Vec::new(),
@@ -278,6 +280,7 @@ fn transaction_to_fake_v5(trans: &Transaction) -> Transaction {
             outputs,
             lock_time,
         } => V5 {
+            consensus_branch_id: Nu5.branch_id().expect("nu5 has a branch id"),
             inputs: inputs.to_vec(),
             outputs: outputs.to_vec(),
             lock_time: *lock_time,
@@ -290,6 +293,7 @@ fn transaction_to_fake_v5(trans: &Transaction) -> Transaction {
             lock_time,
             ..
         } => V5 {
+            consensus_branch_id: Nu5.branch_id().expect("nu5 has a branch id"),
             inputs: inputs.to_vec(),
             outputs: outputs.to_vec(),
             lock_time: *lock_time,
@@ -303,6 +307,7 @@ fn transaction_to_fake_v5(trans: &Transaction) -> Transaction {
             expiry_height,
             ..
         } => V5 {
+            consensus_branch_id: Nu5.branch_id().expect("nu5 has a branch id"),
             inputs: inputs.to_vec(),
             outputs: outputs.to_vec(),
             lock_time: *lock_time,
@@ -317,6 +322,7 @@ fn transaction_to_fake_v5(trans: &Transaction) -> Transaction {
             sapling_shielded_data,
             ..
         } => V5 {
+            consensus_branch_id: Nu5.branch_id().expect("nu5 has a branch id"),
             inputs: inputs.to_vec(),
             outputs: outputs.to_vec(),
             lock_time: *lock_time,