Move dependencies to workspace (sigp#4650)

Synchronize dependencies and edition on the workspace `Cargo.toml` with rust-lang/cargo#8415 merged it's now possible to synchronize details on the workspace `Cargo.toml` like the metadata and dependencies. By only having dependencies that are shared between multiple crates aligned on the workspace `Cargo.toml` it's easier to not miss duplicate versions of the same dependency and therefore ease on the compile times. this PR also removes the no longer required direct dependency of the `serde_derive` crate. should be reviewed after sigp#4639 get's merged. closes sigp#4651 Co-authored-by: Michael Sproul <[email protected]> Co-authored-by: Michael Sproul <[email protected]>
Woodpile37 · Jan 6, 2024 · b349175 · b349175
1 parent 798d1d9
commit b349175
Show file tree

Hide file tree

Showing 84 changed files with 1,027 additions and 1,027 deletions.
diff --git a/Makefile b/Makefile
@@ -199,7 +199,7 @@ arbitrary-fuzz:
 # Runs cargo audit (Audit Cargo.lock files for crates with security vulnerabilities reported to the RustSec Advisory Database)
 audit:
 	cargo install --force cargo-audit
-	cargo audit --ignore RUSTSEC-2023-0052
+	cargo audit
 
 # Runs `cargo vendor` to make sure dependencies can be vendored for packaging, reproducibility and archival purpose.
 vendor:

diff --git a/account_manager/Cargo.toml b/account_manager/Cargo.toml
@@ -5,31 +5,31 @@ authors = [
     "Paul Hauner <[email protected]>",
     "Luke Anderson <[email protected]>",
 ]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-bls = { path = "../crypto/bls" }
-clap = "2.33.3"
-types = { path = "../consensus/types" }
-environment = { path = "../lighthouse/environment" }
-eth2_network_config = { path = "../common/eth2_network_config" }
-clap_utils = { path = "../common/clap_utils" }
-directory = { path = "../common/directory" }
-eth2_wallet = { path = "../crypto/eth2_wallet" }
+bls = { workspace = true }
+clap = { workspace = true }
+types = { workspace = true }
+environment = { workspace = true }
+eth2_network_config = { workspace = true }
+clap_utils = { workspace = true }
+directory = { workspace = true }
+eth2_wallet = { workspace = true }
 eth2_wallet_manager = { path = "../common/eth2_wallet_manager" }
-validator_dir = { path = "../common/validator_dir" }
-tokio = { version = "1.14.0", features = ["full"] }
-eth2_keystore = { path = "../crypto/eth2_keystore" }
-account_utils = { path = "../common/account_utils" }
-slashing_protection = { path = "../validator_client/slashing_protection" }
-eth2 = { path = "../common/eth2" }
-safe_arith = { path = "../consensus/safe_arith" }
-slot_clock = { path = "../common/slot_clock" }
-filesystem = { path = "../common/filesystem" }
-sensitive_url = { path = "../common/sensitive_url" }
-serde = { version = "1.0.116", features = ["derive"] }
-serde_json = "1.0.58"
-slog = { version = "2.5.2" }
+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 }
+sensitive_url = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+slog = { workspace = true }
 
 [dev-dependencies]
