From eabb854ecf49a9fa8658872f44a457cdb5d579f8 Mon Sep 17 00:00:00 2001
From: hopinheimer <knmanas6@gmail.com>
Date: Tue, 28 Oct 2025 20:11:16 -0400
Subject: [PATCH 1/2] fix

---
 consensus/types/src/beacon_block_header.rs    | 4 ++++
 consensus/types/src/light_client_bootstrap.rs | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/consensus/types/src/beacon_block_header.rs b/consensus/types/src/beacon_block_header.rs
index e14a9fc8af7..27820a0ba9a 100644
--- a/consensus/types/src/beacon_block_header.rs
+++ b/consensus/types/src/beacon_block_header.rs
@@ -62,6 +62,10 @@ impl BeaconBlockHeader {
             state_root: Default::default(),
         }
     }
+
+    pub fn update_state_root(&mut self, state_root: Hash256) {
+        self.state_root = state_root;
+    }
 }
 
 #[cfg(test)]
diff --git a/consensus/types/src/light_client_bootstrap.rs b/consensus/types/src/light_client_bootstrap.rs
index 5850db876c2..0ec8755251b 100644
--- a/consensus/types/src/light_client_bootstrap.rs
+++ b/consensus/types/src/light_client_bootstrap.rs
@@ -188,8 +188,12 @@ impl<E: EthSpec> LightClientBootstrap<E> {
         block: &SignedBlindedBeaconBlock<E>,
         chain_spec: &ChainSpec,
     ) -> Result<Self, Error> {
-        let mut header = beacon_state.latest_block_header().clone();
-        header.state_root = beacon_state.update_tree_hash_cache()?;
+        let header = beacon_state.update_tree_hash_cache()?;
+        beacon_state
+            .latest_block_header()
+            .clone()
+            .update_state_root(header);
+
         let current_sync_committee_branch = beacon_state.compute_current_sync_committee_proof()?;
         let current_sync_committee = beacon_state.current_sync_committee()?.clone();
 

From c04eccc4134a35cf849c7aa8b523af825d465384 Mon Sep 17 00:00:00 2001
From: hopinheimer <knmanas6@gmail.com>
Date: Tue, 28 Oct 2025 20:56:24 -0400
Subject: [PATCH 2/2] addressing comment and fmt

---
 consensus/types/src/beacon_block_header.rs    | 4 ----
 consensus/types/src/light_client_bootstrap.rs | 6 ------
 2 files changed, 10 deletions(-)

diff --git a/consensus/types/src/beacon_block_header.rs b/consensus/types/src/beacon_block_header.rs
index 27820a0ba9a..e14a9fc8af7 100644
--- a/consensus/types/src/beacon_block_header.rs
+++ b/consensus/types/src/beacon_block_header.rs
@@ -62,10 +62,6 @@ impl BeaconBlockHeader {
             state_root: Default::default(),
         }
     }
-
-    pub fn update_state_root(&mut self, state_root: Hash256) {
-        self.state_root = state_root;
-    }
 }
 
 #[cfg(test)]
diff --git a/consensus/types/src/light_client_bootstrap.rs b/consensus/types/src/light_client_bootstrap.rs
index 0ec8755251b..21e805f2c7c 100644
--- a/consensus/types/src/light_client_bootstrap.rs
+++ b/consensus/types/src/light_client_bootstrap.rs
@@ -188,12 +188,6 @@ impl<E: EthSpec> LightClientBootstrap<E> {
         block: &SignedBlindedBeaconBlock<E>,
         chain_spec: &ChainSpec,
     ) -> Result<Self, Error> {
-        let header = beacon_state.update_tree_hash_cache()?;
-        beacon_state
-            .latest_block_header()
-            .clone()
-            .update_state_root(header);
-
         let current_sync_committee_branch = beacon_state.compute_current_sync_committee_proof()?;
         let current_sync_committee = beacon_state.current_sync_committee()?.clone();