Merge tag 'v4.5.0' into tree-states

v4.5.0

consensus/cached_tree_hash/Cargo.toml

@@ -2,20 +2,20 @@
 name = "cached_tree_hash"
 version = "0.1.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-ethereum-types = "0.14.1"
-ssz_types = "0.5.3"
-ethereum_hashing = "1.0.0-beta.2"
-ethereum_ssz_derive = "0.5.0"
-ethereum_ssz = "0.5.0"
-tree_hash = "0.5.0"
-smallvec = "1.6.1"
+ethereum-types = { workspace = true }
+ssz_types = { workspace = true }
+ethereum_hashing = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+ethereum_ssz = { workspace = true }
+tree_hash = { workspace = true }
+smallvec = { workspace = true }
 
 [dev-dependencies]
-quickcheck = "0.9.2"
-quickcheck_macros = "0.9.1"
+quickcheck = { workspace = true }
+quickcheck_macros = { workspace = true }
 
 [features]
 arbitrary = ["ethereum-types/arbitrary"]

consensus/fork_choice/Cargo.toml

@@ -2,19 +2,19 @@
 name = "fork_choice"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-types = { path = "../types" }
-state_processing = { path = "../state_processing" }
-proto_array = { path = "../proto_array" }
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
-slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] }
+types = { workspace = true }
+state_processing = { workspace = true }
+proto_array = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+slog = { workspace = true }
 
 [dev-dependencies]
-beacon_chain = { path = "../../beacon_node/beacon_chain" }
-store = { path = "../../beacon_node/store" }
-tokio = { version = "1.14.0", features = ["rt-multi-thread"] }
+beacon_chain = { workspace = true }
+store = { workspace = true }
+tokio = { workspace = true }

consensus/int_to_bytes/Cargo.toml

@@ -2,11 +2,11 @@
 name = "int_to_bytes"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-bytes = "1.0.1"
+bytes = { workspace = true }
 
 [dev-dependencies]
 yaml-rust = "0.4.4"
-hex = "0.4.2"
+hex = { workspace = true }

consensus/merkle_proof/Cargo.toml

@@ -2,17 +2,17 @@
 name = "merkle_proof"
 version = "0.2.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-ethereum-types = "0.14.1"
-ethereum_hashing = "1.0.0-beta.2"
-lazy_static = "1.4.0"
-safe_arith = { path = "../safe_arith" }
+ethereum-types = { workspace = true }
+ethereum_hashing = { workspace = true }
+lazy_static = { workspace = true }
+safe_arith = { workspace = true }
 
 [dev-dependencies]
-quickcheck = "0.9.2"
-quickcheck_macros = "0.9.1"
+quickcheck = { workspace = true }
+quickcheck_macros = { workspace = true }
 
 [features]
 arbitrary = ["ethereum-types/arbitrary"]

consensus/proto_array/Cargo.toml

@@ -2,18 +2,18 @@
 name = "proto_array"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [[bin]]
 name = "proto_array"
 path = "src/bin.rs"
 
 [dependencies]
-types = { path = "../types" }
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
-serde = "1.0.116"
+types = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-serde_yaml = "0.8.13"
-safe_arith = { path = "../safe_arith" }
-superstruct = "0.5.0"
+serde_yaml = { workspace = true }
+safe_arith = { workspace = true }
+superstruct = { workspace = true }

consensus/safe_arith/Cargo.toml

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

consensus/state_processing/Cargo.toml

@@ -2,44 +2,40 @@
 name = "state_processing"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>", "Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dev-dependencies]
-env_logger = "0.9.0"
-beacon_chain = { path = "../../beacon_node/beacon_chain" }
-tokio = { version = "1.14.0", features = ["rt-multi-thread"] }
+env_logger = { workspace = true }
+beacon_chain = { workspace = true }
+tokio = { workspace = true }
 
 [dependencies]
-bls = { path = "../../crypto/bls" }
+bls = { workspace = true }
 integer-sqrt = "0.1.5"
