## Issue Addressed NA ## Proposed Changes - Implements https://github.com/ethereum/consensus-specs/pull/3290/ - Bumps `ef-tests` to [v1.3.0-rc.4](https://github.com/ethereum/consensus-spec-tests/releases/tag/v1.3.0-rc.4). The `CountRealizedFull` concept has been removed and the `--count-unrealized-full` and `--count-unrealized` BN flags now do nothing but log a `WARN` when used. ## Database Migration Debt This PR removes the `best_justified_checkpoint` from fork choice. This field is persisted on-disk and the correct way to go about this would be to make a DB migration to remove the field. However, in this PR I've simply stubbed out the value with a junk value. I've taken this approach because if we're going to do a DB migration I'd love to remove the `Option`s around the justified and finalized checkpoints on `ProtoNode` whilst we're at it. Those options were added in #2822 which was included in Lighthouse v2.1.0. The options were only put there to handle the migration and they've been set to `Some` ever since v2.1.0. There's no reason to keep them as options anymore. I started adding the DB migration to this branch but I started to feel like I was bloating this rather critical PR with nice-to-haves. I've kept the partially-complete migration [over in my repo](https://github.com/paulhauner/lighthouse/tree/fc-pr-18-migration) so we can pick it up after this PR is merged.
63 lines
2.0 KiB
Rust
63 lines
2.0 KiB
Rust
use safe_arith::{ArithError, SafeArith};
|
|
use types::{BeaconState, EthSpec};
|
|
|
|
#[derive(Debug, PartialEq, Clone, Default)]
|
|
pub struct JustifiedBalances {
|
|
/// The effective balances for every validator in a given justified state.
|
|
///
|
|
/// Any validator who is not active in the epoch of the justified state is assigned a balance of
|
|
/// zero.
|
|
pub effective_balances: Vec<u64>,
|
|
/// The sum of `self.effective_balances`.
|
|
pub total_effective_balance: u64,
|
|
/// The number of active validators included in `self.effective_balances`.
|
|
pub num_active_validators: u64,
|
|
}
|
|
|
|
impl JustifiedBalances {
|
|
pub fn from_justified_state<T: EthSpec>(state: &BeaconState<T>) -> Result<Self, ArithError> {
|
|
let current_epoch = state.current_epoch();
|
|
let mut total_effective_balance = 0u64;
|
|
let mut num_active_validators = 0u64;
|
|
|
|
let effective_balances = state
|
|
.validators()
|
|
.iter()
|
|
.map(|validator| {
|
|
if !validator.slashed && validator.is_active_at(current_epoch) {
|
|
total_effective_balance.safe_add_assign(validator.effective_balance)?;
|
|
num_active_validators.safe_add_assign(1)?;
|
|
|
|
Ok(validator.effective_balance)
|
|
} else {
|
|
Ok(0)
|
|
}
|
|
})
|
|
.collect::<Result<Vec<_>, _>>()?;
|
|
|
|
Ok(Self {
|
|
effective_balances,
|
|
total_effective_balance,
|
|
num_active_validators,
|
|
})
|
|
}
|
|
|
|
pub fn from_effective_balances(effective_balances: Vec<u64>) -> Result<Self, ArithError> {
|
|
let mut total_effective_balance = 0;
|
|
let mut num_active_validators = 0;
|
|
|
|
for &balance in &effective_balances {
|
|
if balance != 0 {
|
|
total_effective_balance.safe_add_assign(balance)?;
|
|
num_active_validators.safe_add_assign(1)?;
|
|
}
|
|
}
|
|
|
|
Ok(Self {
|
|
effective_balances,
|
|
total_effective_balance,
|
|
num_active_validators,
|
|
})
|
|
}
|
|
}
|