all: update and clean up dependencies (#469)

ZcashFoundation · Feb 20, 2025 · df39100 · df39100
1 parent 6f50c25
commit df39100
Show file tree

Hide file tree

Showing 10 changed files with 597 additions and 512 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,6 @@ bech32 = "0.11.0"
 clap = "4.5.23"
 coordinator = { path = "coordinator" }
 delay_map = "0.4.0"
-derivative = "2.2.0"
 dirs = "5.0.1"
 dkg = { path = "dkg" }
 exitcode = "1.1.2"
@@ -47,7 +46,7 @@ rand_core = "0.6.4"
 rcgen = "0.13.2"
 reddsa = { git = "https://github.com/ZcashFoundation/reddsa.git", rev = "ed49e9ca0699a6450f6d4a9fe62ff168f5ea1ead" }
 regex = "1.11.1"
-reqwest = "0.12.12"
+reqwest = { version = "0.12.12", default-features = false }
 rpassword = "7.3.1"
 rustls = "0.23.21"
 sapling-crypto = "0.4.0"

diff --git a/coordinator/Cargo.toml b/coordinator/Cargo.toml
@@ -18,7 +18,7 @@ rand = { workspace = true }
 serde_json = { workspace = true }
 serdect = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
-reqwest = { workspace = true, features = ["json"] }
+reqwest = { workspace = true, features = ["json", "rustls-tls-native-roots"] }
 frostd = { workspace = true }
 participant = { workspace = true }
 tokio = { workspace = true, features = ["full"] }

diff --git a/dkg/Cargo.toml b/dkg/Cargo.toml
@@ -19,7 +19,7 @@ serde_json = { workspace = true }
 frostd = { workspace = true }
 participant = { workspace = true }
 xeddsa = { workspace = true }
-reqwest = { workspace = true, features = ["json"] }
+reqwest = { workspace = true, features = ["json", "rustls-tls-native-roots"] }
 tokio = { workspace = true, features = ["full"] }
 snow = { workspace = true }
 

diff --git a/frost-client/Cargo.toml b/frost-client/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 clap = { workspace = true, features = ["derive"] }
-reqwest = { workspace = true, features = ["json"] }
+reqwest = { workspace = true, features = ["json", "rustls-tls-native-roots"] }
 serde = { workspace = true, features = ["derive"] }
 snow = { workspace = true }
 toml = { workspace = true }

diff --git a/frostd/Cargo.toml b/frostd/Cargo.toml
@@ -6,13 +6,11 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = { workspace = true }
 axum = { workspace = true }
 axum-extra = { workspace = true, features = ["typed-header"] }
 axum-server = { workspace = true, features = ["tls-rustls"] }
 clap = { workspace = true, features = ["derive"] }
 delay_map = { workspace = true }
-derivative = { workspace = true }
 eyre = { workspace = true }
 frost-core = { workspace = true, features = ["serde"] }
 frost-rerandomized = { workspace = true, features = ["serde"] }
@@ -45,7 +43,7 @@ rustls = { workspace = true, features = ["ring"] }
 axum-test = { workspace = true }
 frost-ed25519 = { workspace = true, features = ["serde"] }
 reddsa = { workspace = true, features = ["frost", "serde"] }
-reqwest = { workspace = true, features = ["json", "rustls-tls-manual-roots"] }
+reqwest = { workspace = true, default-features = false, features = ["json", "rustls-tls-manual-roots"] }
 regex = { workspace = true }
 coordinator = { workspace = true }
 rcgen = { workspace = true }

diff --git a/frostd/src/types.rs b/frostd/src/types.rs
@@ -142,7 +142,7 @@ pub struct CloseSessionArgs {
     pub session_id: Uuid,
 }
 
-#[derive(Serialize, Deserialize, derivative::Derivative)]
+#[derive(Serialize, Deserialize)]
 #[serde(bound = "C: Ciphersuite")]
 pub struct SendSigningPackageArgs<C: Ciphersuite> {
     pub signing_package: Vec<SigningPackage<C>>,

diff --git a/participant/Cargo.toml b/participant/Cargo.toml
@@ -7,21 +7,19 @@ edition = "2021"
 
 [dependencies]
 async-trait = { workspace = true }
-derivative = { workspace = true }
 frost-core = { workspace = true, features = ["serde"] }
 frost-rerandomized = { workspace = true, features = ["serde"] }
 frost-ed25519 = { workspace = true, features = ["serde"] }
 reddsa = { workspace = true, features = ["frost"] }
 hex = { workspace = true }
 rand = { workspace = true }
 eyre = { workspace = true }
-exitcode = { workspace = true }
 serde_json = { workspace = true }
 serdect = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 tokio = { workspace = true, features = ["full"] }
 message-io = { workspace = true }
-reqwest = { workspace = true, features = ["json"] }
+reqwest = { workspace = true, features = ["json", "rustls-tls-native-roots"] }
 frostd = { workspace = true }
 rpassword = { workspace = true }
 snow = { workspace = true }

diff --git a/participant/src/round1.rs b/participant/src/round1.rs
@@ -33,7 +33,7 @@ pub async fn request_inputs<C: Ciphersuite + 'static>(
         } else {
             // TODO: Improve error
             serde_json::from_str::<KeyPackage<C>>(&secret_share)
-                .map_err(|_| Error::<C>::InvalidSecretShare)?
+                .map_err(|_| Error::<C>::InvalidSecretShare { culprit: None })?
         };
 
     Ok(Round1Config { key_package })

diff --git a/participant/src/tests/round1.rs b/participant/src/tests/round1.rs
@@ -71,7 +71,7 @@ async fn check_0_input_for_identifier() {
 
     assert_eq!(
         *expected.downcast::<Error>().unwrap(),
-        Error::InvalidSecretShare
+        Error::InvalidSecretShare { culprit: None }
     );
 }
 
@@ -91,7 +91,7 @@ async fn check_invalid_length_signing_share() {
 
     assert_eq!(
         *expected.downcast::<Error>().unwrap(),
-        Error::InvalidSecretShare
+        Error::InvalidSecretShare { culprit: None }
     );
 }
 
@@ -110,7 +110,7 @@ async fn check_invalid_round_1_inputs() {
             .unwrap_err();
     assert_eq!(
         *expected.downcast::<Error>().unwrap(),
-        Error::InvalidSecretShare
+        Error::InvalidSecretShare { culprit: None }
     );
 }