Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

fix: resolve hardfork for blocks by blocknumber and timestamp #4455

Merged
merged 16 commits into from
Jul 3, 2023
Merged
Changes from 2 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
6 changes: 3 additions & 3 deletions src/chains/ethereum/ethereum/tests/forking/fork.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ describe("Fork", () => {
const mainnet = 1;
const mergeBlocknumber = 15537394n;

// ensure that the fork blockNumber is after the merge blockNumber
// ensure that the "fork" blockNumber is after the "merge" hardfork blockNumber
fork.blockNumber = Quantity.from(mergeBlocknumber + 100n);
fork.chainId = mainnet;

Expand All @@ -80,7 +80,7 @@ describe("Fork", () => {

blocknumberToHardfork.forEach(([number, expectedHardfork]) => {
const common = fork.getCommonForBlock(parentCommon, {
number, // the block at which paris is scheduled
number,
timestamp: 0n
});

Expand All @@ -100,7 +100,7 @@ describe("Fork", () => {
const shanghaiTimestamp = 1677557088n;
const mergeForkIdTransitionBlockNumber = 1735371n;

// ensure that the fork blockNumber is after the mergeForkIdTransition blockNumber
// ensure that the "fork" blockNumber is after the "mergeForkIdTransition" hardfork blockNumber
fork.blockNumber = Quantity.from(mergeForkIdTransitionBlockNumber + 100n);
fork.chainId = sepolia;

Expand Down