mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-15 10:52:43 +00:00
* Attestation superstruct changes for EIP 7549 (#5644)
* update
* experiment
* superstruct changes
* revert
* superstruct changes
* fix tests
* indexed attestation
* indexed attestation superstruct
* updated TODOs
* `superstruct` the `AttesterSlashing` (#5636)
* `superstruct` Attester Fork Variants
* Push a little further
* Deal with Encode / Decode of AttesterSlashing
* not so sure about this..
* Stop Encode/Decode Bounds from Propagating Out
* Tons of Changes..
* More Conversions to AttestationRef
* Add AsReference trait (#15)
* Add AsReference trait
* Fix some snafus
* Got it Compiling! :D
* Got Tests Building
* Get beacon chain tests compiling
---------
Co-authored-by: Michael Sproul <micsproul@gmail.com>
* Merge remote-tracking branch 'upstream/unstable' into electra_attestation_changes
* Make EF Tests Fork-Agnostic (#5713)
* Finish EF Test Fork Agnostic (#5714)
* Superstruct `AggregateAndProof` (#5715)
* Upgrade `superstruct` to `0.8.0`
* superstruct `AggregateAndProof`
* Merge remote-tracking branch 'sigp/unstable' into electra_attestation_changes
* cargo fmt
* Merge pull request #5726 from realbigsean/electra_attestation_changes
Merge unstable into Electra attestation changes
* EIP7549 `get_attestation_indices` (#5657)
* get attesting indices electra impl
* fmt
* get tests to pass
* fmt
* fix some beacon chain tests
* fmt
* fix slasher test
* fmt got me again
* fix more tests
* fix tests
* Some small changes (#5739)
* cargo fmt (#5740)
* Sketch op pool changes
* fix get attesting indices (#5742)
* fix get attesting indices
* better errors
* fix compile
* only get committee index once
* Ef test fixes (#5753)
* attestation related ef test fixes
* delete commented out stuff
* Fix Aggregation Pool for Electra (#5754)
* Fix Aggregation Pool for Electra
* Remove Outdated Interface
* fix ssz (#5755)
* Get `electra_op_pool` up to date (#5756)
* fix get attesting indices (#5742)
* fix get attesting indices
* better errors
* fix compile
* only get committee index once
* Ef test fixes (#5753)
* attestation related ef test fixes
* delete commented out stuff
* Fix Aggregation Pool for Electra (#5754)
* Fix Aggregation Pool for Electra
* Remove Outdated Interface
* fix ssz (#5755)
---------
Co-authored-by: realbigsean <sean@sigmaprime.io>
* Revert "Get `electra_op_pool` up to date (#5756)" (#5757)
This reverts commit ab9e58aa3d.
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into electra_op_pool
* Compute on chain aggregate impl (#5752)
* add compute_on_chain_agg impl to op pool changes
* fmt
* get op pool tests to pass
* update the naive agg pool interface (#5760)
* Fix bugs in cross-committee aggregation
* Add comment to max cover optimisation
* Fix assert
* Merge pull request #5749 from sigp/electra_op_pool
Optimise Electra op pool aggregation
* update committee offset
* Fix Electra Fork Choice Tests (#5764)
* Subscribe to the correct subnets for electra attestations (#5782)
* subscribe to the correct att subnets for electra
* subscribe to the correct att subnets for electra
* cargo fmt
* fix slashing handling
* Merge remote-tracking branch 'upstream/unstable'
* Send unagg attestation based on fork
* Publish all aggregates
* just one more check bro plz..
* Merge pull request #5832 from ethDreamer/electra_attestation_changes_merge_unstable
Merge `unstable` into `electra_attestation_changes`
* Merge pull request #5835 from realbigsean/fix-validator-logic
Fix validator logic
* Merge pull request #5816 from realbigsean/electra-attestation-slashing-handling
Electra slashing handling
* Electra attestation changes rm decode impl (#5856)
* Remove Crappy Decode impl for Attestation
* Remove Inefficient Attestation Decode impl
* Implement Schema Upgrade / Downgrade
* Update beacon_node/beacon_chain/src/schema_change/migration_schema_v20.rs
Co-authored-by: Michael Sproul <micsproul@gmail.com>
---------
Co-authored-by: Michael Sproul <micsproul@gmail.com>
* Fix failing attestation tests and misc electra attestation cleanup (#5810)
* - get attestation related beacon chain tests to pass
- observed attestations are now keyed off of data + committee index
- rename op pool attestationref to compactattestationref
- remove unwraps in agg pool and use options instead
- cherry pick some changes from ef-tests-electra
* cargo fmt
* fix failing test
* Revert dockerfile changes
* make committee_index return option
* function args shouldnt be a ref to attestation ref
* fmt
* fix dup imports
---------
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
* fix some todos (#5817)
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* add consolidations to merkle calc for inclusion proof
* Remove Duplicate KZG Commitment Merkle Proof Code (#5874)
* Remove Duplicate KZG Commitment Merkle Proof Code
* s/tree_lists/fields/
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* fix compile
* Fix slasher tests (#5906)
* Fix electra tests
* Add electra attestations to double vote tests
* Update superstruct to 0.8
* Merge remote-tracking branch 'origin/unstable' into electra_attestation_changes
* Small cleanup in slasher tests
* Clean up Electra observed aggregates (#5929)
* Use consistent key in observed_attestations
* Remove unwraps from observed aggregates
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* De-dup attestation constructor logic
* Remove unwraps in Attestation construction
* Dedup match_attestation_data
* Remove outdated TODO
* Use ForkName Ord in fork-choice tests
* Use ForkName Ord in BeaconBlockBody
* Make to_electra not fallible
* Remove TestRandom impl for IndexedAttestation
* Remove IndexedAttestation faulty Decode impl
* Drop TestRandom impl
* Add PendingAttestationInElectra
* Indexed att on disk (#35)
* indexed att on disk
* fix lints
* Update slasher/src/migrate.rs
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
---------
Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com>
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
* add electra fork enabled fn to ForkName impl (#36)
* add electra fork enabled fn to ForkName impl
* remove inadvertent file
* Update common/eth2/src/types.rs
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
* Dedup attestation constructor logic in attester cache
* Use if let Ok for committee_bits
* Dedup Attestation constructor code
* Diff reduction in tests
* Fix beacon_chain tests
* Diff reduction
* Use Ord for ForkName in pubsub
* Resolve into_attestation_and_indices todo
* Remove stale TODO
* Fix beacon_chain tests
* Test spec invariant
* Use electra_enabled in pubsub
* Remove get_indexed_attestation_from_signed_aggregate
* Use ok_or instead of if let else
* committees are sorted
* remove dup method `get_indexed_attestation_from_committees`
* Merge pull request #5940 from dapplion/electra_attestation_changes_lionreview
Electra attestations #5712 review
* update default persisted op pool deserialization
* ensure aggregate and proof uses serde untagged on ref
* Fork aware ssz static attestation tests
* Electra attestation changes from Lions review (#5971)
* dedup/cleanup and remove unneeded hashset use
* remove irrelevant TODOs
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* Electra attestation changes sean review (#5972)
* instantiate empty bitlist in unreachable code
* clean up error conversion
* fork enabled bool cleanup
* remove a couple todos
* return bools instead of options in `aggregate` and use the result
* delete commented out code
* use map macros in simple transformations
* remove signers_disjoint_from
* get ef tests compiling
* get ef tests compiling
* update intentionally excluded files
* Avoid changing slasher schema for Electra
* Delete slasher schema v4
* Fix clippy
* Fix compilation of beacon_chain tests
* Update database.rs
* Add electra lightclient types
* Update slasher/src/database.rs
* fix imports
* Merge pull request #5980 from dapplion/electra-lightclient
Add electra lightclient types
* Merge pull request #5975 from michaelsproul/electra-slasher-no-migration
Avoid changing slasher schema for Electra
* Update beacon_node/beacon_chain/src/attestation_verification.rs
* Update beacon_node/beacon_chain/src/attestation_verification.rs
191 lines
6.6 KiB
Rust
191 lines
6.6 KiB
Rust
use crate::common::{attesting_indices_base, attesting_indices_electra};
|
|
use crate::per_block_processing::errors::{AttestationInvalid, BlockOperationError};
|
|
use crate::EpochCacheError;
|
|
use std::collections::{hash_map::Entry, HashMap};
|
|
use tree_hash::TreeHash;
|
|
use types::{
|
|
AbstractExecPayload, AttestationRef, BeaconState, BeaconStateError, ChainSpec, Epoch, EthSpec,
|
|
Hash256, IndexedAttestation, IndexedAttestationRef, SignedBeaconBlock, Slot,
|
|
};
|
|
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub struct ConsensusContext<E: EthSpec> {
|
|
/// Slot to act as an identifier/safeguard
|
|
pub slot: Slot,
|
|
/// Previous epoch of the `slot` precomputed for optimization purpose.
|
|
pub previous_epoch: Epoch,
|
|
/// Current epoch of the `slot` precomputed for optimization purpose.
|
|
pub current_epoch: Epoch,
|
|
/// Proposer index of the block at `slot`.
|
|
pub proposer_index: Option<u64>,
|
|
/// Block root of the block at `slot`.
|
|
pub current_block_root: Option<Hash256>,
|
|
/// Cache of indexed attestations constructed during block processing.
|
|
pub indexed_attestations: HashMap<Hash256, IndexedAttestation<E>>,
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub enum ContextError {
|
|
BeaconState(BeaconStateError),
|
|
EpochCache(EpochCacheError),
|
|
SlotMismatch { slot: Slot, expected: Slot },
|
|
EpochMismatch { epoch: Epoch, expected: Epoch },
|
|
}
|
|
|
|
impl From<BeaconStateError> for ContextError {
|
|
fn from(e: BeaconStateError) -> Self {
|
|
Self::BeaconState(e)
|
|
}
|
|
}
|
|
|
|
impl From<EpochCacheError> for ContextError {
|
|
fn from(e: EpochCacheError) -> Self {
|
|
Self::EpochCache(e)
|
|
}
|
|
}
|
|
|
|
impl<E: EthSpec> ConsensusContext<E> {
|
|
pub fn new(slot: Slot) -> Self {
|
|
let current_epoch = slot.epoch(E::slots_per_epoch());
|
|
let previous_epoch = current_epoch.saturating_sub(1u64);
|
|
Self {
|
|
slot,
|
|
previous_epoch,
|
|
current_epoch,
|
|
proposer_index: None,
|
|
current_block_root: None,
|
|
indexed_attestations: HashMap::new(),
|
|
}
|
|
}
|
|
|
|
#[must_use]
|
|
pub fn set_proposer_index(mut self, proposer_index: u64) -> Self {
|
|
self.proposer_index = Some(proposer_index);
|
|
self
|
|
}
|
|
|
|
/// Strict method for fetching the proposer index.
|
|
///
|
|
/// Gets the proposer index for `self.slot` while ensuring that it matches `state.slot()`. This
|
|
/// method should be used in block processing and almost everywhere the proposer index is
|
|
/// required. If the slot check is too restrictive, see `get_proposer_index_from_epoch_state`.
|
|
pub fn get_proposer_index(
|
|
&mut self,
|
|
state: &BeaconState<E>,
|
|
spec: &ChainSpec,
|
|
) -> Result<u64, ContextError> {
|
|
self.check_slot(state.slot())?;
|
|
self.get_proposer_index_no_checks(state, spec)
|
|
}
|
|
|
|
/// More liberal method for fetching the proposer index.
|
|
///
|
|
/// Fetches the proposer index for `self.slot` but does not require the state to be from an
|
|
/// exactly matching slot (merely a matching epoch). This is useful in batch verification where
|
|
/// we want to extract the proposer index from a single state for every slot in the epoch.
|
|
pub fn get_proposer_index_from_epoch_state(
|
|
&mut self,
|
|
state: &BeaconState<E>,
|
|
spec: &ChainSpec,
|
|
) -> Result<u64, ContextError> {
|
|
self.check_epoch(state.current_epoch())?;
|
|
self.get_proposer_index_no_checks(state, spec)
|
|
}
|
|
|
|
fn get_proposer_index_no_checks(
|
|
&mut self,
|
|
state: &BeaconState<E>,
|
|
spec: &ChainSpec,
|
|
) -> Result<u64, ContextError> {
|
|
if let Some(proposer_index) = self.proposer_index {
|
|
return Ok(proposer_index);
|
|
}
|
|
|
|
let proposer_index = state.get_beacon_proposer_index(self.slot, spec)? as u64;
|
|
self.proposer_index = Some(proposer_index);
|
|
Ok(proposer_index)
|
|
}
|
|
|
|
#[must_use]
|
|
pub fn set_current_block_root(mut self, block_root: Hash256) -> Self {
|
|
self.current_block_root = Some(block_root);
|
|
self
|
|
}
|
|
|
|
pub fn get_current_block_root<Payload: AbstractExecPayload<E>>(
|
|
&mut self,
|
|
block: &SignedBeaconBlock<E, Payload>,
|
|
) -> Result<Hash256, ContextError> {
|
|
self.check_slot(block.slot())?;
|
|
|
|
if let Some(current_block_root) = self.current_block_root {
|
|
return Ok(current_block_root);
|
|
}
|
|
|
|
let current_block_root = block.message().tree_hash_root();
|
|
self.current_block_root = Some(current_block_root);
|
|
Ok(current_block_root)
|
|
}
|
|
|
|
fn check_slot(&self, slot: Slot) -> Result<(), ContextError> {
|
|
if slot == self.slot {
|
|
Ok(())
|
|
} else {
|
|
Err(ContextError::SlotMismatch {
|
|
slot,
|
|
expected: self.slot,
|
|
})
|
|
}
|
|
}
|
|
|
|
fn check_epoch(&self, epoch: Epoch) -> Result<(), ContextError> {
|
|
let expected = self.slot.epoch(E::slots_per_epoch());
|
|
if epoch == expected {
|
|
Ok(())
|
|
} else {
|
|
Err(ContextError::EpochMismatch { epoch, expected })
|
|
}
|
|
}
|
|
|
|
pub fn get_indexed_attestation<'a>(
|
|
&'a mut self,
|
|
state: &BeaconState<E>,
|
|
attestation: AttestationRef<'a, E>,
|
|
) -> Result<IndexedAttestationRef<E>, BlockOperationError<AttestationInvalid>> {
|
|
let key = attestation.tree_hash_root();
|
|
match attestation {
|
|
AttestationRef::Base(attn) => match self.indexed_attestations.entry(key) {
|
|
Entry::Occupied(occupied) => Ok(occupied.into_mut()),
|
|
Entry::Vacant(vacant) => {
|
|
let committee = state.get_beacon_committee(attn.data.slot, attn.data.index)?;
|
|
let indexed_attestation =
|
|
attesting_indices_base::get_indexed_attestation(committee.committee, attn)?;
|
|
Ok(vacant.insert(indexed_attestation))
|
|
}
|
|
},
|
|
AttestationRef::Electra(attn) => match self.indexed_attestations.entry(key) {
|
|
Entry::Occupied(occupied) => Ok(occupied.into_mut()),
|
|
Entry::Vacant(vacant) => {
|
|
let indexed_attestation =
|
|
attesting_indices_electra::get_indexed_attestation_from_state(state, attn)?;
|
|
Ok(vacant.insert(indexed_attestation))
|
|
}
|
|
},
|
|
}
|
|
.map(|indexed_attestation| (*indexed_attestation).to_ref())
|
|
}
|
|
|
|
pub fn num_cached_indexed_attestations(&self) -> usize {
|
|
self.indexed_attestations.len()
|
|
}
|
|
|
|
#[must_use]
|
|
pub fn set_indexed_attestations(
|
|
mut self,
|
|
attestations: HashMap<Hash256, IndexedAttestation<E>>,
|
|
) -> Self {
|
|
self.indexed_attestations = attestations;
|
|
self
|
|
}
|
|
}
|