Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
1 change: 1 addition & 0 deletions .github/tests/dummy-el.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
participants:
- el_type: geth
- el_type: dummy
cl_type: teku
- el_type: dummy
Expand Down
52 changes: 27 additions & 25 deletions .github/tests/fulu-genesis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@ participants:
cl_image: ethpandaops/lighthouse:unstable
supernode: true

- el_type: nethermind
el_image: ethpandaops/nethermind:master
el_extra_params: ["--Blocks.ExtraData=TekuFromLocal"]
cl_type: teku
cl_image: ethpandaops/teku:master
# - el_type: nethermind
# el_image: ethpandaops/nethermind:master
# el_extra_params: ["--Blocks.ExtraData=TekuFromLocal"]
# cl_type: teku
# cl_image: ethpandaops/teku:master

- el_type: reth
el_image: ethpandaops/reth:main
el_extra_params: ["--builder.extradata=LodestarFromLocal"]
cl_type: lodestar
cl_image: ethpandaops/lodestar:unstable
# - el_type: reth
# el_image: ethpandaops/reth:main
# el_extra_params: ["--builder.extradata=LodestarFromLocal"]
# cl_type: lodestar
# cl_image: ethpandaops/lodestar:unstable

- el_type: geth
el_image: ethpandaops/geth:master
el_extra_params: ["--miner.extradata=PrysmFromLocal"]
cl_type: prysm
cl_image: ethpandaops/prysm-beacon-chain:develop
# - el_type: geth
# el_image: ethpandaops/geth:master
# el_extra_params: ["--miner.extradata=PrysmFromLocal"]
# cl_type: prysm
# cl_image: ethpandaops/prysm-beacon-chain:develop

- el_type: nethermind
el_image: ethpandaops/nethermind:master
el_extra_params: ["--Blocks.ExtraData=NimbusFromLocal"]
cl_type: nimbus
cl_image: ethpandaops/nimbus-eth2:unstable
# - el_type: nethermind
# el_image: ethpandaops/nethermind:master
# el_extra_params: ["--Blocks.ExtraData=NimbusFromLocal"]
# cl_type: nimbus
# cl_image: ethpandaops/nimbus-eth2:unstable

- el_type: reth
el_image: ethpandaops/reth:main
el_extra_params: ["--builder.extradata=GrandineFromLocal"]
cl_type: grandine
cl_image: ethpandaops/grandine:develop
# - el_type: reth
# el_image: ethpandaops/reth:main
# el_extra_params: ["--builder.extradata=GrandineFromLocal"]
# cl_type: grandine
# cl_image: ethpandaops/grandine:develop
network_params:
altair_fork_epoch: 0
bellatrix_fork_epoch: 0
Expand All @@ -45,5 +45,7 @@ network_params:
bpo_1_epoch: 1
gloas_fork_epoch: 2
genesis_delay: 120
preset: minimal
additional_services:
- dora

6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,10 @@ network_params:
# Defaults to 256 epochs ~27 hours
min_validator_withdrawability_delay: 256

# The minimum number of epochs for builder withdrawability delay
# Defaults to 4096, 8 for minimal preset
min_builder_withdrawability_delay: 4096

# The period of the shard committee
# Defaults to 256 epoch ~27 hours
shard_committee_period: 256
Expand Down Expand Up @@ -1388,7 +1392,7 @@ spamoor_params:
# Ethereum genesis generator params
ethereum_genesis_generator_params:
# The image to use for ethereum genesis generator
image: ethpandaops/ethereum-genesis-generator:5.2.2
image: ethpandaops/ethereum-genesis-generator:5.2.3
# Pass custom environment variables to the genesis generator (e.g. MY_VAR: my_value)
extra_env: {}

