Commit 0615cd1b authored by Barnabas Busa's avatar Barnabas Busa Committed by GitHub

feat: update verkle genesis + add besu support to verkle testing (#512)

parent 83c2a559
participants: participants:
- el_type: geth - el_type: geth
el_image: ethpandaops/geth:kaustinen-with-shapella-0b110bd el_image: ethpandaops/geth:gballet-kaustinen-with-shapella-fcdcd3b
cl_type: lodestar
cl_image: ethpandaops/lodestar:g11tech-verge-815364b
- el_type: geth
el_image: ethpandaops/geth:gballet-kaustinen-with-shapella-fcdcd3b
cl_type: lighthouse cl_type: lighthouse
cl_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9 cl_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9
count: 2 - el_type: besu
- el_type: geth el_image: ethpandaops/besu:matkt-fork-verkle-f2e19f9
el_image: ethpandaops/geth:kaustinen-with-shapella-0b110bd
cl_type: lodestar cl_type: lodestar
cl_image: ethpandaops/lodestar:g11tech-verge-815364b cl_image: ethpandaops/lodestar:g11tech-verge-815364b
count: 2 validator_count: 10
- el_type: besu
el_image: ethpandaops/besu:matkt-fork-verkle-f2e19f9
cl_type: lighthouse
cl_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9
validator_count: 10
network_params: network_params:
electra_fork_epoch: 0 electra_fork_epoch: 0
additional_services: additional_services:
- el_forkmon - el_forkmon
- tx_spammer - dora
- dora
snooper_enabled: true snooper_enabled: true
...@@ -127,6 +127,7 @@ def launch( ...@@ -127,6 +127,7 @@ def launch(
el_volume_size, el_volume_size,
tolerations, tolerations,
node_selectors, node_selectors,
launcher.electra_fork_epoch,
) )
service = plan.add_service(service_name, config) service = plan.add_service(service_name, config)
...@@ -172,6 +173,7 @@ def get_config( ...@@ -172,6 +173,7 @@ def get_config(
el_volume_size, el_volume_size,
tolerations, tolerations,
node_selectors, node_selectors,
electra_fork_epoch,
): ):
cmd = [ cmd = [
"besu", "besu",
...@@ -195,7 +197,11 @@ def get_config( ...@@ -195,7 +197,11 @@ def get_config(
"--engine-host-allowlist=*", "--engine-host-allowlist=*",
"--engine-rpc-port={0}".format(ENGINE_HTTP_RPC_PORT_NUM), "--engine-rpc-port={0}".format(ENGINE_HTTP_RPC_PORT_NUM),
"--sync-mode=FULL", "--sync-mode=FULL",
"--data-storage-format=BONSAI", "--data-storage-format={0}".format(
"VERKLE"
if electra_fork_epoch != None or "verkle-gen" in network
else "BONSAI"
),
"--metrics-enabled=true", "--metrics-enabled=true",
"--metrics-host=0.0.0.0", "--metrics-host=0.0.0.0",
"--metrics-port={0}".format(METRICS_PORT_NUM), "--metrics-port={0}".format(METRICS_PORT_NUM),
...@@ -274,9 +280,10 @@ def get_config( ...@@ -274,9 +280,10 @@ def get_config(
) )
def new_besu_launcher(el_cl_genesis_data, jwt_file, network): def new_besu_launcher(el_cl_genesis_data, jwt_file, network, electra_fork_epoch=None):
return struct( return struct(
el_cl_genesis_data=el_cl_genesis_data, el_cl_genesis_data=el_cl_genesis_data,
jwt_file=jwt_file, jwt_file=jwt_file,
network=network, network=network,
electra_fork_epoch=electra_fork_epoch,
) )
...@@ -56,6 +56,7 @@ def launch( ...@@ -56,6 +56,7 @@ def launch(
el_cl_data, el_cl_data,
jwt_file, jwt_file,
network_params.network, network_params.network,
network_params.electra_fork_epoch,
), ),
"launch_method": besu.launch, "launch_method": besu.launch,
}, },
......
...@@ -75,7 +75,7 @@ ETHEREUM_GENESIS_GENERATOR = struct( ...@@ -75,7 +75,7 @@ ETHEREUM_GENESIS_GENERATOR = struct(
capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12", # Default capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12", # Default
deneb_genesis="ethpandaops/ethereum-genesis-generator:default-deneb-genesis", # Soon to become default deneb_genesis="ethpandaops/ethereum-genesis-generator:default-deneb-genesis", # Soon to become default
verkle_support_genesis="ethpandaops/ethereum-genesis-generator:3.0.0-rc.19", # soon to be deneb genesis verkle_support_genesis="ethpandaops/ethereum-genesis-generator:3.0.0-rc.19", # soon to be deneb genesis
verkle_genesis="ethpandaops/ethereum-genesis-generator:4.0.0-rc.6", verkle_genesis="ethpandaops/ethereum-genesis-generator:4.0.0-rc.7",
) )
NETWORK_NAME = struct( NETWORK_NAME = struct(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment