mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-10 04:01:51 +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
172 lines
6.8 KiB
Rust
172 lines
6.8 KiB
Rust
use derivative::Derivative;
|
|
use smallvec::{smallvec, SmallVec};
|
|
use state_processing::{SigVerifiedOp, TransformPersist, VerifyOperation, VerifyOperationAt};
|
|
use std::collections::HashSet;
|
|
use std::marker::PhantomData;
|
|
use types::{
|
|
AttesterSlashing, BeaconState, ChainSpec, Epoch, EthSpec, ForkName, ProposerSlashing,
|
|
SignedBlsToExecutionChange, SignedVoluntaryExit, Slot,
|
|
};
|
|
|
|
/// Number of validator indices to store on the stack in `observed_validators`.
|
|
pub const SMALL_VEC_SIZE: usize = 8;
|
|
|
|
/// Stateful tracker for exit/slashing operations seen on the network.
|
|
///
|
|
/// Implements the conditions for gossip verification of exits and slashings from the P2P spec.
|
|
#[derive(Debug, Derivative)]
|
|
#[derivative(Default(bound = "T: ObservableOperation<E>, E: EthSpec"))]
|
|
pub struct ObservedOperations<T: ObservableOperation<E>, E: EthSpec> {
|
|
/// Indices of validators for whom we have already seen an instance of an operation `T`.
|
|
///
|
|
/// For voluntary exits, this is the set of all `signed_voluntary_exit.message.validator_index`.
|
|
/// For proposer slashings, this is the set of all `proposer_slashing.index`.
|
|
/// For attester slashings, this is the set of all validators who would be slashed by
|
|
/// previously seen attester slashings, i.e. those validators in the intersection of
|
|
/// `attestation_1.attester_indices` and `attestation_2.attester_indices`.
|
|
observed_validator_indices: HashSet<u64>,
|
|
/// The name of the current fork. The default will be overwritten on first use.
|
|
#[derivative(Default(value = "ForkName::Base"))]
|
|
current_fork: ForkName,
|
|
_phantom: PhantomData<(T, E)>,
|
|
}
|
|
|
|
/// Was the observed operation new and valid for further processing, or a useless duplicate?
|
|
#[derive(Debug, PartialEq, Eq, Clone)]
|
|
pub enum ObservationOutcome<T: TransformPersist, E: EthSpec> {
|
|
New(SigVerifiedOp<T, E>),
|
|
AlreadyKnown,
|
|
}
|
|
|
|
/// Trait for operations which can be observed using `ObservedOperations`.
|
|
pub trait ObservableOperation<E: EthSpec>: VerifyOperation<E> + Sized {
|
|
/// The set of validator indices involved in this operation.
|
|
///
|
|
/// See the comment on `observed_validator_indices` above for detail.
|
|
fn observed_validators(&self) -> SmallVec<[u64; SMALL_VEC_SIZE]>;
|
|
}
|
|
|
|
impl<E: EthSpec> ObservableOperation<E> for SignedVoluntaryExit {
|
|
fn observed_validators(&self) -> SmallVec<[u64; SMALL_VEC_SIZE]> {
|
|
smallvec![self.message.validator_index]
|
|
}
|
|
}
|
|
|
|
impl<E: EthSpec> ObservableOperation<E> for ProposerSlashing {
|
|
fn observed_validators(&self) -> SmallVec<[u64; SMALL_VEC_SIZE]> {
|
|
smallvec![self.signed_header_1.message.proposer_index]
|
|
}
|
|
}
|
|
|
|
impl<E: EthSpec> ObservableOperation<E> for AttesterSlashing<E> {
|
|
fn observed_validators(&self) -> SmallVec<[u64; SMALL_VEC_SIZE]> {
|
|
let attestation_1_indices = self
|
|
.attestation_1()
|
|
.attesting_indices_iter()
|
|
.copied()
|
|
.collect::<HashSet<u64>>();
|
|
let attestation_2_indices = self
|
|
.attestation_2()
|
|
.attesting_indices_iter()
|
|
.copied()
|
|
.collect::<HashSet<u64>>();
|
|
attestation_1_indices
|
|
.intersection(&attestation_2_indices)
|
|
.copied()
|
|
.collect()
|
|
}
|
|
}
|
|
|
|
impl<E: EthSpec> ObservableOperation<E> for SignedBlsToExecutionChange {
|
|
fn observed_validators(&self) -> SmallVec<[u64; SMALL_VEC_SIZE]> {
|
|
smallvec![self.message.validator_index]
|
|
}
|
|
}
|
|
|
|
impl<T: ObservableOperation<E>, E: EthSpec> ObservedOperations<T, E> {
|
|
pub fn verify_and_observe_parametric<F>(
|
|
&mut self,
|
|
op: T,
|
|
validate: F,
|
|
head_state: &BeaconState<E>,
|
|
spec: &ChainSpec,
|
|
) -> Result<ObservationOutcome<T, E>, T::Error>
|
|
where
|
|
F: Fn(T) -> Result<SigVerifiedOp<T, E>, T::Error>,
|
|
{
|
|
self.reset_at_fork_boundary(head_state.slot(), spec);
|
|
|
|
let observed_validator_indices = &mut self.observed_validator_indices;
|
|
let new_validator_indices = op.observed_validators();
|
|
|
|
// If all of the new validator indices have been previously observed, short-circuit
|
|
// the validation. This implements the uniqueness check part of the spec, which for attester
|
|
// slashings reads:
|
|
//
|
|
// At least one index in the intersection of the attesting indices of each attestation has
|
|
// not yet been seen in any prior attester_slashing.
|
|
if new_validator_indices
|
|
.iter()
|
|
.all(|index| observed_validator_indices.contains(index))
|
|
{
|
|
return Ok(ObservationOutcome::AlreadyKnown);
|
|
}
|
|
|
|
// Validate the op using operation-specific logic (`verify_attester_slashing`, etc).
|
|
let verified_op = validate(op)?;
|
|
|
|
// Add the relevant indices to the set of known indices to prevent processing of duplicates
|
|
// in the future.
|
|
observed_validator_indices.extend(new_validator_indices);
|
|
|
|
Ok(ObservationOutcome::New(verified_op))
|
|
}
|
|
|
|
pub fn verify_and_observe(
|
|
&mut self,
|
|
op: T,
|
|
head_state: &BeaconState<E>,
|
|
spec: &ChainSpec,
|
|
) -> Result<ObservationOutcome<T, E>, T::Error> {
|
|
let validate = |op: T| op.validate(head_state, spec);
|
|
self.verify_and_observe_parametric(op, validate, head_state, spec)
|
|
}
|
|
|
|
/// Reset the cache when crossing a fork boundary.
|
|
///
|
|
/// This prevents an attacker from crafting a self-slashing which is only valid before the fork
|
|
/// (e.g. using the Altair fork domain at a Bellatrix epoch), in order to prevent propagation of
|
|
/// all other slashings due to the duplicate check.
|
|
///
|
|
/// It doesn't matter if this cache gets reset too often, as we reset it on restart anyway and a
|
|
/// false negative just results in propagation of messages which should have been ignored.
|
|
///
|
|
/// In future we could check slashing relevance against the op pool itself, but that would
|
|
/// require indexing the attester slashings in the op pool by validator index.
|
|
fn reset_at_fork_boundary(&mut self, head_slot: Slot, spec: &ChainSpec) {
|
|
let head_fork = spec.fork_name_at_slot::<E>(head_slot);
|
|
if head_fork != self.current_fork {
|
|
self.observed_validator_indices.clear();
|
|
self.current_fork = head_fork;
|
|
}
|
|
}
|
|
|
|
/// Reset the cache. MUST ONLY BE USED IN TESTS.
|
|
pub fn __reset_for_testing_only(&mut self) {
|
|
self.observed_validator_indices.clear();
|
|
}
|
|
}
|
|
|
|
impl<T: ObservableOperation<E> + VerifyOperationAt<E>, E: EthSpec> ObservedOperations<T, E> {
|
|
pub fn verify_and_observe_at(
|
|
&mut self,
|
|
op: T,
|
|
verify_at_epoch: Epoch,
|
|
head_state: &BeaconState<E>,
|
|
spec: &ChainSpec,
|
|
) -> Result<ObservationOutcome<T, E>, T::Error> {
|
|
let validate = |op: T| op.validate_at(head_state, verify_at_epoch, spec);
|
|
self.verify_and_observe_parametric(op, validate, head_state, spec)
|
|
}
|
|
}
|