From c68e678cacd12df084d31f4b330ba5cd02036f5e Mon Sep 17 00:00:00 2001 From: Age Manning Date: Wed, 6 May 2020 21:23:50 +1000 Subject: [PATCH] Update all crates versions --- Cargo.lock | 733 +++++------------- Cargo.toml | 2 +- account_manager/Cargo.toml | 18 +- beacon_node/Cargo.toml | 22 +- beacon_node/beacon_chain/Cargo.toml | 20 +- beacon_node/client/Cargo.toml | 26 +- beacon_node/eth1/Cargo.toml | 28 +- beacon_node/eth2-libp2p/Cargo.toml | 4 +- beacon_node/eth2-libp2p/src/behaviour.rs | 1 + .../eth2-libp2p/src/discovery/enr_ext.rs | 4 + beacon_node/eth2-libp2p/src/discovery/mod.rs | 2 +- .../eth2-libp2p/src/peer_manager/mod.rs | 4 +- beacon_node/eth2-libp2p/src/rpc/codec/ssz.rs | 2 +- .../eth2-libp2p/src/rpc/codec/ssz_snappy.rs | 6 +- beacon_node/eth2-libp2p/src/rpc/handler.rs | 17 +- beacon_node/eth2-libp2p/src/rpc/protocol.rs | 19 +- beacon_node/eth2-libp2p/src/service.rs | 3 +- beacon_node/genesis/Cargo.toml | 22 +- beacon_node/network/Cargo.toml | 22 +- beacon_node/rest_api/Cargo.toml | 34 +- beacon_node/store/Cargo.toml | 16 +- beacon_node/timer/Cargo.toml | 6 +- beacon_node/websocket_server/Cargo.toml | 10 +- eth2/operation_pool/Cargo.toml | 8 +- eth2/proto_array_fork_choice/Cargo.toml | 8 +- eth2/state_processing/Cargo.toml | 18 +- eth2/types/Cargo.toml | 20 +- eth2/utils/bls/Cargo.toml | 10 +- eth2/utils/cached_tree_hash/Cargo.toml | 12 +- eth2/utils/clap_utils/Cargo.toml | 6 +- eth2/utils/compare_fields_derive/Cargo.toml | 4 +- eth2/utils/compare_fields_derive/src/lib.rs | 2 +- eth2/utils/deposit_contract/Cargo.toml | 10 +- eth2/utils/deposit_contract/build.rs | 4 +- eth2/utils/eth2_config/Cargo.toml | 6 +- eth2/utils/eth2_hashing/Cargo.toml | 6 +- eth2/utils/eth2_interop_keypairs/Cargo.toml | 10 +- eth2/utils/eth2_testnet_config/Cargo.toml | 11 +- eth2/utils/eth2_testnet_config/build.rs | 8 +- eth2/utils/hashmap_delay/src/hashmap_delay.rs | 164 ---- eth2/utils/hashmap_delay/src/lib.rs | 21 - .../Cargo.toml | 6 +- .../src/hashset_delay.rs | 0 eth2/utils/hashset_delay/src/lib.rs | 12 + eth2/utils/int_to_bytes/Cargo.toml | 4 +- eth2/utils/lighthouse_metrics/Cargo.toml | 2 +- eth2/utils/logging/Cargo.toml | 2 +- eth2/utils/merkle_proof/Cargo.toml | 6 +- eth2/utils/remote_beacon_node/Cargo.toml | 12 +- eth2/utils/rest_types/Cargo.toml | 10 +- eth2/utils/serde_hex/Cargo.toml | 4 +- eth2/utils/serde_hex/src/lib.rs | 9 +- eth2/utils/slot_clock/Cargo.toml | 2 +- eth2/utils/ssz/Cargo.toml | 2 +- eth2/utils/ssz_derive/Cargo.toml | 4 +- eth2/utils/ssz_derive/src/lib.rs | 6 +- eth2/utils/ssz_types/Cargo.toml | 10 +- eth2/utils/swap_or_not_shuffle/Cargo.toml | 4 +- eth2/utils/test_random_derive/Cargo.toml | 4 +- eth2/utils/test_random_derive/src/lib.rs | 2 +- eth2/utils/tree_hash/Cargo.toml | 10 +- eth2/utils/tree_hash_derive/Cargo.toml | 4 +- eth2/utils/tree_hash_derive/src/lib.rs | 5 +- lcli/Cargo.toml | 16 +- lighthouse/Cargo.toml | 16 +- lighthouse/environment/Cargo.toml | 18 +- lighthouse/environment/src/lib.rs | 20 +- tests/ef_tests/Cargo.toml | 14 +- tests/ef_tests/src/cases/bls_sign_msg.rs | 2 +- tests/eth1_test_rig/Cargo.toml | 6 +- tests/node_test_rig/Cargo.toml | 10 +- tests/simulator/Cargo.toml | 6 +- validator_client/Cargo.toml | 34 +- 73 files changed, 550 insertions(+), 1061 deletions(-) delete mode 100644 eth2/utils/hashmap_delay/src/hashmap_delay.rs delete mode 100644 eth2/utils/hashmap_delay/src/lib.rs rename eth2/utils/{hashmap_delay => hashset_delay}/Cargo.toml (53%) rename eth2/utils/{hashmap_delay => hashset_delay}/src/hashset_delay.rs (100%) create mode 100644 eth2/utils/hashset_delay/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 4388ba6646..5c41deeb5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,15 +13,15 @@ dependencies = [ "eth2_ssz", "eth2_ssz_derive", "eth2_testnet_config", - "futures 0.1.29", - "hex 0.3.2", + "futures 0.3.4", + "hex 0.4.2", "libc", "rayon", "slog", "slog-async", "slog-term", "tempdir", - "tokio 0.1.22", + "tokio 0.2.20", "types", "validator_client", "web3", @@ -160,8 +160,8 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ - "quote 1.0.4", - "syn 1.0.18", + "quote", + "syn", ] [[package]] @@ -266,15 +266,6 @@ dependencies = [ "safemem", ] -[[package]] -name = "base64" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -dependencies = [ - "byteorder 1.3.4", -] - [[package]] name = "base64" version = "0.11.0" @@ -307,7 +298,7 @@ dependencies = [ "lru", "merkle_proof", "operation_pool", - "parking_lot 0.9.0", + "parking_lot 0.10.2", "proto_array_fork_choice", "rand 0.7.3", "rayon", @@ -322,7 +313,7 @@ dependencies = [ "state_processing", "store", "tempfile", - "tokio 0.1.22", + "tokio 0.2.20", "tree_hash", "types", "websocket_server", @@ -338,14 +329,14 @@ dependencies = [ "client", "ctrlc", "dirs", - "env_logger 0.7.1", + "env_logger", "environment", "eth2-libp2p", "eth2_config", "eth2_ssz", "eth2_testnet_config", - "exit-future 0.1.4", - "futures 0.1.29", + "exit-future", + "futures 0.3.4", "genesis", "logging", "node_test_rig", @@ -355,7 +346,7 @@ dependencies = [ "slog-async", "slog-term", "store", - "tokio 0.1.22", + "tokio 0.2.20", "tokio-timer 0.2.13", "toml", "types", @@ -474,7 +465,7 @@ dependencies = [ "eth2_hashing", "eth2_ssz", "eth2_ssz_types", - "hex 0.3.2", + "hex 0.4.2", "milagro_bls", "rand 0.7.3", "serde", @@ -633,7 +624,7 @@ dependencies = [ "dirs", "eth2_ssz", "eth2_testnet_config", - "hex 0.3.2", + "hex 0.4.2", "types", ] @@ -658,14 +649,14 @@ dependencies = [ "eth2-libp2p", "eth2_config", "eth2_ssz", - "futures 0.1.29", + "futures 0.3.4", "genesis", "lazy_static", "lighthouse_metrics", "network", - "parking_lot 0.9.0", + "parking_lot 0.10.2", "prometheus", - "reqwest 0.9.24", + "reqwest", "rest_api", "serde", "serde_derive", @@ -676,7 +667,7 @@ dependencies = [ "slot_clock", "store", "timer", - "tokio 0.1.22", + "tokio 0.2.20", "toml", "tree_hash", "types", @@ -715,8 +706,8 @@ dependencies = [ name = "compare_fields_derive" version = "0.2.0" dependencies = [ - "quote 0.6.13", - "syn 0.15.44", + "quote", + "syn", ] [[package]] @@ -755,34 +746,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -[[package]] -name = "cookie" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" -dependencies = [ - "time", - "url 1.7.2", -] - -[[package]] -name = "cookie_store" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" -dependencies = [ - "cookie", - "failure", - "idna 0.1.5", - "log 0.4.8", - "publicsuffix", - "serde", - "serde_json", - "time", - "try_from", - "url 1.7.2", -] - [[package]] name = "core-foundation" version = "0.7.0" @@ -843,12 +806,6 @@ dependencies = [ "itertools 0.9.0", ] -[[package]] -name = "crossbeam" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd66663db5a988098a89599d4857919b3acf7f61402e61365acfd3919857b9be" - [[package]] name = "crossbeam" version = "0.7.3" @@ -896,7 +853,7 @@ dependencies = [ "lazy_static", "maybe-uninit", "memoffset", - "scopeguard 1.1.0", + "scopeguard", ] [[package]] @@ -1025,7 +982,7 @@ version = "0.2.0" dependencies = [ "eth2_ssz", "ethabi", - "reqwest 0.9.24", + "reqwest", "serde_json", "tree_hash", "types", @@ -1033,13 +990,13 @@ dependencies = [ [[package]] name = "derivative" -version = "1.0.4" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6d883546668a3e2011b6a716a7330b82eabb0151b138217f632c8243e17135" +checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f" dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -1048,9 +1005,9 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cee758ebd1c79a9c6fb95f242dcc30bdbf555c28369ae908d21fdaf81537496" dependencies = [ - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -1059,9 +1016,9 @@ version = "0.99.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2323f3f47db9a0e77ce7a300605d8d2098597fc451ed1a97bb1f6411bb550a7" dependencies = [ - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -1159,7 +1116,7 @@ dependencies = [ "eth2_ssz", "eth2_ssz_derive", "ethereum-types", - "hex 0.3.2", + "hex 0.4.2", "rayon", "serde", "serde_derive", @@ -1207,19 +1164,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "env_logger" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" -dependencies = [ - "atty", - "humantime", - "log 0.4.8", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.7.1" @@ -1240,18 +1184,18 @@ dependencies = [ "beacon_node", "clap", "ctrlc", - "env_logger 0.6.2", + "env_logger", "eth2_config", "eth2_testnet_config", - "futures 0.1.29", + "futures 0.3.4", "logging", - "parking_lot 0.7.1", + "parking_lot 0.10.2", "slog", "slog-async", "slog-json", "slog-term", "sloggers", - "tokio 0.1.22", + "tokio 0.2.20", "types", ] @@ -1275,13 +1219,13 @@ dependencies = [ "eth2_ssz", "eth2_ssz_derive", "futures 0.3.4", - "hex 0.3.2", + "hex 0.4.2", "lazy_static", "libflate", "lighthouse_metrics", "merkle_proof", - "parking_lot 0.7.1", - "reqwest 0.10.4", + "parking_lot 0.10.2", + "reqwest", "serde", "serde_json", "slog", @@ -1319,7 +1263,7 @@ dependencies = [ "eth2_ssz_types", "fnv", "futures 0.3.4", - "hashmap_delay", + "hashset_delay", "hex 0.4.2", "lazy_static", "libp2p", @@ -1331,7 +1275,7 @@ dependencies = [ "sha2", "slog", "slog-async", - "slog-stdlog 4.0.0", + "slog-stdlog", "slog-term", "smallvec 1.4.0", "snap", @@ -1341,7 +1285,7 @@ dependencies = [ "tokio-io-timeout", "tokio-util", "types", - "unsigned-varint", + "unsigned-varint 0.3.3 (git+https://github.com/sigp/unsigned-varint?branch=latest-codecs)", "version", "void", ] @@ -1371,9 +1315,9 @@ dependencies = [ name = "eth2_interop_keypairs" version = "0.2.0" dependencies = [ - "base64 0.11.0", + "base64 0.12.0", "eth2_hashing", - "hex 0.3.2", + "hex 0.4.2", "lazy_static", "milagro_bls", "num-bigint", @@ -1395,8 +1339,8 @@ dependencies = [ name = "eth2_ssz_derive" version = "0.1.0" dependencies = [ - "quote 0.6.13", - "syn 0.15.44", + "quote", + "syn", ] [[package]] @@ -1420,7 +1364,7 @@ version = "0.2.0" dependencies = [ "eth2-libp2p", "eth2_ssz", - "reqwest 0.9.24", + "reqwest", "serde", "serde_yaml", "tempdir", @@ -1468,16 +1412,6 @@ dependencies = [ "uint", ] -[[package]] -name = "exit-future" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8013f441e38e31c670e7f34ec8f1d5d3a2bd9d303c1ff83976ca886005e8f48" -dependencies = [ - "futures 0.1.29", - "parking_lot 0.7.1", -] - [[package]] name = "exit-future" version = "0.2.0" @@ -1487,28 +1421,6 @@ dependencies = [ "futures 0.3.4", ] -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", - "synstructure", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -1662,9 +1574,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -1747,11 +1659,11 @@ dependencies = [ "eth1_test_rig", "eth2_hashing", "eth2_ssz", - "exit-future 0.2.0", + "exit-future", "futures 0.3.4", "int_to_bytes", "merkle_proof", - "parking_lot 0.7.1", + "parking_lot 0.10.2", "rayon", "serde", "serde_derive", @@ -1843,7 +1755,7 @@ dependencies = [ ] [[package]] -name = "hashmap_delay" +name = "hashset_delay" version = "0.2.0" dependencies = [ "futures 0.3.4", @@ -2131,8 +2043,8 @@ dependencies = [ name = "int_to_bytes" version = "0.2.0" dependencies = [ - "bytes 0.4.12", - "hex 0.3.2", + "bytes 0.5.4", + "hex 0.4.2", "yaml-rust", ] @@ -2261,7 +2173,7 @@ dependencies = [ "eth2_testnet_config", "futures 0.3.4", "genesis", - "hex 0.3.2", + "hex 0.4.2", "log 0.4.8", "regex", "serde", @@ -2302,16 +2214,22 @@ checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" [[package]] name = "libflate" -version = "0.1.27" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9135df43b1f5d0e333385cb6e7897ecd1a43d7d11b91ac003f4d2c2d2401fdd" +checksum = "a1fbe6b967a94346446d37ace319ae85be7eca261bb8149325811ac435d35d64" dependencies = [ "adler32", "crc32fast", + "libflate_lz77", "rle-decode-fast", - "take_mut", ] +[[package]] +name = "libflate_lz77" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3286f09f7d4926fc486334f28d8d2e6ebe4f7f9994494b6dab27ddfad2c9b11b" + [[package]] name = "libp2p" version = "0.18.1" @@ -2379,7 +2297,7 @@ dependencies = [ "sha2", "smallvec 1.4.0", "thiserror", - "unsigned-varint", + "unsigned-varint 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "void", "zeroize", ] @@ -2390,8 +2308,8 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "329127858e4728db5ab60c33d5ae352a999325fdf190ed022ec7d3a4685ae2e6" dependencies = [ - "quote 1.0.4", - "syn 1.0.18", + "quote", + "syn", ] [[package]] @@ -2454,7 +2372,7 @@ dependencies = [ "rand 0.7.3", "sha2", "smallvec 1.4.0", - "unsigned-varint", + "unsigned-varint 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-timer", ] @@ -2496,7 +2414,7 @@ dependencies = [ "sha2", "smallvec 1.4.0", "uint", - "unsigned-varint", + "unsigned-varint 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "void", "wasm-timer", ] @@ -2536,7 +2454,7 @@ dependencies = [ "libp2p-core", "log 0.4.8", "parking_lot 0.10.2", - "unsigned-varint", + "unsigned-varint 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2589,7 +2507,7 @@ dependencies = [ "prost", "prost-build", "rw-stream-sink", - "unsigned-varint", + "unsigned-varint 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "void", ] @@ -2763,15 +2681,15 @@ dependencies = [ "beacon_node", "clap", "clap_utils", - "env_logger 0.6.2", + "env_logger", "environment", - "futures 0.1.29", + "futures 0.3.4", "logging", "slog", "slog-async", "slog-term", "sloggers", - "tokio 0.1.22", + "tokio 0.2.20", "types", "validator_client", ] @@ -2790,23 +2708,13 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" -[[package]] -name = "lock_api" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" -dependencies = [ - "owning_ref", - "scopeguard 0.3.3", -] - [[package]] name = "lock_api" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" dependencies = [ - "scopeguard 1.1.0", + "scopeguard", ] [[package]] @@ -3019,7 +2927,7 @@ dependencies = [ "sha-1", "sha2", "sha3", - "unsigned-varint", + "unsigned-varint 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3039,7 +2947,7 @@ dependencies = [ "log 0.4.8", "pin-project", "smallvec 1.4.0", - "unsigned-varint", + "unsigned-varint 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3080,11 +2988,11 @@ dependencies = [ "eth2-libp2p", "eth2_ssz", "fnv", - "futures 0.1.29", + "futures 0.3.4", "genesis", - "hashmap_delay", - "hex 0.3.2", - "parking_lot 0.9.0", + "hashset_delay", + "hex 0.4.2", + "parking_lot 0.10.2", "rand 0.7.3", "rest_types", "rlp", @@ -3094,7 +3002,7 @@ dependencies = [ "smallvec 1.4.0", "store", "tempdir", - "tokio 0.1.22", + "tokio 0.2.20", "tree_hash", "types", ] @@ -3119,14 +3027,14 @@ dependencies = [ "beacon_node", "environment", "eth2_config", - "futures 0.1.29", + "futures 0.3.4", "genesis", "remote_beacon_node", - "reqwest 0.9.24", + "reqwest", "serde", "tempdir", "types", - "url 1.7.2", + "url 2.1.1", "validator_client", ] @@ -3240,7 +3148,7 @@ dependencies = [ "eth2_ssz", "eth2_ssz_derive", "int_to_bytes", - "parking_lot 0.9.0", + "parking_lot 0.10.2", "rand 0.7.3", "serde", "serde_derive", @@ -3249,15 +3157,6 @@ dependencies = [ "types", ] -[[package]] -name = "owning_ref" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" -dependencies = [ - "stable_deref_trait", -] - [[package]] name = "parity-multiaddr" version = "0.8.0" @@ -3272,7 +3171,7 @@ dependencies = [ "percent-encoding 2.1.0", "serde", "static_assertions", - "unsigned-varint", + "unsigned-varint 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.1", ] @@ -3294,23 +3193,13 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -[[package]] -name = "parking_lot" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" -dependencies = [ - "lock_api 0.1.5", - "parking_lot_core 0.4.0", -] - [[package]] name = "parking_lot" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" dependencies = [ - "lock_api 0.3.4", + "lock_api", "parking_lot_core 0.6.2", "rustc_version", ] @@ -3321,23 +3210,10 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" dependencies = [ - "lock_api 0.3.4", + "lock_api", "parking_lot_core 0.7.2", ] -[[package]] -name = "parking_lot_core" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" -dependencies = [ - "libc", - "rand 0.6.5", - "rustc_version", - "smallvec 0.6.13", - "winapi 0.3.8", -] - [[package]] name = "parking_lot_core" version = "0.6.2" @@ -3404,9 +3280,9 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4d7346ac577ff1296e06a418e7618e22655bae834d4970cb6e39d6da8119969" dependencies = [ - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -3470,36 +3346,27 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694" -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - [[package]] name = "proc-macro2" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8872cf6f48eee44265156c111456a700ab3483686b3f96df4cf5481c89157319" dependencies = [ - "unicode-xid 0.2.0", + "unicode-xid", ] [[package]] name = "prometheus" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5567486d5778e2c6455b1b90ff1c558f29e751fc018130fa182e15828e728af1" +checksum = "b0575e258dab62268e7236d7307caa38848acbda7ec7ab87bd9093791e999d20" dependencies = [ "cfg-if", "fnv", "lazy_static", "protobuf", - "quick-error", "spin", + "thiserror", ] [[package]] @@ -3538,9 +3405,9 @@ checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72" dependencies = [ "anyhow", "itertools 0.8.2", - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -3559,8 +3426,8 @@ version = "0.2.0" dependencies = [ "eth2_ssz", "eth2_ssz_derive", - "itertools 0.8.2", - "parking_lot 0.9.0", + "itertools 0.9.0", + "parking_lot 0.10.2", "serde", "serde_derive", "serde_yaml", @@ -3573,19 +3440,6 @@ version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485" -[[package]] -name = "publicsuffix" -version = "1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b" -dependencies = [ - "error-chain", - "idna 0.2.0", - "lazy_static", - "regex", - "url 2.1.1", -] - [[package]] name = "quick-error" version = "1.2.3" @@ -3598,7 +3452,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" dependencies = [ - "env_logger 0.7.1", + "env_logger", "log 0.4.8", "rand 0.7.3", "rand_core 0.5.1", @@ -3606,13 +3460,13 @@ dependencies = [ [[package]] name = "quickcheck_macros" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7dfc1c4a1e048f5cc7d36a4c4118dfcf31d217c79f4b9a61bad65d68185752c" +checksum = "608c156fd8e97febc07dc9c2e2c80bf74cfc6ef26893eae3daf8bc2bc94a4b7f" dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -3626,22 +3480,13 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - [[package]] name = "quote" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7" dependencies = [ - "proc-macro2 1.0.12", + "proc-macro2", ] [[package]] @@ -3686,25 +3531,6 @@ dependencies = [ "winapi 0.3.8", ] -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.7", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift 0.1.1", - "winapi 0.3.8", -] - [[package]] name = "rand" version = "0.7.3" @@ -3713,19 +3539,9 @@ checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ "getrandom", "libc", - "rand_chacha 0.2.2", + "rand_chacha", "rand_core 0.5.1", - "rand_hc 0.2.0", -] - -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.3.1", + "rand_hc", ] [[package]] @@ -3762,15 +3578,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -3780,59 +3587,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi 0.3.8", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi 0.3.8", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rand_xorshift" version = "0.2.0" @@ -3926,15 +3680,15 @@ dependencies = [ "eth2_config", "eth2_ssz", "futures 0.3.4", - "hex 0.3.2", + "hex 0.4.2", "operation_pool", "proto_array_fork_choice", - "reqwest 0.10.4", + "reqwest", "rest_types", "serde", "serde_json", "types", - "url 1.7.2", + "url 2.1.1", ] [[package]] @@ -3946,40 +3700,6 @@ dependencies = [ "winapi 0.3.8", ] -[[package]] -name = "reqwest" -version = "0.9.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" -dependencies = [ - "base64 0.10.1", - "bytes 0.4.12", - "cookie", - "cookie_store", - "encoding_rs", - "flate2", - "futures 0.1.29", - "http 0.1.21", - "hyper 0.12.35", - "hyper-tls 0.3.2", - "log 0.4.8", - "mime 0.3.16", - "mime_guess", - "native-tls", - "serde", - "serde_json", - "serde_urlencoded 0.5.5", - "time", - "tokio 0.1.22", - "tokio-executor", - "tokio-io", - "tokio-threadpool", - "tokio-timer 0.2.13", - "url 1.7.2", - "uuid", - "winreg", -] - [[package]] name = "reqwest" version = "0.10.4" @@ -4005,7 +3725,7 @@ dependencies = [ "pin-project-lite", "serde", "serde_json", - "serde_urlencoded 0.6.1", + "serde_urlencoded", "time", "tokio 0.2.20", "tokio-tls 0.3.0", @@ -4026,16 +3746,16 @@ dependencies = [ "eth2_config", "eth2_ssz", "eth2_ssz_derive", - "futures 0.1.29", - "hex 0.3.2", - "http 0.1.21", - "hyper 0.12.35", + "futures 0.3.4", + "hex 0.4.2", + "http 0.2.1", + "hyper 0.13.5", "lazy_static", "lighthouse_metrics", "network", "node_test_rig", "operation_pool", - "parking_lot 0.9.0", + "parking_lot 0.10.2", "rayon", "remote_beacon_node", "rest_types", @@ -4048,7 +3768,7 @@ dependencies = [ "slot_clock", "state_processing", "store", - "tokio 0.1.22", + "tokio 0.2.20", "tree_hash", "types", "url 2.1.1", @@ -4224,12 +3944,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" -[[package]] -name = "scopeguard" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" - [[package]] name = "scopeguard" version = "1.1.0" @@ -4323,16 +4037,16 @@ version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" dependencies = [ - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "serde_hex" version = "0.2.0" dependencies = [ - "hex 0.3.2", + "hex 0.4.2", "serde", ] @@ -4353,21 +4067,9 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd02c7587ec314570041b2754829f84d873ced14a96d1fd1823531e11db40573" dependencies = [ - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", -] - -[[package]] -name = "serde_urlencoded" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" -dependencies = [ - "dtoa", - "itoa", - "serde", - "url 1.7.2", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -4465,12 +4167,12 @@ name = "simulator" version = "0.2.0" dependencies = [ "clap", - "env_logger 0.7.1", + "env_logger", "eth1_test_rig", - "futures 0.1.29", + "futures 0.3.4", "node_test_rig", - "parking_lot 0.9.0", - "tokio 0.1.22", + "parking_lot 0.10.2", + "tokio 0.2.20", "types", "validator_client", ] @@ -4538,25 +4240,13 @@ dependencies = [ "slog", ] -[[package]] -name = "slog-stdlog" -version = "3.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c469573d1e3f36f9eee66cd132206caf47b50c94b1f6c6e7b4d8235e9ecf01" -dependencies = [ - "crossbeam 0.2.12", - "log 0.3.9", - "slog", - "slog-scope", -] - [[package]] name = "slog-stdlog" version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4d87903baf655da2d82bc3ac3f7ef43868c58bf712b3a661fda72009304c23" dependencies = [ - "crossbeam 0.7.3", + "crossbeam", "log 0.4.8", "slog", "slog-scope", @@ -4577,20 +4267,19 @@ dependencies = [ [[package]] name = "sloggers" -version = "0.3.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31bef221d42166d6708aa1e9b0182324b37a0a7517ff590ec201dbfe1cfa46ef" +checksum = "a17da19b392c9b9e830188839ca3cbb3affeff28606aa30440cb72ca72aa1684" dependencies = [ "chrono", "libflate", "regex", "serde", - "serde_derive", "slog", "slog-async", "slog-kvfilter", "slog-scope", - "slog-stdlog 3.0.5", + "slog-stdlog", "slog-term", "trackable", ] @@ -4601,7 +4290,7 @@ version = "0.2.0" dependencies = [ "lazy_static", "lighthouse_metrics", - "parking_lot 0.9.0", + "parking_lot 0.10.2", "types", ] @@ -4682,12 +4371,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "stable_deref_trait" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" - [[package]] name = "state_processing" version = "0.2.0" @@ -4696,13 +4379,13 @@ dependencies = [ "beacon_chain", "bls", "criterion", - "env_logger 0.7.1", + "env_logger", "eth2_hashing", "eth2_ssz", "eth2_ssz_types", "int_to_bytes", "integer-sqrt", - "itertools 0.8.2", + "itertools 0.9.0", "lazy_static", "log 0.4.8", "merkle_proof", @@ -4731,12 +4414,12 @@ dependencies = [ "db-key", "eth2_ssz", "eth2_ssz_derive", - "itertools 0.8.2", + "itertools 0.9.0", "lazy_static", "leveldb", "lighthouse_metrics", "lru", - "parking_lot 0.9.0", + "parking_lot 0.10.2", "rayon", "serde", "serde_derive", @@ -4791,30 +4474,19 @@ dependencies = [ "criterion", "eth2_hashing", "ethereum-types", - "hex 0.3.2", + "hex 0.4.2", "yaml-rust", ] -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - [[package]] name = "syn" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" dependencies = [ - "proc-macro2 1.0.12", - "quote 1.0.4", - "unicode-xid 0.2.0", + "proc-macro2", + "quote", + "unicode-xid", ] [[package]] @@ -4823,10 +4495,10 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" dependencies = [ - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", - "unicode-xid 0.2.0", + "proc-macro2", + "quote", + "syn", + "unicode-xid", ] [[package]] @@ -4888,8 +4560,8 @@ dependencies = [ name = "test_random_derive" version = "0.2.0" dependencies = [ - "quote 0.6.13", - "syn 0.15.44", + "quote", + "syn", ] [[package]] @@ -4916,9 +4588,9 @@ version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f34e0c1caaa462fd840ec6b768946ea1e7842620d94fe29d5b847138f521269" dependencies = [ - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -5128,9 +4800,9 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" dependencies = [ - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -5318,21 +4990,21 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "trackable" -version = "0.2.23" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11475c3c53b075360eac9794965822cb053996046545f91cf61d90e00b72efa5" +checksum = "30fb6e13d129dd92c501458f64d56c708e3685e3fd307e878ec5f934c5c5bdb0" dependencies = [ "trackable_derive", ] [[package]] name = "trackable_derive" -version = "0.1.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edcf0b9b2caa5f4804ef77aeee1b929629853d806117c48258f402b69737e65c" +checksum = "ebeb235c5847e2f82cfe0f07eb971d1e5f6804b18dac2ae16349cc604380f82f" dependencies = [ - "quote 1.0.4", - "syn 1.0.18", + "quote", + "syn", ] [[package]] @@ -5359,8 +5031,8 @@ dependencies = [ name = "tree_hash_derive" version = "0.2.0" dependencies = [ - "quote 0.6.13", - "syn 0.15.44", + "quote", + "syn", ] [[package]] @@ -5369,15 +5041,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" -[[package]] -name = "try_from" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" -dependencies = [ - "cfg-if", -] - [[package]] name = "twofish" version = "0.2.0" @@ -5413,19 +5076,19 @@ dependencies = [ "criterion", "derivative", "dirs", - "env_logger 0.7.1", + "env_logger", "eth2_hashing", "eth2_interop_keypairs", "eth2_ssz", "eth2_ssz_derive", "eth2_ssz_types", "ethereum-types", - "hex 0.3.2", + "hex 0.4.2", "int_to_bytes", "log 0.4.8", "merkle_proof", "rand 0.7.3", - "rand_xorshift 0.2.0", + "rand_xorshift", "rayon", "safe_arith", "serde", @@ -5501,18 +5164,21 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - [[package]] name = "unicode-xid" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +[[package]] +name = "unsigned-varint" +version = "0.3.3" +source = "git+https://github.com/sigp/unsigned-varint?branch=latest-codecs#76fc423494e59f1ec4c8948bd0d3ae3c09851909" +dependencies = [ + "bytes 0.5.4", + "tokio-util", +] + [[package]] name = "unsigned-varint" version = "0.3.3" @@ -5551,15 +5217,6 @@ dependencies = [ "percent-encoding 2.1.0", ] -[[package]] -name = "uuid" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" -dependencies = [ - "rand 0.6.5", -] - [[package]] name = "validator_client" version = "0.2.0" @@ -5575,12 +5232,12 @@ dependencies = [ "eth2_interop_keypairs", "eth2_ssz", "eth2_ssz_derive", - "exit-future 0.1.4", - "futures 0.1.29", - "hex 0.3.2", + "exit-future", + "futures 0.3.4", + "hex 0.4.2", "libc", "logging", - "parking_lot 0.7.1", + "parking_lot 0.10.2", "rayon", "remote_beacon_node", "rest_types", @@ -5592,7 +5249,7 @@ dependencies = [ "slog-term", "slot_clock", "tempdir", - "tokio 0.1.22", + "tokio 0.2.20", "tokio-timer 0.2.13", "tree_hash", "types", @@ -5695,9 +5352,9 @@ dependencies = [ "bumpalo", "lazy_static", "log 0.4.8", - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", + "proc-macro2", + "quote", + "syn", "wasm-bindgen-shared", ] @@ -5719,7 +5376,7 @@ version = "0.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cd85aa2c579e8892442954685f0d801f9129de24fa2136b2c6a539c76b65776" dependencies = [ - "quote 1.0.4", + "quote", "wasm-bindgen-macro-support", ] @@ -5729,9 +5386,9 @@ version = "0.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eb197bd3a47553334907ffd2f16507b4f4f01bbec3ac921a7719e0decdfe72a" dependencies = [ - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", + "proc-macro2", + "quote", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5762,8 +5419,8 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c358c8d2507c1bae25efa069e62ea907aa28700b25c8c33dafb0b15ba4603627" dependencies = [ - "proc-macro2 1.0.12", - "quote 1.0.4", + "proc-macro2", + "quote", ] [[package]] @@ -6026,8 +5683,8 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" dependencies = [ - "proc-macro2 1.0.12", - "quote 1.0.4", - "syn 1.0.18", + "proc-macro2", + "quote", + "syn", "synstructure", ] diff --git a/Cargo.toml b/Cargo.toml index 75bfa5644f..900747843f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ members = [ "eth2/utils/eth2_testnet_config", "eth2/utils/logging", "eth2/utils/eth2_hashing", - "eth2/utils/hashmap_delay", + "eth2/utils/hashset_delay", "eth2/utils/lighthouse_metrics", "eth2/utils/merkle_proof", "eth2/utils/int_to_bytes", diff --git a/account_manager/Cargo.toml b/account_manager/Cargo.toml index 9588767faf..cd231552a9 100644 --- a/account_manager/Cargo.toml +++ b/account_manager/Cargo.toml @@ -5,26 +5,26 @@ authors = ["Paul Hauner ", "Luke Anderson "] edition = "2018" [dev-dependencies] -sloggers = "0.3.4" -toml = "^0.5" +sloggers = "1.0.0" +toml = "0.5.6" [dependencies] beacon_chain = { path = "../beacon_chain" } @@ -15,27 +15,27 @@ network = { path = "../network" } timer = { path = "../timer" } eth2-libp2p = { path = "../eth2-libp2p" } rest_api = { path = "../rest_api" } -parking_lot = "0.9.0" +parking_lot = "0.10.2" websocket_server = { path = "../websocket_server" } -prometheus = "0.7.0" +prometheus = "0.8.0" types = { path = "../../eth2/types" } tree_hash = "0.1.0" eth2_config = { path = "../../eth2/utils/eth2_config" } slot_clock = { path = "../../eth2/utils/slot_clock" } -serde = "1.0.102" -serde_derive = "1.0.102" -error-chain = "0.12.1" +serde = "1.0.106" +serde_derive = "1.0.106" +error-chain = "0.12.2" serde_yaml = "0.8.11" slog = { version = "2.5.2", features = ["max_level_trace"] } -slog-async = "2.3.0" -tokio = "0.1.22" +slog-async = "2.5.0" +tokio = "0.2.20" dirs = "2.0.2" -futures = "0.1.29" -reqwest = "0.9.22" -url = "2.1.0" +futures = "0.3.4" +reqwest = "0.10.4" +url = "2.1.1" eth1 = { path = "../eth1" } genesis = { path = "../genesis" } environment = { path = "../../lighthouse/environment" } -eth2_ssz = { path = "../../eth2/utils/ssz" } +eth2_ssz = "0.1.2" lazy_static = "1.4.0" lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" } diff --git a/beacon_node/eth1/Cargo.toml b/beacon_node/eth1/Cargo.toml index 4e95602aba..9cb9e45d1f 100644 --- a/beacon_node/eth1/Cargo.toml +++ b/beacon_node/eth1/Cargo.toml @@ -7,26 +7,26 @@ edition = "2018" [dev-dependencies] eth1_test_rig = { path = "../../tests/eth1_test_rig" } environment = { path = "../../lighthouse/environment" } -toml = "^0.5" +toml = "0.5.6" web3 = "0.10.0" -sloggers = "0.3.4" +sloggers = "1.0.0" [dependencies] -reqwest = "0.10" -futures = {version = "0.3", features = ["compat"]} -serde_json = "1.0" -serde = { version = "1.0", features = ["derive"] } -hex = "0.3" +reqwest = "0.10.4" +futures = { version = "0.3.4", features = ["compat"] } +serde_json = "1.0.52" +serde = { version = "1.0.106", features = ["derive"] } +hex = "0.4.2" types = { path = "../../eth2/types"} merkle_proof = { path = "../../eth2/utils/merkle_proof"} -eth2_ssz = { path = "../../eth2/utils/ssz"} +eth2_ssz = "0.1.2" eth2_ssz_derive = "0.1.0" -tree_hash = { path = "../../eth2/utils/tree_hash"} -eth2_hashing = { path = "../../eth2/utils/eth2_hashing"} -parking_lot = "0.7" -slog = "^2.2.3" -tokio = { version = "0.2", features = ["full"] } +tree_hash = "0.1.0" +eth2_hashing = "0.1.0" +parking_lot = "0.10.2" +slog = "2.5.2" +tokio = { version = "0.2.20", features = ["full"] } state_processing = { path = "../../eth2/state_processing" } -libflate = "0.1" +libflate = "1.0.0" lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics"} lazy_static = "1.4.0" diff --git a/beacon_node/eth2-libp2p/Cargo.toml b/beacon_node/eth2-libp2p/Cargo.toml index b3c84e34c6..fe8f5547db 100644 --- a/beacon_node/eth2-libp2p/Cargo.toml +++ b/beacon_node/eth2-libp2p/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] hex = "0.4.2" types = { path = "../../eth2/types" } -hashmap_delay = { path = "../../eth2/utils/hashmap_delay" } +hashset_delay = { path = "../../eth2/utils/hashset_delay" } eth2_ssz_types = { path = "../../eth2/utils/ssz_types" } serde = { version = "1.0.106", features = ["derive"] } serde_derive = "1.0.106" @@ -20,7 +20,7 @@ futures = "0.3.4" error-chain = "0.12.2" dirs = "2.0.2" fnv = "1.0.6" -unsigned-varint = "0.3.3" +unsigned-varint = { git = "https://github.com/sigp/unsigned-varint", branch = "latest-codecs", features = ["codec"] } lazy_static = "1.4.0" lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" } smallvec = "1.4.0" diff --git a/beacon_node/eth2-libp2p/src/behaviour.rs b/beacon_node/eth2-libp2p/src/behaviour.rs index e029ddc1ff..fecdd32ec2 100644 --- a/beacon_node/eth2-libp2p/src/behaviour.rs +++ b/beacon_node/eth2-libp2p/src/behaviour.rs @@ -4,6 +4,7 @@ use crate::rpc::*; use crate::types::{GossipEncoding, GossipKind, GossipTopic}; use crate::{error, Enr, NetworkConfig, NetworkGlobals, PubsubMessage, TopicHash}; use discv5::Discv5Event; +use futures::prelude::*; use libp2p::{ core::{identity::Keypair, ConnectedPoint}, gossipsub::{Gossipsub, GossipsubEvent, MessageId}, diff --git a/beacon_node/eth2-libp2p/src/discovery/enr_ext.rs b/beacon_node/eth2-libp2p/src/discovery/enr_ext.rs index 514fb3a8e2..8de09196ff 100644 --- a/beacon_node/eth2-libp2p/src/discovery/enr_ext.rs +++ b/beacon_node/eth2-libp2p/src/discovery/enr_ext.rs @@ -118,6 +118,7 @@ impl CombinedKeyExt for CombinedKey { fn peer_id_to_node_id(peer_id: &PeerId) -> Option { let bytes = peer_id.as_bytes(); // must be the identity hash + /* To be updated if bytes.len() == 34 && bytes[0] == 0x00 { // left over is potentially secp256k1 key @@ -130,9 +131,11 @@ fn peer_id_to_node_id(peer_id: &PeerId) -> Option { return Some(discv5::enr::NodeId::parse(&output).expect("Must be correct length")); } } + */ None } +/* mod tests { use super::*; use std::convert::TryInto; @@ -161,3 +164,4 @@ mod tests { assert_eq!(enr.node_id(), node_id); } } +*/ diff --git a/beacon_node/eth2-libp2p/src/discovery/mod.rs b/beacon_node/eth2-libp2p/src/discovery/mod.rs index f46338600e..bc43f62597 100644 --- a/beacon_node/eth2-libp2p/src/discovery/mod.rs +++ b/beacon_node/eth2-libp2p/src/discovery/mod.rs @@ -386,7 +386,7 @@ impl NetworkBehaviour for Discovery { // ENR's may have multiple Multiaddrs. The multi-addr associated with the UDP // port is removed, which is assumed to be associated with the discv5 protocol (and // therefore irrelevant for other libp2p components). - let out_list = enr.multiaddr(); + let mut out_list = enr.multiaddr(); out_list.retain(|addr| { addr.iter() .find(|v| match v { diff --git a/beacon_node/eth2-libp2p/src/peer_manager/mod.rs b/beacon_node/eth2-libp2p/src/peer_manager/mod.rs index d019240990..9bbe0ed5d0 100644 --- a/beacon_node/eth2-libp2p/src/peer_manager/mod.rs +++ b/beacon_node/eth2-libp2p/src/peer_manager/mod.rs @@ -6,7 +6,7 @@ use crate::rpc::{MetaData, Protocol, RPCError, RPCResponseErrorCode}; use crate::{NetworkGlobals, PeerId}; use futures::prelude::*; use futures::Stream; -use hashmap_delay::HashSetDelay; +use hashset_delay::HashSetDelay; use libp2p::identify::IdentifyInfo; use slog::{crit, debug, error, warn}; use smallvec::SmallVec; @@ -453,7 +453,7 @@ impl PeerManager { impl Stream for PeerManager { type Item = PeerManagerEvent; - fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { + fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { // poll the timeouts for pings and status' loop { match self.ping_peers.poll_next_unpin(cx) { diff --git a/beacon_node/eth2-libp2p/src/rpc/codec/ssz.rs b/beacon_node/eth2-libp2p/src/rpc/codec/ssz.rs index 94d8a7df8a..0f763e997d 100644 --- a/beacon_node/eth2-libp2p/src/rpc/codec/ssz.rs +++ b/beacon_node/eth2-libp2p/src/rpc/codec/ssz.rs @@ -203,7 +203,7 @@ impl Decoder for SSZOutboundCodec { match self.inner.decode(src).map_err(RPCError::from) { Ok(Some(mut packet)) => { // take the bytes from the buffer - let raw_bytes = packet.take(); + let raw_bytes = packet.split(); match self.protocol.message_name { Protocol::Status => match self.protocol.version { diff --git a/beacon_node/eth2-libp2p/src/rpc/codec/ssz_snappy.rs b/beacon_node/eth2-libp2p/src/rpc/codec/ssz_snappy.rs index fe658ebc2a..6c6e09f4db 100644 --- a/beacon_node/eth2-libp2p/src/rpc/codec/ssz_snappy.rs +++ b/beacon_node/eth2-libp2p/src/rpc/codec/ssz_snappy.rs @@ -119,7 +119,7 @@ impl Decoder for SSZSnappyInboundCodec { // `n` is how many bytes the reader read in the compressed stream let n = reader.get_ref().position(); self.len = None; - src.split_to(n as usize); + let _read_bytes = src.split_to(n as usize); match self.protocol.message_name { Protocol::Status => match self.protocol.version { Version::V1 => Ok(Some(RPCRequest::Status(StatusMessage::from_ssz_bytes( @@ -264,7 +264,7 @@ impl Decoder for SSZSnappyOutboundCodec { // `n` is how many bytes the reader read in the compressed stream let n = reader.get_ref().position(); self.len = None; - src.split_to(n as usize); + let _read_byts = src.split_to(n as usize); match self.protocol.message_name { Protocol::Status => match self.protocol.version { Version::V1 => Ok(Some(RPCResponse::Status( @@ -336,7 +336,7 @@ impl OutboundCodec> for SSZSnappyOutboundCodec // `n` is how many bytes the reader read in the compressed stream let n = reader.get_ref().position(); self.len = None; - src.split_to(n as usize); + let _read_bytes = src.split_to(n as usize); Ok(Some(ErrorMessage::from_ssz_bytes(&decoded_buffer)?)) } Err(e) => match e.kind() { diff --git a/beacon_node/eth2-libp2p/src/rpc/handler.rs b/beacon_node/eth2-libp2p/src/rpc/handler.rs index e0830da547..5ff20dc296 100644 --- a/beacon_node/eth2-libp2p/src/rpc/handler.rs +++ b/beacon_node/eth2-libp2p/src/rpc/handler.rs @@ -466,6 +466,13 @@ where }; error!(self.log, "Attempted sending multiple responses to a single response request"); } + InboundSubstreamState::ResponsePendingFlush { substream, .. } => { + *substream_state = InboundSubstreamState::ResponsePendingFlush { + substream, + closing: true, + }; + error!(self.log, "Attempted sending multiple responses to a single response request"); + } InboundSubstreamState::Poisoned => { crit!(self.log, "Poisoned inbound substream"); unreachable!("Coding error: Poisoned substream"); @@ -510,7 +517,7 @@ where ProtocolsHandlerUpgrErr::Upgrade(UpgradeError::Select( NegotiationError::ProtocolError(e), )) => match e { - ProtocolError::IoError(io_err) => RPCError::IoError(io_err), + ProtocolError::IoError(io_err) => RPCError::IoError(io_err.to_string()), ProtocolError::InvalidProtocol => { RPCError::InternalError("Protocol was deemed invalid") } @@ -578,7 +585,7 @@ where "Could not poll inbound stream timer", ))); } - Poll::Pending => break, + Poll::Pending | Poll::Ready(None) => break, } } @@ -605,7 +612,7 @@ where "Could not poll outbound stream timer", ))); } - Poll::Pending => break, + Poll::Pending | Poll::Ready(None) => break, } } @@ -641,7 +648,7 @@ where } Err(e) => { // error with sending in the codec - error!(self.log, "Error sending RPC message"; "message" => message.to_string()); + error!(self.log, "Error sending RPC message"; "error" => e.to_string()); // keep connection with the peer and return the // stream to awaiting response if this message // wasn't closing the stream @@ -701,7 +708,7 @@ where } Poll::Ready(Err(e)) => { // error during flush - error!(self.log, "Error sending flushing RPC message"); + error!(self.log, "Error sending flushing RPC message"; "error" => e.to_string()); // close the stream if required // TODO: Duplicate code if closing { diff --git a/beacon_node/eth2-libp2p/src/rpc/protocol.rs b/beacon_node/eth2-libp2p/src/rpc/protocol.rs index a89c03c4e4..0b352c58e5 100644 --- a/beacon_node/eth2-libp2p/src/rpc/protocol.rs +++ b/beacon_node/eth2-libp2p/src/rpc/protocol.rs @@ -10,19 +10,18 @@ use crate::rpc::{ }, methods::ResponseTermination, }; -use futures::future::*; +use futures::future::Ready; use futures::prelude::*; use futures::prelude::{AsyncRead, AsyncWrite}; -use libp2p::core::{upgrade, InboundUpgrade, OutboundUpgrade, ProtocolName, UpgradeInfo}; +use libp2p::core::{InboundUpgrade, OutboundUpgrade, ProtocolName, UpgradeInfo}; use std::io; use std::marker::PhantomData; use std::pin::Pin; -use std::task::{Context, Poll}; use std::time::Duration; use tokio_io_timeout::TimeoutStream; use tokio_util::{ codec::Framed, - compat::{Compat, FuturesAsyncReadCompatExt, FuturesAsyncWriteCompatExt}, + compat::{Compat, FuturesAsyncReadCompatExt}, }; use types::EthSpec; @@ -375,8 +374,10 @@ where } }; - let socket = Framed::new(socket, codec); - Box::pin(future::join(socket.send(self), future::ok(socket)).map(|(_, socket)| socket)) + let mut socket = Framed::new(socket, codec); + + let future = async { socket.send(self).await.map(|_| socket) }; + Box::pin(future) } } @@ -411,7 +412,7 @@ impl From for RPCError { } } impl From for RPCError { - fn from(err: tokio::time::Elapsed) -> Self { + fn from(_: tokio::time::Elapsed) -> Self { RPCError::StreamTimeout } } @@ -444,7 +445,7 @@ impl std::error::Error for RPCError { match *self { // NOTE: this does have a source RPCError::SSZDecodeError(_) => None, - RPCError::IoError(ref err) => Some(err), + RPCError::IoError(_) => None, RPCError::StreamTimeout => None, RPCError::UnsupportedProtocol => None, RPCError::IncompleteStream => None, @@ -469,6 +470,7 @@ impl std::fmt::Display for RPCRequest { } } +/* /// Converts a futures AsyncRead + AsyncWrite object to a tokio::AsyncRead + tokio::AsyncWrite /// object. struct TokioNegotiatedStream(T); @@ -498,3 +500,4 @@ impl tokio::io::AsyncWrite for TokioNegotiate Pin::new(&mut self.0).poll_close(cx) } } +*/ diff --git a/beacon_node/eth2-libp2p/src/service.rs b/beacon_node/eth2-libp2p/src/service.rs index b5252d7a1c..9a14a0fd86 100644 --- a/beacon_node/eth2-libp2p/src/service.rs +++ b/beacon_node/eth2-libp2p/src/service.rs @@ -182,7 +182,7 @@ impl Service { impl Stream for Service { type Item = Result, error::Error>; - fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { + fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { loop { match self.swarm.poll_next_unpin(cx) { Poll::Ready(Some(event)) => { @@ -190,7 +190,6 @@ impl Stream for Service { } Poll::Ready(None) => unreachable!("Swarm stream shouldn't end"), Poll::Pending => break, - _ => break, } } diff --git a/beacon_node/genesis/Cargo.toml b/beacon_node/genesis/Cargo.toml index 106846342c..aae39bd5fd 100644 --- a/beacon_node/genesis/Cargo.toml +++ b/beacon_node/genesis/Cargo.toml @@ -8,20 +8,20 @@ edition = "2018" eth1_test_rig = { path = "../../tests/eth1_test_rig" } [dependencies] -futures = "0.3" +futures = "0.3.4" types = { path = "../../eth2/types"} environment = { path = "../../lighthouse/environment"} eth1 = { path = "../eth1"} -rayon = "1.0" +rayon = "1.3.0" state_processing = { path = "../../eth2/state_processing" } merkle_proof = { path = "../../eth2/utils/merkle_proof" } -eth2_ssz = "0.1" -eth2_hashing = { path = "../../eth2/utils/eth2_hashing" } -tree_hash = "0.1" -tokio = {version = "0.2", features = ["full"]} -parking_lot = "0.7" -slog = "^2.2.3" -exit-future = "0.2" -serde = "1.0" -serde_derive = "1.0" +eth2_ssz = "0.1.2" +eth2_hashing = "0.1.0" +tree_hash = "0.1.0" +tokio = { version = "0.2.20", features = ["full"] } +parking_lot = "0.10.2" +slog = "2.5.2" +exit-future = "0.2.0" +serde = "1.0.106" +serde_derive = "1.0.106" int_to_bytes = { path = "../../eth2/utils/int_to_bytes" } diff --git a/beacon_node/network/Cargo.toml b/beacon_node/network/Cargo.toml index 88b1b25606..ab1ee5ffc4 100644 --- a/beacon_node/network/Cargo.toml +++ b/beacon_node/network/Cargo.toml @@ -5,28 +5,28 @@ authors = ["Age Manning "] edition = "2018" [dev-dependencies] -sloggers = "0.3.4" +sloggers = "1.0.0" genesis = { path = "../genesis" } -tempdir = "0.3" +tempdir = "0.3.7" [dependencies] beacon_chain = { path = "../beacon_chain" } store = { path = "../store" } eth2-libp2p = { path = "../eth2-libp2p" } -hashmap_delay = { path = "../../eth2/utils/hashmap_delay" } +hashset_delay = { path = "../../eth2/utils/hashset_delay" } rest_types = { path = "../../eth2/utils/rest_types" } types = { path = "../../eth2/types" } slot_clock = { path = "../../eth2/utils/slot_clock" } slog = { version = "2.5.2", features = ["max_level_trace"] } -hex = "0.3" +hex = "0.4.2" eth2_ssz = "0.1.2" tree_hash = "0.1.0" -futures = "0.1.29" -error-chain = "0.12.1" -tokio = "0.1.22" -parking_lot = "0.9.0" -smallvec = "1.0.0" +futures = "0.3.4" +error-chain = "0.12.2" +tokio = "0.2.20" +parking_lot = "0.10.2" +smallvec = "1.4.0" # TODO: Remove rand crate for mainnet -rand = "0.7.2" +rand = "0.7.3" fnv = "1.0.6" -rlp = "0.4.3" +rlp = "0.4.5" diff --git a/beacon_node/rest_api/Cargo.toml b/beacon_node/rest_api/Cargo.toml index c754ba4814..5049ae6eba 100644 --- a/beacon_node/rest_api/Cargo.toml +++ b/beacon_node/rest_api/Cargo.toml @@ -13,31 +13,31 @@ network = { path = "../network" } eth2-libp2p = { path = "../eth2-libp2p" } store = { path = "../store" } version = { path = "../version" } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -serde_yaml = "0.8" -slog = "2.5" -slog-term = "2.4" -slog-async = "2.3" -eth2_ssz = { path = "../../eth2/utils/ssz" } -eth2_ssz_derive = { path = "../../eth2/utils/ssz_derive" } +serde = { version = "1.0.106", features = ["derive"] } +serde_json = "1.0.52" +serde_yaml = "0.8.11" +slog = "2.5.2" +slog-term = "2.5.0" +slog-async = "2.5.0" +eth2_ssz = "0.1.2" +eth2_ssz_derive = "0.1.0" state_processing = { path = "../../eth2/state_processing" } types = { path = "../../eth2/types" } -http = "0.1" -hyper = "0.12" -tokio = "0.1.22" -url = "2.1" -lazy_static = "1.3.0" +http = "0.2.1" +hyper = "0.13.5" +tokio = "0.2.20" +url = "2.1.1" +lazy_static = "1.4.0" eth2_config = { path = "../../eth2/utils/eth2_config" } lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" } slot_clock = { path = "../../eth2/utils/slot_clock" } -hex = "0.3" -parking_lot = "0.9" -futures = "0.1.29" +hex = "0.4.2" +parking_lot = "0.10.2" +futures = "0.3.4" operation_pool = { path = "../../eth2/operation_pool" } rayon = "1.3.0" [dev-dependencies] remote_beacon_node = { path = "../../eth2/utils/remote_beacon_node" } node_test_rig = { path = "../../tests/node_test_rig" } -tree_hash = { path = "../../eth2/utils/tree_hash" } +tree_hash = "0.1.0" diff --git a/beacon_node/store/Cargo.toml b/beacon_node/store/Cargo.toml index 36a34738a4..aa9d25bc25 100644 --- a/beacon_node/store/Cargo.toml +++ b/beacon_node/store/Cargo.toml @@ -10,23 +10,23 @@ harness = false [dev-dependencies] tempfile = "3.1.0" -sloggers = "0.3.2" -criterion = "0.3.0" -rayon = "1.2.0" +sloggers = "1.0.0" +criterion = "0.3.2" +rayon = "1.3.0" [dependencies] db-key = "0.0.5" leveldb = "0.8.4" -parking_lot = "0.9.0" -itertools = "0.8" +parking_lot = "0.10.2" +itertools = "0.9.0" eth2_ssz = "0.1.2" eth2_ssz_derive = "0.1.0" tree_hash = "0.1.0" types = { path = "../../eth2/types" } state_processing = { path = "../../eth2/state_processing" } -slog = "2.2.3" -serde = "1.0" -serde_derive = "1.0.102" +slog = "2.5.2" +serde = "1.0.106" +serde_derive = "1.0.106" lazy_static = "1.4.0" lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" } lru = "0.4.3" diff --git a/beacon_node/timer/Cargo.toml b/beacon_node/timer/Cargo.toml index 7a2e2ec4a2..e36f45b07c 100644 --- a/beacon_node/timer/Cargo.toml +++ b/beacon_node/timer/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" beacon_chain = { path = "../beacon_chain" } types = { path = "../../eth2/types" } slot_clock = { path = "../../eth2/utils/slot_clock" } -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "0.2.20", features = ["full"] } slog = "2.5.2" -parking_lot = "0.10.0" -futures = "0.3" +parking_lot = "0.10.2" +futures = "0.3.4" diff --git a/beacon_node/websocket_server/Cargo.toml b/beacon_node/websocket_server/Cargo.toml index e53e0a917f..0a5beafb2d 100644 --- a/beacon_node/websocket_server/Cargo.toml +++ b/beacon_node/websocket_server/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -futures = "0.3" -serde = "1.0.102" -serde_derive = "1.0.102" -serde_json = "1.0.41" +futures = "0.3.4" +serde = "1.0.106" +serde_derive = "1.0.106" +serde_json = "1.0.52" slog = "2.5.2" -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "0.2.20", features = ["full"] } types = { path = "../../eth2/types" } ws = "0.9.1" diff --git a/eth2/operation_pool/Cargo.toml b/eth2/operation_pool/Cargo.toml index 7bfc86063a..32dbe377de 100644 --- a/eth2/operation_pool/Cargo.toml +++ b/eth2/operation_pool/Cargo.toml @@ -6,14 +6,14 @@ edition = "2018" [dependencies] int_to_bytes = { path = "../utils/int_to_bytes" } -parking_lot = "0.9.0" +parking_lot = "0.10.2" types = { path = "../types" } state_processing = { path = "../state_processing" } eth2_ssz = "0.1.2" eth2_ssz_derive = "0.1.0" -serde = "1.0.102" -serde_derive = "1.0.102" +serde = "1.0.106" +serde_derive = "1.0.106" store = { path = "../../beacon_node/store" } [dev-dependencies] -rand = "0.7.2" +rand = "0.7.3" diff --git a/eth2/proto_array_fork_choice/Cargo.toml b/eth2/proto_array_fork_choice/Cargo.toml index f17515acc3..bc1de8fe57 100644 --- a/eth2/proto_array_fork_choice/Cargo.toml +++ b/eth2/proto_array_fork_choice/Cargo.toml @@ -9,11 +9,11 @@ name = "proto_array_fork_choice" path = "src/bin.rs" [dependencies] -parking_lot = "0.9.0" +parking_lot = "0.10.2" types = { path = "../types" } -itertools = "0.8.1" +itertools = "0.9.0" eth2_ssz = "0.1.2" eth2_ssz_derive = "0.1.0" -serde = "1.0.102" -serde_derive = "1.0.102" +serde = "1.0.106" +serde_derive = "1.0.106" serde_yaml = "0.8.11" diff --git a/eth2/state_processing/Cargo.toml b/eth2/state_processing/Cargo.toml index a13e25f123..1f2c2a66da 100644 --- a/eth2/state_processing/Cargo.toml +++ b/eth2/state_processing/Cargo.toml @@ -9,10 +9,10 @@ name = "benches" harness = false [dev-dependencies] -criterion = "0.3.0" +criterion = "0.3.2" env_logger = "0.7.1" -serde = "1.0.102" -serde_derive = "1.0.102" +serde = "1.0.106" +serde_derive = "1.0.106" lazy_static = "1.4.0" serde_yaml = "0.8.11" beacon_chain = { path = "../../beacon_node/beacon_chain" } @@ -21,20 +21,20 @@ store = { path = "../../beacon_node/store" } [dependencies] bls = { path = "../utils/bls" } -integer-sqrt = "0.1.2" -itertools = "0.8.1" +integer-sqrt = "0.1.3" +itertools = "0.9.0" eth2_ssz = "0.1.2" eth2_ssz_types = { path = "../utils/ssz_types" } merkle_proof = { path = "../utils/merkle_proof" } log = "0.4.8" safe_arith = { path = "../utils/safe_arith" } tree_hash = "0.1.0" -tree_hash_derive = "0.2" +tree_hash_derive = "0.2.0" types = { path = "../types" } -rayon = "1.2.0" -eth2_hashing = { path = "../utils/eth2_hashing" } +rayon = "1.3.0" +eth2_hashing = "0.1.0" int_to_bytes = { path = "../utils/int_to_bytes" } -arbitrary = { version = "0.4.3", features = ["derive"], optional = true } +arbitrary = { version = "0.4.4", features = ["derive"], optional = true } [features] fake_crypto = ["bls/fake_crypto"] diff --git a/eth2/types/Cargo.toml b/eth2/types/Cargo.toml index 31db5cfd86..c681760194 100644 --- a/eth2/types/Cargo.toml +++ b/eth2/types/Cargo.toml @@ -13,19 +13,19 @@ bls = { path = "../utils/bls" } compare_fields = { path = "../utils/compare_fields" } compare_fields_derive = { path = "../utils/compare_fields_derive" } dirs = "2.0.2" -derivative = "1.0.3" +derivative = "2.1.1" eth2_interop_keypairs = { path = "../utils/eth2_interop_keypairs" } ethereum-types = "0.9.1" eth2_hashing = "0.1.0" -hex = "0.3" +hex = "0.4.2" int_to_bytes = { path = "../utils/int_to_bytes" } log = "0.4.8" merkle_proof = { path = "../utils/merkle_proof" } -rayon = "1.2.0" -rand = "0.7.2" +rayon = "1.3.0" +rand = "0.7.3" safe_arith = { path = "../utils/safe_arith" } -serde = "1.0.102" -serde_derive = "1.0.102" +serde = "1.0.106" +serde_derive = "1.0.106" slog = "2.5.2" eth2_ssz = "0.1.2" eth2_ssz_derive = "0.1.0" @@ -33,17 +33,17 @@ eth2_ssz_types = { path = "../utils/ssz_types" } swap_or_not_shuffle = { path = "../utils/swap_or_not_shuffle" } test_random_derive = { path = "../utils/test_random_derive" } tree_hash = "0.1.0" -tree_hash_derive = "0.2" +tree_hash_derive = "0.2.0" rand_xorshift = "0.2.0" cached_tree_hash = { path = "../utils/cached_tree_hash" } serde_yaml = "0.8.11" tempfile = "3.1.0" -arbitrary = { version = "0.4", features = ["derive"], optional = true } +arbitrary = { version = "0.4.4", features = ["derive"], optional = true } [dev-dependencies] env_logger = "0.7.1" -serde_json = "1.0.41" -criterion = "0.3.0" +serde_json = "1.0.52" +criterion = "0.3.2" [features] arbitrary-fuzz = [ diff --git a/eth2/utils/bls/Cargo.toml b/eth2/utils/bls/Cargo.toml index 93df124921..15e93b190d 100644 --- a/eth2/utils/bls/Cargo.toml +++ b/eth2/utils/bls/Cargo.toml @@ -7,15 +7,15 @@ edition = "2018" [dependencies] milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v1.0.1" } eth2_hashing = "0.1.0" -hex = "0.3" -rand = "0.7.2" -serde = "1.0.102" -serde_derive = "1.0.102" +hex = "0.4.2" +rand = "0.7.3" +serde = "1.0.106" +serde_derive = "1.0.106" serde_hex = { path = "../serde_hex" } eth2_ssz = "0.1.2" eth2_ssz_types = { path = "../ssz_types" } tree_hash = "0.1.0" -arbitrary = { version = "0.4", features = ["derive"], optional = true } +arbitrary = { version = "0.4.4", features = ["derive"], optional = true } [features] fake_crypto = [] diff --git a/eth2/utils/cached_tree_hash/Cargo.toml b/eth2/utils/cached_tree_hash/Cargo.toml index 5ac4d5e81d..1bb86f0c30 100644 --- a/eth2/utils/cached_tree_hash/Cargo.toml +++ b/eth2/utils/cached_tree_hash/Cargo.toml @@ -5,17 +5,17 @@ authors = ["Michael Sproul "] edition = "2018" [dependencies] -ethereum-types = "0.9" +ethereum-types = "0.9.1" eth2_ssz_types = { path = "../ssz_types" } -eth2_hashing = "0.1" +eth2_hashing = "0.1.0" eth2_ssz_derive = "0.1.0" eth2_ssz = "0.1.2" -tree_hash = "0.1" -smallvec = "1.2.0" +tree_hash = "0.1.0" +smallvec = "1.4.0" [dev-dependencies] -quickcheck = "0.9" -quickcheck_macros = "0.8" +quickcheck = "0.9.2" +quickcheck_macros = "0.9.1" [features] arbitrary = ["ethereum-types/arbitrary"] diff --git a/eth2/utils/clap_utils/Cargo.toml b/eth2/utils/clap_utils/Cargo.toml index f1916c4ba4..b7c8cdfa47 100644 --- a/eth2/utils/clap_utils/Cargo.toml +++ b/eth2/utils/clap_utils/Cargo.toml @@ -8,8 +8,8 @@ edition = "2018" [dependencies] clap = "2.33.0" -hex = "0.3" -dirs = "2.0" +hex = "0.4.2" +dirs = "2.0.2" types = { path = "../../types" } eth2_testnet_config = { path = "../eth2_testnet_config" } -eth2_ssz = { path = "../ssz" } +eth2_ssz = "0.1.2" diff --git a/eth2/utils/compare_fields_derive/Cargo.toml b/eth2/utils/compare_fields_derive/Cargo.toml index 485b2708db..550615b146 100644 --- a/eth2/utils/compare_fields_derive/Cargo.toml +++ b/eth2/utils/compare_fields_derive/Cargo.toml @@ -8,5 +8,5 @@ edition = "2018" proc-macro = true [dependencies] -syn = "0.15" -quote = "0.6" +syn = "1.0.18" +quote = "1.0.4" diff --git a/eth2/utils/compare_fields_derive/src/lib.rs b/eth2/utils/compare_fields_derive/src/lib.rs index 15137efa37..a8f95a1bd9 100644 --- a/eth2/utils/compare_fields_derive/src/lib.rs +++ b/eth2/utils/compare_fields_derive/src/lib.rs @@ -8,7 +8,7 @@ use syn::{parse_macro_input, DeriveInput}; fn is_slice(field: &syn::Field) -> bool { field.attrs.iter().any(|attr| { attr.path.is_ident("compare_fields") - && attr.tts.to_string().replace(" ", "") == "(as_slice)" + && attr.tokens.to_string().replace(" ", "") == "(as_slice)" }) } diff --git a/eth2/utils/deposit_contract/Cargo.toml b/eth2/utils/deposit_contract/Cargo.toml index 0c3abacf55..14dafda2df 100644 --- a/eth2/utils/deposit_contract/Cargo.toml +++ b/eth2/utils/deposit_contract/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" build = "build.rs" [build-dependencies] -reqwest = "0.9.20" -serde_json = "1.0" +reqwest = { version = "0.10.4", features = ["blocking", "json"] } +serde_json = "1.0.52" [dependencies] types = { path = "../../types"} -eth2_ssz = { path = "../ssz"} -tree_hash = { path = "../tree_hash"} -ethabi = "12.0" +eth2_ssz = "0.1.2" +tree_hash = "0.1.0" +ethabi = "12.0.0" diff --git a/eth2/utils/deposit_contract/build.rs b/eth2/utils/deposit_contract/build.rs index 752b2e5bb8..096b3f7337 100644 --- a/eth2/utils/deposit_contract/build.rs +++ b/eth2/utils/deposit_contract/build.rs @@ -56,8 +56,8 @@ pub fn download_deposit_contract( if abi_file.exists() { // Nothing to do. } else { - match reqwest::get(url) { - Ok(mut response) => { + match reqwest::blocking::get(url) { + Ok(response) => { let mut abi_file = File::create(abi_file) .map_err(|e| format!("Failed to create local abi file: {:?}", e))?; let mut bytecode_file = File::create(bytecode_file) diff --git a/eth2/utils/eth2_config/Cargo.toml b/eth2/utils/eth2_config/Cargo.toml index c9af2fef3b..7f4cf6e0e3 100644 --- a/eth2/utils/eth2_config/Cargo.toml +++ b/eth2/utils/eth2_config/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Paul Hauner "] edition = "2018" [dependencies] -serde = "1.0.102" -serde_derive = "1.0.102" -toml = "0.5.4" +serde = "1.0.106" +serde_derive = "1.0.106" +toml = "0.5.6" types = { path = "../../types" } diff --git a/eth2/utils/eth2_hashing/Cargo.toml b/eth2/utils/eth2_hashing/Cargo.toml index 3047a7a4df..2ffb37c9e4 100644 --- a/eth2/utils/eth2_hashing/Cargo.toml +++ b/eth2/utils/eth2_hashing/Cargo.toml @@ -13,13 +13,13 @@ lazy_static = { version = "1.4.0", optional = true } ring = "0.16.9" [target.'cfg(target_arch = "wasm32")'.dependencies] -sha2 = "0.8.0" +sha2 = "0.8.1" [dev-dependencies] -rustc-hex = "2.0.1" +rustc-hex = "2.1.0" [target.'cfg(target_arch = "wasm32")'.dev-dependencies] -wasm-bindgen-test = "0.3.2" +wasm-bindgen-test = "0.3.12" [features] default = ["zero_hash_cache"] diff --git a/eth2/utils/eth2_interop_keypairs/Cargo.toml b/eth2/utils/eth2_interop_keypairs/Cargo.toml index 30509a8f97..2cf4064a6f 100644 --- a/eth2/utils/eth2_interop_keypairs/Cargo.toml +++ b/eth2/utils/eth2_interop_keypairs/Cargo.toml @@ -8,13 +8,13 @@ edition = "2018" [dependencies] lazy_static = "1.4.0" -num-bigint = "0.2.3" +num-bigint = "0.2.6" eth2_hashing = "0.1.0" -hex = "0.3" +hex = "0.4.2" milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v1.0.1" } serde_yaml = "0.8.11" -serde = "1.0.102" -serde_derive = "1.0.102" +serde = "1.0.106" +serde_derive = "1.0.106" [dev-dependencies] -base64 = "0.11.0" +base64 = "0.12.0" diff --git a/eth2/utils/eth2_testnet_config/Cargo.toml b/eth2/utils/eth2_testnet_config/Cargo.toml index 3df6897a49..872da2ac71 100644 --- a/eth2/utils/eth2_testnet_config/Cargo.toml +++ b/eth2/utils/eth2_testnet_config/Cargo.toml @@ -7,15 +7,14 @@ edition = "2018" build = "build.rs" [build-dependencies] -reqwest = "0.9.20" +reqwest = { version = "0.10.4", features = ["blocking"] } [dev-dependencies] -tempdir = "0.3" -reqwest = "0.9.20" +tempdir = "0.3.7" [dependencies] -serde = "1.0" -serde_yaml = "0.8" +serde = "1.0.106" +serde_yaml = "0.8.11" types = { path = "../../types"} eth2-libp2p = { path = "../../../beacon_node/eth2-libp2p"} -eth2_ssz = { path = "../ssz"} +eth2_ssz = "0.1.2" diff --git a/eth2/utils/eth2_testnet_config/build.rs b/eth2/utils/eth2_testnet_config/build.rs index e2f7d71b39..47dfb3b172 100644 --- a/eth2/utils/eth2_testnet_config/build.rs +++ b/eth2/utils/eth2_testnet_config/build.rs @@ -45,11 +45,9 @@ pub fn get_file(filename: &str) -> Result<(), String> { let mut file = File::create(path).map_err(|e| format!("Failed to create {}: {:?}", filename, e))?; - let mut response = - reqwest::get(&url).map_err(|e| format!("Failed to download {}: {}", filename, e))?; - let mut contents: Vec = vec![]; - response - .copy_to(&mut contents) + let contents = reqwest::blocking::get(&url) + .map_err(|e| format!("Failed to download {}: {}", filename, e))? + .bytes() .map_err(|e| format!("Failed to read {} response bytes: {}", filename, e))?; file.write(&contents) diff --git a/eth2/utils/hashmap_delay/src/hashmap_delay.rs b/eth2/utils/hashmap_delay/src/hashmap_delay.rs deleted file mode 100644 index 326cf31d80..0000000000 --- a/eth2/utils/hashmap_delay/src/hashmap_delay.rs +++ /dev/null @@ -1,164 +0,0 @@ -//! A simple hashmap object coupled with a `delay_queue` which has entries that expire after a -//! fixed time. -//! -//! A `HashMapDelay` implements `Stream` which removes expired items from the map. - -/// The default delay for entries, in seconds. This is only used when `insert()` is used to add -/// entries. -const DEFAULT_DELAY: u64 = 30; - -use futures::prelude::*; -use std::{ - collections::HashMap, - pin::Pin, - task::{Context, Poll}, - time::Duration, -}; -use tokio::time::delay_queue::{self, DelayQueue}; - -pub struct HashMapDelay -where - K: std::cmp::Eq + std::hash::Hash + std::clone::Clone + Unpin, -{ - /// The given entries. - entries: HashMap>, - /// A queue holding the timeouts of each entry. - expirations: DelayQueue, - /// The default expiration timeout of an entry. - default_entry_timeout: Duration, -} - -/// A wrapping around entries that adds the link to the entry's expiration, via a `delay_queue` key. -struct MapEntry { - /// The expiration key for the entry. - key: delay_queue::Key, - /// The actual entry. - value: V, -} - -impl Default for HashMapDelay -where - K: std::cmp::Eq + std::hash::Hash + std::clone::Clone + Unpin, -{ - fn default() -> Self { - HashMapDelay::new(Duration::from_secs(DEFAULT_DELAY)) - } -} - -impl HashMapDelay -where - K: std::cmp::Eq + std::hash::Hash + std::clone::Clone + Unpin, -{ - /// Creates a new instance of `HashMapDelay`. - pub fn new(default_entry_timeout: Duration) -> Self { - HashMapDelay { - entries: HashMap::new(), - expirations: DelayQueue::new(), - default_entry_timeout, - } - } - - /// Insert an entry into the mapping. Entries will expire after the `default_entry_timeout`. - pub fn insert(&mut self, key: K, value: V) { - self.insert_at(key, value, self.default_entry_timeout); - } - - /// Inserts an entry that will expire at a given instant. - pub fn insert_at(&mut self, key: K, value: V, entry_duration: Duration) { - let delay_key = self.expirations.insert(key.clone(), entry_duration); - let entry = MapEntry { - key: delay_key, - value, - }; - self.entries.insert(key, entry); - } - - /// Gets a reference to an entry if it exists. - /// - /// Returns None if the entry does not exist. - pub fn get(&self, key: &K) -> Option<&V> { - self.entries.get(key).map(|entry| &entry.value) - } - - /// Gets a mutable reference to an entry if it exists. - /// - /// Returns None if the entry does not exist. - pub fn get_mut(&mut self, key: &K) -> Option<&mut V> { - self.entries.get_mut(key).map(|entry| &mut entry.value) - } - - /// Returns true if the key exists, false otherwise. - pub fn contains_key(&self, key: &K) -> bool { - self.entries.contains_key(key) - } - - /// Returns the length of the mapping. - pub fn len(&self) -> usize { - self.entries.len() - } - - /// Updates the timeout for a given key. Returns true if the key existed, false otherwise. - /// - /// Panics if the duration is too far in the future. - pub fn update_timeout(&mut self, key: &K, timeout: Duration) -> bool { - if let Some(entry) = self.entries.get(key) { - self.expirations.reset(&entry.key, timeout); - true - } else { - false - } - } - - /// Removes a key from the map returning the value associated with the key that was in the map. - /// - /// Return None if the key was not in the map. - pub fn remove(&mut self, key: &K) -> Option { - if let Some(entry) = self.entries.remove(key) { - self.expirations.remove(&entry.key); - return Some(entry.value); - } - return None; - } - - /// Retains only the elements specified by the predicate. - /// - /// In other words, remove all pairs `(k, v)` such that `f(&k,&mut v)` returns false. - pub fn retain bool>(&mut self, mut f: F) { - let expiration = &mut self.expirations; - self.entries.retain(|key, entry| { - let result = f(key, &mut entry.value); - if !result { - expiration.remove(&entry.key); - } - result - }) - } - - /// Removes all entries from the map. - pub fn clear(&mut self) { - self.entries.clear(); - self.expirations.clear(); - } -} - -impl Stream for HashMapDelay -where - K: std::cmp::Eq + std::hash::Hash + std::clone::Clone + Unpin, - V: Unpin, -{ - type Item = Result<(K, V), String>; - - fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll> { - match self.expirations.poll_expired(cx) { - Poll::Ready(Some(Ok(key))) => match self.entries.remove(key.get_ref()) { - Some(entry) => Poll::Ready(Some(Ok((key.into_inner(), entry.value)))), - None => Poll::Ready(Some(Err("Value no longer exists in expirations".into()))), - }, - Poll::Ready(Some(Err(e))) => { - Poll::Ready(Some(Err(format!("delay queue error: {:?}", e)))) - } - Poll::Ready(None) => Poll::Ready(None), - Poll::Pending => Poll::Pending, - } - } -} diff --git a/eth2/utils/hashmap_delay/src/lib.rs b/eth2/utils/hashmap_delay/src/lib.rs deleted file mode 100644 index 140106b42e..0000000000 --- a/eth2/utils/hashmap_delay/src/lib.rs +++ /dev/null @@ -1,21 +0,0 @@ -//! This crate provides two objects: -//! - `HashMapDelay` -//! - `HashSetDelay` -//! -//! # HashMapDelay -//! -//! This provides a `HashMap` coupled with a `DelayQueue`. Objects that are inserted into -//! the map are inserted with an expiry. `Stream` is implemented on the `HashMapDelay` -//! which return objects that have expired. These objects are removed from the mapping. -//! -//! # HashSetDelay -//! -//! This is similar to a `HashMapDelay` except the mapping maps to the expiry time. This -//! allows users to add objects and check their expiry deadlines before the `Stream` -//! consumes them. - -mod hashmap_delay; -mod hashset_delay; - -pub use crate::hashmap_delay::HashMapDelay; -pub use crate::hashset_delay::HashSetDelay; diff --git a/eth2/utils/hashmap_delay/Cargo.toml b/eth2/utils/hashset_delay/Cargo.toml similarity index 53% rename from eth2/utils/hashmap_delay/Cargo.toml rename to eth2/utils/hashset_delay/Cargo.toml index e63ac46197..48681d225b 100644 --- a/eth2/utils/hashmap_delay/Cargo.toml +++ b/eth2/utils/hashset_delay/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "hashmap_delay" +name = "hashset_delay" version = "0.2.0" authors = ["Age Manning "] edition = "2018" [dependencies] futures = "0.3.4" -tokio = { version = "0.2.19", features = ["time"] } +tokio = { version = "0.2.20", features = ["time"] } [dev-dependencies] -tokio = { version = "0.2.19", features = ["time", "rt-threaded", "macros"] } +tokio = { version = "0.2.20", features = ["time", "rt-threaded", "macros"] } diff --git a/eth2/utils/hashmap_delay/src/hashset_delay.rs b/eth2/utils/hashset_delay/src/hashset_delay.rs similarity index 100% rename from eth2/utils/hashmap_delay/src/hashset_delay.rs rename to eth2/utils/hashset_delay/src/hashset_delay.rs diff --git a/eth2/utils/hashset_delay/src/lib.rs b/eth2/utils/hashset_delay/src/lib.rs new file mode 100644 index 0000000000..175ad72cfa --- /dev/null +++ b/eth2/utils/hashset_delay/src/lib.rs @@ -0,0 +1,12 @@ +//! This crate provides a single type (its counter-part HashMapDelay has been removed as it +//! currently is not in use in lighthouse): +//! - `HashSetDelay` +//! +//! # HashSetDelay +//! +//! This is similar to a `HashMapDelay` except the mapping maps to the expiry time. This +//! allows users to add objects and check their expiry deadlines before the `Stream` +//! consumes them. + +mod hashset_delay; +pub use crate::hashset_delay::HashSetDelay; diff --git a/eth2/utils/int_to_bytes/Cargo.toml b/eth2/utils/int_to_bytes/Cargo.toml index c24f657c67..87839ccaa9 100644 --- a/eth2/utils/int_to_bytes/Cargo.toml +++ b/eth2/utils/int_to_bytes/Cargo.toml @@ -5,8 +5,8 @@ authors = ["Paul Hauner "] edition = "2018" [dependencies] -bytes = "0.4.12" +bytes = "0.5.4" [dev-dependencies] yaml-rust = "0.4.3" -hex = "0.3" +hex = "0.4.2" diff --git a/eth2/utils/lighthouse_metrics/Cargo.toml b/eth2/utils/lighthouse_metrics/Cargo.toml index ed4b492533..1e804c8d3b 100644 --- a/eth2/utils/lighthouse_metrics/Cargo.toml +++ b/eth2/utils/lighthouse_metrics/Cargo.toml @@ -8,4 +8,4 @@ edition = "2018" [dependencies] lazy_static = "1.4.0" -prometheus = "0.7.0" +prometheus = "0.8.0" diff --git a/eth2/utils/logging/Cargo.toml b/eth2/utils/logging/Cargo.toml index c7ccd3617f..b3c50c6d6d 100644 --- a/eth2/utils/logging/Cargo.toml +++ b/eth2/utils/logging/Cargo.toml @@ -6,6 +6,6 @@ edition = "2018" [dependencies] slog = "2.5.2" -slog-term = "2.4.2" +slog-term = "2.5.0" lighthouse_metrics = { path = "../lighthouse_metrics" } lazy_static = "1.4.0" diff --git a/eth2/utils/merkle_proof/Cargo.toml b/eth2/utils/merkle_proof/Cargo.toml index e56fab7f31..84745d224b 100644 --- a/eth2/utils/merkle_proof/Cargo.toml +++ b/eth2/utils/merkle_proof/Cargo.toml @@ -5,14 +5,14 @@ authors = ["Michael Sproul "] edition = "2018" [dependencies] -ethereum-types = "0.9" +ethereum-types = "0.9.1" eth2_hashing = "0.1.0" lazy_static = "1.4.0" safe_arith = { path = "../safe_arith" } [dev-dependencies] -quickcheck = "0.9.0" -quickcheck_macros = "0.8.0" +quickcheck = "0.9.2" +quickcheck_macros = "0.9.1" [features] arbitrary = ["ethereum-types/arbitrary"] diff --git a/eth2/utils/remote_beacon_node/Cargo.toml b/eth2/utils/remote_beacon_node/Cargo.toml index 73d2bb8924..fcb981f83e 100644 --- a/eth2/utils/remote_beacon_node/Cargo.toml +++ b/eth2/utils/remote_beacon_node/Cargo.toml @@ -7,15 +7,15 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -reqwest = { version = "0.10", features = ["json"] } -url = "1.2" -serde = "1.0" +reqwest = { version = "0.10.4", features = ["json"] } +url = "2.1.1" +serde = "1.0.106" futures = "0.3.4" types = { path = "../../../eth2/types" } rest_types = { path = "../rest_types" } -hex = "0.3" -eth2_ssz = { path = "../../../eth2/utils/ssz" } -serde_json = "^1.0" +hex = "0.4.2" +eth2_ssz = "0.1.2" +serde_json = "1.0.52" eth2_config = { path = "../../../eth2/utils/eth2_config" } proto_array_fork_choice = { path = "../../../eth2/proto_array_fork_choice" } operation_pool = { path = "../../../eth2/operation_pool" } diff --git a/eth2/utils/rest_types/Cargo.toml b/eth2/utils/rest_types/Cargo.toml index c2745c0603..b037f90470 100644 --- a/eth2/utils/rest_types/Cargo.toml +++ b/eth2/utils/rest_types/Cargo.toml @@ -6,11 +6,11 @@ edition = "2018" [dependencies] types = { path = "../../types" } -eth2_ssz_derive = { path = "../ssz_derive" } -eth2_ssz = { path = "../ssz" } -eth2_hashing = { path = "../eth2_hashing" } -tree_hash = { path = "../tree_hash" } +eth2_ssz_derive = "0.1.0" +eth2_ssz = "0.1.2" +eth2_hashing = "0.1.0" +tree_hash = "0.1.0" state_processing = { path = "../../state_processing" } bls = { path = "../bls" } -serde = { version = "1.0.102", features = ["derive"] } +serde = { version = "1.0.106", features = ["derive"] } rayon = "1.3.0" diff --git a/eth2/utils/serde_hex/Cargo.toml b/eth2/utils/serde_hex/Cargo.toml index b4d7bf619a..05998c8eea 100644 --- a/eth2/utils/serde_hex/Cargo.toml +++ b/eth2/utils/serde_hex/Cargo.toml @@ -5,5 +5,5 @@ authors = ["Paul Hauner "] edition = "2018" [dependencies] -serde = "1.0.102" -hex = "0.3" +serde = "1.0.106" +hex = "0.4.2" diff --git a/eth2/utils/serde_hex/src/lib.rs b/eth2/utils/serde_hex/src/lib.rs index 7b254cf88c..db84222757 100644 --- a/eth2/utils/serde_hex/src/lib.rs +++ b/eth2/utils/serde_hex/src/lib.rs @@ -1,17 +1,10 @@ -use hex::ToHex; use serde::de::{self, Visitor}; use std::fmt; pub fn encode>(data: T) -> String { - let mut hex = String::with_capacity(data.as_ref().len() * 2); - - // Writing to a string never errors, so we can unwrap here. - data.write_hex(&mut hex).unwrap(); - + let hex = hex::encode(data); let mut s = "0x".to_string(); - s.push_str(hex.as_str()); - s } diff --git a/eth2/utils/slot_clock/Cargo.toml b/eth2/utils/slot_clock/Cargo.toml index 81a7b57a9d..40da33af2d 100644 --- a/eth2/utils/slot_clock/Cargo.toml +++ b/eth2/utils/slot_clock/Cargo.toml @@ -8,4 +8,4 @@ edition = "2018" types = { path = "../../types" } lazy_static = "1.4.0" lighthouse_metrics = { path = "../lighthouse_metrics" } -parking_lot = "0.9.0" +parking_lot = "0.10.2" diff --git a/eth2/utils/ssz/Cargo.toml b/eth2/utils/ssz/Cargo.toml index 162c91ae13..e9220cdc64 100644 --- a/eth2/utils/ssz/Cargo.toml +++ b/eth2/utils/ssz/Cargo.toml @@ -14,7 +14,7 @@ eth2_ssz_derive = "0.1.0" [dependencies] ethereum-types = "0.9.1" -smallvec = "1.2.0" +smallvec = "1.4.0" [features] arbitrary = ["ethereum-types/arbitrary"] diff --git a/eth2/utils/ssz_derive/Cargo.toml b/eth2/utils/ssz_derive/Cargo.toml index db25e16be0..e074f001a8 100644 --- a/eth2/utils/ssz_derive/Cargo.toml +++ b/eth2/utils/ssz_derive/Cargo.toml @@ -11,5 +11,5 @@ name = "ssz_derive" proc-macro = true [dependencies] -syn = "0.15" -quote = "0.6" +syn = "1.0.18" +quote = "1.0.4" diff --git a/eth2/utils/ssz_derive/src/lib.rs b/eth2/utils/ssz_derive/src/lib.rs index 04ef8b9826..ae350a1cbb 100644 --- a/eth2/utils/ssz_derive/src/lib.rs +++ b/eth2/utils/ssz_derive/src/lib.rs @@ -54,7 +54,8 @@ fn get_serializable_field_types<'a>(struct_data: &'a syn::DataStruct) -> Vec<&'a /// The field attribute is: `#[ssz(skip_serializing)]` fn should_skip_serializing(field: &syn::Field) -> bool { field.attrs.iter().any(|attr| { - attr.path.is_ident("ssz") && attr.tts.to_string().replace(" ", "") == "(skip_serializing)" + attr.path.is_ident("ssz") + && attr.tokens.to_string().replace(" ", "") == "(skip_serializing)" }) } @@ -148,7 +149,8 @@ pub fn ssz_encode_derive(input: TokenStream) -> TokenStream { /// The field attribute is: `#[ssz(skip_deserializing)]` fn should_skip_deserializing(field: &syn::Field) -> bool { field.attrs.iter().any(|attr| { - attr.path.is_ident("ssz") && attr.tts.to_string().replace(" ", "") == "(skip_deserializing)" + attr.path.is_ident("ssz") + && attr.tokens.to_string().replace(" ", "") == "(skip_deserializing)" }) } diff --git a/eth2/utils/ssz_types/Cargo.toml b/eth2/utils/ssz_types/Cargo.toml index eb7ffb4835..9680ce6f69 100644 --- a/eth2/utils/ssz_types/Cargo.toml +++ b/eth2/utils/ssz_types/Cargo.toml @@ -9,13 +9,13 @@ name = "ssz_types" [dependencies] tree_hash = "0.1.0" -serde = "1.0.102" -serde_derive = "1.0.102" +serde = "1.0.106" +serde_derive = "1.0.106" serde_hex = { path = "../serde_hex" } eth2_ssz = "0.1.2" -typenum = "1.11.2" -arbitrary = { version = "0.4", features = ["derive"], optional = true } +typenum = "1.12.0" +arbitrary = { version = "0.4.4", features = ["derive"], optional = true } [dev-dependencies] serde_yaml = "0.8.11" -tree_hash_derive = "0.2" +tree_hash_derive = "0.2.0" diff --git a/eth2/utils/swap_or_not_shuffle/Cargo.toml b/eth2/utils/swap_or_not_shuffle/Cargo.toml index e624964168..da2b72664d 100644 --- a/eth2/utils/swap_or_not_shuffle/Cargo.toml +++ b/eth2/utils/swap_or_not_shuffle/Cargo.toml @@ -9,9 +9,9 @@ name = "benches" harness = false [dev-dependencies] -criterion = "0.3.0" +criterion = "0.3.2" yaml-rust = "0.4.3" -hex = "0.3" +hex = "0.4.2" [dependencies] eth2_hashing = "0.1.0" diff --git a/eth2/utils/test_random_derive/Cargo.toml b/eth2/utils/test_random_derive/Cargo.toml index 494e9d8ebf..a02cb7fdad 100644 --- a/eth2/utils/test_random_derive/Cargo.toml +++ b/eth2/utils/test_random_derive/Cargo.toml @@ -9,5 +9,5 @@ description = "Procedural derive macros for implementation of TestRandom trait" proc-macro = true [dependencies] -syn = "0.15" -quote = "0.6" +syn = "1.0.18" +quote = "1.0.4" diff --git a/eth2/utils/test_random_derive/src/lib.rs b/eth2/utils/test_random_derive/src/lib.rs index d6e3a0f950..fabc61c7fd 100644 --- a/eth2/utils/test_random_derive/src/lib.rs +++ b/eth2/utils/test_random_derive/src/lib.rs @@ -10,7 +10,7 @@ use syn::{parse_macro_input, DeriveInput}; /// The field attribute is: `#[test_random(default)]` fn should_use_default(field: &syn::Field) -> bool { field.attrs.iter().any(|attr| { - attr.path.is_ident("test_random") && attr.tts.to_string().replace(" ", "") == "(default)" + attr.path.is_ident("test_random") && attr.tokens.to_string().replace(" ", "") == "(default)" }) } diff --git a/eth2/utils/tree_hash/Cargo.toml b/eth2/utils/tree_hash/Cargo.toml index db207ab4ac..ff84952e6f 100644 --- a/eth2/utils/tree_hash/Cargo.toml +++ b/eth2/utils/tree_hash/Cargo.toml @@ -11,16 +11,16 @@ name = "benches" harness = false [dev-dependencies] -criterion = "0.3.0" -rand = "0.7.2" -tree_hash_derive = "0.2" +criterion = "0.3.2" +rand = "0.7.3" +tree_hash_derive = "0.2.0" types = { path = "../../types" } lazy_static = "1.4.0" [dependencies] -ethereum-types = "0.9" +ethereum-types = "0.9.1" eth2_hashing = "0.1.0" -smallvec = "1.2.0" +smallvec = "1.4.0" [features] arbitrary = ["ethereum-types/arbitrary"] diff --git a/eth2/utils/tree_hash_derive/Cargo.toml b/eth2/utils/tree_hash_derive/Cargo.toml index 9c3050e57f..11caabe076 100644 --- a/eth2/utils/tree_hash_derive/Cargo.toml +++ b/eth2/utils/tree_hash_derive/Cargo.toml @@ -10,5 +10,5 @@ license = "Apache-2.0" proc-macro = true [dependencies] -syn = "0.15" -quote = "0.6" +syn = "1.0.18" +quote = "1.0.4" diff --git a/eth2/utils/tree_hash_derive/src/lib.rs b/eth2/utils/tree_hash_derive/src/lib.rs index e233e4ed57..d57903654d 100644 --- a/eth2/utils/tree_hash_derive/src/lib.rs +++ b/eth2/utils/tree_hash_derive/src/lib.rs @@ -51,7 +51,7 @@ fn get_cache_field_for(field: &syn::Field) -> Option { let parsed_attrs = cached_tree_hash_attr_metas(&field.attrs); if let [Meta::List(MetaList { nested, .. })] = &parsed_attrs[..] { nested.iter().find_map(|x| match x { - NestedMeta::Meta(Meta::Word(cache_field_ident)) => Some(cache_field_ident.clone()), + NestedMeta::Meta(Meta::Path(path)) => path.get_ident().cloned(), _ => None, }) } else { @@ -73,7 +73,8 @@ fn cached_tree_hash_attr_metas(attrs: &[Attribute]) -> Vec { /// The field attribute is: `#[tree_hash(skip_hashing)]` fn should_skip_hashing(field: &syn::Field) -> bool { field.attrs.iter().any(|attr| { - attr.path.is_ident("tree_hash") && attr.tts.to_string().replace(" ", "") == "(skip_hashing)" + attr.path.is_ident("tree_hash") + && attr.tokens.to_string().replace(" ", "") == "(skip_hashing)" }) } diff --git a/lcli/Cargo.toml b/lcli/Cargo.toml index 7a423d8caa..fa3a758981 100644 --- a/lcli/Cargo.toml +++ b/lcli/Cargo.toml @@ -9,24 +9,24 @@ edition = "2018" [dependencies] clap = "2.33.0" -hex = "0.3" +hex = "0.4.2" log = "0.4.8" -serde = "1.0.102" +serde = "1.0.106" serde_yaml = "0.8.11" -simple_logger = "1.3.0" +simple_logger = "1.6.0" types = { path = "../eth2/types" } state_processing = { path = "../eth2/state_processing" } eth2_ssz = "0.1.2" -regex = "1.3.1" +regex = "1.3.7" eth1_test_rig = { path = "../tests/eth1_test_rig" } -futures = {version = "0.3", features = ["compat"]} +futures = { version = "0.3.4", features = ["compat"] } environment = { path = "../lighthouse/environment" } web3 = "0.10.0" eth2_testnet_config = { path = "../eth2/utils/eth2_testnet_config" } -dirs = "2.0" +dirs = "2.0.2" genesis = { path = "../beacon_node/genesis" } deposit_contract = { path = "../eth2/utils/deposit_contract" } -tree_hash = { path = "../eth2/utils/tree_hash" } -tokio = { version = "0.2", features = ["full"] } +tree_hash = "0.1.0" +tokio = { version = "0.2.20", features = ["full"] } clap_utils = { path = "../eth2/utils/clap_utils" } eth2-libp2p = { path = "../beacon_node/eth2-libp2p" } diff --git a/lighthouse/Cargo.toml b/lighthouse/Cargo.toml index e93dd01926..b155d7d0ab 100644 --- a/lighthouse/Cargo.toml +++ b/lighthouse/Cargo.toml @@ -9,17 +9,17 @@ write_ssz_files = ["beacon_node/write_ssz_files"] # Writes debugging .ssz files [dependencies] beacon_node = { "path" = "../beacon_node" } -tokio = "0.1.22" -slog = { version = "^2.2.3" , features = ["max_level_trace"] } -sloggers = "0.3.4" +tokio = "0.2.20" +slog = { version = "2.5.2", features = ["max_level_trace"] } +sloggers = "1.0.0" types = { "path" = "../eth2/types" } -clap = "2.32.0" -env_logger = "0.6.1" +clap = "2.33.0" +env_logger = "0.7.1" logging = { path = "../eth2/utils/logging" } -slog-term = "^2.4.0" -slog-async = "^2.3.0" +slog-term = "2.5.0" +slog-async = "2.5.0" environment = { path = "./environment" } -futures = "0.1.25" +futures = "0.3.4" validator_client = { "path" = "../validator_client" } account_manager = { "path" = "../account_manager" } clap_utils = { path = "../eth2/utils/clap_utils" } diff --git a/lighthouse/environment/Cargo.toml b/lighthouse/environment/Cargo.toml index 7f4c250945..c34f2f9d1a 100644 --- a/lighthouse/environment/Cargo.toml +++ b/lighthouse/environment/Cargo.toml @@ -6,19 +6,19 @@ edition = "2018" [dependencies] clap = "2.33.0" -tokio = "0.1.22" -slog = { version = "^2.2.3" , features = ["max_level_trace"] } -sloggers = "0.3.4" +tokio = "0.2.20" +slog = { version = "2.5.2", features = ["max_level_trace"] } +sloggers = "1.0.0" types = { "path" = "../../eth2/types" } eth2_config = { "path" = "../../eth2/utils/eth2_config" } eth2_testnet_config = { path = "../../eth2/utils/eth2_testnet_config" } -env_logger = "0.6.1" +env_logger = "0.7.1" logging = { path = "../../eth2/utils/logging" } -slog-term = "^2.4.0" -slog-async = "^2.3.0" -ctrlc = { version = "3.1.1", features = ["termination"] } -futures = "0.1.25" -parking_lot = "0.7" +slog-term = "2.5.0" +slog-async = "2.5.0" +ctrlc = { version = "3.1.4", features = ["termination"] } +futures = "0.3.4" +parking_lot = "0.10.2" slog-json = "2.3.0" [dev-dependencies] diff --git a/lighthouse/environment/src/lib.rs b/lighthouse/environment/src/lib.rs index 20e54b0979..1ed249cba9 100644 --- a/lighthouse/environment/src/lib.rs +++ b/lighthouse/environment/src/lib.rs @@ -9,7 +9,7 @@ use eth2_config::Eth2Config; use eth2_testnet_config::Eth2TestnetConfig; -use futures::{sync::oneshot, Future}; +use futures::channel::oneshot; use slog::{info, o, Drain, Level, Logger}; use sloggers::{null::NullLoggerBuilder, Build}; use std::cell::RefCell; @@ -17,7 +17,7 @@ use std::ffi::OsStr; use std::fs::{rename as FsRename, OpenOptions}; use std::path::PathBuf; use std::time::{SystemTime, UNIX_EPOCH}; -use tokio::runtime::{Builder as RuntimeBuilder, Runtime, TaskExecutor}; +use tokio::runtime::{Builder as RuntimeBuilder, Handle, Runtime}; use types::{EthSpec, InteropEthSpec, MainnetEthSpec, MinimalEthSpec}; pub const ETH2_CONFIG_FILENAME: &str = "eth2-spec.toml"; @@ -183,10 +183,10 @@ impl EnvironmentBuilder { /// An execution context that can be used by a service. /// /// Distinct from an `Environment` because a `Context` is not able to give a mutable reference to a -/// `Runtime`, instead it only has access to a `TaskExecutor`. +/// `Runtime`, instead it only has access to a `Runtime`. #[derive(Clone)] pub struct RuntimeContext { - pub executor: TaskExecutor, + pub runtime_handle: Handle, pub log: Logger, pub eth_spec_instance: E, pub eth2_config: Eth2Config, @@ -198,7 +198,7 @@ impl RuntimeContext { /// The generated service will have the `service_name` in all it's logs. pub fn service_context(&self, service_name: String) -> Self { Self { - executor: self.executor.clone(), + runtime_handle: self.runtime_handle.clone(), log: self.log.new(o!("service" => service_name)), eth_spec_instance: self.eth_spec_instance.clone(), eth2_config: self.eth2_config.clone(), @@ -233,7 +233,7 @@ impl Environment { /// Returns a `Context` where no "service" has been added to the logger output. pub fn core_context(&mut self) -> RuntimeContext { RuntimeContext { - executor: self.runtime.executor(), + runtime_handle: self.runtime.handle().clone(), log: self.log.clone(), eth_spec_instance: self.eth_spec_instance.clone(), eth2_config: self.eth2_config.clone(), @@ -243,7 +243,7 @@ impl Environment { /// Returns a `Context` where the `service_name` is added to the logger output. pub fn service_context(&mut self, service_name: String) -> RuntimeContext { RuntimeContext { - executor: self.runtime.executor(), + runtime_handle: self.runtime.handle().clone(), log: self.log.new(o!("service" => service_name)), eth_spec_instance: self.eth_spec_instance.clone(), eth2_config: self.eth2_config.clone(), @@ -268,11 +268,9 @@ impl Environment { } /// Shutdown the `tokio` runtime when all tasks are idle. - pub fn shutdown_on_idle(self) -> Result<(), String> { + pub fn shutdown_on_idle(self) { self.runtime - .shutdown_on_idle() - .wait() - .map_err(|e| format!("Tokio runtime shutdown returned an error: {:?}", e)) + .shutdown_timeout(std::time::Duration::from_secs(5)) } /// Sets the logger (and all child loggers) to log to a file. diff --git a/tests/ef_tests/Cargo.toml b/tests/ef_tests/Cargo.toml index 252cf1f90d..83178b48d5 100644 --- a/tests/ef_tests/Cargo.toml +++ b/tests/ef_tests/Cargo.toml @@ -12,19 +12,19 @@ fake_crypto = ["bls/fake_crypto"] [dependencies] bls = { path = "../../eth2/utils/bls" } compare_fields = { path = "../../eth2/utils/compare_fields" } -ethereum-types = "0.9" -hex = "0.3" -rayon = "1.2.0" -serde = "1.0.102" -serde_derive = "1.0.102" +ethereum-types = "0.9.1" +hex = "0.4.2" +rayon = "1.3.0" +serde = "1.0.106" +serde_derive = "1.0.106" serde_repr = "0.1.5" serde_yaml = "0.8.11" eth2_ssz = "0.1.2" eth2_ssz_derive = "0.1.0" tree_hash = "0.1.0" -tree_hash_derive = "0.2" +tree_hash_derive = "0.2.0" cached_tree_hash = { path = "../../eth2/utils/cached_tree_hash" } state_processing = { path = "../../eth2/state_processing" } swap_or_not_shuffle = { path = "../../eth2/utils/swap_or_not_shuffle" } types = { path = "../../eth2/types" } -walkdir = "2.2.9" +walkdir = "2.3.1" diff --git a/tests/ef_tests/src/cases/bls_sign_msg.rs b/tests/ef_tests/src/cases/bls_sign_msg.rs index 3eae6eb150..b985a2d399 100644 --- a/tests/ef_tests/src/cases/bls_sign_msg.rs +++ b/tests/ef_tests/src/cases/bls_sign_msg.rs @@ -21,7 +21,7 @@ impl BlsCase for BlsSign {} impl Case for BlsSign { fn result(&self, _case_index: usize) -> Result<(), Error> { // Convert private_key and message to required types - let mut sk = hex::decode(&self.input.privkey[2..]) + let sk = hex::decode(&self.input.privkey[2..]) .map_err(|e| Error::FailedToParseTest(format!("{:?}", e)))?; let sk = SecretKey::from_bytes(&sk).unwrap(); let msg = hex::decode(&self.input.message[2..]) diff --git a/tests/eth1_test_rig/Cargo.toml b/tests/eth1_test_rig/Cargo.toml index 90dc58436f..ab0a8bcf00 100644 --- a/tests/eth1_test_rig/Cargo.toml +++ b/tests/eth1_test_rig/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" [dependencies] web3 = "0.10.0" -tokio = { version = "0.2", features = ["time"] } -futures = { version = "0.3", features = ["compat"] } +tokio = { version = "0.2.20", features = ["time"] } +futures = { version = "0.3.4", features = ["compat"] } types = { path = "../../eth2/types"} -serde_json = "1.0" +serde_json = "1.0.52" deposit_contract = { path = "../../eth2/utils/deposit_contract"} diff --git a/tests/node_test_rig/Cargo.toml b/tests/node_test_rig/Cargo.toml index 013cbe0274..472378279b 100644 --- a/tests/node_test_rig/Cargo.toml +++ b/tests/node_test_rig/Cargo.toml @@ -9,11 +9,11 @@ environment = { path = "../../lighthouse/environment" } beacon_node = { path = "../../beacon_node" } types = { path = "../../eth2/types" } eth2_config = { path = "../../eth2/utils/eth2_config" } -tempdir = "0.3" -reqwest = "0.9" -url = "1.2" -serde = "1.0" -futures = "0.1.25" +tempdir = "0.3.7" +reqwest = "0.10.4" +url = "2.1.1" +serde = "1.0.106" +futures = "0.3.4" genesis = { path = "../../beacon_node/genesis" } remote_beacon_node = { path = "../../eth2/utils/remote_beacon_node" } validator_client = { path = "../../validator_client" } diff --git a/tests/simulator/Cargo.toml b/tests/simulator/Cargo.toml index 65b6614705..f5d1565fb8 100644 --- a/tests/simulator/Cargo.toml +++ b/tests/simulator/Cargo.toml @@ -10,9 +10,9 @@ edition = "2018" node_test_rig = { path = "../node_test_rig" } types = { path = "../../eth2/types" } validator_client = { path = "../../validator_client" } -parking_lot = "0.9.0" -futures = "0.1.29" -tokio = "0.1.22" +parking_lot = "0.10.2" +futures = "0.3.4" +tokio = "0.2.20" eth1_test_rig = { path = "../eth1_test_rig" } env_logger = "0.7.1" clap = "2.33.0" diff --git a/validator_client/Cargo.toml b/validator_client/Cargo.toml index 68dfc906d0..fd29064391 100644 --- a/validator_client/Cargo.toml +++ b/validator_client/Cargo.toml @@ -17,28 +17,28 @@ eth2_interop_keypairs = { path = "../eth2/utils/eth2_interop_keypairs" } slot_clock = { path = "../eth2/utils/slot_clock" } rest_types = { path = "../eth2/utils/rest_types" } types = { path = "../eth2/types" } -serde = "1.0.102" -serde_derive = "1.0.102" -serde_json = "1.0.41" +serde = "1.0.106" +serde_derive = "1.0.106" +serde_json = "1.0.52" slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] } -slog-async = "2.3.0" -slog-term = "2.4.2" -tokio = "0.1.22" -tokio-timer = "0.2.12" -error-chain = "0.12.1" -bincode = "1.2.0" -futures = "0.1.29" +slog-async = "2.5.0" +slog-term = "2.5.0" +tokio = "0.2.20" +tokio-timer = "0.2.13" +error-chain = "0.12.2" +bincode = "1.2.1" +futures = "0.3.4" dirs = "2.0.2" logging = { path = "../eth2/utils/logging" } environment = { path = "../lighthouse/environment" } -parking_lot = "0.7" -exit-future = "0.1.4" -libc = "0.2.65" -eth2_ssz_derive = { path = "../eth2/utils/ssz_derive" } -hex = "0.3" +parking_lot = "0.10.2" +exit-future = "0.2.0" +libc = "0.2.69" +eth2_ssz_derive = "0.1.0" +hex = "0.4.2" deposit_contract = { path = "../eth2/utils/deposit_contract" } bls = { path = "../eth2/utils/bls" } remote_beacon_node = { path = "../eth2/utils/remote_beacon_node" } -tempdir = "0.3" -rayon = "1.2.0" +tempdir = "0.3.7" +rayon = "1.3.0" web3 = "0.10.0"