diff --git a/Cargo.toml b/Cargo.toml index a461be7847..5ad44eb917 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ members = [ "crates/era-downloader", "crates/era-utils", "crates/errors/", - "crates/ethereum-forks/", + "crates/ethereum/hardforks/", "crates/ethereum/cli/", "crates/ethereum/consensus/", "crates/ethereum/engine-primitives/", @@ -353,7 +353,7 @@ reth-eth-wire-types = { path = "crates/net/eth-wire-types" } reth-ethereum-cli = { path = "crates/ethereum/cli" } reth-ethereum-consensus = { path = "crates/ethereum/consensus", default-features = false } reth-ethereum-engine-primitives = { path = "crates/ethereum/engine-primitives", default-features = false } -reth-ethereum-forks = { path = "crates/ethereum-forks", default-features = false } +reth-ethereum-forks = { path = "crates/ethereum/hardforks", default-features = false } reth-ethereum-payload-builder = { path = "crates/ethereum/payload" } reth-ethereum-primitives = { path = "crates/ethereum/primitives", default-features = false } reth-ethereum = { path = "crates/ethereum/reth" } diff --git a/crates/ethereum-forks/Cargo.toml b/crates/ethereum/hardforks/Cargo.toml similarity index 100% rename from crates/ethereum-forks/Cargo.toml rename to crates/ethereum/hardforks/Cargo.toml diff --git a/crates/ethereum-forks/src/display.rs b/crates/ethereum/hardforks/src/display.rs similarity index 98% rename from crates/ethereum-forks/src/display.rs rename to crates/ethereum/hardforks/src/display.rs index eb6538dd68..e40a117d26 100644 --- a/crates/ethereum-forks/src/display.rs +++ b/crates/ethereum/hardforks/src/display.rs @@ -84,7 +84,8 @@ impl core::fmt::Display for DisplayFork { // - Paris @58750000000000000000000 (network is known to be merged) // Post-merge hard forks (timestamp based): // - Shanghai @1681338455 -// - Cancun @1710338135" +// - Cancun @1710338135 +// - Prague @1746612311 /// ``` #[derive(Debug)] pub struct DisplayHardforks { diff --git a/crates/ethereum-forks/src/hardforks/dev.rs b/crates/ethereum/hardforks/src/hardforks/dev.rs similarity index 95% rename from crates/ethereum-forks/src/hardforks/dev.rs rename to crates/ethereum/hardforks/src/hardforks/dev.rs index 225263ffed..b121a084de 100644 --- a/crates/ethereum-forks/src/hardforks/dev.rs +++ b/crates/ethereum/hardforks/src/hardforks/dev.rs @@ -34,5 +34,6 @@ pub static DEV_HARDFORKS: LazyLock = LazyLock::new(|| { ), (EthereumHardfork::Shanghai.boxed(), ForkCondition::Timestamp(0)), (EthereumHardfork::Cancun.boxed(), ForkCondition::Timestamp(0)), + (EthereumHardfork::Prague.boxed(), ForkCondition::Timestamp(0)), ]) }); diff --git a/crates/ethereum-forks/src/hardforks/mod.rs b/crates/ethereum/hardforks/src/hardforks/mod.rs similarity index 100% rename from crates/ethereum-forks/src/hardforks/mod.rs rename to crates/ethereum/hardforks/src/hardforks/mod.rs diff --git a/crates/ethereum-forks/src/lib.rs b/crates/ethereum/hardforks/src/lib.rs similarity index 100% rename from crates/ethereum-forks/src/lib.rs rename to crates/ethereum/hardforks/src/lib.rs