From 56e1448dbdcbddc6e45a3dad5b4cf81028bf9b96 Mon Sep 17 00:00:00 2001 From: clabby Date: Tue, 20 Aug 2024 00:31:29 -0400 Subject: [PATCH] feat: Superchain mainnet - `Granite` hardfork timestamps (#10387) --- crates/chainspec/src/spec.rs | 8 ++++++-- crates/ethereum-forks/src/hardfork/optimism.rs | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/crates/chainspec/src/spec.rs b/crates/chainspec/src/spec.rs index 5c96bfb803..588e083e89 100644 --- a/crates/chainspec/src/spec.rs +++ b/crates/chainspec/src/spec.rs @@ -1691,7 +1691,11 @@ Post-merge hard forks (timestamp based): ), ( Head { number: 0, timestamp: 1720627201, ..Default::default() }, - ForkId { hash: ForkHash([0xe4, 0x01, 0x0e, 0xb9]), next: 0 }, + ForkId { hash: ForkHash([0xe4, 0x01, 0x0e, 0xb9]), next: 1725984001 }, + ), + ( + Head { number: 0, timestamp: 1725984001, ..Default::default() }, + ForkId { hash: ForkHash([0xfa, 0x57, 0x86, 0x01]), next: 0 }, ), ], ); @@ -2649,7 +2653,7 @@ Post-merge hard forks (timestamp based): #[test] fn latest_base_mainnet_fork_id() { assert_eq!( - ForkId { hash: ForkHash([0xe4, 0x01, 0x0e, 0xb9]), next: 0 }, + ForkId { hash: ForkHash([0xfa, 0x57, 0x86, 0x01]), next: 0 }, BASE_MAINNET.latest_fork_id() ) } diff --git a/crates/ethereum-forks/src/hardfork/optimism.rs b/crates/ethereum-forks/src/hardfork/optimism.rs index cd23d632b5..e9c83dc072 100644 --- a/crates/ethereum-forks/src/hardfork/optimism.rs +++ b/crates/ethereum-forks/src/hardfork/optimism.rs @@ -187,7 +187,7 @@ impl OptimismHardfork { Self::Canyon => Some(1704992401), Self::Ecotone => Some(1710374401), Self::Fjord => Some(1720627201), - _ => None, + Self::Granite => Some(1725984001), }, ) } @@ -219,6 +219,7 @@ impl OptimismHardfork { (EthereumHardfork::Cancun.boxed(), ForkCondition::Timestamp(1710374401)), (Self::Ecotone.boxed(), ForkCondition::Timestamp(1710374401)), (Self::Fjord.boxed(), ForkCondition::Timestamp(1720627201)), + (Self::Granite.boxed(), ForkCondition::Timestamp(1725984001)), ]) } @@ -311,6 +312,7 @@ impl OptimismHardfork { (EthereumHardfork::Cancun.boxed(), ForkCondition::Timestamp(1710374401)), (Self::Ecotone.boxed(), ForkCondition::Timestamp(1710374401)), (Self::Fjord.boxed(), ForkCondition::Timestamp(1720627201)), + (Self::Granite.boxed(), ForkCondition::Timestamp(1725984001)), ]) } }