gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 04:37:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert botched attestation changes

Browse Source
This commit is contained in:
Michael Sproul
2026-05-19 17:54:06 +10:00
parent 9fe6f3f68c
commit b7920318e7
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
beacon_node/beacon_chain/src/block_verification.rs
View File

@@ -48,9 +48,6 @@
// returned alongside. // returned alongside.
#![allow(clippy::result_large_err)] #![allow(clippy::result_large_err)]
use crate::attestation_verification::{
Error as AttestationVerificationError, obtain_indexed_attestation_and_committees_per_slot,
};
use crate::beacon_snapshot::PreProcessingSnapshot; use crate::beacon_snapshot::PreProcessingSnapshot;
use crate::blob_verification::GossipBlobError; use crate::blob_verification::GossipBlobError;
use crate::block_verification_types::{AsBlock, BlockImportData, LookupBlock, RangeSyncBlock}; use crate::block_verification_types::{AsBlock, BlockImportData, LookupBlock, RangeSyncBlock};
@@ -1656,18 +1653,6 @@ impl<T: BeaconChainTypes> ExecutionPendingBlock<T> {
* free real estate. * free real estate.
*/ */
let current_slot = chain.slot()?; let current_slot = chain.slot()?;
let mut indexed_attestations = vec![];
for attestation in block.message().body().attestations() {
match obtain_indexed_attestation_and_committees_per_slot(chain, attestation) {
Ok((indexed_attestation, _)) => indexed_attestations.push(indexed_attestation),
Err(AttestationVerificationError::BeaconChainError(e)) => {
return Err(BlockError::BeaconChainError(e));
}
// Ignore invalid attestations whilst importing attestations from a block. The
// block might be very old and therefore the attestations useless to fork choice.
Err(_) => {}
}
}
let mut fork_choice = chain.canonical_head.fork_choice_write_lock(); let mut fork_choice = chain.canonical_head.fork_choice_write_lock();
// Register each attester slashing in the block with fork choice. // Register each attester slashing in the block with fork choice.
@@ -1676,10 +1661,14 @@ impl<T: BeaconChainTypes> ExecutionPendingBlock<T> {
} }
// Register each attestation in the block with fork choice. // Register each attestation in the block with fork choice.
for indexed_attestation in indexed_attestations { for (i, attestation) in block.message().body().attestations().enumerate() {
let indexed_attestation = consensus_context
.get_indexed_attestation(&state, attestation)
.map_err(|e| BlockError::PerBlockProcessingError(e.into_with_index(i)))?;
match fork_choice.on_attestation( match fork_choice.on_attestation(
current_slot, current_slot,
indexed_attestation.to_ref(), indexed_attestation,
AttestationFromBlock::True, AttestationFromBlock::True,
&chain.spec, &chain.spec,
) { ) {