Skip to content

Commit

Permalink
feat: update verkle genesis + add besu support to verkle testing (#512)
Browse files Browse the repository at this point in the history
  • Loading branch information
barnabasbusa authored Mar 19, 2024
1 parent 83c2a55 commit 0615cd1
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 11 deletions.
23 changes: 15 additions & 8 deletions .github/tests/verkle-gen.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
participants:
- 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_image: ethpandaops/lighthouse:verkle-trees-capella-2ffb8a9
count: 2
- el_type: geth
el_image: ethpandaops/geth:kaustinen-with-shapella-0b110bd
- el_type: besu
el_image: ethpandaops/besu:matkt-fork-verkle-f2e19f9
cl_type: lodestar
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:
electra_fork_epoch: 0
additional_services:
- el_forkmon
- tx_spammer
- dora
- el_forkmon
- dora
snooper_enabled: true
11 changes: 9 additions & 2 deletions src/el/besu/besu_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ def launch(
el_volume_size,
tolerations,
node_selectors,
launcher.electra_fork_epoch,
)

service = plan.add_service(service_name, config)
Expand Down Expand Up @@ -172,6 +173,7 @@ def get_config(
el_volume_size,
tolerations,
node_selectors,
electra_fork_epoch,
):
cmd = [
"besu",
Expand All @@ -195,7 +197,11 @@ def get_config(
"--engine-host-allowlist=*",
"--engine-rpc-port={0}".format(ENGINE_HTTP_RPC_PORT_NUM),
"--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-host=0.0.0.0",
"--metrics-port={0}".format(METRICS_PORT_NUM),
Expand Down Expand Up @@ -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(
el_cl_genesis_data=el_cl_genesis_data,
jwt_file=jwt_file,
network=network,
electra_fork_epoch=electra_fork_epoch,
)
1 change: 1 addition & 0 deletions src/el/el_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def launch(
el_cl_data,
jwt_file,
network_params.network,
network_params.electra_fork_epoch,
),
"launch_method": besu.launch,
},
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 @@ -75,7 +75,7 @@ ETHEREUM_GENESIS_GENERATOR = struct(
capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12", # 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_genesis="ethpandaops/ethereum-genesis-generator:4.0.0-rc.6",
verkle_genesis="ethpandaops/ethereum-genesis-generator:4.0.0-rc.7",
)

NETWORK_NAME = struct(
Expand Down

0 comments on commit 0615cd1

Please sign in to comment.