Enforce alphabetically ordered cargo deps (#6678)

* Enforce alphabetically ordered cargo deps

* Fix test-suite

* Another CI fix

* Merge branch 'unstable' into cargo-sort

* Fix conflicts

* Merge remote-tracking branch 'origin/unstable' into cargo-sort

.github/workflows/test-suite.yml

@@ -428,6 +428,21 @@ jobs:
         cache-target: release
     - name: Run Makefile to trigger the bash script
       run: make cli-local
+  cargo-sort:
+    name: cargo-sort
+    needs: [check-labels]
+    if: needs.check-labels.outputs.skip_ci != 'true'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Get latest version of stable Rust
+      uses: moonrepo/setup-rust@v1
+      with:
+        channel: stable
+        cache-target: release
+        bins: cargo-sort
+    - name: Run cargo sort to check if Cargo.toml files are sorted
+      run: cargo sort --check --workspace
   # This job succeeds ONLY IF all others succeed. It is used by the merge queue to determine whether
   # a PR is safe to merge. New jobs should be added here.
   test-suite-success:
@@ -455,6 +470,7 @@ jobs:
       'compile-with-beta-compiler',
       'cli-check',
       'lockbud',
+      'cargo-sort',
     ]
     steps:
       - uses: actions/checkout@v4

Cargo.toml

