Massive Update to Engine API (#3740)

* Massive Update to Engine API

* Update beacon_node/execution_layer/src/engine_api/json_structures.rs

Co-authored-by: Michael Sproul <micsproul@gmail.com>

* Update beacon_node/execution_layer/src/engine_api/json_structures.rs

Co-authored-by: Michael Sproul <micsproul@gmail.com>

* Update beacon_node/beacon_chain/src/execution_payload.rs

Co-authored-by: realbigsean <seananderson33@GMAIL.com>

* Update beacon_node/execution_layer/src/engine_api.rs

Co-authored-by: realbigsean <seananderson33@GMAIL.com>

Co-authored-by: Michael Sproul <micsproul@gmail.com>
Co-authored-by: realbigsean <seananderson33@GMAIL.com>

beacon_node/execution_layer/src/test_utils/execution_block_generator.rs

@@ -1,4 +1,4 @@
-use crate::engines::ForkChoiceState;
+use crate::engines::ForkchoiceState;
 use crate::{
     engine_api::{
         json_structures::{
@@ -13,8 +13,7 @@ use std::collections::HashMap;
 use tree_hash::TreeHash;
 use tree_hash_derive::TreeHash;
 use types::{
-    EthSpec, ExecutionBlockHash, ExecutionPayload, ExecutionPayloadCapella, ExecutionPayloadMerge,
-    Hash256, Uint256,
+    EthSpec, ExecutionBlockHash, ExecutionPayload, ExecutionPayloadMerge, Hash256, Uint256,
 };
 
 const GAS_LIMIT: u64 = 16384;
@@ -315,7 +314,7 @@ impl<T: EthSpec> ExecutionBlockGenerator<T> {
 
     pub fn forkchoice_updated_v1(
         &mut self,
-        forkchoice_state: ForkChoiceState,
+        forkchoice_state: ForkchoiceState,
         payload_attributes: Option<PayloadAttributes>,
     ) -> Result<JsonForkchoiceUpdatedV1Response, String> {
         if let Some(payload) = self
@@ -369,7 +368,6 @@ impl<T: EthSpec> ExecutionBlockGenerator<T> {
                 let id = payload_id_from_u64(self.next_payload_id);
                 self.next_payload_id += 1;
 
-                // FIXME: think about how to test different forks
                 let mut execution_payload = match &attributes {
                     PayloadAttributes::V1(pa) => ExecutionPayload::Merge(ExecutionPayloadMerge {
                         parent_hash: forkchoice_state.head_block_hash,
@@ -388,7 +386,8 @@ impl<T: EthSpec> ExecutionBlockGenerator<T> {
                         transactions: vec![].into(),
                     }),
                     PayloadAttributes::V2(pa) => {
-                        ExecutionPayload::Capella(ExecutionPayloadCapella {
+                        // FIXME: think about how to test different forks
+                        ExecutionPayload::Merge(ExecutionPayloadMerge {
                             parent_hash: forkchoice_state.head_block_hash,
                             fee_recipient: pa.suggested_fee_recipient,
                             receipts_root: Hash256::repeat_byte(42),
@@ -403,14 +402,6 @@ impl<T: EthSpec> ExecutionBlockGenerator<T> {
                             base_fee_per_gas: Uint256::one(),
                             block_hash: ExecutionBlockHash::zero(),
                             transactions: vec![].into(),
-                            #[cfg(feature = "withdrawals")]
-                            withdrawals: pa
-                                .withdrawals
-                                .iter()
-                                .cloned()
-                                .map(Into::into)
-                                .collect::<Vec<_>>()
-                                .into(),
                         })
                     }
                 };

beacon_node/execution_layer/src/test_utils/handle_rpc.rs

@@ -4,7 +4,7 @@ use crate::json_structures::*;
 use serde::de::DeserializeOwned;
 use serde_json::Value as JsonValue;
 use std::sync::Arc;
-use types::EthSpec;
+use types::{EthSpec, ForkName};
 
 pub async fn handle_rpc<T: EthSpec>(
     body: JsonValue,
@@ -97,7 +97,8 @@ pub async fn handle_rpc<T: EthSpec>(
                 Some(
                     ctx.execution_block_generator
                         .write()
-                        .new_payload(request.into()),
+                        // FIXME: should this worry about other forks?
+                        .new_payload(request.try_into_execution_payload(ForkName::Merge).unwrap()),
                 )
             } else {
                 None
@@ -117,10 +118,10 @@ pub async fn handle_rpc<T: EthSpec>(
                 .get_payload(&id)
                 .ok_or_else(|| format!("no payload for id {:?}", id))?;
 
-            Ok(serde_json::to_value(JsonExecutionPayload::from(response)).unwrap())
+            Ok(serde_json::to_value(JsonExecutionPayloadV1::try_from(response).unwrap()).unwrap())
         }
         ENGINE_FORKCHOICE_UPDATED_V1 => {
-            let forkchoice_state: JsonForkChoiceStateV1 = get_param(params, 0)?;
+            let forkchoice_state: JsonForkchoiceStateV1 = get_param(params, 0)?;
             let payload_attributes: Option<JsonPayloadAttributes> = get_param(params, 1)?;
 
             let head_block_hash = forkchoice_state.head_block_hash;

beacon_node/execution_layer/src/test_utils/mock_builder.rs

@@ -26,7 +26,8 @@ use task_executor::TaskExecutor;
 use tempfile::NamedTempFile;
 use tree_hash::TreeHash;
 use types::{
-    Address, BeaconState, BlindedPayload, ChainSpec, EthSpec, ExecPayload, Hash256, Slot, Uint256,
+    Address, BeaconState, BlindedPayload, ChainSpec, EthSpec, ExecPayload, ForkName, Hash256, Slot,
+    Uint256,
 };
 
 #[derive(Clone)]
@@ -313,6 +314,10 @@ impl<E: EthSpec> mev_build_rs::BlindedBlockProvider for MockBuilder<E> {
                 *prev_randao,
                 fee_recipient,
                 forkchoice_update_params,
+                // TODO: do we need to write a test for this if this is Capella fork?
+                ForkName::Merge,
+                #[cfg(feature = "withdrawals")]
+                None,
             )
             .await
             .map_err(convert_err)?

beacon_node/execution_layer/src/test_utils/mock_execution_layer.rs

@@ -114,7 +114,7 @@ impl<T: EthSpec> MockExecutionLayer<T> {
                         suggested_fee_recipient: Address::repeat_byte(42),
                         // FIXME: think about adding withdrawals here..
                         #[cfg(feature = "withdrawals")]
-                        withdrawals: vec![],
+                        withdrawals: Some(vec![]),
                     })
                 }
             },
@@ -159,6 +159,10 @@ impl<T: EthSpec> MockExecutionLayer<T> {
                 validator_index,
                 forkchoice_update_params,
                 builder_params,
+                // FIXME: do we need to consider other forks somehow? What about withdrawals?
+                ForkName::Merge,
+                #[cfg(feature = "withdrawals")]
+                Some(vec![]),
                 &self.spec,
             )
             .await
@@ -191,6 +195,10 @@ impl<T: EthSpec> MockExecutionLayer<T> {
                 validator_index,
                 forkchoice_update_params,
                 builder_params,
+                // FIXME: do we need to consider other forks somehow? What about withdrawals?
+                ForkName::Merge,
+                #[cfg(feature = "withdrawals")]
+                Some(vec![]),
                 &self.spec,
             )
             .await