update frost-rerandomized; skip tests if redpallas enabled

ZcashFoundation · Nov 13, 2023 · 6c25312 · 6c25312
1 parent 42ed36e
commit 6c25312
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/coordinator/Cargo.toml b/coordinator/Cargo.toml
@@ -10,7 +10,7 @@ eyre = "0.6.8"
 # frost-ed25519 = { version = "0.7.0", features = ["serde"] }
 # Re-export serde PR, point to 1.0.0-rc.0 after that's released
 frost-ed25519 = { git = "https://github.com/ZcashFoundation/frost.git", rev = "6d5e1ff23ad6587357ff0762b5b004525c387755", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "885f118fdf4956238345c8547946a46cbd39c566", features = ["frost", "serde"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "6e55be4da9fa7beec9f744d49a1bad844318a932", features = ["frost", "serde"] }
 hex = { version = "0.4", features = ["serde"] }
 thiserror = "1.0"
 rand = "0.8"

diff --git a/coordinator/src/step_3.rs b/coordinator/src/step_3.rs
@@ -71,7 +71,7 @@ async fn request_inputs_signature_shares(
 
     #[cfg(feature = "redpallas")]
     let randomizer_params = frost::RandomizedParams::from_randomizer(
-        participants.pub_key_package.group_public(),
+        participants.pub_key_package.verifying_key(),
         randomizer,
     );
 

diff --git a/dkg/Cargo.toml b/dkg/Cargo.toml
@@ -10,7 +10,7 @@ eyre = "0.6.8"
 # frost-ed25519 = { version = "0.7.0", features = ["serde"] }
 # Re-export serde PR, point to 1.0.0-rc.0 after that's released
 frost-ed25519 = { git = "https://github.com/ZcashFoundation/frost.git", rev = "6d5e1ff23ad6587357ff0762b5b004525c387755", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "885f118fdf4956238345c8547946a46cbd39c566", features = ["frost"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "6e55be4da9fa7beec9f744d49a1bad844318a932", features = ["frost"] }
 hex = { version = "0.4", features = ["serde"] }
 thiserror = "1.0"
 rand = "0.8"

diff --git a/dkg/src/tests/inputs.rs b/dkg/src/tests/inputs.rs
@@ -1,3 +1,5 @@
+#![cfg(not(feature = "redpallas"))]
+
 use std::io::BufWriter;
 
 use crate::inputs::{request_inputs, Config};

diff --git a/dkg/tests/integration_tests.rs b/dkg/tests/integration_tests.rs
@@ -1,11 +1,16 @@
+#[cfg(not(feature = "redpallas"))]
+use frost_ed25519 as frost;
+#[cfg(feature = "redpallas")]
+use reddsa::frost::redpallas as frost;
+
 use dkg::cli::cli;
 
 use std::collections::HashMap;
 use std::io::{BufRead, Write};
 use std::thread;
 
-use frost_ed25519::keys::{KeyPackage, PublicKeyPackage};
-use frost_ed25519::Identifier;
+use frost::keys::{KeyPackage, PublicKeyPackage};
+use frost::Identifier;
 
 // Read a single line from the given reader.
 fn read_line(mut reader: impl BufRead) -> Result<String, std::io::Error> {

diff --git a/participant/Cargo.toml b/participant/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 # frost-ed25519 = { version = "0.7.0", features = ["serde"] }
 # Re-export serde PR, point to 1.0.0-rc.0 after that's released
 frost-ed25519 = { git = "https://github.com/ZcashFoundation/frost.git", rev = "6d5e1ff23ad6587357ff0762b5b004525c387755", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "885f118fdf4956238345c8547946a46cbd39c566", features = ["frost"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "6e55be4da9fa7beec9f744d49a1bad844318a932", features = ["frost"] }
 hex = "0.4"
 rand = "0.8"
 eyre = "0.6.8"

diff --git a/participant/tests/integration_tests.rs b/participant/tests/integration_tests.rs
@@ -1,3 +1,5 @@
+#![cfg(not(feature = "redpallas"))]
+
 use std::collections::{BTreeMap, HashMap};
 
 use frost::keys::IdentifierList;

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 # frost-ed25519 = { version = "0.7.0", features = ["serde"] }
 # Re-export serde PR, point to 1.0.0-rc.0 after that's released
 frost-ed25519 = { git = "https://github.com/ZcashFoundation/frost.git", rev = "6d5e1ff23ad6587357ff0762b5b004525c387755", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "885f118fdf4956238345c8547946a46cbd39c566", features = ["frost"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "6e55be4da9fa7beec9f744d49a1bad844318a932", features = ["frost"] }
 hex = "0.4"
 rand = "0.8"
 exitcode = "1.1.2"
@@ -23,3 +23,7 @@ trusted-dealer = { path = "../trusted-dealer"}
 participant = { path = "../participant"}
 coordinator = { path = "../coordinator"}
 rand = "0.8"
+
+[features]
+redpallas = []
+default = []
diff --git a/tests/tests/integration_tests.rs b/tests/tests/integration_tests.rs
@@ -1,3 +1,5 @@
+#![cfg(not(feature = "redpallas"))]
+
 use coordinator::args::Args;
 use coordinator::comms::cli::CLIComms;
 use frost_ed25519 as frost;

diff --git a/trusted-dealer/Cargo.toml b/trusted-dealer/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 # frost-ed25519 = { version = "0.7.0", features = ["serde"] }
 # Re-export serde PR, point to 1.0.0-rc.0 after that's released
 frost-ed25519 = { git = "https://github.com/ZcashFoundation/frost.git", rev = "6d5e1ff23ad6587357ff0762b5b004525c387755", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "885f118fdf4956238345c8547946a46cbd39c566", features = ["frost"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "6e55be4da9fa7beec9f744d49a1bad844318a932", features = ["frost"] }
 thiserror = "1.0"
 rand = "0.8"
 hex = "0.4"

diff --git a/trusted-dealer/src/tests/inputs.rs b/trusted-dealer/src/tests/inputs.rs
@@ -1,3 +1,5 @@
+#![cfg(not(feature = "redpallas"))]
+
 use std::io::BufWriter;
 
 use frost::Error;

diff --git a/trusted-dealer/src/tests/print_values.rs b/trusted-dealer/src/tests/print_values.rs
@@ -1,3 +1,5 @@
+#![cfg(not(feature = "redpallas"))]
+
 use frost::keys::{IdentifierList, PublicKeyPackage, SecretShare};
 use frost::Identifier;
 use frost_ed25519 as frost;

diff --git a/trusted-dealer/src/trusted_dealer_keygen.rs b/trusted-dealer/src/trusted_dealer_keygen.rs
@@ -56,6 +56,7 @@ pub fn split_secret(
     Ok((shares, pubkeys))
 }
 
+#[cfg(not(feature = "redpallas"))]
 #[cfg(test)]
 mod tests {
 

diff --git a/trusted-dealer/tests/integration_tests.rs b/trusted-dealer/tests/integration_tests.rs
@@ -1,3 +1,5 @@
+#![cfg(not(feature = "redpallas"))]
+
 mod helpers;
 
 use frost::aggregate;