add chain_id to Custom chains + remove helder

JasonVranek · JasonVranek · commit cd10faadfef0 · 2026-02-25T12:07:38.000-08:00
diff --git a/config.example.toml b/config.example.toml
@@ -2,7 +2,7 @@
 # Some fields are optional and can be omitted, in which case the default value, if present, will be used.
 
 # Chain spec ID. Supported values:
-# A network ID. Supported values: Mainnet, Holesky, Sepolia, Helder, Hoodi. Lower case values e.g. "mainnet" are also accepted
+# A network ID. Supported values: Mainnet, Holesky, Sepolia, Hoodi. Lower case values e.g. "mainnet" are also accepted
 # A custom object, e.g., chain = { genesis_time_secs = 1695902400, path = "/path/to/spec.json" }, with a path to a chain spec file, either in .json format (e.g., as returned by the beacon endpoint /eth/v1/config/spec), or in .yml format (see examples in tests/data).
 # A custom object, e.g., chain = { genesis_time_secs = 1695902400, slot_time_secs = 12, genesis_fork_version = "0x01017000" }.
 chain = "Holesky"
diff --git a/crates/common/src/config/mod.rs b/crates/common/src/config/mod.rs
@@ -68,7 +68,7 @@ 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, fulu_fork_slot) =
+                let (slot_time_secs, genesis_fork_version, fulu_fork_slot, chain_id) =
                     if let Some(path) = load_optional_env_var(CHAIN_SPEC_ENV) {
                         load_chain_from_file(path.parse()?)?
                     } else {
@@ -79,6 +79,7 @@ impl CommitBoostConfig {
                     slot_time_secs,
                     genesis_fork_version,
                     fulu_fork_slot,
+                    chain_id,
                 }
             }
             ChainLoader::Known(known) => Chain::from(known),
@@ -87,13 +88,15 @@ impl CommitBoostConfig {
                 slot_time_secs,
                 genesis_fork_version,
                 fulu_fork_slot,
+                chain_id,
             } => {
                 let genesis_fork_version: ForkVersion = genesis_fork_version.as_ref().try_into()?;
                 Chain::Custom {
                     genesis_time_secs,
                     slot_time_secs,
                     genesis_fork_version,
                     fulu_fork_slot,
+                    chain_id,
                 }
             }
         };
diff --git a/crates/common/src/signature.rs b/crates/common/src/signature.rs
@@ -106,10 +106,6 @@ mod tests {
             compute_domain(Chain::Sepolia, APPLICATION_BUILDER_DOMAIN),
             Chain::Sepolia.builder_domain()
         );
-        assert_eq!(
-            compute_domain(Chain::Helder, APPLICATION_BUILDER_DOMAIN),
-            Chain::Helder.builder_domain()
-        );
         assert_eq!(
             compute_domain(Chain::Hoodi, APPLICATION_BUILDER_DOMAIN),
             Chain::Hoodi.builder_domain()
diff --git a/crates/common/src/types.rs b/crates/common/src/types.rs
@@ -34,13 +34,13 @@ pub enum Chain {
     Mainnet,
     Holesky,
     Sepolia,
-    Helder,
     Hoodi,
     Custom {
         genesis_time_secs: u64,
         slot_time_secs: u64,
         genesis_fork_version: ForkVersion,
         fulu_fork_slot: u64,
+        chain_id: u64,
     },
 }
 
@@ -69,7 +69,7 @@ pub type ForkVersion = [u8; 4];
 impl std::fmt::Display for Chain {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::Mainnet | Self::Holesky | Self::Sepolia | Self::Helder | Self::Hoodi => {
+            Self::Mainnet | Self::Holesky | Self::Sepolia | Self::Hoodi => {
                 write!(f, "{self:?}")
             }
             Self::Custom { .. } => write!(f, "Custom"),
@@ -83,19 +83,20 @@ impl std::fmt::Debug for Chain {
             Self::Mainnet => write!(f, "Mainnet"),
             Self::Holesky => write!(f, "Holesky"),
             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,
                 fulu_fork_slot,
+                chain_id,
             } => 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)
+                .field("chain_id", chain_id)
                 .finish(),
         }
     }
