zec
/
orchard
mirror of https://github.com/zcash/orchard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pass `g_d_new` and `pk_d_new` directly to `Circuit` 

The initial Action circuit specification indicated that only the byte
encodings of `g_d_new` and `pk_d_new` would be witnessed, but we ended
up witnessing the points directly instead. This commit removes the
leftover (and now redundant) encoding-decoding round trip.
This commit is contained in:
Jack Grigg 2022-04-29 12:44:57 +00:00
parent f08a2a35c4
commit ae6a50611a
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/builder.rs
View File

@ -4,7 +4,6 @@ use core::fmt;
use core::iter; use core::iter;
use ff::Field; use ff::Field;
use group::GroupEncoding;
use nonempty::NonEmpty; use nonempty::NonEmpty;
use pasta_curves::pallas; use pasta_curves::pallas;
use rand::{prelude::SliceRandom, CryptoRng, RngCore}; use rand::{prelude::SliceRandom, CryptoRng, RngCore};
@ -197,8 +196,8 @@ impl ActionInfo {
ak: Some(ak), ak: Some(ak),
nk: Some(*self.spend.fvk.nk()), nk: Some(*self.spend.fvk.nk()),
rivk: Some(self.spend.fvk.rivk(self.spend.scope)), rivk: Some(self.spend.fvk.rivk(self.spend.scope)),
g_d_new_star: Some((*note.recipient().g_d()).to_bytes()), g_d_new: Some(note.recipient().g_d()),
pk_d_new_star: Some(note.recipient().pk_d().to_bytes()), pk_d_new: Some(*note.recipient().pk_d()),
v_new: Some(note.value()), v_new: Some(note.value()),
psi_new: Some(note.rseed().psi(&note.rho())), psi_new: Some(note.rseed().psi(&note.rho())),
rcm_new: Some(note.rseed().rcm(&note.rho())), rcm_new: Some(note.rseed().rcm(&note.rho())),

25
src/circuit.rs
View File

@ -108,8 +108,8 @@ pub struct Circuit {
pub(crate) ak: Option<SpendValidatingKey>, pub(crate) ak: Option<SpendValidatingKey>,
pub(crate) nk: Option<NullifierDerivingKey>, pub(crate) nk: Option<NullifierDerivingKey>,
pub(crate) rivk: Option<CommitIvkRandomness>, pub(crate) rivk: Option<CommitIvkRandomness>,
pub(crate) g_d_new_star: Option<[u8; 32]>, pub(crate) g_d_new: Option<NonIdentityPallasPoint>,
pub(crate) pk_d_new_star: Option<[u8; 32]>, pub(crate) pk_d_new: Option<DiversifiedTransmissionKey>,
pub(crate) v_new: Option<NoteValue>, pub(crate) v_new: Option<NoteValue>,
pub(crate) psi_new: Option<pallas::Base>, pub(crate) psi_new: Option<pallas::Base>,
pub(crate) rcm_new: Option<NoteCommitTrapdoor>, pub(crate) rcm_new: Option<NoteCommitTrapdoor>,
@ -619,11 +619,9 @@ impl plonk::Circuit<pallas::Base> for Circuit {
{ {
let new_note_commit_config = config.new_note_commit_config.clone(); let new_note_commit_config = config.new_note_commit_config.clone();
// Witness g_d_new_star // Witness g_d_new
let g_d_new = { let g_d_new = {
let g_d_new = self let g_d_new = self.g_d_new.map(|g_d_new| g_d_new.to_affine());
.g_d_new_star
.map(|bytes| pallas::Affine::from_bytes(&bytes).unwrap());
NonIdentityPoint::new( NonIdentityPoint::new(
ecc_chip.clone(), ecc_chip.clone(),
layouter.namespace(|| "witness g_d_new_star"), layouter.namespace(|| "witness g_d_new_star"),
@ -631,11 +629,9 @@ impl plonk::Circuit<pallas::Base> for Circuit {
)? )?
}; };
// Witness pk_d_new_star // Witness pk_d_new
let pk_d_new = { let pk_d_new = {
let pk_d_new = self let pk_d_new = self.pk_d_new.map(|pk_d_new| pk_d_new.inner().to_affine());
.pk_d_new_star
.map(|bytes| pallas::Affine::from_bytes(&bytes).unwrap());
NonIdentityPoint::new( NonIdentityPoint::new(
ecc_chip, ecc_chip,
layouter.namespace(|| "witness pk_d_new"), layouter.namespace(|| "witness pk_d_new"),
@ -907,7 +903,6 @@ mod tests {
use core::iter; use core::iter;
use ff::Field; use ff::Field;
use group::GroupEncoding;
use halo2_proofs::dev::MockProver; use halo2_proofs::dev::MockProver;
use pasta_curves::pallas; use pasta_curves::pallas;
use rand::{rngs::OsRng, RngCore}; use rand::{rngs::OsRng, RngCore};
@ -956,8 +951,8 @@ mod tests {
ak: Some(ak), ak: Some(ak),
nk: Some(nk), nk: Some(nk),
rivk: Some(rivk), rivk: Some(rivk),
g_d_new_star: Some((*output_note.recipient().g_d()).to_bytes()), g_d_new: Some(output_note.recipient().g_d()),
pk_d_new_star: Some(output_note.recipient().pk_d().to_bytes()), pk_d_new: Some(*output_note.recipient().pk_d()),
v_new: Some(output_note.value()), v_new: Some(output_note.value()),
psi_new: Some(output_note.rseed().psi(&output_note.rho())), psi_new: Some(output_note.rseed().psi(&output_note.rho())),
rcm_new: Some(output_note.rseed().rcm(&output_note.rho())), rcm_new: Some(output_note.rseed().rcm(&output_note.rho())),
@ -1142,8 +1137,8 @@ mod tests {
ak: None, ak: None,
nk: None, nk: None,
rivk: None, rivk: None,
g_d_new_star: None, g_d_new: None,
pk_d_new_star: None, pk_d_new: None,
v_new: None, v_new: None,
psi_new: None, psi_new: None,
rcm_new: None, rcm_new: None,