gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-06-10 01:26:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make proposer_score_boost non-optional in ChainSpec (#9386)

Browse Source 
Co-Authored-By: dapplion <35266934+dapplion@users.noreply.github.com>
This commit is contained in:
Lion - dapplion
2026-06-01 10:43:40 +02:00
committed by GitHub
parent f0aaf65553
commit cf259e7c50
5 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/beacon_chain/src/block_production/mod.rs
View File

@@ -179,14 +179,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
let re_org_max_epochs_since_finalization =
Epoch::new(self.spec.reorg_max_epochs_since_finalization);
if self.spec.proposer_score_boost.is_none() {
warn!(
reason = "this network does not have proposer boost enabled",
"Ignoring proposer re-org configuration"
);
return None;
}
let slot_delay = self
.slot_clock
.seconds_from_current_slot_start()

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))
}

14
consensus/types/src/core/chain_spec.rs
View File

@@ -151,7 +151,7 @@ pub struct ChainSpec {
/*
* Fork choice
*/
pub proposer_score_boost: Option<u64>,
pub proposer_score_boost: u64,
pub reorg_head_weight_threshold: u64,
pub reorg_parent_weight_threshold: u64,
pub reorg_max_epochs_since_finalization: u64,
@@ -1162,7 +1162,7 @@ impl ChainSpec {
/*
* Fork choice
*/
proposer_score_boost: Some(40),
proposer_score_boost: 40,
reorg_head_weight_threshold: 20,
reorg_parent_weight_threshold: 160,
reorg_max_epochs_since_finalization: 2,
@@ -1587,7 +1587,7 @@ impl ChainSpec {
/*
* Fork choice
*/
proposer_score_boost: Some(40),
proposer_score_boost: 40,
reorg_head_weight_threshold: 20,
reorg_parent_weight_threshold: 160,
reorg_max_epochs_since_finalization: 2,
@@ -2640,7 +2640,9 @@ impl Config {
min_per_epoch_churn_limit: spec.min_per_epoch_churn_limit,
max_per_epoch_activation_churn_limit: spec.max_per_epoch_activation_churn_limit,
proposer_score_boost: spec.proposer_score_boost.map(|value| MaybeQuoted { value }),
proposer_score_boost: Some(MaybeQuoted {
value: spec.proposer_score_boost,
}),
reorg_head_weight_threshold: spec.reorg_head_weight_threshold,
reorg_parent_weight_threshold: spec.reorg_parent_weight_threshold,
reorg_max_epochs_since_finalization: spec.reorg_max_epochs_since_finalization,
@@ -2854,7 +2856,9 @@ impl Config {
min_per_epoch_churn_limit,
max_per_epoch_activation_churn_limit,
churn_limit_quotient,
proposer_score_boost: proposer_score_boost.map(|q| q.value),
proposer_score_boost: proposer_score_boost
.map(|q| q.value)
.unwrap_or(chain_spec.proposer_score_boost),
reorg_head_weight_threshold,
reorg_parent_weight_threshold,
reorg_max_epochs_since_finalization,