cerc-io/lighthouse
15
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix UnableToReadSlot at startup (#3066)

Browse Source 
## Issue Addressed

Don't send an fcU message at startup if it's pre-genesis. The startup fcU message is not critical, not required by the spec, so it's fine to avoid it for networks that start post-Bellatrix fork.
This commit is contained in:
Paul Hauner 2022-03-09 23:04:19 +00:00
parent 65eaf01942
commit c475499dfe
1 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
beacon_node/client/src/builder.rs
View File

@ -662,56 +662,56 @@ where
); );
if let Some(execution_layer) = beacon_chain.execution_layer.as_ref() { if let Some(execution_layer) = beacon_chain.execution_layer.as_ref() {
let head = beacon_chain // Only send a head update *after* genesis.
.head_info() if let Ok(current_slot) = beacon_chain.slot() {
.map_err(|e| format!("Unable to read beacon chain head: {:?}", e))?; let head = beacon_chain
.head_info()
.map_err(|e| format!("Unable to read beacon chain head: {:?}", e))?;
let current_slot = beacon_chain // Issue the head to the execution engine on startup. This ensures it can start
.slot() // syncing.
.map_err(|e| format!("Unable to read slot: {:?}", e))?; if head
.execution_payload_block_hash
.map_or(false, |h| h != ExecutionBlockHash::zero())
{
// Spawn a new task using the "async" fork choice update method, rather than
// using the "blocking" method.
//
// Using the blocking method may cause a panic if this code is run inside an
// async context.
let inner_chain = beacon_chain.clone();
runtime_context.executor.spawn(
async move {
let result = inner_chain
.update_execution_engine_forkchoice_async(current_slot)
.await;
// Issue the head to the execution engine on startup. This ensures it can start // No need to exit early if setting the head fails. It will be set again if/when the
// syncing. // node comes online.
if head if let Err(e) = result {
.execution_payload_block_hash warn!(
.map_or(false, |h| h != ExecutionBlockHash::zero()) log,
{ "Failed to update head on execution engines";
// Spawn a new task using the "async" fork choice update method, rather than "error" => ?e
// using the "blocking" method. );
// }
// Using the blocking method may cause a panic if this code is run inside an },
// async context. "el_fork_choice_update",
let inner_chain = beacon_chain.clone(); );
runtime_context.executor.spawn( }
async move {
let result = inner_chain
.update_execution_engine_forkchoice_async(current_slot)
.await;
// No need to exit early if setting the head fails. It will be set again if/when the // Spawn a routine that tracks the status of the execution engines.
// node comes online. execution_layer.spawn_watchdog_routine(beacon_chain.slot_clock.clone());
if let Err(e) = result {
warn!( // Spawn a routine that removes expired proposer preparations.
log, execution_layer
"Failed to update head on execution engines"; .spawn_clean_proposer_preparation_routine::<TSlotClock, TEthSpec>(
"error" => ?e beacon_chain.slot_clock.clone(),
); );
}
}, // Spawns a routine that polls the `exchange_transition_configuration` endpoint.
"el_fork_choice_update", execution_layer.spawn_transition_configuration_poll(beacon_chain.spec.clone());
);
} }
// Spawn a routine that tracks the status of the execution engines.
execution_layer.spawn_watchdog_routine(beacon_chain.slot_clock.clone());
// Spawn a routine that removes expired proposer preparations.
execution_layer.spawn_clean_proposer_preparation_routine::<TSlotClock, TEthSpec>(
beacon_chain.slot_clock.clone(),
);
// Spawns a routine that polls the `exchange_transition_configuration` endpoint.
execution_layer.spawn_transition_configuration_poll(beacon_chain.spec.clone());
} }
start_proposer_prep_service(runtime_context.executor.clone(), beacon_chain.clone()); start_proposer_prep_service(runtime_context.executor.clone(), beacon_chain.clone());