mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-15 19:02:42 +00:00
## Issue Addressed resolves #2129 resolves #2099 addresses some of #1712 unblocks #2076 unblocks #2153 ## Proposed Changes - Updates all the dependencies mentioned in #2129, except for web3. They haven't merged their tokio 1.0 update because they are waiting on some dependencies of their own. Since we only use web3 in tests, I think updating it in a separate issue is fine. If they are able to merge soon though, I can update in this PR. - Updates `tokio_util` to 0.6.2 and `bytes` to 1.0.1. - We haven't made a discv5 release since merging tokio 1.0 updates so I'm using a commit rather than release atm. **Edit:** I think we should merge an update of `tokio_util` to 0.6.2 into discv5 before this release because it has panic fixes in `DelayQueue` --> PR in discv5: https://github.com/sigp/discv5/pull/58 ## Additional Info tokio 1.0 changes that required some changes in lighthouse: - `interval.next().await.is_some()` -> `interval.tick().await` - `sleep` future is now `!Unpin` -> https://github.com/tokio-rs/tokio/issues/3028 - `try_recv` has been temporarily removed from `mpsc` -> https://github.com/tokio-rs/tokio/issues/3350 - stream features have moved to `tokio-stream` and `broadcast::Receiver::into_stream()` has been temporarily removed -> `https://github.com/tokio-rs/tokio/issues/2870 - I've copied over the `BroadcastStream` wrapper from this PR, but can update to use `tokio-stream` once it's merged https://github.com/tokio-rs/tokio/pull/3384 Co-authored-by: realbigsean <seananderson33@gmail.com>
80 lines
3.0 KiB
Rust
80 lines
3.0 KiB
Rust
use clap::ArgMatches;
|
|
use environment::Environment;
|
|
use eth2_network_config::Eth2NetworkConfig;
|
|
use genesis::{Eth1Config, Eth1GenesisService};
|
|
use ssz::Encode;
|
|
use std::cmp::max;
|
|
use std::path::PathBuf;
|
|
use std::time::Duration;
|
|
use types::EthSpec;
|
|
|
|
/// Interval between polling the eth1 node for genesis information.
|
|
pub const ETH1_GENESIS_UPDATE_INTERVAL: Duration = Duration::from_millis(7_000);
|
|
|
|
pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches<'_>) -> Result<(), String> {
|
|
let endpoints = matches
|
|
.value_of("eth1-endpoint")
|
|
.map(|e| {
|
|
warn!("The --eth1-endpoint flag is deprecated. Please use --eth1-endpoints instead");
|
|
vec![String::from(e)]
|
|
})
|
|
.or_else(|| {
|
|
matches
|
|
.value_of("eth1-endpoints")
|
|
.map(|s| s.split(',').map(String::from).collect())
|
|
});
|
|
|
|
let testnet_dir = matches
|
|
.value_of("testnet-dir")
|
|
.ok_or(())
|
|
.and_then(|dir| dir.parse::<PathBuf>().map_err(|_| ()))
|
|
.unwrap_or_else(|_| {
|
|
dirs::home_dir()
|
|
.map(|home| home.join(directory::DEFAULT_ROOT_DIR).join("testnet"))
|
|
.expect("should locate home directory")
|
|
});
|
|
|
|
let mut eth2_network_config = Eth2NetworkConfig::load(testnet_dir.clone())?;
|
|
|
|
let spec = eth2_network_config
|
|
.yaml_config
|
|
.as_ref()
|
|
.ok_or("The testnet directory must contain a spec config")?
|
|
.apply_to_chain_spec::<T>(&env.core_context().eth2_config.spec)
|
|
.ok_or_else(|| {
|
|
format!(
|
|
"The loaded config is not compatible with the {} spec",
|
|
&env.core_context().eth2_config.eth_spec_id
|
|
)
|
|
})?;
|
|
|
|
let mut config = Eth1Config::default();
|
|
if let Some(v) = endpoints.clone() {
|
|
config.endpoints = v;
|
|
}
|
|
config.deposit_contract_address = format!("{:?}", spec.deposit_contract_address);
|
|
config.deposit_contract_deploy_block = eth2_network_config.deposit_contract_deploy_block;
|
|
config.lowest_cached_block_number = eth2_network_config.deposit_contract_deploy_block;
|
|
config.follow_distance = spec.eth1_follow_distance / 2;
|
|
config.node_far_behind_seconds = max(5, config.follow_distance) * spec.seconds_per_eth1_block;
|
|
|
|
let genesis_service =
|
|
Eth1GenesisService::new(config, env.core_context().log().clone(), spec.clone());
|
|
|
|
env.runtime().block_on(async {
|
|
let _ = genesis_service
|
|
.wait_for_genesis_state::<T>(ETH1_GENESIS_UPDATE_INTERVAL, spec)
|
|
.await
|
|
.map(move |genesis_state| {
|
|
eth2_network_config.genesis_state_bytes = Some(genesis_state.as_ssz_bytes());
|
|
eth2_network_config.force_write_to_file(testnet_dir)
|
|
})
|
|
.map_err(|e| format!("Failed to find genesis: {}", e))?;
|
|
|
|
info!("Starting service to produce genesis BeaconState from eth1");
|
|
info!("Connecting to eth1 http endpoints: {:?}", endpoints);
|
|
|
|
Ok(())
|
|
})
|
|
}
|