diff --git a/README.md b/README.md index 2201cf6f2..cca15c1f0 100644 --- a/README.md +++ b/README.md @@ -263,6 +263,10 @@ network_params: # 16000000000 gwei ejection_balance: 16000000000, + # ETH1 follow distance + # Defaults to 2048 + eth1_follow_distance: 2048 + # The epoch at which the capella and deneb forks are set to occur. capella_fork_epoch: 0 deneb_fork_epoch: 500 diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star index e31927a0c..e5c3bddd8 100644 --- a/src/cl/teku/teku_launcher.star +++ b/src/cl/teku/teku_launcher.star @@ -321,7 +321,6 @@ def get_beacon_config( "--metrics-categories=BEACON,PROCESS,LIBP2P,JVM,NETWORK,PROCESS", "--metrics-port={0}".format(BEACON_METRICS_PORT_NUM), # ^^^^^^^^^^^^^^^^^^^ METRICS CONFIG ^^^^^^^^^^^^^^^^^^^^^ - "--Xtrusted-setup=" + constants.KZG_DATA_DIRPATH_ON_CLIENT_CONTAINER, ] validator_flags = [ "--validator-keys={0}:{1}".format( diff --git a/src/el/besu/besu_launcher.star b/src/el/besu/besu_launcher.star index 54c0fbbce..7d8b08d3b 100644 --- a/src/el/besu/besu_launcher.star +++ b/src/el/besu/besu_launcher.star @@ -167,7 +167,6 @@ def get_config( "--engine-rpc-port={0}".format(ENGINE_HTTP_RPC_PORT_NUM), "--sync-mode=FULL", "--data-storage-format=BONSAI", - "--kzg-trusted-setup=" + constants.KZG_DATA_DIRPATH_ON_CLIENT_CONTAINER, "--metrics-enabled=true", "--metrics-host=0.0.0.0", "--metrics-port={0}".format(METRICS_PORT_NUM), diff --git a/src/el/nethermind/nethermind_launcher.star b/src/el/nethermind/nethermind_launcher.star index 6d69fc62d..cb0e125a6 100644 --- a/src/el/nethermind/nethermind_launcher.star +++ b/src/el/nethermind/nethermind_launcher.star @@ -145,7 +145,6 @@ def get_config( + constants.GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER + "/chainspec.json", "--Init.WebSocketsEnabled=true", - "--Init.KzgSetupPath=" + constants.KZG_DATA_DIRPATH_ON_CLIENT_CONTAINER, "--config=none.cfg", "--JsonRpc.Enabled=true", "--JsonRpc.EnabledModules=net,eth,consensus,subscribe,web3,admin", diff --git a/src/package_io/constants.star b/src/package_io/constants.star index 845d06b7b..ccecc8f3a 100644 --- a/src/package_io/constants.star +++ b/src/package_io/constants.star @@ -45,11 +45,8 @@ GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER = ( JWT_AUTH_PATH = GENESIS_DATA_MOUNTPOINT_ON_CLIENTS + "/data/jwt/jwtsecret" -KZG_DATA_DIRPATH_ON_CLIENT_CONTAINER = ( - GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER + "/trusted_setup.txt" -) - GENESIS_FORK_VERSION = "0x10000038" BELLATRIX_FORK_VERSION = "0x30000038" CAPELLA_FORK_VERSION = "0x40000038" DENEB_FORK_VERSION = "0x50000038" +ELECTRA_FORK_VERSION = "0x60000038" diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 8da97cbec..0f17bb9c3 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -177,6 +177,7 @@ def input_parser(plan, input_args): genesis_delay=result["network_params"]["genesis_delay"], max_churn=result["network_params"]["max_churn"], ejection_balance=result["network_params"]["ejection_balance"], + eth1_follow_distance=result["network_params"]["eth1_follow_distance"], capella_fork_epoch=result["network_params"]["capella_fork_epoch"], deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"], electra_fork_epoch=result["network_params"]["electra_fork_epoch"], @@ -418,6 +419,7 @@ def default_network_params(): "genesis_delay": 120, "max_churn": 8, "ejection_balance": 16000000000, + "eth1_follow_distance": 2048, "capella_fork_epoch": 0, "deneb_fork_epoch": 500, "electra_fork_epoch": None, diff --git a/src/participant_network.star b/src/participant_network.star index 6af9357aa..571a5fb16 100644 --- a/src/participant_network.star +++ b/src/participant_network.star @@ -100,17 +100,17 @@ def launch_participant_network( and network_params.electra_fork_epoch == None ): ethereum_genesis_generator_image = ( - "ethpandaops/ethereum-genesis-generator:2.0.6" + "ethpandaops/ethereum-genesis-generator:2.0.8" ) # we are running electra - experimental elif network_params.electra_fork_epoch != None: if network_params.electra_fork_epoch == 0: ethereum_genesis_generator_image = ( - "ethpandaops/ethereum-genesis-generator:4.0.0-rc.3" + "ethpandaops/ethereum-genesis-generator:4.0.0-rc.4" ) else: ethereum_genesis_generator_image = ( - "ethpandaops/ethereum-genesis-generator:3.0.0-rc.17" + "ethpandaops/ethereum-genesis-generator:3.0.0-rc.18" ) else: fail( @@ -134,6 +134,7 @@ def launch_participant_network( network_params.genesis_delay, network_params.max_churn, network_params.ejection_balance, + network_params.eth1_follow_distance, network_params.capella_fork_epoch, network_params.deneb_fork_epoch, network_params.electra_fork_epoch, diff --git a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star index 24e49142f..ac839be0d 100644 --- a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star +++ b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star @@ -21,6 +21,7 @@ def generate_el_cl_genesis_data( genesis_delay, max_churn, ejection_balance, + eth1_follow_distance, capella_fork_epoch, deneb_fork_epoch, electra_fork_epoch, @@ -35,6 +36,7 @@ def generate_el_cl_genesis_data( genesis_delay, max_churn, ejection_balance, + eth1_follow_distance, capella_fork_epoch, deneb_fork_epoch, electra_fork_epoch, @@ -84,6 +86,7 @@ def new_env_file_for_el_cl_genesis_data( genesis_delay, max_churn, ejection_balance, + eth1_follow_distance, capella_fork_epoch, deneb_fork_epoch, electra_fork_epoch, @@ -98,6 +101,7 @@ def new_env_file_for_el_cl_genesis_data( "GenesisDelay": genesis_delay, "MaxChurn": max_churn, "EjectionBalance": ejection_balance, + "Eth1FollowDistance": eth1_follow_distance, "CapellaForkEpoch": capella_fork_epoch, "DenebForkEpoch": deneb_fork_epoch, "ElectraForkEpoch": electra_fork_epoch, @@ -105,4 +109,5 @@ def new_env_file_for_el_cl_genesis_data( "BellatrixForkVersion": constants.BELLATRIX_FORK_VERSION, "CapellaForkVersion": constants.CAPELLA_FORK_VERSION, "DenebForkVersion": constants.DENEB_FORK_VERSION, + "ElectraForkVersion": constants.ELECTRA_FORK_VERSION, } diff --git a/static_files/genesis-generation-config/el-cl/values.env.tmpl b/static_files/genesis-generation-config/el-cl/values.env.tmpl index 86e65d0df..45057d8ae 100644 --- a/static_files/genesis-generation-config/el-cl/values.env.tmpl +++ b/static_files/genesis-generation-config/el-cl/values.env.tmpl @@ -12,11 +12,12 @@ export CAPELLA_FORK_VERSION="{{ .CapellaForkVersion }}" export CAPELLA_FORK_EPOCH="{{ .CapellaForkEpoch }}" export DENEB_FORK_VERSION="{{ .DenebForkVersion }}" export DENEB_FORK_EPOCH="{{ .DenebForkEpoch }}" -export ELECTRA_FORK_VERSION="0x60000038" +export ELECTRA_FORK_VERSION="{{ .ElectraForkVersion }}" export ELECTRA_FORK_EPOCH="{{ .ElectraForkEpoch }}" export WITHDRAWAL_TYPE="0x00" export WITHDRAWAL_ADDRESS=0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134 export GENESIS_TIMESTAMP={{ .UnixTimestamp }} export GENESIS_DELAY={{ .GenesisDelay }} export MAX_CHURN={{ .MaxChurn }} -export EJECTION_BALANCE=16000000000 +export EJECTION_BALANCE={{ .EjectionBalance }} +export ETH1_FOLLOW_DISTANCE={{ .Eth1FollowDistance }}