@@ -8,11 +8,11 @@ members = [
     "beacon_node/builder_client",
     "beacon_node/client",
     "beacon_node/eth1",
-    "beacon_node/lighthouse_network",
-    "beacon_node/lighthouse_network/gossipsub",
     "beacon_node/execution_layer",
     "beacon_node/http_api",
     "beacon_node/http_metrics",
+    "beacon_node/lighthouse_network",
+    "beacon_node/lighthouse_network/gossipsub",
     "beacon_node/network",
     "beacon_node/store",
     "beacon_node/timer",
@@ -30,40 +30,40 @@ members = [
     "common/eth2_interop_keypairs",
     "common/eth2_network_config",
     "common/eth2_wallet_manager",
-    "common/metrics",
     "common/lighthouse_version",
     "common/lockfile",
     "common/logging",
     "common/lru_cache",
     "common/malloc_utils",
+    "common/metrics",
+    "common/monitoring_api",
     "common/oneshot_broadcast",
     "common/pretty_reqwest_error",
     "common/sensitive_url",
     "common/slot_clock",
     "common/system_health",
-    "common/task_executor",
     "common/target_check",
+    "common/task_executor",
     "common/test_random_derive",
     "common/unused_port",
     "common/validator_dir",
     "common/warp_utils",
-    "common/monitoring_api",
-
-    "database_manager",
-
-    "consensus/int_to_bytes",
     "consensus/fixed_bytes",
     "consensus/fork_choice",
+
+    "consensus/int_to_bytes",
     "consensus/proto_array",
     "consensus/safe_arith",
     "consensus/state_processing",
     "consensus/swap_or_not_shuffle",
 
     "crypto/bls",
-    "crypto/kzg",
     "crypto/eth2_key_derivation",
     "crypto/eth2_keystore",
     "crypto/eth2_wallet",
+    "crypto/kzg",
+
+    "database_manager",
 
     "lcli",
 
@@ -78,8 +78,8 @@ members = [
     "testing/execution_engine_integration",
     "testing/node_test_rig",
     "testing/simulator",
-    "testing/test-test_logger",
     "testing/state_transition_vectors",
+    "testing/test-test_logger",
     "testing/web3signer_tests",
 
     "validator_client",
@@ -167,7 +167,13 @@ r2d2 = "0.8"
 rand = "0.8"
 rayon = "1.7"
 regex = "1"
-reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "stream", "rustls-tls", "native-tls-vendored"] }
+reqwest = { version = "0.11", default-features = false, features = [
+    "blocking",
+    "json",
+    "stream",
+    "rustls-tls",
+    "native-tls-vendored",
+] }
 ring = "0.16"
 rpds = "0.11"
 rusqlite = { version = "0.28", features = ["bundled"] }
@@ -176,7 +182,11 @@ serde_json = "1"
 serde_repr = "0.1"
 serde_yaml = "0.9"
 sha2 = "0.9"
-slog = { version = "2", features = ["max_level_debug", "release_max_level_debug", "nested-values"] }
+slog = { version = "2", features = [
+    "max_level_debug",
+    "release_max_level_debug",
+    "nested-values",
+] }
 slog-async = "2"
 slog-term = "2"
 sloggers = { version = "2", features = ["json"] }
@@ -188,7 +198,12 @@ superstruct = "0.8"
 syn = "1"
 sysinfo = "0.26"
 tempfile = "3"
-tokio = { version = "1", features = ["rt-multi-thread", "sync", "signal", "macros"] }
+tokio = { version = "1", features = [
+    "rt-multi-thread",
+    "sync",
+    "signal",
+    "macros",
+] }
 tokio-stream = { version = "0.1", features = ["sync"] }
 tokio-util = { version = "0.7", features = ["codec", "compat", "time"] }
 tracing = "0.1.40"

account_manager/Cargo.toml

@@ -8,25 +8,25 @@ authors = [
 edition = { workspace = true }
 
 [dependencies]
+account_utils = { workspace = true }
 bls = { workspace = true }
 clap = { workspace = true }
-types = { workspace = true }
-environment = { workspace = true }
-eth2_network_config = { workspace = true }
 clap_utils = { workspace = true }
 directory = { workspace = true }
+environment = { workspace = true }
+eth2 = { workspace = true }
+eth2_keystore = { workspace = true }
+eth2_network_config = { workspace = true }
 eth2_wallet = { workspace = true }
 eth2_wallet_manager = { path = "../common/eth2_wallet_manager" }
-validator_dir = { workspace = true }
-tokio = { workspace = true }
-eth2_keystore = { workspace = true }
-account_utils = { workspace = true }
-slashing_protection = { workspace = true }
-eth2 = { workspace = true }
-safe_arith = { workspace = true }
-slot_clock = { workspace = true }
 filesystem = { workspace = true }
+safe_arith = { workspace = true }
 sensitive_url = { workspace = true }
+slashing_protection = { workspace = true }
+slot_clock = { workspace = true }
+tokio = { workspace = true }
+types = { workspace = true }
+validator_dir = { workspace = true }
 zeroize = { workspace = true }
 
 [dev-dependencies]

beacon_node/Cargo.toml

@@ -20,28 +20,28 @@ write_ssz_files = [
 ] # Writes debugging .ssz files to /tmp during block processing.
 
 [dependencies]
-eth2_config = { workspace = true }
+account_utils = { workspace = true }
 beacon_chain = { workspace = true }
-types = { workspace = true }
-store = { workspace = true }
-client = { path = "client" }
 clap = { workspace = true }
-slog = { workspace = true }
-dirs = { workspace = true }
-directory = { workspace = true }
-environment = { workspace = true }
-task_executor = { workspace = true }
-genesis = { workspace = true }
-execution_layer = { workspace = true }
-lighthouse_network = { workspace = true }
-serde_json = { workspace = true }
 clap_utils = { workspace = true }
-hyper = { workspace = true }
+client = { path = "client" }
+directory = { workspace = true }
+dirs = { workspace = true }
+environment = { workspace = true }
+eth2_config = { workspace = true }
+execution_layer = { workspace = true }
+genesis = { workspace = true }
 hex = { workspace = true }
-slasher = { workspace = true }
+http_api = { workspace = true }
+hyper = { workspace = true }
+lighthouse_network = { workspace = true }
 monitoring_api = { workspace = true }
 sensitive_url = { workspace = true }
-http_api = { workspace = true }
-unused_port = { workspace = true }
+serde_json = { workspace = true }
+slasher = { workspace = true }
+slog = { workspace = true }
+store = { workspace = true }
 strum = { workspace = true }
-account_utils = { workspace = true }
+task_executor = { workspace = true }
+types = { workspace = true }
+unused_port = { workspace = true }

beacon_node/beacon_chain/Cargo.toml

@@ -18,9 +18,9 @@ portable = ["bls/supranational-portable"]
 test_backfill = []
 
 [dev-dependencies]
+criterion = { workspace = true }
 maplit = { workspace = true }
 serde_json = { workspace = true }
-criterion = { workspace = true }
 
 [dependencies]
 alloy-primitives = { workspace = true }
@@ -42,11 +42,11 @@ hex = { workspace = true }
 int_to_bytes = { workspace = true }
 itertools = { workspace = true }
 kzg = { workspace = true }
-metrics = { workspace = true }
 lighthouse_version = { workspace = true }
 logging = { workspace = true }
 lru = { workspace = true }
 merkle_proof = { workspace = true }
+metrics = { workspace = true }
 oneshot_broadcast = { path = "../../common/oneshot_broadcast/" }
 operation_pool = { workspace = true }
 parking_lot = { workspace = true }

beacon_node/beacon_processor/Cargo.toml

@@ -4,22 +4,22 @@ version = "0.1.0"
 edition = { workspace = true }
 
 [dependencies]
-slog = { workspace = true }
-itertools = { workspace = true }
-logging = { workspace = true }
-tokio = { workspace = true }
-tokio-util = { workspace = true }
-futures = { workspace = true }
 fnv = { workspace = true }
+futures = { workspace = true }
+itertools = { workspace = true }
+lighthouse_network = { workspace = true }
+logging = { workspace = true }
+metrics = { workspace = true }
+num_cpus = { workspace = true }
+parking_lot = { workspace = true }
+serde = { workspace = true }
+slog = { workspace = true }
+slot_clock = { workspace = true }
 strum = { workspace = true }
 task_executor = { workspace = true }
-slot_clock = { workspace = true }
-lighthouse_network = { workspace = true }
+tokio = { workspace = true }
+tokio-util = { workspace = true }
 types = { workspace = true }
-metrics = { workspace = true }
-parking_lot = { workspace = true }
-num_cpus = { workspace = true }
-serde = { workspace = true }
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["test-util"] }

beacon_node/builder_client/Cargo.toml

@@ -5,8 +5,8 @@ edition = { workspace = true }
 authors = ["Sean Anderson <sean@sigmaprime.io>"]
 
 [dependencies]
+eth2 = { workspace = true }
+lighthouse_version = { workspace = true }
 reqwest = { workspace = true }
 sensitive_url = { workspace = true }
-eth2 = { workspace = true }
 serde = { workspace = true }
-lighthouse_version = { workspace = true }

beacon_node/client/Cargo.toml

@@ -5,41 +5,41 @@ authors = ["Sigma Prime <contact@sigmaprime.io>"]
 edition = { workspace = true }
 
 [dev-dependencies]
+operation_pool = { workspace = true }
 serde_yaml = { workspace = true }
 state_processing = { workspace = true }
-operation_pool = { workspace = true }
 tokio = { workspace = true }
 
 [dependencies]
 beacon_chain = { workspace = true }
-store = { workspace = true }
-network = { workspace = true }
-timer = { path = "../timer" }
-lighthouse_network = { workspace = true }
-types = { workspace = true }
-eth2_config = { workspace = true }
-slot_clock = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-slog = { workspace = true }
-tokio = { workspace = true }
-futures = { workspace = true }
+beacon_processor = { workspace = true }
+directory = { workspace = true }
 dirs = { workspace = true }
+environment = { workspace = true }
 eth1 = { workspace = true }
 eth2 = { workspace = true }
-kzg = { workspace = true }
-sensitive_url = { workspace = true }
+eth2_config = { workspace = true }
+ethereum_ssz = { workspace = true }
+execution_layer = { workspace = true }
+futures = { workspace = true }
 genesis = { workspace = true }
-task_executor = { workspace = true }
-environment = { workspace = true }
-metrics = { workspace = true }
-time = "0.3.5"
-directory = { workspace = true }
 http_api = { workspace = true }
 http_metrics = { path = "../http_metrics" }
+kzg = { workspace = true }
+lighthouse_network = { workspace = true }
+metrics = { workspace = true }
+monitoring_api = { workspace = true }
+network = { workspace = true }
+sensitive_url = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 slasher = { workspace = true }
 slasher_service = { path = "../../slasher/service" }
-monitoring_api = { workspace = true }
-execution_layer = { workspace = true }
-beacon_processor = { workspace = true }
-ethereum_ssz = { workspace = true }
+slog = { workspace = true }
+slot_clock = { workspace = true }
+store = { workspace = true }
+task_executor = { workspace = true }
+time = "0.3.5"
+timer = { path = "../timer" }
+tokio = { workspace = true }
+types = { workspace = true }

beacon_node/eth1/Cargo.toml

@@ -5,27 +5,27 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
 
 [dev-dependencies]
+environment = { workspace = true }
 eth1_test_rig = { workspace = true }
 serde_yaml = { workspace = true }
 sloggers = { workspace = true }
-environment = { workspace = true }
 
 [dependencies]
-execution_layer = { workspace = true }
-futures = { workspace = true }
-serde = { workspace = true }
-types = { workspace = true }
-merkle_proof = { workspace = true }
+eth2 = { workspace = true }
 ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
-tree_hash = { workspace = true }
-parking_lot = { workspace = true }
-slog = { workspace = true }
+execution_layer = { workspace = true }
+futures = { workspace = true }
 logging = { workspace = true }
-superstruct = { workspace = true }
-tokio = { workspace = true }
-state_processing = { workspace = true }
+merkle_proof = { workspace = true }
 metrics = { workspace = true }
-task_executor = { workspace = true }
-eth2 = { workspace = true }
+parking_lot = { workspace = true }
 sensitive_url = { workspace = true }
+serde = { workspace = true }
+slog = { workspace = true }
+state_processing = { workspace = true }
+superstruct = { workspace = true }
+task_executor = { workspace = true }
+tokio = { workspace = true }
+tree_hash = { workspace = true }
+types = { workspace = true }

beacon_node/execution_layer/Cargo.toml

@@ -2,54 +2,53 @@
 name = "execution_layer"
 version = "0.1.0"
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+alloy-consensus = { workspace = true }
 alloy-primitives = { workspace = true }
-types = { workspace = true }
-tokio = { workspace = true }
-slog = { workspace = true }
-logging = { workspace = true }
-sensitive_url = { workspace = true }
-reqwest = { workspace = true }
-ethereum_serde_utils = { workspace = true }
-serde_json = { workspace = true }
-serde = { workspace = true }
-warp = { workspace = true }
-jsonwebtoken = "9"
+alloy-rlp = { workspace = true }
+arc-swap = "1.6.0"
+builder_client = { path = "../builder_client" }
 bytes = { workspace = true }
-task_executor = { workspace = true }
-hex = { workspace = true }
-ethereum_ssz = { workspace = true }
-ssz_types = { workspace = true }
 eth2 = { workspace = true }
+eth2_network_config = { workspace = true }
+ethereum_serde_utils = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethers-core = { workspace = true }
+fixed_bytes = { workspace = true }
+fork_choice = { workspace = true }
+hash-db = "0.15.2"
+hash256-std-hasher = "0.15.2"
+hex = { workspace = true }
+jsonwebtoken = "9"
+keccak-hash = "0.10.0"
 kzg = { workspace = true }
-state_processing = { workspace = true }
-superstruct = { workspace = true }
+lighthouse_version = { workspace = true }
+logging = { workspace = true }
 lru = { workspace = true }
+metrics = { workspace = true }
+parking_lot = { workspace = true }
+pretty_reqwest_error = { workspace = true }
+rand = { workspace = true }
+reqwest = { workspace = true }
+sensitive_url = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+sha2 = { workspace = true }
+slog = { workspace = true }
+slot_clock = { workspace = true }
+ssz_types = { workspace = true }
+state_processing = { workspace = true }
+strum = { workspace = true }
+superstruct = { workspace = true }
+task_executor = { workspace = true }
+tempfile = { workspace = true }
+tokio = { workspace = true }
+tokio-stream = { workspace = true }
 tree_hash = { workspace = true }
 tree_hash_derive = { workspace = true }
-parking_lot = { workspace = true }
-slot_clock = { workspace = true }
-tempfile = { workspace = true }
-rand = { workspace = true }
-zeroize = { workspace = true }
-metrics = { workspace = true }
-ethers-core = { workspace = true }
-builder_client = { path = "../builder_client" }
-fork_choice = { workspace = true }
-tokio-stream = { workspace = true }
-strum = { workspace = true }
-keccak-hash = "0.10.0"
-hash256-std-hasher = "0.15.2"
 triehash = "0.8.4"
-hash-db = "0.15.2"
-pretty_reqwest_error = { workspace = true }
-arc-swap = "1.6.0"
-eth2_network_config = { workspace = true }
-alloy-rlp = { workspace = true }
-alloy-consensus = { workspace = true }
-lighthouse_version = { workspace = true }
-fixed_bytes = { workspace = true }
-sha2 = { workspace = true }
+types = { workspace = true }
+warp = { workspace = true }
+zeroize = { workspace = true }

beacon_node/http_api/Cargo.toml

@@ -6,49 +6,49 @@ edition = { workspace = true }
 autotests = false                               # using a single test binary compiles faster
 
 [dependencies]
-warp = { workspace = true }
-serde = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-types = { workspace = true }
-hex = { workspace = true }
 beacon_chain = { workspace = true }
-eth2 = { workspace = true }
-slog = { workspace = true }
-network = { workspace = true }
-lighthouse_network = { workspace = true }
-eth1 = { workspace = true }
-state_processing = { workspace = true }
-lighthouse_version = { workspace = true }
-metrics = { workspace = true }
-warp_utils = { workspace = true }
-slot_clock = { workspace = true }
-ethereum_ssz = { workspace = true }
+beacon_processor = { workspace = true }
 bs58 = "0.4.0"
-futures = { workspace = true }
+bytes = { workspace = true }
+directory = { workspace = true }
+eth1 = { workspace = true }
+eth2 = { workspace = true }
+ethereum_serde_utils = { workspace = true }
+ethereum_ssz = { workspace = true }
 execution_layer = { workspace = true }
-parking_lot = { workspace = true }
-safe_arith = { workspace = true }
-task_executor = { workspace = true }
+futures = { workspace = true }
+hex = { workspace = true }
+lighthouse_network = { workspace = true }
+lighthouse_version = { workspace = true }
+logging = { workspace = true }
 lru = { workspace = true }
-tree_hash = { workspace = true }
+metrics = { workspace = true }
+network = { workspace = true }
+operation_pool = { workspace = true }
+parking_lot = { workspace = true }
+rand = { workspace = true }
+safe_arith = { workspace = true }
+sensitive_url = { workspace = true }
+serde = { workspace = true }
+slog = { workspace = true }
+slot_clock = { workspace = true }
+state_processing = { workspace = true }
+store = { workspace = true }
 sysinfo = { workspace = true }
 system_health = { path = "../../common/system_health" }
-directory = { workspace = true }
-logging = { workspace = true }
-ethereum_serde_utils = { workspace = true }
-operation_pool = { workspace = true }
-sensitive_url = { workspace = true }
-store = { workspace = true }
-bytes = { workspace = true }
-beacon_processor = { workspace = true }
-rand = { workspace = true }
+task_executor = { workspace = true }
+tokio = { workspace = true }
+tokio-stream = { workspace = true }
+tree_hash = { workspace = true }
+types = { workspace = true }
+warp = { workspace = true }
+warp_utils = { workspace = true }
 
 [dev-dependencies]
-serde_json = { workspace = true }
-proto_array = { workspace = true }
 genesis = { workspace = true }
 logging = { workspace = true }
+proto_array = { workspace = true }
+serde_json = { workspace = true }
 
 [[test]]
 name = "bn_http_api_tests"

beacon_node/http_metrics/Cargo.toml

@@ -3,24 +3,23 @@ name = "http_metrics"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-warp = { workspace = true }
+beacon_chain = { workspace = true }
+lighthouse_network = { workspace = true }
+lighthouse_version = { workspace = true }
+malloc_utils = { workspace = true }
+metrics = { workspace = true }
 serde = { workspace = true }
 slog = { workspace = true }
-beacon_chain = { workspace = true }
-store = { workspace = true }
-lighthouse_network = { workspace = true }
 slot_clock = { workspace = true }
-metrics = { workspace = true }
-lighthouse_version = { workspace = true }
+store = { workspace = true }
+warp = { workspace = true }
 warp_utils = { workspace = true }
-malloc_utils = { workspace = true }
 
 [dev-dependencies]
-tokio = { workspace = true }
-reqwest = { workspace = true }
-types = { workspace = true }
 logging = { workspace = true }
+reqwest = { workspace = true }
+tokio = { workspace = true }
+types = { workspace = true }

beacon_node/lighthouse_network/Cargo.toml

@@ -6,48 +6,48 @@ edition = { workspace = true }
 
 [dependencies]
 alloy-primitives = { workspace = true }
+alloy-rlp = { workspace = true }
+bytes = { workspace = true }
+delay_map = { workspace = true }
+directory = { workspace = true }
+dirs = { workspace = true }
 discv5 = { workspace = true }
-gossipsub = { workspace = true }
-unsigned-varint = { version = "0.8", features = ["codec"] }
-ssz_types = { workspace = true }
-types = { workspace = true }
-serde = { workspace = true }
+either = { workspace = true }
 ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
-slog = { workspace = true }
-lighthouse_version = { workspace = true }
-tokio = { workspace = true }
-futures = { workspace = true }
-dirs = { workspace = true }
 fnv = { workspace = true }
-metrics = { workspace = true }
-smallvec = { workspace = true }
-tokio-io-timeout = "1"
+futures = { workspace = true }
+gossipsub = { workspace = true }
+hex = { workspace = true }
+itertools = { workspace = true }
+libp2p-mplex = "0.42"
+lighthouse_version = { workspace = true }
 lru = { workspace = true }
 lru_cache = { workspace = true }
+metrics = { workspace = true }
 parking_lot = { workspace = true }
-sha2 = { workspace = true }
-snap = { workspace = true }
-hex = { workspace = true }
-tokio-util = { workspace = true }
-tiny-keccak = "2"
-task_executor = { workspace = true }
+prometheus-client = "0.22.0"
 rand = { workspace = true }
-directory = { workspace = true }
 regex = { workspace = true }
+serde = { workspace = true }
+sha2 = { workspace = true }
+slog = { workspace = true }
+smallvec = { workspace = true }
+snap = { workspace = true }
+ssz_types = { workspace = true }
 strum = { workspace = true }
 superstruct = { workspace = true }
-prometheus-client = "0.22.0"
+task_executor = { workspace = true }
+tiny-keccak = "2"
+tokio = { workspace = true }
+tokio-io-timeout = "1"
+tokio-util = { workspace = true }
+types = { workspace = true }
+unsigned-varint = { version = "0.8", features = ["codec"] }
 unused_port = { workspace = true }
-delay_map = { workspace = true }
-bytes = { workspace = true }
-either = { workspace = true }
-itertools = { workspace = true }
-alloy-rlp = { workspace = true }
 
 # Local dependencies
 void = "1.0.2"
-libp2p-mplex = "0.42"
 
 [dependencies.libp2p]
 version = "0.54"
@@ -55,13 +55,13 @@ default-features = false
 features = ["identify", "yamux", "noise", "dns", "tcp", "tokio", "plaintext", "secp256k1", "macros", "ecdsa", "metrics", "quic", "upnp"]
 
 [dev-dependencies]
-slog-term = { workspace = true }
-slog-async = { workspace = true }
-tempfile = { workspace = true }
-quickcheck = { workspace = true }
-quickcheck_macros = { workspace = true }
 async-channel = { workspace = true }
 logging = { workspace = true }
+quickcheck = { workspace = true }
+quickcheck_macros = { workspace = true }
+slog-async = { workspace = true }
+slog-term = { workspace = true }
+tempfile = { workspace = true }
 
 [features]
 libp2p-websocket = []

beacon_node/lighthouse_network/gossipsub/Cargo.toml

@@ -24,9 +24,10 @@ fnv = "1.0.7"
 futures = "0.3.30"
 futures-timer = "3.0.2"
 getrandom = "0.2.12"
-hashlink.workspace = true
+hashlink = { workspace = true }
 hex_fmt = "0.3.0"
 libp2p = { version = "0.54", default-features = false }
+prometheus-client = "0.22.0"
 quick-protobuf = "0.8"
 quick-protobuf-codec = "0.3"
 rand = "0.8"
@@ -35,7 +36,6 @@ serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = "0.10.8"
 tracing = "0.1.37"
 void = "1.0.2"
-prometheus-client = "0.22.0"
 web-time = "1.1.0"
 
 [dev-dependencies]

beacon_node/network/Cargo.toml

@@ -5,51 +5,51 @@ authors = ["Sigma Prime <contact@sigmaprime.io>"]
 edition = { workspace = true }
 
 [dev-dependencies]
-sloggers = { workspace = true }
+bls = { workspace = true }
+eth2 = { workspace = true }
+eth2_network_config = { workspace = true }
 genesis = { workspace = true }
+gossipsub = { workspace = true }
+kzg = { workspace = true }
 matches = "0.1.8"
 serde_json = { workspace = true }
-slog-term = { workspace = true }
 slog-async = { workspace = true }
-eth2 = { workspace = true }
-gossipsub = { workspace = true }
-eth2_network_config = { workspace = true }
-kzg = { workspace = true }
-bls = { workspace = true }
+slog-term = { workspace = true }
+sloggers = { workspace = true }
 
 [dependencies]
 alloy-primitives = { workspace = true }
-async-channel = { workspace = true }
-anyhow = { workspace = true }
-beacon_chain = { workspace = true }
-store = { workspace = true }
-lighthouse_network = { workspace = true }
-types = { workspace = true }
-slot_clock = { workspace = true }
-slog = { workspace = true }
-hex = { workspace = true }
-ethereum_ssz = { workspace = true }
-ssz_types = { workspace = true }
-futures = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-smallvec = { workspace = true }
-rand = { workspace = true }
-fnv = { workspace = true }
 alloy-rlp = { workspace = true }
-metrics = { workspace = true }
-logging = { workspace = true }
-task_executor = { workspace = true }
+anyhow = { workspace = true }
+async-channel = { workspace = true }
+beacon_chain = { workspace = true }
+beacon_processor = { workspace = true }
+delay_map = { workspace = true }
+derivative = { workspace = true }
+ethereum_ssz = { workspace = true }
+execution_layer = { workspace = true }
+fnv = { workspace = true }
+futures = { workspace = true }
+hex = { workspace = true }
 igd-next = "0.14"
 itertools = { workspace = true }
+lighthouse_network = { workspace = true }
+logging = { workspace = true }
 lru_cache = { workspace = true }
-strum = { workspace = true }
-derivative = { workspace = true }
-delay_map = { workspace = true }
+metrics = { workspace = true }
 operation_pool = { workspace = true }
-execution_layer = { workspace = true }
-beacon_processor = { workspace = true }
 parking_lot = { workspace = true }
+rand = { workspace = true }
+slog = { workspace = true }
+slot_clock = { workspace = true }
+smallvec = { workspace = true }
+ssz_types = { workspace = true }
+store = { workspace = true }
+strum = { workspace = true }
+task_executor = { workspace = true }
+tokio = { workspace = true }
+tokio-stream = { workspace = true }
+types = { workspace = true }
 
 [features]
 # NOTE: This can be run via cargo build --bin lighthouse --features network/disable-backfill

beacon_node/store/Cargo.toml

@@ -5,34 +5,34 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
 
 [dev-dependencies]
-tempfile = { workspace = true }
 beacon_chain = { workspace = true }
 criterion = { workspace = true }
 rand = { workspace = true, features = ["small_rng"] }
+tempfile = { workspace = true }
 
 [dependencies]
+bls = { workspace = true }
 db-key = "0.0.5"
-leveldb = { version = "0.8" }
-parking_lot = { workspace = true }
-itertools = { workspace = true }
+directory = { workspace = true }
 ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
+itertools = { workspace = true }
+leveldb = { version = "0.8" }
+logging = { workspace = true }
+lru = { workspace = true }
+metrics = { workspace = true }
+parking_lot = { workspace = true }
+safe_arith = { workspace = true }
+serde = { workspace = true }
+slog = { workspace = true }
+sloggers = { workspace = true }
+smallvec = { workspace = true }
+state_processing = { workspace = true }
+strum = { workspace = true }
 superstruct = { workspace = true }
 types = { workspace = true }
-safe_arith = { workspace = true }
-state_processing = { workspace = true }
-slog = { workspace = true }
-serde = { workspace = true }
-metrics = { workspace = true }
-lru = { workspace = true }
-sloggers = { workspace = true }
-directory = { workspace = true }
-strum = { workspace = true }
 xdelta3 = { workspace = true }
 zstd = { workspace = true }
-bls = { workspace = true }
-smallvec = { workspace = true }
-logging = { workspace = true }
 
 [[bench]]
 name = "hdiff"

beacon_node/timer/Cargo.toml

@@ -6,7 +6,7 @@ edition = { workspace = true }
 
 [dependencies]
 beacon_chain = { workspace = true }
-slot_clock = { workspace = true }
-tokio = { workspace = true }
 slog = { workspace = true }
+slot_clock = { workspace = true }
 task_executor = { workspace = true }
+tokio = { workspace = true }

boot_node/Cargo.toml

@@ -6,19 +6,19 @@ edition = { workspace = true }
 
 [dependencies]
 beacon_node = { workspace = true }
+bytes = { workspace = true }
 clap = { workspace = true }
 clap_utils = { workspace = true }
-lighthouse_network = { workspace = true }
-types = { workspace = true }
+eth2_network_config = { workspace = true }
 ethereum_ssz = { workspace = true }
-slog = { workspace = true }
-tokio = { workspace = true }
+hex = { workspace = true }
+lighthouse_network = { workspace = true }
 log = { workspace = true }
-slog-term = { workspace = true }
 logging = { workspace = true }
+serde = { workspace = true }
+slog = { workspace = true }
 slog-async = { workspace = true }
 slog-scope = "4.3.0"
-hex = { workspace = true }
-serde = { workspace = true }
-eth2_network_config = { workspace = true }
-bytes = { workspace = true }
+slog-term = { workspace = true }
+tokio = { workspace = true }
+types = { workspace = true }

common/account_utils/Cargo.toml

@@ -3,20 +3,19 @@ name = "account_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rand = { workspace = true }
-eth2_wallet = { workspace = true }
+directory = { workspace = true }
 eth2_keystore = { workspace = true }
+eth2_wallet = { workspace = true }
 filesystem = { workspace = true }
-zeroize = { workspace = true }
+rand = { workspace = true }
+regex = { workspace = true }
+rpassword = "5.0.0"
 serde = { workspace = true }
 serde_yaml = { workspace = true }
 slog = { workspace = true }
 types = { workspace = true }
 validator_dir = { workspace = true }
-regex = { workspace = true }
-rpassword = "5.0.0"
-directory = { workspace = true }
+zeroize = { workspace = true }

common/clap_utils/Cargo.toml

@@ -3,16 +3,15 @@ name = "clap_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 alloy-primitives = { workspace = true }
 clap = { workspace = true }
-hex = { workspace = true }
 dirs = { workspace = true }
 eth2_network_config = { workspace = true }
 ethereum_ssz = { workspace = true }
+hex = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }

