merge conflicts

This commit is contained in:
Eitan Seri-Levi
2026-04-28 01:06:02 +02:00
parent e8ec40a233
commit d86fd5bb6f
4 changed files with 6 additions and 9 deletions

View File

@@ -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))
}