-tempfile = "3.1.0"
+tempfile = { workspace = true }
diff --git a/beacon_node/beacon_chain/src/beacon_snapshot.rs b/beacon_node/beacon_chain/src/beacon_snapshot.rs
@@ -1,4 +1,4 @@
-use serde_derive::Serialize;
+use serde::Serialize;
 use std::sync::Arc;
 use types::{
     beacon_state::CloneConfig, AbstractExecPayload, BeaconState, EthSpec, FullPayload, Hash256,

diff --git a/beacon_node/beacon_chain/src/chain_config.rs b/beacon_node/beacon_chain/src/chain_config.rs
@@ -1,5 +1,5 @@
 pub use proto_array::{DisallowedReOrgOffsets, ReOrgThreshold};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::time::Duration;
 use types::{Checkpoint, Epoch, ProgressiveBalancesMode};
 

diff --git a/beacon_node/beacon_processor/Cargo.toml b/beacon_node/beacon_processor/Cargo.toml
@@ -1,26 +1,26 @@
 [package]
 name = "beacon_processor"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-slog = { version = "2.5.2", features = ["max_level_trace"] }
-itertools = "0.10.0"
-logging = { path = "../../common/logging" }
-tokio = { version = "1.14.0", features = ["full"] }
-tokio-util = { version = "0.6.3", features = ["time"] }
-futures = "0.3.7"
-fnv = "1.0.7"
-strum = "0.24.0"
-task_executor = { path = "../../common/task_executor" }
-slot_clock = { path = "../../common/slot_clock" }
-lighthouse_network =  { path = "../lighthouse_network" }
-hex = "0.4.2"
-derivative = "2.2.0"
-types = { path = "../../consensus/types" }
-ethereum_ssz = "0.5.0"
-lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
-parking_lot = "0.12.0"
-num_cpus = "1.13.0"
-serde = { version = "1.0.116", features = ["derive"] }
+slog = { workspace = true }
+itertools = { workspace = true }
+logging = { workspace = true }
+tokio = { workspace = true }
+tokio-util = { workspace = true }
+futures = { workspace = true }
+fnv = { workspace = true }
+strum = { workspace = true }
+task_executor = { workspace = true }
+slot_clock = { workspace = true }
+lighthouse_network = { workspace = true }
+hex = { workspace = true }
+derivative = { workspace = true }
+types = { workspace = true }
+ethereum_ssz = { workspace = true }
+lazy_static = { workspace = true }
+lighthouse_metrics = { workspace = true }
+parking_lot = { workspace = true }
+num_cpus = { workspace = true }
+serde = { workspace = true }
diff --git a/beacon_node/builder_client/Cargo.toml b/beacon_node/builder_client/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "builder_client"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 authors = ["Sean Anderson <[email protected]>"]
 
 [dependencies]
-reqwest = { version = "0.11.0", features = ["json","stream"] }
-sensitive_url = { path = "../../common/sensitive_url" }
-eth2 = { path = "../../common/eth2" }
-serde = { version = "1.0.116", features = ["derive"] }
-serde_json = "1.0.58"
-lighthouse_version = { path = "../../common/lighthouse_version" }
+reqwest = { workspace = true }
+sensitive_url = { workspace = true }
+eth2 = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+lighthouse_version = { workspace = true }
diff --git a/beacon_node/client/Cargo.toml b/beacon_node/client/Cargo.toml
@@ -2,45 +2,46 @@
 name = "client"
 version = "0.2.0"
 authors = ["Sigma Prime <[email protected]>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dev-dependencies]
-serde_yaml = "0.8.13"
-operation_pool = { path = "../operation_pool" }
-tokio = "1.14.0"
+serde_yaml = { workspace = true }
+state_processing = { workspace = true }
+operation_pool = { workspace = true }
+tokio = { workspace = true }
 
 [dependencies]
-state_processing = { path = "../../consensus/state_processing" }
-beacon_chain = { path = "../beacon_chain" }
-store = { path = "../store" }
-network = { path = "../network" }
+beacon_chain = { workspace = true }
+store = { workspace = true }
+network = { workspace = true }
 timer = { path = "../timer" }
-lighthouse_network = { path = "../lighthouse_network" }
-logging = { path = "../../common/logging" }
-parking_lot = "0.12.0"
-types = { path = "../../consensus/types" }
-eth2_config = { path = "../../common/eth2_config" }
-slot_clock = { path = "../../common/slot_clock" }
-serde = "1.0.116"
+lighthouse_network = { workspace = true }
+logging = { workspace = true }
+parking_lot = { workspace = true }
+types = { workspace = true }
+eth2_config = { workspace = true }
+slot_clock = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-error-chain = "0.12.4"
-slog = { version = "2.5.2", features = ["max_level_trace"] }
-tokio = "1.14.0"
-dirs = "3.0.1"
-eth1 = { path = "../eth1" }
-eth2 = { path = "../../common/eth2" }
-sensitive_url = { path = "../../common/sensitive_url" }
-genesis = { path = "../genesis" }
-task_executor = { path = "../../common/task_executor" }
-environment = { path = "../../lighthouse/environment" }
-lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
+error-chain = { workspace = true }
+slog = { workspace = true }
+tokio = { workspace = true }
+dirs = { workspace = true }
+eth1 = { workspace = true }
+eth2 = { workspace = true }
+sensitive_url = { workspace = true }
+genesis = { workspace = true }
+task_executor = { workspace = true }
+environment = { workspace = true }
+lazy_static = { workspace = true }
+lighthouse_metrics = { workspace = true }
 time = "0.3.5"
-directory = {path = "../../common/directory"}
-http_api = { path = "../http_api" }
+directory = { workspace = true }
+http_api = { workspace = true }
 http_metrics = { path = "../http_metrics" }
-slasher = { path = "../../slasher" }
+slasher = { workspace = true }
 slasher_service = { path = "../../slasher/service" }
-monitoring_api = {path = "../../common/monitoring_api"}
-execution_layer = { path = "../execution_layer" }
-beacon_processor =  { path = "../beacon_processor" }
+monitoring_api = { workspace = true }
+execution_layer = { workspace = true }
+beacon_processor = { workspace = true }
+num_cpus = { workspace = true }
diff --git a/beacon_node/eth1/Cargo.toml b/beacon_node/eth1/Cargo.toml
@@ -2,33 +2,33 @@
 name = "eth1"
 version = "0.2.0"
 authors = ["Paul Hauner <[email protected]>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dev-dependencies]
-eth1_test_rig = { path = "../../testing/eth1_test_rig" }
-serde_yaml = "0.8.13"
-sloggers = { version = "2.1.1", features = ["json"] }
-environment = { path = "../../lighthouse/environment" }
+eth1_test_rig = { workspace = true }
+serde_yaml = { workspace = true }
+sloggers = { workspace = true }
+environment = { workspace = true }
 
 [dependencies]
-reqwest = { version = "0.11.0", features = ["native-tls-vendored"] }
-execution_layer = { path = "../execution_layer" }
-futures = "0.3.7"
-serde_json = "1.0.58"
-serde = { version = "1.0.116", features = ["derive"] }
-hex = "0.4.2"
-types = { path = "../../consensus/types"}
-merkle_proof = { path = "../../consensus/merkle_proof"}
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
-tree_hash = "0.5.0"
-parking_lot = "0.12.0"
-slog = "2.5.2"
-superstruct = "0.5.0"
-tokio = { version = "1.14.0", features = ["full"] }
-state_processing = { path = "../../consensus/state_processing" }
-lighthouse_metrics = { path = "../../common/lighthouse_metrics"}
-lazy_static = "1.4.0"
-task_executor = { path = "../../common/task_executor" }
-eth2 = { path = "../../common/eth2" }
-sensitive_url = { path = "../../common/sensitive_url" }
+reqwest = { workspace = true }
+execution_layer = { workspace = true }
+futures = { workspace = true }
+serde_json = { workspace = true }
+serde = { workspace = true }
+hex = { workspace = true }
+types = { workspace = true }
+merkle_proof = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+tree_hash = { workspace = true }
+parking_lot = { workspace = true }
+slog = { workspace = true }
+superstruct = { workspace = true }
+tokio = { workspace = true }
+state_processing = { workspace = true }
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
+task_executor = { workspace = true }
+eth2 = { workspace = true }
+sensitive_url = { workspace = true }
diff --git a/beacon_node/execution_layer/Cargo.toml b/beacon_node/execution_layer/Cargo.toml
@@ -1,56 +1,56 @@
 [package]
 name = "execution_layer"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-types = { path = "../../consensus/types"}
-tokio = { version = "1.10.0", features = ["full"] }
+types = { workspace = true }
+tokio = { workspace = true }
 async-trait = "0.1.51"
-slog = "2.5.2"
-futures = "0.3.7"
-sensitive_url = { path = "../../common/sensitive_url" }
-reqwest = { version = "0.11.0", features = ["json","stream"] }
-ethereum_serde_utils = "0.5.0"
-serde_json = "1.0.58"
-serde = { version = "1.0.116", features = ["derive"] }
-warp = { version = "0.3.2", features = ["tls"] }
+slog = { workspace = true }
+futures = { 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 = "8"
-environment = { path = "../../lighthouse/environment" }
-bytes = "1.1.0"
-task_executor = { path = "../../common/task_executor" }
-hex = "0.4.2"
-ethereum_ssz = "0.5.0"
-ssz_types = "0.5.3"
-eth2 = { path = "../../common/eth2" }
-state_processing = { path = "../../consensus/state_processing" }
-superstruct = "0.6.0"
-lru = "0.7.1"
-exit-future = "0.2.0"
-tree_hash = "0.5.0"
-tree_hash_derive = "0.5.0"
-parking_lot = "0.12.0"
-slot_clock = { path = "../../common/slot_clock" }
-tempfile = "3.1.0"
-rand = "0.8.5"
-zeroize = { version = "1.4.2", features = ["zeroize_derive"] }
-lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
-lazy_static = "1.4.0"
-ethers-core = "1.0.2"
+environment = { workspace = true }
+bytes = { workspace = true }
+task_executor = { workspace = true }
+hex = { workspace = true }
+ethereum_ssz = { workspace = true }
+ssz_types = { workspace = true }
+eth2 = { workspace = true }
+state_processing = { workspace = true }
+superstruct = { workspace = true }
+lru = { workspace = true }
+exit-future = { 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 }
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
+ethers-core = { workspace = true }
 builder_client = { path = "../builder_client" }
-fork_choice = { path = "../../consensus/fork_choice" }
+fork_choice = { workspace = true }
 mev-rs = { git = "https://github.com/ralexstokes/mev-rs", rev = "216657016d5c0889b505857c89ae42c7aa2764af" }
 axum = "0.6"
 hyper = "0.14"
 ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "e380108" }
 ssz_rs = "0.9.0"
-tokio-stream = { version = "0.1.9", features = [ "sync" ] }
-strum = "0.24.0"
+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 = { path = "../../common/pretty_reqwest_error" }
+pretty_reqwest_error = { workspace = true }
 arc-swap = "1.6.0"