Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
- run: cargo install --locked --git https://github.com/openvm-org/openvm.git --tag v1.4.0 cargo-openvm
- run: cargo install --locked --git https://github.com/openvm-org/openvm.git --tag v1.4.2 cargo-openvm
- name: verify openvm compatibility
env:
OPENVM_RUST_TOOLCHAIN: nightly-2025-08-18
Expand Down
4 changes: 2 additions & 2 deletions crates/scroll/alloy/hardforks/src/hardfork.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +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::GalileoV2, ForkCondition::Timestamp(u64::MAX)),
(Self::Galileo, ForkCondition::Timestamp(1765868400)),
(Self::GalileoV2, ForkCondition::Timestamp(1766041200)),
]
}

Expand Down
18 changes: 14 additions & 4 deletions crates/scroll/chainspec/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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: 1765868400 },
),
// Galileo
(
Head { number: 7096836, timestamp: u64::MAX, ..Default::default() },
ForkId { hash: ForkHash([0x50, 0xe7, 0xe6, 0xd5]), next: 0 },
Head { number: 7096836, timestamp: 1765868400, ..Default::default() },
ForkId { hash: ForkHash([0x58, 0xdf, 0x9b, 0x21]), next: 1766041200 },
),
// GalileoV2
(
Head { number: 7096836, timestamp: 1766041200, ..Default::default() },
ForkId { hash: ForkHash([0xca, 0x90, 0x54, 0xd4]), next: 0 },
),
],
);
Expand Down Expand Up @@ -633,7 +638,12 @@ mod tests {
),
// Galileo
(
Head { number: 7096836, timestamp: u64::MAX, ..Default::default() },
Head { number: 7096836, timestamp: 1765868400, ..Default::default() },
ForkId { hash: ForkHash([0x18, 0xd3, 0xc8, 0xd9]), next: 0 },
),
// GalileoV2
(
Head { number: 7096836, timestamp: 1766041200, ..Default::default() },
ForkId { hash: ForkHash([0x18, 0xd3, 0xc8, 0xd9]), next: 0 },
),
];
Expand Down
2 changes: 1 addition & 1 deletion crates/scroll/evm/src/execute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ mod tests {
const EUCLID_V2_BLOCK_NUMBER: u64 = 14907015;
const EUCLID_V2_BLOCK_TIMESTAMP: u64 = 1745305200;
const FEYNMAN_BLOCK_TIMESTAMP: u64 = 1755576000;
const GALILEO_BLOCK_TIMESTAMP: u64 = 1755576001; // TODO(thegaram): update to actual timestamp
const GALILEO_BLOCK_TIMESTAMP: u64 = 1765868400;

fn state() -> State<EmptyDBTyped<Infallible>> {
let db = EmptyDBTyped::<Infallible>::new();
Expand Down
4 changes: 2 additions & 2 deletions crates/scroll/hardforks/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ pub static SCROLL_MAINNET_HARDFORKS: LazyLock<ChainHardforks> = 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::GalileoV2.boxed(), ForkCondition::Timestamp(u64::MAX)),
(ScrollHardfork::Galileo.boxed(), ForkCondition::Timestamp(1765868400)),
(ScrollHardfork::GalileoV2.boxed(), ForkCondition::Timestamp(1766041200)),
])
});

Expand Down
Loading