Skip to content

Commit 079764e

Browse files
authored
feat: schedule Galileo and GalileoV2 on Scroll mainnet (#373)
* feat: schedule Galileo and GalileoV2 on Scroll mainnet * use openvm v1.4.1 for lint * use openvm v1.4.2 for lint
1 parent 2dd53a7 commit 079764e

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ jobs:
277277
- uses: Swatinem/rust-cache@v2
278278
with:
279279
cache-on-failure: true
280-
- run: cargo install --locked --git https://github.com/openvm-org/openvm.git --tag v1.4.0 cargo-openvm
280+
- run: cargo install --locked --git https://github.com/openvm-org/openvm.git --tag v1.4.2 cargo-openvm
281281
- name: verify openvm compatibility
282282
env:
283283
OPENVM_RUST_TOOLCHAIN: nightly-2025-08-18

crates/scroll/alloy/hardforks/src/hardfork.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ impl ScrollHardfork {
4141
(Self::Euclid, ForkCondition::Timestamp(1744815600)),
4242
(Self::EuclidV2, ForkCondition::Timestamp(1745305200)),
4343
(Self::Feynman, ForkCondition::Timestamp(1755576000)),
44-
(Self::Galileo, ForkCondition::Timestamp(u64::MAX)),
45-
(Self::GalileoV2, ForkCondition::Timestamp(u64::MAX)),
44+
(Self::Galileo, ForkCondition::Timestamp(1765868400)),
45+
(Self::GalileoV2, ForkCondition::Timestamp(1766041200)),
4646
]
4747
}
4848

crates/scroll/chainspec/src/lib.rs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -575,12 +575,17 @@ mod tests {
575575
// Feynman
576576
(
577577
Head { number: 7096836, timestamp: 1755576000, ..Default::default() },
578-
ForkId { hash: ForkHash([0x38, 0x0f, 0x78, 0x5d]), next: u64::MAX },
578+
ForkId { hash: ForkHash([0x38, 0x0f, 0x78, 0x5d]), next: 1765868400 },
579579
),
580580
// Galileo
581581
(
582-
Head { number: 7096836, timestamp: u64::MAX, ..Default::default() },
583-
ForkId { hash: ForkHash([0x50, 0xe7, 0xe6, 0xd5]), next: 0 },
582+
Head { number: 7096836, timestamp: 1765868400, ..Default::default() },
583+
ForkId { hash: ForkHash([0x58, 0xdf, 0x9b, 0x21]), next: 1766041200 },
584+
),
585+
// GalileoV2
586+
(
587+
Head { number: 7096836, timestamp: 1766041200, ..Default::default() },
588+
ForkId { hash: ForkHash([0xca, 0x90, 0x54, 0xd4]), next: 0 },
584589
),
585590
],
586591
);
@@ -633,7 +638,12 @@ mod tests {
633638
),
634639
// Galileo
635640
(
636-
Head { number: 7096836, timestamp: u64::MAX, ..Default::default() },
641+
Head { number: 7096836, timestamp: 1765868400, ..Default::default() },
642+
ForkId { hash: ForkHash([0x18, 0xd3, 0xc8, 0xd9]), next: 0 },
643+
),
644+
// GalileoV2
645+
(
646+
Head { number: 7096836, timestamp: 1766041200, ..Default::default() },
637647
ForkId { hash: ForkHash([0x18, 0xd3, 0xc8, 0xd9]), next: 0 },
638648
),
639649
];

crates/scroll/evm/src/execute.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ mod tests {
9191
const EUCLID_V2_BLOCK_NUMBER: u64 = 14907015;
9292
const EUCLID_V2_BLOCK_TIMESTAMP: u64 = 1745305200;
9393
const FEYNMAN_BLOCK_TIMESTAMP: u64 = 1755576000;
94-
const GALILEO_BLOCK_TIMESTAMP: u64 = 1755576001; // TODO(thegaram): update to actual timestamp
94+
const GALILEO_BLOCK_TIMESTAMP: u64 = 1765868400;
9595

9696
fn state() -> State<EmptyDBTyped<Infallible>> {
9797
let db = EmptyDBTyped::<Infallible>::new();

crates/scroll/hardforks/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ pub static SCROLL_MAINNET_HARDFORKS: LazyLock<ChainHardforks> = LazyLock::new(||
4040
(ScrollHardfork::Euclid.boxed(), ForkCondition::Timestamp(1744815600)),
4141
(ScrollHardfork::EuclidV2.boxed(), ForkCondition::Timestamp(1745305200)),
4242
(ScrollHardfork::Feynman.boxed(), ForkCondition::Timestamp(1755576000)),
43-
(ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(u64::MAX)),
44-
(ScrollHardfork::GalileoV2.boxed(), ForkCondition::Timestamp(u64::MAX)),
43+
(ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(1765868400)),
44+
(ScrollHardfork::GalileoV2.boxed(), ForkCondition::Timestamp(1766041200)),
4545
])
4646
});
4747

0 commit comments

Comments
 (0)