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
1 change: 1 addition & 0 deletions .github/tests/altair-genesis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ network_params:
deneb_fork_epoch: 3
electra_fork_epoch: 4
fulu_fork_epoch: 5
gloas_fork_epoch: 6
genesis_delay: 120

1 change: 1 addition & 0 deletions .github/tests/bellatrix-genesis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ network_params:
deneb_fork_epoch: 2
electra_fork_epoch: 3
fulu_fork_epoch: 4
gloas_fork_epoch: 5
genesis_delay: 120
1 change: 1 addition & 0 deletions .github/tests/capella-genesis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ network_params:
deneb_fork_epoch: 1
electra_fork_epoch: 2
fulu_fork_epoch: 3
gloas_fork_epoch: 4
genesis_delay: 120
1 change: 1 addition & 0 deletions .github/tests/deneb-genesis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ network_params:
deneb_fork_epoch: 0
electra_fork_epoch: 1
fulu_fork_epoch: 2
gloas_fork_epoch: 3
genesis_delay: 120
1 change: 1 addition & 0 deletions .github/tests/deneb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ network_params:
deneb_fork_epoch: 1
electra_fork_epoch: 2
fulu_fork_epoch: 3
gloas_fork_epoch: 4
preset: minimal
1 change: 1 addition & 0 deletions .github/tests/electra-genesis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ network_params:
deneb_fork_epoch: 0
electra_fork_epoch: 0
fulu_fork_epoch: 1
gloas_fork_epoch: 2
genesis_delay: 120
additional_services:
- dora
1 change: 1 addition & 0 deletions .github/tests/fulu-genesis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ network_params:
deneb_fork_epoch: 0
electra_fork_epoch: 0
fulu_fork_epoch: 0
gloas_fork_epoch: 1
genesis_delay: 120
additional_services:
- dora
3 changes: 1 addition & 2 deletions .github/tests/fulu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ network_params:
deneb_fork_epoch: 0
electra_fork_epoch: 1
fulu_fork_epoch: 2
eip7732_fork_epoch: 3
eip7805_fork_epoch: 4
gloas_fork_epoch: 3

10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,10 @@ network_params:
# Defaults to 18446744073709551615
fulu_fork_epoch: 18446744073709551615

# Gloas fork epoch
# Defaults to 18446744073709551615
gloas_fork_epoch: 18446744073709551615

# Network sync base url for syncing public networks from a custom snapshot (mostly useful for shadowforks)
# Defaults to "https://snapshots.ethpandaops.io/"
# If you have a local snapshot, you can set this to the local url:
Expand Down Expand Up @@ -621,10 +625,6 @@ network_params:
# Base fee update fraction for Electra fork (default 5007716)
base_fee_update_fraction_electra: 5007716

# EIP-7732 fork epoch
# Defaults to 18446744073709551615
eip7732_fork_epoch: 18446744073709551615

# EIP-7805 fork epoch
# Defaults to 18446744073709551615
eip7805_fork_epoch: 18446744073709551615
Expand Down Expand Up @@ -1101,7 +1101,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.0.1
image: ethpandaops/ethereum-genesis-generator:5.0.2

