Add tx_sighash to VerifiedUnminedTx

dmidem · dmidem · commit 56761d37e902 · 2026-03-14T16:01:10.000Z
diff --git a/zebra-chain/src/tests/vectors.rs b/zebra-chain/src/tests/vectors.rs
@@ -8,7 +8,7 @@ use crate::{
     block::Block,
     parameters::Network,
     serialization::ZcashDeserializeInto,
-    transaction::{UnminedTx, VerifiedUnminedTx},
+    transaction::{SigHash, UnminedTx, VerifiedUnminedTx},
 };
 
 use zebra_test::vectors::{
@@ -74,6 +74,7 @@ impl Network {
                     transaction,
                     Amount::try_from(1_000_000).expect("valid amount"),
                     0,
+                    SigHash([0; 32]),
                 )
                 .ok()
             })
diff --git a/zebra-chain/src/transaction/arbitrary.rs b/zebra-chain/src/transaction/arbitrary.rs
@@ -15,7 +15,9 @@ use crate::{
     primitives::{Bctv14Proof, Groth16Proof, Halo2Proof, ZkSnarkProof},
     sapling::{self, AnchorVariant, PerSpendAnchor, SharedAnchor},
     serialization::{self, ZcashDeserializeInto},
-    sprout, transparent,
+    sprout,
+    transaction::SigHash,
+    transparent,
     value_balance::{ValueBalance, ValueBalanceError},
     LedgerState,
 };
@@ -942,6 +944,7 @@ impl Arbitrary for VerifiedUnminedTx {
             any::<f32>(),
             serialization::arbitrary::datetime_u32(),
             any::<block::Height>(),
+            any::<[u8; 32]>().prop_map(SigHash),
         )
             .prop_map(
                 |(
@@ -952,6 +955,7 @@ impl Arbitrary for VerifiedUnminedTx {
                     fee_weight_ratio,
                     time,
                     height,
+                    tx_sighash,
                 )| {
                     if unpaid_actions > conventional_actions {
                         unpaid_actions = conventional_actions;
@@ -969,6 +973,7 @@ impl Arbitrary for VerifiedUnminedTx {
                         fee_weight_ratio,
                         time: Some(time),
                         height: Some(height),
+                        tx_sighash,
                     }
                 },
             )
diff --git a/zebra-chain/src/transaction/unmined.rs b/zebra-chain/src/transaction/unmined.rs
@@ -22,7 +22,7 @@ use crate::{
     block::Height,
     serialization::ZcashSerialize,
     transaction::{
-        AuthDigest, Hash,
+        AuthDigest, Hash, SigHash,
         Transaction::{self, *},
         WtxId,
     },
@@ -369,6 +369,9 @@ pub struct VerifiedUnminedTx {
     /// The tip height when the transaction was added to the mempool, or None if
     /// it has not reached the mempool yet.
     pub height: Option<Height>,
+
+    /// The shielded sighash for this transaction.
+    pub tx_sighash: SigHash,
 }
 
 impl fmt::Debug for VerifiedUnminedTx {
@@ -396,6 +399,7 @@ impl VerifiedUnminedTx {
         transaction: UnminedTx,
         miner_fee: Amount<NonNegative>,
         legacy_sigop_count: u32,
+        tx_sighash: SigHash,
     ) -> Result<Self, zip317::Error> {
         let fee_weight_ratio = zip317::conventional_fee_weight_ratio(&transaction, miner_fee);
         let conventional_actions = zip317::conventional_actions(&transaction.transaction);
@@ -412,6 +416,7 @@ impl VerifiedUnminedTx {
             unpaid_actions,
             time: None,
             height: None,
+            tx_sighash,
         })
     }
 
diff --git a/zebra-consensus/src/transaction.rs b/zebra-consensus/src/transaction.rs
@@ -413,7 +413,7 @@ where
                     tx_id,
                     miner_fee: Some(verified_tx.miner_fee),
                     sigops: verified_tx.sigops,
-                    tx_sighash: SigHash([0u8; 32]) // FIXME: use verified_tx.tx_sighash instead
+                    tx_sighash: verified_tx.tx_sighash,
                 });
             }
 
