gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-22 15:28:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge sigp/unstable into gloas-walk-always

Browse Source
This commit is contained in:
dapplion
2026-03-25 21:37:51 -05:00
parent 93f987f3cf bd34bb1430
commit e676c33c92
20 changed files with 46 additions and 1587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
consensus/fork_choice/src/fork_choice.rs
View File

@@ -6,7 +6,6 @@ use proto_array::{
Block as ProtoBlock, DisallowedReOrgOffsets, ExecutionStatus, JustifiedBalances, LatestMessage,
PayloadStatus, ProposerHeadError, ProposerHeadInfo, ProtoArrayForkChoice, ReOrgThreshold,
};
use ssz::{Decode, Encode};
use ssz_derive::{Decode, Encode};
use state_processing::{
per_block_processing::errors::AttesterSlashingValidationError, per_epoch_processing,
@@ -1811,13 +1810,11 @@ where
///
/// This is used when persisting the state of the fork choice to disk.
#[superstruct(
variants(V17, V28, V29),
variants(V28, V29),
variant_attributes(derive(Encode, Decode, Clone)),
no_enum
)]
pub struct PersistedForkChoice {
#[superstruct(only(V17))]
pub proto_array_bytes: Vec<u8>,
#[superstruct(only(V28))]
pub proto_array_v28: proto_array::core::SszContainerV28,
#[superstruct(only(V29))]
@@ -1829,21 +1826,6 @@ pub struct PersistedForkChoice {
pub type PersistedForkChoice = PersistedForkChoiceV29;
impl TryFrom<PersistedForkChoiceV17> for PersistedForkChoiceV28 {
type Error = ssz::DecodeError;
fn try_from(v17: PersistedForkChoiceV17) -> Result<Self, Self::Error> {
let container_v17 =
proto_array::core::SszContainerV17::from_ssz_bytes(&v17.proto_array_bytes)?;
let container_v28: proto_array::core::SszContainerV28 = container_v17.into();
Ok(Self {
proto_array_v28: container_v28,
queued_attestations: v17.queued_attestations,
})
}
}
impl From<PersistedForkChoiceV28> for PersistedForkChoiceV29 {
fn from(v28: PersistedForkChoiceV28) -> Self {
Self {
@@ -1854,19 +1836,6 @@ impl From<PersistedForkChoiceV28> for PersistedForkChoiceV29 {
}
}
impl From<(PersistedForkChoiceV28, JustifiedBalances)> for PersistedForkChoiceV17 {
fn from((v28, balances): (PersistedForkChoiceV28, JustifiedBalances)) -> Self {
let container_v17 =
proto_array::core::SszContainerV17::from((v28.proto_array_v28, balances));
let proto_array_bytes = container_v17.as_ssz_bytes();
Self {
proto_array_bytes,
queued_attestations: v28.queued_attestations,
}
}
}
#[cfg(test)]
mod tests {
use types::MainnetEthSpec;