coconut -> coconut_crypto

olegnn · lovesh · commit da6a04ba609d · 2023-03-29T15:40:30.000+05:30
diff --git a/benches/Cargo.toml b/benches/Cargo.toml
@@ -18,7 +18,7 @@ serde.workspace = true
 serde_with.workspace = true
 blake2 = { version = "0.10", default-features = false }
 itertools = "0.10.5"
-coconut = { version = "0.1.0", default-features = false, path = "../coconut" }
+coconut-crypto = { version = "0.1.0", default-features = false, path = "../coconut" }
 dock_crypto_utils = { default-features = false, path = "../utils" }
 zeroize.workspace = true
 
diff --git a/benches/benches/ps_proof.rs b/benches/benches/ps_proof.rs
@@ -9,8 +9,8 @@ use benches::setup_ps;
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
 use itertools::{EitherOrBoth, Itertools};
 
-use coconut::signature::Signature;
-use coconut::{setup::*, SignaturePoKGenerator};
+use coconut_crypto::signature::Signature;
+use coconut_crypto::{setup::*, SignaturePoKGenerator};
 
 type Fr = <Bls12_381 as Pairing>::ScalarField;
 
diff --git a/benches/benches/ps_signature.rs b/benches/benches/ps_signature.rs
@@ -5,8 +5,8 @@ use ark_std::{
     UniformRand,
 };
 use benches::setup_ps;
-use coconut::setup::*;
-use coconut::Signature;
+use coconut_crypto::setup::*;
+use coconut_crypto::Signature;
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
 
 type Fr = <Bls12_381 as Pairing>::ScalarField;
diff --git a/coconut/Cargo.toml b/coconut/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "coconut"
+name = "coconut-crypto"
 version = "0.1.0"
 edition.workspace = true
 authors.workspace = true
diff --git a/coconut/src/macros.rs b/coconut/src/macros.rs
@@ -26,20 +26,6 @@ macro_rules! impl_deref {
     };
 }
 
