execution API related fixes

beacon_node/execution_layer/src/engine_api/http.rs

@@ -548,11 +548,13 @@ impl HttpJsonRpc {
         let cached_supported_apis = RwLock::new(Some(SupportedApis {
             new_payload_v1: true,
             new_payload_v2: spec.capella_fork_epoch.is_some() || spec.eip4844_fork_epoch.is_some(),
+            new_payload_v3: spec.eip4844_fork_epoch.is_some(),
             forkchoice_updated_v1: true,
             forkchoice_updated_v2: spec.capella_fork_epoch.is_some()
                 || spec.eip4844_fork_epoch.is_some(),
             get_payload_v1: true,
             get_payload_v2: spec.capella_fork_epoch.is_some() || spec.eip4844_fork_epoch.is_some(),
+            get_payload_v3: spec.eip4844_fork_epoch.is_some(),
             exchange_transition_configuration_v1: true,
         }));
 
@@ -577,11 +579,13 @@ impl HttpJsonRpc {
         let cached_supported_apis = RwLock::new(Some(SupportedApis {
             new_payload_v1: true,
             new_payload_v2: spec.capella_fork_epoch.is_some() || spec.eip4844_fork_epoch.is_some(),
+            new_payload_v3: spec.eip4844_fork_epoch.is_some(),
             forkchoice_updated_v1: true,
             forkchoice_updated_v2: spec.capella_fork_epoch.is_some()
                 || spec.eip4844_fork_epoch.is_some(),
             get_payload_v1: true,
             get_payload_v2: spec.capella_fork_epoch.is_some() || spec.eip4844_fork_epoch.is_some(),
+            get_payload_v3: spec.eip4844_fork_epoch.is_some(),
             exchange_transition_configuration_v1: true,
         }));
 
@@ -737,7 +741,7 @@ impl HttpJsonRpc {
         &self,
         execution_payload: ExecutionPayload<T>,
     ) -> Result<PayloadStatusV1, Error> {
-        let params = json!([JsonExecutionPayloadV1::try_from(execution_payload)?]);
+        let params = json!([JsonExecutionPayload::from(execution_payload)]);
 
         let response: JsonPayloadStatusV1 = self
             .rpc_request(
@@ -754,7 +758,7 @@ impl HttpJsonRpc {
         &self,
         execution_payload: ExecutionPayload<T>,
     ) -> Result<PayloadStatusV1, Error> {
-        let params = json!([JsonExecutionPayloadV2::try_from(execution_payload)?]);
+        let params = json!([JsonExecutionPayload::from(execution_payload)]);
 
         let response: JsonPayloadStatusV1 = self
             .rpc_request(
@@ -771,7 +775,7 @@ impl HttpJsonRpc {
         &self,
         execution_payload: ExecutionPayload<T>,
     ) -> Result<PayloadStatusV1, Error> {
-        let params = json!([JsonExecutionPayloadV2::try_from(execution_payload)?]);
+        let params = json!([JsonExecutionPayload::from(execution_payload)]);
 
         let response: JsonPayloadStatusV1 = self
             .rpc_request(
@@ -786,7 +790,6 @@ impl HttpJsonRpc {
 
     pub async fn get_payload_v1<T: EthSpec>(
         &self,
-        fork_name: ForkName,
         payload_id: PayloadId,
     ) -> Result<ExecutionPayload<T>, Error> {
         let params = json!([JsonPayloadIdRequest::from(payload_id)]);
@@ -799,43 +802,86 @@ impl HttpJsonRpc {
             )
             .await?;
 
-        JsonExecutionPayload::V1(payload_v1).try_into_execution_payload(fork_name)
+        Ok(JsonExecutionPayload::V1(payload_v1).into())
     }
 
     pub async fn get_payload_v2<T: EthSpec>(
         &self,
         fork_name: ForkName,
         payload_id: PayloadId,
-    ) -> Result<ExecutionPayload<T>, Error> {
+    ) -> Result<GetPayloadResponse<T>, Error> {
         let params = json!([JsonPayloadIdRequest::from(payload_id)]);
 
-        let response: JsonGetPayloadResponse<T> = self
-            .rpc_request(
-                ENGINE_GET_PAYLOAD_V2,
-                params,
-                ENGINE_GET_PAYLOAD_TIMEOUT * self.execution_timeout_multiplier,
-            )
-            .await?;
-
-        JsonExecutionPayload::V2(response.execution_payload).try_into_execution_payload(fork_name)
+        match fork_name {
+            ForkName::Merge => {
+                let response: JsonGetPayloadResponseV1<T> = self
+                    .rpc_request(
+                        ENGINE_GET_PAYLOAD_V2,
+                        params,
+                        ENGINE_GET_PAYLOAD_TIMEOUT * self.execution_timeout_multiplier,
+                    )
+                    .await?;
+                Ok(JsonGetPayloadResponse::V1(response).into())
+            }
+            ForkName::Capella => {
+                let response: JsonGetPayloadResponseV2<T> = self
+                    .rpc_request(
+                        ENGINE_GET_PAYLOAD_V2,
+                        params,
+                        ENGINE_GET_PAYLOAD_TIMEOUT * self.execution_timeout_multiplier,
+                    )
+                    .await?;
+                Ok(JsonGetPayloadResponse::V2(response).into())
+            }
+            ForkName::Base | ForkName::Altair | ForkName::Eip4844 => Err(
+                Error::UnsupportedForkVariant(format!("called get_payload_v2 with {}", fork_name)),
+            ),
+        }
     }
 
     pub async fn get_payload_v3<T: EthSpec>(
         &self,
         fork_name: ForkName,
         payload_id: PayloadId,
-    ) -> Result<ExecutionPayload<T>, Error> {
+    ) -> Result<GetPayloadResponse<T>, Error> {
         let params = json!([JsonPayloadIdRequest::from(payload_id)]);
 
-        let payload_v2: JsonExecutionPayloadV2<T> = self
-            .rpc_request(
-                ENGINE_GET_PAYLOAD_V3,
-                params,
-                ENGINE_GET_PAYLOAD_TIMEOUT * self.execution_timeout_multiplier,
-            )
-            .await?;
-
-        JsonExecutionPayload::V2(payload_v2).try_into_execution_payload(fork_name)
+        match fork_name {
+            ForkName::Merge => {
+                let response: JsonGetPayloadResponseV1<T> = self
+                    .rpc_request(
+                        ENGINE_GET_PAYLOAD_V2,
+                        params,
+                        ENGINE_GET_PAYLOAD_TIMEOUT * self.execution_timeout_multiplier,
+                    )
+                    .await?;
+                Ok(JsonGetPayloadResponse::V1(response).into())
+            }
+            ForkName::Capella => {
+                let response: JsonGetPayloadResponseV2<T> = self
+                    .rpc_request(
+                        ENGINE_GET_PAYLOAD_V2,
+                        params,
+                        ENGINE_GET_PAYLOAD_TIMEOUT * self.execution_timeout_multiplier,
+                    )
+                    .await?;
+                Ok(JsonGetPayloadResponse::V2(response).into())
+            }
+            ForkName::Eip4844 => {
+                let response: JsonGetPayloadResponseV3<T> = self
+                    .rpc_request(
+                        ENGINE_GET_PAYLOAD_V3,
+                        params,
+                        ENGINE_GET_PAYLOAD_TIMEOUT * self.execution_timeout_multiplier,
+                    )
+                    .await?;
+                Ok(JsonGetPayloadResponse::V3(response).into())
+            }
+            ForkName::Base | ForkName::Altair => Err(Error::UnsupportedForkVariant(format!(
+                "called get_payload_v3 with {}",
+                fork_name
+            ))),
+        }
     }
 
     pub async fn get_blobs_bundle_v1<T: EthSpec>(
@@ -924,10 +970,12 @@ impl HttpJsonRpc {
         Ok(SupportedApis {
             new_payload_v1: true,
             new_payload_v2: true,
+            new_payload_v3: true,
             forkchoice_updated_v1: true,
             forkchoice_updated_v2: true,
             get_payload_v1: true,
             get_payload_v2: true,
+            get_payload_v3: true,
             exchange_transition_configuration_v1: true,
         })
     }
@@ -954,7 +1002,9 @@ impl HttpJsonRpc {
         execution_payload: ExecutionPayload<T>,
     ) -> Result<PayloadStatusV1, Error> {
         let supported_apis = self.get_cached_supported_apis().await?;
-        if supported_apis.new_payload_v2 {
+        if supported_apis.new_payload_v3 {
+            self.new_payload_v3(execution_payload).await
+        } else if supported_apis.new_payload_v2 {
             self.new_payload_v2(execution_payload).await
         } else if supported_apis.new_payload_v1 {
             self.new_payload_v1(execution_payload).await
@@ -971,10 +1021,21 @@ impl HttpJsonRpc {
         payload_id: PayloadId,
     ) -> Result<ExecutionPayload<T>, Error> {
         let supported_apis = self.get_cached_supported_apis().await?;
-        if supported_apis.get_payload_v2 {
-            self.get_payload_v2(fork_name, payload_id).await
-        } else if supported_apis.new_payload_v1 {
-            self.get_payload_v1(fork_name, payload_id).await
+        if supported_apis.get_payload_v3 {
+            Ok(self
+                .get_payload_v3(fork_name, payload_id)
+                .await?
+                .execution_payload())
+        } else if supported_apis.get_payload_v2 {
+            // TODO: modify this method to return GetPayloadResponse instead
+            //       of throwing away the `block_value` and returning only the
+            //       ExecutionPayload
+            Ok(self
+                .get_payload_v2(fork_name, payload_id)
+                .await?
+                .execution_payload())
+        } else if supported_apis.get_payload_v1 {
+            self.get_payload_v1(payload_id).await
         } else {
             Err(Error::RequiredMethodUnsupported("engine_getPayload"))
         }
@@ -992,13 +1053,8 @@ impl HttpJsonRpc {
             self.forkchoice_updated_v2(forkchoice_state, payload_attributes)
                 .await
         } else if supported_apis.forkchoice_updated_v1 {
-            self.forkchoice_updated_v1(
-                forkchoice_state,
-                payload_attributes
-                    .map(|pa| pa.downgrade_to_v1())
-                    .transpose()?,
-            )
-            .await
+            self.forkchoice_updated_v1(forkchoice_state, payload_attributes)
+                .await
         } else {
             Err(Error::RequiredMethodUnsupported("engine_forkchoiceUpdated"))
         }
@@ -1013,9 +1069,7 @@ mod test {
     use std::future::Future;
     use std::str::FromStr;
     use std::sync::Arc;
-    use types::{
-        ExecutionPayloadMerge, ForkName, MainnetEthSpec, Transactions, Unsigned, VariableList,
-    };
+    use types::{ExecutionPayloadMerge, MainnetEthSpec, Transactions, Unsigned, VariableList};
 
     struct Tester {
         server: MockServer<MainnetEthSpec>,
@@ -1355,9 +1409,7 @@ mod test {
         Tester::new(true)
             .assert_request_equals(
                 |client| async move {
-                    let _ = client
-                        .get_payload_v1::<MainnetEthSpec>(ForkName::Merge, [42; 8])
-                        .await;
+                    let _ = client.get_payload_v1::<MainnetEthSpec>([42; 8]).await;
                 },
                 json!({
                     "id": STATIC_ID,
@@ -1370,9 +1422,7 @@ mod test {
 
         Tester::new(false)
             .assert_auth_failure(|client| async move {
-                client
-                    .get_payload_v1::<MainnetEthSpec>(ForkName::Merge, [42; 8])
-                    .await
+                client.get_payload_v1::<MainnetEthSpec>([42; 8]).await
             })
             .await;
     }
@@ -1601,7 +1651,7 @@ mod test {
                 // engine_getPayloadV1 REQUEST validation
                 |client| async move {
                     let _ = client
-                        .get_payload_v1::<MainnetEthSpec>(ForkName::Merge,str_to_payload_id("0xa247243752eb10b4"))
+                        .get_payload_v1::<MainnetEthSpec>(str_to_payload_id("0xa247243752eb10b4"))
                         .await;
                 },
                 json!({
@@ -1636,7 +1686,7 @@ mod test {
                 })],
                 |client| async move {
                     let payload = client
-                        .get_payload_v1::<MainnetEthSpec>(ForkName::Merge,str_to_payload_id("0xa247243752eb10b4"))
+                        .get_payload_v1::<MainnetEthSpec>(str_to_payload_id("0xa247243752eb10b4"))
                         .await
                         .unwrap();