* Update to spec v0.9.0 * Update to v0.9.1 * Bump spec tags for v0.9.1 * Formatting, fix CI failures * Resolve accidental KeyPair merge conflict * Document new BeaconState functions * Add `validator` changes from `validator-to-rest` * Add initial (failing) REST api tests * Fix signature parsing * Add more tests * Refactor http router * Add working tests for publish beacon block * Add validator duties tests * Move account_manager under `lighthouse` binary * Unify logfile handling in `environment` crate. * Fix incorrect cache drops in `advance_caches` * Update fork choice for v0.9.1 * Add `deposit_contract` crate * Add progress on validator onboarding * Add unfinished attesation code * Update account manager CLI * Write eth1 data file as hex string * Integrate ValidatorDirectory with validator_client * Move ValidatorDirectory into validator_client * Clean up some FIXMEs * Add beacon_chain_sim * Fix a few docs/logs * Expand `beacon_chain_sim` * Fix spec for `beacon_chain_sim * More testing for api * Start work on attestation endpoint * Reject empty attestations * Allow attestations to genesis block * Add working tests for `rest_api` validator endpoint * Remove grpc from beacon_node * Start heavy refactor of validator client - Block production is working * Prune old validator client files * Start works on attestation service * Add attestation service to validator client * Use full pubkey for validator directories * Add validator duties post endpoint * Use par_iter for keypair generation * Use bulk duties request in validator client * Add version http endpoint tests * Add interop keys and startup wait * Ensure a prompt exit * Add duties pruning * Fix compile error in beacon node tests * Add github workflow * Modify rust.yaml * Modify gitlab actions * Add to CI file * Add sudo to CI npm install * Move cargo fmt to own job in tests * Fix cargo fmt in CI * Add rustup update before cargo fmt * Change name of CI job * Make other CI jobs require cargo fmt * Add CI badge * Remove gitlab and travis files * Add different http timeout for debug * Update docker file, use makefile in CI * Use make in the dockerfile, skip the test * Use the makefile for debug GI test * Update book * Tidy grpc and misc things * Apply discv5 fixes * Address other minor issues * Fix warnings * Attempt fix for addr parsing * Tidy validator config, CLIs * Tidy comments * Tidy signing, reduce ForkService duplication * Fail if skipping too many slots * Set default recent genesis time to 0 * Add custom http timeout to validator * Fix compile bug in node_test_rig * Remove old bootstrap flag from val CLI * Update docs * Tidy val client * Change val client log levels * Add comments, more validity checks * Fix compile error, add comments * Undo changes to eth2-libp2p/src * Reduce duplication of keypair generation * Add more logging for validator duties * Fix beacon_chain_sim, nitpicks * Fix compile error, minor nits * Update to use v0.9.2 version of deposit contract * Add efforts to automate eth1 testnet deployment * Fix lcli testnet deployer * Modify bn CLI to parse eth2_testnet_dir * Progress with account_manager deposit tools * Make account manager submit deposits * Add password option for submitting deposits * Allow custom deposit amount * Add long names to lcli clap * Add password option to lcli deploy command * Fix minor bugs whilst testing * Address Michael's comments * Add refund-deposit-contract to lcli * Use time instead of skip count for denying long skips * Improve logging for eth1 * Fix bug with validator services exiting on error * Drop the block cache after genesis * Modify eth1 testnet config * Improve eth1 logging * Make validator wait until genesis time * Fix bug in eth1 voting * Add more logging to eth1 voting * Handle errors in eth1 http module * Set SECONDS_PER_DAY to sensible minimum * Shorten delay before testnet start * Ensure eth1 block is produced without any votes * Improve eth1 logging * Fix broken tests in eth1 * Tidy code in rest_api * Fix failing test in deposit_contract * Make CLI args more consistent * Change validator/duties endpoint * Add time-based skip slot limiting * Add new error type missed in previous commit * Add log when waiting for genesis * Refactor beacon node CLI * Remove unused dep * Add lcli eth1-genesis command * Fix bug in master merge * Apply clippy lints to beacon node * Add support for YamlConfig in Eth2TestnetDir * Upgrade tesnet deposit contract version * Remove unnecessary logging and correct formatting * Add a hardcoded eth2 testnet config * Ensure http server flag works. Overwrite configs with flags. * Ensure boot nodes are loaded from testnet dir * Fix account manager CLI bugs * Fix bugs with beacon node cli * Allow testnet dir without boot nodes * Write genesis state as SSZ * Remove ---/n from the start of testnet_dir files * Set default libp2p address * Tidy account manager CLI, add logging * Add check to see if testnet dir exists * Apply reviewers suggestions * Add HeadTracker struct * Add fork choice persistence * Shorten slot time for simulator * Add the /beacon/heads API endpoint * Update hardcoded testnet * Add tests for BeaconChain persistence + fix bugs * Extend BeaconChain persistence testing * Ensure chain is finalized b4 persistence tests * Ensure boot_enr.yaml is include in binary * Refactor beacon_chain_sim * Move files about in beacon sim * Update beacon_chain_sim * Fix bug with deposit inclusion * Increase log in genesis service, fix todo * Tidy sim, fix broken rest_api tests * Fix more broken tests * Update testnet * Fix broken rest api test * Tidy account manager CLI * Use tempdir for account manager * Stop hardcoded testnet dir from creating dir * Rename Eth2TestnetDir to Eth2TestnetConfig * Change hardcoded -> hard_coded * Tidy account manager * Add log to account manager * Tidy, ensure head tracker is loaded from disk * Tidy beacon chain builder * Tidy eth1_chain * Adds log support for simulator * Revert "Adds log support for simulator" This reverts commit ec77c66a052350f551db145cf20f213823428dd3. * Adds log support for simulator * Tidy after self-review * Change default log level * Address Michael's delicious PR comments * Fix off-by-one in tests
314 lines
13 KiB
Rust
314 lines
13 KiB
Rust
mod attestation_service;
|
|
mod block_service;
|
|
mod cli;
|
|
mod config;
|
|
mod duties_service;
|
|
mod fork_service;
|
|
mod validator_store;
|
|
|
|
pub mod validator_directory;
|
|
|
|
pub use cli::cli_app;
|
|
pub use config::{Config, KeySource};
|
|
|
|
use attestation_service::{AttestationService, AttestationServiceBuilder};
|
|
use block_service::{BlockService, BlockServiceBuilder};
|
|
use clap::ArgMatches;
|
|
use duties_service::{DutiesService, DutiesServiceBuilder};
|
|
use environment::RuntimeContext;
|
|
use exit_future::Signal;
|
|
use fork_service::{ForkService, ForkServiceBuilder};
|
|
use futures::{
|
|
future::{self, loop_fn, Loop},
|
|
Future, IntoFuture,
|
|
};
|
|
use remote_beacon_node::RemoteBeaconNode;
|
|
use slog::{error, info, Logger};
|
|
use slot_clock::SlotClock;
|
|
use slot_clock::SystemTimeSlotClock;
|
|
use std::time::{Duration, Instant};
|
|
use std::time::{SystemTime, UNIX_EPOCH};
|
|
use tokio::timer::Delay;
|
|
use types::EthSpec;
|
|
use validator_store::ValidatorStore;
|
|
|
|
/// The interval between attempts to contact the beacon node during startup.
|
|
const RETRY_DELAY: Duration = Duration::from_secs(2);
|
|
|
|
/// The global timeout for HTTP requests to the beacon node.
|
|
const HTTP_TIMEOUT: Duration = Duration::from_secs(12);
|
|
|
|
pub struct ProductionValidatorClient<T: EthSpec> {
|
|
context: RuntimeContext<T>,
|
|
duties_service: DutiesService<SystemTimeSlotClock, T>,
|
|
fork_service: ForkService<SystemTimeSlotClock, T>,
|
|
block_service: BlockService<SystemTimeSlotClock, T>,
|
|
attestation_service: AttestationService<SystemTimeSlotClock, T>,
|
|
exit_signals: Vec<Signal>,
|
|
}
|
|
|
|
impl<T: EthSpec> ProductionValidatorClient<T> {
|
|
/// Instantiates the validator client, _without_ starting the timers to trigger block
|
|
/// and attestation production.
|
|
pub fn new_from_cli(
|
|
context: RuntimeContext<T>,
|
|
cli_args: &ArgMatches,
|
|
) -> impl Future<Item = Self, Error = String> {
|
|
Config::from_cli(&cli_args)
|
|
.into_future()
|
|
.map_err(|e| format!("Unable to initialize config: {}", e))
|
|
.and_then(|config| Self::new(context, config))
|
|
}
|
|
|
|
/// Instantiates the validator client, _without_ starting the timers to trigger block
|
|
/// and attestation production.
|
|
pub fn new(
|
|
mut context: RuntimeContext<T>,
|
|
config: Config,
|
|
) -> impl Future<Item = Self, Error = String> {
|
|
let log_1 = context.log.clone();
|
|
let log_2 = context.log.clone();
|
|
let log_3 = context.log.clone();
|
|
let log_4 = context.log.clone();
|
|
|
|
info!(
|
|
log_1,
|
|
"Starting validator client";
|
|
"beacon_node" => &config.http_server,
|
|
"datadir" => format!("{:?}", config.data_dir),
|
|
);
|
|
|
|
RemoteBeaconNode::new_with_timeout(config.http_server.clone(), HTTP_TIMEOUT)
|
|
.map_err(|e| format!("Unable to init beacon node http client: {}", e))
|
|
.into_future()
|
|
.and_then(move |beacon_node| wait_for_node(beacon_node, log_2))
|
|
.and_then(|beacon_node| {
|
|
beacon_node
|
|
.http
|
|
.spec()
|
|
.get_eth2_config()
|
|
.map(|eth2_config| (beacon_node, eth2_config))
|
|
.map_err(|e| format!("Unable to read eth2 config from beacon node: {:?}", e))
|
|
})
|
|
.and_then(|(beacon_node, eth2_config)| {
|
|
beacon_node
|
|
.http
|
|
.beacon()
|
|
.get_genesis_time()
|
|
.map(|genesis_time| (beacon_node, eth2_config, genesis_time))
|
|
.map_err(|e| format!("Unable to read genesis time from beacon node: {:?}", e))
|
|
})
|
|
.and_then(move |(beacon_node, remote_eth2_config, genesis_time)| {
|
|
SystemTime::now()
|
|
.duration_since(UNIX_EPOCH)
|
|
.into_future()
|
|
.map_err(|e| format!("Unable to read system time: {:?}", e))
|
|
.and_then(move |now| {
|
|
let log = log_3.clone();
|
|
let genesis = Duration::from_secs(genesis_time);
|
|
|
|
// If the time now is less than (prior to) genesis, then delay until the
|
|
// genesis instant.
|
|
//
|
|
// If the validator client starts before genesis, it will get errors from
|
|
// the slot clock.
|
|
let box_future: Box<dyn Future<Item = _, Error = _> + Send> = if now
|
|
< genesis
|
|
{
|
|
info!(
|
|
log,
|
|
"Starting node prior to genesis";
|
|
"seconds_to_wait" => (genesis - now).as_secs()
|
|
);
|
|
|
|
Box::new(
|
|
Delay::new(Instant::now() + (genesis - now))
|
|
.map_err(|e| {
|
|
format!("Unable to create genesis wait delay: {:?}", e)
|
|
})
|
|
.map(move |_| (beacon_node, remote_eth2_config, genesis_time)),
|
|
)
|
|
} else {
|
|
info!(
|
|
log,
|
|
"Genesis has already occurred";
|
|
"seconds_ago" => (now - genesis).as_secs()
|
|
);
|
|
|
|
Box::new(future::ok((beacon_node, remote_eth2_config, genesis_time)))
|
|
};
|
|
|
|
box_future
|
|
})
|
|
})
|
|
.and_then(move |(beacon_node, remote_eth2_config, genesis_time)| {
|
|
let log = log_4.clone();
|
|
|
|
// Do not permit a connection to a beacon node using different spec constants.
|
|
if context.eth2_config.spec_constants != remote_eth2_config.spec_constants {
|
|
return Err(format!(
|
|
"Beacon node is using an incompatible spec. Got {}, expected {}",
|
|
remote_eth2_config.spec_constants, context.eth2_config.spec_constants
|
|
));
|
|
}
|
|
|
|
// Note: here we just assume the spec variables of the remote node. This is very useful
|
|
// for testnets, but perhaps a security issue when it comes to mainnet.
|
|
//
|
|
// A damaging attack would be for a beacon node to convince the validator client of a
|
|
// different `SLOTS_PER_EPOCH` variable. This could result in slashable messages being
|
|
// produced. We are safe from this because `SLOTS_PER_EPOCH` is a type-level constant
|
|
// for Lighthouse.
|
|
context.eth2_config = remote_eth2_config;
|
|
|
|
let slot_clock = SystemTimeSlotClock::new(
|
|
context.eth2_config.spec.genesis_slot,
|
|
Duration::from_secs(genesis_time),
|
|
Duration::from_millis(context.eth2_config.spec.milliseconds_per_slot),
|
|
);
|
|
|
|
let fork_service = ForkServiceBuilder::new()
|
|
.slot_clock(slot_clock.clone())
|
|
.beacon_node(beacon_node.clone())
|
|
.runtime_context(context.service_context("fork".into()))
|
|
.build()?;
|
|
|
|
let validator_store: ValidatorStore<SystemTimeSlotClock, T> =
|
|
match &config.key_source {
|
|
// Load pre-existing validators from the data dir.
|
|
//
|
|
// Use the `account_manager` to generate these files.
|
|
KeySource::Disk => ValidatorStore::load_from_disk(
|
|
config.data_dir.clone(),
|
|
context.eth2_config.spec.clone(),
|
|
fork_service.clone(),
|
|
log.clone(),
|
|
)?,
|
|
// Generate ephemeral insecure keypairs for testing purposes.
|
|
//
|
|
// Do not use in production.
|
|
KeySource::InsecureKeypairs(indices) => {
|
|
ValidatorStore::insecure_ephemeral_validators(
|
|
&indices,
|
|
context.eth2_config.spec.clone(),
|
|
fork_service.clone(),
|
|
log.clone(),
|
|
)?
|
|
}
|
|
};
|
|
|
|
info!(
|
|
log,
|
|
"Loaded validator keypair store";
|
|
"voting_validators" => validator_store.num_voting_validators()
|
|
);
|
|
|
|
let duties_service = DutiesServiceBuilder::new()
|
|
.slot_clock(slot_clock.clone())
|
|
.validator_store(validator_store.clone())
|
|
.beacon_node(beacon_node.clone())
|
|
.runtime_context(context.service_context("duties".into()))
|
|
.build()?;
|
|
|
|
let block_service = BlockServiceBuilder::new()
|
|
.duties_service(duties_service.clone())
|
|
.slot_clock(slot_clock.clone())
|
|
.validator_store(validator_store.clone())
|
|
.beacon_node(beacon_node.clone())
|
|
.runtime_context(context.service_context("block".into()))
|
|
.build()?;
|
|
|
|
let attestation_service = AttestationServiceBuilder::new()
|
|
.duties_service(duties_service.clone())
|
|
.slot_clock(slot_clock)
|
|
.validator_store(validator_store)
|
|
.beacon_node(beacon_node)
|
|
.runtime_context(context.service_context("attestation".into()))
|
|
.build()?;
|
|
|
|
Ok(Self {
|
|
context,
|
|
duties_service,
|
|
fork_service,
|
|
block_service,
|
|
attestation_service,
|
|
exit_signals: vec![],
|
|
})
|
|
})
|
|
}
|
|
|
|
pub fn start_service(&mut self) -> Result<(), String> {
|
|
let duties_exit = self
|
|
.duties_service
|
|
.start_update_service(&self.context.eth2_config.spec)
|
|
.map_err(|e| format!("Unable to start duties service: {}", e))?;
|
|
|
|
let fork_exit = self
|
|
.fork_service
|
|
.start_update_service(&self.context.eth2_config.spec)
|
|
.map_err(|e| format!("Unable to start fork service: {}", e))?;
|
|
|
|
let block_exit = self
|
|
.block_service
|
|
.start_update_service(&self.context.eth2_config.spec)
|
|
.map_err(|e| format!("Unable to start block service: {}", e))?;
|
|
|
|
let attestation_exit = self
|
|
.attestation_service
|
|
.start_update_service(&self.context.eth2_config.spec)
|
|
.map_err(|e| format!("Unable to start attestation service: {}", e))?;
|
|
|
|
self.exit_signals = vec![duties_exit, fork_exit, block_exit, attestation_exit];
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
/// Request the version from the node, looping back and trying again on failure. Exit once the node
|
|
/// has been contacted.
|
|
fn wait_for_node<E: EthSpec>(
|
|
beacon_node: RemoteBeaconNode<E>,
|
|
log: Logger,
|
|
) -> impl Future<Item = RemoteBeaconNode<E>, Error = String> {
|
|
// Try to get the version string from the node, looping until success is returned.
|
|
loop_fn(beacon_node.clone(), move |beacon_node| {
|
|
let log = log.clone();
|
|
beacon_node
|
|
.clone()
|
|
.http
|
|
.node()
|
|
.get_version()
|
|
.map_err(|e| format!("{:?}", e))
|
|
.then(move |result| {
|
|
let future: Box<dyn Future<Item = Loop<_, _>, Error = String> + Send> = match result
|
|
{
|
|
Ok(version) => {
|
|
info!(
|
|
log,
|
|
"Connected to beacon node";
|
|
"version" => version,
|
|
);
|
|
|
|
Box::new(future::ok(Loop::Break(beacon_node)))
|
|
}
|
|
Err(e) => {
|
|
error!(
|
|
log,
|
|
"Unable to connect to beacon node";
|
|
"error" => format!("{:?}", e),
|
|
);
|
|
|
|
Box::new(
|
|
Delay::new(Instant::now() + RETRY_DELAY)
|
|
.map_err(|e| format!("Failed to trigger delay: {:?}", e))
|
|
.and_then(|_| future::ok(Loop::Continue(beacon_node))),
|
|
)
|
|
}
|
|
};
|
|
|
|
future
|
|
})
|
|
})
|
|
.map(|_| beacon_node)
|
|
}
|