b22ac95d7f
## Issue Addressed Resolves: https://github.com/sigp/lighthouse/issues/2741 Includes: https://github.com/sigp/lighthouse/pull/2853 so that we can get ssz static tests passing here on v1.1.6. If we want to merge that first, we can make this diff slightly smaller ## Proposed Changes - Changes the `justified_epoch` and `finalized_epoch` in the `ProtoArrayNode` each to an `Option<Checkpoint>`. The `Option` is necessary only for the migration, so not ideal. But does allow us to add a default logic to `None` on these fields during the database migration. - Adds a database migration from a legacy fork choice struct to the new one, search for all necessary block roots in fork choice by iterating through blocks in the db. - updates related to https://github.com/ethereum/consensus-specs/pull/2727 - We will have to update the persisted forkchoice to make sure the justified checkpoint stored is correct according to the updated fork choice logic. This boils down to setting the forkchoice store's justified checkpoint to the justified checkpoint of the block that advanced the finalized checkpoint to the current one. - AFAICT there's no migration steps necessary for the update to allow applying attestations from prior blocks, but would appreciate confirmation on that - I updated the consensus spec tests to v1.1.6 here, but they will fail until we also implement the proposer score boost updates. I confirmed that the previously failing scenario `new_finalized_slot_is_justified_checkpoint_ancestor` will now pass after the boost updates, but haven't confirmed _all_ tests will pass because I just quickly stubbed out the proposer boost test scenario formatting. - This PR now also includes proposer boosting https://github.com/ethereum/consensus-specs/pull/2730 ## Additional Info I realized checking justified and finalized roots in fork choice makes it more likely that we trigger this bug: https://github.com/ethereum/consensus-specs/pull/2727 It's possible the combination of justified checkpoint and finalized checkpoint in the forkchoice store is different from in any block in fork choice. So when trying to startup our store's justified checkpoint seems invalid to the rest of fork choice (but it should be valid). When this happens we get an `InvalidBestNode` error and fail to start up. So I'm including that bugfix in this branch. Todo: - [x] Fix fork choice tests - [x] Self review - [x] Add fix for https://github.com/ethereum/consensus-specs/pull/2727 - [x] Rebase onto Kintusgi - [x] Fix `num_active_validators` calculation as @michaelsproul pointed out - [x] Clean up db migrations Co-authored-by: realbigsean <seananderson33@gmail.com>
186 lines
6.2 KiB
Rust
186 lines
6.2 KiB
Rust
#[macro_use]
|
|
extern crate clap;
|
|
|
|
mod cli;
|
|
mod config;
|
|
|
|
pub use beacon_chain;
|
|
use beacon_chain::store::LevelDB;
|
|
use beacon_chain::{
|
|
builder::Witness, eth1_chain::CachingEth1Backend, slot_clock::SystemTimeSlotClock,
|
|
TimeoutRwLock,
|
|
};
|
|
use clap::ArgMatches;
|
|
pub use cli::cli_app;
|
|
pub use client::{Client, ClientBuilder, ClientConfig, ClientGenesis};
|
|
pub use config::{get_config, get_data_dir, set_network_config};
|
|
use environment::RuntimeContext;
|
|
pub use eth2_config::Eth2Config;
|
|
use slasher::Slasher;
|
|
use slog::{info, warn};
|
|
use std::ops::{Deref, DerefMut};
|
|
use std::sync::Arc;
|
|
use types::EthSpec;
|
|
|
|
/// A type-alias to the tighten the definition of a production-intended `Client`.
|
|
pub type ProductionClient<E> =
|
|
Client<Witness<SystemTimeSlotClock, CachingEth1Backend<E>, E, LevelDB<E>, LevelDB<E>>>;
|
|
|
|
/// The beacon node `Client` that will be used in production.
|
|
///
|
|
/// Generic over some `EthSpec`.
|
|
///
|
|
/// ## Notes:
|
|
///
|
|
/// Despite being titled `Production...`, this code is not ready for production. The name
|
|
/// demonstrates an intention, not a promise.
|
|
pub struct ProductionBeaconNode<E: EthSpec>(ProductionClient<E>);
|
|
|
|
impl<E: EthSpec> ProductionBeaconNode<E> {
|
|
/// Starts a new beacon node `Client` in the given `environment`.
|
|
///
|
|
/// Identical to `start_from_client_config`, however the `client_config` is generated from the
|
|
/// given `matches` and potentially configuration files on the local filesystem or other
|
|
/// configurations hosted remotely.
|
|
pub async fn new_from_cli(
|
|
context: RuntimeContext<E>,
|
|
matches: ArgMatches<'static>,
|
|
) -> Result<Self, String> {
|
|
let client_config = get_config::<E>(&matches, &context)?;
|
|
Self::new(context, client_config).await
|
|
}
|
|
|
|
/// Starts a new beacon node `Client` in the given `environment`.
|
|
///
|
|
/// Client behaviour is defined by the given `client_config`.
|
|
pub async fn new(
|
|
context: RuntimeContext<E>,
|
|
mut client_config: ClientConfig,
|
|
) -> Result<Self, String> {
|
|
let spec = context.eth2_config().spec.clone();
|
|
let client_genesis = client_config.genesis.clone();
|
|
let store_config = client_config.store.clone();
|
|
let log = context.log().clone();
|
|
let datadir = client_config.create_data_dir()?;
|
|
let db_path = client_config.create_db_path()?;
|
|
let freezer_db_path = client_config.create_freezer_db_path()?;
|
|
let executor = context.executor.clone();
|
|
|
|
if let Some(legacy_dir) = client_config.get_existing_legacy_data_dir() {
|
|
warn!(
|
|
log,
|
|
"Legacy datadir location";
|
|
"msg" => "this occurs when using relative paths for a datadir location",
|
|
"location" => ?legacy_dir,
|
|
)
|
|
}
|
|
|
|
if !client_config.chain.enable_lock_timeouts {
|
|
info!(log, "Disabling lock timeouts globally");
|
|
TimeoutRwLock::disable_timeouts()
|
|
}
|
|
|
|
let builder = ClientBuilder::new(context.eth_spec_instance.clone())
|
|
.runtime_context(context)
|
|
.chain_spec(spec)
|
|
.http_api_config(client_config.http_api.clone())
|
|
.disk_store(
|
|
&datadir,
|
|
&db_path,
|
|
&freezer_db_path,
|
|
store_config,
|
|
log.clone(),
|
|
)?;
|
|
|
|
let builder = if let Some(slasher_config) = client_config.slasher.clone() {
|
|
let slasher = Arc::new(
|
|
Slasher::open(slasher_config, log.new(slog::o!("service" => "slasher")))
|
|
.map_err(|e| format!("Slasher open error: {:?}", e))?,
|
|
);
|
|
builder.slasher(slasher)
|
|
} else {
|
|
builder
|
|
};
|
|
|
|
let builder = if let Some(monitoring_config) = &mut client_config.monitoring_api {
|
|
monitoring_config.db_path = Some(db_path);
|
|
monitoring_config.freezer_db_path = Some(freezer_db_path);
|
|
builder.monitoring_client(monitoring_config)?
|
|
} else {
|
|
builder
|
|
};
|
|
|
|
let builder = builder
|
|
.beacon_chain_builder(client_genesis, client_config.clone())
|
|
.await?;
|
|
let builder = if client_config.sync_eth1_chain && !client_config.dummy_eth1_backend {
|
|
info!(
|
|
log,
|
|
"Block production enabled";
|
|
"endpoints" => format!("{:?}", &client_config.eth1.endpoints),
|
|
"method" => "json rpc via http"
|
|
);
|
|
builder
|
|
.caching_eth1_backend(client_config.eth1.clone())
|
|
.await?
|
|
} else if client_config.dummy_eth1_backend {
|
|
warn!(
|
|
log,
|
|
"Block production impaired";
|
|
"reason" => "dummy eth1 backend is enabled"
|
|
);
|
|
builder.dummy_eth1_backend()?
|
|
} else {
|
|
info!(
|
|
log,
|
|
"Block production disabled";
|
|
"reason" => "no eth1 backend configured"
|
|
);
|
|
builder.no_eth1_backend()?
|
|
};
|
|
|
|
let builder = builder.system_time_slot_clock()?;
|
|
|
|
// Inject the executor into the discv5 network config.
|
|
let discv5_executor = Discv5Executor(executor);
|
|
client_config.network.discv5_config.executor = Some(Box::new(discv5_executor));
|
|
|
|
builder
|
|
.build_beacon_chain()?
|
|
.network(&client_config.network)
|
|
.await?
|
|
.notifier()?
|
|
.http_metrics_config(client_config.http_metrics.clone())
|
|
.build()
|
|
.map(Self)
|
|
}
|
|
|
|
pub fn into_inner(self) -> ProductionClient<E> {
|
|
self.0
|
|
}
|
|
}
|
|
|
|
impl<E: EthSpec> Deref for ProductionBeaconNode<E> {
|
|
type Target = ProductionClient<E>;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl<E: EthSpec> DerefMut for ProductionBeaconNode<E> {
|
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
|
&mut self.0
|
|
}
|
|
}
|
|
|
|
// Implements the Discv5 Executor trait over our global executor
|
|
#[derive(Clone)]
|
|
struct Discv5Executor(task_executor::TaskExecutor);
|
|
|
|
impl lighthouse_network::discv5::Executor for Discv5Executor {
|
|
fn spawn(&self, future: std::pin::Pin<Box<dyn std::future::Future<Output = ()> + Send>>) {
|
|
self.0.spawn(future, "discv5")
|
|
}
|
|
}
|