domain separation updates as per dep

Author: lovesh

Cargo.lock

@@ -25,8 +25,8 @@ ark-dlog-gadget = { package = "ark-dlog-gadget", git = "https://github.com/Polym
 
 #dock_crypto_utils = { path = "../crypto/utils" }
 #schnorr_pok = { path = "../crypto/schnorr_pok" }
-dock_crypto_utils = { git = "https://github.com/PolymeshAssociation/crypto", branch = "main" }
-schnorr_pok = { git = "https://github.com/PolymeshAssociation/crypto", branch = "main" }
+dock_crypto_utils = { git = "https://github.com/PolymeshAssociation/crypto", branch = "patch30" }
+schnorr_pok = { git = "https://github.com/PolymeshAssociation/crypto", branch = "patch30" }
 
 # Polymesh changes.
 #ark-serialize = { path = "../arkworks-algebra/serialize" }

Cargo.toml

@@ -1,4 +1,5 @@
 use crate::account::AccountState;
+use crate::dst;
 use crate::util::{
     create_balance_bp_t_values, enforce_balance_change_prover,
     generate_schnorr_responses_for_balance_change, generate_sigma_t_values_for_balance_change,
@@ -32,8 +33,8 @@ pub struct BalanceChangeProofPartial<
 > {
     /// Commitment to old and new balances and amounts used in BP
     pub comm_bp_bal: Affine<G0>,
-    /// For the sigma protocol for above commitment
-    pub t_comm_bp_bal: Affine<G0>,
+    /// Response for the sigma protocol for above commitment. Carries the commitment to
+    /// randomness `t` from step 1.
     pub resp_comm_bp_bal: PartialSchnorrResponse<Affine<G0>>,
 }
 
@@ -140,7 +141,6 @@ impl<F0: PrimeField, G0: SWCurveConfig<ScalarField = F0> + Clone + Copy>
     }
 
     pub fn gen_proof(self, challenge: &F0) -> Result<BalanceChangeProof<F0, G0>> {
-        let t_comm_bp_bal = self.t_comm_bp_bal.t;
         let resp_comm_bp_bal = generate_schnorr_responses_for_balance_change(
             self.comm_bp_bal_blinding,
             self.t_comm_bp_bal.clone(),
@@ -149,7 +149,6 @@ impl<F0: PrimeField, G0: SWCurveConfig<ScalarField = F0> + Clone + Copy>
         Ok(BalanceChangeProof {
             partial: BalanceChangeProofPartial {
                 comm_bp_bal: self.comm_bp_bal,
-                t_comm_bp_bal,
                 resp_comm_bp_bal,
             },
         })
@@ -252,7 +251,7 @@ impl<F0: PrimeField, G0: SWCurveConfig<ScalarField = F0> + Clone + Copy>
 
         {
             let mut transcript = even_prover.transcript();
-            t_comm_bp_bal.challenge_contribution(&mut transcript)?;
+            t_comm_bp_bal.challenge_contribution(dst::BP_BALANCE, &mut transcript)?;
         }
 
         Ok(Self {
@@ -263,15 +262,13 @@ impl<F0: PrimeField, G0: SWCurveConfig<ScalarField = F0> + Clone + Copy>
     }
 
     pub fn gen_proof(self, challenge: &F0) -> Result<BalanceChangeProofPartial<F0, G0>> {
-        let t_comm_bp_bal = self.t_comm_bp_bal.t;
         let resp_comm_bp_bal = generate_schnorr_responses_for_balance_change(
             self.comm_bp_bal_blinding,
             self.t_comm_bp_bal.clone(),
             challenge,
         )?;
         Ok(BalanceChangeProofPartial {
             comm_bp_bal: self.comm_bp_bal,
-            t_comm_bp_bal,
             resp_comm_bp_bal,
         })
     }

dart-bp/src/account/common/balance.rs

@@ -5,6 +5,7 @@ pub mod verifier;
 use crate::account::state::NUM_GENERATORS;
 use crate::account::{AccountCommitmentKeyTrait, AccountState, AccountStateCommitment};
 use crate::auth_proofs::account::AuthProofAffirmation;
+use crate::dst;
 use crate::leg::{LegEncryptionCore, PartyEphemeralPublicKey};
 use crate::util::{
     BPProof, generate_sigma_responses_for_common_state_change,
@@ -82,9 +83,8 @@ pub struct CommonStateChangeProofPartial<
     pub resp_null: PartialPokDiscreteLog<Affine<G0>>,
     /// Commitment to initial rho, old and current rho, old and current randomness
     pub comm_bp_randomness_relations: Affine<G0>,
-    /// Commitment to randomness for proving knowledge of rho and commitment randomness (step 1 of Schnorr)
-    pub t_bp_randomness_relations: Affine<G0>,
-    /// Response for proving knowledge of rho and commitment randomness (step 3 of Schnorr)
+    /// Response for proving knowledge of rho and commitment randomness (step 3 of Schnorr).
+    /// Carries the commitment to randomness `t` from step 1.
     pub resp_bp_randomness_relations: PartialSchnorrResponse<Affine<G0>>,
 }
 
@@ -98,13 +98,11 @@ pub struct CommonStateChangeProof<
     G1: SWCurveConfig<ScalarField = F1, BaseField = F0> + Clone + Copy,
 > {
     pub partial: CommonStateChangeProofPartial<F0, F1, G0, G1, { L }>,
-    /// Commitment to randomness for proving knowledge of re-randomized leaf using Schnorr protocol (step 1 of Schnorr)
-    pub t_acc_old: Affine<G0>,
-    /// Commitment to randomness for proving knowledge of new account commitment (which becomes new leaf) using Schnorr protocol (step 1 of Schnorr)
-    pub t_acc_new: Affine<G0>,
-    /// Response for proving knowledge of re-randomized account commitment (leaf) using Schnorr protocol (step 3 of Schnorr)
+    /// Response for proving knowledge of re-randomized account commitment (leaf) using Schnorr
+    /// protocol (step 3 of Schnorr). Carries the commitment to randomness `t` from step 1.
     pub resp_acc_old: SchnorrResponse<Affine<G0>>,
-    /// Response for proving knowledge of new account commitment using Schnorr protocol (step 3 of Schnorr)
+    /// Response for proving knowledge of new account commitment using Schnorr protocol (step 3
+    /// of Schnorr). Carries the commitment to randomness `t` from step 1.
     pub resp_acc_new: PartialSchnorrResponse<Affine<G0>>,
     pub resp_leg_link: Vec<LegAccountLink<G0>>,
 }
@@ -532,11 +530,8 @@ impl<
                 re_randomized_path: self.re_randomized_path.clone(),
                 resp_null,
                 comm_bp_randomness_relations: self.comm_bp_randomness_relations,
-                t_bp_randomness_relations: self.t_bp_randomness_relations.t,
                 resp_bp_randomness_relations,
             },
-            t_acc_old: self.t_acc_old.t,
-            t_acc_new: self.t_acc_new.t,
             resp_acc_old,
             resp_acc_new,
             resp_leg_link,
@@ -548,18 +543,18 @@ impl<
 /// Does NOT include sk or sk_enc.
 #[derive(Clone, Debug, CanonicalSerialize, CanonicalDeserialize)]
 pub struct AccountCommitmentsHostProof<G: SWCurveConfig + Clone + Copy> {
-    pub t_acc_old: Affine<G>,
-    pub t_acc_new: Affine<G>,
-    /// Full response for old re-randomized account
+    /// Full response for old re-randomized account (carries its commitment `t`)
     pub resp_acc_old: SchnorrResponse<Affine<G>>,
-    /// Partial response for new account
+    /// Partial response for new account (carries its commitment `t`)
     pub resp_acc_new: PartialSchnorrResponse<Affine<G>>,
 }
 
 impl<G: SWCurveConfig + Clone + Copy> AccountCommitmentsHostProof<G> {
     pub fn challenge_contribution<W: Write>(&self, writer: &mut W) -> Result<()> {
-        self.t_acc_old.serialize_compressed(&mut *writer)?;
-        self.t_acc_new.serialize_compressed(writer)?;
+        self.resp_acc_old
+            .challenge_contribution(dst::ACCOUNT_COMM_OLD, &mut *writer)?;
+        self.resp_acc_new
+            .challenge_contribution(dst::ACCOUNT_COMM_NEW, writer)?;
         Ok(())
     }
 }
@@ -658,8 +653,10 @@ impl<G: SWCurveConfig + Clone + Copy> AccountCommitmentsHostProtocol<G> {
     }
 
     pub fn challenge_contribution<W: Write>(&self, writer: &mut W) -> Result<()> {
-        self.t_acc_old.challenge_contribution(&mut *writer)?;
-        self.t_acc_new.challenge_contribution(writer)?;
+        self.t_acc_old
+            .challenge_contribution(dst::ACCOUNT_COMM_OLD, &mut *writer)?;
+        self.t_acc_new
+            .challenge_contribution(dst::ACCOUNT_COMM_NEW, writer)?;
         Ok(())
     }
 
@@ -688,8 +685,6 @@ impl<G: SWCurveConfig + Clone + Copy> AccountCommitmentsHostProtocol<G> {
         )?;
 
         Ok(AccountCommitmentsHostProof {
-            t_acc_old: self.t_acc_old.t,
-            t_acc_new: self.t_acc_new.t,
             resp_acc_old,
             resp_acc_new,
         })
@@ -897,7 +892,6 @@ impl<
             re_randomized_path: self.re_randomized_path.take(),
             resp_null,
             comm_bp_randomness_relations: self.comm_bp,
-            t_bp_randomness_relations: self.t_bp.t,
             resp_bp_randomness_relations: resp_bp,
         }
     }
@@ -1217,13 +1211,18 @@ impl<
             let mut transcript = even_prover.transcript();
             acc_host_proto
                 .t_acc_old
-                .challenge_contribution(&mut transcript)?;
+                .challenge_contribution(dst::ACCOUNT_COMM_OLD, &mut transcript)?;
             acc_host_proto
                 .t_acc_new
-                .challenge_contribution(&mut transcript)?;
-            t_bp.challenge_contribution(&mut transcript)?;
+                .challenge_contribution(dst::ACCOUNT_COMM_NEW, &mut transcript)?;
+            t_bp.challenge_contribution(dst::BP_RANDOMNESS_RELATIONS, &mut transcript)?;
             let null_gen = account_comm_key.current_rho_gen();
-            t_null.challenge_contribution(&null_gen, &nullifier, &mut transcript)?;
+            t_null.challenge_contribution(
+                &null_gen,
+                &nullifier,
+                dst::NULLIFIER,
+                &mut transcript,
+            )?;
         }
 
         let mut ct_asset_id_2_protos = Vec::new();
