Commit f1d63cc5 authored by Gyanendra Mishra's avatar Gyanendra Mishra

adding nimbus

parent f1073285
......@@ -57,9 +57,9 @@ This is the Startosis version of the popular [eth2-merge-kurtosis-module](https:
- [x] facts and waits
- [x] framework
- [ ] needs longer fact & wait
- [ ] nymbus
- [ ] facts and waits
- [ ] framework
- [ ] nimbus
- [x] facts and waits
- [x] framework
- [ ] prysm
- [ ] facts and waits
- [ ] framework
......
......@@ -223,7 +223,9 @@ def get_beacon_service_config(
if len(extra_params) > 0:
cmd_args.extend(extra_params)
# this is a repeated<proto type>, we convert it into Starlark
cmd_args.extend([param for param in extra_params])
return struct(
container_image_name = image,
......@@ -283,7 +285,7 @@ def get_validator_service_config(
cmd_args.append("--builder-proposals")
if len(extra_params):
cmd_args.extend(extra_params)
cmd_args.extend([param for param in extra_params])
return struct(
......
......@@ -203,7 +203,8 @@ def get_beacon_service_config(
if len(extra_params) > 0:
cmd_args.extend(extra_params)
# this is a repeated<proto type>, we convert it into Starlark
cmd_args.extend([param for param in extra_params])
return struct(
container_image_name = image,
......@@ -253,7 +254,9 @@ def get_validator_service_config(
# cmdArgs = append(cmdArgs, "--defaultFeeRecipient <your ethereum address>")
if len(extra_params) > 0:
cmd_args.extend(extra_params)
# this is a repeated<proto type>, we convert it into Starlark
cmd_args.extend([param for param in extra_params])
return struct(
container_image_name = image,
......
......@@ -125,7 +125,8 @@ def get_service_config(network_id, genesis_data, image, existing_el_clients, log
launch_node_command.append("--bootnodes={0},{1}".format(boot_node_1.enode, boot_node_2.enode))
if len(extra_params) > 0:
launch_node_command.extend(extra_params)
# we do this as extra_params isn't a normal [] but a proto repeated array
launch_node_command.extend([param for param in extra_params])
launch_node_command_str = " ".join(launch_node_command)
......
......@@ -128,7 +128,8 @@ def get_service_config(network_id, genesis_data, image, existing_el_clients, ver
]
if len(extra_params) > 0:
launch_node_cmd_args.extend(extra_params)
# this is a repeated<proto type>, we convert it into Starlark
launch_node_cmd_args.extend([param for param in extra_params])
command_arg = [
init_datadir_cmd_str,
......
......@@ -169,7 +169,9 @@ def get_service_config(network_id, genesis_data, prefunded_geth_keys_artifact_uu
)
if len(extra_params) > 0:
launch_node_cmd_args.extend(extra_params)
# this is a repeated<proto type>, we convert it into Starlark
launch_node_cmd_args.extend([param for param in extra_params])
launch_node_cmd_str = " ".join(launch_node_cmd_args)
......
......@@ -122,7 +122,8 @@ def get_service_config(genesis_data, image, existing_el_clients, log_level, extr
]
if len(extra_params) > 0:
command_args.extend(extra_params)
# we do this as extra_params is a repeated proto aray
command_args.extend([param for param in extra_params])
return struct(
container_image_name = image,
......
......@@ -15,6 +15,7 @@ load("github.com/kurtosis-tech/eth2-module/src/participant_network/el/nethermind
load("github.com/kurtosis-tech/eth2-module/src/participant_network/cl/lighthouse/lighthouse_launcher.star", launch_lighthouse="launch", "new_lighthouse_launcher")
load("github.com/kurtosis-tech/eth2-module/src/participant_network/cl/lodestar/lodestar_launcher.star", launch_lodestar="launch", "new_lodestar_launcher")
load("github.com/kurtosis-tech/eth2-module/src/participant_network/cl/nimbus/nimbus_launcher.star", launch_nimbus="launch", "new_nimbus_launcher")
load("github.com/kurtosis-tech/eth2-module/src/participant_network/prelaunch_data_generator/genesis_constants/genesis_constants.star", "PRE_FUNDED_ACCOUNTS")
load("github.com/kurtosis-tech/eth2-module/src/participant_network/participant.star", "new_participant")
......@@ -88,7 +89,7 @@ def launch_participant_network(participants, network_params, global_log_level):
el_client_type = participant.el_client_type
if el_client_type not in el_launchers:
fail("Unsupported launcher '{0}', need one of '{1}'".format(el_client_type, ",".join(el_launchers.keys())))
fail("Unsupported launcher '{0}', need one of '{1}'".format(el_client_type, ",".join([el.name for el in el_launchers.keys()])))
el_launcher, launch_method = el_launchers[el_client_type]["launcher"], el_launchers[el_client_type]["launch_method"]
el_service_id = "{0}{1}".format(EL_CLIENT_SERVICE_ID_PREFIX, index)
......@@ -128,7 +129,8 @@ def launch_participant_network(participants, network_params, global_log_level):
cl_launchers = {
# TODO Allow for other types here
module_io.CLClientType.lighthouse : {"launcher": new_lighthouse_launcher(cl_genesis_data), "launch_method": launch_lighthouse},
module_io.CLClientType.lodestar: {"launcher": new_lodestar_launcher(cl_genesis_data), "launch_method": launch_lodestar}
module_io.CLClientType.lodestar: {"launcher": new_lodestar_launcher(cl_genesis_data), "launch_method": launch_lodestar},
module_io.CLClientType.nimbus: {"launcher": new_nimbus_launcher(cl_genesis_data), "launch_method": launch_nimbus}
}
all_cl_client_contexts = []
......@@ -139,7 +141,7 @@ def launch_participant_network(participants, network_params, global_log_level):
cl_client_type = participant.cl_client_type
if cl_client_type not in cl_launchers:
fail("Unsupported launcher '{0}', need one of '{1}'".format(cl_client_type, ",".join(cl_launchers.keys())))
fail("Unsupported launcher '{0}', need one of '{1}'".format(cl_client_type, ",".join([cl.name for cl in cl_launchers.keys()])))
cl_launcher, launch_method = cl_launchers[cl_client_type]["launcher"], cl_launchers[cl_client_type]["launch_method"]
cl_service_id = "{0}{1}".format(CL_CLIENT_SERVICE_ID_PREFIX, index)
......
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