gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-07 16:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix state for block production

Browse Source
This commit is contained in:
Michael Sproul
2026-02-25 16:02:15 +11:00
parent 57527e5094
commit 59a2b6dead
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
beacon_node/beacon_chain/src/block_production/mod.rs
View File

@@ -37,7 +37,13 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
}; };
let (state, state_root_opt) = if head_slot < slot { let (state, state_root_opt) = if head_slot < slot {
// Attempt an aggressive re-org if configured and the conditions are right. // Attempt an aggressive re-org if configured and the conditions are right.
if let Some((re_org_state, re_org_state_root)) = // TODO(gloas): re-enable reorgs
let gloas_enabled = self
.spec
.fork_name_at_slot::<T::EthSpec>(slot)
.gloas_enabled();
if !gloas_enabled
&& let Some((re_org_state, re_org_state_root)) =
self.get_state_for_re_org(slot, head_slot, head_block_root) self.get_state_for_re_org(slot, head_slot, head_block_root)
{ {
info!( info!(
@@ -49,13 +55,29 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
} else { } else {
// Fetch the head state advanced through to `slot`, which should be present in the // Fetch the head state advanced through to `slot`, which should be present in the
// state cache thanks to the state advance timer. // state cache thanks to the state advance timer.
// TODO(gloas): need to fix this once fork choice understands payloads
// for now we just use the existence of the head's payload envelope to determine
// whether we should build atop it
let (payload_status, parent_state_root) = if gloas_enabled
&& let Ok(Some(envelope)) = self.store.get_payload_envelope(&head_block_root)
{
debug!(
%slot,
parent_state_root = ?envelope.message.state_root,
parent_block_root = ?head_block_root,
"Building Gloas block on full state"
);
(StatePayloadStatus::Full, envelope.message.state_root)
} else {
(StatePayloadStatus::Pending, head_state_root)
};
let (state_root, state) = self let (state_root, state) = self
.store .store
.get_advanced_hot_state( .get_advanced_hot_state(
head_block_root, head_block_root,
StatePayloadStatus::Pending, payload_status,
slot, slot,
head_state_root, parent_state_root,
) )
.map_err(BlockProductionError::FailedToLoadState)? .map_err(BlockProductionError::FailedToLoadState)?
.ok_or(BlockProductionError::UnableToProduceAtSlot(slot))?; .ok_or(BlockProductionError::UnableToProduceAtSlot(slot))?;

4
beacon_node/beacon_chain/tests/store_tests.rs
View File

@@ -5461,7 +5461,7 @@ async fn test_gloas_block_and_envelope_storage() {
let slot = Slot::new(i); let slot = Slot::new(i);
harness.advance_slot(); harness.advance_slot();
let (block_contents, envelope, pending_state) = let (block_contents, envelope, mut pending_state) =
harness.make_block_with_envelope(state, slot).await; harness.make_block_with_envelope(state, slot).await;
let block_root = block_contents.0.canonical_root(); let block_root = block_contents.0.canonical_root();
@@ -5471,7 +5471,7 @@ async fn test_gloas_block_and_envelope_storage() {
.await .await
.unwrap(); .unwrap();
let pending_state_root = pending_state.clone().update_tree_hash_cache().unwrap(); let pending_state_root = pending_state.update_tree_hash_cache().unwrap();
pending_state_roots.push(pending_state_root); pending_state_roots.push(pending_state_root);
// Process the envelope. // Process the envelope.