Eth1 Integration (#542)
* Refactor to cache Eth1Data
* Fix merge conflicts and minor refactorings
* Rename Eth1Cache to Eth1DataCache
* Refactor events subscription
* Add deposits module to interface with BeaconChain deposits
* Remove utils
* Rename to types.rs and add trait constraints to Eth1DataFetcher
* Confirm to trait constraints. Make Web3DataFetcher cloneable
* Make fetcher object member of deposit and eth1_data cache and other fixes
* Fix update_cache function
* Move fetch_eth1_data to impl block
* Fix deposit tests
* Create Eth1 object for interfacing with Beacon chain
* Add `run` function for running update_cache and subscribe_deposit_logs tasks
* Add logging
* Run `cargo fmt` and make tests pass
* Convert sync functions to async
* Add timeouts to web3 functions
* Return futures from cache functions
* Add failed chaining of futures
* Working cache updation
* Clean up tests and `update_cache` function
* Refactor `get_eth1_data` functions to work with future returning functions
* Refactor eth1 `run` function to work with modified `update_cache` api
* Minor changes
* Add distance parameter to `update_cache`
* Fix tests and other minor fixes
* Working integration with cache and deposits
* Add merkle_tree construction, proof generation and verification code
* Add function to construct and fetch Deposits for BeaconNode
* Add error handling
* Import ssz
* Add error handling to eth1 cache and fix minor errors
* Run rustfmt
* Fix minor bug
* Rename Eth1Error and change to Result<T>
* Change deposit fetching mechanism from notification based to poll based
* Add deposits from eth1 chain in a given range every `x` blocks
* Modify `run` function to accommodate changes
* Minor fixes
* Fix formatting
* Initial commit. web3 api working.
* Tidied up lib. Add function for fetching logs.
* Refactor with `Eth1DataFetcher` trait
* Add parsing for deposit contract logs and get_eth1_data function
* Add `get_eth1_votes` function
* Refactor to cache Eth1Data
* Fix merge conflicts and minor refactorings
* Rename Eth1Cache to Eth1DataCache
* Refactor events subscription
* Add deposits module to interface with BeaconChain deposits
* Remove utils
* Rename to types.rs and add trait constraints to Eth1DataFetcher
* Confirm to trait constraints. Make Web3DataFetcher cloneable
* Make fetcher object member of deposit and eth1_data cache and other fixes
* Fix update_cache function
* Move fetch_eth1_data to impl block
* Fix deposit tests
* Create Eth1 object for interfacing with Beacon chain
* Add `run` function for running update_cache and subscribe_deposit_logs tasks
* Add logging
* Run `cargo fmt` and make tests pass
* Convert sync functions to async
* Add timeouts to web3 functions
* Return futures from cache functions
* Add failed chaining of futures
* Working cache updation
* Clean up tests and `update_cache` function
* Refactor `get_eth1_data` functions to work with future returning functions
* Refactor eth1 `run` function to work with modified `update_cache` api
* Minor changes
* Add distance parameter to `update_cache`
* Fix tests and other minor fixes
* Working integration with cache and deposits
* Add merkle_tree construction, proof generation and verification code
* Add function to construct and fetch Deposits for BeaconNode
* Add error handling
* Import ssz
* Add error handling to eth1 cache and fix minor errors
* Run rustfmt
* Fix minor bug
* Rename Eth1Error and change to Result<T>
* Change deposit fetching mechanism from notification based to poll based
* Add deposits from eth1 chain in a given range every `x` blocks
* Modify `run` function to accommodate changes
* Minor fixes
* Fix formatting
* Fix merge issue
* Refactor with `Config` struct. Remote `ContractConfig`
* Rename eth1_chain crate to eth1
* Rename files and read abi file using `fs::read`
* Move eth1 to lib
* Remove unnecessary mutability constraint
* Add `Web3Backend` for returning actual eth1 data
* Refactor `get_eth1_votes` to return a Result
* Delete `eth1_chain` crate
* Return `Result` from `get_deposits`
* Fix range of deposits to return to beacon chain
* Add `get_block_height_by_hash` trait function
* Add naive method for getting `previous_eth1_distance`
* Add eth1 config params to main config
* Add instructions for setting up eth1 testing environment
* Add build script to fetch deposit contract abi
* Contract ABI is part of compiled binary
* Fix minor bugs
* Move docs to lib
* Add timeout to config
* Remove print statements
* Change warn to error
* Fix typos
* Removed prints in test and get timeout value from config
* Fixed error types
* Added logging to web3_fetcher
* Refactor for modified web3 api
* Fix minor stuff
* Add build script
* Tidy, hide eth1 integration tests behind flag
* Add http crate
* Add first stages of eth1_test_rig
* Fix deposits on test rig
* Fix bug with deposit count method
* Add block hash getter to http eth1
* Clean eth1 http crate and tests
* Add script to start ganache
* Adds deposit tree to eth1-http
* Extend deposit tree tests
* Tidy tests in eth1-http
* Add more detail to get block request
* Add block cache to eth1-http
* Rename deposit tree to deposit cache
* Add inital updating to eth1-http
* Tidy updater
* Fix compile bugs in tests
* Adds an Eth1DataCache builder
* Reorg eth1-http files
* Add (failing) tests for eth1 updater
* Rename files, fix bug in eth1-http
* Ensure that ganache timestamps are increasing
* Fix bugs with getting eth1data ancestors
* Improve eth1 testing, fix bugs
* Add truncate method to block cache
* Add pruning to block cache update process
* Add tests for block pruning
* Allow for dropping an expired cache.
* Add more comments
* Add first compiling version of deposit updater
* Add common fn for getting range of required blocks
* Add passing deposit update test
* Improve tests
* Fix block pruning bug
* Add tests for running two updates at once
* Add updater services to eth1
* Add deposit collection to beacon chain
* Add incomplete builder experiments
* Add first working version of beacon chain builder
* Update test harness to new beacon chain type
* Rename builder file, tidy
* Add first working client builder
* Progress further on client builder
* Update becaon node binary to use client builder
* Ensure release tests compile
* Remove old eth1 crate
* Add first pass of new lighthouse binary
* Fix websocket server startup
* Remove old binary code from beacon_node crate
* Add first working beacon node tests
* Add genesis crate, new eth1 cache_2
* Add Serivce to Eth1Cache
* Refactor with general eth1 improvements
* Add passing genesis test
* Tidy, add comments
* Add more comments to eth1 service
* Add further eth1 progress
* Fix some bugs with genesis
* Fix eth1 bugs, make eth1 linking more efficient
* Shift logic in genesis service
* Add more comments to genesis service
* Add gzip, max request values, timeouts to http
* Update testnet parameters to suit goerli testnet
* Add ability to vary Fork, fix custom spec
* Be more explicit about deposit fork version
* Start adding beacon chain eth1 option
* Add more flexibility to prod client
* Further runtime refactoring
* Allow for starting from store
* Add bootstrapping to client config
* Add remote_beacon_node crate
* Update eth1 service for more configurability
* Update eth1 tests to use less runtimes
* Patch issues with tests using too many files
* Move dummy eth1 backend flag
* Ensure all tests pass
* Add ganache-cli to Dockerfile
* Use a special docker hub image for testing
* Appease clippy
* Move validator client into lighthouse binary
* Allow starting with dummy eth1 backend
* Improve logging
* Fix dummy eth1 backend from cli
* Add extra testnet command
* Ensure consistent spec in beacon node
* Update eth1 rig to work on goerli
* Tidy lcli, start adding support for yaml config
* Add incomplete YamlConfig struct
* Remove efforts at YamlConfig
* Add incomplete eth1 voting. Blocked on spec issues
* Add (untested) first pass at eth1 vote algo
* Add tests for winning vote
* Add more tests for eth1 chain
* Add more eth1 voting tests
* Added more eth1 voting testing
* Change test name
* Add more tests to eth1 chain
* Tidy eth1 generics, add more tests
* Improve comments
* Tidy beacon_node tests
* Tidy, rename JsonRpc.. to Caching..
* Tidy voting logic
* Tidy builder docs
* Add comments, tidy eth1
* Add more comments to eth1
* Fix bug with winning_vote
* Add doc comments to the `ClientBuilder`
* Remove commented-out code
* Improve `ClientBuilder` docs
* Add comments to client config
* Add decoding test for `ClientConfig`
* Remove unused `DepositSet` struct
* Tidy `block_cache`
* Remove commented out lines
* Remove unused code in `eth1` crate
* Remove old validator binary `main.rs`
* Tidy, fix tests compile error
* Add initial tests for get_deposits
* Remove dead code in eth1_test_rig
* Update TestingDepositBuilder
* Add testing for getting eth1 deposits
* Fix duplicate rand dep
* Remove dead code
* Remove accidentally-added files
* Fix comment in eth1_genesis_service
* Add .gitignore for eth1_test_rig
* Fix bug in eth1_genesis_service
* Remove dead code from eth2_config
* Fix tabs/spaces in root Cargo.toml
* Tidy eth1 crate
* Allow for re-use of eth1 service after genesis
* Update docs for new CLI
* Change README gif
* Tidy eth1 http module
* Tidy eth1 service
* Tidy environment crate
* Remove unused file
* Tidy, add comments
* Remove commented-out code
* Address majority of Michael's comments
* Address other PR comments
* Add link to issue alongside TODO
2019-11-15 03:47:51 +00:00
|
|
|
mod attestation_producer;
|
|
|
|
mod block_producer;
|
|
|
|
mod cli;
|
|
|
|
mod config;
|
|
|
|
mod duties;
|
|
|
|
mod error;
|
|
|
|
mod service;
|
|
|
|
mod signer;
|
2019-03-20 05:23:33 +00:00
|
|
|
|
Eth1 Integration (#542)
* Refactor to cache Eth1Data
* Fix merge conflicts and minor refactorings
* Rename Eth1Cache to Eth1DataCache
* Refactor events subscription
* Add deposits module to interface with BeaconChain deposits
* Remove utils
* Rename to types.rs and add trait constraints to Eth1DataFetcher
* Confirm to trait constraints. Make Web3DataFetcher cloneable
* Make fetcher object member of deposit and eth1_data cache and other fixes
* Fix update_cache function
* Move fetch_eth1_data to impl block
* Fix deposit tests
* Create Eth1 object for interfacing with Beacon chain
* Add `run` function for running update_cache and subscribe_deposit_logs tasks
* Add logging
* Run `cargo fmt` and make tests pass
* Convert sync functions to async
* Add timeouts to web3 functions
* Return futures from cache functions
* Add failed chaining of futures
* Working cache updation
* Clean up tests and `update_cache` function
* Refactor `get_eth1_data` functions to work with future returning functions
* Refactor eth1 `run` function to work with modified `update_cache` api
* Minor changes
* Add distance parameter to `update_cache`
* Fix tests and other minor fixes
* Working integration with cache and deposits
* Add merkle_tree construction, proof generation and verification code
* Add function to construct and fetch Deposits for BeaconNode
* Add error handling
* Import ssz
* Add error handling to eth1 cache and fix minor errors
* Run rustfmt
* Fix minor bug
* Rename Eth1Error and change to Result<T>
* Change deposit fetching mechanism from notification based to poll based
* Add deposits from eth1 chain in a given range every `x` blocks
* Modify `run` function to accommodate changes
* Minor fixes
* Fix formatting
* Initial commit. web3 api working.
* Tidied up lib. Add function for fetching logs.
* Refactor with `Eth1DataFetcher` trait
* Add parsing for deposit contract logs and get_eth1_data function
* Add `get_eth1_votes` function
* Refactor to cache Eth1Data
* Fix merge conflicts and minor refactorings
* Rename Eth1Cache to Eth1DataCache
* Refactor events subscription
* Add deposits module to interface with BeaconChain deposits
* Remove utils
* Rename to types.rs and add trait constraints to Eth1DataFetcher
* Confirm to trait constraints. Make Web3DataFetcher cloneable
* Make fetcher object member of deposit and eth1_data cache and other fixes
* Fix update_cache function
* Move fetch_eth1_data to impl block
* Fix deposit tests
* Create Eth1 object for interfacing with Beacon chain
* Add `run` function for running update_cache and subscribe_deposit_logs tasks
* Add logging
* Run `cargo fmt` and make tests pass
* Convert sync functions to async
* Add timeouts to web3 functions
* Return futures from cache functions
* Add failed chaining of futures
* Working cache updation
* Clean up tests and `update_cache` function
* Refactor `get_eth1_data` functions to work with future returning functions
* Refactor eth1 `run` function to work with modified `update_cache` api
* Minor changes
* Add distance parameter to `update_cache`
* Fix tests and other minor fixes
* Working integration with cache and deposits
* Add merkle_tree construction, proof generation and verification code
* Add function to construct and fetch Deposits for BeaconNode
* Add error handling
* Import ssz
* Add error handling to eth1 cache and fix minor errors
* Run rustfmt
* Fix minor bug
* Rename Eth1Error and change to Result<T>
* Change deposit fetching mechanism from notification based to poll based
* Add deposits from eth1 chain in a given range every `x` blocks
* Modify `run` function to accommodate changes
* Minor fixes
* Fix formatting
* Fix merge issue
* Refactor with `Config` struct. Remote `ContractConfig`
* Rename eth1_chain crate to eth1
* Rename files and read abi file using `fs::read`
* Move eth1 to lib
* Remove unnecessary mutability constraint
* Add `Web3Backend` for returning actual eth1 data
* Refactor `get_eth1_votes` to return a Result
* Delete `eth1_chain` crate
* Return `Result` from `get_deposits`
* Fix range of deposits to return to beacon chain
* Add `get_block_height_by_hash` trait function
* Add naive method for getting `previous_eth1_distance`
* Add eth1 config params to main config
* Add instructions for setting up eth1 testing environment
* Add build script to fetch deposit contract abi
* Contract ABI is part of compiled binary
* Fix minor bugs
* Move docs to lib
* Add timeout to config
* Remove print statements
* Change warn to error
* Fix typos
* Removed prints in test and get timeout value from config
* Fixed error types
* Added logging to web3_fetcher
* Refactor for modified web3 api
* Fix minor stuff
* Add build script
* Tidy, hide eth1 integration tests behind flag
* Add http crate
* Add first stages of eth1_test_rig
* Fix deposits on test rig
* Fix bug with deposit count method
* Add block hash getter to http eth1
* Clean eth1 http crate and tests
* Add script to start ganache
* Adds deposit tree to eth1-http
* Extend deposit tree tests
* Tidy tests in eth1-http
* Add more detail to get block request
* Add block cache to eth1-http
* Rename deposit tree to deposit cache
* Add inital updating to eth1-http
* Tidy updater
* Fix compile bugs in tests
* Adds an Eth1DataCache builder
* Reorg eth1-http files
* Add (failing) tests for eth1 updater
* Rename files, fix bug in eth1-http
* Ensure that ganache timestamps are increasing
* Fix bugs with getting eth1data ancestors
* Improve eth1 testing, fix bugs
* Add truncate method to block cache
* Add pruning to block cache update process
* Add tests for block pruning
* Allow for dropping an expired cache.
* Add more comments
* Add first compiling version of deposit updater
* Add common fn for getting range of required blocks
* Add passing deposit update test
* Improve tests
* Fix block pruning bug
* Add tests for running two updates at once
* Add updater services to eth1
* Add deposit collection to beacon chain
* Add incomplete builder experiments
* Add first working version of beacon chain builder
* Update test harness to new beacon chain type
* Rename builder file, tidy
* Add first working client builder
* Progress further on client builder
* Update becaon node binary to use client builder
* Ensure release tests compile
* Remove old eth1 crate
* Add first pass of new lighthouse binary
* Fix websocket server startup
* Remove old binary code from beacon_node crate
* Add first working beacon node tests
* Add genesis crate, new eth1 cache_2
* Add Serivce to Eth1Cache
* Refactor with general eth1 improvements
* Add passing genesis test
* Tidy, add comments
* Add more comments to eth1 service
* Add further eth1 progress
* Fix some bugs with genesis
* Fix eth1 bugs, make eth1 linking more efficient
* Shift logic in genesis service
* Add more comments to genesis service
* Add gzip, max request values, timeouts to http
* Update testnet parameters to suit goerli testnet
* Add ability to vary Fork, fix custom spec
* Be more explicit about deposit fork version
* Start adding beacon chain eth1 option
* Add more flexibility to prod client
* Further runtime refactoring
* Allow for starting from store
* Add bootstrapping to client config
* Add remote_beacon_node crate
* Update eth1 service for more configurability
* Update eth1 tests to use less runtimes
* Patch issues with tests using too many files
* Move dummy eth1 backend flag
* Ensure all tests pass
* Add ganache-cli to Dockerfile
* Use a special docker hub image for testing
* Appease clippy
* Move validator client into lighthouse binary
* Allow starting with dummy eth1 backend
* Improve logging
* Fix dummy eth1 backend from cli
* Add extra testnet command
* Ensure consistent spec in beacon node
* Update eth1 rig to work on goerli
* Tidy lcli, start adding support for yaml config
* Add incomplete YamlConfig struct
* Remove efforts at YamlConfig
* Add incomplete eth1 voting. Blocked on spec issues
* Add (untested) first pass at eth1 vote algo
* Add tests for winning vote
* Add more tests for eth1 chain
* Add more eth1 voting tests
* Added more eth1 voting testing
* Change test name
* Add more tests to eth1 chain
* Tidy eth1 generics, add more tests
* Improve comments
* Tidy beacon_node tests
* Tidy, rename JsonRpc.. to Caching..
* Tidy voting logic
* Tidy builder docs
* Add comments, tidy eth1
* Add more comments to eth1
* Fix bug with winning_vote
* Add doc comments to the `ClientBuilder`
* Remove commented-out code
* Improve `ClientBuilder` docs
* Add comments to client config
* Add decoding test for `ClientConfig`
* Remove unused `DepositSet` struct
* Tidy `block_cache`
* Remove commented out lines
* Remove unused code in `eth1` crate
* Remove old validator binary `main.rs`
* Tidy, fix tests compile error
* Add initial tests for get_deposits
* Remove dead code in eth1_test_rig
* Update TestingDepositBuilder
* Add testing for getting eth1 deposits
* Fix duplicate rand dep
* Remove dead code
* Remove accidentally-added files
* Fix comment in eth1_genesis_service
* Add .gitignore for eth1_test_rig
* Fix bug in eth1_genesis_service
* Remove dead code from eth2_config
* Fix tabs/spaces in root Cargo.toml
* Tidy eth1 crate
* Allow for re-use of eth1 service after genesis
* Update docs for new CLI
* Change README gif
* Tidy eth1 http module
* Tidy eth1 service
* Tidy environment crate
* Remove unused file
* Tidy, add comments
* Remove commented-out code
* Address majority of Michael's comments
* Address other PR comments
* Add link to issue alongside TODO
2019-11-15 03:47:51 +00:00
|
|
|
pub use cli::cli_app;
|
|
|
|
pub use config::Config;
|
|
|
|
|
|
|
|
use clap::ArgMatches;
|
|
|
|
use config::{Config as ClientConfig, KeySource};
|
|
|
|
use environment::RuntimeContext;
|
|
|
|
use eth2_config::Eth2Config;
|
|
|
|
use exit_future::Signal;
|
|
|
|
use futures::Stream;
|
|
|
|
use lighthouse_bootstrap::Bootstrapper;
|
|
|
|
use parking_lot::RwLock;
|
|
|
|
use protos::services_grpc::ValidatorServiceClient;
|
|
|
|
use service::Service;
|
|
|
|
use slog::{error, info, warn, Logger};
|
|
|
|
use slot_clock::SlotClock;
|
|
|
|
use std::path::PathBuf;
|
|
|
|
use std::sync::Arc;
|
|
|
|
use std::time::{Duration, Instant};
|
|
|
|
use tokio::timer::Interval;
|
|
|
|
use types::{EthSpec, Keypair};
|
|
|
|
|
|
|
|
/// A fixed amount of time after a slot to perform operations. This gives the node time to complete
|
|
|
|
/// per-slot processes.
|
|
|
|
const TIME_DELAY_FROM_SLOT: Duration = Duration::from_millis(100);
|
|
|
|
|
|
|
|
#[derive(Clone)]
|
|
|
|
pub struct ProductionValidatorClient<T: EthSpec> {
|
|
|
|
context: RuntimeContext<T>,
|
|
|
|
service: Arc<Service<ValidatorServiceClient, Keypair, T>>,
|
|
|
|
exit_signals: Arc<RwLock<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>, matches: &ArgMatches) -> Result<Self, String> {
|
|
|
|
let mut log = context.log.clone();
|
|
|
|
|
|
|
|
let (client_config, eth2_config) = get_configs(&matches, &mut log)
|
|
|
|
.map_err(|e| format!("Unable to initialize config: {}", e))?;
|
|
|
|
|
|
|
|
info!(
|
|
|
|
log,
|
|
|
|
"Starting validator client";
|
|
|
|
"datadir" => client_config.full_data_dir().expect("Unable to find datadir").to_str(),
|
|
|
|
);
|
|
|
|
|
|
|
|
let service: Service<ValidatorServiceClient, Keypair, T> =
|
|
|
|
Service::initialize_service(client_config, eth2_config, log.clone())
|
|
|
|
.map_err(|e| e.to_string())?;
|
|
|
|
|
|
|
|
Ok(Self {
|
|
|
|
context,
|
|
|
|
service: Arc::new(service),
|
|
|
|
exit_signals: Arc::new(RwLock::new(vec![])),
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Starts the timers to trigger block and attestation production.
|
|
|
|
pub fn start_service(&self) -> Result<(), String> {
|
|
|
|
let service = self.clone().service;
|
|
|
|
let log = self.context.log.clone();
|
|
|
|
|
|
|
|
let duration_to_next_slot = service
|
|
|
|
.slot_clock
|
|
|
|
.duration_to_next_slot()
|
|
|
|
.ok_or_else(|| "Unable to determine duration to next slot. Exiting.".to_string())?;
|
|
|
|
|
|
|
|
// set up the validator work interval - start at next slot and proceed every slot
|
|
|
|
let interval = {
|
|
|
|
// Set the interval to start at the next slot, and every slot after
|
|
|
|
let slot_duration = Duration::from_millis(service.spec.milliseconds_per_slot);
|
|
|
|
//TODO: Handle checked add correctly
|
|
|
|
Interval::new(Instant::now() + duration_to_next_slot, slot_duration)
|
|
|
|
};
|
|
|
|
|
|
|
|
if service.slot_clock.now().is_none() {
|
|
|
|
warn!(
|
|
|
|
log,
|
|
|
|
"Starting node prior to genesis";
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
info!(
|
|
|
|
log,
|
|
|
|
"Waiting for next slot";
|
|
|
|
"seconds_to_wait" => duration_to_next_slot.as_secs()
|
|
|
|
);
|
|
|
|
|
|
|
|
let (exit_signal, exit_fut) = exit_future::signal();
|
|
|
|
|
|
|
|
self.exit_signals.write().push(exit_signal);
|
|
|
|
|
|
|
|
/* kick off the core service */
|
|
|
|
self.context.executor.spawn(
|
|
|
|
interval
|
|
|
|
.map_err(move |e| {
|
|
|
|
error! {
|
|
|
|
log,
|
|
|
|
"Timer thread failed";
|
|
|
|
"error" => format!("{}", e)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.and_then(move |_| if exit_fut.is_live() { Ok(()) } else { Err(()) })
|
|
|
|
.for_each(move |_| {
|
|
|
|
// wait for node to process
|
|
|
|
std::thread::sleep(TIME_DELAY_FROM_SLOT);
|
|
|
|
// if a non-fatal error occurs, proceed to the next slot.
|
|
|
|
let _ignore_error = service.per_slot_execution();
|
|
|
|
// completed a slot process
|
|
|
|
Ok(())
|
|
|
|
}),
|
|
|
|
);
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Parses the CLI arguments and attempts to load the client and eth2 configuration.
|
|
|
|
///
|
|
|
|
/// This is not a pure function, it reads from disk and may contact network servers.
|
|
|
|
fn get_configs(
|
|
|
|
cli_args: &ArgMatches,
|
|
|
|
mut log: &mut Logger,
|
|
|
|
) -> Result<(ClientConfig, Eth2Config), String> {
|
|
|
|
let mut client_config = ClientConfig::default();
|
|
|
|
|
|
|
|
client_config.apply_cli_args(&cli_args, &mut log)?;
|
|
|
|
|
|
|
|
if let Some(server) = cli_args.value_of("server") {
|
|
|
|
client_config.server = server.to_string();
|
|
|
|
}
|
|
|
|
|
|
|
|
if let Some(port) = cli_args.value_of("server-http-port") {
|
|
|
|
client_config.server_http_port = port
|
|
|
|
.parse::<u16>()
|
|
|
|
.map_err(|e| format!("Unable to parse HTTP port: {:?}", e))?;
|
|
|
|
}
|
|
|
|
|
|
|
|
if let Some(port) = cli_args.value_of("server-grpc-port") {
|
|
|
|
client_config.server_grpc_port = port
|
|
|
|
.parse::<u16>()
|
|
|
|
.map_err(|e| format!("Unable to parse gRPC port: {:?}", e))?;
|
|
|
|
}
|
|
|
|
|
|
|
|
info!(
|
|
|
|
*log,
|
|
|
|
"Beacon node connection info";
|
|
|
|
"grpc_port" => client_config.server_grpc_port,
|
|
|
|
"http_port" => client_config.server_http_port,
|
|
|
|
"server" => &client_config.server,
|
|
|
|
);
|
|
|
|
|
|
|
|
let (client_config, eth2_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, client_config, log)
|
|
|
|
}
|
|
|
|
_ => return Err("You must use the testnet command. See '--help'.".into()),
|
|
|
|
}?;
|
|
|
|
|
|
|
|
Ok((client_config, eth2_config))
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Parses the `testnet` CLI subcommand.
|
|
|
|
///
|
|
|
|
/// This is not a pure function, it reads from disk and may contact network servers.
|
|
|
|
fn process_testnet_subcommand(
|
|
|
|
cli_args: &ArgMatches,
|
|
|
|
mut client_config: ClientConfig,
|
|
|
|
log: &Logger,
|
|
|
|
) -> Result<(ClientConfig, Eth2Config), String> {
|
|
|
|
let eth2_config = if cli_args.is_present("bootstrap") {
|
|
|
|
info!(log, "Connecting to bootstrap server");
|
|
|
|
let bootstrapper = Bootstrapper::connect(
|
|
|
|
format!(
|
|
|
|
"http://{}:{}",
|
|
|
|
client_config.server, client_config.server_http_port
|
|
|
|
),
|
|
|
|
&log,
|
|
|
|
)?;
|
|
|
|
|
|
|
|
let eth2_config = bootstrapper.eth2_config()?;
|
|
|
|
|
|
|
|
info!(
|
|
|
|
log,
|
|
|
|
"Bootstrapped eth2 config via HTTP";
|
|
|
|
"slot_time_millis" => eth2_config.spec.milliseconds_per_slot,
|
|
|
|
"spec" => ð2_config.spec_constants,
|
|
|
|
);
|
|
|
|
|
|
|
|
eth2_config
|
|
|
|
} else {
|
|
|
|
match cli_args.value_of("spec") {
|
|
|
|
Some("mainnet") => Eth2Config::mainnet(),
|
|
|
|
Some("minimal") => Eth2Config::minimal(),
|
|
|
|
Some("interop") => Eth2Config::interop(),
|
|
|
|
_ => return Err("No --spec flag provided. See '--help'.".into()),
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
client_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 count = sub_cli_args
|
|
|
|
.value_of("validator_count")
|
|
|
|
.ok_or_else(|| "No validator count supplied")?
|
|
|
|
.parse::<usize>()
|
|
|
|
.map_err(|e| format!("Unable to parse validator count: {:?}", e))?;
|
|
|
|
|
|
|
|
info!(
|
|
|
|
log,
|
|
|
|
"Generating unsafe testing keys";
|
|
|
|
"first_validator" => first,
|
|
|
|
"count" => count
|
|
|
|
);
|
|
|
|
|
|
|
|
KeySource::TestingKeypairRange(first..first + count)
|
|
|
|
}
|
|
|
|
("interop-yaml", Some(sub_cli_args)) => {
|
|
|
|
let path = sub_cli_args
|
|
|
|
.value_of("path")
|
|
|
|
.ok_or_else(|| "No yaml path supplied")?
|
|
|
|
.parse::<PathBuf>()
|
|
|
|
.map_err(|e| format!("Unable to parse yaml path: {:?}", e))?;
|
|
|
|
|
|
|
|
info!(
|
|
|
|
log,
|
|
|
|
"Loading keypairs from interop YAML format";
|
|
|
|
"path" => format!("{:?}", path),
|
|
|
|
);
|
|
|
|
|
|
|
|
KeySource::YamlKeypairs(path)
|
|
|
|
}
|
|
|
|
_ => KeySource::Disk,
|
|
|
|
};
|
|
|
|
|
|
|
|
Ok((client_config, eth2_config))
|
|
|
|
}
|