gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-06-17 18:58:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sigp/unstable' into gloas-lookup-sync-fixes

Browse Source 
Reconciles unstable's #9383 (Deprecate blob lookup sync) with this PR's
rewritten lookup architecture by removing blob lookup from the new arch:
Deneb/Electra block lookups complete on the block alone (the merged
da_checker makes them available without blobs), and DataDownload::Blobs,
blob_lookup_request, SyncRequestId::SingleBlob, BlockProcessType::SingleBlob,
the process_rpc_blobs lookup cluster, and blob lookup tests are removed.
Range-sync blobs and blob serving are kept.
This commit is contained in:
dapplion
2026-06-01 17:44:16 +02:00
parent 21e0af8239 b781227f1d
commit 5754c38132
22 changed files with 309 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
consensus/proto_array/src/fork_choice_test_definition.rs
View File

@@ -144,7 +144,7 @@ impl ForkChoiceTestDefinition {
pub fn run(self) {
let spec = self.spec.unwrap_or_else(|| {
let mut spec = MainnetEthSpec::default_spec();
spec.proposer_score_boost = Some(50);
spec.proposer_score_boost = 50;
// Legacy test definitions target pre-Gloas behaviour unless explicitly overridden.
spec.gloas_fork_epoch = None;
spec

4
consensus/proto_array/src/fork_choice_test_definition/gloas_payload.rs
View File

@@ -2,7 +2,7 @@ use super::*;
fn gloas_spec() -> ChainSpec {
let mut spec = MainnetEthSpec::default_spec();
spec.proposer_score_boost = Some(50);
spec.proposer_score_boost = 50;
spec.gloas_fork_epoch = Some(Epoch::new(0));
spec
}
@@ -977,7 +977,7 @@ mod tests {
fn gloas_fork_boundary_spec() -> ChainSpec {
let mut spec = MainnetEthSpec::default_spec();
spec.proposer_score_boost = Some(50);
spec.proposer_score_boost = 50;
spec.gloas_fork_epoch = Some(Epoch::new(1));
spec
}

5
consensus/proto_array/src/proto_array.rs
View File

@@ -1861,10 +1861,7 @@ fn get_proposer_score<E: EthSpec>(
justified_balances: &JustifiedBalances,
spec: &ChainSpec,
) -> Result<u64, Error> {
let Some(proposer_score_boost) = spec.proposer_score_boost else {
return Ok(0);
};
calculate_committee_fraction::<E>(justified_balances, proposer_score_boost)
calculate_committee_fraction::<E>(justified_balances, spec.proposer_score_boost)
.ok_or(Error::ProposerBoostOverflow(0))
}