@@ -107,11 +108,8 @@ impl Chain {
             Chain::Mainnet => KnownChain::Mainnet.id(),
             Chain::Holesky => KnownChain::Holesky.id(),
             Chain::Sepolia => KnownChain::Sepolia.id(),
-            Chain::Helder => KnownChain::Helder.id(),
             Chain::Hoodi => KnownChain::Hoodi.id(),
-            Chain::Custom { .. } => {
-                unimplemented!("chain id is not supported on custom chains, please file an issue")
-            }
+            Chain::Custom { chain_id, .. } => *chain_id,
         }
     }
 
@@ -120,7 +118,6 @@ impl Chain {
             Chain::Mainnet => KnownChain::Mainnet.builder_domain(),
             Chain::Holesky => KnownChain::Holesky.builder_domain(),
             Chain::Sepolia => KnownChain::Sepolia.builder_domain(),
-            Chain::Helder => KnownChain::Helder.builder_domain(),
             Chain::Hoodi => KnownChain::Hoodi.builder_domain(),
             Chain::Custom { .. } => compute_domain(*self, APPLICATION_BUILDER_DOMAIN),
         }
@@ -131,7 +128,6 @@ impl Chain {
             Chain::Mainnet => KnownChain::Mainnet.genesis_fork_version(),
             Chain::Holesky => KnownChain::Holesky.genesis_fork_version(),
             Chain::Sepolia => KnownChain::Sepolia.genesis_fork_version(),
-            Chain::Helder => KnownChain::Helder.genesis_fork_version(),
             Chain::Hoodi => KnownChain::Hoodi.genesis_fork_version(),
             Chain::Custom { genesis_fork_version, .. } => *genesis_fork_version,
         }
@@ -142,7 +138,6 @@ impl Chain {
             Chain::Mainnet => KnownChain::Mainnet.genesis_time_sec(),
             Chain::Holesky => KnownChain::Holesky.genesis_time_sec(),
             Chain::Sepolia => KnownChain::Sepolia.genesis_time_sec(),
-            Chain::Helder => KnownChain::Helder.genesis_time_sec(),
             Chain::Hoodi => KnownChain::Hoodi.genesis_time_sec(),
             Chain::Custom { genesis_time_secs, .. } => *genesis_time_secs,
         }
@@ -153,7 +148,6 @@ impl Chain {
             Chain::Mainnet => KnownChain::Mainnet.slot_time_sec(),
             Chain::Holesky => KnownChain::Holesky.slot_time_sec(),
             Chain::Sepolia => KnownChain::Sepolia.slot_time_sec(),
-            Chain::Helder => KnownChain::Helder.slot_time_sec(),
             Chain::Hoodi => KnownChain::Hoodi.slot_time_sec(),
             Chain::Custom { slot_time_secs, .. } => *slot_time_secs,
         }
@@ -164,7 +158,6 @@ impl Chain {
             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,
         }
@@ -183,8 +176,6 @@ pub enum KnownChain {
     Holesky,
     #[serde(alias = "sepolia")]
     Sepolia,
-    #[serde(alias = "helder")]
-    Helder,
     #[serde(alias = "hoodi")]
     Hoodi,
 }
@@ -196,7 +187,6 @@ impl KnownChain {
             KnownChain::Mainnet => 1,
             KnownChain::Holesky => 17000,
             KnownChain::Sepolia => 11155111,
-            KnownChain::Helder => 167000,
             KnownChain::Hoodi => 560048,
         }
     }
