From 96d423b5a8dc6807c792d907cdfb33966d21c597 Mon Sep 17 00:00:00 2001
From: Jeb Bearer <jeb@espressosys.com>
Date: Tue, 14 Nov 2023 11:28:49 -0500
Subject: [PATCH 1/2] Update tagged-base64

---
 Cargo.lock                               | 265 ++++++-----------------
 Cargo.toml                               |   8 +-
 crates/hotshot-stake-table/Cargo.toml    |   2 +-
 crates/orchestrator/Cargo.toml           |   4 +-
 crates/types/Cargo.toml                  |   6 +-
 crates/types/src/data.rs                 |   2 +-
 crates/types/src/traits/signature_key.rs |   2 +-
 crates/web_server/Cargo.toml             |   2 +-
 crates/web_server/src/lib.rs             |   2 +-
 9 files changed, 77 insertions(+), 216 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 617fb4165d..246922c8fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -898,7 +898,7 @@ dependencies = [
  "http",
  "http-body",
  "hyper",
- "itoa 1.0.9",
+ "itoa",
  "matchit",
  "memchr",
  "mime",
@@ -1932,33 +1932,13 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys 0.3.7",
-]
-
 [[package]]
 name = "dirs"
 version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "dirs-sys 0.4.1",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -2656,7 +2636,7 @@ dependencies = [
  "surf-disco",
  "time 0.3.29",
  "tokio",
- "toml 0.7.8",
+ "toml 0.8.2",
  "tracing",
  "typenum",
 ]
@@ -2683,9 +2663,9 @@ dependencies = [
  "serde_json",
  "snafu",
  "surf-disco",
- "tide-disco 0.4.1 (git+https://github.com/EspressoSystems/tide-disco.git?tag=v0.4.1)",
+ "tide-disco",
  "tokio",
- "toml 0.5.11",
+ "toml 0.8.2",
  "tracing",
 ]
 
@@ -2755,7 +2735,7 @@ dependencies = [
  "jf-utils",
  "rand_chacha 0.3.1",
  "serde",
- "tagged-base64 0.3.0",
+ "tagged-base64 0.3.4",
  "typenum",
 ]
 
