Merge pull request #2057 from EspressoSystems/update/tagged-base64

Update tagged base64
EspressoSystems · Nov 14, 2023 · a3ec633 · a3ec633
2 parents 0483454 + 5efeff5
commit a3ec633
Show file tree

Hide file tree

Showing 9 changed files with 116 additions and 313 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,7 +30,7 @@ resolver = "2"
 [workspace.dependencies]
 ark-bls12-381 = "0.4"
 ark-ec = "0.4"
-ark-serialize = "0.4" # features = ["derive"]
+ark-serialize = "0.4"
 ark-std = { version = "0.4", default-features = false }
 async-compatibility-layer = { git = "https://github.com/EspressoSystems/async-compatibility-layer.git", tag = "1.4.1", default-features = false, features = [
         "logging-utils",
@@ -44,7 +44,7 @@ bitvec = { version = "1.0.1", default-features = false, features = [
         "serde",
 ] }
 blake3 = "1.4"
-commit = { git = "https://github.com/EspressoSystems/commit", tag = "0.2.2" }
+commit = { git = "https://github.com/EspressoSystems/commit", tag = "0.2.3" }
 custom_debug = "0.5"
 digest = "0.10"
 either = { version = "1.8" }
@@ -62,9 +62,11 @@ rand = "0.8.5"
 rand_chacha = { version = "0.3.1", default-features = false }
 serde = { version = "1.0.188", features = ["derive"] }
 snafu = "0.7.5"
-surf-disco = { git = "https://github.com/EspressoSystems/surf-disco.git", tag = "v0.4.2" }
+surf-disco = { git = "https://github.com/EspressoSystems/surf-disco.git", tag = "v0.4.3" }
+tagged-base64 = { git = "https://github.com/EspressoSystems/tagged-base64", tag = "0.3.4" }
+tide-disco = { git = "https://github.com/EspressoSystems/tide-disco.git", tag = "v0.4.3" }
 time = "0.3.28"
-toml = "0.7.8"
+toml = "0.8"
 tracing = "0.1.37"
 typenum = "1.16.0"
 libp2p = { package = "libp2p", version = "0.52.3", features = [

diff --git a/crates/hotshot-stake-table/Cargo.toml b/crates/hotshot-stake-table/Cargo.toml
@@ -22,7 +22,7 @@ jf-primitives = { workspace = true }
 jf-relation = { workspace = true }
 jf-utils = { workspace = true }
 serde = { workspace = true, features = ["rc"] }
-tagged-base64 = { git = "https://github.com/espressosystems/tagged-base64", tag = "0.3.0" }
+tagged-base64 = { workspace = true }
 typenum = { workspace = true }
 
 [dev-dependencies]

diff --git a/crates/orchestrator/Cargo.toml b/crates/orchestrator/Cargo.toml
@@ -17,13 +17,13 @@ hotshot-types = { version = "0.1.0", path = "../types", default-features = false
 hotshot-utils = { path = "../utils" }
 libp2p-networking = { workspace = true }
 nll = { workspace = true }
-tide-disco = { git = "https://github.com/EspressoSystems/tide-disco.git", tag = "v0.4.1" }
+tide-disco = { workspace = true }
 surf-disco = { workspace = true }
 tracing = { workspace = true }
 serde = { workspace = true }
 serde_json = "1.0.96"
 snafu = { workspace = true }
-toml = "0.5.9" # TODO GG upgrade to toml = { workspace = true }
+toml = { workspace = true }
 
 [target.'cfg(all(async_executor_impl = "tokio"))'.dependencies]
 tokio = { workspace = true }

diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
@@ -15,9 +15,7 @@ arbitrary = { version = "1.3", features = ["derive"] }
 async-compatibility-layer = { workspace = true }
 async-lock = { workspace = true }
 async-trait = { workspace = true }
-ark-serialize = { version = "0.3", features = [
-    "derive",
-] } # TODO GG upgrade to 0.4 and inherit this dep from workspace
+ark-serialize = { workspace = true, features = ["derive"] }
 ark-std = { workspace = true }
 bincode = { workspace = true }
 bitvec = { workspace = true }
@@ -42,7 +40,7 @@ rand = { workspace = true }
 rand_chacha = { workspace = true }
 serde = { workspace = true }
 snafu = { workspace = true }
-tagged-base64 = { git = "https://github.com/EspressoSystems/tagged-base64", tag = "0.2.4" }
+tagged-base64 = { workspace = true }
 time = { workspace = true }
 tracing = { workspace = true }
 ethereum-types = { workspace = true }

diff --git a/crates/types/src/data.rs b/crates/types/src/data.rs
@@ -18,7 +18,7 @@ use crate::{
         Block, State,
     },
 };
-use ark_serialize::{CanonicalDeserialize, CanonicalSerialize, Read, SerializationError, Write};
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 use bincode::Options;
 use commit::{Commitment, Committable};
 use derivative::Derivative;

diff --git a/crates/types/src/traits/signature_key.rs b/crates/types/src/traits/signature_key.rs
@@ -1,5 +1,5 @@
 //! Minimal compatibility over public key signatures
-use ark_serialize::{CanonicalDeserialize, CanonicalSerialize, Read, SerializationError, Write};
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 use bitvec::prelude::*;
 use espresso_systems_common::hotshot::tag;
 use ethereum_types::U256;

diff --git a/crates/web_server/Cargo.toml b/crates/web_server/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-core = { version = "0.40.0", default-features = false }
 hotshot-types = { path = "../types", default-features = false }
 hotshot-utils = { path = "../utils" }
 jf-primitives = { workspace = true }
-tide-disco = { git = "https://github.com/EspressoSystems/tide-disco.git", tag = "v0.4.1" }
+tide-disco = { workspace = true }
 nll = { workspace = true }
 tracing = { workspace = true }
 rand = { workspace = true }

diff --git a/crates/web_server/src/lib.rs b/crates/web_server/src/lib.rs
@@ -492,7 +492,7 @@ where
     let mut api = match &options.api_path {
         Some(path) => Api::<State, Error>::from_file(path)?,
         None => {
-            let toml = toml::from_str(include_str!("../api.toml")).map_err(|err| {
+            let toml: toml::Value = toml::from_str(include_str!("../api.toml")).map_err(|err| {
                 ApiError::CannotReadToml {
                     reason: err.to_string(),
                 }