Merge tag 'v4.5.0' into tree-states

v4.5.0

beacon_node/beacon_chain/Cargo.toml

@@ -2,7 +2,7 @@
 name = "beacon_chain"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>", "Age Manning <Age@AgeManning.com>"]
-edition = "2021"
+edition = { workspace = true }
 autotests = false # using a single test binary compiles faster
 
 [features]
@@ -12,61 +12,60 @@ participation_metrics = []  # Exposes validator participation metrics to Prometh
 fork_from_env = [] # Initialise the harness chain spec from the FORK_NAME env variable
 
 [dev-dependencies]
-maplit = "1.0.2"
-environment = { path = "../../lighthouse/environment" }
-serde_json = "1.0.58"
+maplit = { workspace = true }
+environment = { workspace = true }
+serde_json = { workspace = true }
 
 [dependencies]
-merkle_proof = { path = "../../consensus/merkle_proof" }
-store = { path = "../store" }
-parking_lot = "0.12.0"
-lazy_static = "1.4.0"
-smallvec = "1.6.1"
-lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
-operation_pool = { path = "../operation_pool" }
-rayon = "1.4.1"
-serde = "1.0.116"
-serde_derive = "1.0.116"
-ethereum_serde_utils = "0.5.0"
-slog = { version = "2.5.2", features = ["max_level_trace"] }
-sloggers = { version = "2.1.1", features = ["json"] }
-slot_clock = { path = "../../common/slot_clock" }
-ethereum_hashing = "1.0.0-beta.2"
-ethereum_ssz = "0.5.0"
-ssz_types = "0.5.3"
-ethereum_ssz_derive = "0.5.0"
-state_processing = { path = "../../consensus/state_processing" }
-tree_hash_derive = "0.5.0"
-tree_hash = "0.5.0"
-types = { path = "../../consensus/types" }
-tokio = "1.14.0"
-tokio-stream = "0.1.3"
-eth1 = { path = "../eth1" }
-futures = "0.3.7"
-genesis = { path = "../genesis" }
-int_to_bytes = { path = "../../consensus/int_to_bytes" }
-rand = "0.8.5"
-proto_array = { path = "../../consensus/proto_array" }
-lru = "0.7.1"
-tempfile = "3.1.0"
-bitvec = "0.20.4"
-bls = { path = "../../crypto/bls" }
-safe_arith = { path = "../../consensus/safe_arith" }
-fork_choice = { path = "../../consensus/fork_choice" }
-task_executor = { path = "../../common/task_executor" }
-derivative = "2.1.1"
-itertools = "0.10.0"
-slasher = { path = "../../slasher" }
-eth2 = { path = "../../common/eth2" }
-strum = { version = "0.24.0", features = ["derive"] }
-logging = { path = "../../common/logging" }
-execution_layer = { path = "../execution_layer" }
-sensitive_url = { path = "../../common/sensitive_url" }
-superstruct = "0.7.0"
-hex = "0.4.2"
-exit-future = "0.2.0"
-oneshot_broadcast = { path = "../../common/oneshot_broadcast" }
-crossbeam-channel = "0.5.5"
+bitvec = { workspace = true }
+bls = { workspace = true }
+crossbeam-channel = { workspace = true }
+derivative = { workspace = true }
+eth1 = { workspace = true }
+eth2 = { workspace = true }
+ethereum_hashing = { workspace = true }
+ethereum_serde_utils = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+execution_layer = { workspace = true }
+exit-future = { workspace = true }
+fork_choice = { workspace = true }
+futures = { workspace = true }
+genesis = { workspace = true }
+hex = { workspace = true }
+int_to_bytes = { workspace = true }
+itertools = { workspace = true }
+lazy_static = { workspace = true }
+lighthouse_metrics = { workspace = true }
+logging = { workspace = true }
+lru = { workspace = true }
+merkle_proof = { workspace = true }
+oneshot_broadcast = { path = "../../common/oneshot_broadcast/" }
+operation_pool = { workspace = true }
+parking_lot = { workspace = true }
+proto_array = { workspace = true }
+rand = { workspace = true }
+rayon = { workspace = true }
+safe_arith = { workspace = true }
+sensitive_url = { workspace = true }
+serde = { workspace = true }
+slasher = { workspace = true }
+slog = { workspace = true }
+sloggers = { workspace = true }
+slot_clock = { workspace = true }
+smallvec = { workspace = true }
+ssz_types = { workspace = true }
+state_processing = { workspace = true }
+store = { 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 }
+types = { workspace = true }
 
 [[test]]
 name = "beacon_chain_tests"

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::{
     AbstractExecPayload, BeaconState, EthSpec, FullPayload, Hash256, SignedBeaconBlock,

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};