mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-16 19:32:55 +00:00
e559bd9f59
* - Update the fork choice `ProtoNode` to include `is_merge_complete` - Add database migration for the persisted fork choice * update tests * Small cleanup * lints * store execution block hash in fork choice rather than bool
83 lines
2.4 KiB
Rust
83 lines
2.4 KiB
Rust
use crate::proto_array::LegacyProtoNode;
|
|
use crate::{
|
|
proto_array::{ProtoArray, ProtoNode},
|
|
proto_array_fork_choice::{ElasticList, ProtoArrayForkChoice, VoteTracker},
|
|
};
|
|
use ssz_derive::{Decode, Encode};
|
|
use std::collections::HashMap;
|
|
use types::{Epoch, Hash256};
|
|
|
|
#[derive(Encode, Decode)]
|
|
pub struct SszContainer {
|
|
votes: Vec<VoteTracker>,
|
|
balances: Vec<u64>,
|
|
prune_threshold: usize,
|
|
justified_epoch: Epoch,
|
|
finalized_epoch: Epoch,
|
|
nodes: Vec<ProtoNode>,
|
|
indices: Vec<(Hash256, usize)>,
|
|
}
|
|
|
|
/// Only used for SSZ deserialization of the persisted fork choice during the database migration
|
|
/// from schema 4 to schema 5.
|
|
#[derive(Encode, Decode)]
|
|
pub struct LegacySszContainer {
|
|
votes: Vec<VoteTracker>,
|
|
balances: Vec<u64>,
|
|
prune_threshold: usize,
|
|
justified_epoch: Epoch,
|
|
finalized_epoch: Epoch,
|
|
nodes: Vec<LegacyProtoNode>,
|
|
indices: Vec<(Hash256, usize)>,
|
|
}
|
|
|
|
impl Into<SszContainer> for LegacySszContainer {
|
|
fn into(self) -> SszContainer {
|
|
let nodes = self.nodes.into_iter().map(Into::into).collect();
|
|
|
|
SszContainer {
|
|
votes: self.votes,
|
|
balances: self.balances,
|
|
prune_threshold: self.prune_threshold,
|
|
justified_epoch: self.justified_epoch,
|
|
finalized_epoch: self.finalized_epoch,
|
|
nodes,
|
|
indices: self.indices,
|
|
}
|
|
}
|
|
}
|
|
|
|
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_epoch: proto_array.justified_epoch,
|
|
finalized_epoch: proto_array.finalized_epoch,
|
|
nodes: proto_array.nodes.clone(),
|
|
indices: proto_array.indices.iter().map(|(k, v)| (*k, *v)).collect(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<SszContainer> for ProtoArrayForkChoice {
|
|
fn from(from: SszContainer) -> Self {
|
|
let proto_array = ProtoArray {
|
|
prune_threshold: from.prune_threshold,
|
|
justified_epoch: from.justified_epoch,
|
|
finalized_epoch: from.finalized_epoch,
|
|
nodes: from.nodes,
|
|
indices: from.indices.into_iter().collect::<HashMap<_, _>>(),
|
|
};
|
|
|
|
Self {
|
|
proto_array,
|
|
votes: ElasticList(from.votes),
|
|
balances: from.balances,
|
|
}
|
|
}
|
|
}
|