diff --git a/Cargo.lock b/Cargo.lock index 64ddf6539..284e8aa15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,29 +10,17 @@ dependencies = [ "bls", "clap", "clap_utils", - "deposit_contract", "directory", - "dirs", "environment", "eth2", "eth2_keystore", "eth2_network_config", - "eth2_ssz", - "eth2_ssz_derive", "eth2_wallet", "eth2_wallet_manager", "filesystem", - "futures", - "hex", - "libc", - "rand 0.7.3", - "rayon", "safe_arith", "sensitive_url", "slashing_protection", - "slog", - "slog-async", - "slog-term", "slot_clock", "tempfile", "tokio", @@ -452,21 +440,17 @@ dependencies = [ "environment", "eth1", "eth2", - "eth2_config", "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "eth2_ssz", "eth2_ssz_derive", "eth2_ssz_types", - "exit-future", "fork_choice", "futures", "genesis", "int_to_bytes", - "integer-sqrt", "itertools", "lazy_static", "lighthouse_metrics", - "log", "lru", "maplit", "merkle_proof", @@ -474,14 +458,10 @@ dependencies = [ "parking_lot", "proto_array", "rand 0.7.3", - "rand_core 0.6.3", "rayon", - "regex", "safe_arith", "serde", "serde_derive", - "serde_json", - "serde_yaml", "slasher", "slog", "sloggers", @@ -511,26 +491,19 @@ dependencies = [ "eth2_config", "eth2_libp2p", "eth2_network_config", - "eth2_ssz", - "exit-future", "futures", "genesis", "hex", "hyper", "lighthouse_version", - "logging", "monitoring_api", "node_test_rig", - "rand 0.7.3", "sensitive_url", "serde", "slasher", "slog", - "slog-async", - "slog-term", "store", "task_executor", - "tokio", "types", ] @@ -662,9 +635,7 @@ dependencies = [ "beacon_node", "clap", "eth2_libp2p", - "eth2_network_config", "eth2_ssz", - "futures", "hex", "log", "logging", @@ -673,7 +644,6 @@ dependencies = [ "slog-scope", "slog-stdlog", "slog-term", - "sloggers", "tokio", "types", ] @@ -882,7 +852,6 @@ dependencies = [ "eth2_network_config", "eth2_ssz", "hex", - "types", ] [[package]] @@ -898,8 +867,6 @@ dependencies = [ "eth2", "eth2_config", "eth2_libp2p", - "eth2_ssz", - "futures", "genesis", "http_api", "http_metrics", @@ -908,17 +875,12 @@ dependencies = [ "monitoring_api", "network", "parking_lot", - "prometheus", - "reqwest", "sensitive_url", "serde", "serde_derive", - "serde_yaml", "slasher", "slasher_service", "slog", - "slog-async", - "sloggers", "slot_clock", "store", "task_executor", @@ -926,9 +888,7 @@ dependencies = [ "timer", "tokio", "toml", - "tree_hash", "types", - "url", ] [[package]] @@ -1392,7 +1352,6 @@ version = "0.1.0" dependencies = [ "clap", "clap_utils", - "dirs", "eth2_network_config", ] @@ -1540,7 +1499,6 @@ dependencies = [ "ethereum-types 0.11.0", "fs2", "hex", - "parking_lot", "rayon", "serde", "serde_derive", @@ -1651,7 +1609,6 @@ dependencies = [ "filesystem", "futures", "logging", - "parking_lot", "slog", "slog-async", "slog-json", @@ -1679,14 +1636,12 @@ dependencies = [ "environment", "eth1_test_rig", "eth2", - "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "eth2_ssz", "eth2_ssz_derive", "fallback", "futures", "hex", "lazy_static", - "libflate", "lighthouse_metrics", "merkle_proof", "parking_lot", @@ -1710,7 +1665,6 @@ name = "eth1_test_rig" version = "0.2.0" dependencies = [ "deposit_contract", - "futures", "serde_json", "tokio", "types", @@ -1730,7 +1684,6 @@ dependencies = [ "eth2_ssz_derive", "futures", "futures-util", - "hex", "libsecp256k1 0.6.0", "procinfo", "proto_array", @@ -1742,7 +1695,6 @@ dependencies = [ "serde_json", "store", "types", - "zeroize", ] [[package]] @@ -1750,8 +1702,6 @@ name = "eth2_config" version = "0.2.0" dependencies = [ "paste", - "serde", - "serde_derive", "types", ] @@ -1813,7 +1763,6 @@ dependencies = [ "aes", "bls", "eth2_key_derivation", - "eth2_ssz", "hex", "hmac 0.11.0", "pbkdf2 0.8.0", @@ -1833,7 +1782,6 @@ dependencies = [ name = "eth2_libp2p" version = "0.2.0" dependencies = [ - "base64 0.13.0", "directory", "dirs", "discv5", @@ -1844,7 +1792,6 @@ dependencies = [ "exit-future", "fnv", "futures", - "futures-io", "hashset_delay", "hex", "lazy_static", @@ -1873,7 +1820,6 @@ dependencies = [ "tokio-util", "types", "unsigned-varint 0.6.0", - "void", ] [[package]] @@ -1883,7 +1829,6 @@ dependencies = [ "enr", "eth2_config", "eth2_ssz", - "serde", "serde_yaml", "tempfile", "types", @@ -1965,7 +1910,6 @@ dependencies = [ name = "eth2_wallet_manager" version = "0.1.0" dependencies = [ - "eth2_keystore", "eth2_wallet", "lockfile", "tempfile", @@ -2205,12 +2149,8 @@ dependencies = [ "beacon_chain", "eth2_ssz", "eth2_ssz_derive", - "hex", "proto_array", - "slot_clock", - "state_processing", "store", - "tree_hash", "types", ] @@ -2386,15 +2326,11 @@ dependencies = [ "eth1_test_rig", "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "eth2_ssz", - "exit-future", "futures", "int_to_bytes", "merkle_proof", - "parking_lot", "rayon", "sensitive_url", - "serde", - "serde_derive", "slog", "state_processing", "tokio", @@ -2684,14 +2620,12 @@ dependencies = [ "eth2", "eth2_libp2p", "eth2_ssz", - "fork_choice", "futures", "hex", "lazy_static", "lighthouse_metrics", "lighthouse_version", "network", - "parking_lot", "sensitive_url", "serde", "slog", @@ -2700,7 +2634,6 @@ dependencies = [ "store", "tokio", "tokio-stream", - "tokio-util", "tree_hash", "types", "warp", @@ -2713,13 +2646,10 @@ version = "0.1.0" dependencies = [ "beacon_chain", "environment", - "eth2", "eth2_libp2p", - "lazy_static", "lighthouse_metrics", "lighthouse_version", "malloc_utils", - "prometheus", "reqwest", "serde", "slog", @@ -3061,29 +2991,22 @@ dependencies = [ "clap_utils", "deposit_contract", "directory", - "dirs", "env_logger 0.9.0", "environment", "eth1_test_rig", "eth2", - "eth2_keystore", "eth2_libp2p", "eth2_network_config", "eth2_ssz", "eth2_wallet", - "futures", "genesis", - "hex", "lighthouse_version", "log", - "rand 0.7.3", - "regex", "sensitive_url", "serde", "serde_json", "serde_yaml", "state_processing", - "tokio", "tree_hash", "types", "validator_dir", @@ -3692,7 +3615,6 @@ dependencies = [ "boot_node", "clap", "clap_utils", - "directory", "env_logger 0.9.0", "environment", "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3702,18 +3624,13 @@ dependencies = [ "lazy_static", "lighthouse_metrics", "lighthouse_version", - "logging", "malloc_utils", "serde_json", "slashing_protection", "slog", - "slog-async", - "slog-term", "sloggers", - "target_check", "task_executor", "tempfile", - "tokio", "types", "validator_client", "validator_dir", @@ -3984,7 +3901,6 @@ name = "monitoring_api" version = "0.1.0" dependencies = [ "eth2", - "futures", "lazy_static", "lighthouse_metrics", "lighthouse_version", @@ -4139,7 +4055,6 @@ dependencies = [ "lru_cache", "matches", "num_cpus", - "parking_lot", "rand 0.7.3", "rlp 0.5.1", "slog", @@ -4148,14 +4063,12 @@ dependencies = [ "sloggers", "slot_clock", "smallvec", - "state_processing", "store", "strum", "task_executor", "tokio", "tokio-stream", "tokio-util", - "tree_hash", "types", ] @@ -4192,15 +4105,9 @@ dependencies = [ "beacon_node", "environment", "eth2", - "eth2_config", - "futures", - "genesis", - "reqwest", "sensitive_url", - "serde", "tempfile", "types", - "url", "validator_client", "validator_dir", ] @@ -4377,18 +4284,15 @@ dependencies = [ "derivative", "eth2_ssz", "eth2_ssz_derive", - "int_to_bytes", "itertools", "lazy_static", "lighthouse_metrics", "parking_lot", - "rand 0.7.3", "rayon", "serde", "serde_derive", "state_processing", "store", - "superstruct", "types", ] @@ -5642,7 +5546,6 @@ dependencies = [ "sensitive_url", "tokio", "types", - "validator_client", ] [[package]] @@ -5694,7 +5597,6 @@ dependencies = [ "state_processing", "task_executor", "tokio", - "tokio-stream", "types", ] @@ -5705,7 +5607,6 @@ dependencies = [ "eth2_serde_utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "filesystem", "lazy_static", - "parking_lot", "r2d2", "r2d2_sqlite", "rayon", @@ -5714,7 +5615,6 @@ dependencies = [ "serde_derive", "serde_json", "tempfile", - "tree_hash", "types", ] @@ -5946,16 +5846,11 @@ dependencies = [ "itertools", "lazy_static", "lighthouse_metrics", - "log", "merkle_proof", "rayon", "safe_arith", - "serde", - "serde_derive", - "serde_yaml", "smallvec", "tree_hash", - "tree_hash_derive", "types", ] @@ -6046,7 +5941,6 @@ dependencies = [ "sloggers", "state_processing", "tempfile", - "tree_hash", "types", ] @@ -6313,13 +6207,10 @@ name = "timer" version = "0.2.0" dependencies = [ "beacon_chain", - "futures", - "parking_lot", "slog", "slot_clock", "task_executor", "tokio", - "types", ] [[package]] @@ -6605,7 +6496,6 @@ dependencies = [ "eth2_ssz", "eth2_ssz_derive", "ethereum-types 0.11.0", - "lazy_static", "rand 0.7.3", "smallvec", "tree_hash_derive", @@ -6730,7 +6620,6 @@ dependencies = [ "itertools", "lazy_static", "log", - "merkle_proof", "parking_lot", "rand 0.7.3", "rand_xorshift", @@ -6740,7 +6629,6 @@ dependencies = [ "safe_arith", "serde", "serde_derive", - "serde_json", "serde_yaml", "slog", "state_processing", @@ -6911,43 +6799,31 @@ dependencies = [ "dirs", "environment", "eth2", - "eth2_config", - "eth2_interop_keypairs", "eth2_keystore", "eth2_serde_utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "eth2_ssz", - "eth2_ssz_derive", "exit-future", - "fallback", "filesystem", "futures", "hex", "hyper", "itertools", "lazy_static", - "libc", "libsecp256k1 0.6.0", "lighthouse_metrics", "lighthouse_version", "lockfile", - "logging", "monitoring_api", "parking_lot", "rand 0.7.3", - "rayon", "reqwest", "ring", "safe_arith", - "scrypt", "sensitive_url", "serde", "serde_derive", "serde_json", - "serde_yaml", "slashing_protection", "slog", - "slog-async", - "slog-term", "slot_clock", "task_executor", "tempfile", @@ -6972,8 +6848,6 @@ dependencies = [ "hex", "lockfile", "rand 0.7.3", - "rayon", - "slog", "tempfile", "tree_hash", "types", diff --git a/account_manager/Cargo.toml b/account_manager/Cargo.toml index 3d86aacdc..3c602f45c 100644 --- a/account_manager/Cargo.toml +++ b/account_manager/Cargo.toml @@ -7,25 +7,13 @@ edition = "2018" [dependencies] bls = { path = "../crypto/bls" } clap = "2.33.3" -slog = "2.5.2" -slog-term = "2.6.0" -slog-async = "2.5.0" types = { path = "../consensus/types" } -dirs = "3.0.1" environment = { path = "../lighthouse/environment" } -deposit_contract = { path = "../common/deposit_contract" } -libc = "0.2.79" -eth2_ssz = "0.4.0" -eth2_ssz_derive = "0.3.0" -hex = "0.4.2" -rayon = "1.4.1" eth2_network_config = { path = "../common/eth2_network_config" } -futures = "0.3.7" clap_utils = { path = "../common/clap_utils" } directory = { path = "../common/directory" } eth2_wallet = { path = "../crypto/eth2_wallet" } eth2_wallet_manager = { path = "../common/eth2_wallet_manager" } -rand = "0.7.3" validator_dir = { path = "../common/validator_dir" } tokio = { version = "1.10.0", features = ["full"] } eth2_keystore = { path = "../crypto/eth2_keystore" } diff --git a/beacon_node/Cargo.toml b/beacon_node/Cargo.toml index cf27857cb..68a2f065b 100644 --- a/beacon_node/Cargo.toml +++ b/beacon_node/Cargo.toml @@ -21,14 +21,8 @@ types = { path = "../consensus/types" } store = { path = "./store" } client = { path = "client" } clap = "2.33.3" -rand = "0.7.3" slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] } -slog-term = "2.6.0" -slog-async = "2.5.0" -tokio = { version = "1.10.0", features = ["time"] } -exit-future = "0.2.0" dirs = "3.0.1" -logging = { path = "../common/logging" } directory = {path = "../common/directory"} futures = "0.3.7" environment = { path = "../lighthouse/environment" } @@ -36,7 +30,6 @@ task_executor = { path = "../common/task_executor" } genesis = { path = "genesis" } eth2_network_config = { path = "../common/eth2_network_config" } eth2_libp2p = { path = "./eth2_libp2p" } -eth2_ssz = "0.4.0" serde = "1.0.116" clap_utils = { path = "../common/clap_utils" } hyper = "0.14.4" diff --git a/beacon_node/beacon_chain/Cargo.toml b/beacon_node/beacon_chain/Cargo.toml index cc66408ac..96851e704 100644 --- a/beacon_node/beacon_chain/Cargo.toml +++ b/beacon_node/beacon_chain/Cargo.toml @@ -16,20 +16,16 @@ maplit = "1.0.2" environment = { path = "../../lighthouse/environment" } [dependencies] -eth2_config = { path = "../../common/eth2_config" } merkle_proof = { path = "../../consensus/merkle_proof" } store = { path = "../store" } parking_lot = "0.11.0" lazy_static = "1.4.0" smallvec = "1.6.1" lighthouse_metrics = { path = "../../common/lighthouse_metrics" } -log = "0.4.11" operation_pool = { path = "../operation_pool" } rayon = "1.4.1" serde = "1.0.116" serde_derive = "1.0.116" -serde_yaml = "0.8.13" -serde_json = "1.0.58" slog = { version = "2.5.2", features = ["max_level_trace"] } sloggers = "2.0.2" slot_clock = { path = "../../common/slot_clock" } @@ -44,10 +40,8 @@ tokio = "1.10.0" eth1 = { path = "../eth1" } futures = "0.3.7" genesis = { path = "../genesis" } -integer-sqrt = "0.1.5" int_to_bytes = { path = "../../consensus/int_to_bytes" } rand = "0.7.3" -rand_core = "0.6.2" proto_array = { path = "../../consensus/proto_array" } lru = "0.6.0" tempfile = "3.1.0" @@ -58,8 +52,6 @@ fork_choice = { path = "../../consensus/fork_choice" } task_executor = { path = "../../common/task_executor" } derivative = "2.1.1" itertools = "0.10.0" -regex = "1.3.9" -exit-future = "0.2.0" slasher = { path = "../../slasher" } eth2 = { path = "../../common/eth2" } strum = { version = "0.21.0", features = ["derive"] } diff --git a/beacon_node/client/Cargo.toml b/beacon_node/client/Cargo.toml index 7b84f4a49..e4fb9e966 100644 --- a/beacon_node/client/Cargo.toml +++ b/beacon_node/client/Cargo.toml @@ -5,7 +5,6 @@ authors = ["Sigma Prime "] edition = "2018" [dev-dependencies] -sloggers = "2.0.2" toml = "0.5.6" [dependencies] @@ -15,29 +14,21 @@ network = { path = "../network" } timer = { path = "../timer" } eth2_libp2p = { path = "../eth2_libp2p" } parking_lot = "0.11.0" -prometheus = "0.11.0" types = { path = "../../consensus/types" } -tree_hash = "0.4.0" eth2_config = { path = "../../common/eth2_config" } slot_clock = { path = "../../common/slot_clock" } serde = "1.0.116" serde_derive = "1.0.116" error-chain = "0.12.4" -serde_yaml = "0.8.13" slog = { version = "2.5.2", features = ["max_level_trace"] } -slog-async = "2.5.0" tokio = "1.10.0" dirs = "3.0.1" -futures = "0.3.7" -reqwest = { version = "0.11.0", features = ["native-tls-vendored"] } -url = "2.1.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" } -eth2_ssz = "0.4.0" lazy_static = "1.4.0" lighthouse_metrics = { path = "../../common/lighthouse_metrics" } time = "0.2.22" diff --git a/beacon_node/eth1/Cargo.toml b/beacon_node/eth1/Cargo.toml index 79309edd9..47082088c 100644 --- a/beacon_node/eth1/Cargo.toml +++ b/beacon_node/eth1/Cargo.toml @@ -22,12 +22,10 @@ merkle_proof = { path = "../../consensus/merkle_proof"} eth2_ssz = "0.4.0" eth2_ssz_derive = "0.3.0" tree_hash = "0.4.0" -eth2_hashing = "0.2.0" parking_lot = "0.11.0" slog = "2.5.2" tokio = { version = "1.10.0", features = ["full"] } state_processing = { path = "../../consensus/state_processing" } -libflate = "1.0.2" lighthouse_metrics = { path = "../../common/lighthouse_metrics"} lazy_static = "1.4.0" task_executor = { path = "../../common/task_executor" } diff --git a/beacon_node/eth2_libp2p/Cargo.toml b/beacon_node/eth2_libp2p/Cargo.toml index a2dbea6e6..639ef6510 100644 --- a/beacon_node/eth2_libp2p/Cargo.toml +++ b/beacon_node/eth2_libp2p/Cargo.toml @@ -19,7 +19,6 @@ slog = { version = "2.5.2", features = ["max_level_trace"] } lighthouse_version = { path = "../../common/lighthouse_version" } tokio = { version = "1.10.0", features = ["time", "macros"] } futures = "0.3.7" -futures-io = "0.3.7" error-chain = "0.12.4" dirs = "3.0.1" fnv = "1.0.7" @@ -30,9 +29,7 @@ tokio-io-timeout = "1.1.1" lru = "0.6.0" parking_lot = "0.11.0" sha2 = "0.9.1" -base64 = "0.13.0" snap = "1.0.1" -void = "1.0.2" hex = "0.4.2" tokio-util = { version = "0.6.2", features = ["codec", "compat", "time"] } tiny-keccak = "2.0.2" @@ -55,7 +52,6 @@ rev = "ce23cbe76a0382b6fcb0e49f1b2612df86f6465d" features = ["websocket", "identify", "mplex", "yamux", "noise", "gossipsub", "dns-tokio", "tcp-tokio"] [dev-dependencies] -tokio = { version = "1.10.0", features = ["full"] } slog-term = "2.6.0" slog-async = "2.5.0" tempfile = "3.1.0" diff --git a/beacon_node/genesis/Cargo.toml b/beacon_node/genesis/Cargo.toml index a360b1037..c80ef1978 100644 --- a/beacon_node/genesis/Cargo.toml +++ b/beacon_node/genesis/Cargo.toml @@ -20,9 +20,5 @@ eth2_ssz = "0.4.0" eth2_hashing = "0.2.0" tree_hash = "0.4.0" tokio = { version = "1.10.0", features = ["full"] } -parking_lot = "0.11.0" slog = "2.5.2" -exit-future = "0.2.0" -serde = "1.0.116" -serde_derive = "1.0.116" int_to_bytes = { path = "../../consensus/int_to_bytes" } diff --git a/beacon_node/http_api/Cargo.toml b/beacon_node/http_api/Cargo.toml index 002cec504..6939b02c4 100644 --- a/beacon_node/http_api/Cargo.toml +++ b/beacon_node/http_api/Cargo.toml @@ -10,8 +10,6 @@ warp = { git = "https://github.com/paulhauner/warp ", branch = "cors-wildcard" } serde = { version = "1.0.116", features = ["derive"] } tokio = { version = "1.10.0", features = ["macros","sync"] } tokio-stream = { version = "0.1.3", features = ["sync"] } -tokio-util = "0.6.3" -parking_lot = "0.11.0" types = { path = "../../consensus/types" } hex = "0.4.2" beacon_chain = { path = "../beacon_chain" } @@ -20,7 +18,6 @@ slog = "2.5.2" network = { path = "../network" } eth2_libp2p = { path = "../eth2_libp2p" } eth1 = { path = "../eth1" } -fork_choice = { path = "../../consensus/fork_choice" } state_processing = { path = "../../consensus/state_processing" } lighthouse_version = { path = "../../common/lighthouse_version" } lighthouse_metrics = { path = "../../common/lighthouse_metrics" } diff --git a/beacon_node/http_metrics/Cargo.toml b/beacon_node/http_metrics/Cargo.toml index 81b693aa6..8338fbb04 100644 --- a/beacon_node/http_metrics/Cargo.toml +++ b/beacon_node/http_metrics/Cargo.toml @@ -7,7 +7,6 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -prometheus = "0.11.0" warp = { git = "https://github.com/paulhauner/warp ", branch = "cors-wildcard" } serde = { version = "1.0.116", features = ["derive"] } slog = "2.5.2" @@ -16,8 +15,6 @@ store = { path = "../store" } eth2_libp2p = { path = "../eth2_libp2p" } slot_clock = { path = "../../common/slot_clock" } lighthouse_metrics = { path = "../../common/lighthouse_metrics" } -lazy_static = "1.4.0" -eth2 = { path = "../../common/eth2" } lighthouse_version = { path = "../../common/lighthouse_version" } warp_utils = { path = "../../common/warp_utils" } malloc_utils = { path = "../../common/malloc_utils" } diff --git a/beacon_node/network/Cargo.toml b/beacon_node/network/Cargo.toml index 8eca1a549..edb51b0c9 100644 --- a/beacon_node/network/Cargo.toml +++ b/beacon_node/network/Cargo.toml @@ -7,7 +7,6 @@ edition = "2018" [dev-dependencies] sloggers = "2.0.2" genesis = { path = "../genesis" } -lazy_static = "1.4.0" matches = "0.1.8" exit-future = "0.2.0" slog-term = "2.6.0" @@ -21,18 +20,15 @@ store = { path = "../store" } eth2_libp2p = { path = "../eth2_libp2p" } hashset_delay = { path = "../../common/hashset_delay" } types = { path = "../../consensus/types" } -state_processing = { path = "../../consensus/state_processing" } slot_clock = { path = "../../common/slot_clock" } slog = { version = "2.5.2", features = ["max_level_trace"] } hex = "0.4.2" eth2_ssz = "0.4.0" eth2_ssz_types = "0.2.1" -tree_hash = "0.4.0" futures = "0.3.7" error-chain = "0.12.4" tokio = { version = "1.10.0", features = ["full"] } tokio-stream = "0.1.3" -parking_lot = "0.11.0" smallvec = "1.6.1" rand = "0.7.3" fnv = "1.0.7" diff --git a/beacon_node/operation_pool/Cargo.toml b/beacon_node/operation_pool/Cargo.toml index c0d4f926a..a63e2808f 100644 --- a/beacon_node/operation_pool/Cargo.toml +++ b/beacon_node/operation_pool/Cargo.toml @@ -7,7 +7,6 @@ edition = "2018" [dependencies] derivative = "2.1.1" itertools = "0.10.0" -int_to_bytes = { path = "../../consensus/int_to_bytes" } lazy_static = "1.4.0" lighthouse_metrics = { path = "../../common/lighthouse_metrics" } parking_lot = "0.11.0" @@ -19,9 +18,6 @@ rayon = "1.5.0" serde = "1.0.116" serde_derive = "1.0.116" store = { path = "../store" } -superstruct = "0.2.0" [dev-dependencies] -rand = "0.7.3" -lazy_static = "1.4.0" beacon_chain = { path = "../beacon_chain" } diff --git a/beacon_node/store/Cargo.toml b/beacon_node/store/Cargo.toml index d1735a12f..d641f87aa 100644 --- a/beacon_node/store/Cargo.toml +++ b/beacon_node/store/Cargo.toml @@ -15,7 +15,6 @@ parking_lot = "0.11.0" itertools = "0.10.0" eth2_ssz = "0.4.0" eth2_ssz_derive = "0.3.0" -tree_hash = "0.4.0" types = { path = "../../consensus/types" } state_processing = { path = "../../consensus/state_processing" } slog = "2.5.2" diff --git a/beacon_node/timer/Cargo.toml b/beacon_node/timer/Cargo.toml index c37689b8e..42df097fb 100644 --- a/beacon_node/timer/Cargo.toml +++ b/beacon_node/timer/Cargo.toml @@ -6,10 +6,7 @@ edition = "2018" [dependencies] beacon_chain = { path = "../beacon_chain" } -types = { path = "../../consensus/types" } slot_clock = { path = "../../common/slot_clock" } tokio = { version = "1.10.0", features = ["full"] } slog = "2.5.2" -parking_lot = "0.11.0" -futures = "0.3.7" task_executor = { path = "../../common/task_executor" } diff --git a/boot_node/Cargo.toml b/boot_node/Cargo.toml index ab35812e1..659a8d194 100644 --- a/boot_node/Cargo.toml +++ b/boot_node/Cargo.toml @@ -9,10 +9,8 @@ beacon_node = { path = "../beacon_node" } clap = "2.33.3" eth2_libp2p = { path = "../beacon_node/eth2_libp2p" } types = { path = "../consensus/types" } -eth2_network_config = { path = "../common/eth2_network_config" } eth2_ssz = "0.4.0" slog = "2.5.2" -sloggers = "2.0.2" tokio = "1.10.0" log = "0.4.11" slog-term = "2.6.0" @@ -20,5 +18,4 @@ logging = { path = "../common/logging" } slog-async = "2.5.0" slog-scope = "4.3.0" slog-stdlog = "4.0.0" -futures = "0.3.7" hex = "0.4.2" diff --git a/common/clap_utils/Cargo.toml b/common/clap_utils/Cargo.toml index 6a837a369..9db525683 100644 --- a/common/clap_utils/Cargo.toml +++ b/common/clap_utils/Cargo.toml @@ -10,6 +10,5 @@ edition = "2018" clap = "2.33.3" hex = "0.4.2" dirs = "3.0.1" -types = { path = "../../consensus/types" } eth2_network_config = { path = "../eth2_network_config" } eth2_ssz = "0.4.0" diff --git a/common/directory/Cargo.toml b/common/directory/Cargo.toml index 116f20894..c85c7b61f 100644 --- a/common/directory/Cargo.toml +++ b/common/directory/Cargo.toml @@ -9,5 +9,4 @@ edition = "2018" [dependencies] clap = "2.33.3" clap_utils = {path = "../clap_utils"} -dirs = "3.0.1" eth2_network_config = { path = "../eth2_network_config" } diff --git a/common/eth2/Cargo.toml b/common/eth2/Cargo.toml index ecee46a80..19c12fd0d 100644 --- a/common/eth2/Cargo.toml +++ b/common/eth2/Cargo.toml @@ -10,12 +10,10 @@ edition = "2018" serde = { version = "1.0.116", features = ["derive"] } serde_json = "1.0.58" types = { path = "../../consensus/types" } -hex = "0.4.2" reqwest = { version = "0.11.0", features = ["json","stream"] } eth2_libp2p = { path = "../../beacon_node/eth2_libp2p" } proto_array = { path = "../../consensus/proto_array", optional = true } eth2_serde_utils = "0.1.0" -zeroize = { version = "1.4.2", features = ["zeroize_derive"] } eth2_keystore = { path = "../../crypto/eth2_keystore" } libsecp256k1 = "0.6.0" ring = "0.16.19" diff --git a/common/eth2_config/Cargo.toml b/common/eth2_config/Cargo.toml index fe8708cd2..18433f09f 100644 --- a/common/eth2_config/Cargo.toml +++ b/common/eth2_config/Cargo.toml @@ -5,7 +5,5 @@ authors = ["Paul Hauner "] edition = "2018" [dependencies] -serde = "1.0.116" -serde_derive = "1.0.116" types = { path = "../../consensus/types" } paste = "1.0.5" diff --git a/common/eth2_network_config/Cargo.toml b/common/eth2_network_config/Cargo.toml index 706028d2a..8fdd32e1b 100644 --- a/common/eth2_network_config/Cargo.toml +++ b/common/eth2_network_config/Cargo.toml @@ -14,7 +14,6 @@ eth2_config = { path = "../eth2_config"} tempfile = "3.1.0" [dependencies] -serde = "1.0.116" serde_yaml = "0.8.13" types = { path = "../../consensus/types"} eth2_ssz = "0.4.0" diff --git a/common/eth2_wallet_manager/Cargo.toml b/common/eth2_wallet_manager/Cargo.toml index 0e38c8732..4c72323f7 100644 --- a/common/eth2_wallet_manager/Cargo.toml +++ b/common/eth2_wallet_manager/Cargo.toml @@ -7,7 +7,6 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -eth2_keystore = { path = "../../crypto/eth2_keystore" } eth2_wallet = { path = "../../crypto/eth2_wallet" } lockfile = { path = "../lockfile" } diff --git a/common/monitoring_api/Cargo.toml b/common/monitoring_api/Cargo.toml index 0c0854f62..0a645b852 100644 --- a/common/monitoring_api/Cargo.toml +++ b/common/monitoring_api/Cargo.toml @@ -8,7 +8,6 @@ edition = "2018" [dependencies] reqwest = { version = "0.11.0", features = ["json","stream"] } -futures = "0.3.7" task_executor = { path = "../task_executor" } tokio = "1.10.0" eth2 = {path = "../eth2"} diff --git a/common/validator_dir/Cargo.toml b/common/validator_dir/Cargo.toml index d8d3604bb..19755c31a 100644 --- a/common/validator_dir/Cargo.toml +++ b/common/validator_dir/Cargo.toml @@ -16,9 +16,7 @@ filesystem = { path = "../filesystem" } types = { path = "../../consensus/types" } rand = "0.7.3" deposit_contract = { path = "../deposit_contract" } -rayon = "1.4.1" tree_hash = "0.4.0" -slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] } hex = "0.4.2" derivative = "2.1.1" lockfile = { path = "../lockfile" } diff --git a/consensus/fork_choice/Cargo.toml b/consensus/fork_choice/Cargo.toml index 5d8c6e11a..f708045df 100644 --- a/consensus/fork_choice/Cargo.toml +++ b/consensus/fork_choice/Cargo.toml @@ -13,9 +13,5 @@ eth2_ssz = "0.4.0" eth2_ssz_derive = "0.3.0" [dev-dependencies] -state_processing = { path = "../../consensus/state_processing" } beacon_chain = { path = "../../beacon_node/beacon_chain" } store = { path = "../../beacon_node/store" } -tree_hash = "0.4.0" -slot_clock = { path = "../../common/slot_clock" } -hex = "0.4.2" diff --git a/consensus/state_processing/Cargo.toml b/consensus/state_processing/Cargo.toml index 205d7d97c..8f921744b 100644 --- a/consensus/state_processing/Cargo.toml +++ b/consensus/state_processing/Cargo.toml @@ -6,10 +6,6 @@ edition = "2018" [dev-dependencies] env_logger = "0.9.0" -serde = "1.0.116" -serde_derive = "1.0.116" -lazy_static = "1.4.0" -serde_yaml = "0.8.13" beacon_chain = { path = "../../beacon_node/beacon_chain" } [dependencies] @@ -19,10 +15,8 @@ itertools = "0.10.0" eth2_ssz = "0.4.0" eth2_ssz_types = "0.2.1" merkle_proof = { path = "../merkle_proof" } -log = "0.4.11" safe_arith = { path = "../safe_arith" } tree_hash = "0.4.0" -tree_hash_derive = "0.4.0" types = { path = "../types", default-features = false } rayon = "1.4.1" eth2_hashing = "0.2.0" diff --git a/consensus/tree_hash/Cargo.toml b/consensus/tree_hash/Cargo.toml index fc16999d9..7b0b9a9b5 100644 --- a/consensus/tree_hash/Cargo.toml +++ b/consensus/tree_hash/Cargo.toml @@ -10,7 +10,6 @@ description = "Efficient Merkle-hashing as used in Ethereum 2.0" rand = "0.7.3" tree_hash_derive = "0.4.0" types = { path = "../types" } -lazy_static = "1.4.0" beacon_chain = { path = "../../beacon_node/beacon_chain" } eth2_ssz = "0.4.0" eth2_ssz_derive = "0.3.0" diff --git a/consensus/types/Cargo.toml b/consensus/types/Cargo.toml index 668091371..19e59ff6a 100644 --- a/consensus/types/Cargo.toml +++ b/consensus/types/Cargo.toml @@ -18,7 +18,6 @@ eth2_hashing = "0.2.0" hex = "0.4.2" int_to_bytes = { path = "../int_to_bytes" } log = "0.4.11" -merkle_proof = { path = "../merkle_proof" } rayon = "1.4.1" rand = "0.7.3" safe_arith = { path = "../safe_arith" } @@ -47,7 +46,6 @@ itertools = "0.10.0" superstruct = "0.2.0" [dev-dependencies] -serde_json = "1.0.58" criterion = "0.3.3" beacon_chain = { path = "../../beacon_node/beacon_chain" } eth2_interop_keypairs = { path = "../../common/eth2_interop_keypairs" } @@ -64,7 +62,6 @@ arbitrary-fuzz = [ "bls/arbitrary", "eth2_ssz/arbitrary", "eth2_ssz_types/arbitrary", - "merkle_proof/arbitrary", "swap_or_not_shuffle/arbitrary", "tree_hash/arbitrary", ] diff --git a/crypto/eth2_keystore/Cargo.toml b/crypto/eth2_keystore/Cargo.toml index 46eb272f8..a629f9a37 100644 --- a/crypto/eth2_keystore/Cargo.toml +++ b/crypto/eth2_keystore/Cargo.toml @@ -18,7 +18,6 @@ serde = "1.0.116" serde_repr = "0.1.6" hex = "0.4.2" bls = { path = "../bls" } -eth2_ssz = "0.4.0" serde_json = "1.0.58" eth2_key_derivation = { path = "../eth2_key_derivation" } unicode-normalization = "0.1.16" diff --git a/lcli/Cargo.toml b/lcli/Cargo.toml index 79500077e..f9cab5acb 100644 --- a/lcli/Cargo.toml +++ b/lcli/Cargo.toml @@ -12,7 +12,6 @@ fake_crypto = ['bls/fake_crypto'] [dependencies] bls = { path = "../crypto/bls" } clap = "2.33.3" -hex = "0.4.2" log = "0.4.11" serde = "1.0.116" serde_yaml = "0.8.13" @@ -21,20 +20,14 @@ env_logger = "0.9.0" types = { path = "../consensus/types" } state_processing = { path = "../consensus/state_processing" } eth2_ssz = "0.4.0" -regex = "1.3.9" -futures = "0.3.7" environment = { path = "../lighthouse/environment" } eth2_network_config = { path = "../common/eth2_network_config" } -dirs = "3.0.1" genesis = { path = "../beacon_node/genesis" } deposit_contract = { path = "../common/deposit_contract" } tree_hash = "0.4.0" -tokio = { version = "1.10.0", features = ["full"] } clap_utils = { path = "../common/clap_utils" } eth2_libp2p = { path = "../beacon_node/eth2_libp2p" } validator_dir = { path = "../common/validator_dir", features = ["insecure_keys"] } -rand = "0.7.3" -eth2_keystore = { path = "../crypto/eth2_keystore" } lighthouse_version = { path = "../common/lighthouse_version" } directory = { path = "../common/directory" } account_utils = { path = "../common/account_utils" } diff --git a/lighthouse/Cargo.toml b/lighthouse/Cargo.toml index 4ceb1b6e9..28b519d8b 100644 --- a/lighthouse/Cargo.toml +++ b/lighthouse/Cargo.toml @@ -19,7 +19,6 @@ spec-minimal = [] [dependencies] beacon_node = { "path" = "../beacon_node" } -tokio = "1.10.0" slog = { version = "2.5.2", features = ["max_level_trace"] } sloggers = "2.0.2" types = { "path" = "../consensus/types" } @@ -27,9 +26,6 @@ bls = { path = "../crypto/bls" } eth2_hashing = "0.2.0" clap = "2.33.3" env_logger = "0.9.0" -logging = { path = "../common/logging" } -slog-term = "2.6.0" -slog-async = "2.5.0" environment = { path = "./environment" } boot_node = { path = "../boot_node" } futures = "0.3.7" @@ -37,7 +33,6 @@ validator_client = { "path" = "../validator_client" } account_manager = { "path" = "../account_manager" } clap_utils = { path = "../common/clap_utils" } eth2_network_config = { path = "../common/eth2_network_config" } -directory = { path = "../common/directory" } lighthouse_version = { path = "../common/lighthouse_version" } account_utils = { path = "../common/account_utils" } lighthouse_metrics = { path = "../common/lighthouse_metrics" } @@ -45,7 +40,6 @@ lazy_static = "1.4.0" serde_json = "1.0.59" task_executor = { path = "../common/task_executor" } malloc_utils = { path = "../common/malloc_utils" } -target_check = { path = "../common/target_check" } [dev-dependencies] tempfile = "3.1.0" diff --git a/lighthouse/environment/Cargo.toml b/lighthouse/environment/Cargo.toml index 52e68f8a6..a0d8d534c 100644 --- a/lighthouse/environment/Cargo.toml +++ b/lighthouse/environment/Cargo.toml @@ -16,7 +16,6 @@ logging = { path = "../../common/logging" } slog-term = "2.6.0" slog-async = "2.5.0" futures = "0.3.7" -parking_lot = "0.11.0" slog-json = "2.3.0" exit-future = "0.2.0" filesystem = {"path" = "../../common/filesystem"} diff --git a/slasher/service/Cargo.toml b/slasher/service/Cargo.toml index 479b0fa3c..789cf7393 100644 --- a/slasher/service/Cargo.toml +++ b/slasher/service/Cargo.toml @@ -15,5 +15,4 @@ slot_clock = { path = "../../common/slot_clock" } state_processing = { path = "../../consensus/state_processing" } task_executor = { path = "../../common/task_executor" } tokio = { version = "1.10.0", features = ["full"] } -tokio-stream = "0.1.3" types = { path = "../../consensus/types" } diff --git a/testing/ef_tests/Cargo.toml b/testing/ef_tests/Cargo.toml index 2776ba5a0..33aa68f9c 100644 --- a/testing/ef_tests/Cargo.toml +++ b/testing/ef_tests/Cargo.toml @@ -31,5 +31,4 @@ state_processing = { path = "../../consensus/state_processing" } swap_or_not_shuffle = { path = "../../consensus/swap_or_not_shuffle" } types = { path = "../../consensus/types" } snap = "1.0.1" -parking_lot = "0.11.0" fs2 = "0.4.3" diff --git a/testing/eth1_test_rig/Cargo.toml b/testing/eth1_test_rig/Cargo.toml index 4f9a9be8f..2fdf7bf7b 100644 --- a/testing/eth1_test_rig/Cargo.toml +++ b/testing/eth1_test_rig/Cargo.toml @@ -7,7 +7,6 @@ edition = "2018" [dependencies] tokio = { version = "1.10.0", features = ["time"] } web3 = { version = "0.17.0", default-features = false, features = ["http-tls", "signing", "ws-tls-tokio"] } -futures = "0.3.7" types = { path = "../../consensus/types"} serde_json = "1.0.58" deposit_contract = { path = "../../common/deposit_contract"} diff --git a/testing/node_test_rig/Cargo.toml b/testing/node_test_rig/Cargo.toml index addd05e7e..be2416a6c 100644 --- a/testing/node_test_rig/Cargo.toml +++ b/testing/node_test_rig/Cargo.toml @@ -8,13 +8,7 @@ edition = "2018" environment = { path = "../../lighthouse/environment" } beacon_node = { path = "../../beacon_node" } types = { path = "../../consensus/types" } -eth2_config = { path = "../../common/eth2_config" } tempfile = "3.1.0" -reqwest = { version = "0.11.0", features = ["native-tls-vendored"] } -url = "2.1.1" -serde = "1.0.116" -futures = "0.3.7" -genesis = { path = "../../beacon_node/genesis" } eth2 = { path = "../../common/eth2" } validator_client = { path = "../../validator_client" } validator_dir = { path = "../../common/validator_dir", features = ["insecure_keys"] } diff --git a/testing/simulator/Cargo.toml b/testing/simulator/Cargo.toml index 688f1ca8d..66efa3189 100644 --- a/testing/simulator/Cargo.toml +++ b/testing/simulator/Cargo.toml @@ -10,7 +10,6 @@ edition = "2018" node_test_rig = { path = "../node_test_rig" } eth1 = {path = "../../beacon_node/eth1"} types = { path = "../../consensus/types" } -validator_client = { path = "../../validator_client" } parking_lot = "0.11.0" futures = "0.3.7" tokio = "1.10.0" diff --git a/validator_client/Cargo.toml b/validator_client/Cargo.toml index 38d57b005..83158e9ec 100644 --- a/validator_client/Cargo.toml +++ b/validator_client/Cargo.toml @@ -10,14 +10,10 @@ path = "src/lib.rs" [dev-dependencies] tokio = { version = "1.10.0", features = ["time", "rt-multi-thread", "macros"] } -deposit_contract = { path = "../common/deposit_contract" } [dependencies] -eth2_ssz = "0.4.0" -eth2_config = { path = "../common/eth2_config" } tree_hash = "0.4.0" clap = "2.33.3" -eth2_interop_keypairs = { path = "../common/eth2_interop_keypairs" } slashing_protection = { path = "./slashing_protection" } slot_clock = { path = "../common/slot_clock" } types = { path = "../consensus/types" } @@ -26,28 +22,21 @@ serde = "1.0.116" serde_derive = "1.0.116" bincode = "1.3.1" serde_json = "1.0.58" -serde_yaml = "0.8.13" slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] } -slog-async = "2.5.0" -slog-term = "2.6.0" tokio = { version = "1.10.0", features = ["time"] } futures = "0.3.7" dirs = "3.0.1" directory = { path = "../common/directory" } lockfile = { path = "../common/lockfile" } -logging = { path = "../common/logging" } environment = { path = "../lighthouse/environment" } parking_lot = "0.11.0" exit-future = "0.2.0" filesystem = { path = "../common/filesystem" } -libc = "0.2.79" -eth2_ssz_derive = "0.3.0" hex = "0.4.2" deposit_contract = { path = "../common/deposit_contract" } bls = { path = "../crypto/bls" } eth2 = { path = "../common/eth2" } tempfile = "3.1.0" -rayon = "1.4.1" validator_dir = { path = "../common/validator_dir" } clap_utils = { path = "../common/clap_utils" } eth2_keystore = { path = "../crypto/eth2_keystore" } @@ -60,10 +49,8 @@ eth2_serde_utils = "0.1.0" libsecp256k1 = "0.6.0" ring = "0.16.19" rand = "0.7.3" -scrypt = { version = "0.7.0", default-features = false } lighthouse_metrics = { path = "../common/lighthouse_metrics" } lazy_static = "1.4.0" -fallback = { path = "../common/fallback" } itertools = "0.10.0" monitoring_api = { path = "../common/monitoring_api" } sensitive_url = { path = "../common/sensitive_url" } diff --git a/validator_client/slashing_protection/Cargo.toml b/validator_client/slashing_protection/Cargo.toml index 6c121ab40..7f30170de 100644 --- a/validator_client/slashing_protection/Cargo.toml +++ b/validator_client/slashing_protection/Cargo.toml @@ -7,11 +7,9 @@ edition = "2018" [dependencies] tempfile = "3.1.0" types = { path = "../../consensus/types" } -tree_hash = "0.4.0" rusqlite = { version = "0.25.3", features = ["bundled"] } r2d2 = "0.8.9" r2d2_sqlite = "0.18.0" -parking_lot = "0.11.0" serde = "1.0.116" serde_derive = "1.0.116" serde_json = "1.0.58"