Merge branch 'master' into spec-v0.12

This commit is contained in:
Paul Hauner
2020-06-21 10:33:02 +10:00
60 changed files with 1812 additions and 1107 deletions

View File

@@ -1,11 +1,12 @@
[workspace]
members = [
"account_manager",
"beacon_node",
"beacon_node/beacon_chain",
"beacon_node/client",
"beacon_node/eth1",
"beacon_node/eth2-libp2p",
"beacon_node/eth2_libp2p",
"beacon_node/network",
"beacon_node/rest_api",
"beacon_node/store",
@@ -13,6 +14,8 @@ members = [
"beacon_node/version",
"beacon_node/websocket_server",
"boot_node",
"common/clap_utils",
"common/compare_fields",
"common/compare_fields_derive",
@@ -73,4 +76,3 @@ eth2_ssz = { path = "consensus/ssz" }
eth2_ssz_derive = { path = "consensus/ssz_derive" }
eth2_ssz_types = { path = "consensus/ssz_types" }
eth2_hashing = { path = "crypto/eth2_hashing" }
web3 = { git = "https://github.com/tomusdrw/rust-web3" }