mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-14 18:32:42 +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
215 lines
7.6 KiB
Rust
215 lines
7.6 KiB
Rust
mod beacon_node_duties;
|
|
mod epoch_duties;
|
|
mod grpc;
|
|
// TODO: reintroduce tests
|
|
//#[cfg(test)]
|
|
//mod test_node;
|
|
|
|
pub use self::beacon_node_duties::{BeaconNodeDuties, BeaconNodeDutiesError};
|
|
use self::epoch_duties::{EpochDuties, EpochDutiesMapError};
|
|
pub use self::epoch_duties::{EpochDutiesMap, WorkInfo};
|
|
use super::signer::Signer;
|
|
use futures::Async;
|
|
use parking_lot::RwLock;
|
|
use slog::{debug, error, info};
|
|
use std::fmt::Display;
|
|
use std::sync::Arc;
|
|
use types::{Epoch, PublicKey, Slot};
|
|
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub enum UpdateOutcome {
|
|
/// The `EpochDuties` were not updated during this poll.
|
|
NoChange(Epoch),
|
|
/// The `EpochDuties` for the `epoch` were previously unknown, but obtained in the poll.
|
|
NewDuties(Epoch, EpochDuties),
|
|
/// New `EpochDuties` were obtained, different to those which were previously known. This is
|
|
/// likely to be the result of chain re-organisation.
|
|
DutiesChanged(Epoch, EpochDuties),
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub enum Error {
|
|
DutiesMapPoisoned,
|
|
BeaconNodeDutiesError(BeaconNodeDutiesError),
|
|
UnknownEpoch,
|
|
UnknownValidator,
|
|
}
|
|
|
|
/// A polling state machine which ensures the latest `EpochDuties` are obtained from the Beacon
|
|
/// Node.
|
|
///
|
|
/// This keeps track of all validator keys and required voting slots.
|
|
pub struct DutiesManager<U: BeaconNodeDuties, S: Signer> {
|
|
pub duties_map: RwLock<EpochDutiesMap>,
|
|
/// A list of all signer objects known to the validator service.
|
|
pub signers: Arc<Vec<S>>,
|
|
pub beacon_node: Arc<U>,
|
|
}
|
|
|
|
impl<U: BeaconNodeDuties, S: Signer + Display> DutiesManager<U, S> {
|
|
/// Check the Beacon Node for `EpochDuties`.
|
|
///
|
|
/// be a wall-clock (e.g., system time, remote server time, etc.).
|
|
fn update(&self, epoch: Epoch) -> Result<UpdateOutcome, Error> {
|
|
let public_keys: Vec<PublicKey> = self.signers.iter().map(Signer::to_public).collect();
|
|
let duties = self.beacon_node.request_duties(epoch, &public_keys)?;
|
|
{
|
|
// If these duties were known, check to see if they're updates or identical.
|
|
if let Some(known_duties) = self.duties_map.read().get(&epoch) {
|
|
if *known_duties == duties {
|
|
return Ok(UpdateOutcome::NoChange(epoch));
|
|
}
|
|
}
|
|
}
|
|
if !self.duties_map.read().contains_key(&epoch) {
|
|
//TODO: Remove clone by removing duties from outcome
|
|
self.duties_map.write().insert(epoch, duties.clone());
|
|
return Ok(UpdateOutcome::NewDuties(epoch, duties));
|
|
}
|
|
// duties have changed
|
|
//TODO: Duties could be large here. Remove from display and avoid the clone.
|
|
self.duties_map.write().insert(epoch, duties.clone());
|
|
Ok(UpdateOutcome::DutiesChanged(epoch, duties))
|
|
}
|
|
|
|
/// A future wrapping around `update()`. This will perform logic based upon the update
|
|
/// process and complete once the update has completed.
|
|
pub fn run_update(&self, epoch: Epoch, log: slog::Logger) -> Result<Async<()>, ()> {
|
|
match self.update(epoch) {
|
|
Err(error) => error!(log, "Epoch duties poll error"; "error" => format!("{:?}", error)),
|
|
Ok(UpdateOutcome::NoChange(epoch)) => {
|
|
debug!(log, "No change in duties"; "epoch" => epoch)
|
|
}
|
|
Ok(UpdateOutcome::DutiesChanged(epoch, duties)) => {
|
|
info!(log, "Duties changed (potential re-org)"; "epoch" => epoch, "duties" => format!("{:?}", duties))
|
|
}
|
|
Ok(UpdateOutcome::NewDuties(epoch, duties)) => {
|
|
info!(log, "New duties obtained"; "epoch" => epoch);
|
|
print_duties(&log, duties);
|
|
}
|
|
};
|
|
Ok(Async::Ready(()))
|
|
}
|
|
|
|
/// Returns a list of (index, WorkInfo) indicating all the validators that have work to perform
|
|
/// this slot.
|
|
pub fn get_current_work(&self, slot: Slot) -> Option<Vec<(usize, WorkInfo)>> {
|
|
let mut current_work: Vec<(usize, WorkInfo)> = Vec::new();
|
|
|
|
// if the map is poisoned, return None
|
|
let duties = self.duties_map.read();
|
|
|
|
for (index, validator_signer) in self.signers.iter().enumerate() {
|
|
match duties.is_work_slot(slot, &validator_signer.to_public()) {
|
|
Ok(Some(work_type)) => current_work.push((index, work_type)),
|
|
Ok(None) => {} // No work for this validator
|
|
//TODO: This should really log an error, as we shouldn't end up with an err here.
|
|
Err(_) => {} // Unknown epoch or validator, no work
|
|
}
|
|
}
|
|
if current_work.is_empty() {
|
|
return None;
|
|
}
|
|
Some(current_work)
|
|
}
|
|
}
|
|
|
|
//TODO: Use error_chain to handle errors
|
|
impl From<BeaconNodeDutiesError> for Error {
|
|
fn from(e: BeaconNodeDutiesError) -> Error {
|
|
Error::BeaconNodeDutiesError(e)
|
|
}
|
|
}
|
|
|
|
//TODO: Use error_chain to handle errors
|
|
impl<T> From<std::sync::PoisonError<T>> for Error {
|
|
fn from(_e: std::sync::PoisonError<T>) -> Error {
|
|
Error::DutiesMapPoisoned
|
|
}
|
|
}
|
|
impl From<EpochDutiesMapError> for Error {
|
|
fn from(e: EpochDutiesMapError) -> Error {
|
|
match e {
|
|
EpochDutiesMapError::UnknownEpoch => Error::UnknownEpoch,
|
|
EpochDutiesMapError::UnknownValidator => Error::UnknownValidator,
|
|
}
|
|
}
|
|
}
|
|
|
|
fn print_duties(log: &slog::Logger, duties: EpochDuties) {
|
|
for (pk, duty) in duties.iter() {
|
|
if let Some(display_duty) = duty {
|
|
info!(log, "Validator: {}",pk; "Duty" => format!("{}",display_duty));
|
|
} else {
|
|
info!(log, "Validator: {}",pk; "Duty" => "None");
|
|
}
|
|
}
|
|
}
|
|
|
|
/* TODO: Modify tests for new Duties Manager form
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::test_node::TestBeaconNode;
|
|
use super::*;
|
|
use bls::Keypair;
|
|
use slot_clock::TestingSlotClock;
|
|
use types::Slot;
|
|
|
|
// TODO: implement more thorough testing.
|
|
// https://github.com/sigp/lighthouse/issues/160
|
|
//
|
|
// These tests should serve as a good example for future tests.
|
|
|
|
|
|
#[test]
|
|
pub fn polling() {
|
|
let spec = Arc::new(ChainSpec::mainnet());
|
|
let duties_map = Arc::new(EpochDutiesMap::new(T::slots_per_epoch()));
|
|
let keypair = Keypair::random();
|
|
let slot_clock = Arc::new(TestingSlotClock::new(0));
|
|
let beacon_node = Arc::new(TestBeaconNode::default());
|
|
|
|
let manager = DutiesManager {
|
|
spec: spec.clone(),
|
|
pubkey: keypair.pk.clone(),
|
|
duties_map: duties_map.clone(),
|
|
slot_clock: slot_clock.clone(),
|
|
beacon_node: beacon_node.clone(),
|
|
};
|
|
|
|
// Configure response from the BeaconNode.
|
|
let duties = EpochDuties {
|
|
validator_index: 0,
|
|
block_production_slot: Some(Slot::new(10)),
|
|
};
|
|
beacon_node.set_next_shuffling_result(Ok(Some(duties)));
|
|
|
|
// Get the duties for the first time...
|
|
assert_eq!(
|
|
manager.poll(),
|
|
Ok(PollOutcome::NewDuties(Epoch::new(0), duties))
|
|
);
|
|
// Get the same duties again...
|
|
assert_eq!(manager.poll(), Ok(PollOutcome::NoChange(Epoch::new(0))));
|
|
|
|
// Return new duties.
|
|
let duties = EpochDuties {
|
|
validator_index: 0,
|
|
block_production_slot: Some(Slot::new(11)),
|
|
};
|
|
beacon_node.set_next_shuffling_result(Ok(Some(duties)));
|
|
assert_eq!(
|
|
manager.poll(),
|
|
Ok(PollOutcome::DutiesChanged(Epoch::new(0), duties))
|
|
);
|
|
|
|
// Return no duties.
|
|
beacon_node.set_next_shuffling_result(Ok(None));
|
|
assert_eq!(
|
|
manager.poll(),
|
|
Ok(PollOutcome::UnknownValidatorOrEpoch(Epoch::new(0)))
|
|
);
|
|
}
|
|
}
|
|
*/
|