Skip to content

Commit 8110624

Browse files
greged93mattsseshekhirin
authored
feat: feynman mainnet fork ts (#311)
* feat: feynman mainnet ts Signed-off-by: Gregory Edison <[email protected]> * chore: update mainnet feynman fork time Signed-off-by: Gregory Edison <[email protected]> * chore: fix clippy docs (paradigmxyz#17726) Co-authored-by: Alexey Shekhirin <[email protected]> --------- Signed-off-by: Gregory Edison <[email protected]> Co-authored-by: Matthias Seitz <[email protected]> Co-authored-by: Alexey Shekhirin <[email protected]>
1 parent b364426 commit 8110624

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ impl ScrollHardfork {
3636
(Self::DarwinV2, ForkCondition::Timestamp(1725264000)),
3737
(Self::Euclid, ForkCondition::Timestamp(1744815600)),
3838
(Self::EuclidV2, ForkCondition::Timestamp(1745305200)),
39-
// TODO: update
40-
(Self::Feynman, ForkCondition::Timestamp(6000000000)),
39+
(Self::Feynman, ForkCondition::Timestamp(1755576000)),
4140
]
4241
}
4342

crates/scroll/chainspec/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -516,11 +516,11 @@ mod tests {
516516
),
517517
(
518518
Head { number: 7096836, timestamp: 1745305200, ..Default::default() },
519-
ForkId { hash: ForkHash([0x0e, 0xcf, 0xb2, 0x31]), next: 6000000000 },
519+
ForkId { hash: ForkHash([0x0e, 0xcf, 0xb2, 0x31]), next: 1755576000 },
520520
),
521521
(
522-
Head { number: 7096836, timestamp: 6000000000, ..Default::default() },
523-
ForkId { hash: ForkHash([0x64, 0xb1, 0x52, 0x56]), next: 0 },
522+
Head { number: 7096836, timestamp: 1755576000, ..Default::default() },
523+
ForkId { hash: ForkHash([0x38, 0x0f, 0x78, 0x5d]), next: 0 },
524524
),
525525
],
526526
);

crates/scroll/evm/src/execute.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ mod tests {
9494
const CURIE_BLOCK_NUMBER: u64 = 7096837;
9595
const EUCLID_V2_BLOCK_NUMBER: u64 = 14907015;
9696
const EUCLID_V2_BLOCK_TIMESTAMP: u64 = 1745305200;
97-
const FEYNMAN_BLOCK_TIMESTAMP: u64 = u64::MAX;
97+
const FEYNMAN_BLOCK_TIMESTAMP: u64 = 1755576000;
9898

9999
const L1_BASE_FEE_SLOT: U256 = U256::from_limbs([1, 0, 0, 0]);
100100
const OVER_HEAD_SLOT: U256 = U256::from_limbs([2, 0, 0, 0]);

crates/scroll/hardforks/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ pub static SCROLL_MAINNET_HARDFORKS: LazyLock<ChainHardforks> = LazyLock::new(||
3939
(ScrollHardfork::DarwinV2.boxed(), ForkCondition::Timestamp(1725264000)),
4040
(ScrollHardfork::Euclid.boxed(), ForkCondition::Timestamp(1744815600)),
4141
(ScrollHardfork::EuclidV2.boxed(), ForkCondition::Timestamp(1745305200)),
42-
// TODO: update
43-
(ScrollHardfork::Feynman.boxed(), ForkCondition::Timestamp(6000000000)),
42+
(ScrollHardfork::Feynman.boxed(), ForkCondition::Timestamp(1755576000)),
4443
])
4544
});
4645

0 commit comments

Comments
 (0)