diff --git a/Cargo.toml b/Cargo.toml index 9b31060a2d..9616155310 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,3 +48,4 @@ tree_hash_derive = { path = "eth2/utils/tree_hash_derive" } eth2_ssz = { path = "eth2/utils/ssz" } eth2_ssz_derive = { path = "eth2/utils/ssz_derive" } eth2_ssz_types = { path = "eth2/utils/ssz_types" } +eth2_hashing = { path = "eth2/utils/eth2_hashing" } diff --git a/account_manager/Cargo.toml b/account_manager/Cargo.toml index 32d2286c8e..fc3df1e8da 100644 --- a/account_manager/Cargo.toml +++ b/account_manager/Cargo.toml @@ -6,10 +6,10 @@ edition = "2018" [dependencies] bls = { path = "../eth2/utils/bls" } -clap = "2.32.0" -slog = "^2.2.3" -slog-term = "^2.4.0" -slog-async = "^2.3.0" +clap = "2.33.0" +slog = "2.5.2" +slog-term = "2.4.2" +slog-async = "2.3.0" validator_client = { path = "../validator_client" } types = { path = "../eth2/types" } -dirs = "2.0.1" +dirs = "2.0.2" diff --git a/beacon_node/Cargo.toml b/beacon_node/Cargo.toml index 0e42990182..8238b5f8da 100644 --- a/beacon_node/Cargo.toml +++ b/beacon_node/Cargo.toml @@ -12,16 +12,16 @@ types = { path = "../eth2/types" } store = { path = "./store" } client = { path = "client" } version = { path = "version" } -clap = "2.32.0" -rand = "0.7" -slog = { version = "^2.2.3" , features = ["max_level_trace", "release_max_level_trace"] } -slog-term = "^2.4.0" -slog-async = "^2.3.0" -ctrlc = { version = "3.1.1", features = ["termination"] } -tokio = "0.1.15" -tokio-timer = "0.2.10" -futures = "0.1.25" -exit-future = "0.1.3" -env_logger = "0.6.1" -dirs = "2.0.1" +clap = "2.33.0" +rand = "0.7.2" +slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] } +slog-term = "2.4.2" +slog-async = "2.3.0" +ctrlc = { version = "3.1.3", features = ["termination"] } +tokio = "0.1.22" +tokio-timer = "0.2.11" +exit-future = "0.1.4" +env_logger = "0.7.1" +dirs = "2.0.2" logging = { path = "../eth2/utils/logging" } +futures = "0.1.29" diff --git a/beacon_node/beacon_chain/Cargo.toml b/beacon_node/beacon_chain/Cargo.toml index 02a45d1374..b69564047c 100644 --- a/beacon_node/beacon_chain/Cargo.toml +++ b/beacon_node/beacon_chain/Cargo.toml @@ -12,28 +12,28 @@ write_ssz_files = [] # Writes debugging .ssz files to /tmp during block process eth2_config = { path = "../../eth2/utils/eth2_config" } merkle_proof = { path = "../../eth2/utils/merkle_proof" } store = { path = "../store" } -parking_lot = "0.7" -lazy_static = "1.3.0" +parking_lot = "0.9.0" +lazy_static = "1.4.0" lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" } lighthouse_bootstrap = { path = "../../eth2/utils/lighthouse_bootstrap" } -log = "0.4" +log = "0.4.8" operation_pool = { path = "../../eth2/operation_pool" } -rayon = "1.0" -serde = "1.0" -serde_derive = "1.0" -serde_yaml = "0.8" -serde_json = "^1.0" -slog = { version = "^2.2.3" , features = ["max_level_trace"] } -sloggers = { version = "^0.3" } +rayon = "1.2.0" +serde = "1.0.102" +serde_derive = "1.0.102" +serde_yaml = "0.8.11" +serde_json = "1.0.41" +slog = { version = "2.5.2", features = ["max_level_trace"] } +sloggers = "0.3.4" slot_clock = { path = "../../eth2/utils/slot_clock" } -eth2_hashing = { path = "../../eth2/utils/eth2_hashing" } -eth2_ssz = "0.1" -eth2_ssz_derive = "0.1" +eth2_hashing = "0.1.0" +eth2_ssz = "0.1.2" +eth2_ssz_derive = "0.1.0" state_processing = { path = "../../eth2/state_processing" } -tree_hash = "0.1" +tree_hash = "0.1.0" types = { path = "../../eth2/types" } lmd_ghost = { path = "../../eth2/lmd_ghost" } [dev-dependencies] -rand = "0.5.5" -lazy_static = "1.3.0" +rand = "0.7.2" +lazy_static = "1.4.0" diff --git a/beacon_node/client/Cargo.toml b/beacon_node/client/Cargo.toml index e557217938..ec0c14159a 100644 --- a/beacon_node/client/Cargo.toml +++ b/beacon_node/client/Cargo.toml @@ -12,22 +12,22 @@ eth2-libp2p = { path = "../eth2-libp2p" } rpc = { path = "../rpc" } rest_api = { path = "../rest_api" } websocket_server = { path = "../websocket_server" } -prometheus = "^0.6" +prometheus = "0.7.0" types = { path = "../../eth2/types" } -tree_hash = "0.1" +tree_hash = "0.1.0" eth2_config = { path = "../../eth2/utils/eth2_config" } slot_clock = { path = "../../eth2/utils/slot_clock" } -serde = "1.0.93" -serde_derive = "1.0" -error-chain = "0.12.0" -serde_yaml = "0.8" -slog = { version = "^2.2.3" , features = ["max_level_trace"] } -slog-async = "^2.3.0" -slog-json = "^2.3" -tokio = "0.1.15" -clap = "2.32.0" -dirs = "1.0.3" -exit-future = "0.1.3" -futures = "0.1.25" -reqwest = "0.9" -url = "1.2" +serde = "1.0.102" +serde_derive = "1.0.102" +error-chain = "0.12.1" +serde_yaml = "0.8.11" +slog = { version = "2.5.2", features = ["max_level_trace"] } +slog-async = "2.3.0" +slog-json = "2.3.0" +tokio = "0.1.22" +clap = "2.33.0" +dirs = "2.0.2" +exit-future = "0.1.4" +futures = "0.1.29" +reqwest = "0.9.22" +url = "2.1.0" diff --git a/beacon_node/eth2-libp2p/Cargo.toml b/beacon_node/eth2-libp2p/Cargo.toml index ccc6efb6d9..8982e17669 100644 --- a/beacon_node/eth2-libp2p/Cargo.toml +++ b/beacon_node/eth2-libp2p/Cargo.toml @@ -5,28 +5,28 @@ authors = ["Age Manning "] edition = "2018" [dependencies] -clap = "2.32.0" +clap = "2.33.0" hex = "0.3" #SigP repository -libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "8ac9c744197faaadc0e2b64fed7470ac4e2a41ca" } -enr = { git = "https://github.com/SigP/rust-libp2p/", rev = "8ac9c744197faaadc0e2b64fed7470ac4e2a41ca", features = ["serde"] } +libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "cdd5251d29e21a01aa2ffed8cb577a37a0f9e2eb" } +enr = { git = "https://github.com/SigP/rust-libp2p/", rev = "cdd5251d29e21a01aa2ffed8cb577a37a0f9e2eb", features = ["serde"] } types = { path = "../../eth2/types" } -serde = "1.0" -serde_derive = "1.0" -eth2_ssz = "0.1" -eth2_ssz_derive = "0.1" -slog = { version = "^2.4.1" , features = ["max_level_trace"] } +serde = "1.0.102" +serde_derive = "1.0.102" +eth2_ssz = "0.1.2" +eth2_ssz_derive = "0.1.0" +slog = { version = "2.5.2", features = ["max_level_trace"] } version = { path = "../version" } -tokio = "0.1.16" -futures = "0.1.25" -error-chain = "0.12.0" -tokio-timer = "0.2.10" -dirs = "2.0.1" +tokio = "0.1.22" +futures = "0.1.29" +error-chain = "0.12.1" +tokio-timer = "0.2.11" +dirs = "2.0.2" tokio-io = "0.1.12" -smallvec = "0.6.10" +smallvec = "0.6.11" fnv = "1.0.6" -unsigned-varint = "0.2.2" +unsigned-varint = "0.2.3" bytes = "0.4.12" tokio-io-timeout = "0.3.1" -lazy_static = "1.3.0" +lazy_static = "1.4.0" lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" } diff --git a/beacon_node/eth2-libp2p/src/behaviour.rs b/beacon_node/eth2-libp2p/src/behaviour.rs index a47d32ec2a..aa11d586ff 100644 --- a/beacon_node/eth2-libp2p/src/behaviour.rs +++ b/beacon_node/eth2-libp2p/src/behaviour.rs @@ -153,8 +153,10 @@ impl NetworkBehaviourEventProcess { if info.listen_addrs.len() > MAX_IDENTIFY_ADDRESSES { debug!( @@ -167,11 +169,12 @@ impl NetworkBehaviourEventProcess info.protocol_version, "Agent Version" => info.agent_version, "Listening Addresses" => format!("{:?}", info.listen_addrs), + "Observed Address" => format!("{:?}", observed_addr), "Protocols" => format!("{:?}", info.protocols) ); } + IdentifyEvent::Sent { .. } => {} IdentifyEvent::Error { .. } => {} - IdentifyEvent::SendBack { .. } => {} } } } diff --git a/beacon_node/eth2-libp2p/src/config.rs b/beacon_node/eth2-libp2p/src/config.rs index fa20d2cdd0..cacad9c206 100644 --- a/beacon_node/eth2-libp2p/src/config.rs +++ b/beacon_node/eth2-libp2p/src/config.rs @@ -82,7 +82,7 @@ impl Default for Config { gs_config: GossipsubConfigBuilder::new() .max_transmit_size(1_048_576) .heartbeat_interval(Duration::from_secs(20)) // TODO: Reduce for mainnet - .propagate_messages(false) // require validation before propagation + .manual_propagation(true) // require validation before propagation .build(), boot_nodes: vec![], libp2p_nodes: vec![], diff --git a/beacon_node/eth2-libp2p/src/discovery.rs b/beacon_node/eth2-libp2p/src/discovery.rs index 69ca39ad79..380914af5b 100644 --- a/beacon_node/eth2-libp2p/src/discovery.rs +++ b/beacon_node/eth2-libp2p/src/discovery.rs @@ -286,7 +286,7 @@ fn load_enr( // Build the local ENR. // Note: Discovery should update the ENR record's IP to the external IP as seen by the // majority of our peers. - let mut local_enr = EnrBuilder::new() + let mut local_enr = EnrBuilder::new("v4") .ip(config.discovery_address) .tcp(config.libp2p_port) .udp(config.discovery_port) @@ -302,7 +302,7 @@ fn load_enr( match Enr::from_str(&enr_string) { Ok(enr) => { if enr.node_id() == local_enr.node_id() { - if enr.ip() == config.discovery_address.into() + if enr.ip().map(Into::into) == Some(config.discovery_address) && enr.tcp() == Some(config.libp2p_port) && enr.udp() == Some(config.discovery_port) { diff --git a/beacon_node/eth2-libp2p/src/service.rs b/beacon_node/eth2-libp2p/src/service.rs index f9c06a532d..2ffafb855e 100644 --- a/beacon_node/eth2-libp2p/src/service.rs +++ b/beacon_node/eth2-libp2p/src/service.rs @@ -8,12 +8,8 @@ use crate::{Topic, TopicHash}; use futures::prelude::*; use futures::Stream; use libp2p::core::{ - identity::Keypair, - multiaddr::Multiaddr, - muxing::StreamMuxerBox, - nodes::Substream, + identity::Keypair, multiaddr::Multiaddr, muxing::StreamMuxerBox, nodes::Substream, transport::boxed::Boxed, - upgrade::{InboundUpgradeExt, OutboundUpgradeExt}, }; use libp2p::{core, secio, PeerId, Swarm, Transport}; use slog::{crit, debug, info, trace, warn}; @@ -206,7 +202,7 @@ impl Stream for Service { fn build_transport(local_private_key: Keypair) -> Boxed<(PeerId, StreamMuxerBox), Error> { // TODO: The Wire protocol currently doesn't specify encryption and this will need to be customised // in the future. - let transport = libp2p::tcp::TcpConfig::new(); + let transport = libp2p::tcp::TcpConfig::new().nodelay(true); let transport = libp2p::dns::DnsConfig::new(transport); #[cfg(feature = "libp2p-websocket")] let transport = { @@ -214,22 +210,15 @@ fn build_transport(local_private_key: Keypair) -> Boxed<(PeerId, StreamMuxerBox) transport.or_transport(websocket::WsConfig::new(trans_clone)) }; transport - .with_upgrade(secio::SecioConfig::new(local_private_key)) - .and_then(move |out, endpoint| { - let peer_id = out.remote_key.into_peer_id(); - let peer_id2 = peer_id.clone(); - let upgrade = core::upgrade::SelectUpgrade::new( - libp2p::yamux::Config::default(), - libp2p::mplex::MplexConfig::new(), - ) - // TODO: use a single `.map` instead of two maps - .map_inbound(move |muxer| (peer_id, muxer)) - .map_outbound(move |muxer| (peer_id2, muxer)); - - core::upgrade::apply(out.stream, upgrade, endpoint) - .map(|(id, muxer)| (id, core::muxing::StreamMuxerBox::new(muxer))) - }) - .with_timeout(Duration::from_secs(20)) + .upgrade(core::upgrade::Version::V1) + .authenticate(secio::SecioConfig::new(local_private_key)) + .multiplex(core::upgrade::SelectUpgrade::new( + libp2p::yamux::Config::default(), + libp2p::mplex::MplexConfig::new(), + )) + .map(|(peer, muxer), _| (peer, core::muxing::StreamMuxerBox::new(muxer))) + .timeout(Duration::from_secs(20)) + .timeout(Duration::from_secs(20)) .map_err(|err| Error::new(ErrorKind::Other, err)) .boxed() } diff --git a/beacon_node/network/Cargo.toml b/beacon_node/network/Cargo.toml index ffeba96ec5..b58f2fd7cb 100644 --- a/beacon_node/network/Cargo.toml +++ b/beacon_node/network/Cargo.toml @@ -5,19 +5,19 @@ authors = ["Age Manning "] edition = "2018" [dev-dependencies] -sloggers = "0.3.2" +sloggers = "0.3.4" [dependencies] beacon_chain = { path = "../beacon_chain" } store = { path = "../store" } eth2-libp2p = { path = "../eth2-libp2p" } types = { path = "../../eth2/types" } -slog = { version = "^2.2.3" , features = ["max_level_trace"] } +slog = { version = "2.5.2", features = ["max_level_trace"] } hex = "0.3" -eth2_ssz = "0.1" -tree_hash = "0.1" -futures = "0.1.25" -error-chain = "0.12.0" -tokio = "0.1.16" +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 = "0.6.10" +smallvec = "0.6.11" diff --git a/beacon_node/rest_api/Cargo.toml b/beacon_node/rest_api/Cargo.toml index 7ea21eeba3..ac019b97c0 100644 --- a/beacon_node/rest_api/Cargo.toml +++ b/beacon_node/rest_api/Cargo.toml @@ -12,28 +12,28 @@ 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.2.3" -slog-term = "^2.4.0" -slog-async = "^2.3.0" -eth2_ssz = { path = "../../eth2/utils/ssz" } -eth2_ssz_derive = { path = "../../eth2/utils/ssz_derive" } +serde = { version = "1.0.102", features = ["derive"] } +serde_json = "1.0.41" +serde_yaml = "0.8.11" +slog = "2.5.2" +slog-term = "2.4.2" +slog-async = "2.3.0" +eth2_ssz = "0.1.2" +eth2_ssz_derive = "0.1.0" state_processing = { path = "../../eth2/state_processing" } types = { path = "../../eth2/types" } -clap = "2.32.0" -http = "^0.1.17" -prometheus = { version = "^0.6", features = ["process"] } -hyper = "0.12.34" -exit-future = "0.1.3" -tokio = "0.1.17" -url = "2.0" -lazy_static = "1.3.0" +clap = "2.33.0" +http = "0.1.19" +prometheus = { version = "0.7.0", features = ["process"] } +hyper = "0.12.35" +exit-future = "0.1.4" +tokio = "0.1.22" +url = "2.1.0" +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.2" -parking_lot = "0.9" -futures = "0.1.25" +hex = "0.3" +parking_lot = "0.9.0" +futures = "0.1.29" diff --git a/beacon_node/rpc/Cargo.toml b/beacon_node/rpc/Cargo.toml index 8fc13a1bd6..93a5239e48 100644 --- a/beacon_node/rpc/Cargo.toml +++ b/beacon_node/rpc/Cargo.toml @@ -11,13 +11,13 @@ network = { path = "../network" } eth2-libp2p = { path = "../eth2-libp2p" } version = { path = "../version" } types = { path = "../../eth2/types" } -eth2_ssz = "0.1" +eth2_ssz = "0.1.2" protos = { path = "../../protos" } -grpcio = { version = "0.4", default-features = false, features = ["protobuf-codec"] } -clap = "2.32.0" -futures = "0.1.23" -serde = "1.0" -serde_derive = "1.0" -slog = { version = "^2.2.3" , features = ["max_level_trace"] } -tokio = "0.1.17" +grpcio = { version = "0.4.6", default-features = false, features = ["protobuf-codec"] } +clap = "2.33.0" +futures = "0.1.29" +serde = "1.0.102" +serde_derive = "1.0.102" +slog = { version = "2.5.2", features = ["max_level_trace"] } +tokio = "0.1.22" exit-future = "0.1.4" diff --git a/beacon_node/store/Cargo.toml b/beacon_node/store/Cargo.toml index cd9711253e..d613c12000 100644 --- a/beacon_node/store/Cargo.toml +++ b/beacon_node/store/Cargo.toml @@ -5,15 +5,15 @@ authors = ["Paul Hauner "] edition = "2018" [dev-dependencies] -tempfile = "3" +tempfile = "3.1.0" [dependencies] db-key = "0.0.5" leveldb = "0.8.4" -parking_lot = "0.7" -eth2_ssz = "0.1" -eth2_ssz_derive = "0.1" -tree_hash = "0.1" +parking_lot = "0.9.0" +eth2_ssz = "0.1.2" +eth2_ssz_derive = "0.1.0" +tree_hash = "0.1.0" types = { path = "../../eth2/types" } -lazy_static = "1.3.0" +lazy_static = "1.4.0" lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" } diff --git a/beacon_node/websocket_server/Cargo.toml b/beacon_node/websocket_server/Cargo.toml index 48f046e074..2922d5fa5d 100644 --- a/beacon_node/websocket_server/Cargo.toml +++ b/beacon_node/websocket_server/Cargo.toml @@ -8,13 +8,13 @@ edition = "2018" [dependencies] beacon_chain = { path = "../beacon_chain" } -clap = "2.32.0" -exit-future = "0.1.3" -futures = "0.1.25" -serde = "1.0" -serde_derive = "1.0" -serde_json = "^1.0" -slog = "^2.2.3" -tokio = "0.1.16" +clap = "2.33.0" +exit-future = "0.1.4" +futures = "0.1.29" +serde = "1.0.102" +serde_derive = "1.0.102" +serde_json = "1.0.41" +slog = "2.5.2" +tokio = "0.1.22" types = { path = "../../eth2/types" } -ws = "0.9" +ws = "0.9.1" diff --git a/eth2/lmd_ghost/Cargo.toml b/eth2/lmd_ghost/Cargo.toml index 636076c466..e26b85626c 100644 --- a/eth2/lmd_ghost/Cargo.toml +++ b/eth2/lmd_ghost/Cargo.toml @@ -5,17 +5,17 @@ authors = ["Age Manning ", "Paul Hauner edition = "2018" [dependencies] -parking_lot = "0.7" +parking_lot = "0.9.0" store = { path = "../../beacon_node/store" } types = { path = "../types" } [dev-dependencies] -criterion = "0.2" -hex = "0.3.2" -yaml-rust = "0.4.2" +criterion = "0.3.0" +hex = "0.3" +yaml-rust = "0.4.3" bls = { path = "../utils/bls" } slot_clock = { path = "../utils/slot_clock" } beacon_chain = { path = "../../beacon_node/beacon_chain" } -env_logger = "0.6.0" -lazy_static = "1.3.0" -rand = "0.7" +env_logger = "0.7.1" +lazy_static = "1.4.0" +rand = "0.7.2" diff --git a/eth2/operation_pool/Cargo.toml b/eth2/operation_pool/Cargo.toml index 41edf8086c..9aa2b598da 100644 --- a/eth2/operation_pool/Cargo.toml +++ b/eth2/operation_pool/Cargo.toml @@ -6,12 +6,12 @@ edition = "2018" [dependencies] int_to_bytes = { path = "../utils/int_to_bytes" } -itertools = "0.8" -parking_lot = "0.7" +itertools = "0.8.1" +parking_lot = "0.9.0" types = { path = "../types" } state_processing = { path = "../state_processing" } -eth2_ssz = "0.1" -eth2_ssz_derive = { path = "../utils/ssz_derive" } +eth2_ssz = "0.1.2" +eth2_ssz_derive = "0.1.0" [dev-dependencies] -rand = "0.5.5" +rand = "0.7.2" diff --git a/eth2/state_processing/Cargo.toml b/eth2/state_processing/Cargo.toml index 1e29431991..96b8f20145 100644 --- a/eth2/state_processing/Cargo.toml +++ b/eth2/state_processing/Cargo.toml @@ -9,13 +9,13 @@ name = "benches" harness = false [dev-dependencies] -criterion = "0.2" -env_logger = "0.6.0" -serde = "1.0" -serde_derive = "1.0" -lazy_static = "1.4" -serde_yaml = "0.8" -eth2_ssz = { path = "../utils/ssz" } +criterion = "0.3.0" +env_logger = "0.7.1" +serde = "1.0.102" +serde_derive = "1.0.102" +lazy_static = "1.4.0" +serde_yaml = "0.8.11" +eth2_ssz = "0.1.2" beacon_chain = { path = "../../beacon_node/beacon_chain" } store = { path = "../../beacon_node/store" } lmd_ghost = { path = "../lmd_ghost" } @@ -23,15 +23,15 @@ lmd_ghost = { path = "../lmd_ghost" } [dependencies] bls = { path = "../utils/bls" } -integer-sqrt = "0.1" -itertools = "0.8" +integer-sqrt = "0.1.2" +itertools = "0.8.1" eth2_ssz_types = { path = "../utils/ssz_types" } merkle_proof = { path = "../utils/merkle_proof" } -log = "0.4" -tree_hash = "0.1" +log = "0.4.8" +tree_hash = "0.1.0" tree_hash_derive = "0.2" types = { path = "../types" } -rayon = "1.0" +rayon = "1.2.0" [features] fake_crypto = ["bls/fake_crypto"] diff --git a/eth2/types/Cargo.toml b/eth2/types/Cargo.toml index 95d7a03174..9123ca6b32 100644 --- a/eth2/types/Cargo.toml +++ b/eth2/types/Cargo.toml @@ -8,27 +8,28 @@ edition = "2018" bls = { path = "../utils/bls" } compare_fields = { path = "../utils/compare_fields" } compare_fields_derive = { path = "../utils/compare_fields_derive" } -dirs = "1.0" -derivative = "1.0" +dirs = "2.0.2" +derivative = "1.0.3" eth2_interop_keypairs = { path = "../utils/eth2_interop_keypairs" } -ethereum-types = "0.6" -eth2_hashing = { path = "../utils/eth2_hashing" } +ethereum-types = "0.8.0" +eth2_hashing = "0.1.0" hex = "0.3" int_to_bytes = { path = "../utils/int_to_bytes" } -log = "0.4" -rayon = "1.0" -rand = "0.5.5" -serde = "1.0" -serde_derive = "1.0" -slog = "^2.2.3" -eth2_ssz = "0.1" -eth2_ssz_derive = "0.1" +log = "0.4.8" +rayon = "1.2.0" +rand = "0.7.2" +serde = "1.0.102" +serde_derive = "1.0.102" +slog = "2.5.2" +eth2_ssz = "0.1.2" +eth2_ssz_derive = "0.1.0" 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" +tree_hash = "0.1.0" tree_hash_derive = "0.2" +rand_xorshift = "0.2.0" [dev-dependencies] -env_logger = "0.6.0" -serde_json = "^1.0" +env_logger = "0.7.1" +serde_json = "1.0.41" diff --git a/eth2/types/src/test_utils/keypairs_file.rs b/eth2/types/src/test_utils/keypairs_file.rs index a1ea4d928b..13b1b17f2d 100644 --- a/eth2/types/src/test_utils/keypairs_file.rs +++ b/eth2/types/src/test_utils/keypairs_file.rs @@ -91,7 +91,7 @@ mod tests { } fn random_tmp_file() -> String { - let mut rng = thread_rng(); + let rng = thread_rng(); rng.sample_iter(&Alphanumeric).take(7).collect() } diff --git a/eth2/types/src/test_utils/mod.rs b/eth2/types/src/test_utils/mod.rs index b3ecb9089c..0e5a6d41d2 100644 --- a/eth2/types/src/test_utils/mod.rs +++ b/eth2/types/src/test_utils/mod.rs @@ -10,8 +10,6 @@ pub use generate_deterministic_keypairs::generate_deterministic_keypair; pub use generate_deterministic_keypairs::generate_deterministic_keypairs; pub use generate_deterministic_keypairs::load_keypairs_from_yaml; pub use keypairs_file::KeypairsFile; -pub use rand::{ - RngCore, - {prng::XorShiftRng, SeedableRng}, -}; +pub use rand::{RngCore, SeedableRng}; +pub use rand_xorshift::XorShiftRng; pub use test_random::TestRandom; diff --git a/eth2/utils/bls/Cargo.toml b/eth2/utils/bls/Cargo.toml index 6638f13a26..dbee0cead6 100644 --- a/eth2/utils/bls/Cargo.toml +++ b/eth2/utils/bls/Cargo.toml @@ -5,16 +5,16 @@ authors = ["Paul Hauner "] edition = "2018" [dependencies] -milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v0.11.0" } -eth2_hashing = { path = "../eth2_hashing" } +milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v0.11.1" } +eth2_hashing = "0.1.0" hex = "0.3" -rand = "^0.5" -serde = "1.0" -serde_derive = "1.0" +rand = "0.7.2" +serde = "1.0.102" +serde_derive = "1.0.102" serde_hex = { path = "../serde_hex" } -eth2_ssz = "0.1" +eth2_ssz = "0.1.2" eth2_ssz_types = { path = "../ssz_types" } -tree_hash = "0.1" +tree_hash = "0.1.0" [features] fake_crypto = [] diff --git a/eth2/utils/eth2_config/Cargo.toml b/eth2/utils/eth2_config/Cargo.toml index a125887480..7459cfed69 100644 --- a/eth2/utils/eth2_config/Cargo.toml +++ b/eth2/utils/eth2_config/Cargo.toml @@ -5,8 +5,8 @@ authors = ["Paul Hauner "] edition = "2018" [dependencies] -clap = "2.32.0" -serde = "1.0" -serde_derive = "1.0" -toml = "^0.5" +clap = "2.33.0" +serde = "1.0.102" +serde_derive = "1.0.102" +toml = "0.5.4" types = { path = "../../types" } diff --git a/eth2/utils/eth2_hashing/Cargo.toml b/eth2/utils/eth2_hashing/Cargo.toml index 665e89d597..3e7d8ed3f1 100644 --- a/eth2/utils/eth2_hashing/Cargo.toml +++ b/eth2/utils/eth2_hashing/Cargo.toml @@ -7,10 +7,10 @@ license = "Apache-2.0" description = "Hashing primitives used in Ethereum 2.0" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -ring = "0.14.6" +ring = "0.16.9" [dev-dependencies] rustc-hex = "2.0.1" [target.'cfg(target_arch = "wasm32")'.dev-dependencies] -wasm-bindgen-test = "0.2.47" +wasm-bindgen-test = "0.3.2" diff --git a/eth2/utils/eth2_interop_keypairs/Cargo.toml b/eth2/utils/eth2_interop_keypairs/Cargo.toml index fbebfa25da..b8969c6618 100644 --- a/eth2/utils/eth2_interop_keypairs/Cargo.toml +++ b/eth2/utils/eth2_interop_keypairs/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -lazy_static = "1.4" -num-bigint = "0.2" -eth2_hashing = "0.1" +lazy_static = "1.4.0" +num-bigint = "0.2.3" +eth2_hashing = "0.1.0" hex = "0.3" -milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v0.11.0" } -serde_yaml = "0.8" -serde = "1.0" -serde_derive = "1.0" +milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v0.11.1" } +serde_yaml = "0.8.11" +serde = "1.0.102" +serde_derive = "1.0.102" [dev-dependencies] -base64 = "0.10" +base64 = "0.11.0" diff --git a/eth2/utils/int_to_bytes/Cargo.toml b/eth2/utils/int_to_bytes/Cargo.toml index f7424e0328..48c52548b1 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" +bytes = "0.4.12" [dev-dependencies] -yaml-rust = "0.4.2" +yaml-rust = "0.4.3" hex = "0.3" diff --git a/eth2/utils/lighthouse_bootstrap/Cargo.toml b/eth2/utils/lighthouse_bootstrap/Cargo.toml index cfc4c6bafd..0e1bbc7448 100644 --- a/eth2/utils/lighthouse_bootstrap/Cargo.toml +++ b/eth2/utils/lighthouse_bootstrap/Cargo.toml @@ -9,8 +9,8 @@ edition = "2018" [dependencies] eth2_config = { path = "../eth2_config" } eth2-libp2p = { path = "../../../beacon_node/eth2-libp2p" } -reqwest = "0.9" +reqwest = "0.9.22" url = "1.2" types = { path = "../../types" } -serde = "1.0" -slog = { version = "^2.2.3" , features = ["max_level_trace", "release_max_level_trace"] } +serde = "1.0.102" +slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] } diff --git a/eth2/utils/lighthouse_metrics/Cargo.toml b/eth2/utils/lighthouse_metrics/Cargo.toml index 0a24a96fb5..3b01c63e41 100644 --- a/eth2/utils/lighthouse_metrics/Cargo.toml +++ b/eth2/utils/lighthouse_metrics/Cargo.toml @@ -7,5 +7,5 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -lazy_static = "1.3.0" -prometheus = "^0.6" +lazy_static = "1.4.0" +prometheus = "0.7.0" diff --git a/eth2/utils/logging/Cargo.toml b/eth2/utils/logging/Cargo.toml index 62a8b41e0c..9d9405429e 100644 --- a/eth2/utils/logging/Cargo.toml +++ b/eth2/utils/logging/Cargo.toml @@ -5,5 +5,5 @@ authors = ["blacktemplar "] edition = "2018" [dependencies] -slog = { version = "^2.2.3" } -slog-term = "^2.4.0" +slog = "2.5.2" +slog-term = "2.4.2" diff --git a/eth2/utils/merkle_proof/Cargo.toml b/eth2/utils/merkle_proof/Cargo.toml index 5ffb6af532..a342b5bea7 100644 --- a/eth2/utils/merkle_proof/Cargo.toml +++ b/eth2/utils/merkle_proof/Cargo.toml @@ -5,10 +5,10 @@ authors = ["Michael Sproul "] edition = "2018" [dependencies] -ethereum-types = "0.6" -eth2_hashing = { path = "../eth2_hashing" } -lazy_static = "1.3.0" +ethereum-types = "0.8.0" +eth2_hashing = "0.1.0" +lazy_static = "1.4.0" [dev-dependencies] -quickcheck = "0.8" -quickcheck_macros = "0.8" +quickcheck = "0.9.0" +quickcheck_macros = "0.8.0" diff --git a/eth2/utils/serde_hex/Cargo.toml b/eth2/utils/serde_hex/Cargo.toml index b28194dd6f..06102f24ec 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" +serde = "1.0.102" hex = "0.3" diff --git a/eth2/utils/slot_clock/Cargo.toml b/eth2/utils/slot_clock/Cargo.toml index c4b9df5edd..e27395e42d 100644 --- a/eth2/utils/slot_clock/Cargo.toml +++ b/eth2/utils/slot_clock/Cargo.toml @@ -6,5 +6,5 @@ edition = "2018" [dependencies] types = { path = "../../types" } -lazy_static = "1.3.0" +lazy_static = "1.4.0" lighthouse_metrics = { path = "../lighthouse_metrics" } diff --git a/eth2/utils/ssz/Cargo.toml b/eth2/utils/ssz/Cargo.toml index ff5df162d8..53d75b697c 100644 --- a/eth2/utils/ssz/Cargo.toml +++ b/eth2/utils/ssz/Cargo.toml @@ -13,4 +13,4 @@ name = "ssz" eth2_ssz_derive = "0.1.0" [dependencies] -ethereum-types = "0.6" +ethereum-types = "0.8.0" diff --git a/eth2/utils/ssz_types/Cargo.toml b/eth2/utils/ssz_types/Cargo.toml index 732cea20d6..d019373e9f 100644 --- a/eth2/utils/ssz_types/Cargo.toml +++ b/eth2/utils/ssz_types/Cargo.toml @@ -8,13 +8,13 @@ edition = "2018" name = "ssz_types" [dependencies] -tree_hash = "0.1" -serde = "1.0" -serde_derive = "1.0" +tree_hash = "0.1.0" +serde = "1.0.102" +serde_derive = "1.0.102" serde_hex = { path = "../serde_hex" } -eth2_ssz = "0.1" -typenum = "1.10" +eth2_ssz = "0.1.2" +typenum = "1.11.2" [dev-dependencies] -serde_yaml = "0.8" +serde_yaml = "0.8.11" tree_hash_derive = "0.2" diff --git a/eth2/utils/swap_or_not_shuffle/Cargo.toml b/eth2/utils/swap_or_not_shuffle/Cargo.toml index 7c0e8151d8..2f7d331036 100644 --- a/eth2/utils/swap_or_not_shuffle/Cargo.toml +++ b/eth2/utils/swap_or_not_shuffle/Cargo.toml @@ -9,11 +9,11 @@ name = "benches" harness = false [dev-dependencies] -criterion = "0.2" -yaml-rust = "0.4.2" +criterion = "0.3.0" +yaml-rust = "0.4.3" hex = "0.3" -ethereum-types = "0.6" +ethereum-types = "0.8.0" [dependencies] -eth2_hashing = { path = "../eth2_hashing" } +eth2_hashing = "0.1.0" int_to_bytes = { path = "../int_to_bytes" } diff --git a/eth2/utils/tree_hash/Cargo.toml b/eth2/utils/tree_hash/Cargo.toml index 6cb18648db..e416a3f8e7 100644 --- a/eth2/utils/tree_hash/Cargo.toml +++ b/eth2/utils/tree_hash/Cargo.toml @@ -11,12 +11,12 @@ name = "benches" harness = false [dev-dependencies] -criterion = "0.2" -rand = "0.7" +criterion = "0.3.0" +rand = "0.7.2" tree_hash_derive = "0.2" types = { path = "../../types" } [dependencies] -ethereum-types = "0.6" -eth2_hashing = "0.1" -lazy_static = "1.4" +ethereum-types = "0.8.0" +eth2_hashing = "0.1.0" +lazy_static = "1.4.0" diff --git a/lcli/Cargo.toml b/lcli/Cargo.toml index 55bfc16544..d1dbdb221e 100644 --- a/lcli/Cargo.toml +++ b/lcli/Cargo.toml @@ -8,13 +8,13 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -clap = "2.33" +clap = "2.33.0" hex = "0.3" -log = "0.4" -serde = "1.0" -serde_yaml = "0.8" -simple_logger = "1.0" +log = "0.4.8" +serde = "1.0.102" +serde_yaml = "0.8.11" +simple_logger = "1.3.0" types = { path = "../eth2/types" } state_processing = { path = "../eth2/state_processing" } -eth2_ssz = { path = "../eth2/utils/ssz" } -regex = "1.3" +eth2_ssz = "0.1.2" +regex = "1.3.1" diff --git a/protos/Cargo.toml b/protos/Cargo.toml index ab97e5fb3a..479273cfc7 100644 --- a/protos/Cargo.toml +++ b/protos/Cargo.toml @@ -6,9 +6,9 @@ edition = "2018" description = "Google protobuf message and service definitions used in Lighthouse APIs." [dependencies] -futures = "0.1" -grpcio = { version = "0.4", default-features = false, features = ["protobuf-codec"] } -protobuf = "~2.8.1" +futures = "0.1.29" +grpcio = { version = "0.4.6", default-features = false, features = ["protobuf-codec"] } +protobuf = "2.8.1" [build-dependencies] -protoc-grpcio = "0.3.1" +protoc-grpcio = "1.1.0" diff --git a/protos/build.rs b/protos/build.rs index 108d9e2ddb..5b45bb7f83 100644 --- a/protos/build.rs +++ b/protos/build.rs @@ -5,6 +5,6 @@ use std::path::Path; fn main() { let proto_root = Path::new("src"); println!("cargo:rerun-if-changed={}", proto_root.display()); - protoc_grpcio::compile_grpc_protos(&["services.proto"], &[proto_root], &proto_root) + protoc_grpcio::compile_grpc_protos(&["services.proto"], &[proto_root], &proto_root, None) .expect("Failed to compile gRPC definitions!"); } diff --git a/tests/ef_tests/Cargo.toml b/tests/ef_tests/Cargo.toml index 24fe75fb3e..b0d281b8d6 100644 --- a/tests/ef_tests/Cargo.toml +++ b/tests/ef_tests/Cargo.toml @@ -12,18 +12,18 @@ fake_crypto = ["bls/fake_crypto"] [dependencies] bls = { path = "../../eth2/utils/bls" } compare_fields = { path = "../../eth2/utils/compare_fields" } -ethereum-types = "0.6" +ethereum-types = "0.8.0" hex = "0.3" -rayon = "1.0" -serde = "1.0" -serde_derive = "1.0" -serde_repr = "0.1" -serde_yaml = "0.8" -eth2_ssz = "0.1" -eth2_ssz_derive = "0.1" -tree_hash = "0.1" +rayon = "1.2.0" +serde = "1.0.102" +serde_derive = "1.0.102" +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" state_processing = { path = "../../eth2/state_processing" } swap_or_not_shuffle = { path = "../../eth2/utils/swap_or_not_shuffle" } types = { path = "../../eth2/types" } -walkdir = "2" +walkdir = "2.2.9" diff --git a/validator_client/Cargo.toml b/validator_client/Cargo.toml index dcadf3b478..09cb52b76d 100644 --- a/validator_client/Cargo.toml +++ b/validator_client/Cargo.toml @@ -14,28 +14,28 @@ path = "src/lib.rs" [dependencies] bls = { path = "../eth2/utils/bls" } -eth2_ssz = "0.1" +eth2_ssz = "0.1.2" eth2_config = { path = "../eth2/utils/eth2_config" } -tree_hash = "0.1" -clap = "2.32.0" +tree_hash = "0.1.0" +clap = "2.33.0" lighthouse_bootstrap = { path = "../eth2/utils/lighthouse_bootstrap" } eth2_interop_keypairs = { path = "../eth2/utils/eth2_interop_keypairs" } -grpcio = { version = "0.4", default-features = false, features = ["protobuf-codec"] } +grpcio = { version = "0.4.6", default-features = false, features = ["protobuf-codec"] } protos = { path = "../protos" } slot_clock = { path = "../eth2/utils/slot_clock" } types = { path = "../eth2/types" } -serde = "1.0" -serde_derive = "1.0" -serde_json = "^1.0" -slog = { version = "^2.2.3" , features = ["max_level_trace", "release_max_level_trace"] } -slog-async = "^2.3.0" -slog-json = "^2.3" -slog-term = "^2.4.0" -tokio = "0.1.18" -tokio-timer = "0.2.10" -error-chain = "0.12.0" -bincode = "^1.1.2" -futures = "0.1.25" -dirs = "2.0.1" +serde = "1.0.102" +serde_derive = "1.0.102" +serde_json = "1.0.41" +slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] } +slog-async = "2.3.0" +slog-json = "2.3.0" +slog-term = "2.4.2" +tokio = "0.1.22" +tokio-timer = "0.2.11" +error-chain = "0.12.1" +bincode = "1.2.0" +futures = "0.1.29" +dirs = "2.0.2" logging = { path = "../eth2/utils/logging" } -libc = "0.2" +libc = "0.2.65"