mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-16 03:12:41 +00:00
* 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
173 lines
5.4 KiB
Rust
173 lines
5.4 KiB
Rust
use clap::ArgMatches;
|
|
use network::NetworkConfig;
|
|
use serde_derive::{Deserialize, Serialize};
|
|
use slog::{info, o, Drain};
|
|
use std::fs::{self, OpenOptions};
|
|
use std::path::PathBuf;
|
|
use std::sync::Mutex;
|
|
|
|
/// The number initial validators when starting the `Minimal`.
|
|
const TESTNET_SPEC_CONSTANTS: &str = "minimal";
|
|
|
|
/// Defines how the client should initialize the `BeaconChain` and other components.
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub enum ClientGenesis {
|
|
/// Reads the genesis state and other persisted data from the `Store`.
|
|
Resume,
|
|
/// Creates a genesis state as per the 2019 Canada interop specifications.
|
|
Interop {
|
|
validator_count: usize,
|
|
genesis_time: u64,
|
|
},
|
|
/// Connects to an eth1 node and waits until it can create the genesis state from the deposit
|
|
/// contract.
|
|
DepositContract,
|
|
/// Loads the genesis state from a SSZ-encoded `BeaconState` file.
|
|
SszFile { path: PathBuf },
|
|
/// Connects to another Lighthouse instance and reads the genesis state and other data via the
|
|
/// HTTP API.
|
|
RemoteNode { server: String, port: Option<u16> },
|
|
}
|
|
|
|
impl Default for ClientGenesis {
|
|
fn default() -> Self {
|
|
Self::DepositContract
|
|
}
|
|
}
|
|
|
|
/// The core configuration of a Lighthouse beacon node.
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct Config {
|
|
pub data_dir: PathBuf,
|
|
pub db_type: String,
|
|
db_name: String,
|
|
pub log_file: PathBuf,
|
|
pub spec_constants: String,
|
|
/// If true, the node will use co-ordinated junk for eth1 values.
|
|
///
|
|
/// This is the method used for the 2019 client interop in Canada.
|
|
pub dummy_eth1_backend: bool,
|
|
pub sync_eth1_chain: bool,
|
|
#[serde(skip)]
|
|
/// The `genesis` field is not serialized or deserialized by `serde` to ensure it is defined
|
|
/// via the CLI at runtime, instead of from a configuration file saved to disk.
|
|
pub genesis: ClientGenesis,
|
|
pub network: network::NetworkConfig,
|
|
pub rpc: rpc::Config,
|
|
pub rest_api: rest_api::Config,
|
|
pub websocket_server: websocket_server::Config,
|
|
pub eth1: eth1::Config,
|
|
}
|
|
|
|
impl Default for Config {
|
|
fn default() -> Self {
|
|
Self {
|
|
data_dir: PathBuf::from(".lighthouse"),
|
|
log_file: PathBuf::from(""),
|
|
db_type: "disk".to_string(),
|
|
db_name: "chain_db".to_string(),
|
|
genesis: <_>::default(),
|
|
network: NetworkConfig::new(),
|
|
rpc: <_>::default(),
|
|
rest_api: <_>::default(),
|
|
websocket_server: <_>::default(),
|
|
spec_constants: TESTNET_SPEC_CONSTANTS.into(),
|
|
dummy_eth1_backend: false,
|
|
sync_eth1_chain: false,
|
|
eth1: <_>::default(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Config {
|
|
/// Returns the path to which the client may initialize an on-disk database.
|
|
pub fn db_path(&self) -> Option<PathBuf> {
|
|
self.data_dir()
|
|
.and_then(|path| Some(path.join(&self.db_name)))
|
|
}
|
|
|
|
/// Returns the core path for the client.
|
|
///
|
|
/// Creates the directory if it does not exist.
|
|
pub fn data_dir(&self) -> Option<PathBuf> {
|
|
let path = dirs::home_dir()?.join(&self.data_dir);
|
|
fs::create_dir_all(&path).ok()?;
|
|
Some(path)
|
|
}
|
|
|
|
// Update the logger to output in JSON to specified file
|
|
fn update_logger(&mut self, log: &mut slog::Logger) -> Result<(), &'static str> {
|
|
let file = OpenOptions::new()
|
|
.create(true)
|
|
.write(true)
|
|
.truncate(true)
|
|
.open(&self.log_file);
|
|
|
|
if file.is_err() {
|
|
return Err("Cannot open log file");
|
|
}
|
|
let file = file.unwrap();
|
|
|
|
if let Some(file) = self.log_file.to_str() {
|
|
info!(
|
|
*log,
|
|
"Log file specified, output will now be written to {} in json.", file
|
|
);
|
|
} else {
|
|
info!(
|
|
*log,
|
|
"Log file specified output will now be written in json"
|
|
);
|
|
}
|
|
|
|
let drain = Mutex::new(slog_json::Json::default(file)).fuse();
|
|
let drain = slog_async::Async::new(drain).build().fuse();
|
|
*log = slog::Logger::root(drain, o!());
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Apply the following arguments to `self`, replacing values if they are specified in `args`.
|
|
///
|
|
/// Returns an error if arguments are obviously invalid. May succeed even if some values are
|
|
/// invalid.
|
|
pub fn apply_cli_args(
|
|
&mut self,
|
|
args: &ArgMatches,
|
|
log: &mut slog::Logger,
|
|
) -> Result<(), String> {
|
|
if let Some(dir) = args.value_of("datadir") {
|
|
self.data_dir = PathBuf::from(dir);
|
|
};
|
|
|
|
if let Some(dir) = args.value_of("db") {
|
|
self.db_type = dir.to_string();
|
|
};
|
|
|
|
self.network.apply_cli_args(args)?;
|
|
self.rpc.apply_cli_args(args)?;
|
|
self.rest_api.apply_cli_args(args)?;
|
|
self.websocket_server.apply_cli_args(args)?;
|
|
|
|
if let Some(log_file) = args.value_of("logfile") {
|
|
self.log_file = PathBuf::from(log_file);
|
|
self.update_logger(log)?;
|
|
};
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use toml;
|
|
|
|
#[test]
|
|
fn serde() {
|
|
let config = Config::default();
|
|
let serialized = toml::to_string(&config).expect("should serde encode default config");
|
|
toml::from_str::<Config>(&serialized).expect("should serde decode default config");
|
|
}
|
|
}
|