Update repo to use current dalek-cryptography dependencies

Author: onyiny-ang

Cargo.toml

@@ -18,23 +18,18 @@ exclude = [
 features = ["nightly"]
 
 [dependencies]
-merlin = "2"
-rand = "0.7"
+merlin = "3"
+rand = { version = "0.8", features = ["std"] }
 serde = "1"
 serde_derive = "1"
 thiserror = "1"
 # Disable default features to deselect a backend, then select one below
-curve25519-dalek = { version = "2", default-features = false, features = ["serde", "std"] }
+curve25519-dalek = { version = "4", default-features = false, features = ["serde", "rand_core", "alloc", "digest", "precomputed-tables"] }
 
 [dev-dependencies]
 bincode = "1"
-sha2 = "0.8"
+sha2 = "0.10"
 
 [features]
-nightly = ["curve25519-dalek/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"]

README.md

@@ -64,15 +64,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
 
 The `debug-transcript` feature is for development and testing, and

src/toolbox/batch_verifier.rs

@@ -170,7 +170,7 @@ impl<'a> BatchVerifier<'a> {
         let num_i = self.instance_points.len();
         let num_c = self.constraints.len();
 
-        let mut static_coeffs = vec![Scalar::zero(); num_s];
+        let mut static_coeffs = vec![Scalar::ZERO; num_s];
         let mut instance_coeffs = Matrix::<Scalar>::new(num_i + num_c, self.batch_size);
 
         for i in 0..num_c {

src/toolbox/verifier.rs

@@ -144,7 +144,7 @@ impl<'a> Verifier<'a> {
         let commitments_offset = self.points.len();
         let combined_points = self.points.iter().chain(proof.commitments.iter());
 
-        let mut coeffs = vec![Scalar::zero(); self.points.len() + proof.commitments.len()];
+        let mut coeffs = vec![Scalar::ZERO; self.points.len() + proof.commitments.len()];
         // For each constraint of the form Q = sum(P_i, x_i),
         // we want to ensure Q_com = sum(P_i, resp_i) - c * Q,
         // so add the check rand*( sum(P_i, resp_i) - c * Q - Q_com ) == 0

tests/sig_and_vrf_example.rs

@@ -55,7 +55,7 @@ pub struct PublicKey(RistrettoPoint, CompressedRistretto);
 
 impl<'a> From<&'a SecretKey> for PublicKey {
     fn from(sk: &'a SecretKey) -> PublicKey {
-        let pk = &sk.0 * &dalek_constants::RISTRETTO_BASEPOINT_TABLE;
+        let pk = &sk.0 * dalek_constants::RISTRETTO_BASEPOINT_TABLE;
         PublicKey(pk, pk.compress())
     }
 }

tests/zkp.rs

@@ -33,7 +33,7 @@ fn create_and_verify_compact() {
     let (proof, points) = {
         let H = RistrettoPoint::hash_from_bytes::<Sha512>(b"A VRF input, for instance");
         let x = Scalar::from(89327492234u64).invert();
-        let A = &x * &dalek_constants::RISTRETTO_BASEPOINT_TABLE;
+        let A = &x * dalek_constants::RISTRETTO_BASEPOINT_TABLE;
         let B = &x * &H;
 
         let mut transcript = Transcript::new(b"DLEQTest");
@@ -76,7 +76,7 @@ fn create_and_verify_batchable() {
     let (proof, points) = {
         let H = RistrettoPoint::hash_from_bytes::<Sha512>(b"A VRF input, for instance");
         let x = Scalar::from(89327492234u64).invert();
-        let A = &x * &dalek_constants::RISTRETTO_BASEPOINT_TABLE;
+        let A = &x * dalek_constants::RISTRETTO_BASEPOINT_TABLE;
         let B = &x * &H;
 
         let mut transcript = Transcript::new(b"DLEQTest");
@@ -129,7 +129,7 @@ fn create_batch_and_batch_verify() {
         for (i, message) in messages.iter().enumerate() {
             let H = RistrettoPoint::hash_from_bytes::<Sha512>(message.as_bytes());
             let x = Scalar::from(89327492234u64) * Scalar::from((i + 1) as u64);
-            let A = &x * &dalek_constants::RISTRETTO_BASEPOINT_TABLE;
+            let A = &x * dalek_constants::RISTRETTO_BASEPOINT_TABLE;
             let B = &x * &H;
 
             let mut transcript = Transcript::new(b"DLEQTest");