mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-15 10:52:43 +00:00
Add Electra forks to basic sim tests (#7199)
This PR adds transitions to Electra ~~and Fulu~~ fork epochs in the simulator tests. ~~It also covers blob inclusion verification and data column syncing on a full node in Fulu.~~ UPDATE: Remove fulu fork from sim tests due to https://github.com/sigp/lighthouse/pull/7199#issuecomment-2852281176
This commit is contained in:
@@ -18,6 +18,7 @@ use environment::tracing_common;
|
||||
use tracing_subscriber::prelude::*;
|
||||
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
|
||||
|
||||
use logging::build_workspace_filter;
|
||||
use tokio::time::sleep;
|
||||
use types::{Epoch, EthSpec, MinimalEthSpec};
|
||||
|
||||
@@ -25,10 +26,9 @@ const END_EPOCH: u64 = 16;
|
||||
const GENESIS_DELAY: u64 = 32;
|
||||
const ALTAIR_FORK_EPOCH: u64 = 0;
|
||||
const BELLATRIX_FORK_EPOCH: u64 = 0;
|
||||
const CAPELLA_FORK_EPOCH: u64 = 1;
|
||||
const DENEB_FORK_EPOCH: u64 = 2;
|
||||
// const ELECTRA_FORK_EPOCH: u64 = 3;
|
||||
// const FULU_FORK_EPOCH: u64 = 4;
|
||||
const CAPELLA_FORK_EPOCH: u64 = 0;
|
||||
const DENEB_FORK_EPOCH: u64 = 0;
|
||||
const ELECTRA_FORK_EPOCH: u64 = 2;
|
||||
|
||||
const SUGGESTED_FEE_RECIPIENT: [u8; 20] =
|
||||
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1];
|
||||
@@ -116,7 +116,11 @@ pub fn run_basic_sim(matches: &ArgMatches) -> Result<(), String> {
|
||||
);
|
||||
|
||||
if let Err(e) = tracing_subscriber::registry()
|
||||
.with(stdout_logging_layer.with_filter(logger_config.debug_level))
|
||||
.with(
|
||||
stdout_logging_layer
|
||||
.with_filter(logger_config.debug_level)
|
||||
.with_filter(build_workspace_filter()?),
|
||||
)
|
||||
.try_init()
|
||||
{
|
||||
eprintln!("Failed to initialize dependency logging: {e}");
|
||||
@@ -130,8 +134,8 @@ pub fn run_basic_sim(matches: &ArgMatches) -> Result<(), String> {
|
||||
let genesis_delay = GENESIS_DELAY;
|
||||
|
||||
// Convenience variables. Update these values when adding a newer fork.
|
||||
let latest_fork_version = spec.deneb_fork_version;
|
||||
let latest_fork_start_epoch = DENEB_FORK_EPOCH;
|
||||
let latest_fork_version = spec.electra_fork_version;
|
||||
let latest_fork_start_epoch = ELECTRA_FORK_EPOCH;
|
||||
|
||||
spec.seconds_per_slot /= speed_up_factor;
|
||||
spec.seconds_per_slot = max(1, spec.seconds_per_slot);
|
||||
@@ -142,8 +146,7 @@ pub fn run_basic_sim(matches: &ArgMatches) -> Result<(), String> {
|
||||
spec.bellatrix_fork_epoch = Some(Epoch::new(BELLATRIX_FORK_EPOCH));
|
||||
spec.capella_fork_epoch = Some(Epoch::new(CAPELLA_FORK_EPOCH));
|
||||
spec.deneb_fork_epoch = Some(Epoch::new(DENEB_FORK_EPOCH));
|
||||
//spec.electra_fork_epoch = Some(Epoch::new(ELECTRA_FORK_EPOCH));
|
||||
//spec.fulu_fork_epoch = Some(Epoch::new(FULU_FORK_EPOCH));
|
||||
spec.electra_fork_epoch = Some(Epoch::new(ELECTRA_FORK_EPOCH));
|
||||
let spec = Arc::new(spec);
|
||||
env.eth2_config.spec = spec.clone();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user