From d86fd5bb6f0d4ac8181bb2c3c937234df42e6673 Mon Sep 17 00:00:00 2001
From: Eitan Seri-Levi <eserilev@ucsc.edu>
Date: Tue, 28 Apr 2026 01:06:02 +0200
Subject: [PATCH] merge conflicts

---
 beacon_node/beacon_chain/src/builder.rs                    | 4 ++--
 .../src/payload_attestation_verification/tests.rs          | 2 +-
 .../beacon_chain/src/payload_bid_verification/tests.rs     | 2 +-
 consensus/state_processing/src/genesis.rs                  | 7 ++-----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/beacon_node/beacon_chain/src/builder.rs b/beacon_node/beacon_chain/src/builder.rs
index d70561db9b..53cb19397e 100644
--- a/beacon_node/beacon_chain/src/builder.rs
+++ b/beacon_node/beacon_chain/src/builder.rs
@@ -1177,8 +1177,8 @@ fn make_genesis_block<E: EthSpec>(
     genesis_state: &mut BeaconState<E>,
     spec: &ChainSpec,
 ) -> Result<SignedBeaconBlock<E>, String> {
-    let mut block = genesis_block(genesis_state, spec)
-        .map_err(|e| format!("Error building genesis block: {:?}", e))?;
+    let mut block =
+        genesis_block(spec).map_err(|e| format!("Error building genesis block: {:?}", e))?;
 
     *block.state_root_mut() = genesis_state
         .update_tree_hash_cache()
diff --git a/beacon_node/beacon_chain/src/payload_attestation_verification/tests.rs b/beacon_node/beacon_chain/src/payload_attestation_verification/tests.rs
index 7faad98e55..038068d928 100644
--- a/beacon_node/beacon_chain/src/payload_attestation_verification/tests.rs
+++ b/beacon_node/beacon_chain/src/payload_attestation_verification/tests.rs
@@ -65,7 +65,7 @@ impl TestContext {
             root: Hash256::ZERO,
         };
 
-        let mut block = genesis_block(&state, &spec).expect("should build genesis block");
+        let mut block = genesis_block(&spec).expect("should build genesis block");
         *block.state_root_mut() = state
             .update_tree_hash_cache()
             .expect("should hash genesis state");
diff --git a/beacon_node/beacon_chain/src/payload_bid_verification/tests.rs b/beacon_node/beacon_chain/src/payload_bid_verification/tests.rs
index 98863a49d5..be5f4b485a 100644
--- a/beacon_node/beacon_chain/src/payload_bid_verification/tests.rs
+++ b/beacon_node/beacon_chain/src/payload_bid_verification/tests.rs
@@ -113,7 +113,7 @@ impl TestContext {
             )
             .expect("should register inactive builder");
 
-        let mut block = genesis_block(&state, &spec).expect("should build genesis block");
+        let mut block = genesis_block(&spec).expect("should build genesis block");
         *block.state_root_mut() = state
             .update_tree_hash_cache()
             .expect("should hash genesis state");
diff --git a/consensus/state_processing/src/genesis.rs b/consensus/state_processing/src/genesis.rs
index 46541e0326..f412f8cd3c 100644
--- a/consensus/state_processing/src/genesis.rs
+++ b/consensus/state_processing/src/genesis.rs
@@ -184,15 +184,12 @@ pub fn initialize_beacon_state_from_eth1<E: EthSpec>(
     Ok(state)
 }
 
-/// Create an unsigned genesis `BeaconBlock` matching the genesis state.
+/// Create an unsigned genesis `BeaconBlock`.
 ///
 /// Per spec, the genesis block body is empty (all default fields).
 /// `state.latest_block_header.body_root` is set from `BeaconBlock::empty()`,
 /// so this function must return the same empty block to keep roots consistent.
-pub fn genesis_block<E: EthSpec>(
-    _genesis_state: &BeaconState<E>,
-    spec: &ChainSpec,
-) -> Result<BeaconBlock<E>, BeaconStateError> {
+pub fn genesis_block<E: EthSpec>(spec: &ChainSpec) -> Result<BeaconBlock<E>, BeaconStateError> {
     Ok(BeaconBlock::empty(spec))
 }