Skip to content

fix(l1): unschedule Amsterdam on Hoodi #7455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ilitteri merged 2 commits into from
Oct 23, 2026
Merged

fix(l1): unschedule Amsterdam on Hoodi #7455

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a6e5a5
fix(l1): unschedule Amsterdam on Hoodi
MegaRedHand Oct 22, 2026
67a1201
Merge branch 'main' into unschedule-hoodi-amsterdam
ilitteri Oct 22, 2026
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
1 change: 0 additions & 1 deletion cmd/ethrex/networks/hoodi/genesis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"osakaTime": 1761677592,
"bpo1Time": 1762365720,
"bpo2Time": 1762955544,
"amsterdamTime": 1793036568,
"blobSchedule": {
"cancun": {
"target": 3,
Expand Down
11 changes: 0 additions & 11 deletions crates/common/config/networks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,17 +243,6 @@ mod tests {
);
}

#[test]
fn test_hoodi_amsterdam_activation() {
// Epoch 132352, 2026-10-26 17:42:48 UTC. Proposed in ethereum/pm#2263; the
// client configuration is eth-clients/hoodi#31 (`metadata/genesis.json`,
// `amsterdamTime`). 1742213400 + 132352 * 32 * 12 = 1793036568.
let genesis = Network::PublicNetwork(PublicNetwork::Hoodi)
.get_genesis()
.unwrap();
assert_eq!(genesis.config.amsterdam_time, Some(1_793_036_568));
}

#[test]
fn test_mainnet_genesis_block_hash() {
// Values taken from the geth codebase:
Expand Down
20 changes: 1 addition & 19 deletions crates/common/types/fork_id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,24 +343,6 @@ mod tests {
time: 1762955544,
fork_id: ForkId {
fork_hash: H32::from_str("0x23aa1351").unwrap(),
fork_next: 1793036568,
},
is_valid: true,
},
TestCase {
head: 123,
time: 1793036567,
fork_id: ForkId {
fork_hash: H32::from_str("0x23aa1351").unwrap(),
fork_next: 1793036568,
},
is_valid: true,
},
TestCase {
head: 123,
time: 1793036568,
fork_id: ForkId {
fork_hash: H32::from_str("0x3d068b59").unwrap(),
fork_next: 0,
},
is_valid: true,
Expand All @@ -369,7 +351,7 @@ mod tests {
head: 123,
time: 2740434112,
fork_id: ForkId {
fork_hash: H32::from_str("0x3d068b59").unwrap(),
fork_hash: H32::from_str("0x23aa1351").unwrap(),
fork_next: 0,
},
is_valid: true,
Expand Down
6 changes: 2 additions & 4 deletions crates/networking/rpc/rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2608,14 +2608,14 @@ mod tests {
}
},
"last": {
"activationTime": 1793036568,
"activationTime": 1762955544,
"blobSchedule": {
"baseFeeUpdateFraction": 11684671,
"max": 21,
"target": 14,
},
"chainId": "0x88bb0",
"forkId": "0x3d068b59",
"forkId": "0x23aa1351",
"precompiles": {
"BLAKE2F": "0x0000000000000000000000000000000000000009",
"BLS12_G1ADD": "0x000000000000000000000000000000000000000b",
Expand All @@ -2638,8 +2638,6 @@ mod tests {
},
"systemContracts": {
"BEACON_ROOTS_ADDRESS": "0x000f3df6d732807ef1319fb7b8bb8522d0beac02",
"BUILDER_DEPOSIT_CONTRACT_ADDRESS": "0x0000bff46984e3725691fa540a8c7589300d8282",
"BUILDER_EXIT_CONTRACT_ADDRESS": "0x000064d678505ad48f8ccb093bc65613800e8282",
"CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS": "0x0000bbddc7ce488642fb579f8b00f3a590007251",
"DEPOSIT_CONTRACT_ADDRESS": "0x00000000219ab540356cbb839cbe05303d7705fa",
"HISTORY_STORAGE_ADDRESS": "0x0000f90827f1c53a10cb7a02335b175320002935",
Expand Down
8 changes: 4 additions & 4 deletions docs/roadmaps/forks-roadmap.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ Glamsterdam declined 47 EIPs per [EIP-7773], including EIP-7692 (EOF) and EIP-79
The fork enum lives in `crates/common/types/genesis.rs`, ending at `Amsterdam`;
activation timestamps are `ChainConfig` fields, with `bpo1_time`..`bpo5_time` already
defined for the BPOs and Hegotá. Amsterdam is scheduled on Sepolia (`amsterdamTime`
1791294816, 2026-10-06 13:53:36 UTC, epoch 353024; ethereum/pm#2205, EIP-7773) and Hoodi
(`amsterdamTime` 1793036568, 2026-10-26 17:42:48 UTC, epoch 132352; ethereum/pm#2263,
eth-clients/hoodi#31) in their genesis files under `cmd/ethrex/networks/`. The mainnet date is
still TBD upstream, so its preset carries no `amsterdamTime` yet.
1791294816, 2026-10-06 13:53:36 UTC, epoch 353024; ethereum/pm#2205, EIP-7773) in
`cmd/ethrex/networks/sepolia/genesis.json`. Hoodi's 2026-10-26 activation was unscheduled
(eth-clients/hoodi#33) and the mainnet date is still TBD upstream, so their presets carry no
`amsterdamTime` yet.

---

Expand Down
Loading