fix: Use capella fork as the default genesis state

README.md

@@ -152,8 +152,7 @@ For example, this `eth-network-params.json` adds a second node, running a differ
  "deposit_contract_address": "0x4242424242424242424242424242424242424242",
  "seconds_per_slot": 12,
  "slots_per_epoch": 32,
- "genesis_delay": 10,
- "capella_fork_epoch": 2,
+ "genesis_delay": 120,
  "deneb_fork_epoch": 500
  },
  "global_client_log_level": "info"

default-network-params.json

@@ -19,7 +19,7 @@
  "deposit_contract_address": "0x4242424242424242424242424242424242424242",
  "seconds_per_slot": 12,
  "genesis_delay": 120,
- "capella_fork_epoch": 5
+ "deneb_fork_epoch": 5
  },
  "global_client_log_level": "info"
 }

kurtosis.yml

@@ -1 +1 @@
-name: "github.com/kurtosis-tech/eth-network-package"
+name: "github.com/barnabasbusa/eth-network-package"

main.star

@@ -1,8 +1,8 @@
-participant_network = import_module("github.com/kurtosis-tech/eth-network-package/src/participant_network.star")
-input_parser = import_module("github.com/kurtosis-tech/eth-network-package/package_io/input_parser.star")
+participant_network = import_module("github.com/barnabasbusa/eth-network-package/src/participant_network.star")
+input_parser = import_module("github.com/barnabasbusa/eth-network-package/package_io/input_parser.star")
 
-static_files = import_module("github.com/kurtosis-tech/eth-network-package/static_files/static_files.star")
-genesis_constants = import_module("github.com/kurtosis-tech/eth-network-package/src/prelaunch_data_generator/genesis_constants/genesis_constants.star")
+static_files = import_module("github.com/barnabasbusa/eth-network-package/static_files/static_files.star")
+genesis_constants = import_module("github.com/barnabasbusa/eth-network-package/src/prelaunch_data_generator/genesis_constants/genesis_constants.star")
 
 def run(plan, args):
  args_with_right_defaults = input_parser.parse_input(args)

package_io/input_parser.star

@@ -88,9 +88,6 @@ def parse_input(input_args):
  if result["network_params"]["genesis_delay"] == 0:
  fail("genesis_delay is 0 needs to be > 0 ")
 
- if result["network_params"]["capella_fork_epoch"] == 0:
- fail("capella_fork_epoch is 0 needs to be > 0 ")
-
  if result["network_params"]["deneb_fork_epoch"] == 0:
  fail("deneb_fork_epoch is 0 needs to be > 0 ")
 
@@ -123,8 +120,7 @@ def parse_input(input_args):
  deposit_contract_address=result["network_params"]["deposit_contract_address"],
  seconds_per_slot=result["network_params"]["seconds_per_slot"],
  slots_per_epoch=result["network_params"]["slots_per_epoch"],
- capella_fork_epoch=result["network_params"]["capella_fork_epoch"],
- deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"],
+ deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"],
  genesis_delay=result["network_params"]["genesis_delay"]
  ),
  wait_for_finalization=result["wait_for_finalization"],
@@ -162,8 +158,7 @@ def default_network_params():
  "deposit_contract_address": "0x4242424242424242424242424242424242424242",
  "seconds_per_slot": 12,
  "slots_per_epoch": 32,
- "genesis_delay": 10,
- "capella_fork_epoch": 2,
+ "genesis_delay": 120,
  # arbitrarily large while we sort out https://github.com/kurtosis-tech/eth-network-package/issues/42
  # this will take 53~ hoours for now
  "deneb_fork_epoch": 500,

src/cl/cl_client_context.star

@@ -1,9 +1,9 @@
-def new_cl_client_context(client_name, enr, ip_addr, http_port_num, cl_nodes_metrics_info, beacon_service_name):
+def new_cl_client_context(client_name, enr, ip_addr, http_port_num, cl_nodes_metrics_info, beacon_service_name, cl_service_name):
  return struct(
  client_name = client_name,
  enr = enr,
  ip_addr = ip_addr,
  http_port_num = http_port_num,
  cl_nodes_metrics_info = cl_nodes_metrics_info,
- beacon_service_name = beacon_service_name
+ beacon_service_name = beacon_service_name,
  )

src/cl/lighthouse/lighthouse_launcher.star

