add consensus header

Author: ltitanb

crates/common/src/config/mod.rs

@@ -68,18 +68,33 @@ impl CommitBoostConfig {
         let chain = match helper_config.chain {
             ChainLoader::Path { path, genesis_time_secs } => {
                 // check if the file path is overridden by env var
-                let (slot_time_secs, genesis_fork_version) =
+                let (slot_time_secs, genesis_fork_version, fulu_fork_slot) =
                     if let Some(path) = load_optional_env_var(CHAIN_SPEC_ENV) {
                         load_chain_from_file(path.parse()?)?
                     } else {
                         load_chain_from_file(path)?
                     };
-                Chain::Custom { genesis_time_secs, slot_time_secs, genesis_fork_version }
+                Chain::Custom {
+                    genesis_time_secs,
+                    slot_time_secs,
+                    genesis_fork_version,
+                    fulu_fork_slot,
+                }
             }
             ChainLoader::Known(known) => Chain::from(known),
-            ChainLoader::Custom { genesis_time_secs, slot_time_secs, genesis_fork_version } => {
+            ChainLoader::Custom {
+                genesis_time_secs,
+                slot_time_secs,
+                genesis_fork_version,
+                fulu_fork_slot,
+            } => {
                 let genesis_fork_version: ForkVersion = genesis_fork_version.as_ref().try_into()?;
-                Chain::Custom { genesis_time_secs, slot_time_secs, genesis_fork_version }
+                Chain::Custom {
+                    genesis_time_secs,
+                    slot_time_secs,
+                    genesis_fork_version,
+                    fulu_fork_slot,
+                }
             }
         };
 

crates/common/src/pbs/constants.rs

@@ -17,6 +17,7 @@ pub const HEADER_VERSION_KEY: &str = "X-CommitBoost-Version";
 pub const HEADER_VERSION_VALUE: &str = COMMIT_BOOST_VERSION;
 pub const HEADER_START_TIME_UNIX_MS: &str = "Date-Milliseconds";
 pub const HEADER_TIMEOUT_MS: &str = "X-Timeout-Ms";
+pub const HEADER_CONSENSUS_VERSION: &str = "Eth-Consensus-Version";
 
 pub const DEFAULT_PBS_JWT_KEY: &str = "DEFAULT_PBS";
 

crates/common/src/types.rs

@@ -3,6 +3,7 @@ use std::path::PathBuf;
 use alloy::primitives::{B256, Bytes, b256, hex};
 use derive_more::{Deref, Display, From, Into};
 use eyre::{Context, bail};
+use lh_types::ForkName;
 use serde::{Deserialize, Serialize};
 
 use crate::{constants::APPLICATION_BUILDER_DOMAIN, signature::compute_domain};
@@ -35,7 +36,12 @@ pub enum Chain {
     Sepolia,
     Helder,
     Hoodi,
-    Custom { genesis_time_secs: u64, slot_time_secs: u64, genesis_fork_version: ForkVersion },
+    Custom {
+        genesis_time_secs: u64,
+        slot_time_secs: u64,
+        genesis_fork_version: ForkVersion,
+        fulu_fork_slot: u64,
+    },
 }
 
 pub type ForkVersion = [u8; 4];
@@ -59,11 +65,17 @@ impl std::fmt::Debug for Chain {
             Self::Sepolia => write!(f, "Sepolia"),
             Self::Helder => write!(f, "Helder"),
             Self::Hoodi => write!(f, "Hoodi"),
-            Self::Custom { genesis_time_secs, slot_time_secs, genesis_fork_version } => f
+            Self::Custom {
+                genesis_time_secs,
+                slot_time_secs,
+                genesis_fork_version,
+                fulu_fork_slot,
+            } => f
                 .debug_struct("Custom")
                 .field("genesis_time_secs", genesis_time_secs)
                 .field("slot_time_secs", slot_time_secs)
                 .field("genesis_fork_version", &hex::encode_prefixed(genesis_fork_version))
+                .field("fulu_fork_slot", fulu_fork_slot)
                 .finish(),
         }
     }
@@ -126,6 +138,21 @@ impl Chain {
             Chain::Custom { slot_time_secs, .. } => *slot_time_secs,
         }
     }
