5de00b7ee8
## Issue Addressed Resolves #3069 ## Proposed Changes Unify the `eth1-endpoints` and `execution-endpoints` flags in a backwards compatible way as described in https://github.com/sigp/lighthouse/issues/3069#issuecomment-1134219221 Users have 2 options: 1. Use multiple non auth execution endpoints for deposit processing pre-merge 2. Use a single jwt authenticated execution endpoint for both execution layer and deposit processing post merge Related https://github.com/sigp/lighthouse/issues/3118 To enable jwt authenticated deposit processing, this PR removes the calls to `net_version` as the `net` namespace is not exposed in the auth server in execution clients. Moving away from using `networkId` is a good step in my opinion as it doesn't provide us with any added guarantees over `chainId`. See https://github.com/ethereum/consensus-specs/issues/2163 and https://github.com/sigp/lighthouse/issues/2115 Co-authored-by: Paul Hauner <paul@paulhauner.com>
70 lines
2.6 KiB
Rust
70 lines
2.6 KiB
Rust
use clap::ArgMatches;
|
|
use environment::Environment;
|
|
use eth2_network_config::Eth2NetworkConfig;
|
|
use genesis::{Eth1Config, Eth1Endpoint, Eth1GenesisService};
|
|
use sensitive_url::SensitiveUrl;
|
|
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>,
|
|
testnet_dir: PathBuf,
|
|
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 mut eth2_network_config = Eth2NetworkConfig::load(testnet_dir.clone())?;
|
|
|
|
let spec = eth2_network_config.chain_spec::<T>()?;
|
|
|
|
let mut config = Eth1Config::default();
|
|
if let Some(v) = endpoints.clone() {
|
|
let endpoints = v
|
|
.iter()
|
|
.map(|s| SensitiveUrl::parse(s))
|
|
.collect::<Result<_, _>>()
|
|
.map_err(|e| format!("Unable to parse eth1 endpoint URL: {:?}", e))?;
|
|
config.endpoints = Eth1Endpoint::NoAuth(endpoints);
|
|
}
|
|
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(())
|
|
})
|
|
}
|