Initial merge changes

Added Execution Payload from Rayonism Fork

Updated new Containers to match Merge Spec

Updated BeaconBlockBody for Merge Spec

Completed updating BeaconState and BeaconBlockBody

Modified ExecutionPayload<T> to use Transaction<T>

Mostly Finished Changes for beacon-chain.md

Added some things for fork-choice.md

Update to match new fork-choice.md/fork.md changes

ran cargo fmt

Added Missing Pieces in eth2_libp2p for Merge

fix ef test

Various Changes to Conform Closer to Merge Spec
This commit is contained in:
Mark Mackey
2021-09-08 13:45:22 -05:00
committed by Paul Hauner
parent c0122e1a52
commit 3718c36c51
53 changed files with 1293 additions and 155 deletions

48
Cargo.lock generated
View File

@@ -895,7 +895,6 @@ dependencies = [
"environment",
"error-chain",
"eth1",
"eth2",
"eth2_config",
"eth2_libp2p",
"eth2_ssz",
@@ -910,7 +909,6 @@ dependencies = [
"parking_lot",
"prometheus",
"reqwest",
"sensitive_url",
"serde",
"serde_derive",
"serde_yaml",
@@ -940,6 +938,17 @@ 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"
@@ -1740,7 +1749,6 @@ dependencies = [
"sensitive_url",
"serde",
"serde_json",
"store",
"types",
"zeroize",
]
@@ -2935,9 +2943,6 @@ 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]]
@@ -3062,10 +3067,8 @@ dependencies = [
"deposit_contract",
"directory",
"dirs",
"env_logger 0.9.0",
"environment",
"eth1_test_rig",
"eth2",
"eth2_keystore",
"eth2_libp2p",
"eth2_network_config",
@@ -3080,8 +3083,8 @@ dependencies = [
"regex",
"sensitive_url",
"serde",
"serde_json",
"serde_yaml",
"simple_logger",
"state_processing",
"tokio",
"tree_hash",
@@ -5627,6 +5630,19 @@ 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"
@@ -6324,14 +6340,13 @@ dependencies = [
[[package]]
name = "tiny-bip39"
version = "0.8.1"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "524daa5624d9d4ffb5a0625971d35205b882111daa6b6338a7a6c578a3c36928"
checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8"
dependencies = [
"anyhow",
"hmac 0.8.1",
"once_cell",
"parking_lot",
"pbkdf2 0.4.0",
"rand 0.7.3",
"rustc-hash",
@@ -6743,7 +6758,6 @@ dependencies = [
"serde_json",
"serde_yaml",
"slog",
"state_processing",
"superstruct",
"swap_or_not_shuffle",
"tempfile",
@@ -7448,18 +7462,18 @@ dependencies = [
[[package]]
name = "zeroize"
version = "1.4.2"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf68b08513768deaa790264a7fac27a58cbf2705cfcdc9448362229217d7e970"
checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd"
dependencies = [
"zeroize_derive",
]
[[package]]
name = "zeroize_derive"
version = "1.2.0"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7"
checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1"
dependencies = [
"proc-macro2",
"quote",