2019-03-28 03:32:02 +00:00
|
|
|
use clap::ArgMatches;
|
2019-06-09 00:21:50 +00:00
|
|
|
use serde_derive::{Deserialize, Serialize};
|
2019-02-14 01:09:18 +00:00
|
|
|
use std::path::PathBuf;
|
|
|
|
|
2019-11-25 04:48:24 +00:00
|
|
|
pub const DEFAULT_HTTP_SERVER: &str = "http://localhost:5052/";
|
Prepare for public testnet (#628)
* 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
2019-12-03 04:28:57 +00:00
|
|
|
pub const DEFAULT_DATA_DIR: &str = ".lighthouse/validators";
|
2020-05-18 06:25:16 +00:00
|
|
|
/// Path to the slashing protection database within the datadir.
|
|
|
|
pub const SLASHING_PROTECTION_FILENAME: &str = "slashing_protection.sqlite";
|
2019-09-01 09:33:43 +00:00
|
|
|
|
2019-11-25 04:48:24 +00:00
|
|
|
/// Specifies a method for obtaining validator keypairs.
|
2019-09-01 09:33:43 +00:00
|
|
|
#[derive(Clone)]
|
|
|
|
pub enum KeySource {
|
|
|
|
/// Load the keypairs from disk.
|
|
|
|
Disk,
|
|
|
|
/// Generate the keypairs (insecure, generates predictable keys).
|
2019-11-25 04:48:24 +00:00
|
|
|
InsecureKeypairs(Vec<usize>),
|
2019-09-01 09:33:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Default for KeySource {
|
|
|
|
fn default() -> Self {
|
|
|
|
KeySource::Disk
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-14 01:09:18 +00:00
|
|
|
/// Stores the core configuration for this validator instance.
|
2019-06-09 00:21:50 +00:00
|
|
|
#[derive(Clone, Serialize, Deserialize)]
|
2019-03-22 06:27:07 +00:00
|
|
|
pub struct Config {
|
2019-03-20 05:23:33 +00:00
|
|
|
/// The data directory, which stores all validator databases
|
2019-02-14 01:09:18 +00:00
|
|
|
pub data_dir: PathBuf,
|
2019-11-25 04:48:24 +00:00
|
|
|
/// Specifies how the validator client should load keypairs.
|
2019-09-01 09:33:43 +00:00
|
|
|
#[serde(skip)]
|
|
|
|
pub key_source: KeySource,
|
2019-11-25 04:48:24 +00:00
|
|
|
/// The http endpoint of the beacon node API.
|
|
|
|
///
|
|
|
|
/// Should be similar to `http://localhost:8080`
|
|
|
|
pub http_server: String,
|
2020-02-04 01:43:04 +00:00
|
|
|
/// If true, the validator client will still poll for duties and produce blocks even if the
|
|
|
|
/// beacon node is not synced at startup.
|
|
|
|
pub allow_unsynced_beacon_node: bool,
|
2020-05-18 06:25:16 +00:00
|
|
|
/// If true, register new validator keys with the slashing protection database.
|
|
|
|
pub auto_register: bool,
|
2019-02-14 01:09:18 +00:00
|
|
|
}
|
|
|
|
|
2019-03-23 04:46:51 +00:00
|
|
|
impl Default for Config {
|
2019-02-14 01:09:18 +00:00
|
|
|
/// Build a new configuration from defaults.
|
2019-03-23 04:46:51 +00:00
|
|
|
fn default() -> Self {
|
2020-05-18 06:25:16 +00:00
|
|
|
let data_dir = dirs::home_dir()
|
|
|
|
.map(|home| home.join(DEFAULT_DATA_DIR))
|
|
|
|
.unwrap_or_else(|| PathBuf::from("."));
|
2019-03-01 17:19:08 +00:00
|
|
|
Self {
|
2019-11-29 02:04:44 +00:00
|
|
|
data_dir,
|
2019-09-01 09:33:43 +00:00
|
|
|
key_source: <_>::default(),
|
2019-11-25 04:48:24 +00:00
|
|
|
http_server: DEFAULT_HTTP_SERVER.to_string(),
|
2020-02-04 01:43:04 +00:00
|
|
|
allow_unsynced_beacon_node: false,
|
2020-05-18 06:25:16 +00:00
|
|
|
auto_register: false,
|
2019-03-01 17:19:08 +00:00
|
|
|
}
|
2019-02-14 01:09:18 +00:00
|
|
|
}
|
2019-03-23 04:46:51 +00:00
|
|
|
}
|
2019-03-22 06:04:55 +00:00
|
|
|
|
2019-03-23 04:46:51 +00:00
|
|
|
impl Config {
|
2019-11-25 04:48:24 +00:00
|
|
|
/// 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();
|
2019-06-09 00:21:50 +00:00
|
|
|
|
Prepare for public testnet (#628)
* 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
2019-12-03 04:28:57 +00:00
|
|
|
// Read the `--datadir` flag.
|
|
|
|
//
|
|
|
|
// If it's not present, try and find the home directory (`~`) and push the default data
|
|
|
|
// directory onto it. If the home directory is not available, use the present directory.
|
|
|
|
config.data_dir = cli_args
|
|
|
|
.value_of("datadir")
|
|
|
|
.map(PathBuf::from)
|
|
|
|
.unwrap_or_else(|| {
|
|
|
|
dirs::home_dir()
|
|
|
|
.map(|home| home.join(DEFAULT_DATA_DIR))
|
|
|
|
.unwrap_or_else(|| PathBuf::from("."))
|
|
|
|
});
|
|
|
|
|
2019-11-25 04:48:24 +00:00
|
|
|
if let Some(server) = cli_args.value_of("server") {
|
|
|
|
config.http_server = server.to_string();
|
2019-09-01 09:33:43 +00:00
|
|
|
}
|
|
|
|
|
2020-02-04 01:43:04 +00:00
|
|
|
let mut config = match cli_args.subcommand() {
|
2019-11-25 04:48:24 +00:00
|
|
|
("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(),
|
|
|
|
);
|
|
|
|
}
|
2019-12-09 11:42:36 +00:00
|
|
|
process_testnet_subcommand(sub_cli_args, config)?
|
2019-11-25 04:48:24 +00:00
|
|
|
}
|
2019-12-09 11:42:36 +00:00
|
|
|
_ => {
|
|
|
|
config.key_source = KeySource::Disk;
|
|
|
|
config
|
|
|
|
}
|
|
|
|
};
|
2019-09-01 10:09:46 +00:00
|
|
|
|
2020-02-04 01:43:04 +00:00
|
|
|
config.allow_unsynced_beacon_node = cli_args.is_present("allow-unsynced");
|
2020-05-18 06:25:16 +00:00
|
|
|
config.auto_register = cli_args.is_present("auto-register");
|
2020-02-04 01:43:04 +00:00
|
|
|
|
2019-11-25 04:48:24 +00:00
|
|
|
Ok(config)
|
2019-09-01 10:09:46 +00:00
|
|
|
}
|
2019-11-25 04:48:24 +00:00
|
|
|
}
|
2019-09-01 10:09:46 +00:00
|
|
|
|
2019-11-25 04:48:24 +00:00
|
|
|
/// 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());
|
2019-09-10 16:13:54 +00:00
|
|
|
}
|
2019-03-23 04:46:51 +00:00
|
|
|
|
2019-11-25 04:48:24 +00:00
|
|
|
KeySource::InsecureKeypairs((first..last).collect())
|
2019-03-12 10:56:45 +00:00
|
|
|
}
|
2019-11-25 04:48:24 +00:00
|
|
|
_ => KeySource::Disk,
|
|
|
|
};
|
2019-03-20 05:23:33 +00:00
|
|
|
|
2019-11-25 04:48:24 +00:00
|
|
|
Ok(config)
|
2019-02-14 01:09:18 +00:00
|
|
|
}
|