get spec tests working and fix json serialization

beacon_node/execution_layer/src/engine_api/http.rs

@@ -747,10 +747,10 @@ impl HttpJsonRpc {
     pub async fn get_blobs_bundle_v1<T: EthSpec>(
         &self,
         payload_id: PayloadId,
-    ) -> Result<JsonBlobBundles<T>, Error> {
+    ) -> Result<JsonBlobsBundle<T>, Error> {
         let params = json!([JsonPayloadIdRequest::from(payload_id)]);
 
-        let response: JsonBlobBundles<T> = self
+        let response: JsonBlobsBundle<T> = self
             .rpc_request(
                 ENGINE_GET_BLOBS_BUNDLE_V1,
                 params,

beacon_node/execution_layer/src/engine_api/json_structures.rs

@@ -424,10 +424,11 @@ impl From<JsonPayloadAttributes> for PayloadAttributes {
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 #[serde(bound = "T: EthSpec", rename_all = "camelCase")]
-pub struct JsonBlobBundles<T: EthSpec> {
+pub struct JsonBlobsBundle<T: EthSpec> {
     pub block_hash: ExecutionBlockHash,
-    pub kzgs: Vec<KzgCommitment>,
-    pub blobs: Vec<Blob<T>>,
+    pub kzgs: VariableList<KzgCommitment, T::MaxBlobsPerBlock>,
+    #[serde(with = "ssz_types::serde_utils::list_of_hex_fixed_vec")]
+    pub blobs: VariableList<Blob<T>, T::MaxBlobsPerBlock>,
 }
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]

beacon_node/execution_layer/src/lib.rs

@@ -95,13 +95,19 @@ pub enum BlockProposalContents<T: EthSpec, Payload: AbstractExecPayload<T>> {
     Payload(Payload),
     PayloadAndBlobs {
         payload: Payload,
-        kzg_commitments: Vec<KzgCommitment>,
-        blobs: Vec<Blob<T>>,
+        kzg_commitments: VariableList<KzgCommitment, T::MaxBlobsPerBlock>,
+        blobs: VariableList<Blob<T>, T::MaxBlobsPerBlock>,
     },
 }
 
 impl<T: EthSpec, Payload: AbstractExecPayload<T>> BlockProposalContents<T, Payload> {
-    pub fn deconstruct(self) -> (Payload, Option<Vec<KzgCommitment>>, Option<Vec<Blob<T>>>) {
+    pub fn deconstruct(
+        self,
+    ) -> (
+        Payload,
+        Option<VariableList<KzgCommitment, T::MaxBlobsPerBlock>>,
+        Option<VariableList<Blob<T>, T::MaxBlobsPerBlock>>,
+    ) {
         match self {
             Self::Payload(payload) => (payload, None, None),
             Self::PayloadAndBlobs {
@@ -132,26 +138,6 @@ impl<T: EthSpec, Payload: AbstractExecPayload<T>> BlockProposalContents<T, Paylo
             } => payload,
         }
     }
-    pub fn kzg_commitments(&self) -> Option<&[KzgCommitment]> {
-        match self {
-            Self::Payload(_) => None,
-            Self::PayloadAndBlobs {
-                payload: _,
-                kzg_commitments,
-                blobs: _,
-            } => Some(kzg_commitments),
-        }
-    }
-    pub fn blobs(&self) -> Option<&[Blob<T>]> {
-        match self {
-            Self::Payload(_) => None,
-            Self::PayloadAndBlobs {
-                payload: _,
-                kzg_commitments: _,
-                blobs,
-            } => Some(blobs),
-        }
-    }
     pub fn default_at_fork(fork_name: ForkName) -> Self {
         match fork_name {
             ForkName::Base | ForkName::Altair | ForkName::Merge | ForkName::Capella => {
@@ -159,8 +145,8 @@ impl<T: EthSpec, Payload: AbstractExecPayload<T>> BlockProposalContents<T, Paylo
             }
             ForkName::Eip4844 => BlockProposalContents::PayloadAndBlobs {
                 payload: Payload::default_at_fork(fork_name),
-                blobs: vec![],
-                kzg_commitments: vec![],
+                blobs: VariableList::default(),
+                kzg_commitments: VariableList::default(),
             },
         }
     }

beacon_node/execution_layer/src/test_utils/handle_rpc.rs

@@ -74,7 +74,7 @@ pub async fn handle_rpc<T: EthSpec>(
                 .unwrap())
             }
         }
-        ENGINE_NEW_PAYLOAD_V1 => {
+        ENGINE_NEW_PAYLOAD_V1 | ENGINE_NEW_PAYLOAD_V2 => {
             let request: JsonExecutionPayload<T> = get_param(params, 0)?;
 
             // Canned responses set by block hash take priority.
@@ -120,7 +120,7 @@ pub async fn handle_rpc<T: EthSpec>(
 
             Ok(serde_json::to_value(JsonExecutionPayloadV1::try_from(response).unwrap()).unwrap())
         }
-        ENGINE_FORKCHOICE_UPDATED_V1 => {
+        ENGINE_FORKCHOICE_UPDATED_V1 | ENGINE_FORKCHOICE_UPDATED_V2 => {
             let forkchoice_state: JsonForkchoiceStateV1 = get_param(params, 0)?;
             let payload_attributes: Option<JsonPayloadAttributes> = get_param(params, 1)?;
 
@@ -153,6 +153,19 @@ pub async fn handle_rpc<T: EthSpec>(
 
             Ok(serde_json::to_value(response).unwrap())
         }
+
+        ENGINE_GET_PAYLOAD_V2 => {
+            let request: JsonPayloadIdRequest = get_param(params, 0)?;
+            let id = request.into();
+
+            let response = ctx
+                .execution_block_generator
+                .write()
+                .get_payload(&id)
+                .ok_or_else(|| format!("no payload for id {:?}", id))?;
+
+            Ok(serde_json::to_value(JsonExecutionPayloadV2::try_from(response).unwrap()).unwrap())
+        }
         ENGINE_EXCHANGE_TRANSITION_CONFIGURATION_V1 => {
             let block_generator = ctx.execution_block_generator.read();
             let transition_config: TransitionConfigurationV1 = TransitionConfigurationV1 {