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: fallback to empty genesis block for external genesis states

Browse Source
This commit is contained in:
Josh King
2026-04-30 15:26:20 +02:00
parent 98d858d942
commit 22a207ffa8
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
beacon_node/beacon_chain/src/builder.rs
View File

@@ -46,8 +46,8 @@ use tracing::{debug, error, info, warn};
use tree_hash::TreeHash; use tree_hash::TreeHash;
use types::data::CustodyIndex; use types::data::CustodyIndex;
use types::{ use types::{
BeaconState, BlobSidecarList, ChainSpec, ColumnIndex, DataColumnSidecarList, Epoch, EthSpec, BeaconBlock, BeaconState, BlobSidecarList, ChainSpec, ColumnIndex, DataColumnSidecarList,
Hash256, SignedBeaconBlock, Slot, Epoch, EthSpec, Hash256, SignedBeaconBlock, Slot,
}; };
/// An empty struct used to "witness" all the `BeaconChainTypes` traits. It has no user-facing /// An empty struct used to "witness" all the `BeaconChainTypes` traits. It has no user-facing
@@ -1177,9 +1177,19 @@ fn make_genesis_block<E: EthSpec>(
genesis_state: &mut BeaconState<E>, genesis_state: &mut BeaconState<E>,
spec: &ChainSpec, spec: &ChainSpec,
) -> Result<SignedBeaconBlock<E>, String> { ) -> Result<SignedBeaconBlock<E>, String> {
// For Gloas, genesis_block() populates the bid in the block body. However, if
// the genesis state was produced by an external tool (e.g. ethereum-genesis-generator),
// its latest_block_header.body_root may correspond to an empty block. In that case,
// use an empty block so the stored block root matches what fork choice derives from
// the state's latest_block_header.
let mut block = genesis_block(genesis_state, spec) let mut block = genesis_block(genesis_state, spec)
.map_err(|e| format!("Error building genesis block: {:?}", e))?; .map_err(|e| format!("Error building genesis block: {:?}", e))?;
let state_body_root = genesis_state.latest_block_header().body_root;
if state_body_root != block.body_root() {
block = BeaconBlock::empty(spec);
}
*block.state_root_mut() = genesis_state *block.state_root_mut() = genesis_state
.update_tree_hash_cache() .update_tree_hash_cache()
.map_err(|e| format!("Error hashing genesis state: {:?}", e))?; .map_err(|e| format!("Error hashing genesis state: {:?}", e))?;