resolve merge conflicts between untstable and release-v7.0.0

This commit is contained in:
Eitan Seri-Levi
2025-03-23 11:09:02 -06:00
63 changed files with 1422 additions and 242 deletions

View File

@@ -264,6 +264,11 @@ pub(crate) async fn verify_light_client_updates<E: EthSpec>(
let slot = Slot::new(slot);
let previous_slot = slot - 1;
let sync_committee_period = slot
.epoch(E::slots_per_epoch())
.sync_committee_period(&E::default_spec())
.unwrap();
let previous_slot_block = client
.get_beacon_blocks::<E>(BlockId::Slot(previous_slot))
.await
@@ -329,6 +334,20 @@ pub(crate) async fn verify_light_client_updates<E: EthSpec>(
"Existing finality update too old: signature slot {signature_slot}, current slot {slot:?}"
));
}
let light_client_updates = client
.get_beacon_light_client_updates::<E>(sync_committee_period, 1)
.await
.map_err(|e| format!("Error while getting light client update: {:?}", e))?
.ok_or(format!("Light client update not found {slot:?}"))?;
// Ensure we're only storing a single light client update for the given sync committee period
if light_client_updates.len() != 1 {
return Err(format!(
"{} light client updates was returned when only one was expected.",
light_client_updates.len()
));
}
}
Ok(())