1f8c17b530
## 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.
66 lines
2.3 KiB
Rust
66 lines
2.3 KiB
Rust
use crate::proto_array::ProposerBoost;
|
|
use crate::{
|
|
proto_array::{ProtoArray, ProtoNode},
|
|
proto_array_fork_choice::{ElasticList, ProtoArrayForkChoice, VoteTracker},
|
|
Error, JustifiedBalances,
|
|
};
|
|
use ssz::{four_byte_option_impl, Encode};
|
|
use ssz_derive::{Decode, Encode};
|
|
use std::collections::HashMap;
|
|
use std::convert::TryFrom;
|
|
use types::{Checkpoint, Hash256};
|
|
|
|
// Define a "legacy" implementation of `Option<usize>` which uses four bytes for encoding the union
|
|
// selector.
|
|
four_byte_option_impl!(four_byte_option_checkpoint, Checkpoint);
|
|
|
|
#[derive(Encode, Decode)]
|
|
pub struct SszContainer {
|
|
pub votes: Vec<VoteTracker>,
|
|
pub balances: Vec<u64>,
|
|
pub prune_threshold: usize,
|
|
pub justified_checkpoint: Checkpoint,
|
|
pub finalized_checkpoint: Checkpoint,
|
|
pub nodes: Vec<ProtoNode>,
|
|
pub indices: Vec<(Hash256, usize)>,
|
|
pub previous_proposer_boost: ProposerBoost,
|
|
}
|
|
|
|
impl From<&ProtoArrayForkChoice> for SszContainer {
|
|
fn from(from: &ProtoArrayForkChoice) -> Self {
|
|
let proto_array = &from.proto_array;
|
|
|
|
Self {
|
|
votes: from.votes.0.clone(),
|
|
balances: from.balances.effective_balances.clone(),
|
|
prune_threshold: proto_array.prune_threshold,
|
|
justified_checkpoint: proto_array.justified_checkpoint,
|
|
finalized_checkpoint: proto_array.finalized_checkpoint,
|
|
nodes: proto_array.nodes.clone(),
|
|
indices: proto_array.indices.iter().map(|(k, v)| (*k, *v)).collect(),
|
|
previous_proposer_boost: proto_array.previous_proposer_boost,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl TryFrom<SszContainer> for ProtoArrayForkChoice {
|
|
type Error = Error;
|
|
|
|
fn try_from(from: SszContainer) -> Result<Self, Error> {
|
|
let proto_array = ProtoArray {
|
|
prune_threshold: from.prune_threshold,
|
|
justified_checkpoint: from.justified_checkpoint,
|
|
finalized_checkpoint: from.finalized_checkpoint,
|
|
nodes: from.nodes,
|
|
indices: from.indices.into_iter().collect::<HashMap<_, _>>(),
|
|
previous_proposer_boost: from.previous_proposer_boost,
|
|
};
|
|
|
|
Ok(Self {
|
|
proto_array,
|
|
votes: ElasticList(from.votes),
|
|
balances: JustifiedBalances::from_effective_balances(from.balances)?,
|
|
})
|
|
}
|
|
}
|