Update zcash_primitives to sync with latest sapling-crypto changes

QED-it · Aug 19, 2024 · 2b69ff8 · 2b69ff8
1 parent fc38730
commit 2b69ff8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/zcash_primitives/src/transaction/components/sapling.rs b/zcash_primitives/src/transaction/components/sapling.rs
@@ -1,12 +1,12 @@
 use ff::PrimeField;
 use redjubjub::SpendAuth;
-use sapling::note_encryption::Zip212Enforcement;
+use sapling::note_encryption::{Zip212Enforcement, ENC_CIPHERTEXT_SIZE};
 use zcash_protocol::consensus::{BlockHeight, NetworkUpgrade, Parameters, ZIP212_GRACE_PERIOD};
 
 use std::io::{self, Read, Write};
 
 use zcash_encoding::{Array, CompactSize, Vector};
-use zcash_note_encryption::{EphemeralKeyBytes, ENC_CIPHERTEXT_SIZE, OUT_CIPHERTEXT_SIZE};
+use zcash_note_encryption::{EphemeralKeyBytes, OUT_CIPHERTEXT_SIZE};
 
 use crate::{
  sapling::{
@@ -270,7 +270,7 @@ pub(crate) fn write_output_v4<W: Write>(
  writer.write_all(&output.cv().to_bytes())?;
  writer.write_all(output.cmu().to_bytes().as_ref())?;
  writer.write_all(output.ephemeral_key().as_ref())?;
- writer.write_all(output.enc_ciphertext())?;
+ writer.write_all(output.enc_ciphertext().as_ref())?;
  writer.write_all(output.out_ciphertext())?;
  writer.write_all(output.zkproof())
 }
@@ -282,7 +282,7 @@ fn write_output_v5_without_proof<W: Write>(
  writer.write_all(&output.cv().to_bytes())?;
  writer.write_all(output.cmu().to_bytes().as_ref())?;
  writer.write_all(output.ephemeral_key().as_ref())?;
- writer.write_all(output.enc_ciphertext())?;
+ writer.write_all(output.enc_ciphertext().as_ref())?;
  writer.write_all(output.out_ciphertext())
 }
 

diff --git a/zcash_primitives/src/transaction/txid.rs b/zcash_primitives/src/transaction/txid.rs
@@ -189,12 +189,15 @@ pub(crate) fn hash_sapling_outputs<A>(shielded_outputs: &[OutputDescription<A>])
  for s_out in shielded_outputs {
  ch.write_all(s_out.cmu().to_bytes().as_ref()).unwrap();
  ch.write_all(s_out.ephemeral_key().as_ref()).unwrap();
- ch.write_all(&s_out.enc_ciphertext()[..52]).unwrap();
+ ch.write_all(&s_out.enc_ciphertext().as_ref()[..52])
+ .unwrap();
 
- mh.write_all(&s_out.enc_ciphertext()[52..564]).unwrap();
+ mh.write_all(&s_out.enc_ciphertext().as_ref()[52..564])
+ .unwrap();
 
  nh.write_all(&s_out.cv().to_bytes()).unwrap();
- nh.write_all(&s_out.enc_ciphertext()[564..]).unwrap();
+ nh.write_all(&s_out.enc_ciphertext().as_ref()[564..])
+ .unwrap();
  nh.write_all(&s_out.out_ciphertext()[..]).unwrap();
  }