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

fetching from hot_state in case of liveness fault

Browse Source
This commit is contained in:
hopinheimer
2026-04-27 01:04:15 -04:00
parent 98fe0bbda5
commit 774b6dca92
4 changed files with 65 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
beacon_node/beacon_chain/src/observed_attesters.rs
View File

@@ -14,7 +14,7 @@
//! - `ObservedSyncAggregators`: allows filtering sync committee contributions from the same aggregators in
//! the same slot and in the same subcommittee.
use crate::types::consts::{altair::TARGET_AGGREGATORS_PER_SYNC_SUBCOMMITTEE, gloas::PTC_SIZE};
use crate::types::consts::altair::TARGET_AGGREGATORS_PER_SYNC_SUBCOMMITTEE;
use bitvec::vec::BitVec;
use std::collections::{HashMap, HashSet};
use std::hash::Hash;
@@ -43,7 +43,7 @@ pub type ObservedAggregators<E> = AutoPruningEpochContainer<EpochHashSet, E>;
pub type ObservedSyncAggregators<E> =
AutoPruningSlotContainer<SlotSubcommitteeIndex, (), SyncAggregatorSlotHashSet, E>;
pub type ObservedPayloadAttesters<E> =
AutoPruningSlotContainer<Slot, (), PayloadAttesterSlotHashSet, E>;
AutoPruningSlotContainer<Slot, (), PayloadAttesterSlotHashSet<E>, E>;
#[derive(Debug, PartialEq)]
pub enum Error {
@@ -259,20 +259,22 @@ impl Item<()> for SyncAggregatorSlotHashSet {
/// Stores a `HashSet` of validator indices that have sent a payload attestation gossip
/// message during a slot.
pub struct PayloadAttesterSlotHashSet {
pub struct PayloadAttesterSlotHashSet<E> {
set: HashSet<usize>,
phantom: PhantomData<E>,
}
impl Item<()> for PayloadAttesterSlotHashSet {
impl<E: EthSpec> Item<()> for PayloadAttesterSlotHashSet<E> {
fn with_capacity(capacity: usize) -> Self {
Self {
set: HashSet::with_capacity(capacity),
phantom: PhantomData,
}
}
/// Defaults to `PTC_SIZE`, the maximum number of payload attesters per slot.
fn default_capacity() -> usize {
PTC_SIZE as usize
E::ptc_size()
}
fn len(&self) -> usize {

59
beacon_node/beacon_chain/src/payload_attestation_verification/gossip_verified_payload_attestation.rs
View File

@@ -1,4 +1,5 @@
use super::Error;
use crate::beacon_chain::BeaconStore;
use crate::canonical_head::CanonicalHead;
use crate::observed_attesters::ObservedPayloadAttesters;
use crate::validator_pubkey_cache::ValidatorPubkeyCache;
@@ -8,8 +9,12 @@ use educe::Educe;
use parking_lot::RwLock;
use slot_clock::SlotClock;
use state_processing::per_block_processing::signature_sets::indexed_payload_attestation_signature_set;
use state_processing::state_advance::partial_state_advance;
use safe_arith::SafeArith;
use std::borrow::Cow;
use types::{ChainSpec, IndexedPayloadAttestation, PTC, PayloadAttestationMessage, Slot};
use types::{
ChainSpec, EthSpec, IndexedPayloadAttestation, PTC, PayloadAttestationMessage, Slot,
};
pub struct GossipVerificationContext<'a, T: BeaconChainTypes> {
pub slot_clock: &'a T::SlotClock,
@@ -17,6 +22,7 @@ pub struct GossipVerificationContext<'a, T: BeaconChainTypes> {
pub observed_payload_attesters: &'a RwLock<ObservedPayloadAttesters<T::EthSpec>>,
pub canonical_head: &'a CanonicalHead<T>,
pub validator_pubkey_cache: &'a RwLock<ValidatorPubkeyCache<T>>,
pub store: &'a BeaconStore<T>,
}
/// A `PayloadAttestationMessage` that has been verified for propagation on the gossip network.
@@ -71,12 +77,56 @@ impl<T: BeaconChainTypes> VerifiedPayloadAttestationMessage<T> {
return Err(Error::UnknownHeadBlock { beacon_block_root });
}
// Get head state for PTC computation.
// Get head state for PTC computation. If the cached head state is too stale
// (e.g. during liveness failures with many skipped slots), fall back to loading
// a more recent state from the store and advancing it if necessary.
let head = ctx.canonical_head.cached_head();
let head_state = &head.snapshot.beacon_state;
let message_epoch = slot.epoch(T::EthSpec::slots_per_epoch());
let state_epoch = head_state.current_epoch();
// get_ptc can serve epochs in [state_epoch - 1, state_epoch + min_seed_lookahead].
// If the message epoch is beyond that range, the head state is stale.
let advanced_state = if message_epoch
> state_epoch
.safe_add(ctx.spec.min_seed_lookahead)
.map_err(BeaconChainError::from)?
{
let head_block_root = head.head_block_root();
let target_slot = message_epoch.start_slot(T::EthSpec::slots_per_epoch());
let (state_root, mut state) = ctx
.store
.get_advanced_hot_state(
head_block_root,
target_slot,
head.snapshot.beacon_state_root(),
)
.map_err(BeaconChainError::from)?
.ok_or(BeaconChainError::MissingBeaconState(
head.snapshot.beacon_state_root(),
))?;
if state
.current_epoch()
.safe_add(ctx.spec.min_seed_lookahead)
.map_err(BeaconChainError::from)?
< message_epoch
{
partial_state_advance(&mut state, Some(state_root), target_slot, ctx.spec)
.map_err(BeaconChainError::from)?;
}
Some(state)
} else {
None
};
let state = advanced_state.as_ref().unwrap_or(head_state);
// [REJECT] `validator_index` is within `get_ptc(state, data.slot)`.
let ptc = head_state.get_ptc(slot, ctx.spec)?;
let ptc = state.get_ptc(slot, ctx.spec)?;
if !ptc.0.contains(&(validator_index as usize)) {
return Err(Error::NotInPTC {
validator_index,
@@ -96,7 +146,7 @@ impl<T: BeaconChainTypes> VerifiedPayloadAttestationMessage<T> {
// [REJECT] The signature is valid with respect to the `validator_index`.
let pubkey_cache = ctx.validator_pubkey_cache.read();
let signature_set = indexed_payload_attestation_signature_set(
head_state,
state,
|validator_index| pubkey_cache.get(validator_index).map(Cow::Borrowed),
&indexed_payload_attestation.signature,
&indexed_payload_attestation,
@@ -154,6 +204,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
observed_payload_attesters: &self.observed_payload_attesters,
canonical_head: &self.canonical_head,
validator_pubkey_cache: &self.validator_pubkey_cache,
store: &self.store,
}
}

31
beacon_node/beacon_chain/src/payload_attestation_verification/tests.rs
View File

@@ -41,6 +41,7 @@ struct TestContext {
keypairs: Vec<Keypair>,
spec: ChainSpec,
genesis_block_root: Hash256,
store: Arc<store::HotColdDB<E, store::MemoryStore<E>, store::MemoryStore<E>>>,
}
impl TestContext {
@@ -104,6 +105,7 @@ impl TestContext {
keypairs,
spec,
genesis_block_root: block_root,
store,
}
}
@@ -114,6 +116,7 @@ impl TestContext {
observed_payload_attesters: &self.observed_payload_attesters,
canonical_head: &self.canonical_head,
validator_pubkey_cache: &self.validator_pubkey_cache,
store: &self.store,
}
}
@@ -198,34 +201,6 @@ fn past_slot() {
));
}
#[test]
fn prior_payload_attestation_message_known() {
if !fork_name_from_env().is_some_and(|f| f.gloas_enabled()) {
return;
}
let ctx = TestContext::new();
let gossip = ctx.gossip_ctx();
let slot = Slot::new(1);
let ptc_members = ctx.ptc_members(slot);
let validator_index = ptc_members[0] as u64;
ctx.observed_payload_attesters
.write()
.observe_validator(slot, validator_index as usize, ())
.expect("should observe");
let msg = make_payload_attestation(slot, validator_index, ctx.genesis_block_root);
let result = VerifiedPayloadAttestationMessage::new(msg, &gossip);
assert!(
matches!(
result,
Err(PayloadAttestationError::PriorPayloadAttestationMessageKnown { .. })
),
"expected PriorPayloadAttestationMessageKnown, got: {:?}",
result
);
}
#[test]
fn unknown_head_block() {
if !fork_name_from_env().is_some_and(|f| f.gloas_enabled()) {