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

initial straightforward merge changes

Browse Source
This commit is contained in:
Daniel Knopik
2026-04-27 11:36:09 +02:00
parent 2ed5e0f6fb fae7941b2d
commit 3a5492fba7
195 changed files with 12380 additions and 2607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -721,10 +721,9 @@ where
if let Some(execution_layer) = beacon_chain.execution_layer.as_ref() {
// Only send a head update *after* genesis.
if let Ok(current_slot) = beacon_chain.slot() {
let params = beacon_chain
.canonical_head
.cached_head()
.forkchoice_update_parameters();
let cached_head = beacon_chain.canonical_head.cached_head();
let head_payload_status = cached_head.head_payload_status();
let params = cached_head.forkchoice_update_parameters();
if params
.head_hash
.is_some_and(|hash| hash != ExecutionBlockHash::zero())
@@ -737,6 +736,7 @@ where
.update_execution_engine_forkchoice(
current_slot,
params,
head_payload_status,
Default::default(),
)
.await;

14
beacon_node/client/src/notifier.rs
View File

@@ -7,8 +7,8 @@ use execution_layer::{
EngineCapabilities,
http::{
ENGINE_FORKCHOICE_UPDATED_V2, ENGINE_FORKCHOICE_UPDATED_V3, ENGINE_GET_PAYLOAD_V2,
ENGINE_GET_PAYLOAD_V3, ENGINE_GET_PAYLOAD_V4, ENGINE_GET_PAYLOAD_V5, ENGINE_NEW_PAYLOAD_V2,
ENGINE_NEW_PAYLOAD_V3, ENGINE_NEW_PAYLOAD_V4,
ENGINE_GET_PAYLOAD_V3, ENGINE_GET_PAYLOAD_V4, ENGINE_GET_PAYLOAD_V5, ENGINE_GET_PAYLOAD_V6,
ENGINE_NEW_PAYLOAD_V2, ENGINE_NEW_PAYLOAD_V3, ENGINE_NEW_PAYLOAD_V4, ENGINE_NEW_PAYLOAD_V5,
},
};
use lighthouse_network::{NetworkGlobals, types::SyncState};
@@ -374,7 +374,7 @@ pub fn spawn_notifier<T: BeaconChainTypes>(
warn!(
info = "chain not fully verified, \
block and attestation production disabled until execution engine syncs",
execution_block_hash = ?hash,
execution_block_hash = ?hash,
"Head is optimistic"
);
format!("{} (unverified)", hash)
@@ -555,11 +555,11 @@ fn methods_required_for_fork(
}
}
ForkName::Gloas => {
if !capabilities.get_payload_v5 {
missing_methods.push(ENGINE_GET_PAYLOAD_V5);
if !capabilities.get_payload_v6 {
missing_methods.push(ENGINE_GET_PAYLOAD_V6);
}
if !capabilities.new_payload_v4 {
missing_methods.push(ENGINE_NEW_PAYLOAD_V4);
if !capabilities.new_payload_v5 {
missing_methods.push(ENGINE_NEW_PAYLOAD_V5);
}
}
}