+
+    pub fn fulu_fork_slot(&self) -> u64 {
+        match self {
+            Chain::Mainnet => KnownChain::Mainnet.fulu_fork_slot(),
+            Chain::Holesky => KnownChain::Holesky.fulu_fork_slot(),
+            Chain::Sepolia => KnownChain::Sepolia.fulu_fork_slot(),
+            Chain::Helder => KnownChain::Helder.fulu_fork_slot(),
+            Chain::Hoodi => KnownChain::Hoodi.fulu_fork_slot(),
+            Chain::Custom { slot_time_secs, .. } => *slot_time_secs,
+        }
+    }
+
+    pub fn fork_by_slot(&self, slot: u64) -> ForkName {
+        if slot >= self.fulu_fork_slot() { ForkName::Fulu } else { ForkName::Electra }
+    }
 }
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
@@ -203,6 +230,15 @@ impl KnownChain {
             KnownChain::Hoodi => 12,
         }
     }
+
+    pub fn fulu_fork_slot(&self) -> u64 {
+        match self {
+            KnownChain::Mainnet | KnownChain::Helder => u64::MAX,
+            KnownChain::Holesky => 5283840,
+            KnownChain::Sepolia => 8724480,
+            KnownChain::Hoodi => 1622016,
+        }
+    }
 }
 
 impl From<KnownChain> for Chain {
@@ -233,6 +269,7 @@ pub enum ChainLoader {
         genesis_time_secs: u64,
         slot_time_secs: u64,
         genesis_fork_version: Bytes,
+        fulu_fork_slot: u64,
     },
 }
 
@@ -247,13 +284,17 @@ impl Serialize for Chain {
             Chain::Sepolia => ChainLoader::Known(KnownChain::Sepolia),
             Chain::Helder => ChainLoader::Known(KnownChain::Helder),
             Chain::Hoodi => ChainLoader::Known(KnownChain::Hoodi),
-            Chain::Custom { genesis_time_secs, slot_time_secs, genesis_fork_version } => {
-                ChainLoader::Custom {
-                    genesis_time_secs: *genesis_time_secs,
-                    slot_time_secs: *slot_time_secs,
-                    genesis_fork_version: Bytes::from(*genesis_fork_version),
-                }
-            }
+            Chain::Custom {
+                genesis_time_secs,
+                slot_time_secs,
+                genesis_fork_version,
+                fulu_fork_slot,
+            } => ChainLoader::Custom {
+                genesis_time_secs: *genesis_time_secs,
+                slot_time_secs: *slot_time_secs,
+                genesis_fork_version: Bytes::from(*genesis_fork_version),
+                fulu_fork_slot: *fulu_fork_slot,
+            },
         };
 
         loader.serialize(serializer)
