cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Updates external dependencies (#577)

Browse Source 
* Updates external dependencies

* Correct fmt formatting
This commit is contained in:
Age Manning 2019-10-30 12:22:18 +11:00 committed by GitHub
parent 2c6b40be78
commit 5c97ed3562
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 272 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -48,3 +48,4 @@ tree_hash_derive = { path = "eth2/utils/tree_hash_derive" }
eth2_ssz = { path = "eth2/utils/ssz" } eth2_ssz = { path = "eth2/utils/ssz" }
eth2_ssz_derive = { path = "eth2/utils/ssz_derive" } eth2_ssz_derive = { path = "eth2/utils/ssz_derive" }
eth2_ssz_types = { path = "eth2/utils/ssz_types" } eth2_ssz_types = { path = "eth2/utils/ssz_types" }
eth2_hashing = { path = "eth2/utils/eth2_hashing" }

10
account_manager/Cargo.toml
View File

@ -6,10 +6,10 @@ edition = "2018"
[dependencies] [dependencies]
bls = { path = "../eth2/utils/bls" } bls = { path = "../eth2/utils/bls" }
clap = "2.32.0" clap = "2.33.0"
slog = "^2.2.3" slog = "2.5.2"
slog-term = "^2.4.0" slog-term = "2.4.2"
slog-async = "^2.3.0" slog-async = "2.3.0"
validator_client = { path = "../validator_client" } validator_client = { path = "../validator_client" }
types = { path = "../eth2/types" } types = { path = "../eth2/types" }
dirs = "2.0.1" dirs = "2.0.2"

24
beacon_node/Cargo.toml
View File

@ -12,16 +12,16 @@ types = { path = "../eth2/types" }
store = { path = "./store" } store = { path = "./store" }
client = { path = "client" } client = { path = "client" }
version = { path = "version" } version = { path = "version" }
clap = "2.32.0" clap = "2.33.0"
rand = "0.7" rand = "0.7.2"
slog = { version = "^2.2.3" , features = ["max_level_trace", "release_max_level_trace"] } slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] }
slog-term = "^2.4.0" slog-term = "2.4.2"
slog-async = "^2.3.0" slog-async = "2.3.0"
ctrlc = { version = "3.1.1", features = ["termination"] } ctrlc = { version = "3.1.3", features = ["termination"] }
tokio = "0.1.15" tokio = "0.1.22"
tokio-timer = "0.2.10" tokio-timer = "0.2.11"
futures = "0.1.25" exit-future = "0.1.4"
exit-future = "0.1.3" env_logger = "0.7.1"
env_logger = "0.6.1" dirs = "2.0.2"
dirs = "2.0.1"
logging = { path = "../eth2/utils/logging" } logging = { path = "../eth2/utils/logging" }
futures = "0.1.29"

32
beacon_node/beacon_chain/Cargo.toml
View File

@ -12,28 +12,28 @@ write_ssz_files = [] # Writes debugging .ssz files to /tmp during block process
eth2_config = { path = "../../eth2/utils/eth2_config" } eth2_config = { path = "../../eth2/utils/eth2_config" }
merkle_proof = { path = "../../eth2/utils/merkle_proof" } merkle_proof = { path = "../../eth2/utils/merkle_proof" }
store = { path = "../store" } store = { path = "../store" }
parking_lot = "0.7" parking_lot = "0.9.0"
lazy_static = "1.3.0" lazy_static = "1.4.0"
lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" } lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" }
lighthouse_bootstrap = { path = "../../eth2/utils/lighthouse_bootstrap" } lighthouse_bootstrap = { path = "../../eth2/utils/lighthouse_bootstrap" }
log = "0.4" log = "0.4.8"
operation_pool = { path = "../../eth2/operation_pool" } operation_pool = { path = "../../eth2/operation_pool" }
rayon = "1.0" rayon = "1.2.0"
serde = "1.0" serde = "1.0.102"
serde_derive = "1.0" serde_derive = "1.0.102"
serde_yaml = "0.8" serde_yaml = "0.8.11"
serde_json = "^1.0" serde_json = "1.0.41"
slog = { version = "^2.2.3" , features = ["max_level_trace"] } slog = { version = "2.5.2", features = ["max_level_trace"] }
sloggers = { version = "^0.3" } sloggers = "0.3.4"
slot_clock = { path = "../../eth2/utils/slot_clock" } slot_clock = { path = "../../eth2/utils/slot_clock" }
eth2_hashing = { path = "../../eth2/utils/eth2_hashing" } eth2_hashing = "0.1.0"
eth2_ssz = "0.1" eth2_ssz = "0.1.2"
eth2_ssz_derive = "0.1" eth2_ssz_derive = "0.1.0"
state_processing = { path = "../../eth2/state_processing" } state_processing = { path = "../../eth2/state_processing" }
tree_hash = "0.1" tree_hash = "0.1.0"
types = { path = "../../eth2/types" } types = { path = "../../eth2/types" }
lmd_ghost = { path = "../../eth2/lmd_ghost" } lmd_ghost = { path = "../../eth2/lmd_ghost" }
[dev-dependencies] [dev-dependencies]
rand = "0.5.5" rand = "0.7.2"
lazy_static = "1.3.0" lazy_static = "1.4.0"

