Skip to content

Commit

Permalink
Delete unused epoch processing code (sigp#5170)
Browse files Browse the repository at this point in the history 
* Delete unused epoch processing code

* Compare total deltas

* Remove unnecessary apply_pending

* cargo fmt

* Remove newline
  • Loading branch information
@michaelsproul @dapplion
michaelsproul authored and dapplion committed Feb 8, 2024
1 parent 3682028 commit 73bd7a2
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 151 deletions.
81 changes: 2 additions & 79 deletions consensus/state_processing/src/per_epoch_processing/altair/rewards_and_penalties.rs
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
use super::ParticipationCache;
use crate::per_epoch_processing::{
single_pass::{process_epoch_single_pass, SinglePassConfig},
Delta, Error,
};
use safe_arith::SafeArith;
use types::consts::altair::{
PARTICIPATION_FLAG_WEIGHTS, TIMELY_HEAD_FLAG_INDEX, TIMELY_TARGET_FLAG_INDEX,
WEIGHT_DENOMINATOR,
Error,
};
use types::consts::altair::PARTICIPATION_FLAG_WEIGHTS;
use types::{BeaconState, ChainSpec, EthSpec};

/// Apply attester and proposer rewards.
Expand All @@ -28,82 +23,10 @@ pub fn process_rewards_and_penalties_slow<T: EthSpec>(
Ok(())
}

/// Return the deltas for a given flag index by scanning through the participation flags.
///
/// Spec v1.1.0
pub fn get_flag_index_deltas<T: EthSpec>(
deltas: &mut [Delta],
state: &BeaconState<T>,
flag_index: usize,
total_active_balance: u64,
participation_cache: &ParticipationCache,
spec: &ChainSpec,
) -> Result<(), Error> {
let weight = get_flag_weight(flag_index)?;
let unslashed_participating_balance =
participation_cache.previous_epoch_flag_attesting_balance(flag_index)?;
let unslashed_participating_increments =
unslashed_participating_balance.safe_div(spec.effective_balance_increment)?;
let active_increments = total_active_balance.safe_div(spec.effective_balance_increment)?;
let previous_epoch = state.previous_epoch();

for &index in participation_cache.eligible_validator_indices() {
let validator = participation_cache.get_validator(index)?;
let base_reward = validator.base_reward;

let mut delta = Delta::default();

if validator.is_unslashed_participating_index(flag_index)? {
if !state.is_in_inactivity_leak(previous_epoch, spec)? {
let reward_numerator = base_reward
.safe_mul(weight)?
.safe_mul(unslashed_participating_increments)?;
delta.reward(
reward_numerator.safe_div(active_increments.safe_mul(WEIGHT_DENOMINATOR)?)?,
)?;
}
} else if flag_index != TIMELY_HEAD_FLAG_INDEX {
delta.penalize(base_reward.safe_mul(weight)?.safe_div(WEIGHT_DENOMINATOR)?)?;
}
deltas
.get_mut(index)
.ok_or(Error::DeltaOutOfBounds(index))?
.combine(delta)?;
}
Ok(())
}

/// Get the weight for a `flag_index` from the constant list of all weights.
pub fn get_flag_weight(flag_index: usize) -> Result<u64, Error> {
PARTICIPATION_FLAG_WEIGHTS
.get(flag_index)
.copied()
.ok_or(Error::InvalidFlagIndex(flag_index))
}

pub fn get_inactivity_penalty_deltas<T: EthSpec>(
deltas: &mut [Delta],
state: &BeaconState<T>,
participation_cache: &ParticipationCache,
spec: &ChainSpec,
) -> Result<(), Error> {
for &index in participation_cache.eligible_validator_indices() {
let validator = participation_cache.get_validator(index)?;
let mut delta = Delta::default();

if !validator.is_unslashed_participating_index(TIMELY_TARGET_FLAG_INDEX)? {
let penalty_numerator = validator
.effective_balance
.safe_mul(state.get_inactivity_score(index)?)?;
let penalty_denominator = spec
.inactivity_score_bias
.safe_mul(spec.inactivity_penalty_quotient_for_state(state))?;
delta.penalize(penalty_numerator.safe_div(penalty_denominator)?)?;
}
deltas
.get_mut(index)
.ok_or(Error::DeltaOutOfBounds(index))?
.combine(delta)?;
}
Ok(())
}
149 changes: 77 additions & 72 deletions testing/ef_tests/src/cases/rewards.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,14 @@ use ssz::four_byte_option_impl;
use ssz_derive::{Decode, Encode};
use state_processing::{
per_epoch_processing::{
altair::{self, rewards_and_penalties::get_flag_index_deltas, ParticipationCache},
altair,
base::{self, rewards_and_penalties::AttestationDelta, ValidatorStatuses},
Delta,
},
EpochProcessingError,
};
use std::path::{Path, PathBuf};
use types::{
consts::altair::{TIMELY_HEAD_FLAG_INDEX, TIMELY_SOURCE_FLAG_INDEX, TIMELY_TARGET_FLAG_INDEX},
BeaconState, EthSpec, ForkName,
};
use types::{BeaconState, EthSpec, ForkName};

#[derive(Debug, Clone, PartialEq, Decode, Encode, CompareFields)]
pub struct Deltas {
Expand All @@ -41,6 +38,11 @@ pub struct AllDeltas {
inactivity_penalty_deltas: Deltas,
}

#[derive(Debug, Clone, PartialEq, CompareFields)]
pub struct TotalDeltas {
deltas: Vec<i64>,
}

#[derive(Debug, Clone, Default, Deserialize)]
pub struct Metadata {
pub description: Option<String>,
Expand Down Expand Up @@ -110,11 +112,19 @@ impl<E: EthSpec> Case for RewardsTest<E> {
let mut state = self.pre.clone();
let spec = &testing_spec::<E>(fork_name);

let deltas: Result<AllDeltas, EpochProcessingError> = (|| {
// Processing requires the committee caches.
state.build_all_committee_caches(spec)?;
// Single-pass epoch processing doesn't compute rewards in the genesis epoch because that's
// what the spec for `process_rewards_and_penalties` says to do. We skip these tests for now.
//
// See: https://github.com/ethereum/consensus-specs/issues/3593
if fork_name != ForkName::Base && state.current_epoch() == 0 {
return Err(Error::SkippedKnownFailure);
}

if let BeaconState::Base(_) = state {
let deltas: Result<AllDeltas, EpochProcessingError> = (|| {
// Processing requires the committee caches.
state.build_all_committee_caches(spec)?;

if let BeaconState::Base(_) = state {
let mut validator_statuses = ValidatorStatuses::new(&state, spec)?;
validator_statuses.process_attestations(&state)?;

Expand All @@ -125,39 +135,19 @@ impl<E: EthSpec> Case for RewardsTest<E> {
)?;

Ok(convert_all_base_deltas(&deltas))
} else {
let total_active_balance = state.get_total_active_balance()?;
})();
compare_result_detailed(&deltas, &Some(self.deltas.clone()))?;
} else {
let deltas: Result<TotalDeltas, EpochProcessingError> = (|| {
// Processing requires the committee caches.
state.build_all_committee_caches(spec)?;
compute_altair_deltas(&mut state, spec)
})();

let source_deltas = compute_altair_flag_deltas(
&state,
TIMELY_SOURCE_FLAG_INDEX,
total_active_balance,
spec,
)?;
let target_deltas = compute_altair_flag_deltas(
&state,
TIMELY_TARGET_FLAG_INDEX,
total_active_balance,
spec,
)?;
let head_deltas = compute_altair_flag_deltas(
&state,
TIMELY_HEAD_FLAG_INDEX,
total_active_balance,
spec,
)?;
let inactivity_penalty_deltas = compute_altair_inactivity_deltas(&state, spec)?;
Ok(AllDeltas {
source_deltas,
target_deltas,
head_deltas,
inclusion_delay_deltas: None,
inactivity_penalty_deltas,
})
}
})();

compare_result_detailed(&deltas, &Some(self.deltas.clone()))?;
let expected = all_deltas_to_total_deltas(&self.deltas);

compare_result_detailed(&deltas, &Some(expected))?;
};

Ok(())
}
Expand All @@ -182,39 +172,54 @@ fn convert_base_deltas(attestation_deltas: &[AttestationDelta], accessor: Access
Deltas { rewards, penalties }
}

fn compute_altair_flag_deltas<E: EthSpec>(
state: &BeaconState<E>,
flag_index: usize,
total_active_balance: u64,
spec: &ChainSpec,
) -> Result<Deltas, EpochProcessingError> {
let mut deltas = vec![Delta::default(); state.validators().len()];
get_flag_index_deltas(
&mut deltas,
state,
flag_index,
total_active_balance,
&ParticipationCache::new(state, spec).unwrap(),
spec,
)?;
Ok(convert_altair_deltas(deltas))
fn deltas_to_total_deltas(d: &Deltas) -> impl Iterator<Item = i64> + '_ {
d.rewards
.iter()
.zip(&d.penalties)
.map(|(&reward, &penalty)| reward as i64 - penalty as i64)
}

fn compute_altair_inactivity_deltas<E: EthSpec>(
state: &BeaconState<E>,
spec: &ChainSpec,
) -> Result<Deltas, EpochProcessingError> {
let mut deltas = vec![Delta::default(); state.validators().len()];
altair::rewards_and_penalties::get_inactivity_penalty_deltas(
&mut deltas,
state,
&ParticipationCache::new(state, spec).unwrap(),
spec,
)?;
Ok(convert_altair_deltas(deltas))
fn optional_deltas_to_total_deltas(d: &Option<Deltas>, len: usize) -> TotalDeltas {
let deltas = if let Some(d) = d {
deltas_to_total_deltas(d).collect()
} else {
vec![0i64; len]
};
TotalDeltas { deltas }
}

fn convert_altair_deltas(deltas: Vec<Delta>) -> Deltas {
let (rewards, penalties) = deltas.into_iter().map(|d| (d.rewards, d.penalties)).unzip();
Deltas { rewards, penalties }
fn all_deltas_to_total_deltas(d: &AllDeltas) -> TotalDeltas {
let len = d.source_deltas.rewards.len();
let deltas = deltas_to_total_deltas(&d.source_deltas)
.zip(deltas_to_total_deltas(&d.target_deltas))
.zip(deltas_to_total_deltas(&d.head_deltas))
.zip(optional_deltas_to_total_deltas(&d.inclusion_delay_deltas, len).deltas)
.zip(deltas_to_total_deltas(&d.inactivity_penalty_deltas))
.map(
|((((source, target), head), inclusion_delay), inactivity_penalty)| {
source + target + head + inclusion_delay + inactivity_penalty
},
)
.collect::<Vec<i64>>();
TotalDeltas { deltas }
}

fn compute_altair_deltas<E: EthSpec>(
state: &mut BeaconState<E>,
spec: &ChainSpec,
) -> Result<TotalDeltas, EpochProcessingError> {
// Initialise deltas to pre-state balances.
let mut deltas = state
.balances()
.iter()
.map(|x| *x as i64)
.collect::<Vec<_>>();
altair::process_rewards_and_penalties_slow(state, spec)?;

for (delta, new_balance) in deltas.iter_mut().zip(state.balances()) {
let old_balance = *delta;
*delta = *new_balance as i64 - old_balance;
}

Ok(TotalDeltas { deltas })
}

0 comments on commit 73bd7a2

Please sign in to comment.