From 8b7c5ee59b8c3a4f209269aa1d3632fb8a3072b5 Mon Sep 17 00:00:00 2001
From: gbayasgalan <bayasgalan.gantumur@rocklogic.at>
Date: Fri, 6 Sep 2024 15:17:38 +0200
Subject: [PATCH] ADD: devnet services monitoring & image for prysm & ignore
 validator list

---
 launcher/src/backend/ethereum-services/GethService.js       | 4 ++++
 .../src/backend/ethereum-services/PrysmBeaconService.js     | 6 +++---
 .../src/backend/ethereum-services/PrysmValidatorService.js  | 4 +++-
 launcher/src/composables/validators.js                      | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/launcher/src/backend/ethereum-services/GethService.js b/launcher/src/backend/ethereum-services/GethService.js
index 9fa63ca02..c97440503 100755
--- a/launcher/src/backend/ethereum-services/GethService.js
+++ b/launcher/src/backend/ethereum-services/GethService.js
@@ -35,6 +35,10 @@ export class GethService extends NodeService {
             "--allow-insecure-unlock",
             "--nodiscover",
             "--syncmode=full",
+            "--metrics",
+            "--metrics.expensive",
+            "--metrics.port=6060",
+            "--metrics.addr=0.0.0.0",
           ]
         : [
             `--${network}`,
diff --git a/launcher/src/backend/ethereum-services/PrysmBeaconService.js b/launcher/src/backend/ethereum-services/PrysmBeaconService.js
index dd20b7292..0ec8c664d 100755
--- a/launcher/src/backend/ethereum-services/PrysmBeaconService.js
+++ b/launcher/src/backend/ethereum-services/PrysmBeaconService.js
@@ -62,7 +62,6 @@ export class PrysmBeaconService extends NodeService {
             `--datadir=${dataDir}`,
             "--min-sync-peers=0",
             `--genesis-state=${genesisDir}/genesis.ssz`,
-            "--bootstrap-node=",
             "--interop-eth1data-votes",
             `--chain-config-file=${configYamlDir}/config.yml`,
             "--contract-deployment-block=0",
@@ -74,7 +73,8 @@ export class PrysmBeaconService extends NodeService {
             `--jwt-secret=${JWTDir}`,
             "--suggested-fee-recipient=0x123463a4b065722e99115d6c222f267d9cabb524",
             "--minimum-peers-per-subnet=0",
-            "--enable-debug-rpc-endpoints",
+            "--monitoring-host=0.0.0.0",
+            "--monitoring-port=8080",
             "--force-clear-db",
           ]
         : [
@@ -98,7 +98,7 @@ export class PrysmBeaconService extends NodeService {
       service.id, //id
       1, // configVersion
       image, //image
-      "v5.1.0", //imageVersion
+      network === "devnet" ? "v5.0.4" : "v5.1.0", //imageVersion
       cmd, // command
       ["/app/cmd/beacon-chain/beacon-chain"], //entrypoint
       null, //env
diff --git a/launcher/src/backend/ethereum-services/PrysmValidatorService.js b/launcher/src/backend/ethereum-services/PrysmValidatorService.js
index 7b89a7a8f..a2e42be1c 100755
--- a/launcher/src/backend/ethereum-services/PrysmValidatorService.js
+++ b/launcher/src/backend/ethereum-services/PrysmValidatorService.js
@@ -50,6 +50,8 @@ export class PrysmValidatorService extends NodeService {
             "--interop-num-validators=64",
             "--interop-start-index=0",
             `--chain-config-file=${configYamlDir}/config.yml`,
+            "--monitoring-host=0.0.0.0",
+            "--monitoring-port=8081",
             "--force-clear-db",
           ]
         : [
@@ -79,7 +81,7 @@ export class PrysmValidatorService extends NodeService {
       service.id, //id
       1, // configVersion
       image, //image
-      "v5.1.0", //imageVersion
+      network === "devnet" ? "v5.0.4" : "v5.1.0", //imageVersion
       cmd, //command
       ["/app/cmd/validator/validator"], // entrypoint
       null, // env
diff --git a/launcher/src/composables/validators.js b/launcher/src/composables/validators.js
index c72ade3ed..840ab0d06 100644
--- a/launcher/src/composables/validators.js
+++ b/launcher/src/composables/validators.js
@@ -11,13 +11,13 @@ export async function useListKeys(forceRefresh) {
 
   let keyStats = [];
   let clients = serviceStore.installedServices.filter(
-    (s) => s.category == "validator" && s.service != "CharonService" && s.service != "SSVNetworkService"
+    (s) => s.category == "validator" && s.config.network != "devnet" && s.service != "CharonService" && s.service != "SSVNetworkService"
   );
   if ((clients && clients.length > 0 && nodeManageStore.currentNetwork?.network != "") || forceRefresh) {
     for (let client of clients) {
       //if there is already a list of keys ()
       if ((client.config.keys === undefined || client.config.keys.length === 0 || forceRefresh) && client.state === "running") {
-        //refresh validaotr list
+        //refresh validator list
         let result = await ControlService.listValidators(client.config.serviceID);
 
         if (!client.service.includes("Web3Signer")) {