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
|
|
|
#![cfg(test)]
|
|
|
|
use environment::{Environment, EnvironmentBuilder};
|
|
|
|
use eth1::http::{get_deposit_count, get_deposit_logs_in_range, get_deposit_root, Block, Log};
|
|
|
|
use eth1::{Config, Service};
|
|
|
|
use eth1::{DepositCache, DepositLog};
|
|
|
|
use eth1_test_rig::GanacheEth1Instance;
|
|
|
|
use exit_future;
|
|
|
|
use futures::Future;
|
|
|
|
use merkle_proof::verify_merkle_proof;
|
|
|
|
use std::ops::Range;
|
|
|
|
use std::time::Duration;
|
|
|
|
use tokio::runtime::Runtime;
|
|
|
|
use tree_hash::TreeHash;
|
|
|
|
use types::{DepositData, EthSpec, Hash256, Keypair, MainnetEthSpec, MinimalEthSpec, Signature};
|
|
|
|
use web3::{transports::Http, Web3};
|
|
|
|
|
|
|
|
const DEPOSIT_CONTRACT_TREE_DEPTH: usize = 32;
|
|
|
|
|
|
|
|
pub fn new_env() -> Environment<MinimalEthSpec> {
|
|
|
|
EnvironmentBuilder::minimal()
|
|
|
|
// Use a single thread, so that when all tests are run in parallel they don't have so many
|
|
|
|
// threads.
|
|
|
|
.single_thread_tokio_runtime()
|
|
|
|
.expect("should start tokio runtime")
|
|
|
|
.null_logger()
|
|
|
|
.expect("should start null logger")
|
|
|
|
.build()
|
|
|
|
.expect("should build env")
|
|
|
|
}
|
|
|
|
|
|
|
|
fn timeout() -> Duration {
|
2019-11-25 09:26:05 +00:00
|
|
|
Duration::from_secs(2)
|
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
|
|
|
}
|
|
|
|
|
|
|
|
fn random_deposit_data() -> DepositData {
|
|
|
|
let keypair = Keypair::random();
|
|
|
|
|
|
|
|
let mut deposit = DepositData {
|
|
|
|
pubkey: keypair.pk.into(),
|
|
|
|
withdrawal_credentials: Hash256::zero(),
|
|
|
|
amount: 32_000_000_000,
|
|
|
|
signature: Signature::empty_signature().into(),
|
|
|
|
};
|
|
|
|
|
|
|
|
deposit.signature = deposit.create_signature(&keypair.sk, &MainnetEthSpec::default_spec());
|
|
|
|
|
|
|
|
deposit
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Blocking operation to get the deposit logs from the `deposit_contract`.
|
|
|
|
fn blocking_deposit_logs(
|
|
|
|
runtime: &mut Runtime,
|
|
|
|
eth1: &GanacheEth1Instance,
|
|
|
|
range: Range<u64>,
|
|
|
|
) -> Vec<Log> {
|
|
|
|
runtime
|
|
|
|
.block_on(get_deposit_logs_in_range(
|
|
|
|
ð1.endpoint(),
|
|
|
|
ð1.deposit_contract.address(),
|
|
|
|
range,
|
|
|
|
timeout(),
|
|
|
|
))
|
|
|
|
.expect("should get logs")
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Blocking operation to get the deposit root from the `deposit_contract`.
|
|
|
|
fn blocking_deposit_root(
|
|
|
|
runtime: &mut Runtime,
|
|
|
|
eth1: &GanacheEth1Instance,
|
|
|
|
block_number: u64,
|
|
|
|
) -> Option<Hash256> {
|
|
|
|
runtime
|
|
|
|
.block_on(get_deposit_root(
|
|
|
|
ð1.endpoint(),
|
|
|
|
ð1.deposit_contract.address(),
|
|
|
|
block_number,
|
|
|
|
timeout(),
|
|
|
|
))
|
|
|
|
.expect("should get deposit root")
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Blocking operation to get the deposit count from the `deposit_contract`.
|
|
|
|
fn blocking_deposit_count(
|
|
|
|
runtime: &mut Runtime,
|
|
|
|
eth1: &GanacheEth1Instance,
|
|
|
|
block_number: u64,
|
|
|
|
) -> Option<u64> {
|
|
|
|
runtime
|
|
|
|
.block_on(get_deposit_count(
|
|
|
|
ð1.endpoint(),
|
|
|
|
ð1.deposit_contract.address(),
|
|
|
|
block_number,
|
|
|
|
timeout(),
|
|
|
|
))
|
|
|
|
.expect("should get deposit count")
|
|
|
|
}
|
|
|
|
|
|
|
|
fn get_block_number(runtime: &mut Runtime, web3: &Web3<Http>) -> u64 {
|
|
|
|
runtime
|
|
|
|
.block_on(web3.eth().block_number().map(|v| v.as_u64()))
|
|
|
|
.expect("should get block number")
|
|
|
|
}
|
|
|
|
|
|
|
|
mod auto_update {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn can_auto_update() {
|
|
|
|
let mut env = new_env();
|
|
|
|
let log = env.core_context().log;
|
|
|
|
let runtime = env.runtime();
|
|
|
|
|
|
|
|
let eth1 = runtime
|
|
|
|
.block_on(GanacheEth1Instance::new())
|
|
|
|
.expect("should start eth1 environment");
|
|
|
|
let deposit_contract = ð1.deposit_contract;
|
|
|
|
let web3 = eth1.web3();
|
|
|
|
|
|
|
|
let now = get_block_number(runtime, &web3);
|
|
|
|
|
|
|
|
let service = Service::new(
|
|
|
|
Config {
|
|
|
|
endpoint: eth1.endpoint(),
|
|
|
|
deposit_contract_address: deposit_contract.address(),
|
|
|
|
deposit_contract_deploy_block: now,
|
|
|
|
lowest_cached_block_number: now,
|
|
|
|
follow_distance: 0,
|
|
|
|
block_cache_truncation: None,
|
|
|
|
..Config::default()
|
|
|
|
},
|
|
|
|
log,
|
|
|
|
);
|
|
|
|
|
|
|
|
// NOTE: this test is sensitive to the response speed of the external web3 server. If
|
|
|
|
// you're experiencing failures, try increasing the update_interval.
|
|
|
|
let update_interval = Duration::from_millis(2_000);
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
service.block_cache_len(),
|
|
|
|
0,
|
|
|
|
"should have imported no blocks"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
service.deposit_cache_len(),
|
|
|
|
0,
|
|
|
|
"should have imported no deposits"
|
|
|
|
);
|
|
|
|
|
|
|
|
let (_exit, signal) = exit_future::signal();
|
|
|
|
|
|
|
|
runtime.executor().spawn(service.auto_update(signal));
|
|
|
|
|
|
|
|
let n = 4;
|
|
|
|
|
|
|
|
for _ in 0..n {
|
|
|
|
deposit_contract
|
|
|
|
.deposit(runtime, random_deposit_data())
|
|
|
|
.expect("should do first deposits");
|
|
|
|
}
|
|
|
|
|
|
|
|
std::thread::sleep(update_interval * 5);
|
|
|
|
|
|
|
|
assert!(
|
|
|
|
service.deposit_cache_len() >= n,
|
|
|
|
"should have imported n deposits"
|
|
|
|
);
|
|
|
|
|
|
|
|
for _ in 0..n {
|
|
|
|
deposit_contract
|
|
|
|
.deposit(runtime, random_deposit_data())
|
|
|
|
.expect("should do second deposits");
|
|
|
|
}
|
|
|
|
|
|
|
|
std::thread::sleep(update_interval * 4);
|
|
|
|
|
|
|
|
assert!(
|
|
|
|
service.block_cache_len() >= n * 2,
|
|
|
|
"should have imported all blocks"
|
|
|
|
);
|
|
|
|
assert!(
|
|
|
|
service.deposit_cache_len() >= n * 2,
|
|
|
|
"should have imported all deposits, not {}",
|
|
|
|
service.deposit_cache_len()
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mod eth1_cache {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn simple_scenario() {
|
|
|
|
let mut env = new_env();
|
|
|
|
let log = env.core_context().log;
|
|
|
|
let runtime = env.runtime();
|
|
|
|
|
|
|
|
for follow_distance in 0..2 {
|
|
|
|
let eth1 = runtime
|
|
|
|
.block_on(GanacheEth1Instance::new())
|
|
|
|
.expect("should start eth1 environment");
|
|
|
|
let deposit_contract = ð1.deposit_contract;
|
|
|
|
let web3 = eth1.web3();
|
|
|
|
|
|
|
|
let initial_block_number = get_block_number(runtime, &web3);
|
|
|
|
|
|
|
|
let service = Service::new(
|
|
|
|
Config {
|
|
|
|
endpoint: eth1.endpoint(),
|
|
|
|
deposit_contract_address: deposit_contract.address(),
|
|
|
|
lowest_cached_block_number: initial_block_number,
|
|
|
|
follow_distance,
|
|
|
|
..Config::default()
|
|
|
|
},
|
|
|
|
log.clone(),
|
|
|
|
);
|
|
|
|
|
|
|
|
// Create some blocks and then consume them, performing the test `rounds` times.
|
|
|
|
for round in 0..2 {
|
|
|
|
let blocks = 4;
|
|
|
|
|
|
|
|
let initial = if round == 0 {
|
|
|
|
initial_block_number
|
|
|
|
} else {
|
|
|
|
service
|
|
|
|
.blocks()
|
|
|
|
.read()
|
|
|
|
.highest_block_number()
|
|
|
|
.map(|n| n + follow_distance)
|
|
|
|
.expect("should have a latest block after the first round")
|
|
|
|
};
|
|
|
|
|
|
|
|
for _ in 0..blocks {
|
|
|
|
runtime
|
|
|
|
.block_on(eth1.ganache.evm_mine())
|
|
|
|
.expect("should mine block");
|
|
|
|
}
|
|
|
|
|
|
|
|
runtime
|
|
|
|
.block_on(service.update_block_cache())
|
|
|
|
.expect("should update cache");
|
|
|
|
|
|
|
|
runtime
|
|
|
|
.block_on(service.update_block_cache())
|
|
|
|
.expect("should update cache when nothing has changed");
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
service
|
|
|
|
.blocks()
|
|
|
|
.read()
|
|
|
|
.highest_block_number()
|
|
|
|
.map(|n| n + follow_distance),
|
|
|
|
Some(initial + blocks),
|
|
|
|
"should update {} blocks in round {} (follow {})",
|
|
|
|
blocks,
|
|
|
|
round,
|
|
|
|
follow_distance,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Tests the case where we attempt to download more blocks than will fit in the cache.
|
|
|
|
#[test]
|
|
|
|
fn big_skip() {
|
|
|
|
let mut env = new_env();
|
|
|
|
let log = env.core_context().log;
|
|
|
|
let runtime = env.runtime();
|
|
|
|
|
|
|
|
let eth1 = runtime
|
|
|
|
.block_on(GanacheEth1Instance::new())
|
|
|
|
.expect("should start eth1 environment");
|
|
|
|
let deposit_contract = ð1.deposit_contract;
|
|
|
|
let web3 = eth1.web3();
|
|
|
|
|
|
|
|
let cache_len = 4;
|
|
|
|
|
|
|
|
let service = Service::new(
|
|
|
|
Config {
|
|
|
|
endpoint: eth1.endpoint(),
|
|
|
|
deposit_contract_address: deposit_contract.address(),
|
|
|
|
lowest_cached_block_number: get_block_number(runtime, &web3),
|
|
|
|
follow_distance: 0,
|
|
|
|
block_cache_truncation: Some(cache_len),
|
|
|
|
..Config::default()
|
|
|
|
},
|
|
|
|
log,
|
|
|
|
);
|
|
|
|
|
|
|
|
let blocks = cache_len * 2;
|
|
|
|
|
|
|
|
for _ in 0..blocks {
|
|
|
|
runtime
|
|
|
|
.block_on(eth1.ganache.evm_mine())
|
|
|
|
.expect("should mine block")
|
|
|
|
}
|
|
|
|
|
|
|
|
runtime
|
|
|
|
.block_on(service.update_block_cache())
|
|
|
|
.expect("should update cache");
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
service.block_cache_len(),
|
|
|
|
cache_len,
|
|
|
|
"should not grow cache beyond target"
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Tests to ensure that the cache gets pruned when doing multiple downloads smaller than the
|
|
|
|
/// cache size.
|
|
|
|
#[test]
|
|
|
|
fn pruning() {
|
|
|
|
let mut env = new_env();
|
|
|
|
let log = env.core_context().log;
|
|
|
|
let runtime = env.runtime();
|
|
|
|
|
|
|
|
let eth1 = runtime
|
|
|
|
.block_on(GanacheEth1Instance::new())
|
|
|
|
.expect("should start eth1 environment");
|
|
|
|
let deposit_contract = ð1.deposit_contract;
|
|
|
|
let web3 = eth1.web3();
|
|
|
|
|
|
|
|
let cache_len = 4;
|
|
|
|
|
|
|
|
let service = Service::new(
|
|
|
|
Config {
|
|
|
|
endpoint: eth1.endpoint(),
|
|
|
|
deposit_contract_address: deposit_contract.address(),
|
|
|
|
lowest_cached_block_number: get_block_number(runtime, &web3),
|
|
|
|
follow_distance: 0,
|
|
|
|
block_cache_truncation: Some(cache_len),
|
|
|
|
..Config::default()
|
|
|
|
},
|
|
|
|
log,
|
|
|
|
);
|
|
|
|
|
|
|
|
for _ in 0..4 {
|
|
|
|
for _ in 0..cache_len / 2 {
|
|
|
|
runtime
|
|
|
|
.block_on(eth1.ganache.evm_mine())
|
|
|
|
.expect("should mine block")
|
|
|
|
}
|
|
|
|
runtime
|
|
|
|
.block_on(service.update_block_cache())
|
|
|
|
.expect("should update cache");
|
|
|
|
}
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
service.block_cache_len(),
|
|
|
|
cache_len,
|
|
|
|
"should not grow cache beyond target"
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn double_update() {
|
|
|
|
let mut env = new_env();
|
|
|
|
let log = env.core_context().log;
|
|
|
|
let runtime = env.runtime();
|
|
|
|
|
|
|
|
let n = 16;
|
|
|
|
|
|
|
|
let eth1 = runtime
|
|
|
|
.block_on(GanacheEth1Instance::new())
|
|
|
|
.expect("should start eth1 environment");
|
|
|
|
let deposit_contract = ð1.deposit_contract;
|
|
|
|
let web3 = eth1.web3();
|
|
|
|
|
|
|
|
let service = Service::new(
|
|
|
|
Config {
|
|
|
|
endpoint: eth1.endpoint(),
|
|
|
|
deposit_contract_address: deposit_contract.address(),
|
|
|
|
lowest_cached_block_number: get_block_number(runtime, &web3),
|
|
|
|
follow_distance: 0,
|
|
|
|
..Config::default()
|
|
|
|
},
|
|
|
|
log,
|
|
|
|
);
|
|
|
|
|
|
|
|
for _ in 0..n {
|
|
|
|
runtime
|
|
|
|
.block_on(eth1.ganache.evm_mine())
|
|
|
|
.expect("should mine block")
|
|
|
|
}
|
|
|
|
|
|
|
|
runtime
|
|
|
|
.block_on(
|
|
|
|
service
|
|
|
|
.update_block_cache()
|
|
|
|
.join(service.update_block_cache()),
|
|
|
|
)
|
|
|
|
.expect("should perform two simultaneous updates");
|
|
|
|
|
|
|
|
assert!(service.block_cache_len() >= n, "should grow the cache");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mod deposit_tree {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn updating() {
|
|
|
|
let mut env = new_env();
|
|
|
|
let log = env.core_context().log;
|
|
|
|
let runtime = env.runtime();
|
|
|
|
|
|
|
|
let n = 4;
|
|
|
|
|
|
|
|
let eth1 = runtime
|
|
|
|
.block_on(GanacheEth1Instance::new())
|
|
|
|
.expect("should start eth1 environment");
|
|
|
|
let deposit_contract = ð1.deposit_contract;
|
|
|
|
let web3 = eth1.web3();
|
|
|
|
|
|
|
|
let start_block = get_block_number(runtime, &web3);
|
|
|
|
|
|
|
|
let service = Service::new(
|
|
|
|
Config {
|
|
|
|
endpoint: eth1.endpoint(),
|
|
|
|
deposit_contract_address: deposit_contract.address(),
|
|
|
|
deposit_contract_deploy_block: start_block,
|
|
|
|
follow_distance: 0,
|
|
|
|
..Config::default()
|
|
|
|
},
|
|
|
|
log,
|
|
|
|
);
|
|
|
|
|
|
|
|
for round in 0..3 {
|
|
|
|
let deposits: Vec<_> = (0..n).into_iter().map(|_| random_deposit_data()).collect();
|
|
|
|
|
|
|
|
for deposit in &deposits {
|
|
|
|
deposit_contract
|
|
|
|
.deposit(runtime, deposit.clone())
|
|
|
|
.expect("should perform a deposit");
|
|
|
|
}
|
|
|
|
|
|
|
|
runtime
|
|
|
|
.block_on(service.update_deposit_cache())
|
|
|
|
.expect("should perform update");
|
|
|
|
|
|
|
|
runtime
|
|
|
|
.block_on(service.update_deposit_cache())
|
|
|
|
.expect("should perform update when nothing has changed");
|
|
|
|
|
|
|
|
let first = n * round;
|
|
|
|
let last = n * (round + 1);
|
|
|
|
|
|
|
|
let (_root, local_deposits) = service
|
|
|
|
.deposits()
|
|
|
|
.read()
|
|
|
|
.cache
|
|
|
|
.get_deposits(first..last, last, 32)
|
|
|
|
.expect(&format!("should get deposits in round {}", round));
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
local_deposits.len(),
|
|
|
|
n as usize,
|
|
|
|
"should get the right number of deposits in round {}",
|
|
|
|
round
|
|
|
|
);
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
local_deposits
|
|
|
|
.iter()
|
|
|
|
.map(|d| d.data.clone())
|
|
|
|
.collect::<Vec<_>>(),
|
|
|
|
deposits.to_vec(),
|
|
|
|
"obtained deposits should match those submitted in round {}",
|
|
|
|
round
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn double_update() {
|
|
|
|
let mut env = new_env();
|
|
|
|
let log = env.core_context().log;
|
|
|
|
let runtime = env.runtime();
|
|
|
|
|
|
|
|
let n = 8;
|
|
|
|
|
|
|
|
let eth1 = runtime
|
|
|
|
.block_on(GanacheEth1Instance::new())
|
|
|
|
.expect("should start eth1 environment");
|
|
|
|
let deposit_contract = ð1.deposit_contract;
|
|
|
|
let web3 = eth1.web3();
|
|
|
|
|
|
|
|
let start_block = get_block_number(runtime, &web3);
|
|
|
|
|
|
|
|
let service = Service::new(
|
|
|
|
Config {
|
|
|
|
endpoint: eth1.endpoint(),
|
|
|
|
deposit_contract_address: deposit_contract.address(),
|
|
|
|
deposit_contract_deploy_block: start_block,
|
|
|
|
lowest_cached_block_number: start_block,
|
|
|
|
follow_distance: 0,
|
|
|
|
..Config::default()
|
|
|
|
},
|
|
|
|
log,
|
|
|
|
);
|
|
|
|
|
|
|
|
let deposits: Vec<_> = (0..n).into_iter().map(|_| random_deposit_data()).collect();
|
|
|
|
|
|
|
|
for deposit in &deposits {
|
|
|
|
deposit_contract
|
|
|
|
.deposit(runtime, deposit.clone())
|
|
|
|
.expect("should perform a deposit");
|
|
|
|
}
|
|
|
|
|
|
|
|
runtime
|
|
|
|
.block_on(
|
|
|
|
service
|
|
|
|
.update_deposit_cache()
|
|
|
|
.join(service.update_deposit_cache()),
|
|
|
|
)
|
|
|
|
.expect("should perform two updates concurrently");
|
|
|
|
|
|
|
|
assert_eq!(service.deposit_cache_len(), n);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn cache_consistency() {
|
|
|
|
let mut env = new_env();
|
|
|
|
let runtime = env.runtime();
|
|
|
|
|
|
|
|
let n = 8;
|
|
|
|
|
|
|
|
let deposits: Vec<_> = (0..n).into_iter().map(|_| random_deposit_data()).collect();
|
|
|
|
|
|
|
|
let eth1 = runtime
|
|
|
|
.block_on(GanacheEth1Instance::new())
|
|
|
|
.expect("should start eth1 environment");
|
|
|
|
let deposit_contract = ð1.deposit_contract;
|
|
|
|
let web3 = eth1.web3();
|
|
|
|
|
|
|
|
let mut deposit_roots = vec![];
|
|
|
|
let mut deposit_counts = vec![];
|
|
|
|
|
|
|
|
// Perform deposits to the smart contract, recording it's state along the way.
|
|
|
|
for deposit in &deposits {
|
|
|
|
deposit_contract
|
|
|
|
.deposit(runtime, deposit.clone())
|
|
|
|
.expect("should perform a deposit");
|
|
|
|
let block_number = get_block_number(runtime, &web3);
|
|
|
|
deposit_roots.push(
|
|
|
|
blocking_deposit_root(runtime, ð1, block_number)
|
|
|
|
.expect("should get root if contract exists"),
|
|
|
|
);
|
|
|
|
deposit_counts.push(
|
|
|
|
blocking_deposit_count(runtime, ð1, block_number)
|
|
|
|
.expect("should get count if contract exists"),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut tree = DepositCache::default();
|
|
|
|
|
|
|
|
// Pull all the deposit logs from the contract.
|
|
|
|
let block_number = get_block_number(runtime, &web3);
|
|
|
|
let logs: Vec<_> = blocking_deposit_logs(runtime, ð1, 0..block_number)
|
|
|
|
.iter()
|
|
|
|
.map(|raw| DepositLog::from_log(raw).expect("should parse deposit log"))
|
|
|
|
.inspect(|log| {
|
|
|
|
tree.insert_log(log.clone())
|
|
|
|
.expect("should add consecutive logs")
|
|
|
|
})
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
// Check the logs for invariants.
|
|
|
|
for i in 0..logs.len() {
|
|
|
|
let log = &logs[i];
|
|
|
|
assert_eq!(
|
|
|
|
log.deposit_data, deposits[i],
|
|
|
|
"log {} should have correct deposit data",
|
|
|
|
i
|
|
|
|
);
|
|
|
|
assert_eq!(log.index, i as u64, "log {} should have correct index", i);
|
|
|
|
}
|
|
|
|
|
|
|
|
// For each deposit test some more invariants
|
|
|
|
for i in 0..n {
|
|
|
|
// Ensure the deposit count from the smart contract was as expected.
|
|
|
|
assert_eq!(
|
|
|
|
deposit_counts[i],
|
|
|
|
i as u64 + 1,
|
|
|
|
"deposit count should be accurate"
|
|
|
|
);
|
|
|
|
|
|
|
|
// Ensure that the root from the deposit tree matches what the contract reported.
|
|
|
|
let (root, deposits) = tree
|
|
|
|
.get_deposits(0..i as u64, deposit_counts[i], DEPOSIT_CONTRACT_TREE_DEPTH)
|
|
|
|
.expect("should get deposits");
|
|
|
|
assert_eq!(
|
|
|
|
root, deposit_roots[i],
|
|
|
|
"tree deposit root {} should match the contract",
|
|
|
|
i
|
|
|
|
);
|
|
|
|
|
|
|
|
// Ensure that the deposits all prove into the root from the smart contract.
|
|
|
|
let deposit_root = deposit_roots[i];
|
|
|
|
for (j, deposit) in deposits.iter().enumerate() {
|
|
|
|
assert!(
|
|
|
|
verify_merkle_proof(
|
|
|
|
Hash256::from_slice(&deposit.data.tree_hash_root()),
|
|
|
|
&deposit.proof,
|
|
|
|
DEPOSIT_CONTRACT_TREE_DEPTH + 1,
|
|
|
|
j,
|
|
|
|
deposit_root
|
|
|
|
),
|
|
|
|
"deposit merkle proof should prove into deposit contract root"
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Tests for the base HTTP requests and response handlers.
|
|
|
|
mod http {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
fn get_block(runtime: &mut Runtime, eth1: &GanacheEth1Instance, block_number: u64) -> Block {
|
|
|
|
runtime
|
|
|
|
.block_on(eth1::http::get_block(
|
|
|
|
ð1.endpoint(),
|
|
|
|
block_number,
|
|
|
|
timeout(),
|
|
|
|
))
|
|
|
|
.expect("should get block number")
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn incrementing_deposits() {
|
|
|
|
let mut env = new_env();
|
|
|
|
let runtime = env.runtime();
|
|
|
|
|
|
|
|
let eth1 = runtime
|
|
|
|
.block_on(GanacheEth1Instance::new())
|
|
|
|
.expect("should start eth1 environment");
|
|
|
|
let deposit_contract = ð1.deposit_contract;
|
|
|
|
let web3 = eth1.web3();
|
|
|
|
|
|
|
|
let block_number = get_block_number(runtime, &web3);
|
|
|
|
let logs = blocking_deposit_logs(runtime, ð1, 0..block_number);
|
|
|
|
assert_eq!(logs.len(), 0);
|
|
|
|
|
|
|
|
let mut old_root = blocking_deposit_root(runtime, ð1, block_number);
|
|
|
|
let mut old_block = get_block(runtime, ð1, block_number);
|
|
|
|
let mut old_block_number = block_number;
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
blocking_deposit_count(runtime, ð1, block_number),
|
|
|
|
Some(0),
|
|
|
|
"should have deposit count zero"
|
|
|
|
);
|
|
|
|
|
|
|
|
for i in 1..=8 {
|
|
|
|
runtime
|
|
|
|
.block_on(eth1.ganache.increase_time(1))
|
|
|
|
.expect("should be able to increase time on ganache");
|
|
|
|
|
|
|
|
deposit_contract
|
|
|
|
.deposit(runtime, random_deposit_data())
|
|
|
|
.expect("should perform a deposit");
|
|
|
|
|
|
|
|
// Check the logs.
|
|
|
|
let block_number = get_block_number(runtime, &web3);
|
|
|
|
let logs = blocking_deposit_logs(runtime, ð1, 0..block_number);
|
|
|
|
assert_eq!(logs.len(), i, "the number of logs should be as expected");
|
|
|
|
|
|
|
|
// Check the deposit count.
|
|
|
|
assert_eq!(
|
|
|
|
blocking_deposit_count(runtime, ð1, block_number),
|
|
|
|
Some(i as u64),
|
|
|
|
"should have a correct deposit count"
|
|
|
|
);
|
|
|
|
|
|
|
|
// Check the deposit root.
|
|
|
|
let new_root = blocking_deposit_root(runtime, ð1, block_number);
|
|
|
|
assert_ne!(
|
|
|
|
new_root, old_root,
|
|
|
|
"deposit root should change with each deposit"
|
|
|
|
);
|
|
|
|
old_root = new_root;
|
|
|
|
|
|
|
|
// Check the block hash.
|
|
|
|
let new_block = get_block(runtime, ð1, block_number);
|
|
|
|
assert_ne!(
|
|
|
|
new_block.hash, old_block.hash,
|
|
|
|
"block hash should change with each deposit"
|
|
|
|
);
|
|
|
|
|
|
|
|
// Check to ensure the timestamp is increasing
|
|
|
|
assert!(
|
|
|
|
old_block.timestamp <= new_block.timestamp,
|
|
|
|
"block timestamp should increase"
|
|
|
|
);
|
|
|
|
|
|
|
|
old_block = new_block.clone();
|
|
|
|
|
|
|
|
// Check the block number.
|
|
|
|
assert!(
|
|
|
|
block_number > old_block_number,
|
|
|
|
"block number should increase"
|
|
|
|
);
|
|
|
|
old_block_number = block_number;
|
|
|
|
|
|
|
|
// Check to ensure the block root is changing
|
|
|
|
assert_ne!(
|
|
|
|
new_root,
|
|
|
|
Some(new_block.hash),
|
|
|
|
"the deposit root should be different to the block hash"
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|