Expand Down
2 changes: 1 addition & 1 deletion network_params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ keymanager_enabled: false
checkpoint_sync_enabled: false
checkpoint_sync_url: ""
ethereum_genesis_generator_params:
image: ethpandaops/ethereum-genesis-generator:5.2.2
image: ethpandaops/ethereum-genesis-generator:5.2.3
extra_env: {}
port_publisher:
nat_exit_ip: KURTOSIS_IP_ADDR_PLACEHOLDER
Expand Down
2 changes: 1 addition & 1 deletion src/package_io/constants.star
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ DEFAULT_ASSERTOOR_IMAGE = "ethpandaops/assertoor:latest"
DEFAULT_SNOOPER_IMAGE = "ethpandaops/rpc-snooper:latest"
DEFAULT_BOOTNODOOR_IMAGE = "ethpandaops/bootnodoor:latest"
DEFAULT_ETHEREUM_GENESIS_GENERATOR_IMAGE = (
"ethpandaops/ethereum-genesis-generator:5.2.2"
"ethpandaops/ethereum-genesis-generator:5.2.3"
)
DEFAULT_YQ_IMAGE = "linuxserver/yq"
DEFAULT_FLASHBOTS_RELAY_IMAGE = "ethpandaops/mev-boost-relay:main"
Expand Down
3 changes: 3 additions & 0 deletions src/package_io/input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ ATTR_TO_BE_SKIPPED_AT_ROOT = (
"bootnodoor_params",
"mempool_bridge_params",
"ews_params",
"ethereum_genesis_generator_params",
)


Expand Down Expand Up @@ -1346,6 +1347,7 @@ def default_network_params():
"ejection_balance": 16000000000,
"eth1_follow_distance": 2048,
"min_validator_withdrawability_delay": 256,
"min_builder_withdrawability_delay": 4096,
"shard_committee_period": 256,
"attestation_due_bps_gloas": 2500,
"aggregate_due_bps_gloas": 5000,
Expand Down Expand Up @@ -1429,6 +1431,7 @@ def default_minimal_network_params():
"ejection_balance": 16000000000,
"eth1_follow_distance": 16,
"min_validator_withdrawability_delay": 256,
"min_builder_withdrawability_delay": 8,
"shard_committee_period": 64,
"attestation_due_bps_gloas": 2500,
"aggregate_due_bps_gloas": 5000,
Expand Down
1 change: 1 addition & 0 deletions src/package_io/sanity_check.star
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ SUBCATEGORY_PARAMS = {
"ejection_balance",
"eth1_follow_distance",
"min_validator_withdrawability_delay",
"min_builder_withdrawability_delay",
"shard_committee_period",
"attestation_due_bps_gloas",
"aggregate_due_bps_gloas",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ def new_env_file_for_el_cl_genesis_data(
"ShadowForkFile": shadowfork_file,
"AdditionalValidatorMnemonics": get_additional_mnemonics_json(network_params),
"MinValidatorWithdrawabilityDelay": network_params.min_validator_withdrawability_delay,
"MinBuilderWithdrawabilityDelay": network_params.min_builder_withdrawability_delay,
"ShardCommitteePeriod": network_params.shard_committee_period,
"AttestationDueBpsGloas": network_params.attestation_due_bps_gloas,
"AggregateDueBpsGloas": network_params.aggregate_due_bps_gloas,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export EJECTION_BALANCE={{ .EjectionBalance }}
export ETH1_FOLLOW_DISTANCE={{ .Eth1FollowDistance }}
export SHADOW_FORK_FILE={{ .ShadowForkFile }}
export MIN_VALIDATOR_WITHDRAWABILITY_DELAY={{ .MinValidatorWithdrawabilityDelay }}
export MIN_BUILDER_WITHDRAWABILITY_DELAY={{ .MinBuilderWithdrawabilityDelay }}
export SHARD_COMMITTEE_PERIOD={{ .ShardCommitteePeriod }}
export ATTESTATION_DUE_BPS_GLOAS={{ .AttestationDueBpsGloas }}
export AGGREGATE_DUE_BPS_GLOAS={{ .AggregateDueBpsGloas }}
Expand Down
Loading