From 1706025e6ec3db310535f8a85ad3031312189711 Mon Sep 17 00:00:00 2001
From: eltitanb <lorenzo@gattaca.com>
Date: Mon, 24 Mar 2025 20:12:57 +0000
Subject: [PATCH] cleanup

---
 Cargo.lock                      |  17 -----
 Cargo.toml                      | 131 ++++++++++++--------------------
 benches/pbs/Cargo.toml          |  32 +++-----
 bin/Cargo.toml                  |  20 ++---
 crates/cli/Cargo.toml           |  17 ++---
 crates/common/Cargo.toml        |  66 +++++++---------
 crates/metrics/Cargo.toml       |  22 ++----
 crates/pbs/Cargo.toml           |  40 +++-------
 crates/signer/Cargo.toml        |  40 ++++------
 examples/builder_log/Cargo.toml |  12 +--
 examples/da_commit/Cargo.toml   |  26 ++-----
 examples/status_api/Cargo.toml  |  28 +++----
 taplo.toml                      |   6 ++
 tests/Cargo.toml                |  24 ++----
 14 files changed, 161 insertions(+), 320 deletions(-)
 create mode 100644 taplo.toml

diff --git a/Cargo.lock b/Cargo.lock
index 2c0220b4..7db6ff67 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1450,12 +1450,9 @@ name = "cb-bench-pbs"
 version = "0.7.0-rc.2"
 dependencies = [
  "alloy",
- "axum 0.8.1",
  "cb-common",
- "cb-pbs",
  "cb-tests",
  "comfy-table",
- "eyre",
  "histogram",
  "rand 0.9.0",
  "reqwest",
@@ -1463,9 +1460,6 @@ dependencies = [
  "serde_json",
  "tokio",
  "toml",
- "tracing",
- "tracing-subscriber",
- "tree_hash 0.9.1",
 ]
 
 [[package]]
@@ -1475,11 +1469,8 @@ dependencies = [
  "cb-common",
  "clap",
  "docker-compose-types",
- "dotenvy",
  "eyre",
  "indexmap 2.8.0",
- "serde",
- "serde_json",
  "serde_yaml",
 ]
 
@@ -1547,7 +1538,6 @@ dependencies = [
  "blst",
  "cb-common",
  "cb-metrics",
- "dashmap",
  "eyre",
  "futures",
  "lazy_static",
@@ -1555,7 +1545,6 @@ dependencies = [
  "prometheus",
  "reqwest",
  "serde_json",
- "thiserror 2.0.12",
  "tokio",
  "tracing",
  "tree_hash 0.9.1",
@@ -2173,12 +2162,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562"
 
-[[package]]
-name = "dotenvy"
-version = "0.15.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
-
 [[package]]
 name = "dunce"
 version = "1.0.5"
diff --git a/Cargo.toml b/Cargo.toml
index 27bdfb17..43bf3991 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,109 +1,72 @@
 [workspace]
-members = [
-    "bin",
-
-    "crates/cli",
-    "crates/common",
-    "crates/signer",
-    "crates/pbs",
-    "crates/metrics",
-
-    "tests",
-    "benches/*",
-    "examples/builder_log",
-    "examples/da_commit",
-    "examples/status_api",
-]
+members = ["benches/*", "bin", "crates/*", "examples/builder_log", "examples/da_commit", "examples/status_api", "tests"]
 resolver = "2"
 
 [workspace.package]
-version = "0.7.0-rc.2"
-rust-version = "1.83"
 edition = "2021"
+rust-version = "1.83"
+version = "0.7.0-rc.2"
 
 [workspace.dependencies]
-cb-cli = { path = "crates/cli" }
-cb-common = { path = "crates/common" }
-cb-metrics = { path = "crates/metrics" }
-cb-pbs = { path = "crates/pbs" }
-cb-signer = { path = "crates/signer" }
-
-# ethereum
+aes = "0.8"
 alloy = { version = "0.12", features = [
     "full",
-    "rpc-types-beacon",
-    "serde",
-    "ssz",
     "getrandom",
     "providers",
+    "rpc-types-beacon",
+    "serde",
     "signer-local",
+    "ssz",
 ] }
-ssz_types = "0.10"
-ethereum_serde_utils = "0.7.0"
-
-# networking
+async-trait = "0.1.80"
 axum = { version = "0.8.1", features = ["macros"] }
 axum-extra = { version = "0.10.0", features = ["typed-header"] }
-reqwest = { version = "0.12.4", features = ["json", "stream"] }
-headers = "0.4.0"
-tonic = { version = "0.12.3", features = ["tls", "channel", "prost"] }
-tonic-build = "0.12.3"
-prost = "0.13.4"
-
-# async / threads
-tokio = { version = "1.37.0", features = ["full"] }
+base64 = "0.22.1"
+bimap = { version = "0.6.3", features = ["serde"] }
+blsful = "2.5"
+blst = "0.3.11"
+cb-cli = { path = "crates/cli" }
+cb-common = { path = "crates/common" }
+cb-metrics = { path = "crates/metrics" }
+cb-pbs = { path = "crates/pbs" }
+cb-signer = { path = "crates/signer" }
+cipher = "0.4"
+clap = { version = "4.5.4", features = ["derive", "env"] }
+color-eyre = "0.6.3"
+ctr = "0.9.2"
+derive_more = { version = "2.0.1", features = ["deref", "display", "from", "into"] }
+docker-compose-types = "0.16.0"
+eth2_keystore = { git = "https://github.com/sigp/lighthouse", rev = "8d058e4040b765a96aa4968f4167af7571292be2" }
+ethereum_serde_utils = "0.7.0"
+ethereum_ssz = "0.8"
+ethereum_ssz_derive = "0.8"
+eyre = "0.6.12"
 futures = "0.3.30"
-async-trait = "0.1.80"
-dashmap = "6.1.0"
+headers = "0.4.0"
+indexmap = "2.2.6"
+lazy_static = "1.5.0"
 parking_lot = "0.12.3"
-
-# serialization
-toml = "0.8.13"
+pbkdf2 = "0.12.2"
+prometheus = "0.13.4"
+prost = "0.13.4"
+rand = { version = "0.9", features = ["os_rng"] }
+reqwest = { version = "0.12.4", features = ["json", "stream"] }
 serde = { version = "1.0.202", features = ["derive"] }
 serde_json = "1.0.117"
 serde_yaml = "0.9.33"
-base64 = "0.22.1"
-unicode-normalization = "0.1.24"
-ethereum_ssz = "0.8"
-ethereum_ssz_derive = "0.8"
-
-# telemetry
+sha2 = "0.10.8"
+ssz_types = "0.10"
+thiserror = "2.0.12"
+tokio = { version = "1.37.0", features = ["full"] }
+toml = "0.8.13"
+tonic = { version = "0.12.3", features = ["channel", "prost", "tls"] }
+tonic-build = "0.12.3"
 tracing = "0.1.40"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
 tracing-appender = "0.2.3"
-prometheus = "0.13.4"
-
-# crypto
-blst = "0.3.11"
-blsful = "2.5"
+tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
 tree_hash = "0.9"
 tree_hash_derive = "0.9"
-eth2_keystore = { git = "https://github.com/sigp/lighthouse", rev = "8d058e4040b765a96aa4968f4167af7571292be2" }
-aes = "0.8"
-ctr = "0.9.2"
-cipher = "0.4"
-pbkdf2 = "0.12.2"
-sha2 = "0.10.8"
-
-# docker
-docker-compose-types = "0.16.0"
-
-# misc
-clap = { version = "4.5.4", features = ["derive", "env"] }
-thiserror = "2.0.12"
-color-eyre = "0.6.3"
-eyre = "0.6.12"
-url = { version = "2.5.0", features = ["serde"] }
-uuid = { version = "1.8.0", features = ["v4", "fast-rng", "serde"] }
 typenum = "1.17.0"
-rand = { version = "0.9", features = ["os_rng"] }
-dotenvy = "0.15.7"
-indexmap = "2.2.6"
-lazy_static = "1.5.0"
-bimap = { version = "0.6.3", features = ["serde"] }
-derive_more = { version = "2.0.1", features = [
-    "from",
-    "into",
-    "deref",
-    "display",
-] }
+unicode-normalization = "0.1.24"
+url = { version = "2.5.0", features = ["serde"] }
+uuid = { version = "1.8.0", features = ["fast-rng", "serde", "v4"] }
diff --git a/benches/pbs/Cargo.toml b/benches/pbs/Cargo.toml
index 257bd72b..2cfeedd1 100644
--- a/benches/pbs/Cargo.toml
+++ b/benches/pbs/Cargo.toml
@@ -1,32 +1,18 @@
 [package]
-name = "cb-bench-pbs"
-version.workspace = true
 edition.workspace = true
+name = "cb-bench-pbs"
 rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
+alloy.workspace = true
 cb-common.workspace = true
-cb-pbs.workspace = true
 cb-tests = { path = "../../tests" }
-
-tokio.workspace = true
-
-axum.workspace = true
-
-alloy.workspace = true
-
+comfy-table = "7.1.1"
+histogram = "0.11.0"
+rand.workspace = true
+reqwest.workspace = true
 serde.workspace = true
-toml.workspace = true
 serde_json.workspace = true
-
-reqwest.workspace = true
-
-tracing.workspace = true
-tracing-subscriber.workspace = true
-
-tree_hash.workspace = true
-eyre.workspace = true
-
-rand.workspace = true
-histogram = "0.11.0"
-comfy-table = "7.1.1"
+tokio.workspace = true
+toml.workspace = true
diff --git a/bin/Cargo.toml b/bin/Cargo.toml
index 79258d76..d50c2932 100644
--- a/bin/Cargo.toml
+++ b/bin/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "commit-boost"
-version.workspace = true
 edition.workspace = true
+name = "commit-boost"
 rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
 cb-cli.workspace = true
@@ -10,22 +10,14 @@ cb-common.workspace = true
 cb-metrics.workspace = true
 cb-pbs.workspace = true
 cb-signer.workspace = true
-
-# async / threads
+clap.workspace = true
+color-eyre.workspace = true
+eyre.workspace = true
 tokio.workspace = true
-
-# crypto
+tracing.workspace = true
 tree_hash.workspace = true
 tree_hash_derive.workspace = true
 
-# telemetry
-tracing.workspace = true
-
-# misc
-clap.workspace = true
-eyre.workspace = true
-color-eyre.workspace = true
-
 [[bin]]
 name = "commit-boost-cli"
 path = "cli.rs"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index 707e4c16..2acc6a7b 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -1,21 +1,14 @@
 [package]
-name = "cb-cli"
-version.workspace = true
 edition.workspace = true
-rust-version.workspace = true
+name = "cb-cli"
 publish = false
+rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
 cb-common.workspace = true
-
-serde.workspace = true
-serde_json.workspace = true
-serde_yaml.workspace = true
-
 clap.workspace = true
-
-eyre.workspace = true
-
 docker-compose-types.workspace = true
-dotenvy.workspace = true
+eyre.workspace = true
 indexmap.workspace = true
+serde_yaml.workspace = true
diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
index 8ac207fd..6f5dd36d 100644
--- a/crates/common/Cargo.toml
+++ b/crates/common/Cargo.toml
@@ -1,56 +1,42 @@
 [package]
-name = "cb-common"
-version.workspace = true
 edition.workspace = true
-rust-version.workspace = true
+name = "cb-common"
 publish = false
+rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
-# ethereum
+aes.workspace = true
 alloy.workspace = true
-ssz_types.workspace = true
-ethereum_serde_utils.workspace = true
-
-# networking
+async-trait.workspace = true
 axum.workspace = true
+base64.workspace = true
+bimap.workspace = true
+blst.workspace = true
+cipher.workspace = true
+ctr.workspace = true
+derive_more.workspace = true
+eth2_keystore.workspace = true
+ethereum_serde_utils.workspace = true
+ethereum_ssz.workspace = true
+ethereum_ssz_derive.workspace = true
+eyre.workspace = true
+pbkdf2.workspace = true
+rand.workspace = true
 reqwest.workspace = true
-tonic.workspace = true
-
-# async / threads
-tokio.workspace = true
-async-trait.workspace = true
-
-# serialization
-toml.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 serde_yaml.workspace = true
-ethereum_ssz.workspace = true
-ethereum_ssz_derive.workspace = true
-
-# telemetry
+sha2.workspace = true
+ssz_types.workspace = true
+thiserror.workspace = true
+tokio.workspace = true
+toml.workspace = true
+tonic.workspace = true
 tracing.workspace = true
-tracing-subscriber.workspace = true
 tracing-appender.workspace = true
-
-# crypto
-blst.workspace = true
+tracing-subscriber.workspace = true
 tree_hash.workspace = true
 tree_hash_derive.workspace = true
-eth2_keystore.workspace = true
-aes.workspace = true
-ctr.workspace = true
-cipher.workspace = true
-pbkdf2.workspace = true
-sha2.workspace = true
-
-# misc
-thiserror.workspace = true
-eyre.workspace = true
-url.workspace = true
-rand.workspace = true
-bimap.workspace = true
-derive_more.workspace = true
-
 unicode-normalization.workspace = true
-base64.workspace = true
+url.workspace = true
diff --git a/crates/metrics/Cargo.toml b/crates/metrics/Cargo.toml
index 2cee8bcb..4a1b0e65 100644
--- a/crates/metrics/Cargo.toml
+++ b/crates/metrics/Cargo.toml
@@ -1,23 +1,15 @@
 [package]
-name = "cb-metrics"
-version.workspace = true
-rust-version.workspace = true
 edition.workspace = true
+name = "cb-metrics"
 publish = false
+rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
-cb-common.workspace = true
-
-# async / threads
-tokio.workspace = true
-
-# networking
 axum.workspace = true
-
-# telemetry
-tracing.workspace = true
+cb-common.workspace = true
+eyre.workspace = true
 prometheus.workspace = true
-
-# misc
 thiserror.workspace = true
-eyre.workspace = true
+tokio.workspace = true
+tracing.workspace = true
diff --git a/crates/pbs/Cargo.toml b/crates/pbs/Cargo.toml
index be547570..ad747f9d 100644
--- a/crates/pbs/Cargo.toml
+++ b/crates/pbs/Cargo.toml
@@ -1,43 +1,27 @@
 [package]
-name = "cb-pbs"
-version.workspace = true
 edition.workspace = true
-rust-version.workspace = true
+name = "cb-pbs"
 publish = false
+rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
-cb-common.workspace = true
-cb-metrics.workspace = true
-
-# ethereum
 alloy.workspace = true
-
-# networking
+async-trait.workspace = true
 axum.workspace = true
 axum-extra.workspace = true
-reqwest.workspace = true
-
-# async / threads
-tokio.workspace = true
+blst.workspace = true
+cb-common.workspace = true
+cb-metrics.workspace = true
+eyre.workspace = true
 futures.workspace = true
-async-trait.workspace = true
-dashmap.workspace = true
+lazy_static.workspace = true
 parking_lot.workspace = true
-
-# serialization
+prometheus.workspace = true
+reqwest.workspace = true
 serde_json.workspace = true
-
-# telemetry
+tokio.workspace = true
 tracing.workspace = true
-prometheus.workspace = true
-
-# crypto
-blst.workspace = true
 tree_hash.workspace = true
-
-# misc
-thiserror.workspace = true
-eyre.workspace = true
 url.workspace = true
 uuid.workspace = true
-lazy_static.workspace = true
diff --git a/crates/signer/Cargo.toml b/crates/signer/Cargo.toml
index 19f4add1..2b108bd2 100644
--- a/crates/signer/Cargo.toml
+++ b/crates/signer/Cargo.toml
@@ -1,43 +1,31 @@
 [package]
-name = "cb-signer"
-version.workspace = true
 edition.workspace = true
-rust-version.workspace = true
+name = "cb-signer"
 publish = false
+rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
-cb-common.workspace = true
-cb-metrics.workspace = true
-
-# ethereum
 alloy.workspace = true
-
-# networking
 axum.workspace = true
 axum-extra.workspace = true
+bimap.workspace = true
+blsful.workspace = true
+cb-common.workspace = true
+cb-metrics.workspace = true
+eyre.workspace = true
+futures.workspace = true
 headers.workspace = true
-tonic.workspace = true
+lazy_static.workspace = true
+prometheus.workspace = true
 prost.workspace = true
-
-# async / threads
+rand.workspace = true
+thiserror.workspace = true
 tokio.workspace = true
-futures.workspace = true
-
-# telemetry
+tonic.workspace = true
 tracing.workspace = true
-prometheus.workspace = true
-
-# crypto
-blsful.workspace = true
 tree_hash.workspace = true
-
-# misc
-thiserror.workspace = true
-eyre.workspace = true
 uuid.workspace = true
-bimap.workspace = true
-lazy_static.workspace = true
-rand.workspace = true
 
 [build-dependencies]
 tonic-build.workspace = true
diff --git a/examples/builder_log/Cargo.toml b/examples/builder_log/Cargo.toml
index cc147db4..64173a5f 100644
--- a/examples/builder_log/Cargo.toml
+++ b/examples/builder_log/Cargo.toml
@@ -1,16 +1,12 @@
 [package]
-name = "builder_log"
-version.workspace = true
 edition.workspace = true
+name = "builder_log"
 rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
+async-trait.workspace = true
 commit-boost = { path = "../../bin" }
-
-# async / threads
+eyre.workspace = true
 tokio.workspace = true
-async-trait.workspace = true
-
-# telemetry
 tracing.workspace = true
-eyre.workspace = true
diff --git a/examples/da_commit/Cargo.toml b/examples/da_commit/Cargo.toml
index 46e308ee..f518fe4f 100644
--- a/examples/da_commit/Cargo.toml
+++ b/examples/da_commit/Cargo.toml
@@ -1,27 +1,17 @@
 [package]
-name = "da_commit"
-version.workspace = true
 edition.workspace = true
+name = "da_commit"
 rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
-commit-boost = { path = "../../bin" }
-
-# ethereum
 alloy.workspace = true
-
-# async / threads
-tokio.workspace = true
-
-# serialization
+color-eyre.workspace = true
+commit-boost = { path = "../../bin" }
+eyre.workspace = true
+lazy_static.workspace = true
+prometheus.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-
-# telemetry
+tokio.workspace = true
 tracing.workspace = true
-prometheus.workspace = true
-
-# misc
-eyre.workspace = true
-color-eyre.workspace = true
-lazy_static.workspace = true
diff --git a/examples/status_api/Cargo.toml b/examples/status_api/Cargo.toml
index e87f5e33..f2be040e 100644
--- a/examples/status_api/Cargo.toml
+++ b/examples/status_api/Cargo.toml
@@ -1,28 +1,18 @@
 [package]
-name = "status_api"
-version.workspace = true
 edition.workspace = true
+name = "status_api"
 rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
+async-trait.workspace = true
+axum.workspace = true
+color-eyre.workspace = true
 commit-boost = { path = "../../bin" }
-
-# networking
+eyre.workspace = true
+lazy_static.workspace = true
+prometheus.workspace = true
 reqwest.workspace = true
-axum.workspace = true
-
-# async / threads
-tokio.workspace = true
-async-trait.workspace = true
-
-# serialization
 serde.workspace = true
-
-# telemetry
+tokio.workspace = true
 tracing.workspace = true
-prometheus.workspace = true
-
-# misc
-eyre.workspace = true
-color-eyre.workspace = true
-lazy_static.workspace = true
diff --git a/taplo.toml b/taplo.toml
new file mode 100644
index 00000000..0d8d172b
--- /dev/null
+++ b/taplo.toml
@@ -0,0 +1,6 @@
+[formatting]
+column_width = 120
+compact_entries = false
+reorder_arrays = true
+reorder_inline_tables = true
+reorder_keys = true
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index 19175ebf..ce273ae7 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -1,27 +1,19 @@
 [package]
-name = "cb-tests"
-version.workspace = true
 edition.workspace = true
+name = "cb-tests"
 rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
+alloy.workspace = true
+axum.workspace = true
 cb-common.workspace = true
 cb-pbs.workspace = true
-
-tokio.workspace = true
-
-axum.workspace = true
-
-alloy.workspace = true
-
-serde_json.workspace = true
-
+eyre.workspace = true
 reqwest.workspace = true
-
+serde_json.workspace = true
+tokio.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
-
 tree_hash.workspace = true
-eyre.workspace = true
-
-url.workspace = true
\ No newline at end of file
+url.workspace = true