Skip to content

✨ feat(fork): Amsterdam #1349

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

✨ feat(fork): Amsterdam #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
510922c
✨ feat(fork): Amsterdam
raxhvl Sep 30, 2025
4694531
🧹 chore: geth blob sch
raxhvl Sep 30, 2025
982fef4
✨ feat: Besu
raxhvl Oct 8, 2025
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
5 changes: 5 additions & 0 deletions clients/besu/besu.sh
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that adding the dummy file on line 104 in this file:

blocks="$blocks dummy"

is not necessary anymore.

Copy link

@mirgee mirgee Oct 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh - it seems that it actually still is necessary - without it, negative scenarios where block should fail to import cause the client to terminate, but the tests rely on the client keep serving RPC requests after the import, resulting in a failing test which might pass otherwise.

Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,11 @@ if [ "$HIVE_TERMINAL_TOTAL_DIFFICULTY" != "" ]; then
RPCFLAGS="$RPCFLAGS --engine-host-allowlist=* --engine-jwt-secret /jwtsecret"
fi

# Disable parallel transaction processing
if [ "$HIVE_PARALLEL_TX_PROCESSING_DISABLED" = "true" ]; then
FLAGS="$FLAGS --bonsai-parallel-tx-processing-enabled=false"
fi

# Start Besu.
if [ -z "$HAS_IMPORT" ]; then
cmd="$besu $FLAGS $RPCFLAGS"
Expand Down
6 changes: 6 additions & 0 deletions clients/besu/mapper.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,13 @@ def to_int:
"cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int,
"pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int,
"osakaTime": env.HIVE_OSAKA_TIMESTAMP|to_int,
"amsterdamTime": env.HIVE_AMSTERDAM_TIMESTAMP|to_int,
"blobSchedule": {
"amsterdam": {
"target": (if env.HIVE_AMSTERDAM_BLOB_TARGET then env.HIVE_AMSTERDAM_BLOB_TARGET|to_int else 6 end),
"max": (if env.HIVE_AMSTERDAM_BLOB_MAX then env.HIVE_AMSTERDAM_BLOB_MAX|to_int else 9 end),
"baseFeeUpdateFraction": (if env.HIVE_AMSTERDAM_BLOB_BASE_FEE_UPDATE_FRACTION then env.HIVE_AMSTERDAM_BLOB_BASE_FEE_UPDATE_FRACTION|to_int else 5007716 end)
},
"cancun": {
"target": (if env.HIVE_CANCUN_BLOB_TARGET then env.HIVE_CANCUN_BLOB_TARGET|to_int else 3 end),
"max": (if env.HIVE_CANCUN_BLOB_MAX then env.HIVE_CANCUN_BLOB_MAX|to_int else 6 end),
Expand Down
1 change: 1 addition & 0 deletions clients/erigon/mapper.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ def to_bool:
"cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int,
"pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int,
"osakaTime": env.HIVE_OSAKA_TIMESTAMP|to_int,
"amsterdamTime": env.HIVE_AMSTERDAM_TIMESTAMP|to_int,
"blobSchedule": {
"cancun": {
"target": (if env.HIVE_CANCUN_BLOB_TARGET then env.HIVE_CANCUN_BLOB_TARGET|to_int else 3 end),
Expand Down
1 change: 1 addition & 0 deletions clients/ethereumjs/mapper.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ def pad_storage_keys:
"cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int,
"pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int,
"osakaTime": env.HIVE_OSAKA_TIMESTAMP|to_int,
"amsterdamTime": env.HIVE_AMSTERDAM_TIMESTAMP|to_int,
"blobSchedule": {
"cancun": {
"target": (if env.HIVE_CANCUN_BLOB_TARGET then env.HIVE_CANCUN_BLOB_TARGET|to_int else 3 end),
Expand Down
1 change: 1 addition & 0 deletions clients/ethrex/mapper.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ def to_bool:
"shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int,
"cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int,
"pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int,
"amsterdamTime": env.HIVE_AMSTERDAM_TIMESTAMP|to_int,
"blobSchedule": {
"cancun": {
"target": (if env.HIVE_CANCUN_BLOB_TARGET then env.HIVE_CANCUN_BLOB_TARGET|to_int else 3 end),
Expand Down
6 changes: 6 additions & 0 deletions clients/go-ethereum/mapper.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ def to_bool:
"cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int,
"pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int,
"osakaTime": env.HIVE_OSAKA_TIMESTAMP|to_int,
"amsterdamTime": env.HIVE_AMSTERDAM_TIMESTAMP|to_int,
"terminalTotalDifficultyPassed": true,
"blobSchedule": {
"cancun": {
Expand Down Expand Up @@ -99,6 +100,11 @@ def to_bool:
"target": (if env.HIVE_BPO5_BLOB_TARGET then env.HIVE_BPO5_BLOB_TARGET|to_int else 9 end),
"max": (if env.HIVE_BPO5_BLOB_MAX then env.HIVE_BPO5_BLOB_MAX|to_int else 14 end),
"baseFeeUpdateFraction": (if env.HIVE_BPO5_BLOB_BASE_FEE_UPDATE_FRACTION then env.HIVE_BPO5_BLOB_BASE_FEE_UPDATE_FRACTION|to_int else 8832827 end)
},
"amsterdam": {
"target": (if env.HIVE_AMSTERDAM_BLOB_TARGET then env.HIVE_AMSTERDAM_BLOB_TARGET|to_int else 9 end),
"max": (if env.HIVE_AMSTERDAM_BLOB_MAX then env.HIVE_AMSTERDAM_BLOB_MAX|to_int else 14 end),
"baseFeeUpdateFraction": (if env.HIVE_AMSTERDAM_BLOB_BASE_FEE_UPDATE_FRACTION then env.HIVE_AMSTERDAM_BLOB_BASE_FEE_UPDATE_FRACTION|to_int else 8832827 end)
}
},
"bpo1Time": env.HIVE_BPO1_TIMESTAMP|to_int,
Expand Down
3 changes: 3 additions & 0 deletions clients/nethermind/mapper.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@ def clique_engine:
"eip7934TransitionTimestamp": env.HIVE_OSAKA_TIMESTAMP|to_hex,
"eip7934MaxRlpBlockSize": "0x800000",

# Amsterdam
"eip7928TransitionTimestamp": env.HIVE_AMSTERDAM_TIMESTAMP|to_hex,

# Other chain parameters
"networkID": env.HIVE_NETWORK_ID|to_hex,
"chainID": env.HIVE_CHAIN_ID|to_hex,
Expand Down
1 change: 1 addition & 0 deletions clients/nimbus-el/mapper.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ def to_bool:
"cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int,
"pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int,
"osakaTime": env.HIVE_OSAKA_TIMESTAMP|to_int,
"amsterdamTime": env.HIVE_AMSTERDAM_TIMESTAMP|to_int,
"blobSchedule": {
"cancun": {
"target": (if env.HIVE_CANCUN_BLOB_TARGET then env.HIVE_CANCUN_BLOB_TARGET|to_int else 3 end),
Expand Down
1 change: 1 addition & 0 deletions clients/reth/mapper.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ def to_bool:
"cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int,
"pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int,
"osakaTime": env.HIVE_OSAKA_TIMESTAMP|to_int,
"amsterdamTime": env.HIVE_AMSTERDAM_TIMESTAMP|to_int,
"blobSchedule": {
"cancun": {
"target": (if env.HIVE_CANCUN_BLOB_TARGET then env.HIVE_CANCUN_BLOB_TARGET|to_int else 3 end),
Expand Down
3 changes: 3 additions & 0 deletions cmd/hivechain/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ var (
"cancun",
"prague",
"osaka",
"amsterdam",
}
)

Expand Down Expand Up @@ -109,6 +110,8 @@ func (cfg *generatorConfig) createChainConfig() *params.ChainConfig {
case "osaka":
chaincfg.OsakaTime = &timestamp
chaincfg.BlobScheduleConfig.Osaka = params.DefaultOsakaBlobConfig
case "amsterdam":
chaincfg.AmsterdamTime = &timestamp
default:
panic(fmt.Sprintf("unknown fork name %q", fork))
}
Expand Down
2 changes: 2 additions & 0 deletions cmd/hivechain/output_forkenv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ func (g *generator) writeForkEnv() error {
setTime("HIVE_SHANGHAI_TIMESTAMP", cfg.ShanghaiTime)
setTime("HIVE_CANCUN_TIMESTAMP", cfg.CancunTime)
setTime("HIVE_PRAGUE_TIMESTAMP", cfg.PragueTime)
setTime("HIVE_OSAKA_TIMESTAMP", cfg.OsakaTime)
setTime("HIVE_AMSTERDAM_TIMESTAMP", cfg.AmsterdamTime)

// blob schedule
if cfg.BlobScheduleConfig != nil {
Expand Down