From 5dd4f9b352a571775684b30fe6fd530512fa943b Mon Sep 17 00:00:00 2001
From: Gyanendra Mishra <anomaly.the@gmail.com>
Date: Fri, 22 Sep 2023 14:19:24 +0200
Subject: [PATCH] fix: fix mismatch between validator_count & metrics gazer
 (#223)

---
 main.star                                             |  1 +
 .../beacon_metrics_gazer_launcher.star                | 11 ++++++++---
 src/package_io/parse_input.star                       |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/main.star b/main.star
index 688465a34..a201d5d1d 100644
--- a/main.star
+++ b/main.star
@@ -273,6 +273,7 @@ def run(plan, args={}):
         plan,
         beacon_metrics_gazer_config_template,
         all_cl_client_contexts,
+        args_with_right_defaults.participants,
         network_params,
     )
     plan.print("Succesfully launched beacon metrics gazer")
diff --git a/src/beacon_metrics_gazer/beacon_metrics_gazer_launcher.star b/src/beacon_metrics_gazer/beacon_metrics_gazer_launcher.star
index 4ea10fc38..0ff49a841 100644
--- a/src/beacon_metrics_gazer/beacon_metrics_gazer_launcher.star
+++ b/src/beacon_metrics_gazer/beacon_metrics_gazer_launcher.star
@@ -23,12 +23,17 @@ USED_PORTS = {
 
 
 def launch_beacon_metrics_gazer(
-    plan, config_template, cl_client_contexts, network_params
+    plan, config_template, cl_client_contexts, participants, network_params
 ):
     data = []
+    running_total_validator_count = 0
     for index, client in enumerate(cl_client_contexts):
-        start_index = index * network_params.num_validator_keys_per_node
-        end_index = ((index + 1) * network_params.num_validator_keys_per_node) - 1
+        participant = participants[index]
+        if participant.validator_count == 0:
+            continue
+        start_index = running_total_validator_count
+        running_total_validator_count += participant.validator_count
+        end_index = start_index + participant.validator_count
         service_name = client.beacon_service_name
         data.append(
             {
diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star
index bfc1bff1b..7c18efc48 100644
--- a/src/package_io/parse_input.star
+++ b/src/package_io/parse_input.star
@@ -70,6 +70,7 @@ def parse_input(plan, input_args):
                     el_extra_params=participant["el_extra_params"],
                     validator_extra_params=participant["validator_extra_params"],
                     builder_network_params=participant["builder_network_params"],
+                    validator_count=participant["validator_count"],
                 )
                 for participant in result["participants"]
             ],