mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-18 04:13:00 +00:00
* 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 * Address Michael's comments
102 lines
3.3 KiB
Rust
102 lines
3.3 KiB
Rust
use clap::ArgMatches;
|
|
use serde_derive::{Deserialize, Serialize};
|
|
use std::path::PathBuf;
|
|
|
|
pub const DEFAULT_HTTP_SERVER: &str = "http://localhost:5052/";
|
|
|
|
/// Specifies a method for obtaining validator keypairs.
|
|
#[derive(Clone)]
|
|
pub enum KeySource {
|
|
/// Load the keypairs from disk.
|
|
Disk,
|
|
/// Generate the keypairs (insecure, generates predictable keys).
|
|
InsecureKeypairs(Vec<usize>),
|
|
}
|
|
|
|
impl Default for KeySource {
|
|
fn default() -> Self {
|
|
KeySource::Disk
|
|
}
|
|
}
|
|
|
|
/// Stores the core configuration for this validator instance.
|
|
#[derive(Clone, Serialize, Deserialize)]
|
|
pub struct Config {
|
|
/// The data directory, which stores all validator databases
|
|
pub data_dir: PathBuf,
|
|
/// Specifies how the validator client should load keypairs.
|
|
#[serde(skip)]
|
|
pub key_source: KeySource,
|
|
/// The http endpoint of the beacon node API.
|
|
///
|
|
/// Should be similar to `http://localhost:8080`
|
|
pub http_server: String,
|
|
}
|
|
|
|
impl Default for Config {
|
|
/// Build a new configuration from defaults.
|
|
fn default() -> Self {
|
|
Self {
|
|
data_dir: PathBuf::from(".lighthouse/validators"),
|
|
key_source: <_>::default(),
|
|
http_server: DEFAULT_HTTP_SERVER.to_string(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Config {
|
|
/// Returns a `Default` implementation of `Self` with some parameters modified by the supplied
|
|
/// `cli_args`.
|
|
pub fn from_cli(cli_args: &ArgMatches) -> Result<Config, String> {
|
|
let mut config = Config::default();
|
|
|
|
if let Some(server) = cli_args.value_of("server") {
|
|
config.http_server = server.to_string();
|
|
}
|
|
|
|
let config = match cli_args.subcommand() {
|
|
("testnet", Some(sub_cli_args)) => {
|
|
if cli_args.is_present("eth2-config") && sub_cli_args.is_present("bootstrap") {
|
|
return Err(
|
|
"Cannot specify --eth2-config and --bootstrap as it may result \
|
|
in ambiguity."
|
|
.into(),
|
|
);
|
|
}
|
|
process_testnet_subcommand(sub_cli_args, config)
|
|
}
|
|
_ => return Err("You must use the testnet command. See '--help'.".into()),
|
|
}?;
|
|
|
|
Ok(config)
|
|
}
|
|
}
|
|
|
|
/// Parses the `testnet` CLI subcommand, modifying the `config` based upon the parameters in
|
|
/// `cli_args`.
|
|
fn process_testnet_subcommand(cli_args: &ArgMatches, mut config: Config) -> Result<Config, String> {
|
|
config.key_source = match cli_args.subcommand() {
|
|
("insecure", Some(sub_cli_args)) => {
|
|
let first = sub_cli_args
|
|
.value_of("first_validator")
|
|
.ok_or_else(|| "No first validator supplied")?
|
|
.parse::<usize>()
|
|
.map_err(|e| format!("Unable to parse first validator: {:?}", e))?;
|
|
let last = sub_cli_args
|
|
.value_of("last_validator")
|
|
.ok_or_else(|| "No last validator supplied")?
|
|
.parse::<usize>()
|
|
.map_err(|e| format!("Unable to parse last validator: {:?}", e))?;
|
|
|
|
if last < first {
|
|
return Err("Cannot supply a last validator less than the first".to_string());
|
|
}
|
|
|
|
KeySource::InsecureKeypairs((first..last).collect())
|
|
}
|
|
_ => KeySource::Disk,
|
|
};
|
|
|
|
Ok(config)
|
|
}
|