mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-09 19:51:47 +00:00
## Issue Addressed Add a flag that can increase count unrealized strictness, defaults to false ## Proposed Changes Please list or describe the changes introduced by this PR. ## Additional Info Please provide any additional information. For example, future considerations or information useful for reviewers. Co-authored-by: realbigsean <seananderson33@gmail.com> Co-authored-by: sean <seananderson33@gmail.com>
63 lines
2.2 KiB
Rust
63 lines
2.2 KiB
Rust
use crate::proto_array::ProposerBoost;
|
|
use crate::{
|
|
proto_array::{CountUnrealizedFull, ProtoArray, ProtoNode},
|
|
proto_array_fork_choice::{ElasticList, ProtoArrayForkChoice, VoteTracker},
|
|
};
|
|
use ssz::{four_byte_option_impl, Encode};
|
|
use ssz_derive::{Decode, Encode};
|
|
use std::collections::HashMap;
|
|
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.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 From<(SszContainer, CountUnrealizedFull)> for ProtoArrayForkChoice {
|
|
fn from((from, count_unrealized_full): (SszContainer, CountUnrealizedFull)) -> Self {
|
|
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,
|
|
count_unrealized_full,
|
|
};
|
|
|
|
Self {
|
|
proto_array,
|
|
votes: ElasticList(from.votes),
|
|
balances: from.balances,
|
|
}
|
|
}
|
|
}
|