mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-15 10:52:43 +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
* Electra epoch processing
* 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
* Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc
* update committee offset
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* update committee offset
* only increment the state deposit index on old deposit flow
* Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc
* use correct max eb in epoch cache initialization
* drop initiate validator ordering optimization
* fix initiate exit for single pass
* Fix Electra Fork Choice Tests (#5764)
* 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
* Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc
* Fix Consolidation Sigs & Withdrawals
* Merge pull request #5766 from ethDreamer/two_fixes
Fix Consolidation Sigs & Withdrawals
* Merge branches 'block-processing-electra' and 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-epoch-proc
* 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
* 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
* Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc
* 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
* Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc
* 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
* Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc
* fix compile
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra
* Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc
* 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
* Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc
* 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
* Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-epoch-proc
* Update consensus/state_processing/src/per_epoch_processing/single_pass.rs
* Update consensus/state_processing/src/per_epoch_processing/single_pass.rs
* Update consensus/state_processing/src/per_epoch_processing/single_pass.rs
* Update consensus/state_processing/src/per_epoch_processing/single_pass.rs
* Update consensus/state_processing/src/per_epoch_processing/single_pass.rs
173 lines
6.3 KiB
Rust
173 lines
6.3 KiB
Rust
use crate::common::altair::BaseRewardPerIncrement;
|
|
use crate::common::base::SqrtTotalActiveBalance;
|
|
use crate::common::{altair, base};
|
|
use safe_arith::SafeArith;
|
|
use types::epoch_cache::{EpochCache, EpochCacheError, EpochCacheKey};
|
|
use types::{ActivationQueue, BeaconState, ChainSpec, EthSpec, ForkName, Hash256};
|
|
|
|
/// Precursor to an `EpochCache`.
|
|
pub struct PreEpochCache {
|
|
epoch_key: EpochCacheKey,
|
|
effective_balances: Vec<u64>,
|
|
total_active_balance: u64,
|
|
}
|
|
|
|
impl PreEpochCache {
|
|
pub fn new_for_next_epoch<E: EthSpec>(
|
|
state: &mut BeaconState<E>,
|
|
) -> Result<Self, EpochCacheError> {
|
|
// The decision block root for the next epoch is the latest block root from this epoch.
|
|
let latest_block_header = state.latest_block_header();
|
|
|
|
let decision_block_root = if !latest_block_header.state_root.is_zero() {
|
|
latest_block_header.canonical_root()
|
|
} else {
|
|
// State root should already have been filled in by `process_slot`, except in the case
|
|
// of a `partial_state_advance`. Once we have tree-states this can be an error, and
|
|
// `self` can be immutable.
|
|
let state_root = state.update_tree_hash_cache()?;
|
|
state.get_latest_block_root(state_root)
|
|
};
|
|
|
|
let epoch_key = EpochCacheKey {
|
|
epoch: state.next_epoch()?,
|
|
decision_block_root,
|
|
};
|
|
|
|
Ok(Self {
|
|
epoch_key,
|
|
effective_balances: Vec::with_capacity(state.validators().len()),
|
|
total_active_balance: 0,
|
|
})
|
|
}
|
|
|
|
pub fn update_effective_balance(
|
|
&mut self,
|
|
validator_index: usize,
|
|
effective_balance: u64,
|
|
is_active_next_epoch: bool,
|
|
) -> Result<(), EpochCacheError> {
|
|
if validator_index == self.effective_balances.len() {
|
|
self.effective_balances.push(effective_balance);
|
|
if is_active_next_epoch {
|
|
self.total_active_balance
|
|
.safe_add_assign(effective_balance)?;
|
|
}
|
|
|
|
Ok(())
|
|
} else if let Some(existing_balance) = self.effective_balances.get_mut(validator_index) {
|
|
// Update total active balance for a late change in effective balance. This happens when
|
|
// processing consolidations.
|
|
if is_active_next_epoch {
|
|
self.total_active_balance
|
|
.safe_add_assign(effective_balance)?;
|
|
self.total_active_balance
|
|
.safe_sub_assign(*existing_balance)?;
|
|
}
|
|
*existing_balance = effective_balance;
|
|
Ok(())
|
|
} else {
|
|
Err(EpochCacheError::ValidatorIndexOutOfBounds { validator_index })
|
|
}
|
|
}
|
|
|
|
pub fn get_total_active_balance(&self) -> u64 {
|
|
self.total_active_balance
|
|
}
|
|
|
|
pub fn into_epoch_cache(
|
|
self,
|
|
activation_queue: ActivationQueue,
|
|
spec: &ChainSpec,
|
|
) -> Result<EpochCache, EpochCacheError> {
|
|
let epoch = self.epoch_key.epoch;
|
|
let total_active_balance = self.total_active_balance;
|
|
let sqrt_total_active_balance = SqrtTotalActiveBalance::new(total_active_balance);
|
|
let base_reward_per_increment = BaseRewardPerIncrement::new(total_active_balance, spec)?;
|
|
|
|
let effective_balance_increment = spec.effective_balance_increment;
|
|
let max_effective_balance =
|
|
spec.max_effective_balance_for_fork(spec.fork_name_at_epoch(epoch));
|
|
let max_effective_balance_eth =
|
|
max_effective_balance.safe_div(effective_balance_increment)?;
|
|
|
|
let mut base_rewards = Vec::with_capacity(max_effective_balance_eth.safe_add(1)? as usize);
|
|
|
|
for effective_balance_eth in 0..=max_effective_balance_eth {
|
|
let effective_balance = effective_balance_eth.safe_mul(effective_balance_increment)?;
|
|
let base_reward = if spec.fork_name_at_epoch(epoch) == ForkName::Base {
|
|
base::get_base_reward(effective_balance, sqrt_total_active_balance, spec)?
|
|
} else {
|
|
altair::get_base_reward(effective_balance, base_reward_per_increment, spec)?
|
|
};
|
|
base_rewards.push(base_reward);
|
|
}
|
|
|
|
Ok(EpochCache::new(
|
|
self.epoch_key,
|
|
self.effective_balances,
|
|
base_rewards,
|
|
activation_queue,
|
|
spec,
|
|
))
|
|
}
|
|
}
|
|
|
|
pub fn is_epoch_cache_initialized<E: EthSpec>(
|
|
state: &BeaconState<E>,
|
|
) -> Result<bool, EpochCacheError> {
|
|
let current_epoch = state.current_epoch();
|
|
let epoch_cache: &EpochCache = state.epoch_cache();
|
|
let decision_block_root = state
|
|
.proposer_shuffling_decision_root(Hash256::zero())
|
|
.map_err(EpochCacheError::BeaconState)?;
|
|
|
|
Ok(epoch_cache
|
|
.check_validity(current_epoch, decision_block_root)
|
|
.is_ok())
|
|
}
|
|
|
|
pub fn initialize_epoch_cache<E: EthSpec>(
|
|
state: &mut BeaconState<E>,
|
|
spec: &ChainSpec,
|
|
) -> Result<(), EpochCacheError> {
|
|
if is_epoch_cache_initialized(state)? {
|
|
// `EpochCache` has already been initialized and is valid, no need to initialize.
|
|
return Ok(());
|
|
}
|
|
|
|
let current_epoch = state.current_epoch();
|
|
let next_epoch = state.next_epoch().map_err(EpochCacheError::BeaconState)?;
|
|
let decision_block_root = state
|
|
.proposer_shuffling_decision_root(Hash256::zero())
|
|
.map_err(EpochCacheError::BeaconState)?;
|
|
|
|
state.build_total_active_balance_cache(spec)?;
|
|
let total_active_balance = state.get_total_active_balance_at_epoch(current_epoch)?;
|
|
|
|
// Collect effective balances and compute activation queue.
|
|
let mut effective_balances = Vec::with_capacity(state.validators().len());
|
|
let mut activation_queue = ActivationQueue::default();
|
|
|
|
for (index, validator) in state.validators().iter().enumerate() {
|
|
effective_balances.push(validator.effective_balance);
|
|
|
|
// Add to speculative activation queue.
|
|
activation_queue
|
|
.add_if_could_be_eligible_for_activation(index, validator, next_epoch, spec);
|
|
}
|
|
|
|
// Compute base rewards.
|
|
let pre_epoch_cache = PreEpochCache {
|
|
epoch_key: EpochCacheKey {
|
|
epoch: current_epoch,
|
|
decision_block_root,
|
|
},
|
|
effective_balances,
|
|
total_active_balance,
|
|
};
|
|
*state.epoch_cache_mut() = pre_epoch_cache.into_epoch_cache(activation_queue, spec)?;
|
|
|
|
Ok(())
|
|
}
|