From c790d9dd451c6fb58703cf783ebf8beba83ae10c Mon Sep 17 00:00:00 2001 From: Tan Chee Keong Date: Fri, 9 May 2025 16:00:56 +0800 Subject: [PATCH] Fix --- validator_client/src/lib.rs | 5 ++-- .../validator_services/src/duties_service.rs | 25 ++++++++++++++----- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/validator_client/src/lib.rs b/validator_client/src/lib.rs index 0eadffacfb..ec7a084f55 100644 --- a/validator_client/src/lib.rs +++ b/validator_client/src/lib.rs @@ -483,7 +483,7 @@ impl ProductionValidatorClient { } }; - let _sync_selection_proof_config = if config.distributed { + let sync_selection_proof_config = if config.distributed { SelectionProofConfig { lookahead_slot: AGGREGATION_PRE_COMPUTE_SLOTS_DISTRIBUTED, computation_offset: Duration::default(), @@ -509,7 +509,8 @@ impl ProductionValidatorClient { .spec(context.eth2_config.spec.clone()) .executor(context.executor.clone()) .enable_high_validator_count_metrics(config.enable_high_validator_count_metrics) - .selection_proof_config(attestation_selection_proof_config) + .attestation_selection_proof_config(attestation_selection_proof_config) + .sync_selection_proof_config(sync_selection_proof_config) .disable_attesting(config.disable_attesting) .build()?, ); diff --git a/validator_client/validator_services/src/duties_service.rs b/validator_client/validator_services/src/duties_service.rs index 8902684cb1..48aaf351a1 100644 --- a/validator_client/validator_services/src/duties_service.rs +++ b/validator_client/validator_services/src/duties_service.rs @@ -278,7 +278,8 @@ pub struct DutiesServiceBuilder { //// Whether we permit large validator counts in the metrics. enable_high_validator_count_metrics: bool, /// If this validator is running in distributed mode. - selection_proof_config: SelectionProofConfig, + attestation_selection_proof_config: SelectionProofConfig, + sync_selection_proof_config: SelectionProofConfig, disable_attesting: bool, } @@ -297,7 +298,8 @@ impl DutiesServiceBuilder { executor: None, spec: None, enable_high_validator_count_metrics: false, - selection_proof_config: SelectionProofConfig::default(), + attestation_selection_proof_config: SelectionProofConfig::default(), + sync_selection_proof_config: SelectionProofConfig::default(), disable_attesting: false, } } @@ -335,8 +337,19 @@ impl DutiesServiceBuilder { self } - pub fn selection_proof_config(mut self, selection_proof_config: SelectionProofConfig) -> Self { - self.selection_proof_config = selection_proof_config; + pub fn attestation_selection_proof_config( + mut self, + attestation_selection_proof_config: SelectionProofConfig, + ) -> Self { + self.attestation_selection_proof_config = attestation_selection_proof_config; + self + } + + pub fn sync_selection_proof_config( + mut self, + sync_selection_proof_config: SelectionProofConfig, + ) -> Self { + self.sync_selection_proof_config = sync_selection_proof_config; self } @@ -349,7 +362,7 @@ impl DutiesServiceBuilder { Ok(DutiesService { attesters: Default::default(), proposers: Default::default(), - sync_duties: SyncDutiesMap::new(self.selection_proof_config), + sync_duties: SyncDutiesMap::new(self.sync_selection_proof_config), validator_store: self .validator_store .ok_or("Cannot build DutiesService without validator_store")?, @@ -365,7 +378,7 @@ impl DutiesServiceBuilder { .ok_or("Cannot build DutiesService without executor")?, spec: self.spec.ok_or("Cannot build DutiesService without spec")?, enable_high_validator_count_metrics: self.enable_high_validator_count_metrics, - selection_proof_config: self.selection_proof_config, + selection_proof_config: self.attestation_selection_proof_config, disable_attesting: self.disable_attesting, }) }