mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-22 06:14:38 +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
* process withdrawals updates
* cleanup withdrawals processing
* update `process_operations` deposit length check
* add apply_deposit changes
* add execution layer withdrawal request processing
* process deposit receipts
* add consolidation processing
* update process operations function
* exit updates
* clean up
* update slash_validator
* 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)
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* cargo fmt (#5740)
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* fix attestation verification
* Sketch op pool changes
* fix get attesting indices (#5742)
* fix get attesting indices
* better errors
* fix compile
* only get committee index once
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* Ef test fixes (#5753)
* attestation related ef test fixes
* delete commented out stuff
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* 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
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* 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)
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* 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
* don't fail on empty consolidations
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* update committee offset
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* only increment the state deposit index on old deposit flow
* Fix Electra Fork Choice Tests (#5764)
* Fix Electra Fork Choice Tests (#5764)
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* Fix Consolidation Sigs & Withdrawals
* Merge pull request #5766 from ethDreamer/two_fixes
Fix Consolidation Sigs & Withdrawals
* 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
* 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
* Fix Bug In Block Processing with 0x02 Credentials
* 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
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* 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
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* 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
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* fix compile
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* 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
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* 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
* Update per_block_processing.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
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* Merge branch 'electra_attestation_changes' of https://github.com/realbigsean/lighthouse into block-processing-electra
* fork enabled electra
183 lines
7.3 KiB
Rust
183 lines
7.3 KiB
Rust
use super::per_block_processing::{
|
|
errors::BlockProcessingError, process_operations::apply_deposit,
|
|
};
|
|
use crate::common::DepositDataTree;
|
|
use crate::upgrade::{
|
|
upgrade_to_altair, upgrade_to_bellatrix, upgrade_to_capella, upgrade_to_deneb,
|
|
upgrade_to_electra,
|
|
};
|
|
use safe_arith::{ArithError, SafeArith};
|
|
use tree_hash::TreeHash;
|
|
use types::*;
|
|
|
|
/// Initialize a `BeaconState` from genesis data.
|
|
pub fn initialize_beacon_state_from_eth1<E: EthSpec>(
|
|
eth1_block_hash: Hash256,
|
|
eth1_timestamp: u64,
|
|
deposits: Vec<Deposit>,
|
|
execution_payload_header: Option<ExecutionPayloadHeader<E>>,
|
|
spec: &ChainSpec,
|
|
) -> Result<BeaconState<E>, BlockProcessingError> {
|
|
let genesis_time = eth2_genesis_time(eth1_timestamp, spec)?;
|
|
let eth1_data = Eth1Data {
|
|
// Temporary deposit root
|
|
deposit_root: Hash256::zero(),
|
|
deposit_count: deposits.len() as u64,
|
|
block_hash: eth1_block_hash,
|
|
};
|
|
let mut state = BeaconState::new(genesis_time, eth1_data, spec);
|
|
|
|
// Seed RANDAO with Eth1 entropy
|
|
state.fill_randao_mixes_with(eth1_block_hash)?;
|
|
|
|
let mut deposit_tree = DepositDataTree::create(&[], 0, DEPOSIT_TREE_DEPTH);
|
|
|
|
for deposit in deposits.into_iter() {
|
|
deposit_tree
|
|
.push_leaf(deposit.data.tree_hash_root())
|
|
.map_err(BlockProcessingError::MerkleTreeError)?;
|
|
state.eth1_data_mut().deposit_root = deposit_tree.root();
|
|
let Deposit { proof, data } = deposit;
|
|
apply_deposit(&mut state, data, Some(proof), true, spec)?;
|
|
}
|
|
|
|
process_activations(&mut state, spec)?;
|
|
|
|
// To support testnets with Altair enabled from genesis, perform a possible state upgrade here.
|
|
// This must happen *after* deposits and activations are processed or the calculation of sync
|
|
// committees during the upgrade will fail. It's a bit cheeky to do this instead of having
|
|
// separate Altair genesis initialization logic, but it turns out that our
|
|
// use of `BeaconBlock::empty` in `BeaconState::new` is sufficient to correctly initialise
|
|
// the `latest_block_header` as per:
|
|
// https://github.com/ethereum/eth2.0-specs/pull/2323
|
|
if spec
|
|
.altair_fork_epoch
|
|
.map_or(false, |fork_epoch| fork_epoch == E::genesis_epoch())
|
|
{
|
|
upgrade_to_altair(&mut state, spec)?;
|
|
|
|
state.fork_mut().previous_version = spec.altair_fork_version;
|
|
}
|
|
|
|
// Similarly, perform an upgrade to the merge if configured from genesis.
|
|
if spec
|
|
.bellatrix_fork_epoch
|
|
.map_or(false, |fork_epoch| fork_epoch == E::genesis_epoch())
|
|
{
|
|
// this will set state.latest_execution_payload_header = ExecutionPayloadHeaderBellatrix::default()
|
|
upgrade_to_bellatrix(&mut state, spec)?;
|
|
|
|
// Remove intermediate Altair fork from `state.fork`.
|
|
state.fork_mut().previous_version = spec.bellatrix_fork_version;
|
|
|
|
// Override latest execution payload header.
|
|
// See https://github.com/ethereum/consensus-specs/blob/v1.1.0/specs/bellatrix/beacon-chain.md#testing
|
|
if let Some(ExecutionPayloadHeader::Bellatrix(ref header)) = execution_payload_header {
|
|
*state.latest_execution_payload_header_bellatrix_mut()? = header.clone();
|
|
}
|
|
}
|
|
|
|
// Upgrade to capella if configured from genesis
|
|
if spec
|
|
.capella_fork_epoch
|
|
.map_or(false, |fork_epoch| fork_epoch == E::genesis_epoch())
|
|
{
|
|
upgrade_to_capella(&mut state, spec)?;
|
|
|
|
// Remove intermediate Bellatrix fork from `state.fork`.
|
|
state.fork_mut().previous_version = spec.capella_fork_version;
|
|
|
|
// Override latest execution payload header.
|
|
// See https://github.com/ethereum/consensus-specs/blob/dev/specs/capella/beacon-chain.md#testing
|
|
if let Some(ExecutionPayloadHeader::Capella(ref header)) = execution_payload_header {
|
|
*state.latest_execution_payload_header_capella_mut()? = header.clone();
|
|
}
|
|
}
|
|
|
|
// Upgrade to deneb if configured from genesis
|
|
if spec
|
|
.deneb_fork_epoch
|
|
.map_or(false, |fork_epoch| fork_epoch == E::genesis_epoch())
|
|
{
|
|
upgrade_to_deneb(&mut state, spec)?;
|
|
|
|
// Remove intermediate Capella fork from `state.fork`.
|
|
state.fork_mut().previous_version = spec.deneb_fork_version;
|
|
|
|
// Override latest execution payload header.
|
|
// See https://github.com/ethereum/consensus-specs/blob/dev/specs/deneb/beacon-chain.md#testing
|
|
if let Some(ExecutionPayloadHeader::Deneb(ref header)) = execution_payload_header {
|
|
*state.latest_execution_payload_header_deneb_mut()? = header.clone();
|
|
}
|
|
}
|
|
|
|
// Upgrade to electra if configured from genesis.
|
|
if spec
|
|
.electra_fork_epoch
|
|
.map_or(false, |fork_epoch| fork_epoch == E::genesis_epoch())
|
|
{
|
|
upgrade_to_electra(&mut state, spec)?;
|
|
|
|
// Remove intermediate Deneb fork from `state.fork`.
|
|
state.fork_mut().previous_version = spec.electra_fork_version;
|
|
|
|
// Override latest execution payload header.
|
|
// See https://github.com/ethereum/consensus-specs/blob/dev/specs/capella/beacon-chain.md#testing
|
|
if let Some(ExecutionPayloadHeader::Electra(header)) = execution_payload_header {
|
|
*state.latest_execution_payload_header_electra_mut()? = header.clone();
|
|
}
|
|
}
|
|
|
|
// Now that we have our validators, initialize the caches (including the committees)
|
|
state.build_caches(spec)?;
|
|
|
|
// Set genesis validators root for domain separation and chain versioning
|
|
*state.genesis_validators_root_mut() = state.update_validators_tree_hash_cache()?;
|
|
|
|
Ok(state)
|
|
}
|
|
|
|
/// Determine whether a candidate genesis state is suitable for starting the chain.
|
|
pub fn is_valid_genesis_state<E: EthSpec>(state: &BeaconState<E>, spec: &ChainSpec) -> bool {
|
|
state
|
|
.get_active_validator_indices(E::genesis_epoch(), spec)
|
|
.map_or(false, |active_validators| {
|
|
state.genesis_time() >= spec.min_genesis_time
|
|
&& active_validators.len() as u64 >= spec.min_genesis_active_validator_count
|
|
})
|
|
}
|
|
|
|
/// Activate genesis validators, if their balance is acceptable.
|
|
pub fn process_activations<E: EthSpec>(
|
|
state: &mut BeaconState<E>,
|
|
spec: &ChainSpec,
|
|
) -> Result<(), Error> {
|
|
let (validators, balances, _) = state.validators_and_balances_and_progressive_balances_mut();
|
|
let mut validators_iter = validators.iter_cow();
|
|
while let Some((index, validator)) = validators_iter.next_cow() {
|
|
let validator = validator.into_mut()?;
|
|
let balance = balances
|
|
.get(index)
|
|
.copied()
|
|
.ok_or(Error::BalancesOutOfBounds(index))?;
|
|
validator.effective_balance = std::cmp::min(
|
|
balance.safe_sub(balance.safe_rem(spec.effective_balance_increment)?)?,
|
|
spec.max_effective_balance,
|
|
);
|
|
if validator.effective_balance == spec.max_effective_balance {
|
|
validator.activation_eligibility_epoch = E::genesis_epoch();
|
|
validator.activation_epoch = E::genesis_epoch();
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
/// Returns the `state.genesis_time` for the corresponding `eth1_timestamp`.
|
|
///
|
|
/// Does _not_ ensure that the time is greater than `MIN_GENESIS_TIME`.
|
|
///
|
|
/// Spec v0.12.1
|
|
pub fn eth2_genesis_time(eth1_timestamp: u64, spec: &ChainSpec) -> Result<u64, ArithError> {
|
|
eth1_timestamp.safe_add(spec.genesis_delay)
|
|
}
|