From baa04e9118f39b10ed7d867eec164483c6fd807d Mon Sep 17 00:00:00 2001
From: Barnabas Busa <busa.barnabas@gmail.com>
Date: Thu, 28 Mar 2024 10:01:36 +0100
Subject: [PATCH] fix: separate vc (#526)

Co-authored-by: Gyanendra Mishra <anomaly.the@gmail.com>
---
 README.md                        |  1 +
 src/package_io/input_parser.star | 18 ++++++++----------
 src/participant_network.star     | 13 +------------
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index d3845b2c4..2289a0820 100644
--- a/README.md
+++ b/README.md
@@ -268,6 +268,7 @@ participants:
   # - nimbus: statusim/nimbus-eth2:multiarch-latest
   # - prysm: gcr.io/prysmaticlabs/prysm/beacon-chain:latest
   # - lodestar: chainsafe/lodestar:next
+  # - grandine: ethpandaops/grandine:develop
   cl_image: ""
 
   # The log level string that this participant's CL client should log at
diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star
index c6ccb4bed..bc5f01596 100644
--- a/src/package_io/input_parser.star
+++ b/src/package_io/input_parser.star
@@ -384,10 +384,14 @@ def parse_network_params(input_args):
         if participant["use_separate_vc"] == None:
             # Default to false for CL clients that can run validator clients
             # in the same process.
-            if cl_type in (
-                constants.CL_TYPE.nimbus,
-                constants.CL_TYPE.teku,
-                constants.CL_TYPE.grandine,
+            if (
+                cl_type
+                in (
+                    constants.CL_TYPE.nimbus,
+                    constants.CL_TYPE.teku,
+                    constants.CL_TYPE.grandine,
+                )
+                and vc_type == ""
             ):
                 participant["use_separate_vc"] = False
             else:
@@ -398,12 +402,6 @@ def parse_network_params(input_args):
             vc_type = cl_type
             participant["vc_type"] = vc_type
 
-        if (
-            cl_type == constants.CL_TYPE.grandine
-            and vc_type != constants.CL_TYPE.grandine
-        ):
-            fail("grandine does not support running a different validator client")
-
         vc_image = participant["vc_image"]
         if vc_image == "":
             if cl_image == "":
diff --git a/src/participant_network.star b/src/participant_network.star
index 246b70766..12e54048e 100644
--- a/src/participant_network.star
+++ b/src/participant_network.star
@@ -282,19 +282,8 @@ def launch_participant_network(
 
         vc_context = None
         snooper_beacon_context = None
-        if participant.snooper_enabled:
-            if (
-                participant.cl_type == constants.CL_TYPE.teku
-                or participant.cl_type == constants.CL_TYPE.nimbus
-                or participant.cl_type == constants.CL_TYPE.grandine
-            ) and participant.use_separate_vc != False:
-                plan.print(
-                    "Beacon snooper not supported for non split operation for {0}".format(
-                        participant.cl_type
-                    )
-                )
-                continue
 
+        if participant.snooper_enabled:
             snooper_service_name = "snooper-beacon-{0}-{1}-{2}".format(
                 index_str, cl_type, vc_type
             )