diff --git a/clients/besu/besu.sh b/clients/besu/besu.sh index 000eb8932a..2cd373c0b6 100644 --- a/clients/besu/besu.sh +++ b/clients/besu/besu.sh @@ -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" diff --git a/clients/besu/mapper.jq b/clients/besu/mapper.jq index b41ccb31f5..7624994b7f 100644 --- a/clients/besu/mapper.jq +++ b/clients/besu/mapper.jq @@ -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), diff --git a/clients/erigon/mapper.jq b/clients/erigon/mapper.jq index 42fd666e24..6761806cda 100644 --- a/clients/erigon/mapper.jq +++ b/clients/erigon/mapper.jq @@ -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), diff --git a/clients/ethereumjs/mapper.jq b/clients/ethereumjs/mapper.jq index 03f270edce..7fec3e7c7d 100644 --- a/clients/ethereumjs/mapper.jq +++ b/clients/ethereumjs/mapper.jq @@ -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), diff --git a/clients/ethrex/mapper.jq b/clients/ethrex/mapper.jq index 78a1eec6a8..03605d888b 100644 --- a/clients/ethrex/mapper.jq +++ b/clients/ethrex/mapper.jq @@ -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), diff --git a/clients/go-ethereum/mapper.jq b/clients/go-ethereum/mapper.jq index 3e962a815b..3a29adb32a 100644 --- a/clients/go-ethereum/mapper.jq +++ b/clients/go-ethereum/mapper.jq @@ -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": { @@ -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, diff --git a/clients/nethermind/mapper.jq b/clients/nethermind/mapper.jq index fa12fc0fe9..20bc59316f 100644 --- a/clients/nethermind/mapper.jq +++ b/clients/nethermind/mapper.jq @@ -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, diff --git a/clients/nimbus-el/mapper.jq b/clients/nimbus-el/mapper.jq index 54b5272b87..3dc8a1886c 100644 --- a/clients/nimbus-el/mapper.jq +++ b/clients/nimbus-el/mapper.jq @@ -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), diff --git a/clients/reth/mapper.jq b/clients/reth/mapper.jq index c3012bf79e..13d3f8e6d9 100644 --- a/clients/reth/mapper.jq +++ b/clients/reth/mapper.jq @@ -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), diff --git a/cmd/hivechain/genesis.go b/cmd/hivechain/genesis.go index a75254e109..2dd28a595b 100644 --- a/cmd/hivechain/genesis.go +++ b/cmd/hivechain/genesis.go @@ -47,6 +47,7 @@ var ( "cancun", "prague", "osaka", + "amsterdam", } ) @@ -109,6 +110,8 @@ func (cfg *generatorConfig) createChainConfig() *params.ChainConfig { case "osaka": chaincfg.OsakaTime = ×tamp chaincfg.BlobScheduleConfig.Osaka = params.DefaultOsakaBlobConfig + case "amsterdam": + chaincfg.AmsterdamTime = ×tamp default: panic(fmt.Sprintf("unknown fork name %q", fork)) } diff --git a/cmd/hivechain/output_forkenv.go b/cmd/hivechain/output_forkenv.go index 029a1ad7c0..e63a1de0f8 100644 --- a/cmd/hivechain/output_forkenv.go +++ b/cmd/hivechain/output_forkenv.go @@ -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 {