cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

DO spec check before waiting for genesis (#1962)

Browse Source
This commit is contained in:
Paul Hauner 2020-11-25 02:00:11 +11:00 committed by GitHub
parent b6eff50ffa
commit 11c4968ea0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
validator_client/src/lib.rs
View File

@ -37,7 +37,7 @@ use std::net::SocketAddr;
use std::sync::Arc; use std::sync::Arc;
use std::time::{SystemTime, UNIX_EPOCH}; use std::time::{SystemTime, UNIX_EPOCH};
use tokio::time::{delay_for, Duration}; use tokio::time::{delay_for, Duration};
use types::{EthSpec, Hash256, YamlConfig}; use types::{EthSpec, Hash256};
use validator_store::ValidatorStore; use validator_store::ValidatorStore;
/// The interval between attempts to contact the beacon node during startup. /// The interval between attempts to contact the beacon node during startup.
@ -181,23 +181,10 @@ impl<T: EthSpec> ProductionValidatorClient<T> {
BeaconNodeHttpClient::from_components(beacon_node_url, beacon_node_http_client); BeaconNodeHttpClient::from_components(beacon_node_url, beacon_node_http_client);
// Perform some potentially long-running initialization tasks. // Perform some potentially long-running initialization tasks.
let (yaml_config, genesis_time, genesis_validators_root) = tokio::select! { let (genesis_time, genesis_validators_root) = tokio::select! {
tuple = init_from_beacon_node(&beacon_node, &context) => tuple?, tuple = init_from_beacon_node(&beacon_node, &context) => tuple?,
() = context.executor.exit() => return Err("Shutting down".to_string()) () = context.executor.exit() => return Err("Shutting down".to_string())
}; };
let beacon_node_spec = yaml_config.apply_to_chain_spec::<T>(&T::default_spec())
.ok_or_else(||
"The minimal/mainnet spec type of the beacon node does not match the validator client. \
See the --network command.".to_string()
)?;
if context.eth2_config.spec != beacon_node_spec {
return Err(
"The beacon node is using a different Eth2 specification to this validator client. \
See the --network command."
.to_string(),
);
}
let slot_clock = SystemTimeSlotClock::new( let slot_clock = SystemTimeSlotClock::new(
context.eth2_config.spec.genesis_slot, context.eth2_config.spec.genesis_slot,
@ -331,7 +318,7 @@ impl<T: EthSpec> ProductionValidatorClient<T> {
async fn init_from_beacon_node<E: EthSpec>( async fn init_from_beacon_node<E: EthSpec>(
beacon_node: &BeaconNodeHttpClient, beacon_node: &BeaconNodeHttpClient,
context: &RuntimeContext<E>, context: &RuntimeContext<E>,
) -> Result<(YamlConfig, u64, Hash256), String> { ) -> Result<(u64, Hash256), String> {
// Wait for the beacon node to come online. // Wait for the beacon node to come online.
wait_for_node(beacon_node, context.log()).await?; wait_for_node(beacon_node, context.log()).await?;
@ -341,6 +328,22 @@ async fn init_from_beacon_node<E: EthSpec>(
.map_err(|e| format!("Unable to read spec from beacon node: {:?}", e))? .map_err(|e| format!("Unable to read spec from beacon node: {:?}", e))?
.data; .data;
let beacon_node_spec = yaml_config
.apply_to_chain_spec::<E>(&E::default_spec())
.ok_or_else(|| {
"The minimal/mainnet spec type of the beacon node does not match the validator client. \
See the --network command."
.to_string()
})?;
if context.eth2_config.spec != beacon_node_spec {
return Err(
"The beacon node is using a different Eth2 specification to this validator client. \
See the --network command."
.to_string(),
);
}
let genesis = loop { let genesis = loop {
match beacon_node.get_beacon_genesis().await { match beacon_node.get_beacon_genesis().await {
Ok(genesis) => break genesis.data, Ok(genesis) => break genesis.data,
@ -401,11 +404,7 @@ async fn init_from_beacon_node<E: EthSpec>(
); );
} }
Ok(( Ok((genesis.genesis_time, genesis.genesis_validators_root))
yaml_config,
genesis.genesis_time,
genesis.genesis_validators_root,
))
} }
/// Request the version from the node, looping back and trying again on failure. Exit once the node /// Request the version from the node, looping back and trying again on failure. Exit once the node