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

Refine VC->BN config check (#2636)

Browse Source 
## Proposed Changes

Instead of checking for strict equality between a BN's spec and the VC's local spec, just check the genesis fork version. This prevents us from failing eagerly for minor differences, while still protecting the VC from connecting to a completely incompatible BN.

A warning is retained for the previous case where the specs are not exactly equal, which is to be expected if e.g. running against Infura before Infura configures the mainnet Altair fork epoch.
This commit is contained in:
Michael Sproul 2021-09-27 04:22:07 +00:00
parent e895074ba9
commit c0122e1a52
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
validator_client/src/beacon_node_fallback.rs
View File

@ -244,17 +244,35 @@ impl<E: EthSpec> CandidateBeaconNode<E> {
);
}
if *spec == beacon_node_spec {
Ok(())
} else {
if beacon_node_spec.genesis_fork_version != spec.genesis_fork_version {
error!(
log,
"The beacon node is using a different Eth2 specification to this validator client. \
See the --network command.";
"Beacon node is configured for a different network";
"endpoint" => %self.beacon_node,
"bn_genesis_fork" => ?beacon_node_spec.genesis_fork_version,
"our_genesis_fork" => ?spec.genesis_fork_version,
);
return Err(CandidateError::Incompatible);
} else if *spec != beacon_node_spec {
warn!(
log,
"Beacon node config does not match exactly";
"endpoint" => %self.beacon_node,
"advice" => "check that the BN is updated and configured for any upcoming forks",
);
debug!(
log,
"Beacon node config";
"config" => ?beacon_node_spec,
);
debug!(
log,
"Our config";
"config" => ?spec,
);
Err(CandidateError::Incompatible)
}
Ok(())
}
/// Checks if the beacon node is synced.