Merge of #5407

sigp · Apr 4, 2024 · 9d2cb2d · 9d2cb2d
2 parents 9c8dfd6 + 46d6b32
commit 9d2cb2d
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 53 deletions.
diff --git a/beacon_node/builder_client/src/lib.rs b/beacon_node/builder_client/src/lib.rs
@@ -5,7 +5,8 @@ use eth2::types::{
 };
 use eth2::types::{FullPayloadContents, SignedBlindedBeaconBlock};
 pub use eth2::Error;
-use eth2::{ok_or_error, StatusCode};
+use eth2::{ok_or_error, StatusCode, CONSENSUS_VERSION_HEADER};
+use reqwest::header::{HeaderMap, HeaderValue};
 use reqwest::{IntoUrl, Response};
 use sensitive_url::SensitiveUrl;
 use serde::de::DeserializeOwned;
@@ -108,13 +109,20 @@ impl BuilderHttpClient {
         &self,
         url: U,
         body: &T,
+        headers: HeaderMap,
         timeout: Option<Duration>,
     ) -> Result<Response, Error> {
         let mut builder = self.client.post(url);
         if let Some(timeout) = timeout {
             builder = builder.timeout(timeout);
         }
-        let response = builder.json(body).send().await.map_err(Error::from)?;
+
+        let response = builder
+            .headers(headers)
+            .json(body)
+            .send()
+            .await
+            .map_err(Error::from)?;
         ok_or_error(response).await
     }
 
@@ -151,10 +159,16 @@ impl BuilderHttpClient {
             .push("builder")
             .push("blinded_blocks");
 
+        let mut headers = HeaderMap::new();
+        if let Ok(value) = HeaderValue::from_str(&blinded_block.fork_name_unchecked().to_string()) {
+            headers.insert(CONSENSUS_VERSION_HEADER, value);
+        }
+
         Ok(self
             .post_with_raw_response(
                 path,
                 &blinded_block,
+                headers,
                 Some(self.timeouts.post_blinded_blocks),
             )
             .await?

diff --git a/beacon_node/execution_layer/src/test_utils/mock_builder.rs b/beacon_node/execution_layer/src/test_utils/mock_builder.rs
@@ -1,7 +1,7 @@
 use crate::test_utils::{DEFAULT_BUILDER_PAYLOAD_VALUE_WEI, DEFAULT_JWT_SECRET};
 use crate::{Config, ExecutionLayer, PayloadAttributes};
 use eth2::types::{BlobsBundle, BlockId, StateId, ValidatorId};
-use eth2::{BeaconNodeHttpClient, Timeouts};
+use eth2::{BeaconNodeHttpClient, Timeouts, CONSENSUS_VERSION_HEADER};
 use fork_choice::ForkchoiceUpdateParameters;
 use parking_lot::RwLock;
 use sensitive_url::SensitiveUrl;
@@ -321,56 +321,57 @@ pub fn serve<E: EthSpec>(
             },
         );
 
-    let blinded_block = prefix
-        .and(warp::path("blinded_blocks"))
-        .and(warp::body::json())
-        .and(warp::path::end())
-        .and(ctx_filter.clone())
-        .and_then(
-            |block: SignedBlindedBeaconBlock<E>, builder: MockBuilder<E>| async move {
-                let slot = block.slot();
-                let root = match block {
-                    SignedBlindedBeaconBlock::Base(_) | types::SignedBeaconBlock::Altair(_) => {
-                        return Err(reject("invalid fork"));
-                    }
-                    SignedBlindedBeaconBlock::Merge(block) => {
-                        block.message.body.execution_payload.tree_hash_root()
-                    }
-                    SignedBlindedBeaconBlock::Capella(block) => {
-                        block.message.body.execution_payload.tree_hash_root()
-                    }
-                    SignedBlindedBeaconBlock::Deneb(block) => {
-                        block.message.body.execution_payload.tree_hash_root()
-                    }
-                    SignedBlindedBeaconBlock::Electra(block) => {
-                        block.message.body.execution_payload.tree_hash_root()
-                    }
-                };
-
-                let fork_name = builder.spec.fork_name_at_slot::<E>(slot);
-                let payload = builder
-                    .el
-                    .get_payload_by_root(&root)
-                    .ok_or_else(|| reject("missing payload for tx root"))?;
-                let resp: ForkVersionedResponse<_> = ForkVersionedResponse {
-                    version: Some(fork_name),
-                    metadata: Default::default(),
-                    data: payload,
-                };
-
-                let json_payload = serde_json::to_string(&resp)
-                    .map_err(|_| reject("coudn't serialize response"))?;
-                Ok::<_, warp::reject::Rejection>(
-                    warp::http::Response::builder()
-                        .status(200)
-                        .body(
-                            serde_json::to_string(&json_payload)
-                                .map_err(|_| reject("nvalid JSON"))?,
-                        )
-                        .unwrap(),
-                )
-            },
-        );
+    let blinded_block =
+        prefix
+            .and(warp::path("blinded_blocks"))
+            .and(warp::body::json())
+            .and(warp::header::header::<ForkName>(CONSENSUS_VERSION_HEADER))
+            .and(warp::path::end())
+            .and(ctx_filter.clone())
+            .and_then(
+                |block: SignedBlindedBeaconBlock<E>,
+                 fork_name: ForkName,
+                 builder: MockBuilder<E>| async move {
+                    let root = match block {
+                        SignedBlindedBeaconBlock::Base(_) | types::SignedBeaconBlock::Altair(_) => {
+                            return Err(reject("invalid fork"));
+                        }
+                        SignedBlindedBeaconBlock::Merge(block) => {
+                            block.message.body.execution_payload.tree_hash_root()
+                        }
+                        SignedBlindedBeaconBlock::Capella(block) => {
+                            block.message.body.execution_payload.tree_hash_root()
+                        }
+                        SignedBlindedBeaconBlock::Deneb(block) => {
+                            block.message.body.execution_payload.tree_hash_root()
+                        }
+                        SignedBlindedBeaconBlock::Electra(block) => {
+                            block.message.body.execution_payload.tree_hash_root()
+                        }
+                    };
+                    let payload = builder
+                        .el
+                        .get_payload_by_root(&root)
+                        .ok_or_else(|| reject("missing payload for tx root"))?;
+                    let resp: ForkVersionedResponse<_> = ForkVersionedResponse {
+                        version: Some(fork_name),
+                        metadata: Default::default(),
+                        data: payload,
+                    };
+
+                    let json_payload = serde_json::to_string(&resp)
+                        .map_err(|_| reject("coudn't serialize response"))?;
+                    Ok::<_, warp::reject::Rejection>(
+                        warp::http::Response::builder()
+                            .status(200)
+                            .body(
+                                serde_json::to_string(&json_payload)
+                                    .map_err(|_| reject("invalid JSON"))?,
+                            )
+                            .unwrap(),
+                    )
+                },
+            );
 
     let status = prefix
         .and(warp::path("status"))