mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-10 20:22:02 +00:00
In-memory tree states (#5533)
* Consensus changes
* EF tests
* lcli
* common and watch
* account manager
* cargo
* fork choice
* promise cache
* beacon chain
* interop genesis
* http api
* lighthouse
* op pool
* beacon chain misc
* parallel state cache
* store
* fix issues in store
* IT COMPILES
* Remove some unnecessary module qualification
* Revert Arced pubkey optimization (#5536)
* Merge remote-tracking branch 'origin/unstable' into tree-states-memory
* Fix caching, rebasing and some tests
* Remove unused deps
* Merge remote-tracking branch 'origin/unstable' into tree-states-memory
* Small cleanups
* Revert shuffling cache/promise cache changes
* Fix state advance bugs
* Fix shuffling tests
* Remove some resolved FIXMEs
* Remove StateProcessingStrategy
* Optimise withdrawals calculation
* Don't reorg if state cache is missed
* Remove inconsistent state func
* Fix beta compiler
* Rebase early, rebase often
* Fix state caching behaviour
* Update to milhouse release
* Fix on-disk consensus context format
* Merge remote-tracking branch 'origin/unstable' into tree-states-memory
* Squashed commit of the following:
commit 3a16649023
Author: Michael Sproul <michael@sigmaprime.io>
Date: Thu Apr 18 14:26:09 2024 +1000
Fix on-disk consensus context format
* Keep indexed attestations, thanks Sean
* Merge branch 'on-disk-consensus-context' into tree-states-memory
* Merge branch 'unstable' into tree-states-memory
* Address half of Sean's review
* More simplifications from Sean's review
* Cache state after get_advanced_hot_state
This commit is contained in:
@@ -12,6 +12,7 @@ use types::{
|
||||
NUM_FLAG_INDICES, PARTICIPATION_FLAG_WEIGHTS, TIMELY_HEAD_FLAG_INDEX,
|
||||
TIMELY_TARGET_FLAG_INDEX, WEIGHT_DENOMINATOR,
|
||||
},
|
||||
milhouse::Cow,
|
||||
ActivationQueue, BeaconState, BeaconStateError, ChainSpec, Epoch, EthSpec, ExitCache, ForkName,
|
||||
ParticipationFlags, ProgressiveBalancesCache, RelativeEpoch, Unsigned, Validator,
|
||||
};
|
||||
@@ -173,9 +174,9 @@ pub fn process_epoch_single_pass<E: EthSpec>(
|
||||
let effective_balances_ctxt = &EffectiveBalancesContext::new(spec)?;
|
||||
|
||||
// Iterate over the validators and related fields in one pass.
|
||||
let mut validators_iter = validators.iter_mut();
|
||||
let mut balances_iter = balances.iter_mut();
|
||||
let mut inactivity_scores_iter = inactivity_scores.iter_mut();
|
||||
let mut validators_iter = validators.iter_cow();
|
||||
let mut balances_iter = balances.iter_cow();
|
||||
let mut inactivity_scores_iter = inactivity_scores.iter_cow();
|
||||
|
||||
// Values computed for the next epoch transition.
|
||||
let mut next_epoch_total_active_balance = 0;
|
||||
@@ -186,14 +187,14 @@ pub fn process_epoch_single_pass<E: EthSpec>(
|
||||
previous_epoch_participation.iter(),
|
||||
current_epoch_participation.iter(),
|
||||
) {
|
||||
let validator = validators_iter
|
||||
.next()
|
||||
let (_, mut validator) = validators_iter
|
||||
.next_cow()
|
||||
.ok_or(BeaconStateError::UnknownValidator(index))?;
|
||||
let balance = balances_iter
|
||||
.next()
|
||||
let (_, mut balance) = balances_iter
|
||||
.next_cow()
|
||||
.ok_or(BeaconStateError::UnknownValidator(index))?;
|
||||
let inactivity_score = inactivity_scores_iter
|
||||
.next()
|
||||
let (_, mut inactivity_score) = inactivity_scores_iter
|
||||
.next_cow()
|
||||
.ok_or(BeaconStateError::UnknownValidator(index))?;
|
||||
|
||||
let is_active_current_epoch = validator.is_active_at(current_epoch);
|
||||
@@ -223,7 +224,7 @@ pub fn process_epoch_single_pass<E: EthSpec>(
|
||||
// `process_inactivity_updates`
|
||||
if conf.inactivity_updates {
|
||||
process_single_inactivity_update(
|
||||
inactivity_score,
|
||||
&mut inactivity_score,
|
||||
validator_info,
|
||||
state_ctxt,
|
||||
spec,
|
||||
@@ -233,8 +234,8 @@ pub fn process_epoch_single_pass<E: EthSpec>(
|
||||
// `process_rewards_and_penalties`
|
||||
if conf.rewards_and_penalties {
|
||||
process_single_reward_and_penalty(
|
||||
balance,
|
||||
inactivity_score,
|
||||
&mut balance,
|
||||
&inactivity_score,
|
||||
validator_info,
|
||||
rewards_ctxt,
|
||||
state_ctxt,
|
||||
@@ -246,7 +247,7 @@ pub fn process_epoch_single_pass<E: EthSpec>(
|
||||
// `process_registry_updates`
|
||||
if conf.registry_updates {
|
||||
process_single_registry_update(
|
||||
validator,
|
||||
&mut validator,
|
||||
validator_info,
|
||||
exit_cache,
|
||||
activation_queue,
|
||||
@@ -258,14 +259,14 @@ pub fn process_epoch_single_pass<E: EthSpec>(
|
||||
|
||||
// `process_slashings`
|
||||
if conf.slashings {
|
||||
process_single_slashing(balance, validator, slashings_ctxt, state_ctxt, spec)?;
|
||||
process_single_slashing(&mut balance, &validator, slashings_ctxt, state_ctxt, spec)?;
|
||||
}
|
||||
|
||||
// `process_effective_balance_updates`
|
||||
if conf.effective_balance_updates {
|
||||
process_single_effective_balance_update(
|
||||
*balance,
|
||||
validator,
|
||||
&mut validator,
|
||||
validator_info,
|
||||
&mut next_epoch_total_active_balance,
|
||||
&mut next_epoch_cache,
|
||||
@@ -290,7 +291,7 @@ pub fn process_epoch_single_pass<E: EthSpec>(
|
||||
}
|
||||
|
||||
fn process_single_inactivity_update(
|
||||
inactivity_score: &mut u64,
|
||||
inactivity_score: &mut Cow<u64>,
|
||||
validator_info: &ValidatorInfo,
|
||||
state_ctxt: &StateContext,
|
||||
spec: &ChainSpec,
|
||||
@@ -303,25 +304,27 @@ fn process_single_inactivity_update(
|
||||
if validator_info.is_unslashed_participating_index(TIMELY_TARGET_FLAG_INDEX)? {
|
||||
// Avoid mutating when the inactivity score is 0 and can't go any lower -- the common
|
||||
// case.
|
||||
if *inactivity_score == 0 {
|
||||
if **inactivity_score == 0 {
|
||||
return Ok(());
|
||||
}
|
||||
inactivity_score.safe_sub_assign(1)?;
|
||||
inactivity_score.make_mut()?.safe_sub_assign(1)?;
|
||||
} else {
|
||||
inactivity_score.safe_add_assign(spec.inactivity_score_bias)?;
|
||||
inactivity_score
|
||||
.make_mut()?
|
||||
.safe_add_assign(spec.inactivity_score_bias)?;
|
||||
}
|
||||
|
||||
// Decrease the score of all validators for forgiveness when not during a leak
|
||||
if !state_ctxt.is_in_inactivity_leak {
|
||||
let deduction = min(spec.inactivity_score_recovery_rate, *inactivity_score);
|
||||
inactivity_score.safe_sub_assign(deduction)?;
|
||||
let deduction = min(spec.inactivity_score_recovery_rate, **inactivity_score);
|
||||
inactivity_score.make_mut()?.safe_sub_assign(deduction)?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn process_single_reward_and_penalty(
|
||||
balance: &mut u64,
|
||||
balance: &mut Cow<u64>,
|
||||
inactivity_score: &u64,
|
||||
validator_info: &ValidatorInfo,
|
||||
rewards_ctxt: &RewardsAndPenaltiesContext,
|
||||
@@ -351,6 +354,7 @@ fn process_single_reward_and_penalty(
|
||||
)?;
|
||||
|
||||
if delta.rewards != 0 || delta.penalties != 0 {
|
||||
let balance = balance.make_mut()?;
|
||||
balance.safe_add_assign(delta.rewards)?;
|
||||
*balance = balance.saturating_sub(delta.penalties);
|
||||
}
|
||||
@@ -452,7 +456,7 @@ impl RewardsAndPenaltiesContext {
|
||||
}
|
||||
|
||||
fn process_single_registry_update(
|
||||
validator: &mut Validator,
|
||||
validator: &mut Cow<Validator>,
|
||||
validator_info: &ValidatorInfo,
|
||||
exit_cache: &mut ExitCache,
|
||||
activation_queue: &BTreeSet<usize>,
|
||||
@@ -463,7 +467,7 @@ fn process_single_registry_update(
|
||||
let current_epoch = state_ctxt.current_epoch;
|
||||
|
||||
if validator.is_eligible_for_activation_queue(spec) {
|
||||
validator.activation_eligibility_epoch = current_epoch.safe_add(1)?;
|
||||
validator.make_mut()?.activation_eligibility_epoch = current_epoch.safe_add(1)?;
|
||||
}
|
||||
|
||||
if validator.is_active_at(current_epoch) && validator.effective_balance <= spec.ejection_balance
|
||||
@@ -472,7 +476,8 @@ fn process_single_registry_update(
|
||||
}
|
||||
|
||||
if activation_queue.contains(&validator_info.index) {
|
||||
validator.activation_epoch = spec.compute_activation_exit_epoch(current_epoch)?;
|
||||
validator.make_mut()?.activation_epoch =
|
||||
spec.compute_activation_exit_epoch(current_epoch)?;
|
||||
}
|
||||
|
||||
// Caching: add to speculative activation queue for next epoch.
|
||||
@@ -487,7 +492,7 @@ fn process_single_registry_update(
|
||||
}
|
||||
|
||||
fn initiate_validator_exit(
|
||||
validator: &mut Validator,
|
||||
validator: &mut Cow<Validator>,
|
||||
exit_cache: &mut ExitCache,
|
||||
state_ctxt: &StateContext,
|
||||
spec: &ChainSpec,
|
||||
@@ -508,6 +513,7 @@ fn initiate_validator_exit(
|
||||
exit_queue_epoch.safe_add_assign(1)?;
|
||||
}
|
||||
|
||||
let validator = validator.make_mut()?;
|
||||
validator.exit_epoch = exit_queue_epoch;
|
||||
validator.withdrawable_epoch =
|
||||
exit_queue_epoch.safe_add(spec.min_validator_withdrawability_delay)?;
|
||||
@@ -540,7 +546,7 @@ impl SlashingsContext {
|
||||
}
|
||||
|
||||
fn process_single_slashing(
|
||||
balance: &mut u64,
|
||||
balance: &mut Cow<u64>,
|
||||
validator: &Validator,
|
||||
slashings_ctxt: &SlashingsContext,
|
||||
state_ctxt: &StateContext,
|
||||
@@ -557,7 +563,7 @@ fn process_single_slashing(
|
||||
.safe_div(state_ctxt.total_active_balance)?
|
||||
.safe_mul(increment)?;
|
||||
|
||||
*balance = balance.saturating_sub(penalty);
|
||||
*balance.make_mut()? = balance.saturating_sub(penalty);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
@@ -581,7 +587,7 @@ impl EffectiveBalancesContext {
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn process_single_effective_balance_update(
|
||||
balance: u64,
|
||||
validator: &mut Validator,
|
||||
validator: &mut Cow<Validator>,
|
||||
validator_info: &ValidatorInfo,
|
||||
next_epoch_total_active_balance: &mut u64,
|
||||
next_epoch_cache: &mut PreEpochCache,
|
||||
@@ -611,7 +617,7 @@ fn process_single_effective_balance_update(
|
||||
}
|
||||
|
||||
if new_effective_balance != old_effective_balance {
|
||||
validator.effective_balance = new_effective_balance;
|
||||
validator.make_mut()?.effective_balance = new_effective_balance;
|
||||
|
||||
// Update progressive balances cache for the *current* epoch, which will soon become the
|
||||
// previous epoch once the epoch transition completes.
|
||||
|
||||
Reference in New Issue
Block a user