mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-23 23:04:53 +00:00
Remove all prod eth1 related code (#7133)
N/A After the electra fork which includes EIP 6110, the beacon node no longer needs the eth1 bridging mechanism to include new deposits as they are provided by the EL as a `deposit_request`. So after electra + a transition period where the finalized bridge deposits pre-fork are included through the old mechanism, we no longer need the elaborate machinery we had to get deposit contract data from the execution layer. Since holesky has already forked to electra and completed the transition period, this PR basically checks to see if removing all the eth1 related logic leads to any surprises.
This commit is contained in:
@@ -2,9 +2,7 @@ mod cli;
|
||||
mod config;
|
||||
|
||||
pub use beacon_chain;
|
||||
use beacon_chain::{
|
||||
builder::Witness, eth1_chain::CachingEth1Backend, slot_clock::SystemTimeSlotClock,
|
||||
};
|
||||
use beacon_chain::{builder::Witness, slot_clock::SystemTimeSlotClock};
|
||||
use clap::ArgMatches;
|
||||
pub use cli::cli_app;
|
||||
pub use client::{Client, ClientBuilder, ClientConfig, ClientGenesis};
|
||||
@@ -19,15 +17,8 @@ use tracing::{info, warn};
|
||||
use types::{ChainSpec, Epoch, EthSpec, ForkName};
|
||||
|
||||
/// A type-alias to the tighten the definition of a production-intended `Client`.
|
||||
pub type ProductionClient<E> = Client<
|
||||
Witness<
|
||||
SystemTimeSlotClock,
|
||||
CachingEth1Backend<E>,
|
||||
E,
|
||||
BeaconNodeBackend<E>,
|
||||
BeaconNodeBackend<E>,
|
||||
>,
|
||||
>;
|
||||
pub type ProductionClient<E> =
|
||||
Client<Witness<SystemTimeSlotClock, E, BeaconNodeBackend<E>, BeaconNodeBackend<E>>>;
|
||||
|
||||
/// The beacon node `Client` that will be used in production.
|
||||
///
|
||||
@@ -132,22 +123,7 @@ impl<E: EthSpec> ProductionBeaconNode<E> {
|
||||
let builder = builder
|
||||
.beacon_chain_builder(client_genesis, client_config.clone())
|
||||
.await?;
|
||||
let builder = if client_config.sync_eth1_chain {
|
||||
info!(
|
||||
endpoint = ?client_config.eth1.endpoint,
|
||||
method = "json rpc via http",
|
||||
"Block production enabled"
|
||||
);
|
||||
builder
|
||||
.caching_eth1_backend(client_config.eth1.clone())
|
||||
.await?
|
||||
} else {
|
||||
info!(
|
||||
reason = "no eth1 backend configured",
|
||||
"Block production disabled"
|
||||
);
|
||||
builder.no_eth1_backend()?
|
||||
};
|
||||
info!("Block production enabled");
|
||||
|
||||
let builder = builder.system_time_slot_clock()?;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user