Merge latest master

This commit is contained in:
Age Manning
2020-05-06 22:12:22 +10:00
42 changed files with 4986 additions and 1488 deletions

3
Cargo.lock generated
View File

@@ -282,6 +282,8 @@ checksum = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3"
name = "beacon_chain"
version = "0.2.0"
dependencies = [
"bitvec",
"bls",
"environment",
"eth1",
"eth2_config",
@@ -2683,6 +2685,7 @@ dependencies = [
"clap_utils",
"env_logger",
"environment",
"eth2_testnet_config",
"futures 0.3.4",
"logging",
"slog",