Merge branch 'fix-consensus-branch-id' of github.com:ZcashFoundation/…

…zebra into fix-consensus-branch-id
ZcashFoundation · Dec 3, 2024 · c2fe569 · c2fe569
2 parents 7ead50f + 8deea77
commit c2fe569
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/zebra-consensus/src/error.rs b/zebra-consensus/src/error.rs
@@ -240,7 +240,7 @@ pub enum TransactionError {
     #[cfg_attr(any(test, feature = "proptest-impl"), proptest(skip))]
     Zip317(#[from] zebra_chain::transaction::zip317::Error),
 
-    #[error("the transaction uses an incorrect consensus branch id")]
+    #[error("transaction uses an incorrect consensus branch id")]
     WrongConsensusBranchId,
 
     #[error("wrong tx format: tx version is ≥ 5, but `nConsensusBranchId` is missing")]

diff --git a/zebra-consensus/src/transaction/check.rs b/zebra-consensus/src/transaction/check.rs
@@ -523,6 +523,9 @@ pub fn consensus_branch_id(
         return Ok(());
     }
 
+
+
+
         let Some(tx_nu) = tx.network_upgrade() else {
             return Err(TransactionError::MissingConsensusBranchId);
         };
-Original file line number
+Diff line change
@@ Expand Up / @@ -523,6 +523,9 @@ pub fn consensus_branch_id( @@
             return Ok(());
         }
             let Some(tx_nu) = tx.network_upgrade() else {
                 return Err(TransactionError::MissingConsensusBranchId);
             };
@@ Expand Down @@