@@ -1,9 +1,9 @@
-shared_utils = import_module("github.com/kurtosis-tech/eth-network-package/shared_utils/shared_utils.star")
-input_parser = import_module("github.com/kurtosis-tech/eth-network-package/package_io/input_parser.star")
-cl_client_context = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_client_context.star")
-cl_node_metrics = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_node_metrics_info.star")
+shared_utils = import_module("github.com/barnabasbusa/eth-network-package/shared_utils/shared_utils.star")
+input_parser = import_module("github.com/barnabasbusa/eth-network-package/package_io/input_parser.star")
+cl_client_context = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_client_context.star")
+cl_node_metrics = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_node_metrics_info.star")
 
-package_io = import_module("github.com/kurtosis-tech/eth-network-package/package_io/constants.star")
+package_io = import_module("github.com/barnabasbusa/eth-network-package/package_io/constants.star")
 
 LIGHTHOUSE_BINARY_COMMAND = "lighthouse"
 
@@ -39,7 +39,6 @@ VALIDATOR_HTTP_PORT_WAIT_DISABLED = None
 
 METRICS_PATH = "/metrics"
 
-BEACON_SUFFIX_SERVICE_NAME = "beacon"
 VALIDATOR_SUFFIX_SERVICE_NAME = "validator"
 
 PRIVATE_IP_ADDRESS_PLACEHOLDER = "KURTOSIS_IP_ADDR_PLACEHOLDER"
@@ -77,7 +76,7 @@ def launch(
  extra_beacon_params,
  extra_validator_params):
 
- beacon_node_service_name = "{0}-{1}".format(service_name, BEACON_SUFFIX_SERVICE_NAME)
+ beacon_node_service_name = "{0}".format(service_name)
  validator_node_service_name = "{0}-{1}".format(service_name, VALIDATOR_SUFFIX_SERVICE_NAME)
 
  log_level = input_parser.get_client_log_level_or_default(participant_log_level, global_log_level, LIGHTHOUSE_LOG_LEVELS)

src/cl/lodestar/lodestar_launcher.star

@@ -1,10 +1,10 @@
-shared_utils = import_module("github.com/kurtosis-tech/eth-network-package/shared_utils/shared_utils.star")
-input_parser = import_module("github.com/kurtosis-tech/eth-network-package/package_io/input_parser.star")
-cl_client_context = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_client_context.star")
-cl_node_metrics = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_node_metrics_info.star")
-cl_node_ready_conditions = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_node_ready_conditions.star")
+shared_utils = import_module("github.com/barnabasbusa/eth-network-package/shared_utils/shared_utils.star")
+input_parser = import_module("github.com/barnabasbusa/eth-network-package/package_io/input_parser.star")
+cl_client_context = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_client_context.star")
+cl_node_metrics = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_node_metrics_info.star")
+cl_node_ready_conditions = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_node_ready_conditions.star")
 
-package_io = import_module("github.com/kurtosis-tech/eth-network-package/package_io/constants.star")
+package_io = import_module("github.com/barnabasbusa/eth-network-package/package_io/constants.star")
 
 CONSENSUS_DATA_DIRPATH_ON_SERVICE_CONTAINER = "/consensus-data"
 GENESIS_DATA_MOUNT_DIRPATH_ON_SERVICE_CONTAINER = "/genesis"
@@ -13,16 +13,15 @@ VALIDATOR_KEYS_MOUNT_DIRPATH_ON_SERVICE_CONTAINER = "/validator-keys"
 # Port IDs
 TCP_DISCOVERY_PORT_ID = "tcp-discovery"
 UDP_DISCOVERY_PORT_ID = "udp-discovery"
-HTTP_PORT_ID = "http"
-METRICS_PORT_ID = "metrics"
+HTTP_PORT_ID  = "http"
+METRICS_PORT_ID  = "metrics"
 VALIDATOR_METRICS_PORT_ID = "validator-metrics"
 
 # Port nums
 DISCOVERY_PORT_NUM = 9000
-HTTP_PORT_NUM  = 4000
-METRICS_PORT_NUM  = 8008
+HTTP_PORT_NUM = 4000
+METRICS_PORT_NUM = 8008
 
-BEACON_SUFFIX_SERVICE_NAME = "beacon"
 VALIDATOR_SUFFIX_SERVICE_NAME = "validator"
 
 METRICS_PATH = "/metrics"
@@ -63,7 +62,7 @@ def launch(
  extra_beacon_params,
  extra_validator_params):
 
