From b2b3efd4c2e15a1debf75145cfe9f61937121627 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Thu, 15 Apr 2021 15:15:54 -0600 Subject: [PATCH] Fix naming cmstar -> cmstar_bytes and cm -> cmstar --- components/zcash_note_encryption/src/lib.rs | 30 +++++++++---------- .../src/sapling/note_encryption.rs | 8 ++--- .../src/transaction/components/sapling.rs | 4 +-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/components/zcash_note_encryption/src/lib.rs b/components/zcash_note_encryption/src/lib.rs index 7302a515d..ddb844711 100644 --- a/components/zcash_note_encryption/src/lib.rs +++ b/components/zcash_note_encryption/src/lib.rs @@ -74,8 +74,8 @@ pub trait Domain { type IncomingViewingKey; type OutgoingViewingKey; type ValueCommitment; - type NoteCommitment; - type ExtractedCommitment: Eq + TryFrom; + type ExtractedCommitment; + type ExtractedCommitmentBytes: Eq + TryFrom; type Memo; fn derive_esk(note: &Self::Note) -> Option; @@ -111,7 +111,7 @@ pub trait Domain { fn derive_ock( ovk: &Self::OutgoingViewingKey, cv: &Self::ValueCommitment, - cm: &Self::NoteCommitment, + cmstar: &Self::ExtractedCommitment, ephemeral_key: &EphemeralKeyBytes, ) -> OutgoingCipherKey; @@ -127,7 +127,7 @@ pub trait Domain { check: F, ) -> NoteValidity; - fn note_commitment(note: &Self::Note) -> Self::NoteCommitment; + fn cmstar(note: &Self::Note) -> Self::ExtractedCommitment; fn parse_note_plaintext_without_memo_ivk( &self, @@ -157,7 +157,7 @@ pub trait Domain { pub trait ShieldedOutput { fn epk(&self) -> &D::EphemeralPublicKey; - fn cmstar(&self) -> D::ExtractedCommitment; + fn cmstar_bytes(&self) -> D::ExtractedCommitmentBytes; fn enc_ciphertext(&self) -> &[u8]; } @@ -288,11 +288,11 @@ impl NoteEncryption { pub fn encrypt_outgoing_plaintext( &self, cv: &D::ValueCommitment, - cm: &D::NoteCommitment, + cmstar: &D::ExtractedCommitment, rng: &mut R, ) -> [u8; OUT_CIPHERTEXT_SIZE] { let (ock, input) = if let Some(ovk) = &self.ovk { - let ock = D::derive_ock(ovk, &cv, &cm, &D::epk_bytes(&self.epk)); + let ock = D::derive_ock(ovk, &cv, &cmstar, &D::epk_bytes(&self.epk)); let input = D::outgoing_plaintext_bytes(&self.note, &self.esk); (ock, input) @@ -355,7 +355,7 @@ pub fn try_note_decryption>( domain, ivk, output.epk(), - &output.cmstar(), + &output.cmstar_bytes(), &plaintext, )?; let memo = domain.extract_memo(&plaintext); @@ -367,12 +367,12 @@ fn parse_note_plaintext_without_memo_ivk( domain: &D, ivk: &D::IncomingViewingKey, epk: &D::EphemeralPublicKey, - cmstar: &D::ExtractedCommitment, + cmstar_bytes: &D::ExtractedCommitmentBytes, plaintext: &[u8], ) -> Option<(D::Note, D::Recipient)> { let (note, to) = domain.parse_note_plaintext_without_memo_ivk(ivk, &plaintext)?; - if let NoteValidity::Valid = check_note_validity::(¬e, epk, cmstar) { + if let NoteValidity::Valid = check_note_validity::(¬e, epk, cmstar_bytes) { Some((note, to)) } else { None @@ -382,10 +382,10 @@ fn parse_note_plaintext_without_memo_ivk( fn check_note_validity( note: &D::Note, epk: &D::EphemeralPublicKey, - cmstar: &D::ExtractedCommitment, + cmstar_bytes: &D::ExtractedCommitmentBytes, ) -> NoteValidity { - if D::ExtractedCommitment::try_from(D::note_commitment(¬e)) - .map_or(false, |cs| &cs == cmstar) + if D::ExtractedCommitmentBytes::try_from(D::cmstar(¬e)) + .map_or(false, |cs| &cs == cmstar_bytes) { let epk_bytes = D::epk_bytes(epk); D::check_epk_bytes(¬e, |derived_esk| { @@ -428,7 +428,7 @@ pub fn try_compact_note_decryption>( plaintext.copy_from_slice(output.enc_ciphertext()); ChaCha20Ietf::xor(key.as_ref(), &[0u8; 12], 1, &mut plaintext); - parse_note_plaintext_without_memo_ivk(domain, ivk, output.epk(), &output.cmstar(), &plaintext) + parse_note_plaintext_without_memo_ivk(domain, ivk, output.epk(), &output.cmstar_bytes(), &plaintext) } /// Recovery of the full note plaintext by the sender. @@ -484,7 +484,7 @@ pub fn try_output_recovery_with_ock>( domain.parse_note_plaintext_without_memo_ovk(&pk_d, &esk, output.epk(), &plaintext)?; let memo = domain.extract_memo(&plaintext); - if let NoteValidity::Valid = check_note_validity::(¬e, output.epk(), &output.cmstar()) { + if let NoteValidity::Valid = check_note_validity::(¬e, output.epk(), &output.cmstar_bytes()) { Some((note, to, memo)) } else { None diff --git a/zcash_primitives/src/sapling/note_encryption.rs b/zcash_primitives/src/sapling/note_encryption.rs index 1be32b689..d92d48c6c 100644 --- a/zcash_primitives/src/sapling/note_encryption.rs +++ b/zcash_primitives/src/sapling/note_encryption.rs @@ -127,8 +127,8 @@ impl Domain for SaplingDomain

{ type IncomingViewingKey = SaplingIvk; type OutgoingViewingKey = OutgoingViewingKey; type ValueCommitment = jubjub::ExtendedPoint; - type NoteCommitment = bls12_381::Scalar; - type ExtractedCommitment = [u8; 32]; + type ExtractedCommitment = bls12_381::Scalar; + type ExtractedCommitmentBytes = [u8; 32]; type Memo = MemoBytes; fn derive_esk(note: &Self::Note) -> Option { @@ -206,7 +206,7 @@ impl Domain for SaplingDomain

{ fn derive_ock( ovk: &Self::OutgoingViewingKey, cv: &Self::ValueCommitment, - cmu: &Self::NoteCommitment, + cmu: &Self::ExtractedCommitment, epk: &EphemeralKeyBytes, ) -> OutgoingCipherKey { prf_ock(ovk, cv, cmu, epk) @@ -265,7 +265,7 @@ impl Domain for SaplingDomain

{ }) } - fn note_commitment(note: &Self::Note) -> Self::NoteCommitment { + fn cmstar(note: &Self::Note) -> Self::ExtractedCommitment { note.cmu() } diff --git a/zcash_primitives/src/transaction/components/sapling.rs b/zcash_primitives/src/transaction/components/sapling.rs index 6f75ec677..f008b75b3 100644 --- a/zcash_primitives/src/transaction/components/sapling.rs +++ b/zcash_primitives/src/transaction/components/sapling.rs @@ -123,7 +123,7 @@ impl ShieldedOutput> for OutputDescri &self.ephemeral_key } - fn cmstar(&self) -> [u8; 32] { + fn cmstar_bytes(&self) -> [u8; 32] { self.cmu.to_repr() } @@ -235,7 +235,7 @@ impl ShieldedOutput> for CompactOutpu &self.epk } - fn cmstar(&self) -> [u8; 32] { + fn cmstar_bytes(&self) -> [u8; 32] { self.cmu.to_repr() }