Skip to content
Open
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
9 changes: 8 additions & 1 deletion .github/workflows/generate-stateful-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,14 @@ jobs:
WARMUP_DIR="${PAYLOAD_DIR}_warmup"
GAS_BUMP_COUNT="$CFG_GAS_BUMP_COUNT"
if [[ "$GAS_BUMP_COUNT" == "-1" ]]; then
if [[ "$EFFECTIVE_CHAIN" == "perf-devnet-3" || "$EFFECTIVE_CHAIN" == "jochemnet" ]]; then
if [[ "$EFFECTIVE_CHAIN" == "jochemnet" ]]; then
# jochemnet final block already has a ~1T gas limit, so only one
# gas-bump block is enough; each gas-bump block also carries the
# 15K sender withdrawals from PR #144, so running many would
# overwhelm the client (see "Connection aborted" failures around
# block ~220).
GAS_BUMP_COUNT="1"
elif [[ "$EFFECTIVE_CHAIN" == "perf-devnet-3" ]]; then
GAS_BUMP_COUNT="5000"
else
GAS_BUMP_COUNT="10000"
Expand Down
19 changes: 19 additions & 0 deletions eest_stateful_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -1198,6 +1198,25 @@ def preparation_getpayload(
"amount": hex((1 << 64) - 1),
}]

sender_addresses_path = Path("sender_addresses.txt")
if sender_addresses_path.exists():
sender_lines = [
ln.strip()
for ln in sender_addresses_path.read_text(encoding="utf-8").splitlines()
if ln.strip()
]
Comment on lines +1201 to +1207
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I am not sure if this a good idea to pre-calculate all the withdraw account in sender_addresses.txt, we could use some addr calculation package here.

next_index = len(withdrawals) + 2
next_validator = len(withdrawals) + 1
for addr in sender_lines:
withdrawals.append({
"index": hex(next_index),
"validatorIndex": hex(next_validator),
"address": addr,
"amount": hex((1 << 64) - 1),
})
next_index += 1
next_validator += 1

payload_attributes = {
"timestamp": hex(new_ts),
"prevRandao": parent_hash,
Expand Down
16 changes: 10 additions & 6 deletions scripts/genesisfiles/nethermind/generator-amsterdam-jochemnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,15 @@
"eip7934TransitionTimestamp": "0x6930b057",
"eip7939TransitionTimestamp": "0x6930b057",
"eip7951TransitionTimestamp": "0x6930b057",
"eip7843TransitionTimestamp": "0x697D1108",
"eip7928TransitionTimestamp": "0x697D1108",
"eip7708TransitionTimestamp": "0x697D1108",
"eip7778TransitionTimestamp": "0x697D1108",
"eip8024TransitionTimestamp": "0x697D1108",
"eip7843TransitionTimestamp": "0x697ddeff",
"eip7928TransitionTimestamp": "0x697ddeff",
"eip7708TransitionTimestamp": "0x697ddeff",
"eip7778TransitionTimestamp": "0x697ddeff",
"eip8024TransitionTimestamp": "0x697ddeff",
"eip8037TransitionTimestamp": "0x697ddeff",
"eip7954TransitionTimestamp": "0x697ddeff",
"eip7976TransitionTimestamp": "0x697ddeff",
"eip7981TransitionTimestamp": "0x697ddeff",
"depositContractAddress": "0x00000000219ab540356cbb839cbe05303d7705fa",
"terminalTotalDifficulty": "C70D808A128D7380000",
"blobSchedule": [
Expand Down Expand Up @@ -30710,4 +30714,4 @@
"balance": "0xad78ebc5ac6200000"
}
}
}
}
Loading
Loading