@@ -270,14 +311,29 @@ impl<'de> Deserialize<'de> for Chain {
         match loader {
             ChainLoader::Known(known) => Ok(Chain::from(known)),
             ChainLoader::Path { genesis_time_secs, path } => {
-                let (slot_time_secs, genesis_fork_version) =
+                let (slot_time_secs, genesis_fork_version, fulu_fork_slot) =
                     load_chain_from_file(path).map_err(serde::de::Error::custom)?;
-                Ok(Chain::Custom { genesis_time_secs, slot_time_secs, genesis_fork_version })
+                Ok(Chain::Custom {
+                    genesis_time_secs,
+                    slot_time_secs,
+                    genesis_fork_version,
+                    fulu_fork_slot,
+                })
             }
-            ChainLoader::Custom { genesis_time_secs, slot_time_secs, genesis_fork_version } => {
+            ChainLoader::Custom {
+                genesis_time_secs,
+                slot_time_secs,
+                genesis_fork_version,
+                fulu_fork_slot,
+            } => {
                 let genesis_fork_version: ForkVersion =
                     genesis_fork_version.as_ref().try_into().map_err(serde::de::Error::custom)?;
-                Ok(Chain::Custom { genesis_time_secs, slot_time_secs, genesis_fork_version })
+                Ok(Chain::Custom {
+                    genesis_time_secs,
+                    slot_time_secs,
+                    genesis_fork_version,
+                    fulu_fork_slot,
+                })
             }
         }
     }
@@ -289,20 +345,25 @@ impl<'de> Deserialize<'de> for Chain {
 /// - JSON as return the getSpec endpoint, either with or without the `data`
 ///   field
 /// - YAML as used e.g. in Kurtosis/Ethereum Package
-pub fn load_chain_from_file(path: PathBuf) -> eyre::Result<(u64, ForkVersion)> {
+pub fn load_chain_from_file(path: PathBuf) -> eyre::Result<(u64, ForkVersion, u64)> {
     #[derive(Deserialize)]
     #[serde(rename_all = "UPPERCASE")]
     struct QuotedSpecFile {
         #[serde(with = "serde_utils::quoted_u64")]
         seconds_per_slot: u64,
         genesis_fork_version: Bytes,
+        #[serde(with = "serde_utils::quoted_u64")]
+        slots_per_epoch: u64,
+        #[serde(with = "serde_utils::quoted_u64")]
+        fulu_fork_epoch: u64,
     }
 
     impl QuotedSpecFile {
-        fn to_chain(&self) -> eyre::Result<(u64, ForkVersion)> {
+        fn to_chain(&self) -> eyre::Result<(u64, ForkVersion, u64)> {
             let genesis_fork_version: ForkVersion =
                 self.genesis_fork_version.as_ref().try_into()?;
-            Ok((self.seconds_per_slot, genesis_fork_version))
+            let fulu_fork_slot = self.fulu_fork_epoch.saturating_mul(self.slots_per_epoch);
+            Ok((self.seconds_per_slot, genesis_fork_version, fulu_fork_slot))
         }
     }
 
@@ -316,12 +377,16 @@ pub fn load_chain_from_file(path: PathBuf) -> eyre::Result<(u64, ForkVersion)> {
     struct SpecFile {
         seconds_per_slot: u64,
         genesis_fork_version: u32,
+        slots_per_epoch: Option<u64>,
+        fulu_fork_epoch: u64,
     }
 
     impl SpecFile {
-        fn to_chain(&self) -> (u64, ForkVersion) {
+        fn to_chain(&self) -> (u64, ForkVersion, u64) {
             let genesis_fork_version: ForkVersion = self.genesis_fork_version.to_be_bytes();
-            (self.seconds_per_slot, genesis_fork_version)
+            let fulu_fork_slot =
+                self.fulu_fork_epoch.saturating_mul(self.slots_per_epoch.unwrap_or(32));
+            (self.seconds_per_slot, genesis_fork_version, fulu_fork_slot)
         }
     }
 
@@ -357,12 +422,13 @@ mod tests {
 
     #[test]
     fn test_load_custom() {
-        let s = r#"chain = { genesis_time_secs = 1, slot_time_secs = 2, genesis_fork_version = "0x01000000" }"#;
+        let s = r#"chain = { genesis_time_secs = 1, slot_time_secs = 2, genesis_fork_version = "0x01000000", fulu_fork_slot = 1 }"#;
         let decoded: MockConfig = toml::from_str(s).unwrap();
         assert_eq!(decoded.chain, Chain::Custom {
             genesis_time_secs: 1,
             slot_time_secs: 2,
-            genesis_fork_version: [1, 0, 0, 0]
+            genesis_fork_version: [1, 0, 0, 0],
+            fulu_fork_slot: 1
         })
     }
 
@@ -403,7 +469,8 @@ mod tests {
         assert_eq!(decoded.chain, Chain::Custom {
             genesis_time_secs: 1,
             slot_time_secs: KnownChain::Holesky.slot_time_sec(),
-            genesis_fork_version: KnownChain::Holesky.genesis_fork_version()
+            genesis_fork_version: KnownChain::Holesky.genesis_fork_version(),
+            fulu_fork_slot: KnownChain::Holesky.fulu_fork_slot(),
         })
     }
 
@@ -423,7 +490,8 @@ mod tests {
         assert_eq!(decoded.chain, Chain::Custom {
             genesis_time_secs: 1,
             slot_time_secs: KnownChain::Sepolia.slot_time_sec(),
-            genesis_fork_version: KnownChain::Sepolia.genesis_fork_version()
+            genesis_fork_version: KnownChain::Sepolia.genesis_fork_version(),
+            fulu_fork_slot: KnownChain::Sepolia.fulu_fork_slot(),
         })
     }
 
@@ -443,7 +511,8 @@ mod tests {
         assert_eq!(decoded.chain, Chain::Custom {
             genesis_time_secs: 1,
             slot_time_secs: KnownChain::Hoodi.slot_time_sec(),
-            genesis_fork_version: KnownChain::Hoodi.genesis_fork_version()
+            genesis_fork_version: KnownChain::Hoodi.genesis_fork_version(),
+            fulu_fork_slot: KnownChain::Hoodi.fulu_fork_slot(),
         })
     }
 
@@ -463,7 +532,8 @@ mod tests {
         assert_eq!(decoded.chain, Chain::Custom {
             genesis_time_secs: 1,
             slot_time_secs: KnownChain::Helder.slot_time_sec(),
-            genesis_fork_version: KnownChain::Helder.genesis_fork_version()
+            genesis_fork_version: KnownChain::Helder.genesis_fork_version(),
+            fulu_fork_slot: KnownChain::Helder.fulu_fork_slot(),
         })
     }
 }

crates/pbs/src/mev_boost/submit_block.rs

@@ -6,7 +6,7 @@ use cb_common::{
     pbs::{
         BlindedBeaconBlock, BlindedBeaconBlockElectra, BlindedBeaconBlockFulu, BlobsBundle,
         BuilderApiVersion, ExecutionPayload, ExecutionPayloadElectra, ExecutionPayloadFulu,
-        HEADER_START_TIME_UNIX_MS, RelayClient, SignedBlindedBeaconBlock,
+        HEADER_CONSENSUS_VERSION, HEADER_START_TIME_UNIX_MS, RelayClient, SignedBlindedBeaconBlock,
         SubmitBlindedBlockResponse,
         error::{PbsError, ValidationError},
     },
@@ -34,10 +34,20 @@ pub async fn submit_block<S: BuilderApiState>(
     state: PbsState<S>,
     api_version: &BuilderApiVersion,
 ) -> eyre::Result<Option<SubmitBlindedBlockResponse>> {
+    debug!(?req_headers, "received headers");
+    let consensus_version =
+        req_headers.get(HEADER_CONSENSUS_VERSION).cloned().unwrap_or_else(|| {
+            let slot = signed_blinded_block.slot().as_u64();
+            let fork = state.config.chain.fork_by_slot(slot);
+            // safe because ForkName is visible ASCII chars
+            HeaderValue::from_str(&fork.to_string()).unwrap()
+        });
+
     // prepare headers
     let mut send_headers = HeaderMap::new();
     send_headers.insert(HEADER_START_TIME_UNIX_MS, HeaderValue::from(utcnow_ms()));
     send_headers.insert(USER_AGENT, get_user_agent_with_version(&req_headers)?);
+    send_headers.insert(HEADER_CONSENSUS_VERSION, consensus_version);
 
     let relays = state.all_relays();
     let mut handles = Vec::with_capacity(relays.len());

tests/data/helder_spec.yml

@@ -40,6 +40,8 @@ DENEB_FORK_EPOCH: 0
 ELECTRA_FORK_VERSION: 0x60132736
 ELECTRA_FORK_EPOCH: 999999
 
+FULU_FORK_EPOCH: 18446744073709551615
+
 # EIP7594 - Peerdas
 EIP7594_FORK_VERSION: 0x70132736
 EIP7594_FORK_EPOCH: 999999