Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
5 changes: 5 additions & 0 deletions clients/besu/besu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,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
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ 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": {
"cancun": {
"target": (if env.HIVE_CANCUN_BLOB_TARGET then env.HIVE_CANCUN_BLOB_TARGET|to_int else 3 end),
Expand All @@ -67,6 +68,11 @@ def to_int:
"max": (if env.HIVE_OSAKA_BLOB_MAX then env.HIVE_OSAKA_BLOB_MAX|to_int else 9 end),
"baseFeeUpdateFraction": (if env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION then env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION|to_int else 5007716 end)
},
"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)
},
"bpo1": {
"target": (if env.HIVE_BPO1_BLOB_TARGET then env.HIVE_BPO1_BLOB_TARGET|to_int else 9 end),
"max": (if env.HIVE_BPO1_BLOB_MAX then env.HIVE_BPO1_BLOB_MAX|to_int else 14 end),
Expand Down
6 changes: 6 additions & 0 deletions clients/erigon/mapper.jq
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 All @@ -75,6 +76,11 @@ def to_bool:
"max": (if env.HIVE_OSAKA_BLOB_MAX then env.HIVE_OSAKA_BLOB_MAX|to_int else 9 end),
"baseFeeUpdateFraction": (if env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION then env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION|to_int else 5007716 end)
},
"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)
},
"bpo1": {
"target": (if env.HIVE_BPO1_BLOB_TARGET then env.HIVE_BPO1_BLOB_TARGET|to_int else 9 end),
"max": (if env.HIVE_BPO1_BLOB_MAX then env.HIVE_BPO1_BLOB_MAX|to_int else 14 end),
Expand Down
1 change: 1 addition & 0 deletions clients/ethereumjs/mapper.jq
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
6 changes: 6 additions & 0 deletions clients/ethrex/mapper.jq
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,
"bpo1Time": env.HIVE_BPO1_TIMESTAMP|to_int,
"bpo2Time": env.HIVE_BPO2_TIMESTAMP|to_int,
"bpo3Time": env.HIVE_BPO3_TIMESTAMP|to_int,
Expand All @@ -80,6 +81,11 @@ def to_bool:
"max": (if env.HIVE_OSAKA_BLOB_MAX then env.HIVE_OSAKA_BLOB_MAX|to_int else 9 end),
"baseFeeUpdateFraction": (if env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION then env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION|to_int else 5007716 end)
},
"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)
},
"bpo1": {
"target": (if env.HIVE_BPO1_BLOB_TARGET then env.HIVE_BPO1_BLOB_TARGET|to_int else 10 end),
"max": (if env.HIVE_BPO1_BLOB_MAX then env.HIVE_BPO1_BLOB_MAX|to_int else 15 end),
Expand Down
11 changes: 11 additions & 0 deletions clients/go-ethereum/mapper.jq
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 All @@ -75,6 +76,11 @@ def to_bool:
"max": (if env.HIVE_OSAKA_BLOB_MAX then env.HIVE_OSAKA_BLOB_MAX|to_int else 9 end),
"baseFeeUpdateFraction": (if env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION then env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION|to_int else 5007716 end)
},
"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)
},
"bpo1": {
"target": (if env.HIVE_BPO1_BLOB_TARGET then env.HIVE_BPO1_BLOB_TARGET|to_int else 9 end),
"max": (if env.HIVE_BPO1_BLOB_MAX then env.HIVE_BPO1_BLOB_MAX|to_int else 14 end),
Expand All @@ -99,6 +105,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
9 changes: 9 additions & 0 deletions clients/nethermind/mapper.jq
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 All @@ -197,6 +200,12 @@ def clique_engine:
"max": (if env.HIVE_OSAKA_BLOB_MAX then env.HIVE_OSAKA_BLOB_MAX|to_hex else "0x9" end),
"baseFeeUpdateFraction": (if env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION then env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION|to_hex else "0x4c6964" end)
} else null end,
if env.HIVE_AMSTERDAM_TIMESTAMP then {
"timestamp": env.HIVE_AMSTERDAM_TIMESTAMP|to_hex,
"target": (if env.HIVE_AMSTERDAM_BLOB_TARGET then env.HIVE_AMSTERDAM_BLOB_TARGET|to_hex else "0x6" end),
"max": (if env.HIVE_AMSTERDAM_BLOB_MAX then env.HIVE_AMSTERDAM_BLOB_MAX|to_hex else "0x9" end),
"baseFeeUpdateFraction": (if env.HIVE_AMSTERDAM_BLOB_BASE_FEE_UPDATE_FRACTION then env.HIVE_AMSTERDAM_BLOB_BASE_FEE_UPDATE_FRACTION|to_hex else "0x4c6964" end)
} else null end,
if env.HIVE_BPO1_TIMESTAMP then {
"timestamp": env.HIVE_BPO1_TIMESTAMP|to_hex,
"target": (if env.HIVE_BPO1_BLOB_TARGET then env.HIVE_BPO1_BLOB_TARGET|to_hex else "0x9" end),
Expand Down
6 changes: 6 additions & 0 deletions clients/nimbus-el/mapper.jq
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 All @@ -95,6 +96,11 @@ def to_bool:
"max": (if env.HIVE_OSAKA_BLOB_MAX then env.HIVE_OSAKA_BLOB_MAX|to_int else 9 end),
"baseFeeUpdateFraction": (if env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION then env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION|to_int else 5007716 end)
},
"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)
},
"bpo1": {
"target": (if env.HIVE_BPO1_BLOB_TARGET then env.HIVE_BPO1_BLOB_TARGET|to_int else 9 end),
"max": (if env.HIVE_BPO1_BLOB_MAX then env.HIVE_BPO1_BLOB_MAX|to_int else 14 end),
Expand Down
6 changes: 6 additions & 0 deletions clients/reth/mapper.jq
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 All @@ -75,6 +76,11 @@ def to_bool:
"max": (if env.HIVE_OSAKA_BLOB_MAX then env.HIVE_OSAKA_BLOB_MAX|to_int else 9 end),
"baseFeeUpdateFraction": (if env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION then env.HIVE_OSAKA_BLOB_BASE_FEE_UPDATE_FRACTION|to_int else 5007716 end)
},
"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)
},
"bpo1": {
"target": (if env.HIVE_BPO1_BLOB_TARGET then env.HIVE_BPO1_BLOB_TARGET|to_int else 9 end),
"max": (if env.HIVE_BPO1_BLOB_MAX then env.HIVE_BPO1_BLOB_MAX|to_int else 14 end),
Expand Down