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

consensus/fork_choice/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2018"
 
 [dependencies]
 types = { path = "../types" }
+state_processing = { path = "../state_processing" }
 proto_array = { path = "../proto_array" }
 eth2_ssz = "0.4.0"
 eth2_ssz_derive = "0.3.0"

consensus/fork_choice/src/fork_choice.rs

@@ -2,9 +2,11 @@ use std::marker::PhantomData;
 
 use proto_array::{Block as ProtoBlock, ProtoArrayForkChoice};
 use ssz_derive::{Decode, Encode};
+use state_processing::per_block_processing::is_merge_block;
 use types::{
-    AttestationShufflingId, BeaconBlock, BeaconState, BeaconStateError, Checkpoint, Epoch, EthSpec,
-    Hash256, IndexedAttestation, RelativeEpoch, SignedBeaconBlock, Slot,
+    AttestationShufflingId, BeaconBlock, BeaconState, BeaconStateError, ChainSpec, Checkpoint,
+    Epoch, EthSpec, Hash256, IndexedAttestation, PowBlock, RelativeEpoch, SignedBeaconBlock, Slot,
+    Uint256,
 };
 
 use crate::ForkChoiceStore;
@@ -65,6 +67,10 @@ pub enum InvalidBlock {
         finalized_root: Hash256,
         block_ancestor: Option<Hash256>,
     },
+    InvalidTerminalPowBlock {
+        block_total_difficulty: Uint256,
+        parent_total_difficulty: Uint256,
+    },
 }
 
 #[derive(Debug)]
@@ -236,6 +242,14 @@ where
     }
 }
 
+/// https://github.com/ethereum/consensus-specs/blob/dev/specs/merge/fork-choice.md#is_valid_terminal_pow_block
+fn is_valid_terminal_pow_block(block: &PowBlock, parent: &PowBlock, spec: &ChainSpec) -> bool {
+    let is_total_difficulty_reached = block.total_difficulty >= spec.terminal_total_difficulty;
+    let is_parent_total_difficulty_valid = parent.total_difficulty < spec.terminal_total_difficulty;
+
+    is_total_difficulty_reached && is_parent_total_difficulty_valid
+}
+
 impl<T, E> ForkChoice<T, E>
 where
     T: ForkChoiceStore<E>,
@@ -442,6 +456,7 @@ where
         block: &BeaconBlock<E>,
         block_root: Hash256,
         state: &BeaconState<E>,
+        spec: &ChainSpec,
     ) -> Result<(), Error<T::Error>> {
         let current_slot = self.update_time(current_slot)?;
 
@@ -492,6 +507,19 @@ where
             }));
         }
 
+        // https://github.com/ethereum/consensus-specs/blob/dev/specs/merge/fork-choice.md#on_block
+        if is_merge_block(state, block.body()) {
+            // TODO: get POW blocks from eth1 chain here as indicated in the merge spec link ^
+            let pow_block = PowBlock::default();
+            let pow_parent = PowBlock::default();
+            if !is_valid_terminal_pow_block(&pow_block, &pow_parent, spec) {
+                return Err(Error::InvalidBlock(InvalidBlock::InvalidTerminalPowBlock {
+                    block_total_difficulty: pow_block.total_difficulty,
+                    parent_total_difficulty: pow_parent.total_difficulty,
+                }));
+            }
+        }
+
         // Update justified checkpoint.
         if state.current_justified_checkpoint().epoch > self.fc_store.justified_checkpoint().epoch {
             if state.current_justified_checkpoint().epoch

consensus/fork_choice/tests/tests.rs

@@ -273,7 +273,13 @@ impl ForkChoiceTest {
             .chain
             .fork_choice
             .write()
-            .on_block(current_slot, &block, block.canonical_root(), &state)
+            .on_block(
+                current_slot,
+                &block,
+                block.canonical_root(),
+                &state,
+                &self.harness.chain.spec,
+            )
             .unwrap();
         self
     }
@@ -308,7 +314,13 @@ impl ForkChoiceTest {
             .chain
             .fork_choice
             .write()
-            .on_block(current_slot, &block, block.canonical_root(), &state)
+            .on_block(
+                current_slot,
+                &block,
+                block.canonical_root(),
+                &state,
+                &self.harness.chain.spec,
+            )
             .err()
             .expect("on_block did not return an error");
         comparison_func(err);