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

Merge branch 'unstable' of github.com:sigp/lighthouse into gloas-fc-proto

Browse Source
This commit is contained in:
hopinheimer
2026-02-26 03:15:04 -05:00
parent e04a8c31ea a1ef265c9e
commit 6d747232f2
74 changed files with 1385 additions and 3042 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,7 @@ use tokio_stream::{
use tracing::{debug, info, warn};
use types::{
BeaconStateError, Checkpoint, ConfigAndPreset, Epoch, EthSpec, ForkName, Hash256,
SignedBlindedBeaconBlock, Slot,
SignedBlindedBeaconBlock,
};
use validator::execution_payload_envelope::get_validator_execution_payload_envelope;
use version::{
@@ -3138,25 +3138,6 @@ pub fn serve<T: BeaconChainTypes>(
},
);
// GET lighthouse/merge_readiness
let get_lighthouse_merge_readiness = warp::path("lighthouse")
.and(warp::path("merge_readiness"))
.and(warp::path::end())
.and(task_spawner_filter.clone())
.and(chain_filter.clone())
.then(
|task_spawner: TaskSpawner<T::EthSpec>, chain: Arc<BeaconChain<T>>| {
task_spawner.spawn_async_with_rejection(Priority::P1, async move {
let current_slot = chain.slot_clock.now_or_genesis().unwrap_or(Slot::new(0));
let merge_readiness = chain.check_bellatrix_readiness(current_slot).await;
Ok::<_, warp::reject::Rejection>(
warp::reply::json(&api_types::GenericResponse::from(merge_readiness))
.into_response(),
)
})
},
);
let get_events = eth_v1
.clone()
.and(warp::path("events"))
@@ -3400,7 +3381,6 @@ pub fn serve<T: BeaconChainTypes>(
.uor(get_beacon_light_client_bootstrap)
.uor(get_beacon_light_client_updates)
.uor(get_lighthouse_block_packing_efficiency)
.uor(get_lighthouse_merge_readiness)
.uor(get_events)
.uor(get_expected_withdrawals)
.uor(lighthouse_log_events.boxed())