update reddsa and remove manual into_positive_y() invocations (#104)

ZcashFoundation · Jan 5, 2024 · 824a133 · 824a133
1 parent f07fbe3
commit 824a133
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 73 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/coordinator/Cargo.toml b/coordinator/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 eyre = "0.6.11"
 frost-ed25519 = { version = "1.0.0-rc.0", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "6e55be4da9fa7beec9f744d49a1bad844318a932", features = ["frost", "serde"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "81c649c412e5b6ba56d491d2857f91fbd28adbc7", features = ["frost", "serde"] }
 hex = { version = "0.4", features = ["serde"] }
 thiserror = "1.0"
 rand = "0.8"

diff --git a/dkg/Cargo.toml b/dkg/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 eyre = "0.6.11"
 frost-ed25519 = { version = "1.0.0-rc.0", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "6e55be4da9fa7beec9f744d49a1bad844318a932", features = ["frost"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "81c649c412e5b6ba56d491d2857f91fbd28adbc7", features = ["frost"] }
 hex = { version = "0.4", features = ["serde"] }
 thiserror = "1.0"
 rand = "0.8"

diff --git a/dkg/src/cli.rs b/dkg/src/cli.rs
@@ -2,8 +2,6 @@
 use frost_ed25519 as frost;
 #[cfg(feature = "redpallas")]
 use reddsa::frost::redpallas as frost;
-#[cfg(feature = "redpallas")]
-use reddsa::frost::redpallas::keys::PositiveY;
 
 use rand::thread_rng;
 use std::collections::BTreeMap;
@@ -85,10 +83,6 @@ pub fn cli(
         &received_round1_packages,
         &received_round2_packages,
     )?;
-    #[cfg(feature = "redpallas")]
-    let public_key_package = public_key_package.into_positive_y();
-    #[cfg(feature = "redpallas")]
-    let key_package = key_package.into_positive_y();
 
     writeln!(
         logger,

diff --git a/participant/Cargo.toml b/participant/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 frost-ed25519 = { version = "1.0.0-rc.0", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "6e55be4da9fa7beec9f744d49a1bad844318a932", features = ["frost"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "81c649c412e5b6ba56d491d2857f91fbd28adbc7", features = ["frost"] }
 hex = "0.4"
 rand = "0.8"
 eyre = "0.6.11"

diff --git a/participant/src/round1.rs b/participant/src/round1.rs
@@ -2,8 +2,6 @@
 use frost_ed25519 as frost;
 #[cfg(feature = "redpallas")]
 use reddsa::frost::redpallas as frost;
-#[cfg(feature = "redpallas")]
-use reddsa::frost::redpallas::keys::PositiveY;
 
 use frost::{
     keys::{KeyPackage, SecretShare},
@@ -36,9 +34,6 @@ pub fn request_inputs(
         serde_json::from_str::<KeyPackage>(&json).map_err(|_| Error::InvalidSecretShare)?
     };
 
-    #[cfg(feature = "redpallas")]
-    let key_package = key_package.into_positive_y();
-
     Ok(Round1Config { key_package })
 }
 

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 frost-ed25519 = { version = "1.0.0-rc.0", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "6e55be4da9fa7beec9f744d49a1bad844318a932", features = ["frost"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "81c649c412e5b6ba56d491d2857f91fbd28adbc7", features = ["frost"] }
 hex = "0.4"
 rand = "0.8"
 exitcode = "1.1.2"

diff --git a/trusted-dealer/Cargo.toml b/trusted-dealer/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 frost-ed25519 = { version = "1.0.0-rc.0", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "6e55be4da9fa7beec9f744d49a1bad844318a932", features = ["frost"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "81c649c412e5b6ba56d491d2857f91fbd28adbc7", features = ["frost"] }
 thiserror = "1.0"
 rand = "0.8"
 hex = "0.4"

diff --git a/trusted-dealer/src/inputs.rs b/trusted-dealer/src/inputs.rs
@@ -2,8 +2,6 @@
 use frost_ed25519 as frost;
 #[cfg(feature = "redpallas")]
 use reddsa::frost::redpallas as frost;
-#[cfg(feature = "redpallas")]
-use reddsa::frost::redpallas::keys::PositiveY;
 
 use frost::keys::{PublicKeyPackage, SecretShare};
 use frost::Error;
@@ -83,11 +81,6 @@ pub fn print_values(
     pubkeys: &PublicKeyPackage,
     logger: &mut dyn Write,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    #[cfg(feature = "redpallas")]
-    let pubkeys = pubkeys.clone().into_positive_y();
-    #[cfg(feature = "redpallas")]
-    let pubkeys = &pubkeys;
-
     writeln!(
         logger,
         "Public key package:\n{}",