mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-17 11:52: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
158 lines
4.9 KiB
Rust
158 lines
4.9 KiB
Rust
use futures::Future;
|
|
use serde_json::json;
|
|
use std::io::prelude::*;
|
|
use std::io::BufReader;
|
|
use std::net::TcpListener;
|
|
use std::process::{Child, Command, Stdio};
|
|
use std::sync::Arc;
|
|
use std::time::{Duration, Instant};
|
|
use web3::{
|
|
transports::{EventLoopHandle, Http},
|
|
Transport, Web3,
|
|
};
|
|
|
|
/// How long we will wait for ganache to indicate that it is ready.
|
|
const GANACHE_STARTUP_TIMEOUT_MILLIS: u64 = 10_000;
|
|
|
|
/// Provides a dedicated `ganachi-cli` instance with a connected `Web3` instance.
|
|
///
|
|
/// Requires that `ganachi-cli` is installed and available on `PATH`.
|
|
pub struct GanacheInstance {
|
|
pub port: u16,
|
|
child: Child,
|
|
_event_loop: Arc<EventLoopHandle>,
|
|
pub web3: Web3<Http>,
|
|
}
|
|
|
|
impl GanacheInstance {
|
|
/// Start a new `ganache-cli` process, waiting until it indicates that it is ready to accept
|
|
/// RPC connections.
|
|
pub fn new() -> Result<Self, String> {
|
|
let port = unused_port()?;
|
|
|
|
let mut child = Command::new("ganache-cli")
|
|
.stdout(Stdio::piped())
|
|
.arg("--defaultBalanceEther")
|
|
.arg("1000000000")
|
|
.arg("--gasLimit")
|
|
.arg("1000000000")
|
|
.arg("--accounts")
|
|
.arg("10")
|
|
.arg("--port")
|
|
.arg(format!("{}", port))
|
|
.arg("--mnemonic")
|
|
.arg("\"vast thought differ pull jewel broom cook wrist tribe word before omit\"")
|
|
.spawn()
|
|
.map_err(|e| {
|
|
format!(
|
|
"Failed to start ganche-cli. \
|
|
Is it ganache-cli installed and available on $PATH? Error: {:?}",
|
|
e
|
|
)
|
|
})?;
|
|
|
|
let stdout = child
|
|
.stdout
|
|
.ok_or_else(|| "Unable to get stdout for ganache child process")?;
|
|
|
|
let start = Instant::now();
|
|
let mut reader = BufReader::new(stdout);
|
|
loop {
|
|
if start + Duration::from_millis(GANACHE_STARTUP_TIMEOUT_MILLIS) <= Instant::now() {
|
|
break Err(
|
|
"Timed out waiting for ganache to start. Is ganache-cli installed?".to_string(),
|
|
);
|
|
}
|
|
|
|
let mut line = String::new();
|
|
if let Err(e) = reader.read_line(&mut line) {
|
|
break Err(format!("Failed to read line from ganache process: {:?}", e));
|
|
} else if line.starts_with("Listening on") {
|
|
break Ok(());
|
|
} else {
|
|
continue;
|
|
}
|
|
}?;
|
|
|
|
let (event_loop, transport) = Http::new(&endpoint(port)).map_err(|e| {
|
|
format!(
|
|
"Failed to start HTTP transport connected to ganache: {:?}",
|
|
e
|
|
)
|
|
})?;
|
|
let web3 = Web3::new(transport);
|
|
|
|
child.stdout = Some(reader.into_inner());
|
|
|
|
Ok(Self {
|
|
child,
|
|
port,
|
|
_event_loop: Arc::new(event_loop),
|
|
web3,
|
|
})
|
|
}
|
|
|
|
/// Returns the endpoint that this instance is listening on.
|
|
pub fn endpoint(&self) -> String {
|
|
endpoint(self.port)
|
|
}
|
|
|
|
/// Increase the timestamp on future blocks by `increase_by` seconds.
|
|
pub fn increase_time(&self, increase_by: u64) -> impl Future<Item = (), Error = String> {
|
|
self.web3
|
|
.transport()
|
|
.execute("evm_increaseTime", vec![json!(increase_by)])
|
|
.map(|_json_value| ())
|
|
.map_err(|e| format!("Failed to increase time on EVM (is this ganache?): {:?}", e))
|
|
}
|
|
|
|
/// Returns the current block number, as u64
|
|
pub fn block_number(&self) -> impl Future<Item = u64, Error = String> {
|
|
self.web3
|
|
.eth()
|
|
.block_number()
|
|
.map(|v| v.as_u64())
|
|
.map_err(|e| format!("Failed to get block number: {:?}", e))
|
|
}
|
|
|
|
/// Mines a single block.
|
|
pub fn evm_mine(&self) -> impl Future<Item = (), Error = String> {
|
|
self.web3
|
|
.transport()
|
|
.execute("evm_mine", vec![])
|
|
.map(|_| ())
|
|
.map_err(|_| {
|
|
"utils should mine new block with evm_mine (only works with ganache-cli!)"
|
|
.to_string()
|
|
})
|
|
}
|
|
}
|
|
|
|
fn endpoint(port: u16) -> String {
|
|
format!("http://localhost:{}", port)
|
|
}
|
|
|
|
/// A bit of hack to find an unused TCP port.
|
|
///
|
|
/// Does not guarantee that the given port is unused after the function exists, just that it was
|
|
/// unused before the function started (i.e., it does not reserve a port).
|
|
pub fn unused_port() -> Result<u16, String> {
|
|
let listener = TcpListener::bind("127.0.0.1:0")
|
|
.map_err(|e| format!("Failed to create TCP listener to find unused port: {:?}", e))?;
|
|
|
|
let local_addr = listener.local_addr().map_err(|e| {
|
|
format!(
|
|
"Failed to read TCP listener local_addr to find unused port: {:?}",
|
|
e
|
|
)
|
|
})?;
|
|
|
|
Ok(local_addr.port())
|
|
}
|
|
|
|
impl Drop for GanacheInstance {
|
|
fn drop(&mut self) {
|
|
let _ = self.child.kill();
|
|
}
|
|
}
|