mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-20 21:34:46 +00:00
## Issue Addressed Resolves: https://github.com/sigp/lighthouse/issues/2741 Includes: https://github.com/sigp/lighthouse/pull/2853 so that we can get ssz static tests passing here on v1.1.6. If we want to merge that first, we can make this diff slightly smaller ## Proposed Changes - Changes the `justified_epoch` and `finalized_epoch` in the `ProtoArrayNode` each to an `Option<Checkpoint>`. The `Option` is necessary only for the migration, so not ideal. But does allow us to add a default logic to `None` on these fields during the database migration. - Adds a database migration from a legacy fork choice struct to the new one, search for all necessary block roots in fork choice by iterating through blocks in the db. - updates related to https://github.com/ethereum/consensus-specs/pull/2727 - We will have to update the persisted forkchoice to make sure the justified checkpoint stored is correct according to the updated fork choice logic. This boils down to setting the forkchoice store's justified checkpoint to the justified checkpoint of the block that advanced the finalized checkpoint to the current one. - AFAICT there's no migration steps necessary for the update to allow applying attestations from prior blocks, but would appreciate confirmation on that - I updated the consensus spec tests to v1.1.6 here, but they will fail until we also implement the proposer score boost updates. I confirmed that the previously failing scenario `new_finalized_slot_is_justified_checkpoint_ancestor` will now pass after the boost updates, but haven't confirmed _all_ tests will pass because I just quickly stubbed out the proposer boost test scenario formatting. - This PR now also includes proposer boosting https://github.com/ethereum/consensus-specs/pull/2730 ## Additional Info I realized checking justified and finalized roots in fork choice makes it more likely that we trigger this bug: https://github.com/ethereum/consensus-specs/pull/2727 It's possible the combination of justified checkpoint and finalized checkpoint in the forkchoice store is different from in any block in fork choice. So when trying to startup our store's justified checkpoint seems invalid to the rest of fork choice (but it should be valid). When this happens we get an `InvalidBestNode` error and fail to start up. So I'm including that bugfix in this branch. Todo: - [x] Fix fork choice tests - [x] Self review - [x] Add fix for https://github.com/ethereum/consensus-specs/pull/2727 - [x] Rebase onto Kintusgi - [x] Fix `num_active_validators` calculation as @michaelsproul pointed out - [x] Clean up db migrations Co-authored-by: realbigsean <seananderson33@gmail.com>
116 lines
4.5 KiB
Rust
116 lines
4.5 KiB
Rust
#[macro_use]
|
|
extern crate lazy_static;
|
|
|
|
mod manual_slot_clock;
|
|
mod metrics;
|
|
mod system_time_slot_clock;
|
|
|
|
use std::time::Duration;
|
|
|
|
pub use crate::manual_slot_clock::ManualSlotClock;
|
|
pub use crate::manual_slot_clock::ManualSlotClock as TestingSlotClock;
|
|
pub use crate::system_time_slot_clock::SystemTimeSlotClock;
|
|
pub use metrics::scrape_for_metrics;
|
|
use types::consts::merge::INTERVALS_PER_SLOT;
|
|
pub use types::Slot;
|
|
|
|
/// A clock that reports the current slot.
|
|
///
|
|
/// The clock is not required to be monotonically increasing and may go backwards.
|
|
pub trait SlotClock: Send + Sync + Sized + Clone {
|
|
/// Creates a new slot clock where the first slot is `genesis_slot`, genesis occurred
|
|
/// `genesis_duration` after the `UNIX_EPOCH` and each slot is `slot_duration` apart.
|
|
fn new(genesis_slot: Slot, genesis_duration: Duration, slot_duration: Duration) -> Self;
|
|
|
|
/// Returns the slot at this present time.
|
|
fn now(&self) -> Option<Slot>;
|
|
|
|
/// Returns the slot at this present time if genesis has happened. Otherwise, returns the
|
|
/// genesis slot. Returns `None` if there is an error reading the clock.
|
|
fn now_or_genesis(&self) -> Option<Slot> {
|
|
if self.is_prior_to_genesis()? {
|
|
Some(self.genesis_slot())
|
|
} else {
|
|
self.now()
|
|
}
|
|
}
|
|
|
|
/// Indicates if the current time is prior to genesis time.
|
|
///
|
|
/// Returns `None` if the system clock cannot be read.
|
|
fn is_prior_to_genesis(&self) -> Option<bool>;
|
|
|
|
/// Returns the present time as a duration since the UNIX epoch.
|
|
///
|
|
/// Returns `None` if the present time is before the UNIX epoch (unlikely).
|
|
fn now_duration(&self) -> Option<Duration>;
|
|
|
|
/// Returns the slot of the given duration since the UNIX epoch.
|
|
fn slot_of(&self, now: Duration) -> Option<Slot>;
|
|
|
|
/// Returns the duration between slots
|
|
fn slot_duration(&self) -> Duration;
|
|
|
|
/// Returns the duration from now until `slot`.
|
|
fn duration_to_slot(&self, slot: Slot) -> Option<Duration>;
|
|
|
|
/// Returns the duration until the next slot.
|
|
fn duration_to_next_slot(&self) -> Option<Duration>;
|
|
|
|
/// Returns the duration until the first slot of the next epoch.
|
|
fn duration_to_next_epoch(&self, slots_per_epoch: u64) -> Option<Duration>;
|
|
|
|
/// Returns the start time of the slot, as a duration since `UNIX_EPOCH`.
|
|
fn start_of(&self, slot: Slot) -> Option<Duration>;
|
|
|
|
/// Returns the first slot to be returned at the genesis time.
|
|
fn genesis_slot(&self) -> Slot;
|
|
|
|
/// Returns the `Duration` from `UNIX_EPOCH` to the genesis time.
|
|
fn genesis_duration(&self) -> Duration;
|
|
|
|
/// Returns the slot if the internal clock were advanced by `duration`.
|
|
fn now_with_future_tolerance(&self, tolerance: Duration) -> Option<Slot> {
|
|
self.slot_of(self.now_duration()?.checked_add(tolerance)?)
|
|
}
|
|
|
|
/// Returns the slot if the internal clock were reversed by `duration`.
|
|
fn now_with_past_tolerance(&self, tolerance: Duration) -> Option<Slot> {
|
|
self.slot_of(self.now_duration()?.checked_sub(tolerance)?)
|
|
.or_else(|| Some(self.genesis_slot()))
|
|
}
|
|
|
|
/// Returns the delay between the start of the slot and when unaggregated attestations should be
|
|
/// produced.
|
|
fn unagg_attestation_production_delay(&self) -> Duration {
|
|
self.slot_duration() / INTERVALS_PER_SLOT as u32
|
|
}
|
|
|
|
/// Returns the delay between the start of the slot and when sync committee messages should be
|
|
/// produced.
|
|
fn sync_committee_message_production_delay(&self) -> Duration {
|
|
self.slot_duration() / INTERVALS_PER_SLOT as u32
|
|
}
|
|
|
|
/// Returns the delay between the start of the slot and when aggregated attestations should be
|
|
/// produced.
|
|
fn agg_attestation_production_delay(&self) -> Duration {
|
|
self.slot_duration() * 2 / INTERVALS_PER_SLOT as u32
|
|
}
|
|
|
|
/// Returns the delay between the start of the slot and when partially aggregated `SyncCommitteeContribution` should be
|
|
/// produced.
|
|
fn sync_committee_contribution_production_delay(&self) -> Duration {
|
|
self.slot_duration() * 2 / INTERVALS_PER_SLOT as u32
|
|
}
|
|
|
|
/// Returns the `Duration` since the start of the current `Slot`. Useful in determining whether to apply proposer boosts.
|
|
fn seconds_from_current_slot_start(&self, seconds_per_slot: u64) -> Option<Duration> {
|
|
self.now_duration()
|
|
.and_then(|now| now.checked_sub(self.genesis_duration()))
|
|
.map(|duration_into_slot| {
|
|
Duration::from_secs(duration_into_slot.as_secs() % seconds_per_slot)
|
|
})
|
|
}
|
|
}
|