From 7cafe040dba6ca06c60124554ebefc3878243da6 Mon Sep 17 00:00:00 2001 From: JanKuczma Date: Tue, 1 Jul 2025 13:49:36 +0200 Subject: [PATCH] rename caller_address to commitment --- .../shielder-circuits/src/circuits/deposit/chip.rs | 12 ++++-------- .../src/circuits/deposit/circuit.rs | 8 ++++---- .../src/circuits/deposit/knowledge.rs | 8 ++++---- crates/shielder-circuits/src/circuits/deposit/mod.rs | 4 ++-- .../src/circuits/new_account/chip.rs | 8 +++----- .../src/circuits/new_account/circuit.rs | 6 +++--- .../src/circuits/new_account/knowledge.rs | 10 +++++----- .../src/circuits/new_account/mod.rs | 4 ++-- 8 files changed, 27 insertions(+), 33 deletions(-) diff --git a/crates/shielder-circuits/src/circuits/deposit/chip.rs b/crates/shielder-circuits/src/circuits/deposit/chip.rs index 3f478245..490bf2b4 100644 --- a/crates/shielder-circuits/src/circuits/deposit/chip.rs +++ b/crates/shielder-circuits/src/circuits/deposit/chip.rs @@ -10,9 +10,7 @@ use crate::{ deposit::knowledge::DepositProverKnowledge, merkle::{MerkleChip, MerkleProverKnowledge}, }, - deposit::DepositInstance::{ - self, CallerAddress, DepositValue, HashedNewNote, HashedOldNullifier, - }, + deposit::DepositInstance::{self, Commitment, DepositValue, HashedNewNote, HashedOldNullifier}, instance_wrapper::InstanceWrapper, poseidon::circuit::{hash, PoseidonChip}, synthesizer::Synthesizer, @@ -115,14 +113,12 @@ impl DepositChip { Ok(()) } - pub fn check_caller_address( + pub fn check_commitment( &self, synthesizer: &mut impl Synthesizer, knowledge: &DepositProverKnowledge, ) -> Result<(), Error> { - self.public_inputs.constrain_cells( - synthesizer, - [(knowledge.caller_address.clone(), CallerAddress)], - ) + self.public_inputs + .constrain_cells(synthesizer, [(knowledge.commitment.clone(), Commitment)]) } } diff --git a/crates/shielder-circuits/src/circuits/deposit/circuit.rs b/crates/shielder-circuits/src/circuits/deposit/circuit.rs index 04b22254..b7c64cee 100644 --- a/crates/shielder-circuits/src/circuits/deposit/circuit.rs +++ b/crates/shielder-circuits/src/circuits/deposit/circuit.rs @@ -57,7 +57,7 @@ impl Circuit for DepositCircuit { main_chip.check_old_nullifier(&mut synthesizer, &knowledge)?; main_chip.check_new_note(&mut synthesizer, &knowledge)?; main_chip.check_mac(&mut synthesizer, &knowledge)?; - main_chip.check_caller_address(&mut synthesizer, &knowledge) + main_chip.check_commitment(&mut synthesizer, &knowledge) } } @@ -188,7 +188,7 @@ mod tests { // Important note: there is no range check in the circuit for DepositValue, however there is an external constraint // (in the smart contract) guaranteeing that this never exceeds MAX_CONTRACT_BALANCE = 2^{112} - 1. DepositValue => pk.deposit_value, - CallerAddress => pk.caller_address, + Commitment => pk.commitment, TokenAddress => pk.token_address, MacSalt => pk.mac_salt, MacCommitment => hash(&[pk.mac_salt, off_circuit::derive_viewing_key(pk.id)]), @@ -266,9 +266,9 @@ mod tests { } #[test] - fn fails_if_caller_address_is_incorrect() { + fn fails_if_commitment_is_incorrect() { let pk = DepositProverKnowledge::random_correct_example(&mut OsRng); - let pub_input = pk.with_substitution(CallerAddress, |s| s + Fr::ONE); + let pub_input = pk.with_substitution(Commitment, |s| s + Fr::ONE); assert!( expect_prover_success_and_run_verification(pk.create_circuit(), &pub_input).is_err() diff --git a/crates/shielder-circuits/src/circuits/deposit/knowledge.rs b/crates/shielder-circuits/src/circuits/deposit/knowledge.rs index a85416e3..eae93553 100644 --- a/crates/shielder-circuits/src/circuits/deposit/knowledge.rs +++ b/crates/shielder-circuits/src/circuits/deposit/knowledge.rs @@ -41,7 +41,7 @@ pub struct DepositProverKnowledge { pub mac_salt: T, pub deposit_value: T, - pub caller_address: T, + pub commitment: T, } impl ProverKnowledge for DepositProverKnowledge { @@ -73,7 +73,7 @@ impl ProverKnowledge for DepositProverKnowledge { nullifier_new: Fr::random(&mut *rng), deposit_value: Fr::ONE, mac_salt: Fr::random(&mut *rng), - caller_address: Fr::random(rng), + commitment: Fr::random(rng), } } @@ -87,7 +87,7 @@ impl ProverKnowledge for DepositProverKnowledge { path: self.path.map(|level| level.map(Value::known)), deposit_value: Value::known(self.deposit_value), mac_salt: Value::known(self.mac_salt), - caller_address: Value::known(self.caller_address), + commitment: Value::known(self.commitment), }) } } @@ -107,7 +107,7 @@ impl PublicInputProvider for DepositProverKnowledge { token_address: self.token_address, }), DepositInstance::DepositValue => self.deposit_value, - DepositInstance::CallerAddress => self.caller_address, + DepositInstance::Commitment => self.commitment, DepositInstance::TokenAddress => self.token_address, DepositInstance::MacSalt => self.mac_salt, DepositInstance::MacCommitment => hash(&[self.mac_salt, viewing_key]), diff --git a/crates/shielder-circuits/src/circuits/deposit/mod.rs b/crates/shielder-circuits/src/circuits/deposit/mod.rs index 4f3c6673..d6c1847d 100644 --- a/crates/shielder-circuits/src/circuits/deposit/mod.rs +++ b/crates/shielder-circuits/src/circuits/deposit/mod.rs @@ -17,7 +17,7 @@ pub enum DepositInstance { HashedOldNullifier, HashedNewNote, DepositValue, - CallerAddress, + Commitment, TokenAddress, MacSalt, MacCommitment, @@ -73,7 +73,7 @@ mod tests { HashedOldNullifier, HashedNewNote, DepositValue, - CallerAddress, + Commitment, TokenAddress, MacSalt, MacCommitment, diff --git a/crates/shielder-circuits/src/circuits/new_account/chip.rs b/crates/shielder-circuits/src/circuits/new_account/chip.rs index d299442f..81943c19 100644 --- a/crates/shielder-circuits/src/circuits/new_account/chip.rs +++ b/crates/shielder-circuits/src/circuits/new_account/chip.rs @@ -151,14 +151,12 @@ impl NewAccountChip { Ok(()) } - pub fn check_caller_address( + pub fn check_commitment( &self, synthesizer: &mut impl Synthesizer, knowledge: &NewAccountProverKnowledge, ) -> Result<(), Error> { - self.public_inputs.constrain_cells( - synthesizer, - [(knowledge.caller_address.clone(), CallerAddress)], - ) + self.public_inputs + .constrain_cells(synthesizer, [(knowledge.commitment.clone(), Commitment)]) } } diff --git a/crates/shielder-circuits/src/circuits/new_account/circuit.rs b/crates/shielder-circuits/src/circuits/new_account/circuit.rs index d35878e6..5651595c 100644 --- a/crates/shielder-circuits/src/circuits/new_account/circuit.rs +++ b/crates/shielder-circuits/src/circuits/new_account/circuit.rs @@ -66,7 +66,7 @@ impl Circuit for NewAccountCircuit { main_chip.constrain_prenullifier(&mut synthesizer, &knowledge)?; main_chip.constrain_encrypting_viewing_key(&mut synthesizer, &knowledge)?; main_chip.check_mac(&mut synthesizer, &knowledge)?; - main_chip.check_caller_address(&mut synthesizer, &knowledge) + main_chip.check_commitment(&mut synthesizer, &knowledge) } } @@ -173,9 +173,9 @@ mod tests { } #[test] - fn fails_if_caller_address_is_incorrect() { + fn fails_if_commitment_is_incorrect() { let pk = NewAccountProverKnowledge::random_correct_example(&mut OsRng); - let pub_input = pk.with_substitution(CallerAddress, |s| s + Fr::ONE); + let pub_input = pk.with_substitution(Commitment, |s| s + Fr::ONE); assert!( expect_prover_success_and_run_verification(pk.create_circuit(), &pub_input).is_err() diff --git a/crates/shielder-circuits/src/circuits/new_account/knowledge.rs b/crates/shielder-circuits/src/circuits/new_account/knowledge.rs index 9e803ed2..464cc4a8 100644 --- a/crates/shielder-circuits/src/circuits/new_account/knowledge.rs +++ b/crates/shielder-circuits/src/circuits/new_account/knowledge.rs @@ -27,7 +27,7 @@ pub struct NewAccountProverKnowledge { pub id: T, pub nullifier: T, pub initial_deposit: T, - pub caller_address: T, + pub commitment: T, pub token_address: T, pub encryption_salt: [T; FIELD_BITS], pub anonymity_revoker_public_key: GrumpkinPointAffine, @@ -40,7 +40,7 @@ impl Default for NewAccountProverKnowledge { id: T::default(), nullifier: T::default(), initial_deposit: T::default(), - caller_address: T::default(), + commitment: T::default(), token_address: T::default(), encryption_salt: [T::default(); FIELD_BITS], anonymity_revoker_public_key: GrumpkinPointAffine::default(), @@ -58,7 +58,7 @@ impl ProverKnowledge for NewAccountProverKnowledge { id: curve_arithmetic::generate_user_id(Fr::random(&mut *rng).to_bytes()), nullifier: Fr::random(&mut *rng), initial_deposit: Fr::ONE, - caller_address: Fr::random(&mut *rng), + commitment: Fr::random(&mut *rng), token_address: Fr::ZERO, encryption_salt: field_element_to_le_bits(grumpkin::Fr::ONE), anonymity_revoker_public_key: GrumpkinPointAffine::random(rng), @@ -71,7 +71,7 @@ impl ProverKnowledge for NewAccountProverKnowledge { id: Value::known(self.id), nullifier: Value::known(self.nullifier), initial_deposit: Value::known(self.initial_deposit), - caller_address: Value::known(self.caller_address), + commitment: Value::known(self.commitment), token_address: Value::known(self.token_address), encryption_salt: self.encryption_salt.map(Value::known), anonymity_revoker_public_key: GrumpkinPointAffine::new( @@ -111,7 +111,7 @@ impl PublicInputProvider for NewAccountProverKnowledge { }), NewAccountInstance::Prenullifier => hash(&[self.id]), NewAccountInstance::InitialDeposit => self.initial_deposit, - NewAccountInstance::CallerAddress => self.caller_address, + NewAccountInstance::Commitment => self.commitment, NewAccountInstance::TokenAddress => self.token_address, NewAccountInstance::AnonymityRevokerPublicKeyX => self.anonymity_revoker_public_key.x, NewAccountInstance::AnonymityRevokerPublicKeyY => self.anonymity_revoker_public_key.y, diff --git a/crates/shielder-circuits/src/circuits/new_account/mod.rs b/crates/shielder-circuits/src/circuits/new_account/mod.rs index 94298ca8..754edadd 100644 --- a/crates/shielder-circuits/src/circuits/new_account/mod.rs +++ b/crates/shielder-circuits/src/circuits/new_account/mod.rs @@ -14,7 +14,7 @@ pub enum NewAccountInstance { HashedNote, Prenullifier, InitialDeposit, - CallerAddress, + Commitment, TokenAddress, AnonymityRevokerPublicKeyX, AnonymityRevokerPublicKeyY, @@ -64,7 +64,7 @@ mod tests { HashedNote, Prenullifier, InitialDeposit, - CallerAddress, + Commitment, TokenAddress, AnonymityRevokerPublicKeyX, AnonymityRevokerPublicKeyY,