mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-19 04:42:34 +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
224 lines
8.7 KiB
Rust
224 lines
8.7 KiB
Rust
//! These two `batch_...` functions provide verification of batches of attestations. They provide
|
|
//! significant CPU-time savings by performing batch verification of BLS signatures.
|
|
//!
|
|
//! In each function, attestations are "indexed" (i.e., the `IndexedAttestation` is computed), to
|
|
//! determine if they should progress to signature verification. Then, all attestations which were
|
|
//! successfully indexed have their signatures verified in a batch. If that signature batch fails
|
|
//! then all attestation signatures are verified independently.
|
|
//!
|
|
//! The outcome of each function is a `Vec<Result>` with a one-to-one mapping to the attestations
|
|
//! supplied as input. Each result provides the exact success or failure result of the corresponding
|
|
//! attestation, with no loss of fidelity when compared to individual verification.
|
|
use super::{
|
|
CheckAttestationSignature, Error, IndexedAggregatedAttestation, IndexedUnaggregatedAttestation,
|
|
VerifiedAggregatedAttestation, VerifiedUnaggregatedAttestation,
|
|
};
|
|
use crate::{
|
|
beacon_chain::VALIDATOR_PUBKEY_CACHE_LOCK_TIMEOUT, metrics, BeaconChain, BeaconChainError,
|
|
BeaconChainTypes,
|
|
};
|
|
use bls::verify_signature_sets;
|
|
use state_processing::signature_sets::{
|
|
indexed_attestation_signature_set_from_pubkeys, signed_aggregate_selection_proof_signature_set,
|
|
signed_aggregate_signature_set,
|
|
};
|
|
use std::borrow::Cow;
|
|
use types::*;
|
|
|
|
/// Verify aggregated attestations using batch BLS signature verification.
|
|
///
|
|
/// See module-level docs for more info.
|
|
pub fn batch_verify_aggregated_attestations<'a, T, I>(
|
|
aggregates: I,
|
|
chain: &BeaconChain<T>,
|
|
) -> Result<Vec<Result<VerifiedAggregatedAttestation<'a, T>, Error>>, Error>
|
|
where
|
|
T: BeaconChainTypes,
|
|
I: Iterator<Item = &'a SignedAggregateAndProof<T::EthSpec>> + ExactSizeIterator,
|
|
{
|
|
let mut num_indexed = 0;
|
|
let mut num_failed = 0;
|
|
|
|
// Perform indexing of all attestations, collecting the results.
|
|
let indexing_results = aggregates
|
|
.map(|aggregate| {
|
|
let result = IndexedAggregatedAttestation::verify(aggregate, chain);
|
|
if result.is_ok() {
|
|
num_indexed += 1;
|
|
} else {
|
|
num_failed += 1;
|
|
}
|
|
result
|
|
})
|
|
.collect::<Vec<_>>();
|
|
|
|
// May be set to `No` if batch verification succeeds.
|
|
let mut check_signatures = CheckAttestationSignature::Yes;
|
|
|
|
// Perform batch BLS verification, if any attestation signatures are worth checking.
|
|
if num_indexed > 0 {
|
|
let signature_setup_timer =
|
|
metrics::start_timer(&metrics::ATTESTATION_PROCESSING_BATCH_AGG_SIGNATURE_SETUP_TIMES);
|
|
|
|
let pubkey_cache = chain
|
|
.validator_pubkey_cache
|
|
.try_read_for(VALIDATOR_PUBKEY_CACHE_LOCK_TIMEOUT)
|
|
.ok_or(BeaconChainError::ValidatorPubkeyCacheLockTimeout)?;
|
|
|
|
let mut signature_sets = Vec::with_capacity(num_indexed * 3);
|
|
// Iterate, flattening to get only the `Ok` values.
|
|
for indexed in indexing_results.iter().flatten() {
|
|
let signed_aggregate = &indexed.signed_aggregate;
|
|
let indexed_attestation = &indexed.indexed_attestation;
|
|
let fork = chain
|
|
.spec
|
|
.fork_at_epoch(indexed_attestation.data().target.epoch);
|
|
|
|
signature_sets.push(
|
|
signed_aggregate_selection_proof_signature_set(
|
|
|validator_index| pubkey_cache.get(validator_index).map(Cow::Borrowed),
|
|
signed_aggregate,
|
|
&fork,
|
|
chain.genesis_validators_root,
|
|
&chain.spec,
|
|
)
|
|
.map_err(BeaconChainError::SignatureSetError)?,
|
|
);
|
|
signature_sets.push(
|
|
signed_aggregate_signature_set(
|
|
|validator_index| pubkey_cache.get(validator_index).map(Cow::Borrowed),
|
|
signed_aggregate,
|
|
&fork,
|
|
chain.genesis_validators_root,
|
|
&chain.spec,
|
|
)
|
|
.map_err(BeaconChainError::SignatureSetError)?,
|
|
);
|
|
signature_sets.push(
|
|
indexed_attestation_signature_set_from_pubkeys(
|
|
|validator_index| pubkey_cache.get(validator_index).map(Cow::Borrowed),
|
|
indexed_attestation.signature(),
|
|
indexed_attestation,
|
|
&fork,
|
|
chain.genesis_validators_root,
|
|
&chain.spec,
|
|
)
|
|
.map_err(BeaconChainError::SignatureSetError)?,
|
|
);
|
|
}
|
|
|
|
metrics::stop_timer(signature_setup_timer);
|
|
|
|
let _signature_verification_timer =
|
|
metrics::start_timer(&metrics::ATTESTATION_PROCESSING_BATCH_AGG_SIGNATURE_TIMES);
|
|
|
|
if verify_signature_sets(signature_sets.iter()) {
|
|
// Since all the signatures verified in a batch, there's no reason for them to be
|
|
// checked again later.
|
|
check_signatures = CheckAttestationSignature::No
|
|
}
|
|
}
|
|
|
|
// Complete the attestation verification, potentially verifying all signatures independently.
|
|
let final_results = indexing_results
|
|
.into_iter()
|
|
.map(|result| match result {
|
|
Ok(indexed) => {
|
|
VerifiedAggregatedAttestation::from_indexed(indexed, chain, check_signatures)
|
|
}
|
|
Err(e) => Err(e),
|
|
})
|
|
.collect();
|
|
|
|
Ok(final_results)
|
|
}
|
|
|
|
/// Verify unaggregated attestations using batch BLS signature verification.
|
|
///
|
|
/// See module-level docs for more info.
|
|
pub fn batch_verify_unaggregated_attestations<'a, T, I>(
|
|
attestations: I,
|
|
chain: &BeaconChain<T>,
|
|
) -> Result<Vec<Result<VerifiedUnaggregatedAttestation<'a, T>, Error>>, Error>
|
|
where
|
|
T: BeaconChainTypes,
|
|
I: Iterator<Item = (&'a Attestation<T::EthSpec>, Option<SubnetId>)> + ExactSizeIterator,
|
|
{
|
|
let mut num_partially_verified = 0;
|
|
let mut num_failed = 0;
|
|
|
|
// Perform partial verification of all attestations, collecting the results.
|
|
let partial_results = attestations
|
|
.map(|(attn, subnet_opt)| {
|
|
let result = IndexedUnaggregatedAttestation::verify(attn, subnet_opt, chain);
|
|
if result.is_ok() {
|
|
num_partially_verified += 1;
|
|
} else {
|
|
num_failed += 1;
|
|
}
|
|
result
|
|
})
|
|
.collect::<Vec<_>>();
|
|
|
|
// May be set to `No` if batch verification succeeds.
|
|
let mut check_signatures = CheckAttestationSignature::Yes;
|
|
|
|
// Perform batch BLS verification, if any attestation signatures are worth checking.
|
|
if num_partially_verified > 0 {
|
|
let signature_setup_timer = metrics::start_timer(
|
|
&metrics::ATTESTATION_PROCESSING_BATCH_UNAGG_SIGNATURE_SETUP_TIMES,
|
|
);
|
|
|
|
let pubkey_cache = chain
|
|
.validator_pubkey_cache
|
|
.try_read_for(VALIDATOR_PUBKEY_CACHE_LOCK_TIMEOUT)
|
|
.ok_or(BeaconChainError::ValidatorPubkeyCacheLockTimeout)?;
|
|
|
|
let mut signature_sets = Vec::with_capacity(num_partially_verified);
|
|
|
|
// Iterate, flattening to get only the `Ok` values.
|
|
for partially_verified in partial_results.iter().flatten() {
|
|
let indexed_attestation = &partially_verified.indexed_attestation;
|
|
let fork = chain
|
|
.spec
|
|
.fork_at_epoch(indexed_attestation.data().target.epoch);
|
|
|
|
let signature_set = indexed_attestation_signature_set_from_pubkeys(
|
|
|validator_index| pubkey_cache.get(validator_index).map(Cow::Borrowed),
|
|
indexed_attestation.signature(),
|
|
indexed_attestation,
|
|
&fork,
|
|
chain.genesis_validators_root,
|
|
&chain.spec,
|
|
)
|
|
.map_err(BeaconChainError::SignatureSetError)?;
|
|
|
|
signature_sets.push(signature_set);
|
|
}
|
|
|
|
metrics::stop_timer(signature_setup_timer);
|
|
|
|
let _signature_verification_timer =
|
|
metrics::start_timer(&metrics::ATTESTATION_PROCESSING_BATCH_UNAGG_SIGNATURE_TIMES);
|
|
|
|
if verify_signature_sets(signature_sets.iter()) {
|
|
// Since all the signatures verified in a batch, there's no reason for them to be
|
|
// checked again later.
|
|
check_signatures = CheckAttestationSignature::No
|
|
}
|
|
}
|
|
|
|
// Complete the attestation verification, potentially verifying all signatures independently.
|
|
let final_results = partial_results
|
|
.into_iter()
|
|
.map(|result| match result {
|
|
Ok(partial) => {
|
|
VerifiedUnaggregatedAttestation::from_indexed(partial, chain, check_signatures)
|
|
}
|
|
Err(e) => Err(e),
|
|
})
|
|
.collect();
|
|
|
|
Ok(final_results)
|
|
}
|