gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-19 13:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable' into validator-manager

Browse Source
This commit is contained in:
Paul Hauner
2023-07-10 17:19:53 +10:00
parent ee430c01c1 dfcb3363c7
commit fb51b09b60
272 changed files with 12065 additions and 4316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
validator_client/src/lib.rs
View File

@@ -146,7 +146,7 @@ impl<T: EthSpec> ProductionValidatorClient<T> {
context
.clone()
.executor
.spawn_without_exit(async move { server.await }, "metrics-api");
.spawn_without_exit(server, "metrics-api");
Some(ctx)
} else {
@@ -446,11 +446,6 @@ impl<T: EthSpec> ProductionValidatorClient<T> {
slot_clock: slot_clock.clone(),
beacon_nodes: beacon_nodes.clone(),
validator_store: validator_store.clone(),
require_synced: if config.allow_unsynced_beacon_node {
RequireSynced::Yes
} else {
RequireSynced::No
},
spec: context.eth2_config.spec.clone(),
context: duties_context,
enable_high_validator_count_metrics: config.enable_high_validator_count_metrics,
@@ -492,6 +487,7 @@ impl<T: EthSpec> ProductionValidatorClient<T> {
.beacon_nodes(beacon_nodes.clone())
.runtime_context(context.service_context("preparation".into()))
.builder_registration_timestamp_override(config.builder_registration_timestamp_override)
.validator_registration_batch_size(config.validator_registration_batch_size)
.build()?;
let sync_committee_service = SyncCommitteeService::new(
@@ -582,6 +578,7 @@ impl<T: EthSpec> ProductionValidatorClient<T> {
graffiti_flag: self.config.graffiti,
spec: self.context.eth2_config.spec.clone(),
config: self.config.http_api.clone(),
sse_logging_components: self.context.sse_logging_components.clone(),
slot_clock: self.slot_clock.clone(),
log: log.clone(),
_phantom: PhantomData,
@@ -595,7 +592,7 @@ impl<T: EthSpec> ProductionValidatorClient<T> {
self.context
.clone()
.executor
.spawn_without_exit(async move { server.await }, "http-api");
.spawn_without_exit(server, "http-api");
Some(listen_addr)
} else {
@@ -621,8 +618,8 @@ async fn init_from_beacon_node<E: EthSpec>(
context: &RuntimeContext<E>,
) -> Result<(u64, Hash256), String> {
loop {
beacon_nodes.update_unready_candidates().await;
proposer_nodes.update_unready_candidates().await;
beacon_nodes.update_all_candidates().await;
proposer_nodes.update_all_candidates().await;
let num_available = beacon_nodes.num_available().await;
let num_total = beacon_nodes.num_total();