fix

Author: Thegaram

crates/scroll/chainspec/src/dev.rs

@@ -20,6 +20,7 @@ use scroll_alloy_hardforks::ScrollHardfork;
 pub static SCROLL_DEV: LazyLock<Arc<ScrollChainSpec>> = LazyLock::new(|| {
     // In order to have Feynman activated at block 0, we set the `baseFeePerGas` field of the devnet
     // genesis to 0.
+    // TODO(thegaram): Update L1GasPriceOracle genesis account bytecode and storage.
     let genesis = serde_json::from_str(include_str!("../res/genesis/dev.json"))
         .expect("Can't deserialize Dev testnet genesis json");
 

crates/scroll/chainspec/src/lib.rs

@@ -190,7 +190,7 @@ impl ScrollChainSpecBuilder {
 
     /// Enable `GalileoV2` at genesis
     pub fn galileo_v2_activated(mut self) -> Self {
-        self = self.feynman_activated();
+        self = self.galileo_activated();
         self.inner = self.inner.with_fork(ScrollHardfork::GalileoV2, ForkCondition::Timestamp(0));
         self
     }

crates/scroll/hardforks/src/lib.rs

@@ -41,6 +41,7 @@ pub static SCROLL_MAINNET_HARDFORKS: LazyLock<ChainHardforks> = LazyLock::new(||
         (ScrollHardfork::EuclidV2.boxed(), ForkCondition::Timestamp(1745305200)),
         (ScrollHardfork::Feynman.boxed(), ForkCondition::Timestamp(1755576000)),
         (ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(u64::MAX)),
+        (ScrollHardfork::GalileoV2.boxed(), ForkCondition::Timestamp(u64::MAX)),
     ])
 });
 
@@ -66,6 +67,7 @@ pub static SCROLL_SEPOLIA_HARDFORKS: LazyLock<ChainHardforks> = LazyLock::new(||
         (ScrollHardfork::EuclidV2.boxed(), ForkCondition::Timestamp(1741852800)),
         (ScrollHardfork::Feynman.boxed(), ForkCondition::Timestamp(1753167600)),
         (ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(1764054000)),
+        (ScrollHardfork::GalileoV2.boxed(), ForkCondition::Timestamp(u64::MAX)),
     ])
 });
 
@@ -91,5 +93,6 @@ pub static DEV_HARDFORKS: LazyLock<ChainHardforks> = LazyLock::new(|| {
         (ScrollHardfork::EuclidV2.boxed(), ForkCondition::Timestamp(0)),
         (ScrollHardfork::Feynman.boxed(), ForkCondition::Timestamp(0)),
         (ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(0)),
+        (ScrollHardfork::GalileoV2.boxed(), ForkCondition::Timestamp(0)),
     ])
 });

crates/scroll/node/src/test_utils.rs

@@ -31,7 +31,7 @@ pub async fn setup(
     reth_e2e_test_utils::setup_engine(
         num_nodes,
         Arc::new(
-            ScrollChainSpecBuilder::scroll_mainnet().genesis(genesis).galileo_activated().build(
+            ScrollChainSpecBuilder::scroll_mainnet().genesis(genesis).galileo_v2_activated().build(
                 ScrollChainConfig {
                     max_tx_payload_bytes_per_block: 120 * 1024,
                     ..Default::default()