Added the support for GR1CS and added rescue hash function

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
           toolchain: ${{ matrix.rust }}
           override: true
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
@@ -108,7 +108,7 @@ jobs:
           target: aarch64-unknown-none
           override: true
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry

Cargo.toml

@@ -1,18 +1,15 @@
 [workspace]
-members = [
-    "crypto-primitives",
-    "macros",
-]
+members = ["crypto-primitives", "macros"]
 resolver = "2"
 
 [workspace.package]
-version = "0.4.0"
-authors = [ "arkworks contributors" ]
+version = "0.5.0"
+authors = ["arkworks contributors"]
 description = "A library of useful cryptographic primitives"
 homepage = "https://arkworks.rs"
 repository = "https://github.com/arkworks-rs/crypto-primitives"
 documentation = "https://docs.rs/ark-crypto-primitives/"
-keywords = [ "r1cs", "pedersen", "blake2s", "snark", "schnorr" ]
+keywords = ["gr1cs", "pedersen", "blake2s", "snark", "schnorr"]
 categories = ["cryptography"]
 include = ["Cargo.toml", "src", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 license = "MIT/Apache-2.0"
@@ -43,16 +40,3 @@ incremental = true
 debug-assertions = true
 debug = true
 
-[patch.crates-io]
-ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std/" }
-ark-ff = { git = "https://github.com/arkworks-rs/algebra/" }
-ark-ec = { git = "https://github.com/arkworks-rs/algebra/" }
-ark-poly = { git = "https://github.com/arkworks-rs/algebra/" }
-ark-serialize = { git = "https://github.com/arkworks-rs/algebra/" }
-ark-std = { git = "https://github.com/arkworks-rs/std/" }
-
-ark-ed-on-bls12-377 = { git = "https://github.com/arkworks-rs/algebra/" }
-ark-ed-on-bls12-381 = { git = "https://github.com/arkworks-rs/algebra/" }
-ark-bls12-377 = { git = "https://github.com/arkworks-rs/algebra/" }
-ark-mnt4-298 = { git = "https://github.com/arkworks-rs/algebra/" }
-ark-mnt6-298 = { git = "https://github.com/arkworks-rs/algebra/" }

crypto-primitives/Cargo.toml

@@ -15,54 +15,75 @@ edition.workspace = true
 ################################# Dependencies ################################
 
 [dependencies]
-ark-crypto-primitives-macros = { version = "^0.4.0", path = "../macros" }
+ark-crypto-primitives-macros = { version = "^0.5.0", path = "../macros" }
 
-ark-ff = { version = "^0.4.0", default-features = false }
-ark-ec = { version = "^0.4.0", default-features = false }
-ark-std = { version = "^0.4.0", default-features = false }
-ark-relations = { version = "^0.4.0", default-features = false }
-ark-serialize = { version = "^0.4.0", default-features = false, features = [ "derive" ] }
+ark-ff = { version = "^0.5.0", default-features = false }
+ark-ec = { version = "^0.5.0", default-features = false }
+ark-std = { version = "^0.5.0", default-features = false }
+ark-relations = { git = "https://github.com/arkworks-rs/snark", default-features = true }
+ark-serialize = { version = "^0.5.0", default-features = false, features = [
+    "derive",
+] }
 
 blake2 = { version = "0.10", default-features = false }
 sha2 = { version = "0.10", default-features = false }
 digest = { version = "0.10", default-features = false }
 merlin = { version = "3.0.0", default-features = false, optional = true }
-
-ark-r1cs-std = { version = "^0.4.0", optional = true, default-features = false }
-ark-snark = { version = "^0.4.0", default-features = false }
+num-bigint = "0.4.4"
+ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std", default-features = true, optional = true }
+ark-snark = { git = "https://github.com/arkworks-rs/snark", default-features = true }
 
 rayon = { version = "1.0", optional = true }
 derivative = { version = "2.0", features = ["use_core"] }
-tracing = { version = "0.1", default-features = false, features = [ "attributes" ], optional = true }
-hashbrown = { version = "0.14", default-features = false, features = ["inline-more", "allocator-api2"], optional = true  }
+tracing = { version = "0.1", default-features = false, features = [
+    "attributes",
+], optional = true }
+hashbrown = { version = "0.14", default-features = false, features = [
+    "inline-more",
+    "allocator-api2",
+], optional = true }
 
 [features]
 default = ["std"]
-std = [ "ark-ff/std", "ark-ec/std", "ark-std/std", "ark-relations/std" ]
-print-trace = [ "ark-std/print-trace" ]
-parallel = [ "std", "rayon", "ark-ec/parallel", "ark-std/parallel", "ark-ff/parallel" ]
-r1cs = [ "ark-r1cs-std", "tracing" ]
-crh = [ "sponge" ]
-sponge = [ "merlin" ]
-commitment = [ "crh" ]
+std = ["ark-ff/std", "ark-ec/std", "ark-std/std", "ark-relations/std"]
+print-trace = ["ark-std/print-trace"]
+parallel = [
+    "std",
+    "rayon",
+    "ark-ec/parallel",
+    "ark-std/parallel",
+    "ark-ff/parallel",
+]
+r1cs = ["ark-r1cs-std", "tracing"]
+gr1cs = ["ark-r1cs-std", "tracing"]
+crh = ["sponge"]
+sponge = ["merlin"]
+commitment = ["crh"]
 merkle_tree = ["crh", "hashbrown"]
 encryption = []
 prf = []
 snark = []
 signature = []
 
 [target.'cfg(all(target_has_atomic = "8", target_has_atomic = "16", target_has_atomic = "32", target_has_atomic = "64", target_has_atomic = "ptr"))'.dependencies]
-ahash = { version = "0.8", default-features = false}
+ahash = { version = "0.8", default-features = false }
 
 [target.'cfg(not(all(target_has_atomic = "8", target_has_atomic = "16", target_has_atomic = "32", target_has_atomic = "64", target_has_atomic = "ptr")))'.dependencies]
 fnv = { version = "1.0", default-features = false }
 
 [dev-dependencies]
-ark-ed-on-bls12-377 = { version = "^0.4.0", default-features = false }
-ark-ed-on-bls12-381 = { version = "^0.4.0", default-features = false, features = [ "r1cs" ] }
-ark-bls12-377 = { version = "^0.4.0", default-features = false, features = [ "curve", "r1cs" ] }
-ark-mnt4-298 = { version = "^0.4.0", default-features = false, features = [ "curve", "r1cs" ] }
-ark-mnt6-298 = { version = "^0.4.0", default-features = false, features = [ "r1cs" ] }
+ark-ed-on-bls12-377 = { git = "https://github.com/arkworks-rs/algebra", default-features = false }
+ark-ed-on-bls12-381 = { git = "https://github.com/arkworks-rs/algebra", default-features = false }
+ark-bls12-377 = { git = "https://github.com/arkworks-rs/algebra", default-features = false, features = [
+    "curve",
+] }
+ark-bls12-381 = { git = "https://github.com/arkworks-rs/algebra", default-features = false, features = [
+    "curve",
+] }
+ark-mnt4-298 = { git = "https://github.com/arkworks-rs/algebra", default-features = false, features = [
+    "curve",
+] }
+ark-mnt6-298 = { git = "https://github.com/arkworks-rs/algebra", default-features = false }
 criterion = { version = "0.4" }
 
 ################################# Benchmarks ##################################
@@ -71,28 +92,28 @@ criterion = { version = "0.4" }
 name = "pedersen_crh"
 path = "benches/crh.rs"
 harness = false
-required-features = [ "crh" ]
+required-features = ["crh"]
 
 [[bench]]
 name = "pedersen_comm"
 path = "benches/comm.rs"
 harness = false
-required-features = [ "commitment" ]
+required-features = ["commitment"]
 
 [[bench]]
 name = "blake2s_prf"
 path = "benches/prf.rs"
 harness = false
-required-features = [ "prf" ]
+required-features = ["prf"]
 
 [[bench]]
 name = "schnorr_sig"
 path = "benches/signature.rs"
 harness = false
-required-features = [ "signature" ]
+required-features = ["signature"]
 
 [[bench]]
 name = "merkle_tree"
 path = "benches/merkle_tree.rs"
 harness = false
-required-features = [ "merkle_tree" ]
+required-features = ["merkle_tree"]

crypto-primitives/src/commitment/blake2s/constraints.rs

@@ -4,7 +4,7 @@ use crate::{
 };
 use ark_ff::{Field, PrimeField};
 use ark_r1cs_std::prelude::*;
-use ark_relations::r1cs::{Namespace, SynthesisError};
+use ark_relations::gr1cs::{Namespace, SynthesisError};
 use ark_std::borrow::Borrow;
 
 #[derive(Clone)]
@@ -20,7 +20,7 @@ impl<F: PrimeField> CommitmentGadget<blake2s::Commitment, F> for CommGadget {
     type ParametersVar = ParametersVar;
     type RandomnessVar = RandomnessVar<F>;
 
-    #[tracing::instrument(target = "r1cs", skip(input, r))]
+    #[tracing::instrument(target = "gr1cs", skip(input, r))]
     fn commit(
         _: &Self::ParametersVar,
         input: &[UInt8<F>],
@@ -40,7 +40,7 @@ impl<F: PrimeField> CommitmentGadget<blake2s::Commitment, F> for CommGadget {
 }
 
 impl<ConstraintF: Field> AllocVar<(), ConstraintF> for ParametersVar {
-    #[tracing::instrument(target = "r1cs", skip(_cs, _f))]
+    #[tracing::instrument(target = "gr1cs", skip(_cs, _f))]
     fn new_variable<T: Borrow<()>>(
         _cs: impl Into<Namespace<ConstraintF>>,
         _f: impl FnOnce() -> Result<T, SynthesisError>,
@@ -51,7 +51,7 @@ impl<ConstraintF: Field> AllocVar<(), ConstraintF> for ParametersVar {
 }
 
 impl<ConstraintF: PrimeField> AllocVar<[u8; 32], ConstraintF> for RandomnessVar<ConstraintF> {
-    #[tracing::instrument(target = "r1cs", skip(cs, f))]
+    #[tracing::instrument(target = "gr1cs", skip(cs, f))]
     fn new_variable<T: Borrow<[u8; 32]>>(
         cs: impl Into<Namespace<ConstraintF>>,
         f: impl FnOnce() -> Result<T, SynthesisError>,
@@ -77,7 +77,7 @@ mod test {
     };
     use ark_ed_on_bls12_381::Fq as Fr;
     use ark_r1cs_std::prelude::*;
-    use ark_relations::r1cs::ConstraintSystem;
+    use ark_relations::gr1cs::ConstraintSystem;
     use ark_std::rand::Rng;
 
     #[test]

crypto-primitives/src/commitment/blake2s/mod.rs

@@ -5,7 +5,7 @@ use digest::Digest;
 
 pub struct Commitment;
 
-#[cfg(feature = "r1cs")]
+#[cfg(any(feature = "r1cs", feature = "gr1cs"))]
 pub mod constraints;
 
 impl CommitmentScheme for Commitment {

crypto-primitives/src/commitment/constraints.rs

@@ -1,14 +1,14 @@
 use crate::commitment::CommitmentScheme;
 use ark_ff::Field;
 use ark_r1cs_std::prelude::*;
-use ark_relations::r1cs::SynthesisError;
+use ark_relations::gr1cs::SynthesisError;
 use ark_std::fmt::Debug;
 
 pub trait CommitmentGadget<C: CommitmentScheme, ConstraintF: Field> {
     type OutputVar: EqGadget<ConstraintF>
         + ToBytesGadget<ConstraintF>
         + AllocVar<C::Output, ConstraintF>
-        + R1CSVar<ConstraintF>
+        + GR1CSVar<ConstraintF>
         + Clone
         + Sized
         + Debug;

crypto-primitives/src/commitment/injective_map/constraints.rs

@@ -12,7 +12,7 @@ use ark_r1cs_std::{
     groups::{CurveVar, GroupOpsBounds},
     uint8::UInt8,
 };
-use ark_relations::r1cs::SynthesisError;
+use ark_relations::gr1cs::SynthesisError;
 use ark_std::marker::PhantomData;
 
 type ConstraintF<C> = <<C as CurveGroup>::BaseField as Field>::BasePrimeField;

crypto-primitives/src/commitment/injective_map/mod.rs

@@ -6,7 +6,7 @@ use crate::{
 use ark_ec::CurveGroup;
 use ark_std::{marker::PhantomData, rand::Rng};
 
-#[cfg(feature = "r1cs")]
+#[cfg(any(feature = "r1cs", feature = "gr1cs"))]
 pub mod constraints;
 
 pub struct PedersenCommCompressor<C: CurveGroup, I: InjectiveMap<C>, W: pedersen::Window> {

crypto-primitives/src/commitment/mod.rs

@@ -7,9 +7,9 @@ pub mod blake2s;
 pub mod injective_map;
 pub mod pedersen;
 
-#[cfg(feature = "r1cs")]
+#[cfg(any(feature = "r1cs", feature = "gr1cs"))]
 pub mod constraints;
-#[cfg(feature = "r1cs")]
+#[cfg(any(feature = "r1cs", feature = "gr1cs"))]
 pub use constraints::*;
 
 pub trait CommitmentScheme {