gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-25 08:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'unstable' into gloas-fc-proto

Browse Source
This commit is contained in:
hopinheimer
2026-03-16 01:42:53 -04:00
committed by GitHub
parent d89e7f78bb 4eecca6da7
commit cf9e463981
31 changed files with 646 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
beacon_node/http_api/src/lib.rs
View File

@@ -1801,8 +1801,16 @@ pub fn serve<T: BeaconChainTypes>(
let execution_optimistic =
chain.is_optimistic_or_invalid_head().unwrap_or_default();
Ok(api_types::GenericResponse::from(attestation_rewards))
.map(|resp| resp.add_execution_optimistic(execution_optimistic))
let finalized = epoch + 2
<= chain
.canonical_head
.cached_head()
.finalized_checkpoint()
.epoch;
Ok(api_types::GenericResponse::from(attestation_rewards)).map(|resp| {
resp.add_execution_optimistic_finalized(execution_optimistic, finalized)
})
})
},
);

16
beacon_node/http_api/src/publish_blocks.rs
View File

@@ -2,7 +2,7 @@ use crate::metrics;
use std::future::Future;
use beacon_chain::blob_verification::{GossipBlobError, GossipVerifiedBlob};
use beacon_chain::block_verification_types::{AsBlock, RpcBlock};
use beacon_chain::block_verification_types::{AsBlock, LookupBlock};
use beacon_chain::data_column_verification::GossipVerifiedDataColumn;
use beacon_chain::validator_monitor::{get_block_delay_ms, timestamp_now};
use beacon_chain::{
@@ -311,19 +311,11 @@ pub async fn publish_block<T: BeaconChainTypes, B: IntoGossipVerifiedBlock<T>>(
slot = %block.slot(),
"Block previously seen"
);
let Ok(rpc_block) = RpcBlock::new(
block.clone(),
None,
&chain.data_availability_checker,
chain.spec.clone(),
) else {
return Err(warp_utils::reject::custom_bad_request(
"Unable to construct rpc block".to_string(),
));
};
// try to reprocess as a lookup (single) block and let sync take care of missing components
let lookup_block = LookupBlock::new(block.clone());
let import_result = Box::pin(chain.process_block(
block_root,
rpc_block,
lookup_block,
NotifyExecutionLayer::Yes,
BlockImportSource::HttpApi,
publish_fn,