Merge tag 'v4.5.0' into tree-states

v4.5.0

common/account_utils/Cargo.toml

@@ -2,22 +2,22 @@
 name = "account_utils"
 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]
-rand = "0.8.5"
-eth2_wallet = { path = "../../crypto/eth2_wallet" }
-eth2_keystore = { path = "../../crypto/eth2_keystore" }
-filesystem = { path = "../filesystem" }
-zeroize = { version = "1.4.2", features = ["zeroize_derive"] }
-serde = "1.0.116"
+rand = { workspace = true }
+eth2_wallet = { workspace = true }
+eth2_keystore = { workspace = true }
+filesystem = { workspace = true }
+zeroize = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-serde_yaml = "0.8.13"
-slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] }
-types = { path = "../../consensus/types" }
-validator_dir = { path = "../validator_dir" }
-regex = "1.5.5"
+serde_yaml = { workspace = true }
+slog = { workspace = true }
+types = { workspace = true }
+validator_dir = { workspace = true }
+regex = { workspace = true }
 rpassword = "5.0.0"
-directory = { path = "../directory" }
+directory = { workspace = true }

common/clap_utils/Cargo.toml

@@ -2,18 +2,18 @@
 name = "clap_utils"
 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]
-clap = "2.33.3"
-hex = "0.4.2"
-dirs = "3.0.1"
-eth2_network_config = { path = "../eth2_network_config" }
-ethereum_ssz = "0.5.0"
-ethereum-types = "0.14.1"
-serde = "1.0.116"
-serde_json = "1.0.59"
-serde_yaml = "0.8.13"
-types = { path = "../../consensus/types"}
+clap = { workspace = true }
+hex = { workspace = true }
+dirs = { workspace = true }
+eth2_network_config = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum-types = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+types = { workspace = true }

common/compare_fields/Cargo.toml

@@ -2,10 +2,10 @@
 name = "compare_fields"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dev-dependencies]
-compare_fields_derive = { path = "../compare_fields_derive" }
+compare_fields_derive = { workspace = true }
 
 [package.metadata.cargo-udeps.ignore]
 development = ["compare_fields_derive"] # used in doc-tests

common/compare_fields_derive/Cargo.toml

@@ -2,11 +2,11 @@
 name = "compare_fields_derive"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [lib]
 proc-macro = true
 
 [dependencies]
-syn = "1.0.42"
-quote = "1.0.7"
+syn = { workspace = true }
+quote = { workspace = true }

common/deposit_contract/Cargo.toml

@@ -2,18 +2,18 @@
 name = "deposit_contract"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 build = "build.rs"
 
 [build-dependencies]
-reqwest = { version = "0.11.0", features = ["blocking", "json", "native-tls-vendored"] }
-serde_json = "1.0.58"
-sha2 = "0.10"
-hex = "0.4.2"
+reqwest = { workspace = true }
+serde_json = { workspace = true }
+sha2 = { workspace = true }
+hex = { workspace = true }
 
 [dependencies]
-types = { path = "../../consensus/types"}
-ethereum_ssz = "0.5.0"
-tree_hash = "0.5.0"
+types = { workspace = true }
+ethereum_ssz = { workspace = true }
+tree_hash = { workspace = true }
 ethabi = "16.0.0"

common/directory/Cargo.toml

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

common/eth2/Cargo.toml

@@ -2,36 +2,36 @@
 name = "eth2"
 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]
-serde = { version = "1.0.116", features = ["derive"] }
-serde_json = "1.0.58"
-types = { path = "../../consensus/types" }
-reqwest = { version = "0.11.0", features = ["json", "stream"] }
-lighthouse_network = { path = "../../beacon_node/lighthouse_network" }
-proto_array = { path = "../../consensus/proto_array", optional = true }
-ethereum_serde_utils = "0.5.0"
-eth2_keystore = { path = "../../crypto/eth2_keystore" }
-libsecp256k1 = "0.7.0"
-ring = "0.16.19"
-bytes = "1.0.1"
-account_utils = { path = "../../common/account_utils" }
-sensitive_url = { path = "../../common/sensitive_url" }
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
+serde = { workspace = true }
+serde_json = { workspace = true }
+types = { workspace = true }
+reqwest = { workspace = true }
+lighthouse_network = { workspace = true }
+proto_array = { workspace = true }
+ethereum_serde_utils = { workspace = true }
+eth2_keystore = { workspace = true }
+libsecp256k1 = { workspace = true }
+ring = { workspace = true }
+bytes = { workspace = true }
+account_utils = { workspace = true }
+sensitive_url = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
 futures-util = "0.3.8"
