Merge pull request #48 from zcash/pasta-curves

Use the pasta_curves crate directly

Cargo.toml

@@ -25,10 +25,17 @@ blake2b_simd = "0.5"
 ff = "0.9"
 fpe = "0.4"
 group = "0.9"
-halo2 = { git = "https://github.com/zcash/halo2.git", branch = "main" }
 nonempty = "0.6"
 subtle = "2.3"
 
+[dependencies.halo2]
+git = "https://github.com/zcash/halo2.git"
+rev = "b079624ea78b4a07d44cb3c725dd734093577062"
+
+[dependencies.pasta_curves]
+git = "https://github.com/zcash/pasta_curves.git"
+rev = "0a6b2f6eb5acbe1dabc9e77ed0bcb748cc640196"
+
 [dependencies.reddsa]
 git = "https://github.com/str4d/redjubjub.git"
 rev = "f8ff124a52d86e122e0705e8e9272f2099fe4c46"

src/keys.rs

@@ -6,7 +6,8 @@ use std::mem;
 use aes::Aes256;
 use fpe::ff1::{BinaryNumeralString, FF1};
 use group::GroupEncoding;
-use halo2::{arithmetic::FieldExt, pasta::pallas};
+use halo2::arithmetic::FieldExt;
+use pasta_curves::pallas;
 use subtle::CtOption;
 
 use crate::{

src/primitives/sinsemilla.rs

@@ -1,7 +1,8 @@
 //! The Sinsemilla hash function and commitment scheme.
 
 use group::Group;
-use halo2::{arithmetic::CurveExt, pasta::pallas};
+use halo2::arithmetic::CurveExt;
+use pasta_curves::pallas;
 
 use crate::spec::extract_p;
 

src/spec.rs

@@ -5,10 +5,8 @@ use std::iter;
 use blake2b_simd::Params;
 use ff::PrimeField;
 use group::{Curve, Group};
-use halo2::{
-    arithmetic::{CurveAffine, CurveExt, FieldExt},
-    pasta::pallas,
-};
+use halo2::arithmetic::{CurveAffine, CurveExt, FieldExt};
+use pasta_curves::pallas;
 
 use crate::{constants::L_ORCHARD_BASE, primitives::sinsemilla};
 
@@ -113,7 +111,8 @@ pub(crate) fn extract_p(point: &pallas::Point) -> pallas::Base {
 #[cfg(test)]
 mod tests {
     use group::Group;
-    use halo2::{arithmetic::CurveExt, pasta::pallas};
+    use halo2::arithmetic::CurveExt;
+    use pasta_curves::pallas;
 
     #[test]
     fn diversify_hash_substitution() {