@@ -1244,6 +1243,7 @@ impl<
                         &enc_gen,
                         &b_blinding,
                         ct_asset_id_2,
+                        dst::HOST_CT_ASSET_ID_2,
                         &mut transcript,
                     )?;
                 }
@@ -1269,6 +1269,7 @@ impl<
                     &enc_gen,
                     &b_blinding,
                     ct_amount_2,
+                    dst::HOST_CT_AMOUNT_2,
                     &mut transcript,
                 )?;
             }
@@ -1489,7 +1490,6 @@ impl<
             re_randomized_path,
             resp_null,
             comm_bp_randomness_relations: comm_bp,
-            t_bp_randomness_relations: t_bp.t,
             resp_bp_randomness_relations: resp_bp,
         };
 

dart-bp/src/account/common/mod.rs

@@ -15,7 +15,7 @@ use crate::util::{
 };
 use crate::{
     Error, LEG_ENC_LABEL, NONCE_LABEL, RE_RANDOMIZED_PATH_LABEL, ROOT_LABEL, TXN_EVEN_LABEL,
-    TXN_ODD_LABEL, UPDATED_ACCOUNT_COMMITMENT_LABEL, add_to_transcript, error::Result,
+    TXN_ODD_LABEL, UPDATED_ACCOUNT_COMMITMENT_LABEL, add_to_transcript, dst, error::Result,
 };
 use ark_dlog_gadget::dlog::DiscreteLogParameters;
 use ark_ec::short_weierstrass::{Affine, SWCurveConfig};