-futures = "0.3.8"
-store = { path = "../../beacon_node/store", optional = true }
-slashing_protection = { path = "../../validator_client/slashing_protection", optional = true }
+futures = { workspace = true }
+store = { workspace = true }
+slashing_protection = { workspace = true }
 mediatype = "0.19.13"
 mime = "0.3.16"
-pretty_reqwest_error = { path = "../../common/pretty_reqwest_error" }
+pretty_reqwest_error = { workspace = true }
 
 [dev-dependencies]
-tokio = { version = "1.14.0", features = ["full"] }
+tokio = { workspace = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 psutil = { version = "3.2.2", optional = true }
@@ -39,4 +39,4 @@ procfs = { version = "0.15.1", optional = true }
 
 [features]
 default = ["lighthouse"]
-lighthouse = ["proto_array", "psutil", "procfs", "store", "slashing_protection"]
+lighthouse = ["psutil", "procfs"]

common/eth2_config/Cargo.toml

@@ -2,8 +2,8 @@
 name = "eth2_config"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-types = { path = "../../consensus/types" }
-paste = "1.0.5"
+types = { workspace = true }
+paste = { workspace = true }

common/eth2_interop_keypairs/Cargo.toml

@@ -2,19 +2,19 @@
 name = "eth2_interop_keypairs"
 version = "0.2.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]
-lazy_static = "1.4.0"
+lazy_static = { workspace = true }
 num-bigint = "0.4.2"
-ethereum_hashing = "1.0.0-beta.2"
-hex = "0.4.2"
-serde_yaml = "0.8.13"
-serde = "1.0.116"
+ethereum_hashing = { workspace = true }
+hex = { workspace = true }
+serde_yaml = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-bls = { path = "../../crypto/bls" }
+bls = { workspace = true }
 
 [dev-dependencies]
 base64 = "0.13.0"

common/eth2_network_config/Cargo.toml

@@ -2,30 +2,29 @@
 name = "eth2_network_config"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 build = "build.rs"
 
 [build-dependencies]
-zip = "0.6"
-eth2_config = { path = "../eth2_config" }
+zip = { workspace = true }
+eth2_config = { workspace = true }
 
 [dev-dependencies]
-tempfile = "3.1.0"
-tokio = "1.14.0"
+tempfile = { workspace = true }
+tokio = { workspace = true }
 
 [dependencies]
-serde_yaml = "0.8.13"
-types = { path = "../../consensus/types" }
-ethereum_ssz = "0.5.0"
-eth2_config = { path = "../eth2_config" }
-discv5 = "0.3.1"
-reqwest = { version = "0.11.0", features = ["blocking"] }
-pretty_reqwest_error = { path = "../pretty_reqwest_error" }
-sha2 = "0.10"
-url = "2.2.2"
-sensitive_url = { path = "../sensitive_url" }
-slog = "2.5.2"
-logging = { path = "../logging" }
-futures = "0.3.7"
-bytes = "1.1.0"
+serde_yaml = { workspace = true }
+types = { workspace = true }
+ethereum_ssz = { 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 }

common/eth2_wallet_manager/Cargo.toml

@@ -2,13 +2,13 @@
 name = "eth2_wallet_manager"
 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]
-eth2_wallet = { path = "../../crypto/eth2_wallet" }
-lockfile = { path = "../lockfile" }
+eth2_wallet = { workspace = true }
+lockfile = { workspace = true }
 
 [dev-dependencies]
-tempfile = "3.1.0"
+tempfile = { workspace = true }

common/filesystem/Cargo.toml

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

common/lighthouse_metrics/Cargo.toml

@@ -2,10 +2,10 @@
 name = "lighthouse_metrics"
 version = "0.2.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]
-lazy_static = "1.4.0"
+lazy_static = { workspace = true }
 prometheus = "0.13.0"

