fix!: remove vc_count (#844)

ethpandaops · Dec 4, 2024 · b61a128 · b61a128
1 parent 3bb88e0
commit b61a128
Show file tree

Hide file tree

Showing 14 changed files with 238 additions and 301 deletions.
diff --git a/.github/tests/eof.yaml → .github/tests/eof.yaml.norun b/.github/tests/eof.yaml → .github/tests/eof.yaml.norun
diff --git a/.github/tests/mev-commit-boost.yaml b/.github/tests/mev-commit-boost.yaml
@@ -12,6 +12,5 @@ additional_services:
   - prometheus_grafana
 mev_params:
   mev_boost_image: ghcr.io/commit-boost/pbs:latest
-  mev_relay_image: flashbots/mev-boost-relay:latest
 network_params:
   seconds_per_slot: 3
diff --git a/.github/tests/mix-assert.yaml b/.github/tests/mix-assert.yaml
@@ -13,6 +13,7 @@ participants:
     cl_type: grandine
 additional_services:
   - assertoor
+  - dora
 assertoor_params:
   run_stability_check: false
   run_block_proposal_check: true
diff --git a/.github/tests/peerdas-deneb.yaml → .github/tests/peerdas-deneb.yaml.norun b/.github/tests/peerdas-deneb.yaml → .github/tests/peerdas-deneb.yaml.norun
diff --git a/.github/tests/peerdas-devnet-3.yaml → .github/tests/peerdas-devnet-3.yaml.norun b/.github/tests/peerdas-devnet-3.yaml → .github/tests/peerdas-devnet-3.yaml.norun
diff --git a/README.md b/README.md
@@ -304,10 +304,6 @@ participants:
     # - vero: ghcr.io/serenita-org/vero:master
     vc_image: ""
 
-    # The number of validator clients to run for this participant
-    # Defaults to 1
-    vc_count: 1
-
     # The log level string that this participant's validator client should log at
     # If this is emptystring then the global `logLevel` parameter's value will be translated into a string appropriate for the client (e.g. if
     # global `logLevel` = `info` then Teku would receive `INFO`, Prysm would receive `info`, etc.)

diff --git a/main.star b/main.star
@@ -133,7 +133,10 @@ def run(plan, args={}):
             args_with_right_defaults.mev_params.mev_builder_extra_data,
             global_node_selectors,
         )