@@ -212,9 +202,6 @@ impl KnownChain {
             KnownChain::Sepolia => {
                 b256!("0x00000001d3010778cd08ee514b08fe67b6c503b510987a4ce43f42306d97c67c")
             }
-            KnownChain::Helder => {
-                b256!("0x0000000194c41af484fff7964969e0bdd922f82dff0f4be87a60d0664cc9d1ff")
-            }
             KnownChain::Hoodi => {
                 b256!("0x00000001719103511efa4f1362ff2a50996cccf329cc84cb410c5e5c7d351d03")
             }
@@ -226,7 +213,6 @@ impl KnownChain {
             KnownChain::Mainnet => hex!("00000000"),
             KnownChain::Holesky => hex!("01017000"),
             KnownChain::Sepolia => hex!("90000069"),
-            KnownChain::Helder => hex!("10000000"),
             KnownChain::Hoodi => hex!("10000910"),
         }
     }
@@ -236,7 +222,6 @@ impl KnownChain {
             KnownChain::Mainnet => 1606824023,
             KnownChain::Holesky => 1695902400,
             KnownChain::Sepolia => 1655733600,
-            KnownChain::Helder => 1718967660,
             KnownChain::Hoodi => 1742213400,
         }
     }
@@ -246,15 +231,13 @@ impl KnownChain {
             KnownChain::Mainnet |
             KnownChain::Holesky |
             KnownChain::Sepolia |
-            KnownChain::Helder |
             KnownChain::Hoodi => 12,
         }
     }
 
     pub fn fulu_fork_slot(&self) -> u64 {
         match self {
             KnownChain::Mainnet => 13164544,
-            KnownChain::Helder => u64::MAX,
             KnownChain::Holesky => 5283840,
             KnownChain::Sepolia => 8724480,
             KnownChain::Hoodi => 1622016,
@@ -268,7 +251,6 @@ impl From<KnownChain> for Chain {
             KnownChain::Mainnet => Chain::Mainnet,
             KnownChain::Holesky => Chain::Holesky,
             KnownChain::Sepolia => Chain::Sepolia,
-            KnownChain::Helder => Chain::Helder,
             KnownChain::Hoodi => Chain::Hoodi,
         }
     }
@@ -291,6 +273,7 @@ pub enum ChainLoader {
         slot_time_secs: u64,
         genesis_fork_version: Bytes,
         fulu_fork_slot: u64,
+        chain_id: u64,
     },
 }
 
@@ -303,18 +286,19 @@ impl Serialize for Chain {
             Chain::Mainnet => ChainLoader::Known(KnownChain::Mainnet),
             Chain::Holesky => ChainLoader::Known(KnownChain::Holesky),
             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,
                 fulu_fork_slot,
+                chain_id,
             } => 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,
+                chain_id: *chain_id,
             },
         };
 
@@ -332,20 +316,22 @@ 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, fulu_fork_slot) =
+                let (slot_time_secs, genesis_fork_version, fulu_fork_slot, chain_id) =
                     load_chain_from_file(path).map_err(serde::de::Error::custom)?;
                 Ok(Chain::Custom {
                     genesis_time_secs,
                     slot_time_secs,
                     genesis_fork_version,
                     fulu_fork_slot,
+                    chain_id,
                 })
             }
             ChainLoader::Custom {
                 genesis_time_secs,
                 slot_time_secs,
                 genesis_fork_version,
                 fulu_fork_slot,
+                chain_id,
             } => {
                 let genesis_fork_version: ForkVersion =
                     genesis_fork_version.as_ref().try_into().map_err(serde::de::Error::custom)?;
@@ -354,6 +340,7 @@ impl<'de> Deserialize<'de> for Chain {
                     slot_time_secs,
                     genesis_fork_version,
                     fulu_fork_slot,
+                    chain_id,
                 })
             }
         }