32
beacon_node/client/Cargo.toml
View File

@ -12,22 +12,22 @@ eth2-libp2p = { path = "../eth2-libp2p" }
rpc = { path = "../rpc" } rpc = { path = "../rpc" }
rest_api = { path = "../rest_api" } rest_api = { path = "../rest_api" }
websocket_server = { path = "../websocket_server" } websocket_server = { path = "../websocket_server" }
prometheus = "^0.6" prometheus = "0.7.0"
types = { path = "../../eth2/types" } types = { path = "../../eth2/types" }
tree_hash = "0.1" tree_hash = "0.1.0"
eth2_config = { path = "../../eth2/utils/eth2_config" } eth2_config = { path = "../../eth2/utils/eth2_config" }
slot_clock = { path = "../../eth2/utils/slot_clock" } slot_clock = { path = "../../eth2/utils/slot_clock" }
serde = "1.0.93" serde = "1.0.102"
serde_derive = "1.0" serde_derive = "1.0.102"
error-chain = "0.12.0" error-chain = "0.12.1"
serde_yaml = "0.8" serde_yaml = "0.8.11"
slog = { version = "^2.2.3" , features = ["max_level_trace"] } slog = { version = "2.5.2", features = ["max_level_trace"] }
slog-async = "^2.3.0" slog-async = "2.3.0"
slog-json = "^2.3" slog-json = "2.3.0"
tokio = "0.1.15" tokio = "0.1.22"
clap = "2.32.0" clap = "2.33.0"
dirs = "1.0.3" dirs = "2.0.2"
exit-future = "0.1.3" exit-future = "0.1.4"
futures = "0.1.25" futures = "0.1.29"
reqwest = "0.9" reqwest = "0.9.22"
url = "1.2" url = "2.1.0"

32
beacon_node/eth2-libp2p/Cargo.toml
View File

@ -5,28 +5,28 @@ authors = ["Age Manning <Age@AgeManning.com>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
clap = "2.32.0" clap = "2.33.0"
hex = "0.3" hex = "0.3"
#SigP repository #SigP repository
libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "8ac9c744197faaadc0e2b64fed7470ac4e2a41ca" } libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "cdd5251d29e21a01aa2ffed8cb577a37a0f9e2eb" }
enr = { git = "https://github.com/SigP/rust-libp2p/", rev = "8ac9c744197faaadc0e2b64fed7470ac4e2a41ca", features = ["serde"] } enr = { git = "https://github.com/SigP/rust-libp2p/", rev = "cdd5251d29e21a01aa2ffed8cb577a37a0f9e2eb", features = ["serde"] }
types = { path = "../../eth2/types" } types = { path = "../../eth2/types" }
serde = "1.0" serde = "1.0.102"
serde_derive = "1.0" serde_derive = "1.0.102"
eth2_ssz = "0.1" eth2_ssz = "0.1.2"
eth2_ssz_derive = "0.1" eth2_ssz_derive = "0.1.0"
slog = { version = "^2.4.1" , features = ["max_level_trace"] } slog = { version = "2.5.2", features = ["max_level_trace"] }
version = { path = "../version" } version = { path = "../version" }
tokio = "0.1.16" tokio = "0.1.22"
futures = "0.1.25" futures = "0.1.29"
error-chain = "0.12.0" error-chain = "0.12.1"
tokio-timer = "0.2.10" tokio-timer = "0.2.11"
dirs = "2.0.1" dirs = "2.0.2"
tokio-io = "0.1.12" tokio-io = "0.1.12"
smallvec = "0.6.10" smallvec = "0.6.11"
fnv = "1.0.6" fnv = "1.0.6"
unsigned-varint = "0.2.2" unsigned-varint = "0.2.3"
bytes = "0.4.12" bytes = "0.4.12"
tokio-io-timeout = "0.3.1" tokio-io-timeout = "0.3.1"
lazy_static = "1.3.0" lazy_static = "1.4.0"
lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" } lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" }

9
beacon_node/eth2-libp2p/src/behaviour.rs
View File

