mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-15 19:02:42 +00:00
d04fde3ba9
## Issue Addressed Closes https://github.com/sigp/lighthouse/issues/3241 Closes https://github.com/sigp/lighthouse/issues/3242 ## Proposed Changes * [x] Implement logic to remove equivocating validators from fork choice per https://github.com/ethereum/consensus-specs/pull/2845 * [x] Update tests to v1.2.0-rc.1. The new test which exercises `equivocating_indices` is passing. * [x] Pull in some SSZ abstractions from the `tree-states` branch that make implementing Vec-compatible encoding for types like `BTreeSet` and `BTreeMap`. * [x] Implement schema upgrades and downgrades for the database (new schema version is V11). * [x] Apply attester slashings from blocks to fork choice ## Additional Info * This PR doesn't need the `BTreeMap` impl, but `tree-states` does, and I don't think there's any harm in keeping it. But I could also be convinced to drop it. Blocked on #3322.
55 lines
1.7 KiB
Rust
55 lines
1.7 KiB
Rust
use crate::beacon_fork_choice_store::{
|
|
PersistedForkChoiceStoreV1, PersistedForkChoiceStoreV10, PersistedForkChoiceStoreV11,
|
|
PersistedForkChoiceStoreV7, PersistedForkChoiceStoreV8,
|
|
};
|
|
use ssz::{Decode, Encode};
|
|
use ssz_derive::{Decode, Encode};
|
|
use store::{DBColumn, Error, StoreItem};
|
|
use superstruct::superstruct;
|
|
|
|
// If adding a new version you should update this type alias and fix the breakages.
|
|
pub type PersistedForkChoice = PersistedForkChoiceV11;
|
|
|
|
#[superstruct(
|
|
variants(V1, V7, V8, V10, V11),
|
|
variant_attributes(derive(Encode, Decode)),
|
|
no_enum
|
|
)]
|
|
pub struct PersistedForkChoice {
|
|
pub fork_choice: fork_choice::PersistedForkChoice,
|
|
#[superstruct(only(V1))]
|
|
pub fork_choice_store: PersistedForkChoiceStoreV1,
|
|
#[superstruct(only(V7))]
|
|
pub fork_choice_store: PersistedForkChoiceStoreV7,
|
|
#[superstruct(only(V8))]
|
|
pub fork_choice_store: PersistedForkChoiceStoreV8,
|
|
#[superstruct(only(V10))]
|
|
pub fork_choice_store: PersistedForkChoiceStoreV10,
|
|
#[superstruct(only(V11))]
|
|
pub fork_choice_store: PersistedForkChoiceStoreV11,
|
|
}
|
|
|
|
macro_rules! impl_store_item {
|
|
($type:ty) => {
|
|
impl StoreItem for $type {
|
|
fn db_column() -> DBColumn {
|
|
DBColumn::ForkChoice
|
|
}
|
|
|
|
fn as_store_bytes(&self) -> Vec<u8> {
|
|
self.as_ssz_bytes()
|
|
}
|
|
|
|
fn from_store_bytes(bytes: &[u8]) -> std::result::Result<Self, Error> {
|
|
Self::from_ssz_bytes(bytes).map_err(Into::into)
|
|
}
|
|
}
|
|
};
|
|
}
|
|
|
|
impl_store_item!(PersistedForkChoiceV1);
|
|
impl_store_item!(PersistedForkChoiceV7);
|
|
impl_store_item!(PersistedForkChoiceV8);
|
|
impl_store_item!(PersistedForkChoiceV10);
|
|
impl_store_item!(PersistedForkChoiceV11);
|