@@ -597,6 +597,7 @@ where
                         tx,
                         miner_fee.expect("fee should have been checked earlier"),
                         sigops,
+                        tx_sighash
                     )?;
 
                     if let Some(mut mempool) = mempool {
diff --git a/zebra-rpc/src/methods/tests/vectors.rs b/zebra-rpc/src/methods/tests/vectors.rs
@@ -23,7 +23,7 @@ use zebra_chain::{
         NetworkKind,
     },
     serialization::{DateTime32, ZcashDeserializeInto, ZcashSerialize},
-    transaction::{zip317, UnminedTxId, VerifiedUnminedTx},
+    transaction::{zip317, SigHash, UnminedTxId, VerifiedUnminedTx},
     work::difficulty::{CompactDifficulty, ExpandedDifficulty, ParameterDifficulty as _, U256},
 };
 use zebra_consensus::MAX_BLOCK_SIGOPS;
@@ -2322,6 +2322,7 @@ async fn gbt_with(net: Network, addr: ZcashAddress) {
         fee_weight_ratio: 1.0,
         time: None,
         height: None,
+        tx_sighash: SigHash([0; 32]),
     };
 
     let next_fake_tip_hash =
diff --git a/zebrad/src/components/inbound/tests/fake_peer_set.rs b/zebrad/src/components/inbound/tests/fake_peer_set.rs
@@ -15,7 +15,7 @@ use zebra_chain::{
     fmt::humantime_seconds,
     parameters::Network::{self, *},
     serialization::{DateTime32, ZcashDeserializeInto},
-    transaction::{UnminedTx, UnminedTxId, VerifiedUnminedTx},
+    transaction::{SigHash, UnminedTx, UnminedTxId, VerifiedUnminedTx},
 };
 use zebra_consensus::{error::TransactionError, transaction, Config as ConsensusConfig};
 use zebra_network::{
@@ -171,6 +171,7 @@ async fn mempool_push_transaction() -> Result<(), crate::BoxError> {
                 transaction,
                 Amount::try_from(1_000_000).expect("valid amount"),
                 0,
+                SigHash([0; 32]),
             )
             .expect("verification should pass"),
         ));
@@ -279,6 +280,7 @@ async fn mempool_advertise_transaction_ids() -> Result<(), crate::BoxError> {
                 transaction,
                 Amount::try_from(1_000_000).expect("valid amount"),
                 0,
+                SigHash([0; 32]),
             )
             .expect("verification should pass"),
         ));
@@ -381,6 +383,7 @@ async fn mempool_transaction_expiration() -> Result<(), crate::BoxError> {
                 transaction,
                 Amount::try_from(1_000_000).expect("valid amount"),
                 0,
+                SigHash([0; 32]),
             )
             .expect("verification should pass"),
         ));
@@ -520,6 +523,7 @@ async fn mempool_transaction_expiration() -> Result<(), crate::BoxError> {
                 transaction,
                 Amount::try_from(1_000_000).expect("valid amount"),
                 0,
+                SigHash([0; 32]),
             )
             .expect("verification should pass"),
         ));
diff --git a/zebrad/src/components/mempool/storage/tests/prop.rs b/zebrad/src/components/mempool/storage/tests/prop.rs
@@ -16,7 +16,7 @@ use zebra_chain::{
     sapling,
     serialization::AtLeastOne,
     sprout,
-    transaction::{self, JoinSplitData, Transaction, UnminedTxId, VerifiedUnminedTx},
+    transaction::{self, JoinSplitData, SigHash, Transaction, UnminedTxId, VerifiedUnminedTx},
     transparent, LedgerState,
 };
 
@@ -490,13 +490,15 @@ impl SpendConflictTestInput {
                 // make sure miner fee is big enough for all cases
                 Amount::try_from(1_000_000).expect("valid amount"),
                 0,
+                SigHash([0; 32]),
             )
             .expect("verification should pass"),
             VerifiedUnminedTx::new(
                 second.0.into(),
                 // make sure miner fee is big enough for all cases
                 Amount::try_from(1_000_000).expect("valid amount"),
                 0,
+                SigHash([0; 32]),
             )
             .expect("verification should pass"),
         )
