From fe5f52c0b3f41acef6cc8d6eb360f4e6db69c2cc Mon Sep 17 00:00:00 2001 From: frisitano Date: Thu, 27 Nov 2025 12:30:55 +0400 Subject: [PATCH 1/2] set galileo timestamps --- crates/scroll/alloy/hardforks/src/hardfork.rs | 3 ++- crates/scroll/hardforks/src/lib.rs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/crates/scroll/alloy/hardforks/src/hardfork.rs b/crates/scroll/alloy/hardforks/src/hardfork.rs index b8bca4dea75..57c5095f616 100644 --- a/crates/scroll/alloy/hardforks/src/hardfork.rs +++ b/crates/scroll/alloy/hardforks/src/hardfork.rs @@ -41,7 +41,8 @@ impl ScrollHardfork { (Self::Euclid, ForkCondition::Timestamp(1744815600)), (Self::EuclidV2, ForkCondition::Timestamp(1745305200)), (Self::Feynman, ForkCondition::Timestamp(1755576000)), - (Self::Galileo, ForkCondition::Timestamp(u64::MAX)), + (Self::Galileo, ForkCondition::Timestamp(1762506265)), + // TODO: update GalileoV2 timestamp when devnet is prepared (Self::GalileoV2, ForkCondition::Timestamp(u64::MAX)), ] } diff --git a/crates/scroll/hardforks/src/lib.rs b/crates/scroll/hardforks/src/lib.rs index d9ce3e95256..7ffc326e1b4 100644 --- a/crates/scroll/hardforks/src/lib.rs +++ b/crates/scroll/hardforks/src/lib.rs @@ -40,7 +40,8 @@ pub static SCROLL_MAINNET_HARDFORKS: LazyLock = LazyLock::new(|| (ScrollHardfork::Euclid.boxed(), ForkCondition::Timestamp(1744815600)), (ScrollHardfork::EuclidV2.boxed(), ForkCondition::Timestamp(1745305200)), (ScrollHardfork::Feynman.boxed(), ForkCondition::Timestamp(1755576000)), - (ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(u64::MAX)), + (ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(1762506265)), + // TODO: update GalileoV2 timestamp when devnet is prepared (ScrollHardfork::GalileoV2.boxed(), ForkCondition::Timestamp(u64::MAX)), ]) }); From 53b252459958efa17ae0c02067fb3e9416703cb8 Mon Sep 17 00:00:00 2001 From: frisitano Date: Thu, 27 Nov 2025 23:01:25 +0400 Subject: [PATCH 2/2] update galileo V2 timestamps --- crates/scroll/alloy/hardforks/src/hardfork.rs | 3 +-- crates/scroll/chainspec/src/lib.rs | 18 ++++++++++++++---- crates/scroll/hardforks/src/lib.rs | 3 +-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/crates/scroll/alloy/hardforks/src/hardfork.rs b/crates/scroll/alloy/hardforks/src/hardfork.rs index 57c5095f616..a144d583a05 100644 --- a/crates/scroll/alloy/hardforks/src/hardfork.rs +++ b/crates/scroll/alloy/hardforks/src/hardfork.rs @@ -42,8 +42,7 @@ impl ScrollHardfork { (Self::EuclidV2, ForkCondition::Timestamp(1745305200)), (Self::Feynman, ForkCondition::Timestamp(1755576000)), (Self::Galileo, ForkCondition::Timestamp(1762506265)), - // TODO: update GalileoV2 timestamp when devnet is prepared - (Self::GalileoV2, ForkCondition::Timestamp(u64::MAX)), + (Self::GalileoV2, ForkCondition::Timestamp(1764244000)), ] } diff --git a/crates/scroll/chainspec/src/lib.rs b/crates/scroll/chainspec/src/lib.rs index 01a1ad772b8..68b39bd7cc4 100644 --- a/crates/scroll/chainspec/src/lib.rs +++ b/crates/scroll/chainspec/src/lib.rs @@ -575,12 +575,17 @@ mod tests { // Feynman ( Head { number: 7096836, timestamp: 1755576000, ..Default::default() }, - ForkId { hash: ForkHash([0x38, 0x0f, 0x78, 0x5d]), next: u64::MAX }, + ForkId { hash: ForkHash([0x38, 0x0f, 0x78, 0x5d]), next: 1762506265 }, ), // Galileo ( - Head { number: 7096836, timestamp: u64::MAX, ..Default::default() }, - ForkId { hash: ForkHash([0x50, 0xe7, 0xe6, 0xd5]), next: 0 }, + Head { number: 7096836, timestamp: 1762506265, ..Default::default() }, + ForkId { hash: ForkHash([0x8c, 0x83, 0x6c, 0x84]), next: 1764244000 }, + ), + // GalileoV2 + ( + Head { number: 7096836, timestamp: 1764244000, ..Default::default() }, + ForkId { hash: ForkHash([0x7c, 0xc0, 0x18, 0x5d]), next: 0 }, ), ], ); @@ -633,7 +638,12 @@ mod tests { ), // Galileo ( - Head { number: 7096836, timestamp: u64::MAX, ..Default::default() }, + Head { number: 7096836, timestamp: 1762506265, ..Default::default() }, + ForkId { hash: ForkHash([0x18, 0xd3, 0xc8, 0xd9]), next: 0 }, + ), + // GalileoV2 + ( + Head { number: 7096836, timestamp: 1764244000, ..Default::default() }, ForkId { hash: ForkHash([0x18, 0xd3, 0xc8, 0xd9]), next: 0 }, ), ]; diff --git a/crates/scroll/hardforks/src/lib.rs b/crates/scroll/hardforks/src/lib.rs index 7ffc326e1b4..beb29e0f774 100644 --- a/crates/scroll/hardforks/src/lib.rs +++ b/crates/scroll/hardforks/src/lib.rs @@ -41,8 +41,7 @@ pub static SCROLL_MAINNET_HARDFORKS: LazyLock = LazyLock::new(|| (ScrollHardfork::EuclidV2.boxed(), ForkCondition::Timestamp(1745305200)), (ScrollHardfork::Feynman.boxed(), ForkCondition::Timestamp(1755576000)), (ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(1762506265)), - // TODO: update GalileoV2 timestamp when devnet is prepared - (ScrollHardfork::GalileoV2.boxed(), ForkCondition::Timestamp(u64::MAX)), + (ScrollHardfork::GalileoV2.boxed(), ForkCondition::Timestamp(1764244000)), ]) });