From 1399cae1e1ba093aea923b5bb8cdf33267beeca2 Mon Sep 17 00:00:00 2001 From: Brian Bland Date: Wed, 5 Jun 2024 11:08:14 -0700 Subject: [PATCH 1/2] Add fjord activation times/blocks for Base --- crates/ethereum-forks/src/hardfork.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crates/ethereum-forks/src/hardfork.rs b/crates/ethereum-forks/src/hardfork.rs index 4c9b6a10e30b..40d879633694 100644 --- a/crates/ethereum-forks/src/hardfork.rs +++ b/crates/ethereum-forks/src/hardfork.rs @@ -251,6 +251,7 @@ impl Hardfork { Self::Regolith => Some(0), Self::Shanghai | Self::Canyon => Some(2106456), Self::Cancun | Self::Ecotone => Some(6383256), + Self::Fjord => Some(10615056), _ => None, } } @@ -485,6 +486,7 @@ impl Hardfork { Self::Regolith => Some(1695768288), Self::Shanghai | Self::Canyon => Some(1699981200), Self::Cancun | Self::Ecotone => Some(1708534800), + Self::Fjord => Some(1716998400), _ => None, } } @@ -513,6 +515,7 @@ impl Hardfork { Self::Regolith => Some(1686789347), Self::Shanghai | Self::Canyon => Some(1704992401), Self::Cancun | Self::Ecotone => Some(1710374401), + Self::Fjord => Some(1720627201), _ => None, } } From 1626eb39983aaae97446bf3d59c3f60ae2b61b1c Mon Sep 17 00:00:00 2001 From: Brian Bland Date: Wed, 5 Jun 2024 11:12:20 -0700 Subject: [PATCH 2/2] Update some op hardfork tests --- crates/ethereum-forks/src/hardfork.rs | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/crates/ethereum-forks/src/hardfork.rs b/crates/ethereum-forks/src/hardfork.rs index 40d879633694..1f8346bfe4ec 100644 --- a/crates/ethereum-forks/src/hardfork.rs +++ b/crates/ethereum-forks/src/hardfork.rs @@ -551,6 +551,8 @@ impl FromStr for Hardfork { "canyon" => Self::Canyon, #[cfg(feature = "optimism")] "ecotone" => Self::Ecotone, + #[cfg(feature = "optimism")] + "fjord" => Self::Fjord, "prague" => Self::Prague, // "arbos11" => Hardfork::ArbOS11, // "arbos20atlas" => Hardfork::ArbOS20Atlas, @@ -621,9 +623,14 @@ mod tests { #[test] #[cfg(feature = "optimism")] fn check_op_hardfork_from_str() { - let hardfork_str = ["beDrOck", "rEgOlITH", "cAnYoN", "eCoToNe"]; - let expected_hardforks = - [Hardfork::Bedrock, Hardfork::Regolith, Hardfork::Canyon, Hardfork::Ecotone]; + let hardfork_str = ["beDrOck", "rEgOlITH", "cAnYoN", "eCoToNe", "FJorD"]; + let expected_hardforks = [ + Hardfork::Bedrock, + Hardfork::Regolith, + Hardfork::Canyon, + Hardfork::Ecotone, + Hardfork::Fjord, + ]; let hardforks: Vec = hardfork_str.iter().map(|h| Hardfork::from_str(h).unwrap()).collect(); @@ -658,8 +665,13 @@ mod tests { let pos_hardforks = [Hardfork::Paris, Hardfork::Shanghai, Hardfork::Cancun]; #[cfg(feature = "optimism")] - let op_hardforks = - [Hardfork::Bedrock, Hardfork::Regolith, Hardfork::Canyon, Hardfork::Ecotone]; + let op_hardforks = [ + Hardfork::Bedrock, + Hardfork::Regolith, + Hardfork::Canyon, + Hardfork::Ecotone, + Hardfork::Fjord, + ]; for hardfork in &pow_hardforks { assert_eq!(hardfork.consensus_type(), ConsensusType::ProofOfWork);