Update BlindedBlobsBundle SSZ and deserialize signed blinded block (Deneb)

Cargo.toml

@@ -4,6 +4,6 @@ members = ["bin/mev", "mev-boost-rs", "mev-relay-rs", "mev-build-rs", "mev-rs"]
 default-members = ["bin/mev"]
 
 [workspace.dependencies]
-ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "2bcb975" }
-beacon-api-client = { git = "https://github.com/ralexstokes/beacon-api-client", rev = "d838d93" }
+ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "12508c1f9b0c8f4bf4c5e9b6d441e840c1b37fd9" }
+beacon-api-client = { git = "https://github.com/ralexstokes/beacon-api-client", rev = "7f28993615fde52d563dd601a0511c34fe9b7c38" }
 ssz_rs = "0.9.0"

mev-boost-rs/src/service.rs

@@ -2,7 +2,7 @@ use crate::{
     relay::{Relay, RelayEndpoint},
     relay_mux::RelayMux,
 };
-use ethereum_consensus::state_transition::Context;
+use ethereum_consensus::{clock::from_system_time, state_transition::Context};
 use futures::StreamExt;
 use mev_rs::{blinded_block_provider::Server as BlindedBlockProviderServer, Error, Network};
 use serde::Deserialize;
@@ -69,7 +69,13 @@ impl Service {
         let context =
             if let Some(context) = context { context } else { Context::try_from(&network)? };
         let relays = relays.into_iter().map(Relay::from);
-        let clock = context.clock(None);
+        let clock = match context.clock() {
+            Some(clock) => clock,
+            None => {
+                let genesis_time = context.genesis_time()?;
+                from_system_time(genesis_time, context.seconds_per_slot, context.slots_per_epoch)
+            }
+        };
         let relay_mux = RelayMux::new(relays, context);
 
         let relay_mux_clone = relay_mux.clone();

mev-build-rs/src/service.rs

@@ -1,6 +1,6 @@
 use crate::mempool_builder::Builder;
 use beacon_api_client::Client;
-use ethereum_consensus::{crypto::SecretKey, state_transition::Context};
+use ethereum_consensus::{clock::from_system_time, crypto::SecretKey, state_transition::Context};
 use futures::StreamExt;
 use mev_rs::{
     blinded_block_provider::Server as BlindedBlockProviderServer,
@@ -72,7 +72,13 @@ impl Service {
 
         let genesis_details = client.get_genesis_details().await?;
         let genesis_validators_root = genesis_details.genesis_validators_root;
-        let clock = context.clock(Some(genesis_details.genesis_time));
+        let clock = match context.clock() {
+            Some(clock) => clock,
+            None => {
+                let genesis_time = context.genesis_time()?;
+                from_system_time(genesis_time, context.seconds_per_slot, context.slots_per_epoch)
+            }
+        };
         let builder = Builder::new(
             secret_key,
             genesis_validators_root,

mev-relay-rs/src/service.rs

@@ -1,6 +1,6 @@
 use crate::relay::Relay;
 use beacon_api_client::mainnet::Client;
-use ethereum_consensus::{crypto::SecretKey, state_transition::Context};
+use ethereum_consensus::{clock::from_system_time, crypto::SecretKey, state_transition::Context};
 use futures::StreamExt;
 use mev_rs::{blinded_block_provider::Server as BlindedBlockProviderServer, Error, Network};
 use serde::Deserialize;
@@ -58,7 +58,13 @@ impl Service {
 
         let context =
             if let Some(context) = context { context } else { Context::try_from(&network)? };
-        let clock = context.clock(None);
+        let clock = match context.clock() {
+            Some(clock) => clock,
+            None => {
+                let genesis_time = context.genesis_time()?;
+                from_system_time(genesis_time, context.seconds_per_slot, context.slots_per_epoch)
+            }
+        };
         let context = Arc::new(context);
         let genesis_details = beacon_node.get_genesis_details().await?;
         let genesis_validators_root = genesis_details.genesis_validators_root;

mev-rs/src/blinded_block_provider/api/server.rs

@@ -2,7 +2,7 @@ use crate::{
     blinded_block_provider::BlindedBlockProvider,
     error::Error,
     types::{
-        bellatrix, capella, BidRequest, ExecutionPayload, SignedBlindedBeaconBlock,
+        bellatrix, capella, deneb, BidRequest, ExecutionPayload, SignedBlindedBeaconBlock,
         SignedBuilderBid, SignedValidatorRegistration,
     },
 };
@@ -49,13 +49,19 @@ async fn handle_open_bid<B: BlindedBlockProvider>(
     State(builder): State<B>,
     Json(block): Json<serde_json::Value>,
 ) -> Result<Json<VersionedValue<ExecutionPayload>>, Error> {
-    let maybe_capella_block = capella::SignedBlindedBeaconBlock::deserialize(&block);
-    let mut block = match maybe_capella_block {
-        Ok(block) => SignedBlindedBeaconBlock::Capella(block),
-        Err(err) => match bellatrix::SignedBlindedBeaconBlock::deserialize(block) {
-            Ok(block) => SignedBlindedBeaconBlock::Bellatrix(block),
-            Err(_) => return Err(ApiClientError::from(err).into()),
-        },
+    // TODO: Using the optional `Eth-Consensus-Version` header once clients have implemented it.
+    let mut block = if block["message"].is_null() {
+        deneb::SignedBlindedBlockAndBlobSidecars::deserialize(&block)
+            .map(SignedBlindedBeaconBlock::Deneb)
+            .map_err(ApiClientError::from)?
+    } else {
+        capella::SignedBlindedBeaconBlock::deserialize(&block)
+            .map(SignedBlindedBeaconBlock::Capella)
+            .or_else(|_| {
+                bellatrix::SignedBlindedBeaconBlock::deserialize(&block)
+                    .map(SignedBlindedBeaconBlock::Bellatrix)
+            })
+            .map_err(ApiClientError::from)?
     };
 
     let payload = builder.open_bid(&mut block).await?;

mev-rs/src/types/deneb.rs

@@ -1,6 +1,6 @@
 pub use ethereum_consensus::{builder::SignedValidatorRegistration, deneb::mainnet as spec};
 use ethereum_consensus::{
-    deneb::mainnet::MAX_BLOBS_PER_BLOCK,
+    deneb::mainnet::{MAX_BLOBS_PER_BLOCK, MAX_BLOB_COMMITMENTS_PER_BLOCK},
     kzg::{KzgCommitment, KzgProof},
     primitives::{BlsPublicKey, BlsSignature, Root, U256},
 };
@@ -26,9 +26,9 @@ pub struct BuilderBid {
 #[derive(Debug, Default, Clone, SimpleSerialize)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct BlindedBlobsBundle {
-    pub commitments: List<KzgCommitment, MAX_BLOBS_PER_BLOCK>,
-    pub proofs: List<KzgProof, MAX_BLOBS_PER_BLOCK>,
-    pub blob_roots: List<Root, MAX_BLOBS_PER_BLOCK>,
+    pub commitments: List<KzgCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK>,
+    pub proofs: List<KzgProof, MAX_BLOB_COMMITMENTS_PER_BLOCK>,
+    pub blob_roots: List<Root, MAX_BLOB_COMMITMENTS_PER_BLOCK>,
 }
 
 #[derive(Debug, Default, Clone, SimpleSerialize)]
@@ -48,9 +48,9 @@ pub struct SignedBlindedBlockAndBlobSidecars {
 #[derive(Debug, Default, Clone, SimpleSerialize)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct BlobsBundle {
-    pub commitments: List<KzgCommitment, MAX_BLOBS_PER_BLOCK>,
-    pub proofs: List<KzgProof, MAX_BLOBS_PER_BLOCK>,
-    pub blobs: List<Blob, MAX_BLOBS_PER_BLOCK>,
+    pub commitments: List<KzgCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK>,
+    pub proofs: List<KzgProof, MAX_BLOB_COMMITMENTS_PER_BLOCK>,
+    pub blobs: List<Blob, MAX_BLOB_COMMITMENTS_PER_BLOCK>,
 }
 
 #[derive(Debug, Default, Clone, SimpleSerialize)]