gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-07-05 05:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-04-27 22:47:19 +02:00
parent d2ec1cda51
commit 9debb1a30b
6 changed files with 1 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
validator_client/src/lib.rs
View File

@@ -45,11 +45,7 @@ use validator_services::{
block_service::{BlockService, BlockServiceBuilder},
duties_service::{self, DutiesService, DutiesServiceBuilder},
latency_service,
<<<<<<< HEAD
payload_attestation_service::{PayloadAttestationService, PayloadAttestationServiceBuilder},
=======
payload_attestation_service::PayloadAttestationService,
>>>>>>> 028b5a42a9715c31f416d45db70add39d9934b12
preparation_service::{PreparationService, PreparationServiceBuilder},
sync_committee_service::SyncCommitteeService,
};
@@ -557,17 +553,6 @@ impl<E: EthSpec> ProductionValidatorClient<E> {
beacon_nodes.clone(),
context.executor.clone(),
);
<<<<<<< HEAD
let payload_attestation_service = PayloadAttestationServiceBuilder::new()
.duties_service(duties_service.clone())
.validator_store(validator_store.clone())
.slot_clock(slot_clock.clone())
.beacon_nodes(beacon_nodes.clone())
.executor(context.executor.clone())
.chain_spec(context.eth2_config.spec.clone())
.build()?;
=======
let payload_attestation_service = PayloadAttestationService::new(
duties_service.clone(),
validator_store.clone(),
@@ -576,7 +561,6 @@ impl<E: EthSpec> ProductionValidatorClient<E> {
context.executor.clone(),
context.eth2_config.spec.clone(),
);
>>>>>>> 028b5a42a9715c31f416d45db70add39d9934b12
Ok(Self {
context,
@@ -656,19 +640,12 @@ impl<E: EthSpec> ProductionValidatorClient<E> {
.start_update_service(&self.context.eth2_config.spec)
.map_err(|e| format!("Unable to start sync committee service: {}", e))?;
<<<<<<< HEAD
self.payload_attestation_service
.clone()
.start_update_service()
.map_err(|e| format!("Unable to start payload attestation service: {}", e))?;
=======
if self.context.eth2_config.spec.is_gloas_scheduled() {
self.payload_attestation_service
.clone()
.start_update_service()
.map_err(|e| format!("Unable to start payload attestation service: {}", e))?;
}
>>>>>>> 028b5a42a9715c31f416d45db70add39d9934b12
self.preparation_service
.clone()