Update merge consensus to v1.1.0-beta.5 (#2630)

This commit is contained in:
Michael Sproul
2021-09-27 09:42:29 +10:00
committed by Paul Hauner
parent b48f133a8c
commit 251ddbd696
5 changed files with 43 additions and 45 deletions

44
Cargo.lock generated
View File

@@ -895,6 +895,7 @@ dependencies = [
"environment",
"error-chain",
"eth1",
"eth2",
"eth2_config",
"eth2_libp2p",
"eth2_ssz",
@@ -909,6 +910,7 @@ dependencies = [
"parking_lot",
"prometheus",
"reqwest",
"sensitive_url",
"serde",
"serde_derive",
"serde_yaml",
@@ -938,17 +940,6 @@ dependencies = [
"cc",
]
[[package]]
name = "colored"
version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59"
dependencies = [
"atty",
"lazy_static",
"winapi",
]
[[package]]
name = "compare_fields"
version = "0.2.0"
@@ -1749,6 +1740,7 @@ dependencies = [
"sensitive_url",
"serde",
"serde_json",
"store",
"types",
"zeroize",
]
@@ -2943,6 +2935,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
"wasm-bindgen",
"web-sys",
]
[[package]]
@@ -3067,8 +3062,10 @@ dependencies = [
"deposit_contract",
"directory",
"dirs",
"env_logger 0.9.0",
"environment",
"eth1_test_rig",
"eth2",
"eth2_keystore",
"eth2_libp2p",
"eth2_network_config",
@@ -3083,8 +3080,8 @@ dependencies = [
"regex",
"sensitive_url",
"serde",
"serde_json",
"serde_yaml",
"simple_logger",
"state_processing",
"tokio",
"tree_hash",
@@ -5630,19 +5627,6 @@ dependencies = [
"rand_core 0.6.3",
]
[[package]]
name = "simple_logger"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7de33c687404ec3045d4a0d437580455257c0436f858d702f244e7d652f9f07"
dependencies = [
"atty",
"chrono",
"colored",
"log",
"winapi",
]
[[package]]
name = "simulator"
version = "0.2.0"
@@ -6340,13 +6324,14 @@ dependencies = [
[[package]]
name = "tiny-bip39"
version = "0.8.0"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8"
checksum = "524daa5624d9d4ffb5a0625971d35205b882111daa6b6338a7a6c578a3c36928"
dependencies = [
"anyhow",
"hmac 0.8.1",
"once_cell",
"parking_lot",
"pbkdf2 0.4.0",
"rand 0.7.3",
"rustc-hash",
@@ -6758,6 +6743,7 @@ dependencies = [
"serde_json",
"serde_yaml",
"slog",
"state_processing",
"superstruct",
"swap_or_not_shuffle",
"tempfile",
@@ -7462,9 +7448,9 @@ dependencies = [
[[package]]
name = "zeroize"
version = "1.4.1"
version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd"
checksum = "bf68b08513768deaa790264a7fac27a58cbf2705cfcdc9448362229217d7e970"
dependencies = [
"zeroize_derive",
]