@@ -347,9 +347,9 @@ impl<
             asset_id,
             &nullifier,
             proof.partial.comm_bp_randomness_relations,
-            &proof.t_acc_old,
-            &proof.t_acc_new,
-            &proof.partial.t_bp_randomness_relations,
+            &proof.resp_acc_old,
+            &proof.resp_acc_new,
+            &proof.partial.resp_bp_randomness_relations,
             &proof.partial.resp_null,
             &proof.resp_leg_link,
             &needs_ct_amount,
@@ -392,7 +392,7 @@ impl<
         // ct_amount challenge contributions are written in the leg-link (common) phase now;
         // the balance phase only contributes the balance BP t-value.
         take_challenge_contrib_of_balance_bp(
-            &proof.partial.t_comm_bp_bal,
+            &proof.partial.resp_comm_bp_bal,
             &mut verifier_transcript,
         )?;
         Ok(())
@@ -441,9 +441,6 @@ impl<
             &common_state_change_proof
                 .partial
                 .comm_bp_randomness_relations,
-            &common_state_change_proof.t_acc_old,
-            &common_state_change_proof.t_acc_new,
-            &common_state_change_proof.partial.t_bp_randomness_relations,
             &common_state_change_proof.resp_acc_old,
             &common_state_change_proof.resp_acc_new,
             &common_state_change_proof.partial.resp_null,
