Changed chain IDs internally to U256

jclapis · jclapis · commit 90ae97a01207 · 2025-08-06T14:03:56.000-04:00
diff --git a/crates/common/src/config/pbs.rs b/crates/common/src/config/pbs.rs
@@ -169,12 +169,13 @@ impl PbsConfig {
             if !matches!(chain, Chain::Custom { .. }) {
                 let provider = ProviderBuilder::new().on_http(rpc_url.clone());
                 let chain_id = provider.get_chain_id().await?;
+                let chain_id_big = U256::from(chain_id);
                 ensure!(
-                    chain_id == chain.id(),
+                    chain_id_big == chain.id(),
                     "Rpc url is for the wrong chain, expected: {} ({:?}) got {}",
                     chain.id(),
                     chain,
-                    chain_id
+                    chain_id_big
                 );
             }
         }
diff --git a/crates/common/src/types.rs b/crates/common/src/types.rs
@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use alloy::primitives::{aliases::B32, hex, Bytes, B256};
+use alloy::primitives::{aliases::B32, hex, Bytes, B256, U256};
 use derive_more::{Deref, Display, From, Into};
 use eyre::{bail, Context};
 use serde::{Deserialize, Serialize};
@@ -72,7 +72,9 @@ impl std::fmt::Debug for Chain {
 }
 
 impl Chain {
-    pub fn id(&self) -> u64 {
+    // Chain IDs are 256-bit unsigned integers because they need to support
+    // Keccak256 hashes
+    pub fn id(&self) -> U256 {
         match self {
             Chain::Mainnet => KnownChain::Mainnet.id(),
             Chain::Holesky => KnownChain::Holesky.id(),
@@ -146,13 +148,13 @@ pub enum KnownChain {
 
 // Constants
 impl KnownChain {
-    pub fn id(&self) -> u64 {
+    pub fn id(&self) -> U256 {
         match self {
-            KnownChain::Mainnet => 1,
-            KnownChain::Holesky => 17000,
-            KnownChain::Sepolia => 11155111,
-            KnownChain::Helder => 167000,
-            KnownChain::Hoodi => 560048,
+            KnownChain::Mainnet => U256::from(1),
+            KnownChain::Holesky => U256::from(17000),
+            KnownChain::Sepolia => U256::from(11155111),
+            KnownChain::Helder => U256::from(167000),
+            KnownChain::Hoodi => U256::from(560048),
         }
     }
 
diff --git a/crates/common/src/utils.rs b/crates/common/src/utils.rs
@@ -6,7 +6,7 @@ use std::{
 };
 
 use alloy::{
-    primitives::U256,
+    primitives::{B256, U256},
     rpc::types::beacon::{BlsPublicKey, BlsSignature},
 };
 use axum::http::HeaderValue;
@@ -443,6 +443,22 @@ pub fn get_user_agent_with_version(req_headers: &HeaderMap) -> eyre::Result<Head
     Ok(HeaderValue::from_str(&format!("commit-boost/{HEADER_VERSION_VALUE} {}", ua))?)
 }
 
+// Trait for converting from u64 to B256
+pub trait FromU64 {
+    /// Converts a u64 to a B256 by left-padding with zeros
+    fn from_u64(value: u64) -> B256;
+}
+
+impl FromU64 for B256 {
+    /// Converts a u64 into a B256 by left-padding with zeros
+    fn from_u64(value: u64) -> B256 {
+        let mut buffer = [0u8; 32];
+        let bytes = value.to_be_bytes();
+        buffer[24..].copy_from_slice(&bytes);
+        B256::from(buffer)
+    }
+}
+
 #[cfg(unix)]
 pub async fn wait_for_signal() -> eyre::Result<()> {
     use tokio::signal::unix::{signal, SignalKind};
