Format Sprout commitments as hex when debugging

zebra-chain/src/primitives/proofs/bctv14.rs

@@ -1,3 +1,5 @@
+//! BCTV14 proofs for Zebra.
+
 use std::{fmt, io};
 
 use serde::{Deserialize, Serialize};

zebra-chain/src/primitives/proofs/groth16.rs

@@ -1,3 +1,5 @@
+//! Groth16 proofs for Zebra.
+
 use std::{fmt, io};
 
 use serde::{Deserialize, Serialize};

zebra-chain/src/sprout/commitment.rs

@@ -2,6 +2,8 @@
 
 use sha2::{Digest, Sha256};
 
+use crate::fmt::HexDebug;
+
 use super::note::Note;
 
 /// The randomness used in the Pedersen Hash for note commitment.
@@ -10,11 +12,11 @@ use super::note::Note;
     any(test, feature = "proptest-impl"),
     derive(proptest_derive::Arbitrary)
 )]
-pub struct CommitmentRandomness(pub [u8; 32]);
+pub struct CommitmentRandomness(pub HexDebug<[u8; 32]>);
 
 impl AsRef<[u8]> for CommitmentRandomness {
     fn as_ref(&self) -> &[u8] {
-        &self.0
+        self.0.as_ref()
     }
 }
 
@@ -24,11 +26,11 @@ impl AsRef<[u8]> for CommitmentRandomness {
     any(test, feature = "proptest-impl"),
     derive(proptest_derive::Arbitrary)
 )]
-pub struct NoteCommitment(pub(crate) [u8; 32]);
+pub struct NoteCommitment(pub(crate) HexDebug<[u8; 32]>);
 
 impl From<[u8; 32]> for NoteCommitment {
     fn from(bytes: [u8; 32]) -> Self {
-        Self(bytes)
+        Self(bytes.into())
     }
 }
 
@@ -44,18 +46,20 @@ impl From<Note> for NoteCommitment {
         hasher.update(note.value.to_bytes());
         hasher.update(note.rho);
         hasher.update(note.rcm);
-        NoteCommitment(hasher.finalize().into())
+
+        let commitment: [u8; 32] = hasher.finalize().into();
+        NoteCommitment(commitment.into())
     }
 }
 
 impl From<NoteCommitment> for [u8; 32] {
     fn from(cm: NoteCommitment) -> [u8; 32] {
-        cm.0
+        *cm.0
     }
 }
 
 impl From<&NoteCommitment> for [u8; 32] {
     fn from(cm: &NoteCommitment) -> [u8; 32] {
-        cm.0
+        *cm.0
     }
 }

zebra-chain/src/sprout/joinsplit.rs

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     amount::{Amount, NegativeAllowed, NonNegative},
     block::MAX_BLOCK_BYTES,
+    fmt::HexDebug,
     primitives::{x25519, Bctv14Proof, Groth16Proof, ZkSnarkProof},
     serialization::{
         ReadZcashExt, SerializationError, TrustedPreallocate, WriteZcashExt, ZcashDeserialize,
@@ -25,17 +26,17 @@ use super::{commitment, note, tree};
     any(test, feature = "proptest-impl"),
     derive(proptest_derive::Arbitrary)
 )]
-pub struct RandomSeed([u8; 32]);
+pub struct RandomSeed(HexDebug<[u8; 32]>);
 
 impl From<[u8; 32]> for RandomSeed {
     fn from(bytes: [u8; 32]) -> Self {
-        Self(bytes)
+        Self(bytes.into())
     }
 }
 
 impl From<RandomSeed> for [u8; 32] {
     fn from(rt: RandomSeed) -> [u8; 32] {
-        rt.0
+        *rt.0
     }
 }
 

zebra-chain/src/sprout/note/mac.rs

@@ -1,6 +1,12 @@
-use crate::serialization::{ReadZcashExt, SerializationError, ZcashDeserialize, ZcashSerialize};
+//! Sprout message authentication codes.
+
 use std::io::{self, Read};
 
+use crate::{
+    fmt::HexDebug,
+    serialization::{ReadZcashExt, SerializationError, ZcashDeserialize, ZcashSerialize},
+};
+
 /// A sequence of message authentication tags ...
 ///
 /// binding h_sig to each a_sk of the JoinSplit description, computed as
@@ -10,17 +16,17 @@ use std::io::{self, Read};
     any(test, feature = "proptest-impl"),
     derive(proptest_derive::Arbitrary)
 )]
-pub struct Mac([u8; 32]);
+pub struct Mac(HexDebug<[u8; 32]>);
 
 impl From<[u8; 32]> for Mac {
     fn from(bytes: [u8; 32]) -> Self {
-        Self(bytes)
+        Self(bytes.into())
     }
 }
 
 impl From<Mac> for [u8; 32] {
     fn from(rt: Mac) -> [u8; 32] {
-        rt.0
+        *rt.0
     }
 }
 
@@ -34,7 +40,7 @@ impl ZcashDeserialize for Mac {
     fn zcash_deserialize<R: Read>(mut reader: R) -> Result<Self, SerializationError> {
         let bytes = reader.read_32_bytes()?;
 
-        Ok(Self(bytes))
+        Ok(Self(bytes.into()))
     }
 }