From 6345fa985329e87b5232fd8086bfca7d3016f363 Mon Sep 17 00:00:00 2001 From: georgehao Date: Fri, 7 Nov 2025 14:55:15 +0800 Subject: [PATCH 1/3] set galileo upgrade time --- crates/scroll/alloy/hardforks/src/hardfork.rs | 4 ++-- crates/scroll/hardforks/src/lib.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/scroll/alloy/hardforks/src/hardfork.rs b/crates/scroll/alloy/hardforks/src/hardfork.rs index 719e41c889c..289263573eb 100644 --- a/crates/scroll/alloy/hardforks/src/hardfork.rs +++ b/crates/scroll/alloy/hardforks/src/hardfork.rs @@ -39,7 +39,7 @@ 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(1761875363)), ] } @@ -54,7 +54,7 @@ impl ScrollHardfork { (Self::Euclid, ForkCondition::Timestamp(1741680000)), (Self::EuclidV2, ForkCondition::Timestamp(1741852800)), (Self::Feynman, ForkCondition::Timestamp(1753167600)), - (Self::Galileo, ForkCondition::Timestamp(u64::MAX)), + (Self::Galileo, ForkCondition::Timestamp(1761875363)), ] } } diff --git a/crates/scroll/hardforks/src/lib.rs b/crates/scroll/hardforks/src/lib.rs index ef55f392492..bd84bfd5241 100644 --- a/crates/scroll/hardforks/src/lib.rs +++ b/crates/scroll/hardforks/src/lib.rs @@ -40,7 +40,7 @@ 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(1761875363)), ]) }); @@ -65,7 +65,7 @@ pub static SCROLL_SEPOLIA_HARDFORKS: LazyLock = LazyLock::new(|| (ScrollHardfork::Euclid.boxed(), ForkCondition::Timestamp(1741680000)), (ScrollHardfork::EuclidV2.boxed(), ForkCondition::Timestamp(1741852800)), (ScrollHardfork::Feynman.boxed(), ForkCondition::Timestamp(1753167600)), - (ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(u64::MAX)), + (ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(1761875363)), ]) }); From f3ce6556c95c1b1b1f4defd108c15d53a592b3e0 Mon Sep 17 00:00:00 2001 From: georgehao Date: Fri, 7 Nov 2025 18:22:58 +0800 Subject: [PATCH 2/3] udpate --- crates/scroll/alloy/hardforks/src/hardfork.rs | 4 ++-- crates/scroll/hardforks/src/lib.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/scroll/alloy/hardforks/src/hardfork.rs b/crates/scroll/alloy/hardforks/src/hardfork.rs index 289263573eb..71306244189 100644 --- a/crates/scroll/alloy/hardforks/src/hardfork.rs +++ b/crates/scroll/alloy/hardforks/src/hardfork.rs @@ -39,7 +39,7 @@ impl ScrollHardfork { (Self::Euclid, ForkCondition::Timestamp(1744815600)), (Self::EuclidV2, ForkCondition::Timestamp(1745305200)), (Self::Feynman, ForkCondition::Timestamp(1755576000)), - (Self::Galileo, ForkCondition::Timestamp(1761875363)), + (Self::Galileo, ForkCondition::Timestamp(1762506265)), ] } @@ -54,7 +54,7 @@ impl ScrollHardfork { (Self::Euclid, ForkCondition::Timestamp(1741680000)), (Self::EuclidV2, ForkCondition::Timestamp(1741852800)), (Self::Feynman, ForkCondition::Timestamp(1753167600)), - (Self::Galileo, ForkCondition::Timestamp(1761875363)), + (Self::Galileo, ForkCondition::Timestamp(1762506265)), ] } } diff --git a/crates/scroll/hardforks/src/lib.rs b/crates/scroll/hardforks/src/lib.rs index bd84bfd5241..c6db25b3c7c 100644 --- a/crates/scroll/hardforks/src/lib.rs +++ b/crates/scroll/hardforks/src/lib.rs @@ -40,7 +40,7 @@ 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(1761875363)), + (ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(1762506265)), ]) }); @@ -65,7 +65,7 @@ pub static SCROLL_SEPOLIA_HARDFORKS: LazyLock = LazyLock::new(|| (ScrollHardfork::Euclid.boxed(), ForkCondition::Timestamp(1741680000)), (ScrollHardfork::EuclidV2.boxed(), ForkCondition::Timestamp(1741852800)), (ScrollHardfork::Feynman.boxed(), ForkCondition::Timestamp(1753167600)), - (ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(1761875363)), + (ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(1762506265)), ]) }); From edbc24042aed5d989486388fb7b40b7faaf9b1bf Mon Sep 17 00:00:00 2001 From: Gregory Edison Date: Tue, 11 Nov 2025 20:24:11 +0000 Subject: [PATCH 3/3] fix: spec id Signed-off-by: Gregory Edison --- crates/scroll/evm/src/lib.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/crates/scroll/evm/src/lib.rs b/crates/scroll/evm/src/lib.rs index 5ae4eae077a..217fa845a50 100644 --- a/crates/scroll/evm/src/lib.rs +++ b/crates/scroll/evm/src/lib.rs @@ -114,6 +114,11 @@ pub fn spec_id_at_timestamp_and_number( chain_spec: impl ScrollHardforks, ) -> ScrollSpecId { if chain_spec + .scroll_fork_activation(ScrollHardfork::Galileo) + .active_at_timestamp_or_number(timestamp, number) + { + ScrollSpecId::GALILEO + } else if chain_spec .scroll_fork_activation(ScrollHardfork::Feynman) .active_at_timestamp_or_number(timestamp, number) {