Merge branch 'unstable' into network-crate

# Conflicts: # Cargo.lock
sigp · Oct 24, 2024 · 19e96ce · 19e96ce
2 parents 79737aa + 7c2274a
commit 19e96ce
Show file tree

Hide file tree

Showing 7 changed files with 298 additions and 239 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,13 +18,14 @@ slot_clock = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
 derive_more = { version = "1.0.0", features = ["full"] }
 async-channel = "1.9"
 axum = "0.7.7"
-clap = "4.5.15"
+clap = { version = "4.5.15", features = ["derive", "wrap_help"]}
 dirs = "5.0.1"
 either = "1.13.0"
 futures = "0.3.30"
 # dirs = "3"
 hyper = "1.4"
 serde = { version = "1.0.208", features = ["derive"] }
+strum = { version = "0.24", features = ["derive"] }
 tokio = { version = "1.39.2", features = [
     "rt",
     "rt-multi-thread",

diff --git a/anchor/client/Cargo.toml b/anchor/client/Cargo.toml
@@ -13,6 +13,7 @@ task_executor = { workspace = true }
 http_api = { workspace = true }
 clap = { workspace = true }
 serde = { workspace = true }
+strum = { workspace = true }
 sensitive_url = { workspace = true }
 dirs = { workspace = true }
 hyper = { workspace = true }