mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-03 00:31:50 +00:00
Single-pass epoch processing and optimised block processing (#5279)
* Single-pass epoch processing (#4483, #4573) Co-authored-by: Michael Sproul <michael@sigmaprime.io> * Delete unused epoch processing code (#5170) * Delete unused epoch processing code * Compare total deltas * Remove unnecessary apply_pending * cargo fmt * Remove newline * Use epoch cache in block packing (#5223) * Remove progressive balances mode (#5224) * inline inactivity_penalty_quotient_for_state * drop previous_epoch_total_active_balance * fc lint * spec compliant process_sync_aggregate (#15) * spec compliant process_sync_aggregate * Update consensus/state_processing/src/per_block_processing/altair/sync_committee.rs Co-authored-by: Michael Sproul <micsproul@gmail.com> --------- Co-authored-by: Michael Sproul <micsproul@gmail.com> * Delete the participation cache (#16) * update help * Fix op_pool tests * Fix fork choice tests * Merge remote-tracking branch 'sigp/unstable' into epoch-single-pass * Simplify exit cache (#5280) * Fix clippy on exit cache * Clean up single-pass a bit (#5282) * Address Mark's review of single-pass (#5386) * Merge remote-tracking branch 'origin/unstable' into epoch-single-pass * Address Sean's review comments (#5414) * Address most of Sean's review comments * Simplify total balance cache building * Clean up unused junk * Merge remote-tracking branch 'origin/unstable' into epoch-single-pass * More self-review * Merge remote-tracking branch 'origin/unstable' into epoch-single-pass * Merge branch 'unstable' into epoch-single-pass * Fix imports for beta compiler * Fix tests, probably
This commit is contained in:
@@ -3,7 +3,6 @@ use eth2::lighthouse::{
|
||||
AttestationPerformance, AttestationPerformanceQuery, AttestationPerformanceStatistics,
|
||||
};
|
||||
use state_processing::{
|
||||
per_epoch_processing::altair::participation_cache::Error as ParticipationCacheError,
|
||||
per_epoch_processing::EpochProcessingSummary, BlockReplayError, BlockReplayer,
|
||||
};
|
||||
use std::sync::Arc;
|
||||
@@ -18,7 +17,6 @@ const BLOCK_ROOT_CHUNK_SIZE: usize = 100;
|
||||
enum AttestationPerformanceError {
|
||||
BlockReplay(#[allow(dead_code)] BlockReplayError),
|
||||
BeaconState(#[allow(dead_code)] BeaconStateError),
|
||||
ParticipationCache(#[allow(dead_code)] ParticipationCacheError),
|
||||
UnableToFindValidator(#[allow(dead_code)] usize),
|
||||
}
|
||||
|
||||
@@ -34,12 +32,6 @@ impl From<BeaconStateError> for AttestationPerformanceError {
|
||||
}
|
||||
}
|
||||
|
||||
impl From<ParticipationCacheError> for AttestationPerformanceError {
|
||||
fn from(e: ParticipationCacheError) -> Self {
|
||||
Self::ParticipationCache(e)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_attestation_performance<T: BeaconChainTypes>(
|
||||
target: String,
|
||||
query: AttestationPerformanceQuery,
|
||||
|
||||
@@ -4,11 +4,8 @@ use eth2::{
|
||||
lighthouse::{GlobalValidatorInclusionData, ValidatorInclusionData},
|
||||
types::ValidatorId,
|
||||
};
|
||||
use state_processing::per_epoch_processing::{
|
||||
altair::participation_cache::Error as ParticipationCacheError, process_epoch,
|
||||
EpochProcessingSummary,
|
||||
};
|
||||
use types::{BeaconState, ChainSpec, Epoch, EthSpec};
|
||||
use state_processing::per_epoch_processing::{process_epoch, EpochProcessingSummary};
|
||||
use types::{BeaconState, BeaconStateError, ChainSpec, Epoch, EthSpec};
|
||||
|
||||
/// Returns the state in the last slot of `epoch`.
|
||||
fn end_of_epoch_state<T: BeaconChainTypes>(
|
||||
@@ -35,7 +32,7 @@ fn get_epoch_processing_summary<E: EthSpec>(
|
||||
.map_err(|e| warp_utils::reject::custom_server_error(format!("{:?}", e)))
|
||||
}
|
||||
|
||||
fn convert_cache_error(error: ParticipationCacheError) -> warp::reject::Rejection {
|
||||
fn convert_cache_error(error: BeaconStateError) -> warp::reject::Rejection {
|
||||
warp_utils::reject::custom_server_error(format!("{:?}", error))
|
||||
}
|
||||
|
||||
@@ -50,7 +47,6 @@ pub fn global_validator_inclusion_data<T: BeaconChainTypes>(
|
||||
|
||||
Ok(GlobalValidatorInclusionData {
|
||||
current_epoch_active_gwei: summary.current_epoch_total_active_balance(),
|
||||
previous_epoch_active_gwei: summary.previous_epoch_total_active_balance(),
|
||||
current_epoch_target_attesting_gwei: summary
|
||||
.current_epoch_target_attesting_balance()
|
||||
.map_err(convert_cache_error)?,
|
||||
|
||||
Reference in New Issue
Block a user