Merge branch 'master' into proto-array

This commit is contained in:
Paul Hauner
2020-01-24 17:00:32 +11:00
115 changed files with 3943 additions and 1029 deletions

32
Cargo.lock generated
View File

@@ -240,20 +240,6 @@ dependencies = [
"websocket_server 0.1.0",
]
[[package]]
name = "beacon_chain_sim"
version = "0.1.0"
dependencies = [
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"eth1_test_rig 0.1.0",
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"node_test_rig 0.1.0",
"parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
"types 0.1.0",
"validator_client 0.1.0",
]
[[package]]
name = "beacon_node"
version = "0.1.0"
@@ -1086,6 +1072,7 @@ dependencies = [
"eth1_test_rig 0.1.0",
"eth2_hashing 0.1.1",
"eth2_ssz 0.1.2",
"eth2_ssz_derive 0.1.0",
"exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2658,9 +2645,11 @@ dependencies = [
"eth2_ssz 0.1.2",
"fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"genesis 0.1.0",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"sloggers 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3738,6 +3727,21 @@ dependencies = [
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "simulator"
version = "0.1.0"
dependencies = [
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"eth1_test_rig 0.1.0",
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"node_test_rig 0.1.0",
"parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
"types 0.1.0",
"validator_client 0.1.0",
]
[[package]]
name = "slab"
version = "0.3.0"