@@ -483,7 +480,6 @@ impl<
             verify_sigma_for_balance_change(
                 &balance_resp_amounts,
                 &balance_change_proof.partial.comm_bp_bal,
-                &balance_change_proof.partial.t_comm_bp_bal,
                 &balance_change_proof.partial.resp_comm_bp_bal,
                 challenge,
                 *common_state_change_proof
@@ -729,12 +725,13 @@ impl<
                 .challenge_contribution(&mut transcript)?;
             proof
                 .partial
-                .t_bp_randomness_relations
-                .serialize_compressed(&mut transcript)?;
+                .resp_bp_randomness_relations
+                .challenge_contribution(dst::BP_RANDOMNESS_RELATIONS, &mut transcript)?;
             let null_gen = account_comm_key.current_rho_gen();
             proof.partial.resp_null.challenge_contribution(
                 &null_gen,
                 &nullifier,
+                dst::NULLIFIER,
                 &mut transcript,
             )?;
         }
@@ -758,6 +755,7 @@ impl<
                         &enc_gen,
                         &B_blinding,
                         &ct_asset_id_2,
+                        dst::HOST_CT_ASSET_ID_2,
                         &mut transcript,
                     )?;
                     asset_id_idx += 1;
@@ -779,6 +777,7 @@ impl<
                         &enc_gen,
                         &B_blinding,
                         &ct_amount_2,
+                        dst::HOST_CT_AMOUNT_2,
                         &mut transcript,
                     )?;
                     amount_idx += 1;
@@ -881,8 +880,8 @@ impl<
             let mut transcript = even_verifier.transcript();
             balance_proof
                 .partial
-                .t_comm_bp_bal
-                .serialize_compressed(&mut transcript)?;
+                .resp_comm_bp_bal
+                .challenge_contribution(dst::BP_BALANCE, &mut transcript)?;
         }
 
         Ok(())
@@ -1001,7 +1000,6 @@ impl<
             common_proof.host_commitment_proof.resp_acc_old,
             gens_acc_old,
             y_old,
-            common_proof.host_commitment_proof.t_acc_old,
             challenge,
         );
 
@@ -1046,7 +1044,6 @@ impl<
             common_proof.host_commitment_proof.resp_acc_new,
             gens_acc_new,
             y_new,
-            common_proof.host_commitment_proof.t_acc_new,
             challenge,
             missing_resps_acc_new,
         );
@@ -1120,7 +1117,6 @@ impl<
             common_proof.partial.resp_bp_randomness_relations,
             bp_gens_vec,
             common_proof.partial.comm_bp_randomness_relations,
-            common_proof.partial.t_bp_randomness_relations,
             challenge,
             missing_resps_bp,
         );
@@ -1196,7 +1192,6 @@ impl<
                 balance_proof.partial.resp_comm_bp_bal,
                 bp_bal_gens,
                 balance_proof.partial.comm_bp_bal,
-                balance_proof.partial.t_comm_bp_bal,
                 challenge,
                 missing_resps_bal,
             );