Merge pull request #7 from pawanjay176/electra

Electra support and minor fixes

Author: realbigsean

Cargo.toml

@@ -16,10 +16,10 @@ members = [
 async-trait = "0.1"
 axum = { version = "0.7", features = ["ws"] }
 bytes = "1.6"
-eth2 = { git = "https://github.com/realbigsean/lighthouse.git", rev = "10ce60633859ab4f20308ef42bb88e219e09fee5" }
-ethereum_serde_utils = "0.5.2"
-ethereum_ssz = "0.5.4"
-ethereum_ssz_derive = "0.5.4"
+eth2 = { git = "https://github.com/sigp/lighthouse.git", rev = "c33307d70287fd3b7a70785f89dadcb737214903" }
+ethereum_serde_utils = "0.7"
+ethereum_ssz = "0.7"
+ethereum_ssz_derive = "0.7"
 flate2 = "1.0"
 futures = "0.3.30"
 http = "1"
@@ -30,5 +30,5 @@ superstruct = "0.8"
 tokio = { version = "1", default-features = false, features = ["signal", "rt-multi-thread"] }
 tokio-tungstenite = "0.24.0"
 tracing = { version = "0.1", features = ["attributes"] }
-types = { git = "https://github.com/realbigsean/lighthouse.git", rev = "10ce60633859ab4f20308ef42bb88e219e09fee5" }
+types = { git = "https://github.com/sigp/lighthouse.git", rev = "c33307d70287fd3b7a70785f89dadcb737214903" }
 rand = "0.8"

builder-server/src/builder.rs

@@ -1,7 +1,8 @@
 use async_trait::async_trait;
 use builder_api_types::{
-    builder_bid::SignedBuilderBid, eth_spec::EthSpec, ExecutionBlockHash, ExecutionPayload,
-    ForkName, PublicKeyBytes, SignedBlindedBeaconBlock, SignedValidatorRegistrationData, Slot,
+    builder_bid::SignedBuilderBid, eth_spec::EthSpec, ExecutionBlockHash, ForkName,
+    FullPayloadContents, PublicKeyBytes, SignedBlindedBeaconBlock, SignedValidatorRegistrationData,
+    Slot,
 };
 use ethereum_apis_common::ErrorResponse;
 
@@ -15,7 +16,7 @@ pub trait Builder<E: EthSpec> {
     async fn submit_blinded_block(
         &self,
         block: SignedBlindedBeaconBlock<E>,
-    ) -> Result<ExecutionPayload<E>, ErrorResponse>;
+    ) -> Result<FullPayloadContents<E>, ErrorResponse>;
 
     async fn get_header(
         &self,

builder-server/src/server.rs

@@ -8,7 +8,7 @@ use axum::{
 };
 use builder_api_types::{
     eth_spec::EthSpec, fork_versioned_response::EmptyMetadata, ExecutionBlockHash,
-    ForkVersionedResponse, PublicKeyBytes, SignedBlindedBeaconBlock,
+    ForkVersionedResponse, FullPayloadContents, PublicKeyBytes, SignedBlindedBeaconBlock,
     SignedValidatorRegistrationData, Slot,
 };
 use ethereum_apis_common::build_response;
@@ -64,10 +64,18 @@ where
         .as_ref()
         .submit_blinded_block(block)
         .await
-        .map(|payload| ForkVersionedResponse {
-            version: Some(payload.fork_name()),
-            metadata: EmptyMetadata {},
-            data: payload,
+        .map(|payload| {
+            let fork_name = match &payload {
+                FullPayloadContents::Payload(payload) => payload.fork_name(),
+                FullPayloadContents::PayloadAndBlobs(payload_and_blobs) => {
+                    payload_and_blobs.execution_payload.fork_name()
+                }
+            };
+            ForkVersionedResponse {
+                version: Some(fork_name),
+                metadata: EmptyMetadata {},
+                data: payload,
+            }
         });
     build_response(res).await
 }