common/compare_fields_derive/Cargo.toml

@@ -8,5 +8,5 @@ edition = { workspace = true }
 proc-macro = true
 
 [dependencies]
-syn = { workspace = true }
 quote = { workspace = true }
+syn = { workspace = true }

common/deposit_contract/Cargo.toml

@@ -7,13 +7,13 @@ edition = { workspace = true }
 build = "build.rs"
 
 [build-dependencies]
+hex = { workspace = true }
 reqwest = { workspace = true }
 serde_json = { workspace = true }
 sha2 = { workspace = true }
-hex = { workspace = true }
 
 [dependencies]
-types = { workspace = true }
+ethabi = "16.0.0"
 ethereum_ssz = { workspace = true }
 tree_hash = { workspace = true }
-ethabi = "16.0.0"
+types = { workspace = true }

common/directory/Cargo.toml

@@ -3,7 +3,6 @@ name = "directory"
 version = "0.1.0"
 authors = ["pawan <pawandhananjay@gmail.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

common/eth2/Cargo.toml

@@ -3,31 +3,30 @@ name = "eth2"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = { workspace = true }
-serde_json = { workspace = true }
-ssz_types = { workspace = true }
-types = { workspace = true }
-reqwest = { workspace = true }
-lighthouse_network = { workspace = true }
-proto_array = { workspace = true }
-ethereum_serde_utils = { workspace = true }
+derivative = { workspace = true }
 eth2_keystore = { workspace = true }
-zeroize = { workspace = true }
-sensitive_url = { workspace = true }
+ethereum_serde_utils = { workspace = true }
 ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
-futures-util = "0.3.8"
 futures = { workspace = true }
-store = { workspace = true }
-slashing_protection = { workspace = true }
+futures-util = "0.3.8"
+lighthouse_network = { workspace = true }
 mediatype = "0.19.13"
 pretty_reqwest_error = { workspace = true }
-derivative = { workspace = true }
+proto_array = { workspace = true }
+reqwest = { workspace = true }
 reqwest-eventsource = "0.5.0"
+sensitive_url = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+slashing_protection = { workspace = true }
+ssz_types = { workspace = true }
+store = { workspace = true }
+types = { workspace = true }
+zeroize = { workspace = true }
 
 [dev-dependencies]
 tokio = { workspace = true }

common/eth2_config/Cargo.toml

@@ -5,5 +5,5 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
 
 [dependencies]
-types = { workspace = true }
 paste = { workspace = true }
+types = { workspace = true }

common/eth2_interop_keypairs/Cargo.toml

@@ -3,16 +3,15 @@ name = "eth2_interop_keypairs"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-num-bigint = "0.4.2"
+bls = { workspace = true }
 ethereum_hashing = { workspace = true }
 hex = { workspace = true }
-serde_yaml = { workspace = true }
+num-bigint = "0.4.2"
 serde = { workspace = true }
-bls = { workspace = true }
+serde_yaml = { workspace = true }
 
 [dev-dependencies]
 base64 = "0.13.0"

common/eth2_network_config/Cargo.toml

@@ -7,25 +7,25 @@ edition = { workspace = true }
 build = "build.rs"
 
 [build-dependencies]
-zip = { workspace = true }
 eth2_config = { workspace = true }
+zip = { workspace = true }
 
 [dev-dependencies]
+ethereum_ssz = { workspace = true }
 tempfile = { workspace = true }
 tokio = { workspace = true }
-ethereum_ssz = { workspace = true }
 
 [dependencies]
-serde_yaml = { workspace = true }
-types = { workspace = true }
-eth2_config = { workspace = true }
-discv5 = { workspace = true }
-reqwest = { workspace = true }
-pretty_reqwest_error = { workspace = true }
-sha2 = { workspace = true }
-url = { workspace = true }
-sensitive_url = { workspace = true }
-slog = { workspace = true }
-logging = { workspace = true }
 bytes = { workspace = true }
+discv5 = { workspace = true }
+eth2_config = { workspace = true }
 kzg = { workspace = true }
+logging = { workspace = true }
+pretty_reqwest_error = { workspace = true }
+reqwest = { workspace = true }
+sensitive_url = { workspace = true }
+serde_yaml = { workspace = true }
+sha2 = { workspace = true }
+slog = { workspace = true }
+types = { workspace = true }
+url = { workspace = true }

common/eth2_wallet_manager/Cargo.toml

@@ -3,7 +3,6 @@ name = "eth2_wallet_manager"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

common/lighthouse_version/Cargo.toml

@@ -3,7 +3,6 @@ name = "lighthouse_version"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

common/logging/Cargo.toml

@@ -19,7 +19,7 @@ sloggers = { workspace = true }
 take_mut = "0.2.2"
 tokio = { workspace = true, features = [ "time" ] }
 tracing = "0.1"
+tracing-appender = { workspace = true }
 tracing-core = { workspace = true }
 tracing-log = { workspace = true }
 tracing-subscriber = { workspace = true }
-tracing-appender = { workspace = true }

common/malloc_utils/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
 
 [dependencies]
-metrics = { workspace = true }
 libc = "0.2.79"
+metrics = { workspace = true }
 parking_lot = { workspace = true }
 tikv-jemalloc-ctl = { version = "0.6.0", optional = true, features = ["stats"] }
 

common/monitoring_api/Cargo.toml

@@ -3,19 +3,18 @@ name = "monitoring_api"
 version = "0.1.0"
 authors = ["pawan <pawandhananjay@gmail.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-reqwest = { workspace = true }
-task_executor = { workspace = true }
-tokio = { workspace = true }
 eth2 = { workspace = true }
-serde_json = { workspace = true }
-serde = { workspace = true }
 lighthouse_version = { workspace = true }
 metrics = { workspace = true }
+regex = { workspace = true }
+reqwest = { workspace = true }
+sensitive_url = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 slog = { workspace = true }
 store = { workspace = true }
-regex = { workspace = true }
-sensitive_url = { workspace = true }
+task_executor = { workspace = true }
+tokio = { workspace = true }

common/oneshot_broadcast/Cargo.toml

@@ -2,7 +2,6 @@
 name = "oneshot_broadcast"
 version = "0.1.0"
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

common/pretty_reqwest_error/Cargo.toml

@@ -2,7 +2,6 @@
 name = "pretty_reqwest_error"
 version = "0.1.0"
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

common/sensitive_url/Cargo.toml

@@ -3,9 +3,8 @@ name = "sensitive_url"
 version = "0.1.0"
 authors = ["Mac L <mjladson@pm.me>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-url = { workspace = true }
 serde = { workspace = true }
+url = { workspace = true }

common/slot_clock/Cargo.toml

@@ -5,6 +5,6 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
 
 [dependencies]
-types = { workspace = true }
 metrics = { workspace = true }
 parking_lot = { workspace = true }
+types = { workspace = true }

common/system_health/Cargo.toml

@@ -5,7 +5,7 @@ edition = { workspace = true }
 
 [dependencies]
 lighthouse_network = { workspace = true }
-types = { workspace = true }
-sysinfo = { workspace = true }
-serde = { workspace = true }
 parking_lot = { workspace = true }
+serde = { workspace = true }
+sysinfo = { workspace = true }
+types = { workspace = true }

common/task_executor/Cargo.toml

@@ -11,10 +11,10 @@ tracing = ["dep:tracing"]
 
 [dependencies]
 async-channel = { workspace = true }
-tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
-slog = { workspace = true, optional = true }
 futures = { workspace = true }
-metrics = { workspace = true }
-sloggers = { workspace = true, optional = true }
 logging = { workspace = true, optional = true }
+metrics = { workspace = true }
+slog = { workspace = true, optional = true }
+sloggers = { workspace = true, optional = true }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 tracing = { workspace = true, optional = true }

common/test_random_derive/Cargo.toml

@@ -9,5 +9,5 @@ description = "Procedural derive macros for implementation of TestRandom trait"
 proc-macro = true
 
 [dependencies]
-syn = { workspace = true }
 quote = { workspace = true }
+syn = { workspace = true }

common/unused_port/Cargo.toml

@@ -2,7 +2,6 @@
 name = "unused_port"
 version = "0.1.0"
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

common/validator_dir/Cargo.toml

@@ -6,21 +6,20 @@ edition = { workspace = true }
 
 [features]
 insecure_keys = []
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 bls = { workspace = true }
+deposit_contract = { workspace = true }
+derivative = { workspace = true }
+directory = { workspace = true }
 eth2_keystore = { workspace = true }
 filesystem = { workspace = true }
-types = { workspace = true }
-rand = { workspace = true }
-deposit_contract = { workspace = true }
-tree_hash = { workspace = true }
 hex = { workspace = true }
-derivative = { workspace = true }
 lockfile = { workspace = true }
-directory = { workspace = true }
+rand = { workspace = true }
+tree_hash = { workspace = true }
+types = { workspace = true }
 
 [dev-dependencies]
 tempfile = { workspace = true }

common/warp_utils/Cargo.toml

@@ -3,20 +3,19 @@ name = "warp_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-warp = { workspace = true }
-eth2 = { workspace = true }
-types = { workspace = true }
 beacon_chain = { workspace = true }
-state_processing = { workspace = true }
-safe_arith = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true }
+bytes = { workspace = true }
+eth2 = { workspace = true }
 headers = "0.3.2"
 metrics = { workspace = true }
+safe_arith = { workspace = true }
+serde = { workspace = true }
 serde_array_query = "0.1.0"
-bytes = { workspace = true }
+serde_json = { workspace = true }
+state_processing = { workspace = true }
+tokio = { workspace = true }
+types = { workspace = true }
+warp = { workspace = true }

consensus/fixed_bytes/Cargo.toml

@@ -3,7 +3,6 @@ name = "fixed_bytes"
 version = "0.1.0"
 authors = ["Eitan Seri-Levi <eitan@sigmaprime.io>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

consensus/fork_choice/Cargo.toml

@@ -3,17 +3,16 @@ name = "fork_choice"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-types = { workspace = true }
-state_processing = { workspace = true }
-proto_array = { workspace = true }
 ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
 metrics = { workspace = true }
+proto_array = { workspace = true }
 slog = { workspace = true }
+state_processing = { workspace = true }
+types = { workspace = true }
 
 [dev-dependencies]
 beacon_chain = { workspace = true }

consensus/int_to_bytes/Cargo.toml

@@ -8,5 +8,5 @@ edition = { workspace = true }
 bytes = { workspace = true }
 
 [dev-dependencies]
-yaml-rust2 = "0.8"
 hex = { workspace = true }
+yaml-rust2 = "0.8"

consensus/proto_array/Cargo.toml

@@ -9,10 +9,10 @@ name = "proto_array"
 path = "src/bin.rs"
 
 [dependencies]
-types = { workspace = true }
 ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
+safe_arith = { workspace = true }
 serde = { workspace = true }
 serde_yaml = { workspace = true }
-safe_arith = { workspace = true }
 superstruct = { workspace = true }
+types = { workspace = true }

consensus/safe_arith/Cargo.toml

@@ -3,7 +3,6 @@ name = "safe_arith"
 version = "0.1.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

consensus/state_processing/Cargo.toml

@@ -5,30 +5,30 @@ authors = ["Paul Hauner <paul@paulhauner.com>", "Michael Sproul <michael@sigmapr
 edition = { workspace = true }
 
 [dev-dependencies]
-env_logger = { workspace = true }
 beacon_chain = { workspace = true }
+env_logger = { workspace = true }
 tokio = { workspace = true }
 
 [dependencies]
+arbitrary = { workspace = true }
 bls = { workspace = true }
-integer-sqrt = "0.1.5"
-itertools = { workspace = true }
+derivative = { workspace = true }
+ethereum_hashing = { workspace = true }
 ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
-ssz_types = { workspace = true }
+int_to_bytes = { workspace = true }
+integer-sqrt = "0.1.5"
+itertools = { workspace = true }
 merkle_proof = { workspace = true }
+metrics = { workspace = true }
+rand = { workspace = true }
+rayon = { workspace = true }
 safe_arith = { workspace = true }
+smallvec = { workspace = true }
+ssz_types = { workspace = true }
+test_random_derive = { path = "../../common/test_random_derive" }
 tree_hash = { workspace = true }
 types = { workspace = true }
-rayon = { workspace = true }
-ethereum_hashing = { workspace = true }
-int_to_bytes = { workspace = true }
-smallvec = { workspace = true }
-arbitrary = { workspace = true }
-metrics = { workspace = true }
-derivative = { workspace = true }
-test_random_derive = { path = "../../common/test_random_derive" }
-rand = { workspace = true }
 
 [features]
 default = ["legacy-arith"]

crypto/bls/Cargo.toml

@@ -6,18 +6,18 @@ edition = { workspace = true }
 
 [dependencies]
 alloy-primitives = { workspace = true }
-ethereum_ssz = { workspace = true }
-tree_hash = { workspace = true }
-rand = { workspace = true }
-serde = { workspace = true }
-ethereum_serde_utils = { workspace = true }
-hex = { workspace = true }
-ethereum_hashing = { workspace = true }
 arbitrary = { workspace = true }
-zeroize = { workspace = true }
 blst = { version = "0.3.3", optional = true }
-safe_arith = { workspace = true }
+ethereum_hashing = { workspace = true }
+ethereum_serde_utils = { workspace = true }
+ethereum_ssz = { workspace = true }
 fixed_bytes = { workspace = true }
+hex = { workspace = true }
+rand = { workspace = true }
+safe_arith = { workspace = true }
+serde = { workspace = true }
+tree_hash = { workspace = true }
+zeroize = { workspace = true }
 
 [features]
 arbitrary = []

crypto/eth2_key_derivation/Cargo.toml

@@ -3,15 +3,14 @@ name = "eth2_key_derivation"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sha2 = { workspace = true }
-zeroize = { workspace = true }
+bls = { workspace = true }
 num-bigint-dig = { version = "0.8.4", features = ["zeroize"] }
 ring = { workspace = true }
-bls = { workspace = true }
+sha2 = { workspace = true }
+zeroize = { workspace = true }
 
 [dev-dependencies]
 hex = { workspace = true }

crypto/eth2_keystore/Cargo.toml

@@ -3,25 +3,24 @@ name = "eth2_keystore"
 version = "0.1.0"
 authors = ["Pawan Dhananjay <pawan@sigmaprime.io", "Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rand = { workspace = true }
+aes = { version = "0.7", features = ["ctr"] }
+bls = { workspace = true }
+eth2_key_derivation = { workspace = true }
+hex = { workspace = true }
 hmac = "0.11.0"
 pbkdf2 = { version = "0.8.0", default-features = false }
+rand = { workspace = true }
 scrypt = { version = "0.7.0", default-features = false }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_repr = { workspace = true }
 sha2 = { workspace = true }
+unicode-normalization = "0.1.16"
 uuid = { workspace = true }
 zeroize = { workspace = true }
-serde = { workspace = true }
-serde_repr = { workspace = true }
-hex = { workspace = true }
-bls = { workspace = true }
-serde_json = { workspace = true }
-eth2_key_derivation = { workspace = true }
-unicode-normalization = "0.1.16"
-aes = { version = "0.7", features = ["ctr"] }
 
 [dev-dependencies]
 tempfile = { workspace = true }

crypto/eth2_wallet/Cargo.toml

@@ -3,18 +3,17 @@ name = "eth2_wallet"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+eth2_key_derivation = { workspace = true }
+eth2_keystore = { workspace = true }
+rand = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_repr = { workspace = true }
-uuid = { workspace = true }
-rand = { workspace = true }
-eth2_keystore = { workspace = true }
-eth2_key_derivation = { workspace = true }
 tiny-bip39 = "1"
+uuid = { workspace = true }
 
 [dev-dependencies]
 hex = { workspace = true }

crypto/kzg/Cargo.toml

@@ -3,22 +3,21 @@ name = "kzg"
 version = "0.1.0"
 authors = ["Pawan Dhananjay <pawandhananjay@gmail.com>"]
 edition = "2021"
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 arbitrary = { workspace = true }
+c-kzg = { workspace = true }
+derivative = { workspace = true }
+ethereum_hashing = { workspace = true }
+ethereum_serde_utils = { workspace = true }
 ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
-tree_hash = { workspace = true }
-derivative = { workspace = true }
-serde = { workspace = true }
-ethereum_serde_utils = { workspace = true }
 hex = { workspace = true }
-ethereum_hashing = { workspace = true }
-c-kzg = { workspace = true }
 rust_eth_kzg = { workspace = true }
+serde = { workspace = true }
 serde_json = { workspace = true }
+tree_hash = { workspace = true }
 
 [dev-dependencies]
 criterion = { workspace = true }

database_manager/Cargo.toml

@@ -10,8 +10,8 @@ clap = { workspace = true }
 clap_utils = { workspace = true }
 environment = { workspace = true }
 hex = { workspace = true }
-store = { workspace = true }
-types = { workspace = true }
-slog = { workspace = true }
-strum = { workspace = true }
 serde = { workspace = true }
+slog = { workspace = true }
+store = { workspace = true }
+strum = { workspace = true }
+types = { workspace = true }

lcli/Cargo.toml

@@ -11,36 +11,36 @@ fake_crypto = ['bls/fake_crypto']
 jemalloc = ["malloc_utils/jemalloc"]
 
 [dependencies]
+account_utils = { workspace = true }
+beacon_chain = { workspace = true }
 bls = { workspace = true }
 clap = { workspace = true }
-log = { workspace = true }
-sloggers = { workspace = true }
-serde = { workspace = true }
-serde_yaml = { workspace = true }
-serde_json = { workspace = true }
+clap_utils = { workspace = true }
+deposit_contract = { workspace = true }
 env_logger = { workspace = true }
-types = { workspace = true }
-state_processing = { workspace = true }
+environment = { workspace = true }
+eth2 = { workspace = true }
+eth2_network_config = { workspace = true }
+eth2_wallet = { workspace = true }
 ethereum_hashing = { workspace = true }
 ethereum_ssz = { workspace = true }
-environment = { workspace = true }
-eth2_network_config = { workspace = true }
-deposit_contract = { workspace = true }
-tree_hash = { workspace = true }
-clap_utils = { workspace = true }
-lighthouse_network = { workspace = true }
-validator_dir = { workspace = true }
-lighthouse_version = { workspace = true }
-account_utils = { workspace = true }
-eth2_wallet = { workspace = true }
-eth2 = { workspace = true }
-snap = { workspace = true }
-beacon_chain = { workspace = true }
-store = { workspace = true }
-malloc_utils = { workspace = true }
-rayon = { workspace = true }
 execution_layer = { workspace = true }
 hex = { workspace = true }
+lighthouse_network = { workspace = true }
+lighthouse_version = { workspace = true }
+log = { workspace = true }
+malloc_utils = { workspace = true }
+rayon = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+sloggers = { workspace = true }
+snap = { workspace = true }
+state_processing = { workspace = true }
+store = { workspace = true }
+tree_hash = { workspace = true }
+types = { workspace = true }
+validator_dir = { workspace = true }
 
 [package.metadata.cargo-udeps.ignore]
 normal = ["malloc_utils"]

lighthouse/Cargo.toml

@@ -34,48 +34,47 @@ malloc_utils = { workspace = true, features = ["jemalloc"] }
 malloc_utils = { workspace = true }
 
 [dependencies]
-beacon_node = { workspace = true }
-slog = { workspace = true }
-types = { workspace = true }
-bls = { workspace = true }
-ethereum_hashing = { workspace = true }
-clap = { workspace = true }
-environment = { workspace = true }
-boot_node = { path = "../boot_node" }
-futures = { workspace = true }
-validator_client = { workspace = true }
 account_manager = { "path" = "../account_manager" }
-clap_utils = { workspace = true }
-eth2_network_config = { workspace = true }
-lighthouse_version = { workspace = true }
 account_utils = { workspace = true }
+beacon_node = { workspace = true }
+bls = { workspace = true }
+boot_node = { path = "../boot_node" }
+clap = { workspace = true }
+clap_utils = { workspace = true }
+database_manager = { path = "../database_manager" }
+directory = { workspace = true }
+environment = { workspace = true }
+eth2_network_config = { workspace = true }
+ethereum_hashing = { workspace = true }
+futures = { workspace = true }
+lighthouse_version = { workspace = true }
+logging = { workspace = true }
+malloc_utils = { workspace = true }
 metrics = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
-task_executor = { workspace = true }
-malloc_utils = { workspace = true }
-directory = { workspace = true }
-unused_port = { workspace = true }
-database_manager = { path = "../database_manager" }
 slasher = { workspace = true }
+slog = { workspace = true }
+task_executor = { workspace = true }
+types = { workspace = true }
+unused_port = { workspace = true }
+validator_client = { workspace = true }
 validator_manager = { path = "../validator_manager" }
-logging = { workspace = true }
 
 [dev-dependencies]
-tempfile = { workspace = true }
-validator_dir = { workspace = true }
-slashing_protection = { workspace = true }
-lighthouse_network = { workspace = true }
-sensitive_url = { workspace = true }
+beacon_node_fallback = { workspace = true }
+beacon_processor = { workspace = true }
 eth1 = { workspace = true }
 eth2 = { workspace = true }
-beacon_processor = { workspace = true }
-beacon_node_fallback = { workspace = true }
 initialized_validators = { workspace = true }
+lighthouse_network = { workspace = true }
+sensitive_url = { workspace = true }
+slashing_protection = { workspace = true }
+tempfile = { workspace = true }
+validator_dir = { workspace = true }
 zeroize = { workspace = true }
 
-
 [[test]]
 name = "lighthouse_tests"
 path = "tests/main.rs"

lighthouse/environment/Cargo.toml

@@ -6,19 +6,19 @@ edition = { workspace = true }
 
 [dependencies]
 async-channel = { workspace = true }
-tokio = { workspace = true }
-slog = { workspace = true }
-sloggers = { workspace = true }
-types = { workspace = true }
 eth2_config = { workspace = true }
-task_executor = { workspace = true }
 eth2_network_config = { workspace = true }
-logging = { workspace = true }
-slog-term = { workspace = true }
-slog-async = { workspace = true }
 futures = { workspace = true }
-slog-json = "2.3.0"
+logging = { workspace = true }
 serde = { workspace = true }
+slog = { workspace = true }
+slog-async = { workspace = true }
+slog-json = "2.3.0"
+slog-term = { workspace = true }
+sloggers = { workspace = true }
+task_executor = { workspace = true }
+tokio = { workspace = true }
+types = { workspace = true }
 
 [target.'cfg(not(target_family = "unix"))'.dependencies]
 ctrlc = { version = "3.1.6", features = ["termination"] }

slasher/Cargo.toml

@@ -17,31 +17,31 @@ byteorder = { workspace = true }
 derivative = { workspace = true }
 ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
-flate2 = { version = "1.0.14", features = ["zlib"], default-features = false }
-metrics = { workspace = true }
 filesystem = { workspace = true }
+flate2 = { version = "1.0.14", features = ["zlib"], default-features = false }
+lmdb-rkv = { git = "https://github.com/sigp/lmdb-rs", rev = "f33845c6469b94265319aac0ed5085597862c27e", optional = true }
+lmdb-rkv-sys = { git = "https://github.com/sigp/lmdb-rs", rev = "f33845c6469b94265319aac0ed5085597862c27e", optional = true }
 lru = { workspace = true }
-parking_lot = { workspace = true }
-rand = { workspace = true }
-safe_arith = { workspace = true }
-serde = { workspace = true }
-slog = { workspace = true }
-tree_hash = { workspace = true }
-tree_hash_derive = { workspace = true }
-types = { workspace = true }
-strum = { workspace = true }
-ssz_types = { workspace = true }
 
 # MDBX is pinned at the last version with Windows and macOS support.
 mdbx = { package = "libmdbx", git = "https://github.com/sigp/libmdbx-rs", rev = "e6ff4b9377c1619bcf0bfdf52bee5a980a432a1a", optional = true }
-lmdb-rkv = { git = "https://github.com/sigp/lmdb-rs", rev = "f33845c6469b94265319aac0ed5085597862c27e", optional = true }
-lmdb-rkv-sys = { git = "https://github.com/sigp/lmdb-rs", rev = "f33845c6469b94265319aac0ed5085597862c27e", optional = true }
+metrics = { workspace = true }
+parking_lot = { workspace = true }
+rand = { workspace = true }
 
 redb = { version = "2.1.4", optional = true }
+safe_arith = { workspace = true }
+serde = { workspace = true }
+slog = { workspace = true }
+ssz_types = { workspace = true }
+strum = { workspace = true }
+tree_hash = { workspace = true }
+tree_hash_derive = { workspace = true }
+types = { workspace = true }
 
 [dev-dependencies]
+logging = { workspace = true }
 maplit = { workspace = true }
 rayon = { workspace = true }
 tempfile = { workspace = true }
-logging = { workspace = true }
 

testing/ef_tests/Cargo.toml

@@ -12,28 +12,28 @@ portable = ["beacon_chain/portable"]
 
 [dependencies]
 alloy-primitives = { workspace = true }
+beacon_chain = { workspace = true }
 bls = { workspace = true }
 compare_fields = { workspace = true }
 compare_fields_derive = { workspace = true }
 derivative = { workspace = true }
+eth2_network_config = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+execution_layer = { workspace = true }
+fork_choice = { workspace = true }
+fs2 = { workspace = true }
 hex = { workspace = true }
 kzg = { workspace = true }
+logging = { workspace = true }
 rayon = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_repr = { workspace = true }
 serde_yaml = { workspace = true }
-eth2_network_config = { workspace = true }
-ethereum_ssz = { workspace = true }
-ethereum_ssz_derive = { workspace = true }
-tree_hash = { workspace = true }
-tree_hash_derive = { workspace = true }
+snap = { workspace = true }
 state_processing = { workspace = true }
 swap_or_not_shuffle = { workspace = true }
+tree_hash = { workspace = true }
+tree_hash_derive = { workspace = true }
 types = { workspace = true }
-snap = { workspace = true }
-fs2 = { workspace = true }
-beacon_chain = { workspace = true }
-fork_choice = { workspace = true }
-execution_layer = { workspace = true }
-logging = { workspace = true }

testing/eth1_test_rig/Cargo.toml

@@ -5,12 +5,12 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
 
 [dependencies]
-tokio = { workspace = true }
+deposit_contract = { workspace = true }
+ethers-contract = "1.0.2"
 ethers-core = { workspace = true }
 ethers-providers = { workspace = true }
-ethers-contract = "1.0.2"
-types = { workspace = true }
-serde_json = { workspace = true }
-deposit_contract = { workspace = true }
-unused_port = { workspace = true }
 hex = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+types = { workspace = true }
+unused_port = { workspace = true }

testing/execution_engine_integration/Cargo.toml

@@ -5,22 +5,22 @@ edition = { workspace = true }
 
 [dependencies]
 async-channel = { workspace = true }
-tempfile = { workspace = true }
+deposit_contract = { workspace = true }
+ethers-core = { workspace = true }
+ethers-providers = { workspace = true }
+execution_layer = { workspace = true }
+fork_choice = { workspace = true }
+futures = { workspace = true }
+hex = { workspace = true }
+logging = { workspace = true }
+reqwest = { workspace = true }
+sensitive_url = { workspace = true }
 serde_json = { workspace = true }
 task_executor = { workspace = true }
+tempfile = { workspace = true }
 tokio = { workspace = true }
-futures = { workspace = true }
-execution_layer = { workspace = true }
-sensitive_url = { workspace = true }
 types = { workspace = true }
 unused_port = { workspace = true }
-ethers-providers = { workspace = true }
-ethers-core = { workspace = true }
-deposit_contract = { workspace = true }
-reqwest = { workspace = true }
-hex = { workspace = true }
-fork_choice = { workspace = true }
-logging = { workspace = true }
 
 [features]
 portable = ["types/portable"]

testing/node_test_rig/Cargo.toml

@@ -5,14 +5,14 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
 
 [dependencies]
-environment = { workspace = true }
 beacon_node = { workspace = true }
-types = { workspace = true }
-tempfile = { workspace = true }
-eth2 = { workspace = true }
-validator_client = { workspace = true }
 beacon_node_fallback = { workspace = true }
-validator_dir = { workspace = true, features = ["insecure_keys"] }
-sensitive_url = { workspace = true }
+environment = { workspace = true }
+eth2 = { workspace = true }
 execution_layer = { workspace = true }
+sensitive_url = { workspace = true }
+tempfile = { workspace = true }
 tokio = { workspace = true }
+types = { workspace = true }
+validator_client = { workspace = true }
+validator_dir = { workspace = true, features = ["insecure_keys"] }

testing/simulator/Cargo.toml

@@ -3,20 +3,19 @@ name = "simulator"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-node_test_rig = { path = "../node_test_rig" }
-execution_layer = { workspace = true }
-types = { workspace = true }
-parking_lot = { workspace = true }
-futures = { workspace = true }
-tokio = { workspace = true }
-env_logger = { workspace = true }
 clap = { workspace = true }
+env_logger = { workspace = true }
+eth2_network_config = { workspace = true }
+execution_layer = { workspace = true }
+futures = { workspace = true }
+kzg = { workspace = true }
+node_test_rig = { path = "../node_test_rig" }
+parking_lot = { workspace = true }
 rayon = { workspace = true }
 sensitive_url  = { path = "../../common/sensitive_url" }
-eth2_network_config = { workspace = true }
 serde_json = { workspace = true }
-kzg = { workspace = true }
+tokio = { workspace = true }
+types = { workspace = true }

testing/state_transition_vectors/Cargo.toml

@@ -3,15 +3,14 @@ name = "state_transition_vectors"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-state_processing = { workspace = true }
-types = { workspace = true }
-ethereum_ssz = { workspace = true }
 beacon_chain = { workspace = true }
+ethereum_ssz = { workspace = true }
+state_processing = { workspace = true }
 tokio = { workspace = true }
+types = { workspace = true }
 
 [features]
 portable = ["beacon_chain/portable"]

testing/test-test_logger/Cargo.toml

@@ -2,7 +2,6 @@
 name = "test-test_logger"
 version = "0.1.0"
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

testing/web3signer_tests/Cargo.toml

@@ -2,31 +2,30 @@
 name = "web3signer_tests"
 version = "0.1.0"
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 
 [dev-dependencies]
+account_utils = { workspace = true }
 async-channel = { workspace = true }
+environment = { workspace = true }
 eth2_keystore = { workspace = true }
-types = { workspace = true }
+eth2_network_config = { workspace = true }
+futures = { workspace = true }
+initialized_validators = { workspace = true }
+logging = { workspace = true }
+parking_lot = { workspace = true }
+reqwest = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+slashing_protection = { workspace = true }
+slot_clock = { workspace = true }
+task_executor = { workspace = true }
 tempfile = { workspace = true }
 tokio = { workspace = true }
-reqwest = { workspace = true }
+types = { workspace = true }
 url = { workspace = true }
-slot_clock = { workspace = true }
-futures = { workspace = true }
-task_executor = { workspace = true }
-environment = { workspace = true }
-account_utils = { workspace = true }
-serde = { workspace = true }
-serde_yaml = { workspace = true }
-eth2_network_config = { workspace = true }
-serde_json = { workspace = true }
-zip = { workspace = true }
-parking_lot = { workspace = true }
-logging = { workspace = true }
-initialized_validators = { workspace = true }
-slashing_protection = { workspace = true }
 validator_store = { workspace = true }
+zip = { workspace = true }

validator_client/Cargo.toml

@@ -17,10 +17,11 @@ beacon_node_fallback = { workspace = true }
 clap = { workspace = true }
 clap_utils = { workspace = true }
 directory = { workspace = true }
-doppelganger_service = { workspace = true }
 dirs = { workspace = true }
-eth2 = { workspace = true }
+doppelganger_service = { workspace = true }
 environment = { workspace = true }
+eth2 = { workspace = true }
+fdlimit = "0.3.0"
 graffiti_file = { workspace = true }
 hyper = { workspace = true }
 initialized_validators = { workspace = true }
@@ -29,15 +30,14 @@ monitoring_api = { workspace = true }
 parking_lot = { workspace = true }
 reqwest = { workspace = true }
 sensitive_url = { workspace = true }
-slashing_protection = { workspace = true }
 serde = { workspace = true }
+slashing_protection = { workspace = true }
 slog = { workspace = true }
 slot_clock = { workspace = true }
+tokio = { workspace = true }
 types  = { workspace = true }
 validator_http_api = { workspace = true }
 validator_http_metrics = { workspace = true }
 validator_metrics = { workspace = true }
 validator_services = { workspace = true }
 validator_store = { workspace = true }
-tokio = { workspace = true }
-fdlimit = "0.3.0"

validator_client/graffiti_file/Cargo.toml

@@ -9,11 +9,11 @@ name = "graffiti_file"
 path = "src/lib.rs"
 
 [dependencies]
-serde = { workspace = true }
 bls = { workspace = true }
-types = { workspace = true }
+serde = { workspace = true }
 slog = { workspace = true }
+types = { workspace = true }
 
 [dev-dependencies]
-tempfile = { workspace = true }
 hex = { workspace = true }
+tempfile = { workspace = true }

validator_client/http_api/Cargo.toml

@@ -10,25 +10,25 @@ path = "src/lib.rs"
 
 [dependencies]
 account_utils = { workspace = true }
-bls = { workspace = true }
 beacon_node_fallback = { workspace = true }
+bls = { workspace = true }
 deposit_contract = { workspace = true }
 directory = { workspace = true }
-doppelganger_service = { workspace = true }
 dirs = { workspace = true }
-graffiti_file = { workspace = true }
+doppelganger_service = { workspace = true }
 eth2  = { workspace = true }
 eth2_keystore  = { workspace = true }
 ethereum_serde_utils = { workspace = true }
+filesystem = { workspace = true }
+graffiti_file = { workspace = true }
 initialized_validators = { workspace = true }
 lighthouse_version = { workspace = true }
 logging = { workspace = true }
 parking_lot = { workspace = true }
-filesystem = { workspace = true }
 rand = { workspace = true }
+sensitive_url = { workspace = true }
 serde = { workspace = true }
 signing_method = { workspace = true }
-sensitive_url = { workspace = true }
 slashing_protection = { workspace = true }
 slog =  { workspace = true }
 slot_clock =  { workspace = true }
@@ -39,15 +39,15 @@ tempfile =  { workspace = true }
 tokio =  { workspace = true }
 tokio-stream =  { workspace = true }
 types =  { workspace = true }
-validator_dir =  { workspace = true }
-validator_store =  { workspace = true }
-validator_services =  { workspace = true }
 url =  { workspace = true }
-warp_utils = { workspace = true }
+validator_dir =  { workspace = true }
+validator_services =  { workspace = true }
+validator_store =  { workspace = true }
 warp = { workspace = true }
+warp_utils = { workspace = true }
 zeroize = { workspace = true }
 
 [dev-dependencies]
-itertools = { workspace = true }
 futures = { workspace = true }
+itertools = { workspace = true }
 rand = { workspace = true, features = ["small_rng"] }

validator_client/http_metrics/Cargo.toml

@@ -5,16 +5,16 @@ edition = { workspace = true }
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
 
 [dependencies]
+lighthouse_version = { workspace = true }
 malloc_utils = { workspace = true }
-slot_clock = { workspace = true }
 metrics = { workspace = true }
 parking_lot = { workspace = true }
 serde = { workspace = true }
 slog = { workspace = true }
-warp_utils = { workspace = true }
-warp = { workspace = true }
-lighthouse_version = { workspace = true }
+slot_clock = { workspace = true }
+types = { workspace = true }
+validator_metrics = { workspace = true }
 validator_services = { workspace = true }
 validator_store = { workspace = true }
-validator_metrics = { workspace = true }
-types = { workspace = true }
+warp = { workspace = true }
+warp_utils = { workspace = true }

validator_client/initialized_validators/Cargo.toml

@@ -5,23 +5,23 @@ edition = { workspace = true }
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
 
 [dependencies]
-signing_method = { workspace = true }
 account_utils = { workspace = true }
+bincode = { workspace = true }
+bls = { workspace = true }
 eth2_keystore = { workspace = true }
-metrics = { workspace = true }
+filesystem = { workspace = true }
 lockfile = { workspace = true }
+metrics = { workspace = true }
 parking_lot = { workspace = true }
+rand = { workspace = true }
 reqwest = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+signing_method = { workspace = true }
 slog = { workspace = true }
+tokio = { workspace = true }
 types = { workspace = true }
 url = { workspace = true }
 validator_dir = { workspace = true }
-rand = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-bls = { workspace = true }
-tokio = { workspace = true }
-bincode = { workspace = true }
-filesystem = { workspace = true }
 validator_metrics = { workspace = true }
 zeroize = { workspace = true }

validator_client/signing_method/Cargo.toml

@@ -6,12 +6,12 @@ authors = ["Sigma Prime <contact@sigmaprime.io>"]
 
 [dependencies]
 eth2_keystore = { workspace = true }
+ethereum_serde_utils = { workspace = true }
 lockfile = { workspace = true }
 parking_lot = { workspace = true }
 reqwest = { workspace = true }
+serde = { workspace = true }
 task_executor = { workspace = true }
 types = { workspace = true }
 url = { workspace = true }
 validator_metrics = { workspace = true }
-serde = { workspace = true }
-ethereum_serde_utils = { workspace = true }

validator_client/slashing_protection/Cargo.toml

@@ -10,16 +10,16 @@ name = "slashing_protection_tests"
 path = "tests/main.rs"
 
 [dependencies]
-tempfile = { workspace = true }
-types = { workspace = true }
-rusqlite = { workspace = true }
-r2d2 = { workspace = true }
-r2d2_sqlite = "0.21.0"
-serde = { workspace = true }
-serde_json = { workspace = true }
+arbitrary = { workspace = true, features = ["derive"] }
 ethereum_serde_utils = { workspace = true }
 filesystem = { workspace = true }
-arbitrary = { workspace = true, features = ["derive"] }
+r2d2 = { workspace = true }
+r2d2_sqlite = "0.21.0"
+rusqlite = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tempfile = { workspace = true }
+types = { workspace = true }
 
 [dev-dependencies]
 rayon = { workspace = true }

validator_client/validator_services/Cargo.toml

@@ -6,18 +6,18 @@ authors = ["Sigma Prime <contact@sigmaprime.io>"]
 
 [dependencies]
 beacon_node_fallback = { workspace = true }
-validator_metrics = { workspace = true }
-validator_store = { workspace = true }
-graffiti_file = { workspace = true }
+bls =  { workspace = true }
 doppelganger_service = { workspace = true }
 environment = { workspace = true }
 eth2 = { workspace = true }
 futures = { workspace = true }
+graffiti_file = { workspace = true }
 parking_lot = { workspace = true }
 safe_arith = { workspace = true }
 slog =  { workspace = true }
 slot_clock =  { workspace = true }
 tokio =  { workspace = true }
-types =  { workspace = true }
 tree_hash =  { workspace = true }
-bls =  { workspace = true }
+types =  { workspace = true }
+validator_metrics = { workspace = true }
+validator_store = { workspace = true }

validator_manager/Cargo.toml

@@ -2,28 +2,27 @@
 name = "validator_manager"
 version = "0.1.0"
 edition = { workspace = true }
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { workspace = true }
-types = { workspace = true }
-environment = { workspace = true }
-eth2_network_config = { workspace = true }
-clap_utils = { workspace = true }
-eth2_wallet = { workspace = true }
 account_utils = { workspace = true }
+clap = { workspace = true }
+clap_utils = { workspace = true }
+derivative = { workspace = true }
+environment = { workspace = true }
+eth2 = { workspace = true }
+eth2_network_config = { workspace = true }
+eth2_wallet = { workspace = true }
+ethereum_serde_utils = { workspace = true }
+hex = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-ethereum_serde_utils = { workspace = true }
-tree_hash = { workspace = true }
-eth2 = { workspace = true }
-hex = { workspace = true }
 tokio = { workspace = true }
-derivative = { workspace = true }
+tree_hash = { workspace = true }
+types = { workspace = true }
 zeroize = { workspace = true }
 
 [dev-dependencies]
-tempfile = { workspace = true }
 regex = { workspace = true }
+tempfile = { workspace = true }
 validator_http_api = { workspace = true }

watch/Cargo.toml

@@ -10,37 +10,36 @@ path = "src/lib.rs"
 [[bin]]
 name = "watch"
 path = "src/main.rs"
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+axum = "0.7"
+beacon_node = { workspace = true }
+bls = { workspace = true }
 clap = { workspace = true }
 clap_utils = { workspace = true }
-log = { workspace = true }
-env_logger = { workspace = true }
-types = { workspace = true }
-eth2 = { workspace = true }
-beacon_node = { workspace = true }
-tokio = { workspace = true }
-axum = "0.7"
-hyper = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-reqwest = { workspace = true }
-url = { workspace = true }
-rand = { workspace = true }
 diesel = { version = "2.0.2", features = ["postgres", "r2d2"] }
 diesel_migrations = { version = "2.0.0", features = ["postgres"] }
-bls = { workspace = true }
+env_logger = { workspace = true }
+eth2 = { workspace = true }
+hyper = { workspace = true }
+log = { workspace = true }
 r2d2 = { workspace = true }
+rand = { workspace = true }
+reqwest = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 serde_yaml = { workspace = true }
+tokio = { workspace = true }
+types = { workspace = true }
+url = { workspace = true }
 
 [dev-dependencies]
-tokio-postgres = "0.7.5"
-http_api = { workspace = true }
 beacon_chain = { workspace = true }
-network = { workspace = true }
-testcontainers = "0.15"
-unused_port = { workspace = true }
-task_executor = { workspace = true }
+http_api = { workspace = true }
 logging = { workspace = true }
+network = { workspace = true }
+task_executor = { workspace = true }
+testcontainers = "0.15"
+tokio-postgres = "0.7.5"
+unused_port = { workspace = true }