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

More WIP

Browse Source
This commit is contained in:
Michael Sproul
2025-05-08 20:52:50 +10:00
parent 2e50c2daea
commit 4d118a6ff2
18 changed files with 338 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
validator_client/src/lib.rs
View File

@@ -22,7 +22,6 @@ use eth2::{reqwest::ClientBuilder, BeaconNodeHttpClient, StatusCode, Timeouts};
use initialized_validators::Error::UnableToOpenVotingKeystore;
use lighthouse_validator_store::LighthouseValidatorStore;
use notifier::spawn_notifier;
use parking_lot::RwLock;
use reqwest::Certificate;
use slot_clock::SlotClock;
use slot_clock::SystemTimeSlotClock;
@@ -32,6 +31,7 @@ use std::net::SocketAddr;
use std::path::Path;
use std::sync::Arc;
use std::time::{SystemTime, UNIX_EPOCH};
use tokio::sync::RwLock;
use tokio::{
sync::mpsc,
time::{sleep, Duration},
@@ -390,7 +390,7 @@ impl<E: EthSpec> ProductionValidatorClient<E> {
// Update the metrics server.
if let Some(ctx) = &validator_metrics_ctx {
ctx.shared.write().genesis_time = Some(genesis_time);
ctx.shared.write().await.genesis_time = Some(genesis_time);
}
let slot_clock = SystemTimeSlotClock::new(
@@ -426,10 +426,12 @@ impl<E: EthSpec> ProductionValidatorClient<E> {
));
// Ensure all validators are registered in doppelganger protection.
validator_store.register_all_in_doppelganger_protection_if_enabled()?;
validator_store
.register_all_in_doppelganger_protection_if_enabled()
.await?;
info!(
voting_validators = validator_store.num_voting_validators(),
voting_validators = validator_store.num_voting_validators().await,
"Loaded validator keypair store"
);
@@ -437,7 +439,9 @@ impl<E: EthSpec> ProductionValidatorClient<E> {
// oversized from having not been pruned (by a prior version) we don't want to prune
// concurrently, as it will hog the lock and cause the attestation service to spew CRITs.
if let Some(slot) = slot_clock.now() {
validator_store.prune_slashing_protection_db(slot.epoch(E::slots_per_epoch()), true);
validator_store
.prune_slashing_protection_db(slot.epoch(E::slots_per_epoch()), true)
.await;
}
let duties_service = Arc::new(
@@ -455,8 +459,8 @@ impl<E: EthSpec> ProductionValidatorClient<E> {
// Update the metrics server.
if let Some(ctx) = &validator_metrics_ctx {
ctx.shared.write().validator_store = Some(validator_store.clone());
ctx.shared.write().duties_service = Some(duties_service.clone());
ctx.shared.write().await.validator_store = Some(validator_store.clone());
ctx.shared.write().await.duties_service = Some(duties_service.clone());
}
let mut block_service_builder = BlockServiceBuilder::new()

8
validator_client/src/notifier.rs
View File

@@ -104,10 +104,10 @@ async fn notify<T: SlotClock + 'static, E: EthSpec>(
if let Some(slot) = duties_service.slot_clock.now() {
let epoch = slot.epoch(E::slots_per_epoch());
let total_validators = duties_service.total_validator_count();
let proposing_validators = duties_service.proposer_count(epoch);
let attesting_validators = duties_service.attester_count(epoch);
let doppelganger_detecting_validators = duties_service.doppelganger_detecting_count();
let total_validators = duties_service.total_validator_count().await;
let proposing_validators = duties_service.proposer_count(epoch).await;
let attesting_validators = duties_service.attester_count(epoch).await;
let doppelganger_detecting_validators = duties_service.doppelganger_detecting_count().await;
if doppelganger_detecting_validators > 0 {
info!(