-/// Implements `From<type>` for the wrapper.
-#[macro_export]
-macro_rules! impl_deref_from_type_conversion {
-    ($wrapper: ident: $($type: ty),+) => {
-        $(
-            impl From<$type> for $wrapper {
-                fn from(value: $type) -> $wrapper {
-                    $wrapper(value.into())
-                }
-            }
-        )+
-    }
-}
-
 /// Convert given slices to `OwnedPairs`, panics in case of error.
 #[macro_export]
 macro_rules! owned_pairs {
diff --git a/proof_system/Cargo.toml b/proof_system/Cargo.toml
@@ -29,7 +29,7 @@ ark-groth16.workspace = true
 ark-r1cs-std.workspace = true
 ark-relations.workspace = true
 zeroize.workspace = true
-coconut = { version = "0.1.0", default-features = false, path = "../coconut" }
+coconut-crypto = { version = "0.1.0", default-features = false, path = "../coconut" }
 merlin = { workspace = true, default-features = false }
 legogroth16 = { workspace = true, default-features = false, features = ["circom", "aggregation"] }
 itertools = "0.10.5"
@@ -44,8 +44,8 @@ test_utils = { version = "0.1.0", default-features = false, path = "../test_util
 
 [features]
 default = ["parallel"]
-std = ["ark-ff/std", "ark-ec/std", "ark-std/std", "ark-serialize/std", "schnorr_pok/std", "dock_crypto_utils/std", "serde/std", "saver/std", "ark-groth16/std", "legogroth16/std", "ark-r1cs-std/std", "ark-relations/std", "merlin/std", "coconut/std"]
+std = ["ark-ff/std", "ark-ec/std", "ark-std/std", "ark-serialize/std", "schnorr_pok/std", "dock_crypto_utils/std", "serde/std", "saver/std", "ark-groth16/std", "legogroth16/std", "ark-r1cs-std/std", "ark-relations/std", "merlin/std", "coconut-crypto/std"]
 print-trace = ["ark-std/print-trace", "schnorr_pok/print-trace", "bbs_plus/print-trace", "vb_accumulator/print-trace", "dock_crypto_utils/print-trace"]
-parallel = ["std", "ark-ff/parallel", "ark-ec/parallel", "ark-std/parallel", "rayon", "schnorr_pok/parallel", "bbs_plus/parallel", "vb_accumulator/parallel", "saver/parallel", "ark-groth16/parallel", "legogroth16/parallel", "ark-r1cs-std/parallel", "dock_crypto_utils/parallel", "coconut/parallel"]
+parallel = ["std", "ark-ff/parallel", "ark-ec/parallel", "ark-std/parallel", "rayon", "schnorr_pok/parallel", "bbs_plus/parallel", "vb_accumulator/parallel", "saver/parallel", "ark-groth16/parallel", "legogroth16/parallel", "ark-r1cs-std/parallel", "dock_crypto_utils/parallel", "coconut-crypto/parallel"]
 wasmer-js = ["legogroth16/wasmer-js"]
 wasmer-sys = ["legogroth16/wasmer-sys"]
diff --git a/proof_system/src/derived_params.rs b/proof_system/src/derived_params.rs
@@ -9,7 +9,7 @@ use bbs_plus::setup::{
     PreparedSignatureParamsG1 as PreparedBBSPlusSigParams, PublicKeyG2 as BBSPlusPk,
     SignatureParamsG1 as BBSPlusSigParams,
 };
-use coconut::setup::{
+use coconut_crypto::setup::{
     PreparedPublicKey as PreparedPSPk, PreparedSignatureParams as PreparedPSSigParams,
     PublicKey as PSPk, SignatureParams as PSSigParams,
 };
diff --git a/proof_system/src/error.rs b/proof_system/src/error.rs
@@ -75,7 +75,7 @@ pub enum ProofSystemError {
     NoAggregateLegoGroth16ProofFound,
     InvalidNumberOfAggregateLegoGroth16Proofs(usize, usize),
     NotFoundAggregateLegoGroth16ProofForRequiredStatements(usize, BTreeSet<usize>),
-    PSSignaturePoKError(coconut::SignaturePoKError),
+    PSSignaturePoKError(coconut_crypto::SignaturePoKError),
 }
 
 impl From<SchnorrError> for ProofSystemError {
@@ -120,8 +120,8 @@ impl From<CircomError> for ProofSystemError {
     }
 }
 
-impl From<coconut::SignaturePoKError> for ProofSystemError {
-    fn from(e: coconut::SignaturePoKError) -> Self {
+impl From<coconut_crypto::SignaturePoKError> for ProofSystemError {
+    fn from(e: coconut_crypto::SignaturePoKError) -> Self {
         Self::PSSignaturePoKError(e)
     }
 }
diff --git a/proof_system/src/proof_spec.rs b/proof_system/src/proof_spec.rs
@@ -15,7 +15,7 @@ use bbs_plus::setup::{
     PreparedSignatureParamsG1 as PreparedBBSPlusSigParams, PublicKeyG2 as BBSPlusPk,
     SignatureParamsG1 as BBSPlusSigParams,
 };
-use coconut::setup::{
+use coconut_crypto::setup::{
     PreparedPublicKey as PreparedPSPk, PreparedSignatureParams as PreparedPSSigParams,
     PublicKey as PSPk, SignatureParams as PSSigParams,
 };
diff --git a/proof_system/src/setup_params.rs b/proof_system/src/setup_params.rs
@@ -47,8 +47,8 @@ pub enum SetupParams<E: Pairing, G: AffineRepr> {
     R1CS(#[serde_as(as = "ArkObjectBytes")] R1CS<E>),
     Bytes(Vec<u8>),
     FieldElemVec(#[serde_as(as = "Vec<ArkObjectBytes>")] Vec<E::ScalarField>),
-    PSSignatureParams(coconut::setup::SignatureParams<E>),
-    PSSignaturePublicKey(coconut::setup::PublicKey<E>),
+    PSSignatureParams(coconut_crypto::setup::SignatureParams<E>),
+    PSSignaturePublicKey(coconut_crypto::setup::PublicKey<E>),
 }
 
 macro_rules! delegate {
diff --git a/proof_system/src/statement/ps_signature.rs b/proof_system/src/statement/ps_signature.rs
@@ -8,7 +8,7 @@ use serde_with::{serde_as, Same};
 use crate::error::ProofSystemError;
 use crate::setup_params::SetupParams;
 use crate::statement::Statement;
-use coconut::{proof::*, setup::*};
+use coconut_crypto::{proof::*, setup::*};
 use dock_crypto_utils::serde_utils::ArkObjectBytes;
 
 /// Public values like setup params, public key and revealed messages for proving knowledge of PS signature.
diff --git a/proof_system/src/statement_proof.rs b/proof_system/src/statement_proof.rs
@@ -3,7 +3,7 @@ use ark_serialize::{CanonicalDeserialize, CanonicalSerialize, SerializationError
 use ark_std::io::{Read, Write};
 use ark_std::vec::Vec;
 use bbs_plus::prelude::PoKOfSignatureG1Proof;
-use coconut::SignaturePoK as PSSignaturePoK;
+use coconut_crypto::SignaturePoK as PSSignaturePoK;
 use dock_crypto_utils::serde_utils::*;
 use saver::encryption::Ciphertext;
 use schnorr_pok::SchnorrResponse;
diff --git a/proof_system/src/sub_protocols/ps_signature.rs b/proof_system/src/sub_protocols/ps_signature.rs
@@ -4,8 +4,8 @@ use ark_std::{collections::BTreeMap, io::Write, vec::Vec};
 
 use dock_crypto_utils::randomized_pairing_check::RandomizedPairingChecker;
 
-use coconut::proof::*;
-use coconut::setup::*;
+use coconut_crypto::proof::*;
+use coconut_crypto::setup::*;
 use itertools::{EitherOrBoth, Itertools};
 
 use crate::error::ProofSystemError;
@@ -85,17 +85,23 @@ impl<'a, E: Pairing> PSSignaturePoK<'a, E> {
             .slice
             .iter()
             .merge_join_by(blindings, |(m_idx, _), (b_idx, _)| m_idx.cmp(b_idx))
-            .map(|either| match either {
-                EitherOrBoth::Left((idx, msg)) => (*idx, CommitMessage::BlindMessageRandomly(msg)),
-                EitherOrBoth::Right((idx, _)) => {
-                    invalid_blinding_idx.replace(idx);
-
-                    (idx, CommitMessage::RevealMessage)
-                }
-                EitherOrBoth::Both((idx, message), (_, blinding)) => (
-                    *idx,
-                    CommitMessage::BlindMessageWithConcreteBlinding { message, blinding },
-                ),
+            .scan((), |(), either| {
+                let item = match either {
+                    EitherOrBoth::Left((idx, msg)) => {
+                        (*idx, CommitMessage::BlindMessageRandomly(msg))
+                    }
+                    EitherOrBoth::Both((idx, message), (_, blinding)) => (
+                        *idx,
+                        CommitMessage::BlindMessageWithConcreteBlinding { message, blinding },
+                    ),
+                    EitherOrBoth::Right((idx, _)) => {
+                        invalid_blinding_idx.replace(idx);
+
+                        return None;
+                    }
+                };
+
+                Some(item)
             });
 
         let revealed_messages = self
diff --git a/proof_system/src/witness.rs b/proof_system/src/witness.rs
@@ -2,7 +2,7 @@ use ark_ec::pairing::Pairing;
 use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 use ark_std::{cmp, collections::BTreeMap, fmt::Debug, string::String, vec::Vec};
 use bbs_plus::signature::SignatureG1 as BBSSignatureG1;
-use coconut::Signature;
+use coconut_crypto::Signature;
 use dock_crypto_utils::serde_utils::*;
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, Same};
diff --git a/proof_system/tests/ps_signature.rs b/proof_system/tests/ps_signature.rs
@@ -5,13 +5,14 @@ use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 use ark_std::collections::{BTreeMap, BTreeSet};
 use ark_std::{rand::prelude::StdRng, rand::SeedableRng, UniformRand};
 use blake2::Blake2b512;
-use coconut::setup::*;
+use coconut_crypto::setup::*;
+
 #[cfg(feature = "parallel")]
 use rayon::prelude::*;
 
-use coconut::MultiMessageCommitment;
-use coconut::{helpers::*, BlindSignature, CommitmentOrMessage};
-use coconut::{MessageCommitment, Signature};
+use coconut_crypto::MultiMessageCommitment;
+use coconut_crypto::{helpers::*, BlindSignature, CommitmentOrMessage};
+use coconut_crypto::{MessageCommitment, Signature};
 use std::time::Instant;
 use vb_accumulator::prelude::{Accumulator, MembershipProvingKey, NonMembershipProvingKey};
 

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ pub enum ProofSystemError {`
`75`	`75`	`NoAggregateLegoGroth16ProofFound,`
`76`	`76`	`InvalidNumberOfAggregateLegoGroth16Proofs(usize, usize),`
`77`	`77`	`NotFoundAggregateLegoGroth16ProofForRequiredStatements(usize, BTreeSet<usize>),`
`78`		`- PSSignaturePoKError(coconut::SignaturePoKError),`
	`78`	`+ PSSignaturePoKError(coconut_crypto::SignaturePoKError),`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`impl From<SchnorrError> for ProofSystemError {`
`@@ -120,8 +120,8 @@ impl From<CircomError> for ProofSystemError {`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`		`-impl From<coconut::SignaturePoKError> for ProofSystemError {`
`124`		`- fn from(e: coconut::SignaturePoKError) -> Self {`
	`123`	`+impl From<coconut_crypto::SignaturePoKError> for ProofSystemError {`
	`124`	`+ fn from(e: coconut_crypto::SignaturePoKError) -> Self {`
`125`	`125`	`Self::PSSignaturePoKError(e)`
`126`	`126`	`}`
`127`	`127`	`}`