-    elif args_with_right_defaults.mev_type == constants.FLASHBOTS_MEV_TYPE:
+    elif (
+        args_with_right_defaults.mev_type == constants.FLASHBOTS_MEV_TYPE
+        or args_with_right_defaults.mev_type == constants.COMMIT_BOOST_MEV_TYPE
+    ):
         plan.print("Generating flashbots builder config file")
         flashbots_builder_config_file = flashbots_mev_rbuilder.new_builder_config(
             plan,

diff --git a/network_params.yaml b/network_params.yaml
@@ -31,7 +31,6 @@ participants:
     vc_type: lighthouse
     vc_image: sigp/lighthouse:latest-unstable
     vc_log_level: ""
-    vc_count: 1
     vc_extra_env_vars: {}
     vc_extra_labels: {}
     vc_extra_params: []

diff --git a/src/cl/cl_launcher.star b/src/cl/cl_launcher.star
@@ -120,7 +120,7 @@ def launch(
 
         cl_service_name = "cl-{0}-{1}-{2}".format(index_str, cl_type, el_type)
         new_cl_node_validator_keystores = None
-        if participant.validator_count != 0 and participant.vc_count != 0:
+        if participant.validator_count != 0:
             new_cl_node_validator_keystores = preregistered_validator_keys_for_nodes[
                 index
             ]
@@ -145,16 +145,16 @@ def launch(
                     snooper_engine_context
                 )
             )
-
+        checkpoint_sync_url = args_with_right_defaults.checkpoint_sync_url
         if args_with_right_defaults.checkpoint_sync_enabled:
             if args_with_right_defaults.checkpoint_sync_url == "":
                 if (
                     network_params.network in constants.PUBLIC_NETWORKS
                     or network_params.network == constants.NETWORK_NAME.ephemery
                 ):
-                    args_with_right_defaults.checkpoint_sync_url = (
-                        constants.CHECKPOINT_SYNC_URL[network_params.network]
-                    )
+                    checkpoint_sync_url = constants.CHECKPOINT_SYNC_URL[
+                        network_params.network
+                    ]
                 else:
                     fail(
                         "Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
@@ -178,7 +178,7 @@ def launch(
                 tolerations,
                 node_selectors,
                 args_with_right_defaults.checkpoint_sync_enabled,
-                args_with_right_defaults.checkpoint_sync_url,
+                checkpoint_sync_url,
                 args_with_right_defaults.port_publisher,
                 index,
             )
@@ -199,7 +199,7 @@ def launch(
                 tolerations,
                 node_selectors,
                 args_with_right_defaults.checkpoint_sync_enabled,
-                args_with_right_defaults.checkpoint_sync_url,
+                checkpoint_sync_url,
                 args_with_right_defaults.port_publisher,
                 index,
             )

diff --git a/src/el/reth/reth_launcher.star b/src/el/reth/reth_launcher.star
@@ -136,7 +136,10 @@ def get_config(
         constants.METRICS_PORT_ID: METRICS_PORT_NUM,
     }
 
-    if launcher.builder_type == "flashbots":
+    if (
+        launcher.builder_type == constants.FLASHBOTS_MEV_TYPE
+        or launcher.builder_type == constants.COMMIT_BOOST_MEV_TYPE
+    ):
         used_port_assignments[constants.RBUILDER_PORT_ID] = RBUILDER_PORT_NUM
 
     used_ports = shared_utils.get_port_specs(used_port_assignments)
@@ -161,7 +164,10 @@ def get_config(
             "--http.addr=0.0.0.0",
             "--http.corsdomain=*",
             "--http.api=admin,net,eth,web3,debug,txpool,trace{0}".format(
-                ",flashbots" if launcher.builder_type == "flashbots" else ""
+                ",flashbots"
+                if launcher.builder_type == constants.FLASHBOTS_MEV_TYPE
+                or launcher.builder_type == constants.COMMIT_BOOST_MEV_TYPE
+                else ""
             ),
             "--ws",
             "--ws.addr=0.0.0.0",
@@ -220,11 +226,14 @@ def get_config(
         )
     env_vars = {}
     image = participant.el_image
-    if launcher.builder_type == "mev-rs":
+    if launcher.builder_type == constants.MEV_RS_MEV_TYPE:
         files[
             mev_rs_builder.MEV_BUILDER_MOUNT_DIRPATH_ON_SERVICE
         ] = mev_rs_builder.MEV_BUILDER_FILES_ARTIFACT_NAME
-    elif launcher.builder_type == "flashbots":
+    elif (
+        launcher.builder_type == constants.FLASHBOTS_MEV_TYPE
+        or launcher.builder_type == constants.COMMIT_BOOST_MEV_TYPE
+    ):
         image = constants.DEFAULT_FLASHBOTS_BUILDER_IMAGE
         cl_client_name = service_name.split("-")[4]
         cmd.append("--engine.experimental")

diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star
@@ -238,7 +238,6 @@ def input_parser(plan, input_args):
                 vc_type=participant["vc_type"],
                 vc_image=participant["vc_image"],
                 vc_log_level=participant["vc_log_level"],
-                vc_count=participant["vc_count"],
                 vc_tolerations=participant["vc_tolerations"],
                 cl_extra_params=participant["cl_extra_params"],
                 cl_extra_labels=participant["cl_extra_labels"],
@@ -642,30 +641,6 @@ def parse_network_params(plan, input_args):
                 remote_signer_type, ""
             )
 
-        if result["parallel_keystore_generation"] and participant["vc_count"] != 1:
-            fail(
-                "parallel_keystore_generation is only supported for 1 validator client per participant (for now)"
-            )
-
-        # If the num validator keys per node is not divisible by vc_count of a participant, fail
-        if (
-            participant["vc_count"] > 0
-            and result["network_params"]["num_validator_keys_per_node"]
-            % participant["vc_count"]
-            != 0
-        ):
-            fail(
-                "num_validator_keys_per_node: {0} is not divisible by vc_count: {1} for participant: {2}".format(
-                    result["network_params"]["num_validator_keys_per_node"],
-                    participant["vc_count"],
-                    str(index + 1)
-                    + "-"
-                    + participant["el_type"]
-                    + "-"
-                    + participant["cl_type"],
-                )
-            )
-
         snooper_enabled = participant["snooper_enabled"]
         if snooper_enabled == None:
             participant["snooper_enabled"] = result["snooper_enabled"]
@@ -972,7 +947,6 @@ def default_participant():
         "vc_type": "",
         "vc_image": "",
         "vc_log_level": "",
-        "vc_count": 1,
         "vc_extra_env_vars": {},
         "vc_extra_labels": {},
         "vc_extra_params": [],

diff --git a/src/package_io/sanity_check.star b/src/package_io/sanity_check.star
@@ -28,7 +28,6 @@ PARTICIPANT_CATEGORIES = {
         "use_separate_vc",
         "vc_type",
         "vc_image",
-        "vc_count",
         "vc_log_level",
         "vc_extra_env_vars",
         "vc_extra_labels",
@@ -96,7 +95,6 @@ PARTICIPANT_MATRIX_PARAMS = {
             "use_separate_vc",
             "vc_type",
             "vc_image",
-            "vc_count",
             "vc_log_level",
             "vc_extra_env_vars",
             "vc_extra_labels",
@@ -112,7 +110,6 @@ PARTICIPANT_MATRIX_PARAMS = {
         "vc": [
             "vc_type",
             "vc_image",
-            "vc_count",
             "vc_log_level",
             "vc_extra_env_vars",
             "vc_extra_labels",