diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs index 1175c0c..d37ff14 100644 --- a/zcash_primitives/src/transaction/builder.rs +++ b/zcash_primitives/src/transaction/builder.rs @@ -214,7 +214,7 @@ impl TransparentInputs { fn apply_signatures( &self, mtx: &mut TransactionData, - consensus_branch_id: consensus::BranchId, + consensus_branch_id: u32, ) { let mut sighash = [0u8; 32]; for (i, info) in self.inputs.iter().enumerate() { @@ -438,7 +438,7 @@ impl Builder { /// the network. pub fn build( mut self, - consensus_branch_id: consensus::BranchId, + consensus_branch_id: u32, prover: &impl TxProver, ) -> Result<(Transaction, TransactionMetadata), Error> { let mut tx_metadata = TransactionMetadata::new(); diff --git a/zcash_primitives/src/transaction/sighash.rs b/zcash_primitives/src/transaction/sighash.rs index 89ee192..d980681 100644 --- a/zcash_primitives/src/transaction/sighash.rs +++ b/zcash_primitives/src/transaction/sighash.rs @@ -152,7 +152,7 @@ fn shielded_outputs_hash(tx: &TransactionData) -> Blake2bHash { pub fn signature_hash_data( tx: &TransactionData, - consensus_branch_id: consensus::BranchId, + consensus_branch_id: u32, hash_type: u32, transparent_input: Option<(usize, &Script, Amount)>, ) -> Vec { @@ -230,7 +230,7 @@ pub fn signature_hash_data( pub fn signature_hash( tx: &Transaction, - consensus_branch_id: consensus::BranchId, + consensus_branch_id: u32, hash_type: u32, transparent_input: Option<(usize, &Script, Amount)>, ) -> Vec {