@@ -2842,7 +2822,7 @@ name = "hotshot-types"
 version = "0.1.0"
 dependencies = [
  "arbitrary",
- "ark-serialize 0.3.0",
+ "ark-serialize 0.4.2",
  "ark-std 0.4.0",
  "async-compatibility-layer",
  "async-lock",
@@ -2874,7 +2854,7 @@ dependencies = [
  "serde",
  "serde_json",
  "snafu",
- "tagged-base64 0.2.4",
+ "tagged-base64 0.3.4",
  "time 0.3.29",
  "tokio",
  "tracing",
@@ -2912,9 +2892,9 @@ dependencies = [
  "snafu",
  "surf-disco",
  "tide",
- "tide-disco 0.4.1 (git+https://github.com/EspressoSystems/tide-disco.git?tag=v0.4.1)",
+ "tide-disco",
  "tokio",
- "toml 0.7.8",
+ "toml 0.8.2",
  "tracing",
 ]
 
@@ -2926,7 +2906,7 @@ checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
 dependencies = [
  "bytes 1.4.0",
  "fnv",
- "itoa 1.0.9",
+ "itoa",
 ]
 
 [[package]]
@@ -3009,7 +2989,7 @@ dependencies = [
  "http-body",
  "httparse",
  "httpdate",
- "itoa 1.0.9",
+ "itoa",
  "pin-project-lite 0.2.13",
  "socket2 0.4.9",
  "tokio",
@@ -3298,12 +3278,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
 [[package]]
 name = "itoa"
 version = "1.0.9"
@@ -4248,40 +4222,17 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef"
 
-[[package]]
-name = "maud"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19aff2cd19eb4b93df29efa602652513b0f731f1d3474f6e377f763fddf61e58"
-dependencies = [
- "itoa 0.4.8",
- "maud_macros 0.24.0",
- "tide",
-]
-
 [[package]]
 name = "maud"
 version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0bab19cef8a7fe1c18a43e881793bfc9d4ea984befec3ae5bd0415abf3ecf00"
 dependencies = [
- "itoa 1.0.9",
- "maud_macros 0.25.0",
+ "itoa",
+ "maud_macros",
  "tide",
 ]
 
-[[package]]
-name = "maud_macros"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5c114f6f24b08fdd4a25d2fb87a8b140df56b577723247b382e8b04c583f2eb"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "maud_macros"
 version = "0.25.0"
@@ -5048,7 +4999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "toml_edit",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
@@ -5108,7 +5059,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c99afa9a01501019ac3a14d71d9f94050346f55ca471ce90c799a15c58f61e2"
 dependencies = [
  "dtoa",
- "itoa 1.0.9",
+ "itoa",
  "parking_lot",
  "prometheus-client-derive-encode",
 ]
@@ -5744,7 +5695,7 @@ version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
- "itoa 1.0.9",
+ "itoa",
  "ryu",
  "serde",
 ]
@@ -5776,27 +5727,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.9",
+ "itoa",
  "ryu",
  "serde",
 ]
 
-[[package]]
-name = "serde_with"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe"
-dependencies = [
- "base64 0.13.1",
- "chrono",
- "hex",
- "indexmap 1.9.3",
- "serde",
- "serde_json",
- "serde_with_macros 2.3.3",
- "time 0.3.29",
-]
-
 [[package]]
 name = "serde_with"
 version = "3.3.0"
@@ -5810,22 +5745,10 @@ dependencies = [
  "indexmap 2.0.0",
  "serde",
  "serde_json",
- "serde_with_macros 3.3.0",
+ "serde_with_macros",
  "time 0.3.29",
 ]
 
-[[package]]
-name = "serde_with_macros"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
-dependencies = [
- "darling 0.20.3",
- "proc-macro2",
- "quote",
- "syn 2.0.31",
-]
-
 [[package]]
 name = "serde_with_macros"
 version = "3.3.0"
@@ -5919,22 +5842,13 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "shellexpand"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4"
-dependencies = [
- "dirs 4.0.0",
-]
-
 [[package]]
 name = "shellexpand"
 version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
 dependencies = [
- "dirs 5.0.1",
+ "dirs",
 ]
 
 [[package]]
@@ -6225,31 +6139,12 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
-[[package]]
-name = "strum"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
-
 [[package]]
 name = "strum"
 version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
 
-[[package]]
-name = "strum_macros"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "strum_macros"
 version = "0.25.2"
@@ -6294,8 +6189,8 @@ dependencies = [
 
 [[package]]
 name = "surf-disco"
-version = "0.4.1"
-source = "git+https://github.com/EspressoSystems/surf-disco.git?tag=v0.4.2#edcfa5532bca5f619e87129f801690b56d8d080e"
+version = "0.4.3"
+source = "git+https://github.com/EspressoSystems/surf-disco.git?tag=v0.4.3#44de23cb7d43893174b00e01148c7ccd100c6c26"
 dependencies = [
  "async-std",
  "async-tungstenite 0.15.0",
@@ -6306,7 +6201,7 @@ dependencies = [
  "serde",
  "serde_json",
  "surf",
- "tide-disco 0.4.1 (git+https://github.com/EspressoSystems/tide-disco.git?tag=v0.4.2)",
+ "tide-disco",
 ]
 
 [[package]]
@@ -6340,7 +6235,7 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dc09e9364c2045ab5fa38f7b04d077b3359d30c4c2b3ec4bae67a358bd64326"
 dependencies = [
- "itoa 1.0.9",
+ "itoa",
  "ryu",
  "sval",
 ]
@@ -6351,7 +6246,7 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ada6f627e38cbb8860283649509d87bc4a5771141daa41c78fd31f2b9485888d"
 dependencies = [
- "itoa 1.0.9",
+ "itoa",
  "ryu",
  "sval",
 ]
@@ -6454,31 +6349,32 @@ dependencies = [
 
 [[package]]
 name = "tagged-base64"
-version = "0.3.0"
-source = "git+https://github.com/espressosystems/tagged-base64?tag=0.3.0#19381b3f14b1f94269c8c783288a63694b6dd12a"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50189d4e81e3a3850799299cc908f28fb15740adccf8bd620f855be396e6e730"
 dependencies = [
  "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
  "base64 0.13.1",
  "crc-any",
  "serde",
  "snafu",
- "tagged-base64-macros 0.3.0",
+ "tagged-base64-macros 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "tagged-base64"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50189d4e81e3a3850799299cc908f28fb15740adccf8bd620f855be396e6e730"
+version = "0.3.4"
+source = "git+https://github.com/EspressoSystems/tagged-base64?tag=0.3.4#93be6f0f5c0ec8458f13dede3d2b68dcce12a608"
 dependencies = [
  "ark-serialize 0.4.2",
  "ark-std 0.4.0",
- "base64 0.13.1",
+ "base64 0.21.3",
  "crc-any",
  "serde",
  "snafu",
- "tagged-base64-macros 0.3.3",
+ "tagged-base64-macros 0.3.3 (git+https://github.com/EspressoSystems/tagged-base64?tag=0.3.4)",
  "wasm-bindgen",
 ]
 
@@ -6494,8 +6390,9 @@ dependencies = [
 
 [[package]]
 name = "tagged-base64-macros"
-version = "0.3.0"
-source = "git+https://github.com/espressosystems/tagged-base64?tag=0.3.0#19381b3f14b1f94269c8c783288a63694b6dd12a"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71636a96f40b6ea3d969182ce22ad8042d5a38839ce448fff3cef4dec80f7589"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -6504,8 +6401,7 @@ dependencies = [
 [[package]]
 name = "tagged-base64-macros"
 version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71636a96f40b6ea3d969182ce22ad8042d5a38839ce448fff3cef4dec80f7589"
+source = "git+https://github.com/EspressoSystems/tagged-base64?tag=0.3.4#93be6f0f5c0ec8458f13dede3d2b68dcce12a608"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -6570,54 +6466,8 @@ dependencies = [
 
 [[package]]
 name = "tide-disco"
-version = "0.4.1"
-source = "git+https://github.com/EspressoSystems/tide-disco.git?tag=v0.4.1#cdd9b1ec3f8566a96dcbbcffa5e5ea5d65135ea6"
-dependencies = [
- "async-std",
- "async-trait",
- "bincode",
- "clap",
- "config",
- "derive_more",
- "dirs 4.0.0",
- "edit-distance",
- "futures",
- "futures-util",
- "http",
- "include_dir",
- "lazy_static",
- "libc",
- "markdown",
- "maud 0.24.0",
- "parking_lot",
- "routefinder",
- "semver 1.0.18",
- "serde",
- "serde_json",
- "serde_with 2.3.3",
- "shellexpand 2.1.2",
- "signal-hook",
- "signal-hook-async-std",
- "snafu",
- "strum 0.24.1",
- "strum_macros 0.24.3",
- "surf",
- "tagged-base64 0.2.4",
- "tide",
- "tide-websockets",
- "toml 0.5.11",
- "tracing",
- "tracing-distributed",
- "tracing-futures",
- "tracing-log",
- "tracing-subscriber",
- "url",
-]
-
-[[package]]
-name = "tide-disco"
-version = "0.4.1"
-source = "git+https://github.com/EspressoSystems/tide-disco.git?tag=v0.4.2#780f37a659d64bc4311112e20ae516fadc0a35c2"
+version = "0.4.3"
+source = "git+https://github.com/EspressoSystems/tide-disco.git?tag=v0.4.3#0863f714a61630ee6da6812f917c684e0df1777b"
 dependencies = [
  "async-std",
  "async-trait",
@@ -6625,7 +6475,7 @@ dependencies = [
  "clap",
  "config",
  "derive_more",
- "dirs 5.0.1",
+ "dirs",
  "edit-distance",
  "futures",
  "futures-util",
@@ -6634,24 +6484,24 @@ dependencies = [
  "lazy_static",
  "libc",
  "markdown",
- "maud 0.25.0",
+ "maud",
  "parking_lot",
  "routefinder",
  "semver 1.0.18",
  "serde",
  "serde_json",
- "serde_with 3.3.0",
- "shellexpand 3.1.0",
+ "serde_with",
+ "shellexpand",
  "signal-hook",
  "signal-hook-async-std",
  "snafu",
- "strum 0.25.0",
- "strum_macros 0.25.2",
+ "strum",
+ "strum_macros",
  "surf",
- "tagged-base64 0.2.4",
+ "tagged-base64 0.3.4",
  "tide",
  "tide-websockets",
- "toml 0.7.8",
+ "toml 0.8.2",
  "tracing",
  "tracing-distributed",
  "tracing-futures",
@@ -6700,7 +6550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe"
 dependencies = [
  "deranged",
- "itoa 1.0.9",
+ "itoa",
  "serde",
  "time-core",
  "time-macros 0.2.15",
@@ -6845,14 +6695,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.8"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.20.2",
 ]
 
 [[package]]
@@ -6869,6 +6719,17 @@ name = "toml_edit"
 version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.0.0",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
  "indexmap 2.0.0",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index cc985000ed..95023bb203 100644
--- 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",
@@ -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
index 8f11e4d66f..917f85eb92 100644
--- 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
index 3febbbce65..1d0d6f789f 100644
--- 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
index f65eac0983..a7e4a00c18 100644
--- 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
index 68fc0ec064..ce07facb55 100644
--- 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
index 5daed175bd..c84f7d95f0 100644
--- 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
index 827d5a5258..a758d4ab37 100644
--- 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
index e29ce036e8..90e94f8aaa 100644
--- 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(),
                 }

From 5efeff53d62a4faa2329f2f239a7a9d36fbfec5e Mon Sep 17 00:00:00 2001
From: Jeb Bearer <jeb@espressosys.com>
Date: Tue, 14 Nov 2023 12:27:19 -0500
Subject: [PATCH 2/2] Update commit

---
 Cargo.lock | 140 ++++++++++++++++-------------------------------------
 Cargo.toml |   2 +-
 2 files changed, 42 insertions(+), 100 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 246922c8fd..d77343faa8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -233,7 +233,7 @@ checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f"
 dependencies = [
  "ark-ec",
  "ark-ff",
- "ark-std 0.4.0",
+ "ark-std",
 ]
 
 [[package]]
@@ -244,8 +244,8 @@ checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488"
 dependencies = [
  "ark-ec",
  "ark-ff",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-serialize",
+ "ark-std",
 ]
 
 [[package]]
@@ -256,7 +256,7 @@ checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f"
 dependencies = [
  "ark-ec",
  "ark-ff",
- "ark-std 0.4.0",
+ "ark-std",
 ]
 
 [[package]]
@@ -268,7 +268,7 @@ dependencies = [
  "ark-bls12-377",
  "ark-ec",
  "ark-ff",
- "ark-std 0.4.0",
+ "ark-std",
 ]
 
 [[package]]
@@ -280,9 +280,9 @@ dependencies = [
  "ark-ec",
  "ark-ff",
  "ark-relations",
- "ark-serialize 0.4.2",
+ "ark-serialize",
  "ark-snark",
- "ark-std 0.4.0",
+ "ark-std",
  "blake2",
  "derivative",
  "digest 0.10.7",
@@ -297,8 +297,8 @@ checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
 dependencies = [
  "ark-ff",
  "ark-poly",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-serialize",
+ "ark-std",
  "derivative",
  "hashbrown 0.13.2",
  "itertools 0.10.5",
@@ -316,7 +316,7 @@ dependencies = [
  "ark-bls12-377",
  "ark-ec",
  "ark-ff",
- "ark-std 0.4.0",
+ "ark-std",
 ]
 
 [[package]]
@@ -328,7 +328,7 @@ dependencies = [
  "ark-bls12-381",
  "ark-ec",
  "ark-ff",
- "ark-std 0.4.0",
+ "ark-std",
 ]
 
 [[package]]
@@ -340,7 +340,7 @@ dependencies = [
  "ark-bn254",
  "ark-ec",
  "ark-ff",
- "ark-std 0.4.0",
+ "ark-std",
 ]
 
 [[package]]
@@ -351,8 +351,8 @@ checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba"
 dependencies = [
  "ark-ff-asm",
  "ark-ff-macros",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-serialize",
+ "ark-std",
  "derivative",
  "digest 0.10.7",
  "itertools 0.10.5",
@@ -395,7 +395,7 @@ checksum = "760ecac12a00211188c9101b63bd284b80da5abcc5d97d9d2b3803bca1f63a52"
 dependencies = [
  "ark-ec",
  "ark-ff",
- "ark-std 0.4.0",
+ "ark-std",
 ]
 
 [[package]]
@@ -405,8 +405,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
 dependencies = [
  "ark-ff",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-serialize",
+ "ark-std",
  "derivative",
  "hashbrown 0.13.2",
  "rayon",
@@ -419,44 +419,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00796b6efc05a3f48225e59cb6a2cda78881e7c390872d5786aaf112f31fb4f0"
 dependencies = [
  "ark-ff",
- "ark-std 0.4.0",
+ "ark-std",
  "tracing",
 ]
 
-[[package]]
-name = "ark-serialize"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671"
-dependencies = [
- "ark-serialize-derive 0.3.0",
- "ark-std 0.3.0",
- "digest 0.9.0",
-]
-
 [[package]]
 name = "ark-serialize"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
 dependencies = [
- "ark-serialize-derive 0.4.2",
- "ark-std 0.4.0",
+ "ark-serialize-derive",
+ "ark-std",
  "digest 0.10.7",
  "num-bigint",
 ]
 
-[[package]]
-name = "ark-serialize-derive"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd4e5f0bf8285d5ed538d27fab7411f3e297908fd93c62195de8bee3f199e82"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "ark-serialize-derive"
 version = "0.4.2"
@@ -476,18 +454,8 @@ checksum = "84d3cc6833a335bb8a600241889ead68ee89a3cf8448081fb7694c0fe503da63"
 dependencies = [
  "ark-ff",
  "ark-relations",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
-]
-
-[[package]]
-name = "ark-std"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c"
-dependencies = [
- "num-traits",
- "rand 0.8.5",
+ "ark-serialize",
+ "ark-std",
 ]
 
 [[package]]
@@ -1310,19 +1278,18 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 [[package]]
 name = "commit"
 version = "0.2.2"
-source = "git+https://github.com/EspressoSystems/commit?tag=0.2.2#7e938186607f87da5fd642ce36313aaeab0cfaca"
+source = "git+https://github.com/EspressoSystems/commit?tag=0.2.3#fa1d0cb00bda1cc06c239aaf3a692014489d88c8"
 dependencies = [
  "arbitrary",
- "ark-serialize 0.3.0",
+ "ark-serialize",
  "bitvec",
  "derivative",
  "derive_more",
  "funty",
- "generic-array",
  "hex",
  "serde",
  "sha3",
- "tagged-base64 0.2.4",
+ "tagged-base64 0.3.4",
 ]
 
 [[package]]
@@ -2390,7 +2357,6 @@ version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
- "serde",
  "typenum",
  "version_check",
 ]
@@ -2680,8 +2646,8 @@ dependencies = [
  "ark-ff",
  "ark-pallas",
  "ark-poly",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-serialize",
+ "ark-std",
  "bincode",
  "bitvec",
  "ethereum-types",
@@ -2721,8 +2687,8 @@ version = "0.3.3"
 dependencies = [
  "ark-bn254",
  "ark-ff",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-serialize",
+ "ark-std",
  "bincode",
  "bitvec",
  "digest 0.10.7",
@@ -2822,8 +2788,8 @@ name = "hotshot-types"
 version = "0.1.0"
 dependencies = [
  "arbitrary",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-serialize",
+ "ark-std",
  "async-compatibility-layer",
  "async-lock",
  "async-std",
@@ -3302,8 +3268,8 @@ dependencies = [
  "ark-ff",
  "ark-pallas",
  "ark-poly",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-serialize",
+ "ark-std",
  "blst",
  "chacha20poly1305 0.10.1",
  "crypto_kx",
@@ -3341,8 +3307,8 @@ dependencies = [
  "ark-ec",
  "ark-ff",
  "ark-poly",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-serialize",
+ "ark-std",
  "derivative",
  "displaydoc",
  "downcast-rs",
@@ -3362,8 +3328,8 @@ source = "git+https://github.com/EspressoSystems/jellyfish#30752c6c1af7b933e2536
 dependencies = [
  "ark-ec",
  "ark-ff",
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-serialize",
+ "ark-std",
  "digest 0.10.7",
  "rayon",
  "serde",
@@ -6333,28 +6299,14 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "tagged-base64"
-version = "0.2.4"
-source = "git+https://github.com/EspressoSystems/tagged-base64?tag=0.2.4#9b9a5fae1e2fd41db8573657cfe169e8284eb6c9"
-dependencies = [
- "ark-serialize 0.3.0",
- "base64 0.13.1",
- "crc-any",
- "serde",
- "snafu",
- "tagged-base64-macros 0.2.0",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "tagged-base64"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50189d4e81e3a3850799299cc908f28fb15740adccf8bd620f855be396e6e730"
 dependencies = [
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-serialize",
+ "ark-std",
  "base64 0.13.1",
  "crc-any",
  "serde",
@@ -6368,8 +6320,8 @@ name = "tagged-base64"
 version = "0.3.4"
 source = "git+https://github.com/EspressoSystems/tagged-base64?tag=0.3.4#93be6f0f5c0ec8458f13dede3d2b68dcce12a608"
 dependencies = [
- "ark-serialize 0.4.2",
- "ark-std 0.4.0",
+ "ark-serialize",
+ "ark-std",
  "base64 0.21.3",
  "crc-any",
  "serde",
@@ -6378,16 +6330,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "tagged-base64-macros"
-version = "0.2.0"
-source = "git+https://github.com/EspressoSystems/tagged-base64?tag=0.2.4#9b9a5fae1e2fd41db8573657cfe169e8284eb6c9"
-dependencies = [
- "ark-std 0.3.0",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "tagged-base64-macros"
 version = "0.3.3"
diff --git a/Cargo.toml b/Cargo.toml
index 95023bb203..abc933b2fb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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" }