Merge branch 'main' into sigp-audit-fixes

Author: jclapis

config.example.toml

@@ -2,9 +2,9 @@
 # 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" }.
+# A custom object, e.g., chain = { genesis_time_secs = 1695902400, slot_time_secs = 12, genesis_fork_version = "0x01017000", chain_id = 17000 }.
 chain = "Holesky"
 
 # Configuration for the PBS module

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,
                 }
             }
         };

crates/common/src/signature.rs

@@ -176,7 +176,6 @@ mod tests {
         assert_eq!(compute_domain(Chain::Mainnet, domain), Chain::Mainnet.builder_domain());
         assert_eq!(compute_domain(Chain::Holesky, domain), Chain::Holesky.builder_domain());
         assert_eq!(compute_domain(Chain::Sepolia, domain), Chain::Sepolia.builder_domain());
-        assert_eq!(compute_domain(Chain::Helder, domain), Chain::Helder.builder_domain());
         assert_eq!(compute_domain(Chain::Hoodi, domain), Chain::Hoodi.builder_domain());
     }
 }