@@ -366,7 +353,7 @@ 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, u64)> {
+pub fn load_chain_from_file(path: PathBuf) -> eyre::Result<(u64, ForkVersion, u64, u64)> {
     #[derive(Deserialize)]
     #[serde(rename_all = "UPPERCASE")]
     struct QuotedSpecFile {
@@ -377,14 +364,16 @@ pub fn load_chain_from_file(path: PathBuf) -> eyre::Result<(u64, ForkVersion, u6
         slots_per_epoch: u64,
         #[serde(with = "serde_utils::quoted_u64")]
         fulu_fork_epoch: u64,
+        #[serde(with = "serde_utils::quoted_u64")]
+        deposit_chain_id: u64,
     }
 
     impl QuotedSpecFile {
-        fn to_chain(&self) -> eyre::Result<(u64, ForkVersion, u64)> {
+        fn to_chain(&self) -> eyre::Result<(u64, ForkVersion, u64, u64)> {
             let genesis_fork_version: ForkVersion =
                 self.genesis_fork_version.as_ref().try_into()?;
             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))
+            Ok((self.seconds_per_slot, genesis_fork_version, fulu_fork_slot, self.deposit_chain_id))
         }
     }
 
@@ -400,14 +389,15 @@ pub fn load_chain_from_file(path: PathBuf) -> eyre::Result<(u64, ForkVersion, u6
         genesis_fork_version: u32,
         slots_per_epoch: Option<u64>,
         fulu_fork_epoch: u64,
+        deposit_chain_id: u64,
     }
 
     impl SpecFile {
-        fn to_chain(&self) -> (u64, ForkVersion, u64) {
+        fn to_chain(&self) -> (u64, ForkVersion, u64, u64) {
             let genesis_fork_version: ForkVersion = self.genesis_fork_version.to_be_bytes();
             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)
+            (self.seconds_per_slot, genesis_fork_version, fulu_fork_slot, self.deposit_chain_id)
         }
     }
 
@@ -443,13 +433,14 @@ mod tests {
 
     #[test]
     fn test_load_custom() {
-        let s = r#"chain = { genesis_time_secs = 1, slot_time_secs = 2, genesis_fork_version = "0x01000000", fulu_fork_slot = 1 }"#;
+        let s = r#"chain = { genesis_time_secs = 1, slot_time_secs = 2, genesis_fork_version = "0x01000000", fulu_fork_slot = 1, chain_id = 123 }"#;
         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],
-            fulu_fork_slot: 1
+            fulu_fork_slot: 1,
+            chain_id: 123,
         })
     }
 
@@ -492,6 +483,7 @@ mod tests {
             slot_time_secs: KnownChain::Holesky.slot_time_sec(),
             genesis_fork_version: KnownChain::Holesky.genesis_fork_version(),
             fulu_fork_slot: KnownChain::Holesky.fulu_fork_slot(),
+            chain_id: KnownChain::Holesky.id(),
         })
     }
 
@@ -507,12 +499,13 @@ mod tests {
         let s = format!("chain = {{ genesis_time_secs = 1, path = {path:?}}}");
 
         let decoded: MockConfig = toml::from_str(&s).unwrap();
-        assert_eq!(decoded.chain.slot_time_sec(), KnownChain::Helder.slot_time_sec());
+        assert_eq!(decoded.chain.slot_time_sec(), KnownChain::Sepolia.slot_time_sec());
         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(),
             fulu_fork_slot: KnownChain::Sepolia.fulu_fork_slot(),
+            chain_id: KnownChain::Sepolia.id(),
         })
     }
 
@@ -534,27 +527,7 @@ mod tests {
             slot_time_secs: KnownChain::Hoodi.slot_time_sec(),
             genesis_fork_version: KnownChain::Hoodi.genesis_fork_version(),
             fulu_fork_slot: KnownChain::Hoodi.fulu_fork_slot(),
-        })
-    }
-
-    #[test]
-    fn test_spec_helder_yml() {
-        let a = env!("CARGO_MANIFEST_DIR");
-        let mut path = PathBuf::from(a);
-
-        path.pop();
-        path.pop();
-        path.push("tests/data/helder_spec.yml");
-
-        let s = format!("chain = {{ genesis_time_secs = 1, path = {path:?}}}");
-
-        let decoded: MockConfig = toml::from_str(&s).unwrap();
-        assert_eq!(decoded.chain.slot_time_sec(), KnownChain::Helder.slot_time_sec());
-        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(),
-            fulu_fork_slot: KnownChain::Helder.fulu_fork_slot(),
+            chain_id: KnownChain::Hoodi.id(),
         })
     }
 }
diff --git a/tests/data/helder_spec.yml b/tests/data/helder_spec.yml