# Configuration for public ports and NAT exit IP addresses
port_publisher:
Expand Down
23 changes: 12 additions & 11 deletions network_params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ network_params:
deneb_fork_epoch: 0
electra_fork_epoch: 0
fulu_fork_epoch: 18446744073709551615
gloas_fork_epoch: 18446744073709551615
network_sync_base_url: https://snapshots.ethpandaops.io/
force_snapshot_sync: false
data_column_sidecar_subnet_count: 128
Expand All @@ -103,24 +104,24 @@ network_params:
devnet_repo: ethpandaops
prefunded_accounts: {}
bpo_1_epoch: 18446744073709551615
bpo_1_max_blobs: 12
bpo_1_target_blobs: 9
bpo_1_max_blobs: 0
bpo_1_target_blobs: 0
bpo_1_base_fee_update_fraction: 0
bpo_2_epoch: 18446744073709551615
bpo_2_max_blobs: 12
bpo_2_target_blobs: 9
bpo_2_max_blobs: 0
bpo_2_target_blobs: 0
bpo_2_base_fee_update_fraction: 0
bpo_3_epoch: 18446744073709551615
bpo_3_max_blobs: 12
bpo_3_target_blobs: 9
bpo_3_max_blobs: 0
bpo_3_target_blobs: 0
bpo_3_base_fee_update_fraction: 0
bpo_4_epoch: 18446744073709551615
bpo_4_max_blobs: 12
bpo_4_target_blobs: 9
bpo_4_max_blobs: 0
bpo_4_target_blobs: 0
bpo_4_base_fee_update_fraction: 0
bpo_5_epoch: 18446744073709551615
bpo_5_max_blobs: 12
bpo_5_target_blobs: 9
bpo_5_max_blobs: 0
bpo_5_target_blobs: 0
bpo_5_base_fee_update_fraction: 0
withdrawal_type: "0x00"
withdrawal_address: "0x8943545177806ED17B9F23F0a21ee5948eCaa776"
Expand Down Expand Up @@ -209,7 +210,7 @@ keymanager_enabled: false
checkpoint_sync_enabled: false
checkpoint_sync_url: ""
ethereum_genesis_generator_params:
image: ethpandaops/ethereum-genesis-generator:5.0.1
image: ethpandaops/ethereum-genesis-generator:5.0.2
port_publisher:
nat_exit_ip: KURTOSIS_IP_ADDR_PLACEHOLDER
el:
Expand Down
2 changes: 1 addition & 1 deletion src/dora/dora_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def get_config(
+ constants.DEFAULT_DORA_IMAGE
)
if dora_params.image == default_dora_image:
if network_params.eip7732_fork_epoch < constants.FAR_FUTURE_EPOCH:
if network_params.gloas_fork_epoch < constants.FAR_FUTURE_EPOCH:
IMAGE_NAME = (
docker_cache_params.url
+ (
Expand Down
4 changes: 2 additions & 2 deletions src/package_io/constants.star
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ DEFAULT_SPAMOOR_IMAGE = "ethpandaops/spamoor:latest"
DEFAULT_ASSERTOOR_IMAGE = "ethpandaops/assertoor:latest"
DEFAULT_SNOOPER_IMAGE = "ethpandaops/rpc-snooper:latest"
DEFAULT_ETHEREUM_GENESIS_GENERATOR_IMAGE = (
"ethpandaops/ethereum-genesis-generator:5.0.1"
"ethpandaops/ethereum-genesis-generator:5.0.2"
)
DEFAULT_YQ_IMAGE = "linuxserver/yq"
DEFAULT_FLASHBOTS_RELAY_IMAGE = "ethpandaops/mev-boost-relay:main"
Expand Down Expand Up @@ -125,7 +125,7 @@ CAPELLA_FORK_VERSION = "0x40000038"
DENEB_FORK_VERSION = "0x50000038"
ELECTRA_FORK_VERSION = "0x60000038"
FULU_FORK_VERSION = "0x70000038"
EIP7732_FORK_VERSION = "0x80000038"
GLOAS_FORK_VERSION = "0x80000038"
EIP7805_FORK_VERSION = "0x90000038"

FAR_FUTURE_EPOCH = 18446744073709551615
Expand Down
6 changes: 3 additions & 3 deletions src/package_io/input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ def input_parser(plan, input_args):
deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"],
electra_fork_epoch=result["network_params"]["electra_fork_epoch"],
fulu_fork_epoch=result["network_params"]["fulu_fork_epoch"],
eip7732_fork_epoch=result["network_params"]["eip7732_fork_epoch"],
gloas_fork_epoch=result["network_params"]["gloas_fork_epoch"],
eip7805_fork_epoch=result["network_params"]["eip7805_fork_epoch"],
network=result["network_params"]["network"],
min_validator_withdrawability_delay=result["network_params"][
Expand Down Expand Up @@ -1136,7 +1136,7 @@ def default_network_params():
"deneb_fork_epoch": 0,
"electra_fork_epoch": 0,
"fulu_fork_epoch": constants.FAR_FUTURE_EPOCH,
"eip7732_fork_epoch": constants.FAR_FUTURE_EPOCH,
"gloas_fork_epoch": constants.FAR_FUTURE_EPOCH,
"eip7805_fork_epoch": constants.FAR_FUTURE_EPOCH,
"network_sync_base_url": "https://snapshots.ethpandaops.io/",
"force_snapshot_sync": False,
Expand Down Expand Up @@ -1204,7 +1204,7 @@ def default_minimal_network_params():
"deneb_fork_epoch": 0,
"electra_fork_epoch": 0,
"fulu_fork_epoch": constants.FAR_FUTURE_EPOCH,
"eip7732_fork_epoch": constants.FAR_FUTURE_EPOCH,
"gloas_fork_epoch": constants.FAR_FUTURE_EPOCH,
"eip7805_fork_epoch": constants.FAR_FUTURE_EPOCH,
"network_sync_base_url": "https://snapshots.ethpandaops.io/",
"force_snapshot_sync": False,
Expand Down
2 changes: 1 addition & 1 deletion src/package_io/sanity_check.star
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ SUBCATEGORY_PARAMS = {
"deneb_fork_epoch",
"electra_fork_epoch",
"fulu_fork_epoch",
"eip7732_fork_epoch",
"gloas_fork_epoch",
"eip7805_fork_epoch",
"network_sync_base_url",
"force_snapshot_sync",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def new_env_file_for_el_cl_genesis_data(
"DenebForkEpoch": "{0}".format(network_params.deneb_fork_epoch),
"ElectraForkEpoch": "{0}".format(network_params.electra_fork_epoch),
"FuluForkEpoch": "{0}".format(network_params.fulu_fork_epoch),
"Eip7732ForkEpoch": "{0}".format(network_params.eip7732_fork_epoch),
"GloasForkEpoch": "{0}".format(network_params.gloas_fork_epoch),
"Eip7805ForkEpoch": "{0}".format(network_params.eip7805_fork_epoch),
"GenesisForkVersion": constants.GENESIS_FORK_VERSION,
"AltairForkVersion": constants.ALTAIR_FORK_VERSION,
Expand All @@ -144,7 +144,7 @@ def new_env_file_for_el_cl_genesis_data(
"DenebForkVersion": constants.DENEB_FORK_VERSION,
"ElectraForkVersion": constants.ELECTRA_FORK_VERSION,
"FuluForkVersion": constants.FULU_FORK_VERSION,
"Eip7732ForkVersion": constants.EIP7732_FORK_VERSION,
"GloasForkVersion": constants.GLOAS_FORK_VERSION,
"Eip7805ForkVersion": constants.EIP7805_FORK_VERSION,
"ShadowForkFile": shadowfork_file,
"MinValidatorWithdrawabilityDelay": network_params.min_validator_withdrawability_delay,
Expand Down
4 changes: 2 additions & 2 deletions static_files/genesis-generation-config/el-cl/values.env.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ export ELECTRA_FORK_VERSION="{{ .ElectraForkVersion }}"
export ELECTRA_FORK_EPOCH="{{ .ElectraForkEpoch }}"
export FULU_FORK_VERSION="{{ .FuluForkVersion }}"
export FULU_FORK_EPOCH="{{ .FuluForkEpoch }}"
export EIP7732_FORK_VERSION="{{ .Eip7732ForkVersion }}"
export EIP7732_FORK_EPOCH="{{ .Eip7732ForkEpoch }}"
export GLOAS_FORK_VERSION="{{ .GloasForkVersion }}"
export GLOAS_FORK_EPOCH="{{ .GloasForkEpoch }}"
export EIP7805_FORK_VERSION="{{ .Eip7805ForkVersion }}"
export EIP7805_FORK_EPOCH="{{ .Eip7805ForkEpoch }}"
export WITHDRAWAL_TYPE="{{ .WithdrawalType }}"
Expand Down