@@ -523,13 +525,15 @@ impl SpendConflictTestInput {
                 // make sure miner fee is big enough for all cases
                 Amount::try_from(1_000_000).expect("valid amount"),
                 0,
+                SigHash([0; 32]),
             )
             .expect("verification should pass"),
             VerifiedUnminedTx::new(
                 second.0.into(),
                 // make sure miner fee is big enough for all cases
                 Amount::try_from(1_000_000).expect("valid amount"),
                 0,
+                SigHash([0; 32]),
             )
             .expect("verification should pass"),
         )
@@ -966,7 +970,10 @@ impl OrchardSpendConflict {
     ///
     /// The transaction will then conflict with any other transaction with the same new nullifier.
     // TODO: Consider adding support of OrchardZSA.
-    pub fn apply_to(self, orchard_shielded_data: &mut Option<orchard::ShieldedData<orchard::OrchardVanilla>>) {
+    pub fn apply_to(
+        self,
+        orchard_shielded_data: &mut Option<orchard::ShieldedData<orchard::OrchardVanilla>>,
+    ) {
         if let Some(shielded_data) = orchard_shielded_data.as_mut() {
             shielded_data
                 .actions
diff --git a/zebrad/src/components/mempool/storage/tests/vectors.rs b/zebrad/src/components/mempool/storage/tests/vectors.rs
@@ -11,6 +11,7 @@ use zebra_chain::{
     amount::{Amount, NonNegative},
     block::{Block, Height},
     parameters::Network,
+    transaction::SigHash,
 };
 
 use crate::components::mempool::{storage::*, Mempool};
@@ -275,6 +276,7 @@ fn mempool_expired_basic_for_network(network: Network) -> Result<()> {
             tx.into(),
             Amount::try_from(1_000_000).expect("valid amount"),
             0,
+            SigHash([0; 32]),
         )
         .expect("verification should pass"),
         Vec::new(),
diff --git a/zebrad/src/components/mempool/tests.rs b/zebrad/src/components/mempool/tests.rs
@@ -13,7 +13,7 @@ use crate::{
 use zebra_chain::{
     amount::{Amount, NonNegative},
     parameters::NetworkKind,
-    transaction::{Transaction, UnminedTx, VerifiedUnminedTx},
+    transaction::{SigHash, Transaction, UnminedTx, VerifiedUnminedTx},
     transparent::{self, Address},
 };
 
@@ -110,7 +110,7 @@ pub fn standard_verified_unmined_tx_strategy() -> BoxedStrategy<VerifiedUnminedT
             let unmined_tx = UnminedTx::from(transaction);
             let miner_fee = unmined_tx.conventional_fee;
 
-            VerifiedUnminedTx::new(unmined_tx, miner_fee, 0)
+            VerifiedUnminedTx::new(unmined_tx, miner_fee, 0, SigHash([0; 32]))
                 .expect("standardized transaction should pass ZIP-317 checks")
         })
         .boxed()
diff --git a/zebrad/src/components/mempool/tests/vector.rs b/zebrad/src/components/mempool/tests/vector.rs
@@ -15,7 +15,7 @@ use zebra_chain::{
     fmt::humantime_seconds,
     parameters::Network,
     serialization::ZcashDeserializeInto,
-    transaction::{Transaction, VerifiedUnminedTx},
+    transaction::{SigHash, Transaction, VerifiedUnminedTx},
     transparent::{self, OutPoint},
 };
 use zebra_consensus::transaction as tx;
@@ -951,6 +951,7 @@ async fn mempool_reverifies_after_tip_change() -> Result<(), Report> {
                     transaction,
                     Amount::try_from(1_000_000).expect("invalid value"),
                     0,
+                    SigHash([0; 32]),
                 )
                 .expect("verification should pass"),
             ));
@@ -1011,6 +1012,7 @@ async fn mempool_reverifies_after_tip_change() -> Result<(), Report> {
                     transaction,
                     Amount::try_from(1_000_000).expect("invalid value"),
                     0,
+                    SigHash([0; 32]),
                 )
                 .expect("verification should pass"),
             ));