common/lighthouse_version/Cargo.toml

@@ -2,7 +2,7 @@
 name = "lighthouse_version"
 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
 
@@ -11,4 +11,4 @@ git-version = "0.3.4"
 target_info = "0.1.0"
 
 [dev-dependencies]
-regex = "1.5.5"
+regex = { workspace = true }

common/lockfile/Cargo.toml

@@ -2,10 +2,10 @@
 name = "lockfile"
 version = "0.1.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-fs2 = "0.4.3"
+fs2 = { workspace = true }
 
 [dev-dependencies]
-tempfile = "3.1.0"
+tempfile = { workspace = true }

common/logging/Cargo.toml

@@ -2,21 +2,21 @@
 name = "logging"
 version = "0.2.0"
 authors = ["blacktemplar <blacktemplar@a1.net>"]
-edition = "2021"
+edition = { workspace = true }
 
 [features]
 test_logger = [] # Print log output to stderr when running tests instead of dropping it
 
 [dependencies]
-slog = "2.5.2"
-slog-term = "2.6.0"
-tokio = { version = "1.26.0", features = ["sync"] }
-lighthouse_metrics = { path = "../lighthouse_metrics" }
-lazy_static = "1.4.0"
-sloggers = { version = "2.1.1", features = ["json"] }
-slog-async = "2.7.0"
+slog = { workspace = true }
+slog-term = { workspace = true }
+tokio = { workspace = true }
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
+sloggers = { workspace = true }
+slog-async = { workspace = true }
 take_mut = "0.2.2"
-parking_lot = "0.12.1"
-serde = "1.0.153"
-serde_json = "1.0.94"
+parking_lot = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }

common/lru_cache/Cargo.toml

@@ -2,7 +2,7 @@
 name = "lru_cache"
 version = "0.1.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-fnv = "1.0.7"
+fnv = { workspace = true }

common/malloc_utils/Cargo.toml

@@ -2,13 +2,13 @@
 name = "malloc_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-lighthouse_metrics = { path = "../lighthouse_metrics" }
-lazy_static = "1.4.0"
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
 libc = "0.2.79"
-parking_lot = "0.12.0"
+parking_lot = { workspace = true }
 jemalloc-ctl = { version = "0.5.0", optional = true }
 
 # Jemalloc's background_threads feature requires Linux (pthreads).

common/monitoring_api/Cargo.toml

@@ -2,22 +2,22 @@
 name = "monitoring_api"
 version = "0.1.0"
 authors = ["pawan <pawandhananjay@gmail.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-reqwest = { version = "0.11.0", features = ["json","stream"] }
-task_executor = { path = "../task_executor" }
-tokio = "1.14.0"
-eth2 = {path = "../eth2"}
-serde_json = "1.0.58"
-serde = "1.0.116"
+reqwest = { workspace = true }
+task_executor = { workspace = true }
+tokio = { workspace = true }
+eth2 = { workspace = true }
+serde_json = { workspace = true }
 serde_derive = "1.0.116"
-lighthouse_version = { path = "../lighthouse_version"}
-lighthouse_metrics = { path = "../lighthouse_metrics" }
-slog = "2.5.2"
-store = { path = "../../beacon_node/store" }
-lazy_static = "1.4.0"
-regex = "1.5.5"
-sensitive_url = { path = "../sensitive_url" }
+serde = { workspace = true }
+lighthouse_version = { workspace = true }
+lighthouse_metrics = { workspace = true }
+slog = { workspace = true }
+store = { workspace = true }
+lazy_static = { workspace = true }
+regex = { workspace = true }
+sensitive_url = { workspace = true }

common/oneshot_broadcast/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "oneshot_broadcast"
 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]
-parking_lot = "0.12.0"
+parking_lot = { workspace = true }

common/pretty_reqwest_error/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "pretty_reqwest_error"
 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]
-reqwest = { version = "0.11.0", features = ["json","stream"] }
-sensitive_url = { path = "../sensitive_url" }
+reqwest = { workspace = true }
+sensitive_url = { workspace = true }

common/sensitive_url/Cargo.toml

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

common/slot_clock/Cargo.toml

@@ -2,10 +2,10 @@
 name = "slot_clock"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-types = { path = "../../consensus/types" }
-lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../lighthouse_metrics" }
-parking_lot = "0.12.0"
+types = { workspace = true }
+lazy_static = { workspace = true }
+lighthouse_metrics = { workspace = true }
+parking_lot = { workspace = true }

common/system_health/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "system_health"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-lighthouse_network = { path = "../../beacon_node/lighthouse_network" }
-types = { path = "../../consensus/types" }
-sysinfo = "0.26.5"
-serde = "1.0.116"
+lighthouse_network = { workspace = true }
+types = { workspace = true }
+sysinfo = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-serde_json = "1.0.58"
-parking_lot = "0.12.0"
+serde_json = { workspace = true }
+parking_lot = { workspace = true }

common/target_check/Cargo.toml

@@ -2,7 +2,7 @@
 name = "target_check"
 version = "0.1.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
 static_assertions = "1.1.0"

common/task_executor/Cargo.toml

@@ -2,14 +2,14 @@
 name = "task_executor"
 version = "0.1.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-tokio = { version = "1.14.0", features = ["rt-multi-thread", "macros"] }
-slog = "2.5.2"
-futures = "0.3.7"
-exit-future = "0.2.0"
-lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../lighthouse_metrics" }
-sloggers = { version = "2.1.1", features = ["json"] }
-logging = { path = "../logging" }
+tokio = { workspace = true }
+slog = { workspace = true }
+futures = { workspace = true }
+exit-future = { workspace = true }
+lazy_static = { workspace = true }
+lighthouse_metrics = { workspace = true }
+sloggers = { workspace = true }
+logging = { workspace = true }

common/test_random_derive/Cargo.toml

@@ -2,12 +2,12 @@
 name = "test_random_derive"
 version = "0.2.0"
 authors = ["thojest <thojest@gmail.com>"]
-edition = "2021"
+edition = { workspace = true }
 description = "Procedural derive macros for implementation of TestRandom trait"
 
 [lib]
 proc-macro = true
 
 [dependencies]
-syn = "1.0.42"
-quote = "1.0.7"
+syn = { workspace = true }
+quote = { workspace = true }

common/unused_port/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "unused_port"
 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]
-lru_cache = { path = "../lru_cache" }
-lazy_static = "1.4.0"
-parking_lot = "0.12.0"
+lru_cache = { workspace = true }
+lazy_static = { workspace = true }
+parking_lot = { workspace = true }

common/validator_dir/Cargo.toml

@@ -2,7 +2,7 @@
 name = "validator_dir"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [features]
 insecure_keys = []
@@ -10,17 +10,17 @@ insecure_keys = []
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bls = { path = "../../crypto/bls" }
-eth2_keystore = { path = "../../crypto/eth2_keystore" }
-filesystem = { path = "../filesystem" }
-types = { path = "../../consensus/types" }
-rand = "0.8.5"
-deposit_contract = { path = "../deposit_contract" }
-tree_hash = "0.5.0"
-hex = "0.4.2"
-derivative = "2.1.1"
-lockfile = { path = "../lockfile" }
-directory = { path = "../directory" }
+bls = { 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 }
 
 [dev-dependencies]
-tempfile = "3.1.0"
+tempfile = { workspace = true }

common/warp_utils/Cargo.toml

@@ -2,20 +2,20 @@
 name = "warp_utils"
 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]
-warp = "0.3.2"
-eth2 = { path = "../eth2" }
-types = { path = "../../consensus/types" }
-beacon_chain = { path = "../../beacon_node/beacon_chain" }
-state_processing = { path = "../../consensus/state_processing" }
-safe_arith = { path = "../../consensus/safe_arith" }
-serde = { version = "1.0.116", features = ["derive"] }
-tokio = { version = "1.14.0", features = ["sync"] }
+warp = { workspace = true }
+eth2 = { workspace = true }
+types = { workspace = true }
+beacon_chain = { workspace = true }
+state_processing = { workspace = true }
+safe_arith = { workspace = true }
+serde = { workspace = true }
+tokio = { workspace = true }
 headers = "0.3.2"
-lighthouse_metrics = { path = "../lighthouse_metrics" }
-lazy_static = "1.4.0"
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
 serde_array_query = "0.1.0"