Merge pull request #85 from ZcashFoundation/fix-redpallas-issues

Fix redpallas issues
ZcashFoundation · Oct 10, 2023 · 6146cc0 · 6146cc0
2 parents 6f5a2f7 + ab74fed
commit 6146cc0
Show file tree

Hide file tree

Showing 10 changed files with 152 additions and 19 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,6 +10,15 @@ on:
 
 jobs:
 
+  build_redpallas:
+    name: Build with redpallas
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/[email protected]
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo build --features redpallas
+
   clippy:
     name: Clippy
     runs-on: ubuntu-latest

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,4 +9,4 @@ default-members = ["participant",
     "trusted-dealer",
     "dkg",
     "coordinator", "tests"]
-
+resolver = "2"
diff --git a/coordinator/Cargo.toml b/coordinator/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 eyre = "0.6.8"
 frost-ed25519 = { version = "0.6.0", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "8534e283acf0015cc2450e2a6b49685a3bb3145d", features = ["frost"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "5ea1293bb8df90c8a19dedf7ab5510903650dda9", features = ["frost"] }
 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.8"
 frost-ed25519 = { version = "0.6.0", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "8534e283acf0015cc2450e2a6b49685a3bb3145d", features = ["frost"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "5ea1293bb8df90c8a19dedf7ab5510903650dda9", features = ["frost"] }
 hex = { version = "0.4", features = ["serde"] }
 thiserror = "1.0"
 rand = "0.8"

diff --git a/participant/Cargo.toml b/participant/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 frost-ed25519 = { version = "0.6.0", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "8534e283acf0015cc2450e2a6b49685a3bb3145d", features = ["frost"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "5ea1293bb8df90c8a19dedf7ab5510903650dda9", features = ["frost"] }
 hex = "0.4"
 rand = "0.8"
 exitcode = "1.1.2"

diff --git a/participant/src/round2.rs b/participant/src/round2.rs
@@ -13,7 +13,7 @@ use frost::{
 };
 use std::io::{BufRead, Write};
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Round2Config {
     pub signing_package: SigningPackage,
     #[cfg(feature = "redpallas")]

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 frost-ed25519 = { version = "0.6.0", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "8534e283acf0015cc2450e2a6b49685a3bb3145d", features = ["frost"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "5ea1293bb8df90c8a19dedf7ab5510903650dda9", 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 = "0.6.0", features = ["serde"] }
-reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "8534e283acf0015cc2450e2a6b49685a3bb3145d", features = ["frost"] }
+reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "5ea1293bb8df90c8a19dedf7ab5510903650dda9", 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,6 +2,8 @@
 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;