mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-06 10:11:44 +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
344 lines
12 KiB
Rust
344 lines
12 KiB
Rust
#![cfg(not(debug_assertions))]
|
|
|
|
use beacon_chain::attestation_simulator::produce_unaggregated_attestation;
|
|
use beacon_chain::block_verification_types::RpcBlock;
|
|
use beacon_chain::test_utils::{AttestationStrategy, BeaconChainHarness, BlockStrategy};
|
|
use beacon_chain::validator_monitor::UNAGGREGATED_ATTESTATION_LAG_SLOTS;
|
|
use beacon_chain::{metrics, StateSkipConfig, WhenSlotSkipped};
|
|
use lazy_static::lazy_static;
|
|
use std::sync::Arc;
|
|
use tree_hash::TreeHash;
|
|
use types::{
|
|
AggregateSignature, Attestation, EthSpec, Keypair, MainnetEthSpec, RelativeEpoch, Slot,
|
|
};
|
|
|
|
pub const VALIDATOR_COUNT: usize = 16;
|
|
|
|
lazy_static! {
|
|
/// A cached set of keys.
|
|
static ref KEYPAIRS: Vec<Keypair> = types::test_utils::generate_deterministic_keypairs(VALIDATOR_COUNT);
|
|
}
|
|
|
|
/// This test builds a chain that is testing the performance of the unaggregated attestations
|
|
/// produced by the attestation simulator service.
|
|
#[tokio::test]
|
|
async fn produces_attestations_from_attestation_simulator_service() {
|
|
// Produce 2 epochs, or 64 blocks
|
|
let num_blocks_produced = MainnetEthSpec::slots_per_epoch() * 2;
|
|
|
|
let harness = BeaconChainHarness::builder(MainnetEthSpec)
|
|
.default_spec()
|
|
.keypairs(KEYPAIRS[..].to_vec())
|
|
.fresh_ephemeral_store()
|
|
.mock_execution_layer()
|
|
.build();
|
|
|
|
let chain = &harness.chain;
|
|
|
|
// Test all valid committee indices and their rewards for all slots in the chain
|
|
// using validator monitor
|
|
for slot in 0..=num_blocks_produced {
|
|
// We do not produce at slot=0, and there's no committe cache available anyway
|
|
if slot > 0 && slot <= num_blocks_produced {
|
|
harness.advance_slot();
|
|
|
|
harness
|
|
.extend_chain(
|
|
1,
|
|
BlockStrategy::OnCanonicalHead,
|
|
AttestationStrategy::AllValidators,
|
|
)
|
|
.await;
|
|
}
|
|
// Set the state to the current slot
|
|
let slot = Slot::from(slot);
|
|
let mut state = chain
|
|
.state_at_slot(slot, StateSkipConfig::WithStateRoots)
|
|
.expect("should get state");
|
|
|
|
// Prebuild the committee cache for the current epoch
|
|
state
|
|
.build_committee_cache(RelativeEpoch::Current, &harness.chain.spec)
|
|
.unwrap();
|
|
|
|
// Produce an unaggragetated attestation
|
|
produce_unaggregated_attestation(chain.clone(), chain.slot().unwrap());
|
|
|
|
// Verify that the ua is stored in validator monitor
|
|
let validator_monitor = chain.validator_monitor.read();
|
|
validator_monitor
|
|
.get_unaggregated_attestation(slot)
|
|
.expect("should get unaggregated attestation");
|
|
}
|
|
|
|
// Compare the prometheus metrics that evaluates the performance of the unaggregated attestations
|
|
let hit_prometheus_metrics = vec![
|
|
metrics::VALIDATOR_MONITOR_ATTESTATION_SIMULATOR_HEAD_ATTESTER_HIT_TOTAL,
|
|
metrics::VALIDATOR_MONITOR_ATTESTATION_SIMULATOR_TARGET_ATTESTER_HIT_TOTAL,
|
|
metrics::VALIDATOR_MONITOR_ATTESTATION_SIMULATOR_SOURCE_ATTESTER_HIT_TOTAL,
|
|
];
|
|
let miss_prometheus_metrics = vec![
|
|
metrics::VALIDATOR_MONITOR_ATTESTATION_SIMULATOR_HEAD_ATTESTER_MISS_TOTAL,
|
|
metrics::VALIDATOR_MONITOR_ATTESTATION_SIMULATOR_TARGET_ATTESTER_MISS_TOTAL,
|
|
metrics::VALIDATOR_MONITOR_ATTESTATION_SIMULATOR_SOURCE_ATTESTER_MISS_TOTAL,
|
|
];
|
|
|
|
// Expected metrics count should only apply to hit metrics as miss metrics are never set, nor can be found
|
|
// when gathering prometheus metrics. If they are found, which should not, it will diff from 0 and fail the test
|
|
let expected_miss_metrics_count = 0;
|
|
let expected_hit_metrics_count =
|
|
num_blocks_produced - UNAGGREGATED_ATTESTATION_LAG_SLOTS as u64;
|
|
lighthouse_metrics::gather().iter().for_each(|mf| {
|
|
if hit_prometheus_metrics.contains(&mf.get_name()) {
|
|
assert_eq!(
|
|
mf.get_metric()[0].get_counter().get_value() as u64,
|
|
expected_hit_metrics_count
|
|
);
|
|
}
|
|
if miss_prometheus_metrics.contains(&mf.get_name()) {
|
|
assert_eq!(
|
|
mf.get_metric()[0].get_counter().get_value() as u64,
|
|
expected_miss_metrics_count
|
|
);
|
|
}
|
|
});
|
|
}
|
|
|
|
/// This test builds a chain that is just long enough to finalize an epoch then it produces an
|
|
/// attestation at each slot from genesis through to three epochs past the head.
|
|
///
|
|
/// It checks the produced attestation against some locally computed values.
|
|
#[tokio::test]
|
|
async fn produces_attestations() {
|
|
let num_blocks_produced = MainnetEthSpec::slots_per_epoch() * 4;
|
|
let additional_slots_tested = MainnetEthSpec::slots_per_epoch() * 3;
|
|
|
|
let harness = BeaconChainHarness::builder(MainnetEthSpec)
|
|
.default_spec()
|
|
.keypairs(KEYPAIRS[..].to_vec())
|
|
.fresh_ephemeral_store()
|
|
.mock_execution_layer()
|
|
.build();
|
|
|
|
let chain = &harness.chain;
|
|
|
|
// Test all valid committee indices for all slots in the chain.
|
|
// for slot in 0..=current_slot.as_u64() + MainnetEthSpec::slots_per_epoch() * 3 {
|
|
for slot in 0..=num_blocks_produced + additional_slots_tested {
|
|
if slot > 0 && slot <= num_blocks_produced {
|
|
harness.advance_slot();
|
|
|
|
harness
|
|
.extend_chain(
|
|
1,
|
|
BlockStrategy::OnCanonicalHead,
|
|
AttestationStrategy::AllValidators,
|
|
)
|
|
.await;
|
|
}
|
|
|
|
let slot = Slot::from(slot);
|
|
let mut state = chain
|
|
.state_at_slot(slot, StateSkipConfig::WithStateRoots)
|
|
.expect("should get state");
|
|
|
|
let block_slot = if slot <= num_blocks_produced {
|
|
slot
|
|
} else {
|
|
Slot::from(num_blocks_produced)
|
|
};
|
|
|
|
let blinded_block = chain
|
|
.block_at_slot(block_slot, WhenSlotSkipped::Prev)
|
|
.expect("should get block")
|
|
.expect("block should not be skipped");
|
|
let block_root = blinded_block.message().tree_hash_root();
|
|
let block = chain
|
|
.store
|
|
.make_full_block(&block_root, blinded_block)
|
|
.unwrap();
|
|
let blobs = chain.get_blobs(&block_root).unwrap();
|
|
|
|
let epoch_boundary_slot = state
|
|
.current_epoch()
|
|
.start_slot(MainnetEthSpec::slots_per_epoch());
|
|
let target_root = if state.slot() == epoch_boundary_slot {
|
|
block_root
|
|
} else {
|
|
*state
|
|
.get_block_root(epoch_boundary_slot)
|
|
.expect("should get target block root")
|
|
};
|
|
|
|
state
|
|
.build_committee_cache(RelativeEpoch::Current, &harness.chain.spec)
|
|
.unwrap();
|
|
let committee_cache = state
|
|
.committee_cache(RelativeEpoch::Current)
|
|
.expect("should get committee_cache");
|
|
|
|
let committee_count = committee_cache.committees_per_slot();
|
|
|
|
for index in 0..committee_count {
|
|
let committee_len = committee_cache
|
|
.get_beacon_committee(slot, index)
|
|
.expect("should get committee for slot")
|
|
.committee
|
|
.len();
|
|
|
|
let attestation = chain
|
|
.produce_unaggregated_attestation(slot, index)
|
|
.expect("should produce attestation");
|
|
|
|
let (aggregation_bits_len, aggregation_bits_zero) = match &attestation {
|
|
Attestation::Base(att) => {
|
|
(att.aggregation_bits.len(), att.aggregation_bits.is_zero())
|
|
}
|
|
Attestation::Electra(att) => {
|
|
(att.aggregation_bits.len(), att.aggregation_bits.is_zero())
|
|
}
|
|
};
|
|
assert_eq!(aggregation_bits_len, committee_len, "bad committee len");
|
|
assert!(aggregation_bits_zero, "some committee bits are set");
|
|
|
|
let data = attestation.data();
|
|
|
|
assert_eq!(
|
|
attestation.signature(),
|
|
&AggregateSignature::infinity(),
|
|
"bad signature"
|
|
);
|
|
assert_eq!(data.index, index, "bad index");
|
|
assert_eq!(data.slot, slot, "bad slot");
|
|
assert_eq!(data.beacon_block_root, block_root, "bad block root");
|
|
assert_eq!(
|
|
data.source,
|
|
state.current_justified_checkpoint(),
|
|
"bad source"
|
|
);
|
|
assert_eq!(
|
|
data.source,
|
|
state.current_justified_checkpoint(),
|
|
"bad source"
|
|
);
|
|
assert_eq!(data.target.epoch, state.current_epoch(), "bad target epoch");
|
|
assert_eq!(data.target.root, target_root, "bad target root");
|
|
|
|
let rpc_block =
|
|
RpcBlock::<MainnetEthSpec>::new(None, Arc::new(block.clone()), Some(blobs.clone()))
|
|
.unwrap();
|
|
let beacon_chain::data_availability_checker::MaybeAvailableBlock::Available(
|
|
available_block,
|
|
) = chain
|
|
.data_availability_checker
|
|
.verify_kzg_for_rpc_block(rpc_block)
|
|
.unwrap()
|
|
else {
|
|
panic!("block should be available")
|
|
};
|
|
|
|
let early_attestation = {
|
|
let proto_block = chain
|
|
.canonical_head
|
|
.fork_choice_read_lock()
|
|
.get_block(&block_root)
|
|
.unwrap();
|
|
chain
|
|
.early_attester_cache
|
|
.add_head_block(
|
|
block_root,
|
|
available_block,
|
|
proto_block,
|
|
&state,
|
|
&chain.spec,
|
|
)
|
|
.unwrap();
|
|
chain
|
|
.early_attester_cache
|
|
.try_attest(slot, index, &chain.spec)
|
|
.unwrap()
|
|
.unwrap()
|
|
};
|
|
|
|
assert_eq!(
|
|
attestation, early_attestation,
|
|
"early attester cache inconsistent"
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Ensures that the early attester cache wont create an attestation to a block in a later slot than
|
|
/// the one requested.
|
|
#[tokio::test]
|
|
async fn early_attester_cache_old_request() {
|
|
let harness = BeaconChainHarness::builder(MainnetEthSpec)
|
|
.default_spec()
|
|
.keypairs(KEYPAIRS[..].to_vec())
|
|
.fresh_ephemeral_store()
|
|
.mock_execution_layer()
|
|
.build();
|
|
|
|
harness.advance_slot();
|
|
|
|
harness
|
|
.extend_chain(
|
|
2,
|
|
BlockStrategy::OnCanonicalHead,
|
|
AttestationStrategy::AllValidators,
|
|
)
|
|
.await;
|
|
|
|
let head = harness.chain.head_snapshot();
|
|
assert_eq!(head.beacon_block.slot(), 2);
|
|
let head_proto_block = harness
|
|
.chain
|
|
.canonical_head
|
|
.fork_choice_read_lock()
|
|
.get_block(&head.beacon_block_root)
|
|
.unwrap();
|
|
|
|
let head_blobs = harness
|
|
.chain
|
|
.get_blobs(&head.beacon_block_root)
|
|
.expect("should get blobs");
|
|
|
|
let rpc_block =
|
|
RpcBlock::<MainnetEthSpec>::new(None, head.beacon_block.clone(), Some(head_blobs)).unwrap();
|
|
let beacon_chain::data_availability_checker::MaybeAvailableBlock::Available(available_block) =
|
|
harness
|
|
.chain
|
|
.data_availability_checker
|
|
.verify_kzg_for_rpc_block(rpc_block)
|
|
.unwrap()
|
|
else {
|
|
panic!("block should be available")
|
|
};
|
|
|
|
harness
|
|
.chain
|
|
.early_attester_cache
|
|
.add_head_block(
|
|
head.beacon_block_root,
|
|
available_block,
|
|
head_proto_block,
|
|
&head.beacon_state,
|
|
&harness.chain.spec,
|
|
)
|
|
.unwrap();
|
|
|
|
let attest_slot = head.beacon_block.slot() - 1;
|
|
let attestation = harness
|
|
.chain
|
|
.produce_unaggregated_attestation(attest_slot, 0)
|
|
.unwrap();
|
|
|
|
assert_eq!(attestation.data().slot, attest_slot);
|
|
let attested_block = harness
|
|
.chain
|
|
.get_blinded_block(&attestation.data().beacon_block_root)
|
|
.unwrap()
|
|
.unwrap();
|
|
assert_eq!(attested_block.slot(), attest_slot);
|
|
}
|