-itertools = "0.10.0"
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
-ssz_types = "0.5.3"
-merkle_proof = { path = "../merkle_proof" }
-safe_arith = { path = "../safe_arith" }
-tree_hash = "0.5.0"
-types = { path = "../types", default-features = false }
-rayon = "1.4.1"
-ethereum_hashing = "1.0.0-beta.2"
-int_to_bytes = { path = "../int_to_bytes" }
-smallvec = "1.6.1"
-arbitrary = { version = "1.0", features = ["derive"], optional = true }
-lighthouse_metrics = { path = "../../common/lighthouse_metrics", optional = true }
-lazy_static = { version = "1.4.0", optional = true }
-rustc-hash = "1.1.0"
+itertools = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+ssz_types = { workspace = true }
+merkle_proof = { workspace = true }
+safe_arith = { workspace = true }
+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 }
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
+derivative = { workspace = true }
 vec_map = "0.8.2"
-derivative = "2.1.1"
 
 [features]
-default = ["legacy-arith", "metrics"]
+default = ["legacy-arith"]
 fake_crypto = ["bls/fake_crypto"]
 legacy-arith = ["types/legacy-arith"]
-metrics = ["lighthouse_metrics", "lazy_static"]
 arbitrary-fuzz = [
-  "arbitrary",
   "types/arbitrary-fuzz",
-  "bls/arbitrary",
   "merkle_proof/arbitrary",
   "ethereum_ssz/arbitrary",
   "ssz_types/arbitrary",

consensus/state_processing/src/metrics.rs

@@ -1,5 +1,3 @@
-#![cfg(feature = "metrics")]
-
 use lazy_static::lazy_static;
 pub use lighthouse_metrics::*;
 

consensus/state_processing/src/per_epoch_processing/epoch_processing_summary.rs

@@ -87,7 +87,6 @@ impl<T: EthSpec> ParticipationEpochSummary<T> {
 
 impl<T: EthSpec> EpochProcessingSummary<T> {
     /// Updates some Prometheus metrics with some values in `self`.
-    #[cfg(feature = "metrics")]
     pub fn observe_metrics(&self) -> Result<(), BeaconStateError> {
         metrics::set_gauge(
             &metrics::PARTICIPATION_PREV_EPOCH_HEAD_ATTESTING_GWEI_TOTAL,

consensus/swap_or_not_shuffle/Cargo.toml

@@ -2,18 +2,18 @@
 name = "swap_or_not_shuffle"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [[bench]]
 name = "benches"
 harness = false
 
 [dev-dependencies]
-criterion = "0.3.3"
+criterion = { workspace = true }
 
 [dependencies]
-ethereum_hashing = "1.0.0-beta.2"
-ethereum-types = "0.14.1"
+ethereum_hashing = { workspace = true }
+ethereum-types = { workspace = true }
 
 [features]
 arbitrary = ["ethereum-types/arbitrary"]

consensus/types/Cargo.toml

@@ -2,73 +2,72 @@
 name = "types"
 version = "0.2.1"
 authors = ["Paul Hauner <paul@paulhauner.com>", "Age Manning <Age@AgeManning.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [[bench]]
 name = "benches"
 harness = false
 
 [dependencies]
-merkle_proof = { path = "../../consensus/merkle_proof" }
-bls = { path = "../../crypto/bls", features = ["arbitrary"] }
-compare_fields = { path = "../../common/compare_fields" }
-compare_fields_derive = { path = "../../common/compare_fields_derive" }
+merkle_proof = { workspace = true }
+bls = { workspace = true, features = ["arbitrary"] }
+compare_fields = { workspace = true }
+compare_fields_derive = { workspace = true }
 eth2_interop_keypairs = { path = "../../common/eth2_interop_keypairs" }
-ethereum-types = { version = "0.14.1", features = ["arbitrary"] }
-ethereum_hashing = "1.0.0-beta.2"
-hex = "0.4.2"
-int_to_bytes = { path = "../int_to_bytes" }
-log = "0.4.11"
-rayon = "1.4.1"
-rand = "0.8.5"
-safe_arith = { path = "../safe_arith" }
-serde = {version = "1.0.116" , features = ["rc"] }
+ethereum-types = { workspace = true, features = ["arbitrary"] }
+ethereum_hashing = { workspace = true }
+hex = { workspace = true }
+int_to_bytes = { workspace = true }
+log = { workspace = true }
+rayon = { workspace = true }
+rand = { workspace = true }
+safe_arith = { workspace = true }
+serde = { workspace = true, features = ["rc"] }
 serde_derive = "1.0.116"
-slog = "2.5.2"
-ethereum_ssz = { version = "0.5.0", features = ["arbitrary"] }
-ethereum_ssz_derive = "0.5.0"
-ssz_types = { version = "0.5.3", features = ["arbitrary"] }
-swap_or_not_shuffle = { path = "../swap_or_not_shuffle", features = ["arbitrary"] }
+slog = { workspace = true }
+ethereum_ssz = { workspace = true, features = ["arbitrary"] }
+ethereum_ssz_derive = { workspace = true }
+ssz_types = { workspace = true, features = ["arbitrary"] }
+swap_or_not_shuffle = { workspace = true, features = ["arbitrary"] }
 test_random_derive = { path = "../../common/test_random_derive" }
-tree_hash = { version = "0.5.0", features = ["arbitrary"] }
-tree_hash_derive = "0.5.0"
+tree_hash = { workspace = true, features = ["arbitrary"] }
+tree_hash_derive = { workspace = true }
 rand_xorshift = "0.3.0"
-cached_tree_hash = { path = "../cached_tree_hash" }
-serde_yaml = "0.8.13"
-tempfile = "3.1.0"
-derivative = "2.1.1"
-rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
+cached_tree_hash = { workspace = true }
+serde_yaml = { workspace = true }
+tempfile = { workspace = true }
+derivative = { workspace = true }
+rusqlite = { workspace = true }
 # The arbitrary dependency is enabled by default since Capella to avoid complexity introduced by
 # `AbstractExecPayload`
-arbitrary = { version = "1.0", features = ["derive"] }
-ethereum_serde_utils = "0.5.0"
-regex = "1.5.5"
-lazy_static = "1.4.0"
-parking_lot = "0.12.0"
-itertools = "0.10.0"
-superstruct = "0.7.0"
-metastruct = "0.1.1"
-serde_json = "1.0.74"
-smallvec = "1.8.0"
-milhouse = { git = "https://github.com/sigp/milhouse", branch = "main" }
-rpds = "0.11.0"
+arbitrary = { workspace = true, features = ["derive"] }
+ethereum_serde_utils = { workspace = true }
+regex = { workspace = true }
+lazy_static = { workspace = true }
+parking_lot = { workspace = true }
+itertools = { workspace = true }
+superstruct = { workspace = true }
+metastruct = "0.1.0"
+serde_json = { workspace = true }
+smallvec = { workspace = true }
 serde_with = "1.13.0"
-maplit = "1.0.2"
-strum = { version = "0.24.0", features = ["derive"] }
+maplit = { workspace = true }
+strum = { workspace = true }
+milhouse = { workspace = true }
+rpds = "0.11.0"
 
 [dev-dependencies]
-criterion = "0.3.3"
-beacon_chain = { path = "../../beacon_node/beacon_chain" }
-eth2_interop_keypairs = { path = "../../common/eth2_interop_keypairs" }
-state_processing = { path = "../state_processing" }
-tokio = "1.14.0"
-paste = "1.0.14"
+criterion = { workspace = true }
+beacon_chain = { workspace = true }
+state_processing = { workspace = true }
+tokio = { workspace = true }
+paste = { workspace = true }
 
 [features]
 default = ["sqlite", "legacy-arith"]
 # Allow saturating arithmetic on slots and epochs. Enabled by default, but deprecated.
 legacy-arith = []
-sqlite = ["rusqlite"]
+sqlite = []
 # The `arbitrary-fuzz` feature is a no-op provided for backwards compatibility.
 # For simplicity `Arbitrary` is now derived regardless of the feature's presence.
 arbitrary-fuzz = []