Add Arkworks crate support

.gitignore

@@ -1,3 +1,4 @@
 target/
 **/*.rs.bk
 Cargo.lock
+.idea

Cargo.toml

@@ -4,15 +4,14 @@ name = "zkp"
 # - update CHANGELOG
 # - update html_root_url
 # - update README if required by semver
-version = "0.8.0"
+version = "0.9.0"
 authors = ["Henry de Valence <hdevalence@hdevalence.ca>"]
 edition = "2018"
 license = "CC0-1.0"
 readme = "README.md"
-repository = "https://github.com/zkcrypto/zkp"
 documentation = "https://docs.rs/zkp"
 categories = ["cryptography"]
-keywords = ["cryptography", "ristretto", "zero-knowledge", "NIZK", "compiler"]
+keywords = ["cryptography", "xsk233", "zero-knowledge", "NIZK", "compiler"]
 description = "A toolkit for auto-generated implementations of Schnorr proofs"
 exclude = [
     ".gitignore"
@@ -22,23 +21,27 @@ exclude = [
 features = ["nightly"]
 
 [dependencies]
-merlin = "2"
-rand = "0.7"
-serde = "1"
+merlin = "3.0.0"
+rand = "0.8.5"
+serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1"
-thiserror = "1"
+thiserror = "2.0.12"
 # Disable default features to deselect a backend, then select one below
-curve25519-dalek = { package = "curve25519-dalek-ng", version = "3", default-features = false, features = ["serde", "std"] }
+ark-ec = "0.5.0"
+ark-serialize = "0.5.0"
+ark-std = "0.5.0"
+ark-ff = "0.5.0"
 
 [dev-dependencies]
 bincode = "1"
-sha2 = "0.9"
+sha2 = "0.10.8"
+ark-xsk233 = { version="0.1.0", git = "https://github.com/distributed-lab/ark-xsk233.git", branch = "fix/for_zkp" }
 
 [features]
-nightly = ["curve25519-dalek/nightly"]
+nightly = []
 debug-transcript = ["merlin/debug-transcript"]
 bench = []
 default = ["u64_backend"]
-u32_backend = ["curve25519-dalek/u32_backend"]
-u64_backend = ["curve25519-dalek/u64_backend"]
-simd_backend = ["curve25519-dalek/simd_backend"]
+u32_backend = []
+u64_backend = []
+simd_backend = []

README.md

@@ -1,7 +1,8 @@
 # zkp: a toolkit for Schnorr proofs
 
 This crate has a toolkit for Schnorr-style zero-knowledge proofs,
-instantiated using the ristretto255 group.
+instantiated using arbitrary elliptic curve group built with [arkworks] 
+(original package uses only xsk233 group).
 
 It provides two levels of API:
 
@@ -64,14 +65,6 @@ extern crate zkp;
 The `nightly` feature enables nightly-specific features.  It is required
 to build the documentation.
 
-#### Backend selection
-
-`zkp` provides the following pass-through features to select a
-`curve25519-dalek` backend:
-
-* `u32_backend`
-* `u64_backend`
-* `simd_backend`
 
 #### Transcript debugging
 
@@ -99,5 +92,6 @@ While I expect the 1.0 version to be largely unchanged from the current
 code, for now there are no stability guarantees on the proofs, so they
 should not yet be deployed.
 
+[arkworks]: https://arkworks.rs/
 [bellman]: https://github.com/zkcrypto/bellman
 [merlin_blog]: https://medium.com/@hdevalence/merlin-flexible-composable-transcripts-for-zero-knowledge-proofs-28d9fda22d9a

benches/dleq.rs

@@ -13,7 +13,6 @@
 #![allow(non_snake_case)]
 
 extern crate bincode;
-extern crate curve25519_dalek;
 extern crate serde;
 #[macro_use]
 extern crate serde_derive;
@@ -22,15 +21,18 @@ extern crate sha2;
 extern crate zkp;
 
 extern crate test;
+use ark_ec::{AffineRepr, CurveGroup};
+use ark_std::UniformRand;
+use rand::thread_rng;
 use test::Bencher;
 
-use self::sha2::Sha512;
+use ark_xsk233::affine::{Xsk233Affine as G1Affine, Xsk233Affine};
+use ark_xsk233::xsk233::Fr;
 
-use curve25519_dalek::constants as dalek_constants;
-use curve25519_dalek::ristretto::RistrettoPoint;
-use curve25519_dalek::scalar::Scalar;
-
-use zkp::toolbox::{batch_verifier::BatchVerifier, prover::Prover, verifier::Verifier, SchnorrCS};
+use zkp::toolbox::{
+    batch_verifier::BatchVerifier, prover::Prover, verifier::Verifier, SchnorrCS,
+    TranscriptProtocol,
+};
 use zkp::Transcript;
 
 #[allow(non_snake_case)]
@@ -48,16 +50,17 @@ fn dleq_statement<CS: SchnorrCS>(
 
 #[bench]
 fn create_compact_dleq(b: &mut Bencher) {
-    let G = dalek_constants::RISTRETTO_BASEPOINT_POINT;
-    let H = RistrettoPoint::hash_from_bytes::<Sha512>(G.compress().as_bytes());
+    let G = G1Affine::generator();
+    let H = G1Affine::rand(&mut thread_rng());
 
-    let x = Scalar::from(89327492234u64);
-    let A = G * x;
-    let B = H * x;
+    let x = Fr::from(89327492234u64);
+    let A = (G * x).into_affine();
+    let B = (H * x).into_affine();
 
     b.iter(|| {
         let mut transcript = Transcript::new(b"DLEQTest");
-        let mut prover = Prover::new(b"DLEQProof", &mut transcript);
+        let mut prover: Prover<Xsk233Affine, Transcript, _> =
+            Prover::new(b"DLEQProof", &mut transcript);
 
         let var_x = prover.allocate_scalar(b"x", x);
         let (var_G, _) = prover.allocate_point(b"G", G);
@@ -73,17 +76,18 @@ fn create_compact_dleq(b: &mut Bencher) {
 
 #[bench]
 fn verify_compact_dleq(b: &mut Bencher) {
-    let G = dalek_constants::RISTRETTO_BASEPOINT_POINT;
-    let H = RistrettoPoint::hash_from_bytes::<Sha512>(G.compress().as_bytes());
+    let G = G1Affine::generator();
+    let H = G1Affine::rand(&mut thread_rng());
 
     let (proof, cmpr_A, cmpr_B) = {
-        let x = Scalar::from(89327492234u64);
+        let x = Fr::from(89327492234u64);
 
-        let A = G * x;
-        let B = H * x;
+        let A = (G * x).into_affine();
+        let B = (H * x).into_affine();
 
         let mut transcript = Transcript::new(b"DLEQTest");
-        let mut prover = Prover::new(b"DLEQProof", &mut transcript);
+        let mut prover: Prover<Xsk233Affine, Transcript, _> =
+            Prover::new(b"DLEQProof", &mut transcript);
 
         // XXX committing var names to transcript forces ordering (?)
         let var_x = prover.allocate_scalar(b"x", x);
@@ -97,16 +101,14 @@ fn verify_compact_dleq(b: &mut Bencher) {
         (prover.prove_compact(), cmpr_A, cmpr_B)
     };
 
-    let cmpr_G = G.compress();
-    let cmpr_H = H.compress();
-
     b.iter(|| {
         let mut transcript = Transcript::new(b"DLEQTest");
-        let mut verifier = Verifier::new(b"DLEQProof", &mut transcript);
+        let mut verifier: Verifier<Xsk233Affine, Transcript, _> =
+            Verifier::new(b"DLEQProof", &mut transcript);
 
         let var_x = verifier.allocate_scalar(b"x");
-        let var_G = verifier.allocate_point(b"G", cmpr_G).unwrap();
-        let var_H = verifier.allocate_point(b"H", cmpr_H).unwrap();
+        let var_G = verifier.allocate_point(b"G", G).unwrap();
+        let var_H = verifier.allocate_point(b"H", H).unwrap();
         let var_A = verifier.allocate_point(b"A", cmpr_A).unwrap();
         let var_B = verifier.allocate_point(b"B", cmpr_B).unwrap();
 
@@ -118,16 +120,17 @@ fn verify_compact_dleq(b: &mut Bencher) {
 
 #[bench]
 fn create_batchable_dleq(b: &mut Bencher) {
-    let G = dalek_constants::RISTRETTO_BASEPOINT_POINT;
-    let H = RistrettoPoint::hash_from_bytes::<Sha512>(G.compress().as_bytes());
+    let G = G1Affine::generator();
+    let H = G1Affine::rand(&mut thread_rng());
 
-    let x = Scalar::from(89327492234u64);
-    let A = G * x;
-    let B = H * x;
+    let x = Fr::from(89327492234u64);
+    let A = (G * x).into_affine();
+    let B = (H * x).into_affine();
 
     b.iter(|| {
         let mut transcript = Transcript::new(b"DLEQTest");
-        let mut prover = Prover::new(b"DLEQProof", &mut transcript);
+        let mut prover: Prover<Xsk233Affine, Transcript, _> =
+            Prover::new(b"DLEQProof", &mut transcript);
 
         let var_x = prover.allocate_scalar(b"x", x);
         let (var_G, _) = prover.allocate_point(b"G", G);
@@ -143,17 +146,18 @@ fn create_batchable_dleq(b: &mut Bencher) {
 
 #[bench]
 fn verify_batchable_dleq(b: &mut Bencher) {
-    let G = dalek_constants::RISTRETTO_BASEPOINT_POINT;
-    let H = RistrettoPoint::hash_from_bytes::<Sha512>(G.compress().as_bytes());
+    let G = G1Affine::generator();
+    let H = G1Affine::rand(&mut thread_rng());
 
     let (proof, cmpr_A, cmpr_B) = {
-        let x = Scalar::from(89327492234u64);
+        let x = Fr::from(89327492234u64);
 
-        let A = G * x;
-        let B = H * x;
+        let A = (G * x).into_affine();
+        let B = (H * x).into_affine();
 
         let mut transcript = Transcript::new(b"DLEQTest");
-        let mut prover = Prover::new(b"DLEQProof", &mut transcript);
+        let mut prover: Prover<Xsk233Affine, Transcript, _> =
+            Prover::new(b"DLEQProof", &mut transcript);
 
         let var_x = prover.allocate_scalar(b"x", x);
         let (var_G, _) = prover.allocate_point(b"G", G);
@@ -166,16 +170,14 @@ fn verify_batchable_dleq(b: &mut Bencher) {
         (prover.prove_batchable(), cmpr_A, cmpr_B)
     };
 
-    let cmpr_G = G.compress();
-    let cmpr_H = H.compress();
-
     b.iter(|| {
         let mut transcript = Transcript::new(b"DLEQTest");
-        let mut verifier = Verifier::new(b"DLEQProof", &mut transcript);
+        let mut verifier: Verifier<Xsk233Affine, Transcript, _> =
+            Verifier::new(b"DLEQProof", &mut transcript);
 
         let var_x = verifier.allocate_scalar(b"x");
-        let var_G = verifier.allocate_point(b"G", cmpr_G).unwrap();
-        let var_H = verifier.allocate_point(b"H", cmpr_H).unwrap();
+        let var_G = verifier.allocate_point(b"G", G).unwrap();
+        let var_H = verifier.allocate_point(b"H", H).unwrap();
         let var_A = verifier.allocate_point(b"A", cmpr_A).unwrap();
         let var_B = verifier.allocate_point(b"B", cmpr_B).unwrap();
 
@@ -186,22 +188,23 @@ fn verify_batchable_dleq(b: &mut Bencher) {
 }
 
 fn batch_verify_batchable_dleq_helper(batch_size: usize, b: &mut Bencher) {
-    let G = dalek_constants::RISTRETTO_BASEPOINT_POINT;
-    let H = RistrettoPoint::hash_from_bytes::<Sha512>(G.compress().as_bytes());
+    let G = G1Affine::generator();
+    let H = G1Affine::rand(&mut thread_rng());
 
     let mut proofs = Vec::new();
     let mut cmpr_As = Vec::new();
     let mut cmpr_Bs = Vec::new();
 
     for j in 0..batch_size {
         let (proof, cmpr_A, cmpr_B) = {
-            let x = Scalar::from((j as u64) + 89327492234u64);
+            let x = Fr::from((j as u64) + 89327492234u64);
 
-            let A = G * x;
-            let B = H * x;
+            let A = (G * x).into_affine();
+            let B = (H * x).into_affine();
 
             let mut transcript = Transcript::new(b"DLEQBatchTest");
-            let mut prover = Prover::new(b"DLEQProof", &mut transcript);
+            let mut prover: Prover<Xsk233Affine, Transcript, _> =
+                Prover::new(b"DLEQProof", &mut transcript);
 
             // XXX committing var names to transcript forces ordering (?)
             let var_x = prover.allocate_scalar(b"x", x);
@@ -222,11 +225,12 @@ fn batch_verify_batchable_dleq_helper(batch_size: usize, b: &mut Bencher) {
     b.iter(|| {
         let mut transcripts = vec![Transcript::new(b"DLEQBatchTest"); batch_size];
         let transcript_refs = transcripts.iter_mut().collect();
-        let mut verifier = BatchVerifier::new(b"DLEQProof", batch_size, transcript_refs).unwrap();
+        let mut verifier: BatchVerifier<Xsk233Affine, Transcript, _> =
+            BatchVerifier::new(b"DLEQProof", batch_size, transcript_refs).unwrap();
 
         let var_x = verifier.allocate_scalar(b"x");
-        let var_G = verifier.allocate_static_point(b"G", G.compress()).unwrap();
-        let var_H = verifier.allocate_static_point(b"H", H.compress()).unwrap();
+        let var_G = verifier.allocate_static_point(b"G", G).unwrap();
+        let var_H = verifier.allocate_static_point(b"H", H).unwrap();
         let var_A = verifier
             .allocate_instance_point(b"A", cmpr_As.clone())
             .unwrap();

benches/zkp.rs

@@ -12,7 +12,6 @@
 #![feature(test)]
 
 extern crate bincode;
-extern crate curve25519_dalek;
 extern crate serde;
 #[macro_use]
 extern crate serde_derive;

src/lib.rs

@@ -22,15 +22,15 @@
 
 extern crate serde;
 
-#[doc(hidden)]
-#[macro_use]
-pub extern crate serde_derive;
-#[doc(hidden)]
-pub extern crate curve25519_dalek;
 #[doc(hidden)]
 pub extern crate merlin;
 #[doc(hidden)]
 pub extern crate rand;
+#[doc(hidden)]
+pub extern crate serde_derive;
+
+pub extern crate ark_ec;
+pub extern crate ark_ff;
 
 pub use merlin::Transcript;
 
@@ -45,4 +45,3 @@ pub mod toolbox;
 
 #[macro_use]
 mod macros;
-pub use crate::macros::*;