update

Author: Mr-Leshiy

rust/catalyst-voting/src/crypto/group/ristretto255.rs

@@ -190,6 +190,17 @@ mod tests {
         }
     }
 
+    impl Arbitrary for GroupElement {
+        type Parameters = ();
+        type Strategy = BoxedStrategy<Self>;
+
+        fn arbitrary_with((): Self::Parameters) -> Self::Strategy {
+            any::<Scalar>()
+                .prop_map(|s| GroupElement::GENERATOR.mul(&s))
+                .boxed()
+        }
+    }
+
     #[proptest]
     fn scalar_to_bytes_from_bytes_test(e1: Scalar) {
         let bytes = e1.to_bytes();

rust/catalyst-voting/src/crypto/zk_unit_vector/mod.rs

@@ -155,7 +155,7 @@ fn generate_response(
 /// Verify a unit vector proof.
 pub fn verify_unit_vector_proof(
     proof: &UnitVectorProof, mut ciphertexts: Vec<Ciphertext>, public_key: &PublicKey,
-    commitment_key: &PublicKey,
+    commitment_key: &GroupElement,
 ) -> bool {
     let m = ciphertexts.len();
     let n = m.next_power_of_two();
@@ -176,7 +176,7 @@ pub fn verify_unit_vector_proof(
 }
 
 /// Check the first part of the proof
-fn check_1(proof: &UnitVectorProof, ch_2: &Scalar, commitment_key: &PublicKey) -> bool {
+fn check_1(proof: &UnitVectorProof, ch_2: &Scalar, commitment_key: &GroupElement) -> bool {
     proof.0.iter().zip(proof.2.iter()).all(|(an, rand)| {
         let right = &an.i.mul(ch_2) + &an.b;
         let left = &GroupElement::GENERATOR.mul(&rand.z) + &commitment_key.mul(&rand.w);
@@ -244,14 +244,13 @@ mod tests {
 
     #[proptest]
     fn zk_unit_vector_test(
-        secret_key: SecretKey, secret_commitment_key: SecretKey,
+        secret_key: SecretKey, commitment_key: GroupElement,
         #[strategy(1..10_usize)] unit_vector_size: usize,
         #[strategy(0..#unit_vector_size)] unit_vector_index: usize,
     ) {
         let mut rng = OsRng;
 
         let public_key = secret_key.public_key();
-        let commitment_key = secret_commitment_key.public_key();
 
         let unit_vector: Vec<_> = (0..unit_vector_size)
             .map(|i| {
@@ -295,7 +294,7 @@ mod tests {
 
     #[proptest]
     fn not_a_unit_vector_test(
-        secret_key: SecretKey, secret_commitment_key: SecretKey,
+        secret_key: SecretKey, commitment_key: GroupElement,
         #[any(size_range(1..10_usize).lift())] random_vector: Vec<Scalar>,
     ) {
         let mut rng = OsRng;
@@ -307,7 +306,6 @@ mod tests {
         }
 
         let public_key = secret_key.public_key();
-        let commitment_key = secret_commitment_key.public_key();
 
         let encryption_randomness: Vec<_> = random_vector
             .iter()

rust/catalyst-voting/src/voter/mod.rs

@@ -28,7 +28,7 @@ pub struct EncryptionRandomness(Vec<Scalar>);
 
 impl EncryptionRandomness {
     /// Randomly generate the `EncryptionRandomness`.
-    fn generate<R: CryptoRngCore>(rng: &mut R, voting_options: usize) -> Self {
+    fn random<R: CryptoRngCore>(rng: &mut R, voting_options: usize) -> Self {
         Self((0..voting_options).map(|_| Scalar::random(rng)).collect())
     }
 }
@@ -89,7 +89,7 @@ impl Vote {
 pub fn encrypt_vote<R: CryptoRngCore>(
     vote: &Vote, public_key: &PublicKey, rng: &mut R,
 ) -> (EncryptedVote, EncryptionRandomness) {
-    let randomness = EncryptionRandomness::generate(rng, vote.voting_options);
+    let randomness = EncryptionRandomness::random(rng, vote.voting_options);
 
     let unit_vector = vote.to_unit_vector();
     let ciphers = unit_vector

rust/catalyst-voting/src/voter/proof.rs

@@ -1,12 +1,15 @@
 //! Voter proof generation and verification procedures.
 //! It allows to transparently verify the correctness voter generation and encryption.
 
+use std::ops::Mul;
+
 use rand_core::CryptoRngCore;
 
 use super::{EncryptedVote, EncryptionRandomness, Vote};
 use crate::{
-    crypto::zk_unit_vector::{
-        generate_unit_vector_proof, verify_unit_vector_proof, UnitVectorProof,
+    crypto::{
+        group::{GroupElement, Scalar},
+        zk_unit_vector::{generate_unit_vector_proof, verify_unit_vector_proof, UnitVectorProof},
     },
     PublicKey,
 };
@@ -15,19 +18,29 @@ use crate::{
 #[allow(clippy::module_name_repetitions)]
 pub struct VoterProof(UnitVectorProof);
 
+/// Voter proof commitment struct.
+pub struct VoterProofCommitment(GroupElement);
+
+impl VoterProofCommitment {
+    /// Randomly generate the `VoterProofCommitment`.
+    pub fn random<R: CryptoRngCore>(rng: &mut R) -> Self {
+        Self(GroupElement::GENERATOR.mul(&Scalar::random(rng)))
+    }
+}
+
 /// Generates a voter proof.
 /// More detailed described [here](https://input-output-hk.github.io/catalyst-voices/architecture/08_concepts/voting_transaction/crypto/#voters-proof)
 #[allow(clippy::module_name_repetitions)]
 pub fn generate_voter_proof<R: CryptoRngCore>(
     vote: &Vote, encrypted_vote: EncryptedVote, randomness: EncryptionRandomness,
-    public_key: &PublicKey, commitment_key: &PublicKey, rng: &mut R,
+    public_key: &PublicKey, commitment: &VoterProofCommitment, rng: &mut R,
 ) -> VoterProof {
     let proof = generate_unit_vector_proof(
         &vote.to_unit_vector(),
         encrypted_vote.0,
         randomness.0,
         public_key,
-        commitment_key,
+        &commitment.0,
         rng,
     );
     VoterProof(proof)