This commit is contained in:
Tan Chee Keong
2025-05-09 16:00:56 +08:00
parent 46c29b09b7
commit c790d9dd45
2 changed files with 22 additions and 8 deletions

View File

@@ -483,7 +483,7 @@ impl<E: EthSpec> ProductionValidatorClient<E> {
} }
}; };
let _sync_selection_proof_config = if config.distributed { let sync_selection_proof_config = if config.distributed {
SelectionProofConfig { SelectionProofConfig {
lookahead_slot: AGGREGATION_PRE_COMPUTE_SLOTS_DISTRIBUTED, lookahead_slot: AGGREGATION_PRE_COMPUTE_SLOTS_DISTRIBUTED,
computation_offset: Duration::default(), computation_offset: Duration::default(),
@@ -509,7 +509,8 @@ impl<E: EthSpec> ProductionValidatorClient<E> {
.spec(context.eth2_config.spec.clone()) .spec(context.eth2_config.spec.clone())
.executor(context.executor.clone()) .executor(context.executor.clone())
.enable_high_validator_count_metrics(config.enable_high_validator_count_metrics) .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) .disable_attesting(config.disable_attesting)
.build()?, .build()?,
); );

View File

@@ -278,7 +278,8 @@ pub struct DutiesServiceBuilder<S, T> {
//// Whether we permit large validator counts in the metrics. //// Whether we permit large validator counts in the metrics.
enable_high_validator_count_metrics: bool, enable_high_validator_count_metrics: bool,
/// If this validator is running in distributed mode. /// 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, disable_attesting: bool,
} }
@@ -297,7 +298,8 @@ impl<S, T> DutiesServiceBuilder<S, T> {
executor: None, executor: None,
spec: None, spec: None,
enable_high_validator_count_metrics: false, 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, disable_attesting: false,
} }
} }
@@ -335,8 +337,19 @@ impl<S, T> DutiesServiceBuilder<S, T> {
self self
} }
pub fn selection_proof_config(mut self, selection_proof_config: SelectionProofConfig) -> Self { pub fn attestation_selection_proof_config(
self.selection_proof_config = 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 self
} }
@@ -349,7 +362,7 @@ impl<S, T> DutiesServiceBuilder<S, T> {
Ok(DutiesService { Ok(DutiesService {
attesters: Default::default(), attesters: Default::default(),
proposers: 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: self
.validator_store .validator_store
.ok_or("Cannot build DutiesService without validator_store")?, .ok_or("Cannot build DutiesService without validator_store")?,
@@ -365,7 +378,7 @@ impl<S, T> DutiesServiceBuilder<S, T> {
.ok_or("Cannot build DutiesService without executor")?, .ok_or("Cannot build DutiesService without executor")?,
spec: self.spec.ok_or("Cannot build DutiesService without spec")?, spec: self.spec.ok_or("Cannot build DutiesService without spec")?,
enable_high_validator_count_metrics: self.enable_high_validator_count_metrics, 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, disable_attesting: self.disable_attesting,
}) })
} }