diff --git a/launcher/src/backend/ServiceManager.js b/launcher/src/backend/ServiceManager.js index 5686a8659..dc675ccd0 100755 --- a/launcher/src/backend/ServiceManager.js +++ b/launcher/src/backend/ServiceManager.js @@ -938,18 +938,9 @@ export class ServiceManager { ); case "PrysmValidatorService": - ports = - args.network === "devnet" - ? [] - : [new ServicePort("127.0.0.1", args.port ? args.port : 7500, 7500, servicePortProtocol.tcp)]; - return PrysmValidatorService.buildByUserInput( - args.network, - ports, - args.installDir + "/prysm", - args.consensusClients - ); - + args.network === "devnet" ? [] : [new ServicePort("127.0.0.1", args.port ? args.port : 7500, 7500, servicePortProtocol.tcp)]; + return PrysmValidatorService.buildByUserInput(args.network, ports, args.installDir + "/prysm", args.consensusClients); case "LodestarBeaconService": //LodestarBeaconService diff --git a/launcher/src/backend/ethereum-services/GethService.js b/launcher/src/backend/ethereum-services/GethService.js index 7ef41c1a2..0a58d9ff8 100755 --- a/launcher/src/backend/ethereum-services/GethService.js +++ b/launcher/src/backend/ethereum-services/GethService.js @@ -7,7 +7,6 @@ export class GethService extends NodeService { service.setId(); const workingDir = service.buildWorkingDir(dir); - const JWTDir = network === "devnet" ? "/execution/engine.jwt" : "/engine.jwt"; const dataDir = network === "devnet" ? "/execution" : "/opt/data/geth"; const volumes = @@ -64,7 +63,6 @@ export class GethService extends NodeService { const entrypoint = network === "devnet" ? [] : ["geth"]; - service.init( "GethService", // service service.id, // id diff --git a/launcher/src/backend/ethereum-services/PrysmBeaconService.js b/launcher/src/backend/ethereum-services/PrysmBeaconService.js index 66f4fbe95..daaf5cce0 100755 --- a/launcher/src/backend/ethereum-services/PrysmBeaconService.js +++ b/launcher/src/backend/ethereum-services/PrysmBeaconService.js @@ -23,7 +23,6 @@ export class PrysmBeaconService extends NodeService { ? [new ServiceVolume(workingDir, configYamlDir)] : [new ServiceVolume(workingDir + "/beacon", dataDir), new ServiceVolume(workingDir + "/genesis", genesisDir)]; - //execution endpoint const executionEndpoint = network === "devnet" @@ -156,9 +155,7 @@ export class PrysmBeaconService extends NodeService { } buildPrometheusJob() { - return `\n - job_name: stereum-${this.id}\n static_configs:\n - targets: [${this.buildConsensusClientMetricsEndpoint()}]`; - } getAvailablePorts() { diff --git a/launcher/src/components/UI/edit-page/EditScreen.vue b/launcher/src/components/UI/edit-page/EditScreen.vue index e5ff368d8..98f3b463e 100644 --- a/launcher/src/components/UI/edit-page/EditScreen.vue +++ b/launcher/src/components/UI/edit-page/EditScreen.vue @@ -122,11 +122,7 @@ - + @@ -900,9 +896,7 @@ const deleteSetup = async (item) => { }); const subtasks = item?.services.flatMap((service) => { - const matchedServices = manageStore.newConfiguration.filter( - (e) => e.config?.serviceID === service.config?.serviceID - ); + const matchedServices = manageStore.newConfiguration.filter((e) => e.config?.serviceID === service.config?.serviceID); return matchedServices.map((e) => ({ id: e.config?.serviceID, diff --git a/launcher/src/components/UI/edit-page/components/drawer/SetupsDrawer.vue b/launcher/src/components/UI/edit-page/components/drawer/SetupsDrawer.vue index 1023a3e18..adad3ca62 100644 --- a/launcher/src/components/UI/edit-page/components/drawer/SetupsDrawer.vue +++ b/launcher/src/components/UI/edit-page/components/drawer/SetupsDrawer.vue @@ -20,7 +20,6 @@ Network {{ network?.name }} - @@ -28,10 +27,8 @@
- Custom Network -
{
- {{ - nameMsg - }} + {{ nameMsg }} Setup Name {
- {{ - colorMsg - }} + {{ colorMsg }} Setup color
{ return serviceStore.allServices .filter( (service) => - service.service === "GethService" || - service.service === "PrysmBeaconService" || - service.service === "PrysmValidatorService" + service.service === "GethService" || service.service === "PrysmBeaconService" || service.service === "PrysmValidatorService" ) .sort(sortServices); }); diff --git a/launcher/src/components/UI/edit-page/components/modals/devnet/components/SelectGenesis.vue b/launcher/src/components/UI/edit-page/components/modals/devnet/components/SelectGenesis.vue index a9d8751e9..9b59fc5ab 100644 --- a/launcher/src/components/UI/edit-page/components/modals/devnet/components/SelectGenesis.vue +++ b/launcher/src/components/UI/edit-page/components/modals/devnet/components/SelectGenesis.vue @@ -43,17 +43,12 @@ defineExpose({ confirmSelection });