Made unblinded block payloads optional for v2 support

Author: jclapis

crates/common/src/pbs/event.rs

@@ -30,7 +30,8 @@ pub enum BuilderEvent {
     GetStatusEvent,
     GetStatusResponse,
     SubmitBlockRequest(Box<SignedBlindedBeaconBlock>, BuilderApiVersion),
-    SubmitBlockResponse(Box<SubmitBlindedBlockResponse>, BuilderApiVersion),
+    SubmitBlockResponseV1(Box<SubmitBlindedBlockResponse>),
+    SubmitBlockResponseV2,
     MissedPayload {
         /// Hash for the block for which no payload was received
         block_hash: B256,

crates/pbs/src/api.rs

@@ -39,7 +39,7 @@ pub trait BuilderApi<S: BuilderApiState>: 'static {
         req_headers: HeaderMap,
         state: PbsState<S>,
         api_version: &BuilderApiVersion,
-    ) -> eyre::Result<SubmitBlindedBlockResponse> {
+    ) -> eyre::Result<Option<SubmitBlindedBlockResponse>> {
         mev_boost::submit_block(signed_blinded_block, req_headers, state, api_version).await
     }
 

crates/pbs/src/mev_boost/submit_block.rs

@@ -31,7 +31,7 @@ pub async fn submit_block<S: BuilderApiState>(
     req_headers: HeaderMap,
     state: PbsState<S>,
     api_version: &BuilderApiVersion,
-) -> eyre::Result<SubmitBlindedBlockResponse> {
+) -> eyre::Result<Option<SubmitBlindedBlockResponse>> {
     // prepare headers
     let mut send_headers = HeaderMap::new();
     send_headers.insert(HEADER_START_TIME_UNIX_MS, HeaderValue::from(utcnow_ms()));
@@ -64,7 +64,7 @@ async fn submit_block_with_timeout(
     headers: HeaderMap,
     timeout_ms: u64,
     api_version: &BuilderApiVersion,
-) -> Result<SubmitBlindedBlockResponse, PbsError> {
+) -> Result<Option<SubmitBlindedBlockResponse>, PbsError> {
     let url = relay.submit_block_url(api_version.clone())?;
     let mut remaining_timeout_ms = timeout_ms;
     let mut retry = 0;
@@ -79,7 +79,7 @@ async fn submit_block_with_timeout(
             headers.clone(),
             remaining_timeout_ms,
             retry,
-            *api_version == BuilderApiVersion::V1, // only validate unblinded block for v1
+            api_version,
         )
         .await
         {
@@ -113,8 +113,8 @@ async fn send_submit_block(
     headers: HeaderMap,
     timeout_ms: u64,
     retry: u32,
-    validate_unblinded_block: bool,
-) -> Result<SubmitBlindedBlockResponse, PbsError> {
+    api_version: &BuilderApiVersion,
+) -> Result<Option<SubmitBlindedBlockResponse>, PbsError> {
     let start_request = Instant::now();
     let res = match relay
         .client
@@ -158,6 +158,10 @@ async fn send_submit_block(
         warn!(relay_id = relay.id.as_ref(), retry, %err, "failed to get payload (this might be ok if other relays have it)");
         return Err(err);
     };
+    if api_version != &BuilderApiVersion::V1 {
+        // v2 response is going to be empty, so just break here
+        return Ok(None);
+    }
 
     let block_response = match serde_json::from_slice::<SubmitBlindedBlockResponse>(&response_bytes)
     {
@@ -187,16 +191,14 @@ async fn send_submit_block(
 
     // request has different type so cant be deserialized in the wrong version,
     // response has a "version" field
-    if validate_unblinded_block {
-        match (&signed_blinded_block.message, &block_response) {
-            (
-                BlindedBeaconBlock::Electra(signed_blinded_block),
-                VersionedResponse::Electra(block_response),
-            ) => validate_unblinded_block_electra(signed_blinded_block, block_response),
-        }?;
-    }
-
-    Ok(block_response)
+    match (&signed_blinded_block.message, &block_response) {
+        (
+            BlindedBeaconBlock::Electra(signed_blinded_block),
+            VersionedResponse::Electra(block_response),
+        ) => validate_unblinded_block_electra(signed_blinded_block, block_response),
+    }?;
+
+    Ok(Some(block_response))
 }
 
 fn validate_unblinded_block_electra(

crates/pbs/src/routes/submit_block.rs

@@ -72,29 +72,29 @@ async fn handle_submit_block_impl<S: BuilderApiState, A: BuilderApi<S>>(
     info!(ua, ms_into_slot = now.saturating_sub(slot_start_ms), "new request");
 
     match A::submit_block(signed_blinded_block, req_headers, state.clone(), &api_version).await {
-        Ok(res) => {
-            trace!(?res);
-            state.publish_event(BuilderEvent::SubmitBlockResponse(
-                Box::new(res.clone()),
-                api_version.clone(),
-            ));
-            info!("received unblinded block");
+        Ok(res) => match res {
+            Some(block_response) => {
+                trace!(?block_response);
+                state.publish_event(BuilderEvent::SubmitBlockResponseV1(Box::new(
+                    block_response.clone(),
+                )));
+                info!("received unblinded block (v1)");
 
-            match api_version {
-                BuilderApiVersion::V1 => {
-                    BEACON_NODE_STATUS
-                        .with_label_values(&["200", SUBMIT_BLINDED_BLOCK_ENDPOINT_TAG])
-                        .inc();
-                    Ok((StatusCode::OK, Json(res).into_response()))
-                }
-                BuilderApiVersion::V2 => {
-                    BEACON_NODE_STATUS
-                        .with_label_values(&["202", SUBMIT_BLINDED_BLOCK_ENDPOINT_TAG])
-                        .inc();
-                    Ok((StatusCode::ACCEPTED, "".into_response()))
-                }
+                BEACON_NODE_STATUS
+                    .with_label_values(&["200", SUBMIT_BLINDED_BLOCK_ENDPOINT_TAG])
+                    .inc();
+                Ok((StatusCode::OK, Json(block_response).into_response()))
             }
-        }
+            None => {
+                state.publish_event(BuilderEvent::SubmitBlockResponseV2);
+                info!("received unblinded block (v2)");
+
+                BEACON_NODE_STATUS
+                    .with_label_values(&["202", SUBMIT_BLINDED_BLOCK_ENDPOINT_TAG])
+                    .inc();
+                Ok((StatusCode::ACCEPTED, "".into_response()))
+            }
+        },
 
         Err(err) => {
             error!(%err, %block_hash, "CRITICAL: no payload received from relays. Check previous logs or use the Relay Data API");