@ -153,8 +153,10 @@ impl<TSubstream: AsyncRead + AsyncWrite> NetworkBehaviourEventProcess<IdentifyEv
{ {
fn inject_event(&mut self, event: IdentifyEvent) { fn inject_event(&mut self, event: IdentifyEvent) {
match event { match event {
IdentifyEvent::Identified { IdentifyEvent::Received {
peer_id, mut info, .. peer_id,
mut info,
observed_addr,
} => { } => {
if info.listen_addrs.len() > MAX_IDENTIFY_ADDRESSES { if info.listen_addrs.len() > MAX_IDENTIFY_ADDRESSES {
debug!( debug!(
@ -167,11 +169,12 @@ impl<TSubstream: AsyncRead + AsyncWrite> NetworkBehaviourEventProcess<IdentifyEv
"Protocol Version" => info.protocol_version, "Protocol Version" => info.protocol_version,
"Agent Version" => info.agent_version, "Agent Version" => info.agent_version,
"Listening Addresses" => format!("{:?}", info.listen_addrs), "Listening Addresses" => format!("{:?}", info.listen_addrs),
"Observed Address" => format!("{:?}", observed_addr),
"Protocols" => format!("{:?}", info.protocols) "Protocols" => format!("{:?}", info.protocols)
); );
} }
IdentifyEvent::Sent { .. } => {}
IdentifyEvent::Error { .. } => {} IdentifyEvent::Error { .. } => {}
IdentifyEvent::SendBack { .. } => {}
} }
} }
} }

2
beacon_node/eth2-libp2p/src/config.rs
View File

@ -82,7 +82,7 @@ impl Default for Config {
gs_config: GossipsubConfigBuilder::new() gs_config: GossipsubConfigBuilder::new()
.max_transmit_size(1_048_576) .max_transmit_size(1_048_576)
.heartbeat_interval(Duration::from_secs(20)) // TODO: Reduce for mainnet .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(), .build(),
boot_nodes: vec![], boot_nodes: vec![],
libp2p_nodes: vec![], libp2p_nodes: vec![],

4
beacon_node/eth2-libp2p/src/discovery.rs
View File

@ -286,7 +286,7 @@ fn load_enr(
// Build the local ENR. // Build the local ENR.
// Note: Discovery should update the ENR record's IP to the external IP as seen by the // Note: Discovery should update the ENR record's IP to the external IP as seen by the
// majority of our peers. // majority of our peers.
let mut local_enr = EnrBuilder::new() let mut local_enr = EnrBuilder::new("v4")
.ip(config.discovery_address) .ip(config.discovery_address)
.tcp(config.libp2p_port) .tcp(config.libp2p_port)
.udp(config.discovery_port) .udp(config.discovery_port)
@ -302,7 +302,7 @@ fn load_enr(
match Enr::from_str(&enr_string) { match Enr::from_str(&enr_string) {
Ok(enr) => { Ok(enr) => {
if enr.node_id() == local_enr.node_id() { 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.tcp() == Some(config.libp2p_port)
&& enr.udp() == Some(config.discovery_port) && enr.udp() == Some(config.discovery_port)
{ {

29
beacon_node/eth2-libp2p/src/service.rs
View File

@ -8,12 +8,8 @@ use crate::{Topic, TopicHash};
use futures::prelude::*; use futures::prelude::*;
use futures::Stream; use futures::Stream;
use libp2p::core::{ use libp2p::core::{
identity::Keypair, identity::Keypair, multiaddr::Multiaddr, muxing::StreamMuxerBox, nodes::Substream,
multiaddr::Multiaddr,
muxing::StreamMuxerBox,
nodes::Substream,
transport::boxed::Boxed, transport::boxed::Boxed,
upgrade::{InboundUpgradeExt, OutboundUpgradeExt},
}; };
use libp2p::{core, secio, PeerId, Swarm, Transport}; use libp2p::{core, secio, PeerId, Swarm, Transport};
use slog::{crit, debug, info, trace, warn}; 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> { 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 // TODO: The Wire protocol currently doesn't specify encryption and this will need to be customised
// in the future. // in the future.
let transport = libp2p::tcp::TcpConfig::new(); let transport = libp2p::tcp::TcpConfig::new().nodelay(true);
let transport = libp2p::dns::DnsConfig::new(transport); let transport = libp2p::dns::DnsConfig::new(transport);
#[cfg(feature = "libp2p-websocket")] #[cfg(feature = "libp2p-websocket")]
let transport = { 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.or_transport(websocket::WsConfig::new(trans_clone))
}; };
transport transport
.with_upgrade(secio::SecioConfig::new(local_private_key)) .upgrade(core::upgrade::Version::V1)
.and_then(move |out, endpoint| { .authenticate(secio::SecioConfig::new(local_private_key))
let peer_id = out.remote_key.into_peer_id(); .multiplex(core::upgrade::SelectUpgrade::new(
let peer_id2 = peer_id.clone();
let upgrade = core::upgrade::SelectUpgrade::new(
libp2p::yamux::Config::default(), libp2p::yamux::Config::default(),
libp2p::mplex::MplexConfig::new(), libp2p::mplex::MplexConfig::new(),
) ))
// TODO: use a single `.map` instead of two maps .map(|(peer, muxer), _| (peer, core::muxing::StreamMuxerBox::new(muxer)))
.map_inbound(move |muxer| (peer_id, muxer)) .timeout(Duration::from_secs(20))
.map_outbound(move |muxer| (peer_id2, muxer)); .timeout(Duration::from_secs(20))
core::upgrade::apply(out.stream, upgrade, endpoint)
.map(|(id, muxer)| (id, core::muxing::StreamMuxerBox::new(muxer)))
})
.with_timeout(Duration::from_secs(20))
.map_err(|err| Error::new(ErrorKind::Other, err)) .map_err(|err| Error::new(ErrorKind::Other, err))
.boxed() .boxed()
} }

16
beacon_node/network/Cargo.toml
View File

@ -5,19 +5,19 @@ authors = ["Age Manning <Age@AgeManning.com>"]
edition = "2018" edition = "2018"
[dev-dependencies] [dev-dependencies]
sloggers = "0.3.2" sloggers = "0.3.4"
[dependencies] [dependencies]
beacon_chain = { path = "../beacon_chain" } beacon_chain = { path = "../beacon_chain" }
store = { path = "../store" } store = { path = "../store" }
eth2-libp2p = { path = "../eth2-libp2p" } eth2-libp2p = { path = "../eth2-libp2p" }
types = { path = "../../eth2/types" } 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" hex = "0.3"
eth2_ssz = "0.1" eth2_ssz = "0.1.2"
tree_hash = "0.1" tree_hash = "0.1.0"
futures = "0.1.25" futures = "0.1.29"
error-chain = "0.12.0" error-chain = "0.12.1"
tokio = "0.1.16" tokio = "0.1.22"
parking_lot = "0.9.0" parking_lot = "0.9.0"
smallvec = "0.6.10" smallvec = "0.6.11"

38
beacon_node/rest_api/Cargo.toml
View File

@ -12,28 +12,28 @@ network = { path = "../network" }
eth2-libp2p = { path = "../eth2-libp2p" } eth2-libp2p = { path = "../eth2-libp2p" }
store = { path = "../store" } store = { path = "../store" }
version = { path = "../version" } version = { path = "../version" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0.102", features = ["derive"] }
serde_json = "^1.0" serde_json = "1.0.41"
serde_yaml = "0.8" serde_yaml = "0.8.11"
slog = "^2.2.3" slog = "2.5.2"
slog-term = "^2.4.0" slog-term = "2.4.2"
slog-async = "^2.3.0" slog-async = "2.3.0"
eth2_ssz = { path = "../../eth2/utils/ssz" } eth2_ssz = "0.1.2"
eth2_ssz_derive = { path = "../../eth2/utils/ssz_derive" } eth2_ssz_derive = "0.1.0"
state_processing = { path = "../../eth2/state_processing" } state_processing = { path = "../../eth2/state_processing" }
types = { path = "../../eth2/types" } types = { path = "../../eth2/types" }
clap = "2.32.0" clap = "2.33.0"
http = "^0.1.17" http = "0.1.19"
prometheus = { version = "^0.6", features = ["process"] } prometheus = { version = "0.7.0", features = ["process"] }
hyper = "0.12.34" hyper = "0.12.35"
exit-future = "0.1.3" exit-future = "0.1.4"
tokio = "0.1.17" tokio = "0.1.22"
url = "2.0" url = "2.1.0"
lazy_static = "1.3.0" lazy_static = "1.4.0"
eth2_config = { path = "../../eth2/utils/eth2_config" } eth2_config = { path = "../../eth2/utils/eth2_config" }
lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" } lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" }
slot_clock = { path = "../../eth2/utils/slot_clock" } slot_clock = { path = "../../eth2/utils/slot_clock" }
hex = "0.3.2" hex = "0.3"
parking_lot = "0.9" parking_lot = "0.9.0"
futures = "0.1.25" futures = "0.1.29"

16
beacon_node/rpc/Cargo.toml
View File

@ -11,13 +11,13 @@ network = { path = "../network" }
eth2-libp2p = { path = "../eth2-libp2p" } eth2-libp2p = { path = "../eth2-libp2p" }
version = { path = "../version" } version = { path = "../version" }
types = { path = "../../eth2/types" } types = { path = "../../eth2/types" }
eth2_ssz = "0.1" eth2_ssz = "0.1.2"
protos = { path = "../../protos" } protos = { path = "../../protos" }
grpcio = { version = "0.4", default-features = false, features = ["protobuf-codec"] } grpcio = { version = "0.4.6", default-features = false, features = ["protobuf-codec"] }
clap = "2.32.0" clap = "2.33.0"
futures = "0.1.23" futures = "0.1.29"
serde = "1.0" serde = "1.0.102"
serde_derive = "1.0" serde_derive = "1.0.102"
slog = { version = "^2.2.3" , features = ["max_level_trace"] } slog = { version = "2.5.2", features = ["max_level_trace"] }
tokio = "0.1.17" tokio = "0.1.22"
exit-future = "0.1.4" exit-future = "0.1.4"

12
beacon_node/store/Cargo.toml
View File

@ -5,15 +5,15 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
edition = "2018" edition = "2018"
[dev-dependencies] [dev-dependencies]
tempfile = "3" tempfile = "3.1.0"
[dependencies] [dependencies]
db-key = "0.0.5" db-key = "0.0.5"
leveldb = "0.8.4" leveldb = "0.8.4"
parking_lot = "0.7" parking_lot = "0.9.0"
eth2_ssz = "0.1" eth2_ssz = "0.1.2"
eth2_ssz_derive = "0.1" eth2_ssz_derive = "0.1.0"
tree_hash = "0.1" tree_hash = "0.1.0"
types = { path = "../../eth2/types" } types = { path = "../../eth2/types" }
lazy_static = "1.3.0" lazy_static = "1.4.0"
lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" } lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" }

18
beacon_node/websocket_server/Cargo.toml
View File

@ -8,13 +8,13 @@ edition = "2018"
[dependencies] [dependencies]
beacon_chain = { path = "../beacon_chain" } beacon_chain = { path = "../beacon_chain" }
clap = "2.32.0" clap = "2.33.0"
exit-future = "0.1.3" exit-future = "0.1.4"
futures = "0.1.25" futures = "0.1.29"
serde = "1.0" serde = "1.0.102"
serde_derive = "1.0" serde_derive = "1.0.102"
serde_json = "^1.0" serde_json = "1.0.41"
slog = "^2.2.3" slog = "2.5.2"
tokio = "0.1.16" tokio = "0.1.22"
types = { path = "../../eth2/types" } types = { path = "../../eth2/types" }
ws = "0.9" ws = "0.9.1"

14
eth2/lmd_ghost/Cargo.toml
View File

@ -5,17 +5,17 @@ authors = ["Age Manning <Age@AgeManning.com>", "Paul Hauner <paul@sigmaprime.io>
edition = "2018" edition = "2018"
[dependencies] [dependencies]
parking_lot = "0.7" parking_lot = "0.9.0"
store = { path = "../../beacon_node/store" } store = { path = "../../beacon_node/store" }
types = { path = "../types" } types = { path = "../types" }
[dev-dependencies] [dev-dependencies]
criterion = "0.2" criterion = "0.3.0"
hex = "0.3.2" hex = "0.3"
yaml-rust = "0.4.2" yaml-rust = "0.4.3"
bls = { path = "../utils/bls" } bls = { path = "../utils/bls" }
slot_clock = { path = "../utils/slot_clock" } slot_clock = { path = "../utils/slot_clock" }
beacon_chain = { path = "../../beacon_node/beacon_chain" } beacon_chain = { path = "../../beacon_node/beacon_chain" }
env_logger = "0.6.0" env_logger = "0.7.1"
lazy_static = "1.3.0" lazy_static = "1.4.0"
rand = "0.7" rand = "0.7.2"

10
eth2/operation_pool/Cargo.toml
View File

@ -6,12 +6,12 @@ edition = "2018"
[dependencies] [dependencies]
int_to_bytes = { path = "../utils/int_to_bytes" } int_to_bytes = { path = "../utils/int_to_bytes" }
itertools = "0.8" itertools = "0.8.1"
parking_lot = "0.7" parking_lot = "0.9.0"
types = { path = "../types" } types = { path = "../types" }
state_processing = { path = "../state_processing" } state_processing = { path = "../state_processing" }
eth2_ssz = "0.1" eth2_ssz = "0.1.2"
eth2_ssz_derive = { path = "../utils/ssz_derive" } eth2_ssz_derive = "0.1.0"
[dev-dependencies] [dev-dependencies]
rand = "0.5.5" rand = "0.7.2"

24
eth2/state_processing/Cargo.toml
View File

@ -9,13 +9,13 @@ name = "benches"
harness = false harness = false
[dev-dependencies] [dev-dependencies]
criterion = "0.2" criterion = "0.3.0"
env_logger = "0.6.0" env_logger = "0.7.1"
serde = "1.0" serde = "1.0.102"
serde_derive = "1.0" serde_derive = "1.0.102"
lazy_static = "1.4" lazy_static = "1.4.0"
serde_yaml = "0.8" serde_yaml = "0.8.11"
eth2_ssz = { path = "../utils/ssz" } eth2_ssz = "0.1.2"
beacon_chain = { path = "../../beacon_node/beacon_chain" } beacon_chain = { path = "../../beacon_node/beacon_chain" }
store = { path = "../../beacon_node/store" } store = { path = "../../beacon_node/store" }
lmd_ghost = { path = "../lmd_ghost" } lmd_ghost = { path = "../lmd_ghost" }
@ -23,15 +23,15 @@ lmd_ghost = { path = "../lmd_ghost" }
[dependencies] [dependencies]
bls = { path = "../utils/bls" } bls = { path = "../utils/bls" }
integer-sqrt = "0.1" integer-sqrt = "0.1.2"
itertools = "0.8" itertools = "0.8.1"
eth2_ssz_types = { path = "../utils/ssz_types" } eth2_ssz_types = { path = "../utils/ssz_types" }
merkle_proof = { path = "../utils/merkle_proof" } merkle_proof = { path = "../utils/merkle_proof" }
log = "0.4" log = "0.4.8"
tree_hash = "0.1" tree_hash = "0.1.0"
tree_hash_derive = "0.2" tree_hash_derive = "0.2"
types = { path = "../types" } types = { path = "../types" }
rayon = "1.0" rayon = "1.2.0"
[features] [features]
fake_crypto = ["bls/fake_crypto"] fake_crypto = ["bls/fake_crypto"]

31
eth2/types/Cargo.toml
View File

@ -8,27 +8,28 @@ edition = "2018"
bls = { path = "../utils/bls" } bls = { path = "../utils/bls" }
compare_fields = { path = "../utils/compare_fields" } compare_fields = { path = "../utils/compare_fields" }
compare_fields_derive = { path = "../utils/compare_fields_derive" } compare_fields_derive = { path = "../utils/compare_fields_derive" }
dirs = "1.0" dirs = "2.0.2"
derivative = "1.0" derivative = "1.0.3"
eth2_interop_keypairs = { path = "../utils/eth2_interop_keypairs" } eth2_interop_keypairs = { path = "../utils/eth2_interop_keypairs" }
ethereum-types = "0.6" ethereum-types = "0.8.0"
eth2_hashing = { path = "../utils/eth2_hashing" } eth2_hashing = "0.1.0"
hex = "0.3" hex = "0.3"
int_to_bytes = { path = "../utils/int_to_bytes" } int_to_bytes = { path = "../utils/int_to_bytes" }
log = "0.4" log = "0.4.8"
rayon = "1.0" rayon = "1.2.0"
rand = "0.5.5" rand = "0.7.2"
serde = "1.0" serde = "1.0.102"
serde_derive = "1.0" serde_derive = "1.0.102"
slog = "^2.2.3" slog = "2.5.2"
eth2_ssz = "0.1" eth2_ssz = "0.1.2"
eth2_ssz_derive = "0.1" eth2_ssz_derive = "0.1.0"
eth2_ssz_types = { path = "../utils/ssz_types" } eth2_ssz_types = { path = "../utils/ssz_types" }
swap_or_not_shuffle = { path = "../utils/swap_or_not_shuffle" } swap_or_not_shuffle = { path = "../utils/swap_or_not_shuffle" }
test_random_derive = { path = "../utils/test_random_derive" } test_random_derive = { path = "../utils/test_random_derive" }
tree_hash = "0.1" tree_hash = "0.1.0"
tree_hash_derive = "0.2" tree_hash_derive = "0.2"
rand_xorshift = "0.2.0"
[dev-dependencies] [dev-dependencies]
env_logger = "0.6.0" env_logger = "0.7.1"
serde_json = "^1.0" serde_json = "1.0.41"

2
eth2/types/src/test_utils/keypairs_file.rs
View File

@ -91,7 +91,7 @@ mod tests {
} }
fn random_tmp_file() -> String { fn random_tmp_file() -> String {
let mut rng = thread_rng(); let rng = thread_rng();
rng.sample_iter(&Alphanumeric).take(7).collect() rng.sample_iter(&Alphanumeric).take(7).collect()
} }

6
eth2/types/src/test_utils/mod.rs
View File

@ -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::generate_deterministic_keypairs;
pub use generate_deterministic_keypairs::load_keypairs_from_yaml; pub use generate_deterministic_keypairs::load_keypairs_from_yaml;
pub use keypairs_file::KeypairsFile; pub use keypairs_file::KeypairsFile;
pub use rand::{ pub use rand::{RngCore, SeedableRng};
RngCore, pub use rand_xorshift::XorShiftRng;
{prng::XorShiftRng, SeedableRng},
};
pub use test_random::TestRandom; pub use test_random::TestRandom;

14
eth2/utils/bls/Cargo.toml
View File

@ -5,16 +5,16 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v0.11.0" } milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v0.11.1" }
eth2_hashing = { path = "../eth2_hashing" } eth2_hashing = "0.1.0"
hex = "0.3" hex = "0.3"
rand = "^0.5" rand = "0.7.2"
serde = "1.0" serde = "1.0.102"
serde_derive = "1.0" serde_derive = "1.0.102"
serde_hex = { path = "../serde_hex" } serde_hex = { path = "../serde_hex" }
eth2_ssz = "0.1" eth2_ssz = "0.1.2"
eth2_ssz_types = { path = "../ssz_types" } eth2_ssz_types = { path = "../ssz_types" }
tree_hash = "0.1" tree_hash = "0.1.0"
[features] [features]
fake_crypto = [] fake_crypto = []

8
eth2/utils/eth2_config/Cargo.toml
View File

@ -5,8 +5,8 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
clap = "2.32.0" clap = "2.33.0"
serde = "1.0" serde = "1.0.102"
serde_derive = "1.0" serde_derive = "1.0.102"
toml = "^0.5" toml = "0.5.4"
types = { path = "../../types" } types = { path = "../../types" }

4
eth2/utils/eth2_hashing/Cargo.toml
View File

@ -7,10 +7,10 @@ license = "Apache-2.0"
description = "Hashing primitives used in Ethereum 2.0" description = "Hashing primitives used in Ethereum 2.0"
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
ring = "0.14.6" ring = "0.16.9"
[dev-dependencies] [dev-dependencies]
rustc-hex = "2.0.1" rustc-hex = "2.0.1"
[target.'cfg(target_arch = "wasm32")'.dev-dependencies] [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = "0.2.47" wasm-bindgen-test = "0.3.2"

16
eth2/utils/eth2_interop_keypairs/Cargo.toml
View File

@ -7,14 +7,14 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
lazy_static = "1.4" lazy_static = "1.4.0"
num-bigint = "0.2" num-bigint = "0.2.3"
eth2_hashing = "0.1" eth2_hashing = "0.1.0"
hex = "0.3" hex = "0.3"
milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v0.11.0" } milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v0.11.1" }
serde_yaml = "0.8" serde_yaml = "0.8.11"
serde = "1.0" serde = "1.0.102"
serde_derive = "1.0" serde_derive = "1.0.102"
[dev-dependencies] [dev-dependencies]
base64 = "0.10" base64 = "0.11.0"

4
eth2/utils/int_to_bytes/Cargo.toml
View File

@ -5,8 +5,8 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
bytes = "0.4" bytes = "0.4.12"
[dev-dependencies] [dev-dependencies]
yaml-rust = "0.4.2" yaml-rust = "0.4.3"
hex = "0.3" hex = "0.3"

6
eth2/utils/lighthouse_bootstrap/Cargo.toml
View File

@ -9,8 +9,8 @@ edition = "2018"
[dependencies] [dependencies]
eth2_config = { path = "../eth2_config" } eth2_config = { path = "../eth2_config" }
eth2-libp2p = { path = "../../../beacon_node/eth2-libp2p" } eth2-libp2p = { path = "../../../beacon_node/eth2-libp2p" }
reqwest = "0.9" reqwest = "0.9.22"
url = "1.2" url = "1.2"
types = { path = "../../types" } types = { path = "../../types" }
serde = "1.0" serde = "1.0.102"
slog = { version = "^2.2.3" , features = ["max_level_trace", "release_max_level_trace"] } slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] }

4
eth2/utils/lighthouse_metrics/Cargo.toml
View File

@ -7,5 +7,5 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
lazy_static = "1.3.0" lazy_static = "1.4.0"
prometheus = "^0.6" prometheus = "0.7.0"

4
eth2/utils/logging/Cargo.toml
View File

@ -5,5 +5,5 @@ authors = ["blacktemplar <blacktemplar@a1.net>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
slog = { version = "^2.2.3" } slog = "2.5.2"
slog-term = "^2.4.0" slog-term = "2.4.2"

10
eth2/utils/merkle_proof/Cargo.toml
View File

@ -5,10 +5,10 @@ authors = ["Michael Sproul <michael@sigmaprime.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
ethereum-types = "0.6" ethereum-types = "0.8.0"
eth2_hashing = { path = "../eth2_hashing" } eth2_hashing = "0.1.0"
lazy_static = "1.3.0" lazy_static = "1.4.0"
[dev-dependencies] [dev-dependencies]
quickcheck = "0.8" quickcheck = "0.9.0"
quickcheck_macros = "0.8" quickcheck_macros = "0.8.0"

2
eth2/utils/serde_hex/Cargo.toml
View File

@ -5,5 +5,5 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
serde = "1.0" serde = "1.0.102"
hex = "0.3" hex = "0.3"

2
eth2/utils/slot_clock/Cargo.toml
View File

@ -6,5 +6,5 @@ edition = "2018"
[dependencies] [dependencies]
types = { path = "../../types" } types = { path = "../../types" }
lazy_static = "1.3.0" lazy_static = "1.4.0"
lighthouse_metrics = { path = "../lighthouse_metrics" } lighthouse_metrics = { path = "../lighthouse_metrics" }

2
eth2/utils/ssz/Cargo.toml
View File

@ -13,4 +13,4 @@ name = "ssz"
eth2_ssz_derive = "0.1.0" eth2_ssz_derive = "0.1.0"
[dependencies] [dependencies]
ethereum-types = "0.6" ethereum-types = "0.8.0"

12
eth2/utils/ssz_types/Cargo.toml
View File

@ -8,13 +8,13 @@ edition = "2018"
name = "ssz_types" name = "ssz_types"
[dependencies] [dependencies]
tree_hash = "0.1" tree_hash = "0.1.0"
serde = "1.0" serde = "1.0.102"
serde_derive = "1.0" serde_derive = "1.0.102"
serde_hex = { path = "../serde_hex" } serde_hex = { path = "../serde_hex" }
eth2_ssz = "0.1" eth2_ssz = "0.1.2"
typenum = "1.10" typenum = "1.11.2"
[dev-dependencies] [dev-dependencies]
serde_yaml = "0.8" serde_yaml = "0.8.11"
tree_hash_derive = "0.2" tree_hash_derive = "0.2"

8
eth2/utils/swap_or_not_shuffle/Cargo.toml
View File

@ -9,11 +9,11 @@ name = "benches"
harness = false harness = false
[dev-dependencies] [dev-dependencies]
criterion = "0.2" criterion = "0.3.0"
yaml-rust = "0.4.2" yaml-rust = "0.4.3"
hex = "0.3" hex = "0.3"
ethereum-types = "0.6" ethereum-types = "0.8.0"
[dependencies] [dependencies]
eth2_hashing = { path = "../eth2_hashing" } eth2_hashing = "0.1.0"
int_to_bytes = { path = "../int_to_bytes" } int_to_bytes = { path = "../int_to_bytes" }

10
eth2/utils/tree_hash/Cargo.toml
View File

@ -11,12 +11,12 @@ name = "benches"
harness = false harness = false
[dev-dependencies] [dev-dependencies]
criterion = "0.2" criterion = "0.3.0"
rand = "0.7" rand = "0.7.2"
tree_hash_derive = "0.2" tree_hash_derive = "0.2"
types = { path = "../../types" } types = { path = "../../types" }
[dependencies] [dependencies]
ethereum-types = "0.6" ethereum-types = "0.8.0"
eth2_hashing = "0.1" eth2_hashing = "0.1.0"
lazy_static = "1.4" lazy_static = "1.4.0"

14
lcli/Cargo.toml
View File

@ -8,13 +8,13 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
clap = "2.33" clap = "2.33.0"
hex = "0.3" hex = "0.3"
log = "0.4" log = "0.4.8"
serde = "1.0" serde = "1.0.102"
serde_yaml = "0.8" serde_yaml = "0.8.11"
simple_logger = "1.0" simple_logger = "1.3.0"
types = { path = "../eth2/types" } types = { path = "../eth2/types" }
state_processing = { path = "../eth2/state_processing" } state_processing = { path = "../eth2/state_processing" }
eth2_ssz = { path = "../eth2/utils/ssz" } eth2_ssz = "0.1.2"
regex = "1.3" regex = "1.3.1"

8
protos/Cargo.toml
View File

@ -6,9 +6,9 @@ edition = "2018"
description = "Google protobuf message and service definitions used in Lighthouse APIs." description = "Google protobuf message and service definitions used in Lighthouse APIs."
[dependencies] [dependencies]
futures = "0.1" futures = "0.1.29"
grpcio = { version = "0.4", default-features = false, features = ["protobuf-codec"] } grpcio = { version = "0.4.6", default-features = false, features = ["protobuf-codec"] }
protobuf = "~2.8.1" protobuf = "2.8.1"
[build-dependencies] [build-dependencies]
protoc-grpcio = "0.3.1" protoc-grpcio = "1.1.0"

2
protos/build.rs
View File

@ -5,6 +5,6 @@ use std::path::Path;
fn main() { fn main() {
let proto_root = Path::new("src"); let proto_root = Path::new("src");
println!("cargo:rerun-if-changed={}", proto_root.display()); 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!"); .expect("Failed to compile gRPC definitions!");
} }

20
tests/ef_tests/Cargo.toml
View File

@ -12,18 +12,18 @@ fake_crypto = ["bls/fake_crypto"]
[dependencies] [dependencies]
bls = { path = "../../eth2/utils/bls" } bls = { path = "../../eth2/utils/bls" }
compare_fields = { path = "../../eth2/utils/compare_fields" } compare_fields = { path = "../../eth2/utils/compare_fields" }
ethereum-types = "0.6" ethereum-types = "0.8.0"
hex = "0.3" hex = "0.3"
rayon = "1.0" rayon = "1.2.0"
serde = "1.0" serde = "1.0.102"
serde_derive = "1.0" serde_derive = "1.0.102"
serde_repr = "0.1" serde_repr = "0.1.5"
serde_yaml = "0.8" serde_yaml = "0.8.11"
eth2_ssz = "0.1" eth2_ssz = "0.1.2"
eth2_ssz_derive = "0.1" eth2_ssz_derive = "0.1.0"
tree_hash = "0.1" tree_hash = "0.1.0"
tree_hash_derive = "0.2" tree_hash_derive = "0.2"
state_processing = { path = "../../eth2/state_processing" } state_processing = { path = "../../eth2/state_processing" }
swap_or_not_shuffle = { path = "../../eth2/utils/swap_or_not_shuffle" } swap_or_not_shuffle = { path = "../../eth2/utils/swap_or_not_shuffle" }
types = { path = "../../eth2/types" } types = { path = "../../eth2/types" }
walkdir = "2" walkdir = "2.2.9"

36
validator_client/Cargo.toml
View File

@ -14,28 +14,28 @@ path = "src/lib.rs"
[dependencies] [dependencies]
bls = { path = "../eth2/utils/bls" } bls = { path = "../eth2/utils/bls" }
eth2_ssz = "0.1" eth2_ssz = "0.1.2"
eth2_config = { path = "../eth2/utils/eth2_config" } eth2_config = { path = "../eth2/utils/eth2_config" }
tree_hash = "0.1" tree_hash = "0.1.0"
clap = "2.32.0" clap = "2.33.0"
lighthouse_bootstrap = { path = "../eth2/utils/lighthouse_bootstrap" } lighthouse_bootstrap = { path = "../eth2/utils/lighthouse_bootstrap" }
eth2_interop_keypairs = { path = "../eth2/utils/eth2_interop_keypairs" } 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" } protos = { path = "../protos" }
slot_clock = { path = "../eth2/utils/slot_clock" } slot_clock = { path = "../eth2/utils/slot_clock" }
types = { path = "../eth2/types" } types = { path = "../eth2/types" }
serde = "1.0" serde = "1.0.102"
serde_derive = "1.0" serde_derive = "1.0.102"
serde_json = "^1.0" serde_json = "1.0.41"
slog = { version = "^2.2.3" , features = ["max_level_trace", "release_max_level_trace"] } slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] }
slog-async = "^2.3.0" slog-async = "2.3.0"
slog-json = "^2.3" slog-json = "2.3.0"
slog-term = "^2.4.0" slog-term = "2.4.2"
tokio = "0.1.18" tokio = "0.1.22"
tokio-timer = "0.2.10" tokio-timer = "0.2.11"
error-chain = "0.12.0" error-chain = "0.12.1"
bincode = "^1.1.2" bincode = "1.2.0"
futures = "0.1.25" futures = "0.1.29"
dirs = "2.0.1" dirs = "2.0.2"
logging = { path = "../eth2/utils/logging" } logging = { path = "../eth2/utils/logging" }
libc = "0.2" libc = "0.2.65"