- beacon_node_service_name = "{0}-{1}".format(service_name, BEACON_SUFFIX_SERVICE_NAME)
+ beacon_node_service_name = "{0}".format(service_name)
  validator_node_service_name = "{0}-{1}".format(service_name, VALIDATOR_SUFFIX_SERVICE_NAME)
 
  log_level = input_parser.get_client_log_level_or_default(participant_log_level, global_log_level, LODESTAR_LOG_LEVELS)
@@ -216,7 +215,7 @@ def get_validator_config(
  "--logLevel=" + log_level,
  "--dataDir=" + root_dirpath,
  "--paramsFile=" + genesis_config_filepath,
- "--server=" + beacon_client_http_url,
+ "--beaconNodes=" + beacon_client_http_url,
  "--keystoresDir=" + validator_keys_dirpath,
  "--secretsDir=" + validator_secrets_dirpath,
  # vvvvvvvvvvvvvvvvvvv PROMETHEUS CONFIG vvvvvvvvvvvvvvvvvvvvv

src/cl/nimbus/nimbus_launcher.star

@@ -1,10 +1,10 @@
-shared_utils = import_module("github.com/kurtosis-tech/eth-network-package/shared_utils/shared_utils.star")
-input_parser = import_module("github.com/kurtosis-tech/eth-network-package/package_io/input_parser.star")
-cl_client_context = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_client_context.star")
-cl_node_metrics = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_node_metrics_info.star")
-cl_node_ready_conditions = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_node_ready_conditions.star")
+shared_utils = import_module("github.com/barnabasbusa/eth-network-package/shared_utils/shared_utils.star")
+input_parser = import_module("github.com/barnabasbusa/eth-network-package/package_io/input_parser.star")
+cl_client_context = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_client_context.star")
+cl_node_metrics = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_node_metrics_info.star")
+cl_node_ready_conditions = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_node_ready_conditions.star")
 
-package_io = import_module("github.com/kurtosis-tech/eth-network-package/package_io/constants.star")
+package_io = import_module("github.com/barnabasbusa/eth-network-package/package_io/constants.star")
 
 GENESIS_DATA_MOUNTPOINT_ON_CLIENT = "/genesis-data"
 
@@ -130,7 +130,7 @@ def get_config(
  # 1) https://github.com/status-im/nimbus-eth2/blob/stable/scripts/launch_local_testnet.sh
  # 2) https://github.com/status-im/nimbus-eth2/blob/67ab477a27e358d605e99bffeb67f98d18218eca/scripts/launch_local_testnet.sh#L417
  # WARNING: Do NOT set the --max-peers flag here, as doing so to the exact number of nodes seems to mess things up!
- # See: https://github.com/kurtosis-tech/eth2-merge-kurtosis-module/issues/26
+ # See: https://github.com/barnabasbusa/eth2-merge-kurtosis-module/issues/26
  cmd = [
  "mkdir",
  CONSENSUS_DATA_DIRPATH_IN_SERVICE_CONTAINER,

src/cl/prysm/prysm_launcher.star

@@ -1,10 +1,10 @@
-shared_utils = import_module("github.com/kurtosis-tech/eth-network-package/shared_utils/shared_utils.star")
-input_parser = import_module("github.com/kurtosis-tech/eth-network-package/package_io/input_parser.star")
-cl_client_context = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_client_context.star")
-cl_node_metrics = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_node_metrics_info.star")
-cl_node_ready_conditions = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_node_ready_conditions.star")
+shared_utils = import_module("github.com/barnabasbusa/eth-network-package/shared_utils/shared_utils.star")
+input_parser = import_module("github.com/barnabasbusa/eth-network-package/package_io/input_parser.star")
+cl_client_context = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_client_context.star")
+cl_node_metrics = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_node_metrics_info.star")
+cl_node_ready_conditions = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_node_ready_conditions.star")
 
-package_io = import_module("github.com/kurtosis-tech/eth-network-package/package_io/constants.star")
+package_io = import_module("github.com/barnabasbusa/eth-network-package/package_io/constants.star")
 
 IMAGE_SEPARATOR_DELIMITER = ","
 EXPECTED_NUM_IMAGES = 2
@@ -30,7 +30,6 @@ HTTP_PORT_NUM = 3500
 BEACON_MONITORING_PORT_NUM = 8080
 VALIDATOR_MONITORING_PORT_NUM = 8081
 
-BEACON_SUFFIX_SERVICE_NAME = "beacon"
 VALIDATOR_SUFFIX_SERVICE_NAME = "validator"
 
 MIN_PEERS = 1
@@ -85,7 +84,7 @@ def launch(
  fail("An empty validator image was provided")
 
 
- beacon_node_service_name = "{0}-{1}".format(service_name, BEACON_SUFFIX_SERVICE_NAME)
+ beacon_node_service_name = "{0}".format(service_name)
  validator_node_service_name = "{0}-{1}".format(service_name, VALIDATOR_SUFFIX_SERVICE_NAME)
 
  log_level = input_parser.get_client_log_level_or_default(participant_log_level, global_log_level, PRYSM_LOG_LEVELS)

src/cl/teku/teku_launcher.star

@@ -1,10 +1,10 @@
-shared_utils = import_module("github.com/kurtosis-tech/eth-network-package/shared_utils/shared_utils.star")
-input_parser = import_module("github.com/kurtosis-tech/eth-network-package/package_io/input_parser.star")
-cl_client_context = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_client_context.star")
-cl_node_metrics = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_node_metrics_info.star")
-cl_node_ready_conditions = import_module("github.com/kurtosis-tech/eth-network-package/src/cl/cl_node_ready_conditions.star")
+shared_utils = import_module("github.com/barnabasbusa/eth-network-package/shared_utils/shared_utils.star")
+input_parser = import_module("github.com/barnabasbusa/eth-network-package/package_io/input_parser.star")
+cl_client_context = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_client_context.star")
+cl_node_metrics = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_node_metrics_info.star")
+cl_node_ready_conditions = import_module("github.com/barnabasbusa/eth-network-package/src/cl/cl_node_ready_conditions.star")
 
-package_io = import_module("github.com/kurtosis-tech/eth-network-package/package_io/constants.star")
+package_io = import_module("github.com/barnabasbusa/eth-network-package/package_io/constants.star")
 
 TEKU_BINARY_FILEPATH_IN_IMAGE = "/opt/teku/bin/teku"
 
@@ -23,13 +23,13 @@ VALIDATING_REWARDS_ACCOUNT = "0x0000000000000000000000000000000000000000"
 # Port IDs
 TCP_DISCOVERY_PORT_ID = "tcp-discovery"
 UDP_DISCOVERY_PORT_ID = "udp-discovery"
-HTTP_PORT_ID = "http"
-METRICS_PORT_ID = "metrics"
+HTTP_PORT_ID  = "http"
+METRICS_PORT_ID  = "metrics"
 
 # Port nums
-DISCOVERY_PORT_NUM = 9000
-HTTP_PORT_NUM  = 4000
-METRICS_PORT_NUM = 8008
+DISCOVERY_PORT_NUM  = 9000
+HTTP_PORT_NUM  = 4000
+METRICS_PORT_NUM = 8008
 
 # 1) The Teku container runs as the "teku" user
 # 2) Teku requires write access to the validator secrets directory, so it can write a lockfile into it as it uses the keys

src/el/besu/besu_launcher.star

@@ -1,8 +1,8 @@
-shared_utils = import_module("github.com/kurtosis-tech/eth-network-package/shared_utils/shared_utils.star")
-input_parser = import_module("github.com/kurtosis-tech/eth-network-package/package_io/input_parser.star")
-el_client_context = import_module("github.com/kurtosis-tech/eth-network-package/src/el/el_client_context.star")
-el_admin_node_info = import_module("github.com/kurtosis-tech/eth-network-package/src/el/el_admin_node_info.star")
-package_io = import_module("github.com/kurtosis-tech/eth-network-package/package_io/constants.star")
+shared_utils = import_module("github.com/barnabasbusa/eth-network-package/shared_utils/shared_utils.star")
+input_parser = import_module("github.com/barnabasbusa/eth-network-package/package_io/input_parser.star")
+el_client_context = import_module("github.com/barnabasbusa/eth-network-package/src/el/el_client_context.star")
+el_admin_node_info = import_module("github.com/barnabasbusa/eth-network-package/src/el/el_admin_node_info.star")
+package_io = import_module("github.com/barnabasbusa/eth-network-package/package_io/constants.star")
 
 # The dirpath of the execution data directory on the client container
 EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER = "/opt/besu/execution-data"
@@ -12,16 +12,14 @@ GENESIS_DATA_DIRPATH_ON_CLIENT_CONTAINER = "/opt/besu/genesis"
 RPC_PORT_NUM = 8545
 WS_PORT_NUM = 8546
 DISCOVERY_PORT_NUM = 30303
-ENGINE_HTTP_RPC_PORT_NUM = 8550
-ENGINE_WS_RPC_PORT_NUM = 8551
+ENGINE_HTTP_RPC_PORT_NUM = 8551
 
 # Port IDs
 RPC_PORT_ID = "rpc"
 WS_PORT_ID = "ws"
 TCP_DISCOVERY_PORT_ID = "tcp-discovery"
 UDP_DISCOVERY_PORT_ID = "udp-discovery"
-ENGINE_HTTP_RPC_PORT_ID = "engineHttpRpc"
-ENGINE_WS_RPC_PORT_ID = "engineWsRpc"
+ENGINE_HTTP_RPC_PORT_ID = "engine-rpc"
 
 PRIVATE_IP_ADDRESS_PLACEHOLDER = "KURTOSIS_IP_ADDR_PLACEHOLDER"
 
@@ -31,7 +29,6 @@ USED_PORTS = {
  TCP_DISCOVERY_PORT_ID: shared_utils.new_port_spec(DISCOVERY_PORT_NUM, shared_utils.TCP_PROTOCOL),
  UDP_DISCOVERY_PORT_ID: shared_utils.new_port_spec(DISCOVERY_PORT_NUM, shared_utils.UDP_PROTOCOL),
  ENGINE_HTTP_RPC_PORT_ID: shared_utils.new_port_spec(ENGINE_HTTP_RPC_PORT_NUM, shared_utils.TCP_PROTOCOL),
- ENGINE_WS_RPC_PORT_ID: shared_utils.new_port_spec(ENGINE_WS_RPC_PORT_NUM, shared_utils.TCP_PROTOCOL)
 }
 
 ENTRYPOINT_ARGS = ["sh", "-c"]
@@ -74,6 +71,7 @@ def launch(
  WS_PORT_NUM,
  ENGINE_HTTP_RPC_PORT_NUM,
  jwt_secret,
+ service_name
  )
 
 

src/el/el_client_context.star

@@ -1,5 +1,6 @@
-def new_el_client_context(client_name, enr, enode, ip_addr, rpc_port_num, ws_port_num, engine_rpc_port_num, jwt_secret):
+def new_el_client_context(client_name, enr, enode, ip_addr, rpc_port_num, ws_port_num, engine_rpc_port_num, jwt_secret, service_name = ""):
  return struct(
+ service_name = service_name,
  client_name = client_name,
  enr = enr,
  enode = enode,

src/el/erigon/erigon_launcher.star

@@ -1,9 +1,9 @@
-shared_utils = import_module("github.com/kurtosis-tech/eth-network-package/shared_utils/shared_utils.star")
-input_parser = import_module("github.com/kurtosis-tech/eth-network-package/package_io/input_parser.star")
-el_admin_node_info = import_module("github.com/kurtosis-tech/eth-network-package/src/el/el_admin_node_info.star")
-el_client_context = import_module("github.com/kurtosis-tech/eth-network-package/src/el/el_client_context.star")
+shared_utils = import_module("github.com/barnabasbusa/eth-network-package/shared_utils/shared_utils.star")
+input_parser = import_module("github.com/barnabasbusa/eth-network-package/package_io/input_parser.star")
+el_admin_node_info = import_module("github.com/barnabasbusa/eth-network-package/src/el/el_admin_node_info.star")
+el_client_context = import_module("github.com/barnabasbusa/eth-network-package/src/el/el_client_context.star")
 
-package_io = import_module("github.com/kurtosis-tech/eth-network-package/package_io/constants.star")
+package_io = import_module("github.com/barnabasbusa/eth-network-package/package_io/constants.star")
 
 # The dirpath of the execution data directory on the client container
 EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER = "/home/erigon/execution-data"
@@ -71,7 +71,8 @@ def launch(
  RPC_PORT_NUM,
  WS_PORT_NUM,
  ENGINE_RPC_PORT_NUM,
- jwt_secret
+ jwt_secret,
+ service_name
  )
 
 
@@ -86,7 +87,7 @@ def get_config(network_id, genesis_data, image, existing_el_clients, verbosity_l
  genesis_json_filepath_on_client,
  )
 
- # TODO remove this based on https://github.com/kurtosis-tech/eth2-merge-kurtosis-module/issues/152
+ # TODO remove this based on https://github.com/barnabasbusa/eth2-merge-kurtosis-module/issues/152
  if len(existing_el_clients) == 0:
  fail("Erigon needs at least one node to exist, which it treats as the bootnode")