jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add fjord activation times/blocks for Base (#8619)

Browse Source
This commit is contained in:
Brian Bland
2024-06-05 12:34:44 -07:00
committed by GitHub
parent ad80ad89a2
commit 8fc5f842f3
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/ethereum-forks/src/hardfork.rs
View File

@ -251,6 +251,7 @@ impl Hardfork {
Self::Regolith => Some(0), Self::Regolith => Some(0),
Self::Shanghai | Self::Canyon => Some(2106456), Self::Shanghai | Self::Canyon => Some(2106456),
Self::Cancun | Self::Ecotone => Some(6383256), Self::Cancun | Self::Ecotone => Some(6383256),
Self::Fjord => Some(10615056),
_ => None, _ => None,
} }
} }
@ -485,6 +486,7 @@ impl Hardfork {
Self::Regolith => Some(1695768288), Self::Regolith => Some(1695768288),
Self::Shanghai | Self::Canyon => Some(1699981200), Self::Shanghai | Self::Canyon => Some(1699981200),
Self::Cancun | Self::Ecotone => Some(1708534800), Self::Cancun | Self::Ecotone => Some(1708534800),
Self::Fjord => Some(1716998400),
_ => None, _ => None,
} }
} }
@ -513,6 +515,7 @@ impl Hardfork {
Self::Regolith => Some(1686789347), Self::Regolith => Some(1686789347),
Self::Shanghai | Self::Canyon => Some(1704992401), Self::Shanghai | Self::Canyon => Some(1704992401),
Self::Cancun | Self::Ecotone => Some(1710374401), Self::Cancun | Self::Ecotone => Some(1710374401),
Self::Fjord => Some(1720627201),
_ => None, _ => None,
} }
} }
@ -548,6 +551,8 @@ impl FromStr for Hardfork {
"canyon" => Self::Canyon, "canyon" => Self::Canyon,
#[cfg(feature = "optimism")] #[cfg(feature = "optimism")]
"ecotone" => Self::Ecotone, "ecotone" => Self::Ecotone,
#[cfg(feature = "optimism")]
"fjord" => Self::Fjord,
"prague" => Self::Prague, "prague" => Self::Prague,
// "arbos11" => Hardfork::ArbOS11, // "arbos11" => Hardfork::ArbOS11,
// "arbos20atlas" => Hardfork::ArbOS20Atlas, // "arbos20atlas" => Hardfork::ArbOS20Atlas,
@ -618,9 +623,14 @@ mod tests {
#[test] #[test]
#[cfg(feature = "optimism")] #[cfg(feature = "optimism")]
fn check_op_hardfork_from_str() { fn check_op_hardfork_from_str() {
let hardfork_str = ["beDrOck", "rEgOlITH", "cAnYoN", "eCoToNe"]; let hardfork_str = ["beDrOck", "rEgOlITH", "cAnYoN", "eCoToNe", "FJorD"];
let expected_hardforks = let expected_hardforks = [
[Hardfork::Bedrock, Hardfork::Regolith, Hardfork::Canyon, Hardfork::Ecotone]; Hardfork::Bedrock,
Hardfork::Regolith,
Hardfork::Canyon,
Hardfork::Ecotone,
Hardfork::Fjord,
];
let hardforks: Vec<Hardfork> = let hardforks: Vec<Hardfork> =
hardfork_str.iter().map(|h| Hardfork::from_str(h).unwrap()).collect(); hardfork_str.iter().map(|h| Hardfork::from_str(h).unwrap()).collect();
@ -655,8 +665,13 @@ mod tests {
let pos_hardforks = [Hardfork::Paris, Hardfork::Shanghai, Hardfork::Cancun]; let pos_hardforks = [Hardfork::Paris, Hardfork::Shanghai, Hardfork::Cancun];
#[cfg(feature = "optimism")] #[cfg(feature = "optimism")]
let op_hardforks = let op_hardforks = [
[Hardfork::Bedrock, Hardfork::Regolith, Hardfork::Canyon, Hardfork::Ecotone]; Hardfork::Bedrock,
Hardfork::Regolith,
Hardfork::Canyon,
Hardfork::Ecotone,
Hardfork::Fjord,
];
for hardfork in &pow_hardforks { for hardfork in &pow_hardforks {
assert_eq!(hardfork.consensus_type(), ConsensusType::ProofOfWork); assert_eq!(hardfork.consensus_type(), ConsensusType::ProofOfWork);