From eadc48879a41b54ba0387b8dc53841c7b32979eb Mon Sep 17 00:00:00 2001
From: str4d <thestr4d@gmail.com>
Date: Tue, 28 Feb 2023 17:59:05 +0000
Subject: [PATCH] Migrate to `group` 0.13, `jubjub` 0.10, `pasta_curves` 0.5
 (#44)

---
 CHANGELOG.md   | 4 ++++
 Cargo.toml     | 8 +++++---
 src/batch.rs   | 6 +++---
 src/orchard.rs | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c16a055..36eb836 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 Entries are listed in reverse chronological order.
 
+## Unreleased
+
+* Migrate to `group` 0.13, `jubjub` 0.10, `pasta_curves` 0.5
+
 ## 0.4.0
 
 * port improvements from Zebra (#40)
diff --git a/Cargo.toml b/Cargo.toml
index 7eb191d..4d8cf6a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,10 +24,10 @@ features = ["nightly"]
 [dependencies]
 blake2b_simd = { version = "1", default-features = false }
 byteorder = { version = "1.4", default-features = false }
-group = { version = "0.12", default-features = false }
+group = { version = "0.13", default-features = false }
 hex = { version = "0.4", optional = true, default-features = false, features = ["alloc"] }
-jubjub = { version = "0.9", default-features = false }
-pasta_curves = { version = "0.4", default-features = false }
+jubjub = { version = "0.10", default-features = false }
+pasta_curves = { version = "0.5", default-features = false }
 rand_core = { version = "0.6", default-features = false }
 serde = { version = "1", optional = true, features = ["derive"] }
 thiserror = { version = "1.0", optional = true }
@@ -52,6 +52,8 @@ frost-rerandomized = { git = "https://github.com/ZcashFoundation/frost.git", rev
 
 # `alloc` is only used in test code
 [dev-dependencies.pasta_curves]
+version = "0.5"
+default-features = false
 features = ["alloc"]
 
 [features]
diff --git a/src/batch.rs b/src/batch.rs
index c4bc566..270f427 100644
--- a/src/batch.rs
+++ b/src/batch.rs
@@ -198,8 +198,8 @@ impl<S: SpendAuth, B: Binding<Scalar = S::Scalar, Point = S::Point>> Verifier<S,
         let mut VKs = Vec::with_capacity(n);
         let mut R_coeffs = Vec::with_capacity(self.signatures.len());
         let mut Rs = Vec::with_capacity(self.signatures.len());
-        let mut P_spendauth_coeff = S::Scalar::zero();
-        let mut P_binding_coeff = B::Scalar::zero();
+        let mut P_spendauth_coeff = S::Scalar::ZERO;
+        let mut P_binding_coeff = B::Scalar::ZERO;
 
         for item in self.signatures.iter() {
             let (s_bytes, r_bytes, c) = match item.inner {
@@ -256,7 +256,7 @@ impl<S: SpendAuth, B: Binding<Scalar = S::Scalar, Point = S::Point>> Verifier<S,
             R_coeffs.push(z);
             Rs.push(R);
 
-            VK_coeffs.push(S::Scalar::zero() + (z * c));
+            VK_coeffs.push(S::Scalar::ZERO + (z * c));
             VKs.push(VK);
         }
 
diff --git a/src/orchard.rs b/src/orchard.rs
index 0bc0126..584930a 100644
--- a/src/orchard.rs
+++ b/src/orchard.rs
@@ -57,7 +57,7 @@ impl super::Binding for Binding {}
 
 impl private::SealedScalar for pallas::Scalar {
     fn from_bytes_wide(bytes: &[u8; 64]) -> Self {
-        <pallas::Scalar as pasta_curves::arithmetic::FieldExt>::from_bytes_wide(bytes)
+        <pallas::Scalar as group::ff::FromUniformBytes<64>>::from_uniform_bytes(bytes)
     }
     fn from_raw(val: [u64; 4]) -> Self {
         pallas::Scalar::from_raw(val)