mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-03 00:31:50 +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
113 lines
4.2 KiB
Rust
113 lines
4.2 KiB
Rust
use crate::{AttesterRecord, Config, IndexedAttesterRecord};
|
|
use parking_lot::Mutex;
|
|
use std::collections::BTreeMap;
|
|
use std::sync::{Arc, Weak};
|
|
use types::{EthSpec, Hash256, IndexedAttestation};
|
|
|
|
/// Staging area for attestations received from the network.
|
|
///
|
|
/// Attestations are not grouped by validator index at this stage so that they can be easily
|
|
/// filtered for timeliness.
|
|
#[derive(Debug, Default)]
|
|
pub struct AttestationQueue<E: EthSpec> {
|
|
pub queue: Mutex<SimpleBatch<E>>,
|
|
}
|
|
|
|
pub type SimpleBatch<E> = Vec<Arc<IndexedAttesterRecord<E>>>;
|
|
|
|
/// Attestations dequeued from the queue and in preparation for processing.
|
|
///
|
|
/// This struct is responsible for mapping validator indices to attestations and performing
|
|
/// de-duplication to remove redundant attestations.
|
|
#[derive(Debug, Default)]
|
|
pub struct AttestationBatch<E: EthSpec> {
|
|
/// Map from (`validator_index`, `attestation_data_hash`) to indexed attester record.
|
|
///
|
|
/// This mapping is used for de-duplication, see:
|
|
///
|
|
/// https://github.com/sigp/lighthouse/issues/2112
|
|
pub attesters: BTreeMap<(u64, Hash256), Arc<IndexedAttesterRecord<E>>>,
|
|
|
|
/// Vec of all unique indexed attester records.
|
|
///
|
|
/// The weak references account for the fact that some records might prove useless after
|
|
/// de-duplication.
|
|
pub attestations: Vec<Weak<IndexedAttesterRecord<E>>>,
|
|
}
|
|
|
|
/// Attestations grouped by validator index range.
|
|
#[derive(Debug)]
|
|
pub struct GroupedAttestations<E: EthSpec> {
|
|
pub subqueues: Vec<SimpleBatch<E>>,
|
|
}
|
|
|
|
impl<E: EthSpec> AttestationBatch<E> {
|
|
/// Add an attestation to the queue.
|
|
pub fn queue(&mut self, indexed_record: Arc<IndexedAttesterRecord<E>>) {
|
|
self.attestations.push(Arc::downgrade(&indexed_record));
|
|
|
|
let attestation_data_hash = indexed_record.record.attestation_data_hash;
|
|
|
|
for &validator_index in indexed_record.indexed.attesting_indices_iter() {
|
|
self.attesters
|
|
.entry((validator_index, attestation_data_hash))
|
|
.and_modify(|existing_entry| {
|
|
// If the new record is for the same attestation data but with more bits set
|
|
// then replace the existing record so that we might avoid storing the
|
|
// smaller indexed attestation. Single-bit attestations will usually be removed
|
|
// completely by this process, and aggregates will only be retained if they
|
|
// are not redundant with respect to a larger aggregate seen in the same batch.
|
|
if existing_entry.indexed.attesting_indices_len()
|
|
< indexed_record.indexed.attesting_indices_len()
|
|
{
|
|
*existing_entry = indexed_record.clone();
|
|
}
|
|
})
|
|
.or_insert_with(|| indexed_record.clone());
|
|
}
|
|
}
|
|
|
|
/// Group the attestations by validator chunk index.
|
|
pub fn group_by_validator_chunk_index(self, config: &Config) -> GroupedAttestations<E> {
|
|
let mut grouped_attestations = GroupedAttestations { subqueues: vec![] };
|
|
|
|
for ((validator_index, _), indexed_record) in self.attesters {
|
|
let subqueue_id = config.validator_chunk_index(validator_index);
|
|
|
|
if subqueue_id >= grouped_attestations.subqueues.len() {
|
|
grouped_attestations
|
|
.subqueues
|
|
.resize_with(subqueue_id + 1, SimpleBatch::default);
|
|
}
|
|
|
|
grouped_attestations.subqueues[subqueue_id].push(indexed_record);
|
|
}
|
|
|
|
grouped_attestations
|
|
}
|
|
}
|
|
|
|
impl<E: EthSpec> AttestationQueue<E> {
|
|
pub fn queue(&self, attestation: IndexedAttestation<E>) {
|
|
let attester_record = AttesterRecord::from(attestation.clone());
|
|
let indexed_record = IndexedAttesterRecord::new(attestation, attester_record);
|
|
self.queue.lock().push(indexed_record);
|
|
}
|
|
|
|
pub fn dequeue(&self) -> SimpleBatch<E> {
|
|
std::mem::take(&mut self.queue.lock())
|
|
}
|
|
|
|
pub fn requeue(&self, batch: SimpleBatch<E>) {
|
|
self.queue.lock().extend(batch);
|
|
}
|
|
|
|
pub fn len(&self) -> usize {
|
|
self.queue.lock().len()
|
|
}
|
|
|
|
pub fn is_empty(&self) -> bool {
|
|
self.len() == 0
|
|
}
|
|
}
|