FIX: SSV Custom Installation, restart services (#1493)

stereum-dev · Oct 18, 2023 · 76e9bb8 · 76e9bb8
1 parent 4ceb46f
commit 76e9bb8
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 45 deletions.
diff --git a/launcher/public/output.css b/launcher/public/output.css
@@ -515,7 +515,7 @@ video {
   --tw-backdrop-sepia:  ;
 }
 
-::-ms-backdrop{
+::-webkit-backdrop{
   --tw-border-spacing-x: 0;
   --tw-border-spacing-y: 0;
   --tw-translate-x: 0;
@@ -1036,10 +1036,6 @@ video {
   grid-row-end: 7;
 }
 
-.row-end-9{
-  grid-row-end: 9;
-}
-
 .-m-1{
   margin: -0.25rem;
 }
@@ -1350,18 +1346,6 @@ video {
   height: 100vh;
 }
 
-.h-3\/5{
-  height: 60%;
-}
-
-.h-5\/6{
-  height: 83.333333%;
-}
-
-.h-3\/4{
-  height: 75%;
-}
-
 .max-h-60{
   max-height: 15rem;
 }
@@ -1606,10 +1590,6 @@ video {
   width: 100vw;
 }
 
-.w-3\/4{
-  width: 75%;
-}
-
 .min-w-\[100px\]{
   min-width: 100px;
 }
@@ -2582,22 +2562,6 @@ video {
   background-color: rgb(24 24 27 / var(--tw-bg-opacity));
 }
 
-.bg-\[gray-700\]{
-  background-color: gray-700;
-}
-
-.bg-\[\#\]{
-  background-color: #;
-}
-
-.bg-\[\]{
-  background-color: ;
-}
-
-.bg-\[\#33393\]{
-  background-color: #33393;
-}
-
 .bg-gradient-to-b{
   background-image: -webkit-gradient(linear, left top, left bottom, from(var(--tw-gradient-stops)));
   background-image: linear-gradient(to bottom, var(--tw-gradient-stops));

diff --git a/launcher/src/backend/ServiceManager.js b/launcher/src/backend/ServiceManager.js
@@ -211,9 +211,9 @@ export class ServiceManager {
 
   async restartService(client) {
     if (client.state == "running") {
-      await this.manageServiceState(client.serviceID, "stopped");
+      await this.manageServiceState(client.config.serviceID, "stopped");
     }
-    await this.manageServiceState(client.serviceID, "started");
+    await this.manageServiceState(client.config.serviceID, "started");
   }
 
   async resyncService(serviceID, checkpointUrl) {
@@ -1069,8 +1069,8 @@ export class ServiceManager {
           return newServices.find((s) => s.id === id);
         });
       }
-      if (t.data.beaconServices.length > 0) {
-        t.data.beaconServices = t.data.beaconServices.map((cc) => {
+      if (t.data.consensusClients.length > 0) {
+        t.data.consensusClients = t.data.consensusClients.map((cc) => {
           let id = cc.config ? cc.config.serviceID : cc.id;
           if (id) {
             return services.find((s) => s.id === id);

diff --git a/launcher/src/components/UI/edit-page/components/drawer/DrawerFilter.vue b/launcher/src/components/UI/edit-page/components/drawer/DrawerFilter.vue
@@ -75,8 +75,9 @@ serviceStore.filteredServices = computed(() => {
 const getFilterbyNetwork = () => {
   switch (manageStore.configNetwork.network) {
     case "mainnet":
-    case "sepolia":
     case "goerli":
+      return (item) => archFilter(item.service);
+    case "sepolia":
       return (item) => item.service != "SSVNetworkService" && archFilter(item.service);
     case "gnosis":
       return (item) =>

diff --git a/launcher/src/components/UI/node-page/sections/ExpertWindow.vue b/launcher/src/components/UI/node-page/sections/ExpertWindow.vue
@@ -208,6 +208,7 @@ import ControlService from "@/store/ControlService";
 import { mapState, mapWritableState } from "pinia";
 import { useNodeManage } from "@/store/nodeManage";
 import { useNodeStore } from "@/store/theNode";
+import { useRestartService } from "@/composables/services";
 
 export default {
   props: {
@@ -388,7 +389,7 @@ export default {
       await this.writeService();
       el.expertOptionsModal = false;
       this.actionHandler(el);
-      await ControlService.restartService(el.config.serviceID);
+      await useRestartService(el);
     },
   },
 };

diff --git a/launcher/src/composables/services.js b/launcher/src/composables/services.js
@@ -186,7 +186,7 @@ export async function useRestartService(client) {
   client.yaml = await ControlService.getServiceYAML(client.config.serviceID);
   if (!client.yaml.includes("isPruning: true")) {
     client.serviceIsPending = true;
-    await ControlService.restartService(client.config.serviceID);
+    await ControlService.restartService(structuredClone(client));
     client.serviceIsPending = false;
     updateStates();
   }

diff --git a/launcher/src/composables/validators.js b/launcher/src/composables/validators.js
@@ -11,7 +11,7 @@ export async function useListKeys(forceRefresh) {
     const stakingStore = useStakingStore();
 
     let keyStats = [];
-    let clients = serviceStore.installedServices.filter((s) => s.category == "validator");
+    let clients = serviceStore.installedServices.filter((s) => s.category == "validator" && s.service != "CharonService" && s.service != "SSVNetworkService");
     if (clients && clients.length > 0 && nodeManageStore.currentNetwork.network != "") {
         for (let client of clients) {
             //if there is already a list of keys ()