Fix compile issues and some refactoring

Signed-off-by: lovesh <[email protected]>

.github/workflows/test.yml

@@ -70,4 +70,4 @@ jobs:
           toolchain: stable
           override: true
       - name: Run tests
-        run: cargo test --release --all
+        run: RUST_MIN_STACK=8388608 cargo test --release --all --no-fail-fast

benches/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.4.0"
 edition.workspace = true
 authors.workspace = true
 license.workspace = true
+publish = false
 
 [dependencies]
 bbs_plus = { default-features = false, path = "../bbs_plus" }

benches/benches/bbs_plus_proof.rs

@@ -6,12 +6,13 @@ use ark_std::{
     UniformRand,
 };
 use bbs_plus::{
-    proof::{MessageOrBlinding, PoKOfSignatureG1Protocol},
+    proof::PoKOfSignatureG1Protocol,
     setup::{KeypairG2, SignatureParamsG1},
     signature::SignatureG1,
 };
 use benches::setup_bbs_plus;
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
+use dock_crypto_utils::signature::MessageOrBlinding;
 
 type Fr = <Bls12_381 as Pairing>::ScalarField;
 

benches/benches/bbs_proof.rs

@@ -6,11 +6,12 @@ use ark_std::{
     UniformRand,
 };
 use bbs_plus::prelude::{
-    KeypairG2, MessageOrBlinding, PoKOfSignature23G1Protocol, Signature23G1, SignatureParams23G1,
+    KeypairG2, PoKOfSignature23G1Protocol, Signature23G1, SignatureParams23G1,
 };
 
 use benches::setup_bbs_plus;
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
+use dock_crypto_utils::signature::MessageOrBlinding;
 
 type Fr = <Bls12_381 as Pairing>::ScalarField;
 

kvac/src/bbs_sharp/README.md

@@ -10,6 +10,8 @@ In the former, the verifier is either the signer (has the secret key) or can ask
 In the latter, the user needs to communicate with the signer before creating a proof and get "some helper data"
 to create a proof which the verifier can check without needing the secret key or interacting with the issuer.
 For efficiency and avoiding correlation (when signer and verifier collude), the user gets a batch of
-"helper data" to let him create several proofs.
+"helper data" to let him create several proofs.  
+Also, the proof of knowledge of MAC protocol specified in footnote 31 in the paper is modified to allow integration with other 
+protocols, see the code comments in the relevant module.
 
 Implements designated verifier proof for both issuer's signature (proof of validity of MAC) and user's proof of knowledge of MAC

kvac/src/bbs_sharp/mod.rs

@@ -10,7 +10,9 @@
 //! In the latter, the user needs to communicate with the signer before creating a proof and get "some helper data"
 //! to create a proof which the verifier can check without needing the secret key or interacting with the issuer.
 //! For efficiency and avoiding correlation (when signer and verifier collude), the user gets a batch of
-//! "helper data" to let him create several proofs.
+//! "helper data" to let him create several proofs.  
+//! Also, the proof of knowledge of MAC protocol specified in footnote 31 in the paper is modified to allow  
+//! integration with other protocols, see the code comments in the relevant module.
 //!
 //! Implements designated verifier proof for both issuer's signature (proof of validity of MAC) and user's proof of
 //! knowledge of MAC

legogroth16/src/circom/tests.rs

@@ -20,6 +20,7 @@ use std::{
     collections::{BTreeSet, HashMap},
     ops::AddAssign,
     path::PathBuf,
+    time::Instant,
 };
 
 /// Given path relative to this crate, return absolute disk path
@@ -54,6 +55,7 @@ pub fn prove_and_verify_circuit<E: Pairing>(
     params: &ProvingKey<E>,
     commit_witness_count: u32,
 ) -> Vec<E::ScalarField> {
+    let start = Instant::now();
     let cs = ConstraintSystem::<E::ScalarField>::new_ref();
     circuit.clone().generate_constraints(cs.clone()).unwrap();
     assert!(cs.is_satisfied().unwrap());
@@ -71,9 +73,10 @@ pub fn prove_and_verify_circuit<E: Pairing>(
     let mut rng = StdRng::seed_from_u64(300u64);
     let v = E::ScalarField::rand(&mut rng);
     let proof = create_random_proof(circuit, v, params, &mut rng).unwrap();
-    println!("Proof generated");
+    println!("Proof generated in {:?}", start.elapsed());
 
     let pvk = prepare_verifying_key::<E>(&params.vk);
+    let start = Instant::now();
     // Prover verifies the openings of the commitments in proof.d
     verify_witness_commitment(
         &params.vk,
@@ -84,8 +87,8 @@ pub fn prove_and_verify_circuit<E: Pairing>(
     )
     .unwrap();
     verify_proof(&pvk, &proof, &public_inputs).unwrap();
-    println!("Proof verified");
-    return public_inputs;
+    println!("Proof verified in {:?}", start.elapsed());
+    public_inputs
 }
 
 pub fn generate_params_prove_and_verify<

proof_system/src/sub_protocols/verifiable_encryption_tz_21.rs

@@ -30,13 +30,6 @@ pub mod dkgith_decls {
     use super::BatchedHashedElgamalCiphertext;
     use verifiable_encryption::tz_21::dkgith::{CompressedCiphertext, DkgithProof};
 
-    // Very large values for repetitions cause stack overflow
-    // pub const NUM_PARTIES: usize = 4;
-    // pub const NUM_REPS: usize = 64;
-    // pub const SUBSET_SIZE: usize = 48;
-    // pub const DEPTH: usize = 2;
-    // pub const NUM_NODES: usize = 7;
-
     pub const NUM_PARTIES: usize = 16;
     pub const NUM_REPS: usize = 32;
     pub const SUBSET_SIZE: usize = 30;
@@ -64,16 +57,16 @@ pub mod rdkgith_decls {
     use dock_crypto_utils::elgamal::BatchedHashedElgamalCiphertext;
     use verifiable_encryption::tz_21::rdkgith::{CompressedCiphertext, RdkgithProof};
 
-    // Very large values cause stack overflow
-    // pub const NUM_PARTIES: usize = 192;
-    // pub const THRESHOLD: usize = 36;
-    // pub const NUM_PARTIES_MINUS_THRESHOLD: usize = 156;
-    // pub const SUBSET_SIZE: usize = 145;
+    pub const NUM_PARTIES: usize = 192;
+    pub const THRESHOLD: usize = 36;
+    pub const NUM_PARTIES_MINUS_THRESHOLD: usize = 156;
+    pub const SUBSET_SIZE: usize = 145;
 
-    pub const NUM_PARTIES: usize = 50;
-    pub const THRESHOLD: usize = 35;
-    pub const NUM_PARTIES_MINUS_THRESHOLD: usize = 15;
-    pub const SUBSET_SIZE: usize = 10;
+    // Very large values cause stack overflow so use them when testing on smaller stack
+    // pub const NUM_PARTIES: usize = 50;
+    // pub const THRESHOLD: usize = 35;
+    // pub const NUM_PARTIES_MINUS_THRESHOLD: usize = 15;
+    // pub const SUBSET_SIZE: usize = 10;
 
     pub type Proof<G> = RdkgithProof<
         G,