Squashed changed from modularized-validator-store

This commit is contained in:
Daniel Knopik
2025-02-10 08:49:41 +01:00
parent b83ffb2131
commit 0ee83716aa
11 changed files with 53 additions and 24 deletions

View File

@@ -6,7 +6,11 @@ authors = ["Sigma Prime <contact@sigmaprime.io>"]
[dependencies]
account_utils = { workspace = true }
beacon_node_fallback = { workspace = true }
doppelganger_service = { workspace = true }
either = { workspace = true }
environment = { workspace = true }
eth2 = { workspace = true }
initialized_validators = { workspace = true }
parking_lot = { workspace = true }
serde = { workspace = true }
@@ -15,6 +19,11 @@ slashing_protection = { workspace = true }
slog = { workspace = true }
slot_clock = { workspace = true }
task_executor = { workspace = true }
tokio = { workspace = true }
types = { workspace = true }
validator_metrics = { workspace = true }
validator_store = { workspace = true }
[dev-dependencies]
futures = { workspace = true }
logging = { workspace = true }

View File

@@ -117,7 +117,11 @@ impl<T: SlotClock + 'static, E: EthSpec> LighthouseValidatorStore<T, E> {
pub fn register_all_in_doppelganger_protection_if_enabled(&self) -> Result<(), String> {
if let Some(doppelganger_service) = &self.doppelganger_service {
for pubkey in self.validators.read().iter_voting_pubkeys() {
doppelganger_service.register_new_validator::<E, _>(*pubkey, &self.slot_clock)?
doppelganger_service.register_new_validator(
*pubkey,
&self.slot_clock,
E::slots_per_epoch(),
)?
}
}
@@ -193,8 +197,11 @@ impl<T: SlotClock + 'static, E: EthSpec> LighthouseValidatorStore<T, E> {
.map_err(|e| format!("failed to register validator: {:?}", e))?;
if let Some(doppelganger_service) = &self.doppelganger_service {
doppelganger_service
.register_new_validator::<E, _>(validator_pubkey, &self.slot_clock)?;
doppelganger_service.register_new_validator(
validator_pubkey,
&self.slot_clock,
E::slots_per_epoch(),
)?;
}
self.validators