Skip to content

Commit

Permalink
format check
Browse files Browse the repository at this point in the history
  • Loading branch information
gbayasgalan committed Sep 4, 2024
1 parent 991dd7a commit 7cc45bc
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 48 deletions.
13 changes: 2 additions & 11 deletions launcher/src/backend/ServiceManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions launcher/src/backend/ethereum-services/GethService.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -64,7 +63,6 @@ export class GethService extends NodeService {

const entrypoint = network === "devnet" ? [] : ["geth"];


service.init(
"GethService", // service
service.id, // id
Expand Down
3 changes: 0 additions & 3 deletions launcher/src/backend/ethereum-services/PrysmBeaconService.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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() {
Expand Down
10 changes: 2 additions & 8 deletions launcher/src/components/UI/edit-page/EditScreen.vue
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,7 @@
<SetupInfos v-if="setupStore.selectedSetupInfos" />
<!-- End Setup Infos -->
<!-- Start Devnet Configs Modal -->
<DevnetSetup
v-if="setupStore.isDevnetSetupModalActive"
@close-window="closeDevnetModal"
@confirm-action="validationForm"
/>
<DevnetSetup v-if="setupStore.isDevnetSetupModalActive" @close-window="closeDevnetModal" @confirm-action="validationForm" />
</TransitionGroup>
<LoaderAnime v-if="manageStore.disableConfirmButton || setupStore.isImportAnimeActive" :anime="getAimationSrc" />
</base-layout>
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,15 @@
<img class="col-start-1 col-span-1 w-5 self-center mx-auto" :src="network.icon" alt="Network" />

<span class="col-start-2 col-span-full text-left text-xs font-sans text-gray-200 ml-1">{{ network?.name }} </span>

</div>
</div>
</div>

<div
class="col-start-1 col-span-full row-start-14 row-span-full w-full h-full bg-[#151618] rounded-md flex flex-col justify-between items-center p-1 shadow-sm shadow-black active:shadow-none border border-gray-700"
>

<span class="text-2xs text-center text-gray-100 font-semibold font-sans uppercase mt-1">Custom Network</span>


<div
class="w-full h-8 bg-teal-700 rounded-sm text-center p-1 cursor-pointer hover:bg-teal-900 transition-all duration-100"
@click="createDevnet"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ const getSetupColor = (color) => {
<div class="w-full max-h-full col-start-1 col-span-full row-start-2 row-end-9 flex justify-center items-center">
<form class="w-full h-full rounded p-1 grid grid-cols-5 grid-rows-3 items-center gap-y-1">
<div class="col-start-1 col-span-full row-start-1 row-span-1 grid grid-cols-2 grid-rows-2 items-center">
<span v-if="nameMsg" class="col-start-1 col-span-full row-start-1 row-span-1 text-red-400 text-xs">{{
nameMsg
}}</span>
<span v-if="nameMsg" class="col-start-1 col-span-full row-start-1 row-span-1 text-red-400 text-xs">{{ nameMsg }}</span>
<span v-else class="col-start-1 col-span-full row-start-1 row-span-1 text-gray-300 text-sm">Setup Name</span>
<input
id="setupName"
Expand All @@ -77,9 +75,7 @@ const getSetupColor = (color) => {
</div>

<div class="col-start-1 col-span-full row-start-2 row-span-1 grid grid-cols-10 grid-rows-2 items-center">
<span v-if="colorMsg" class="col-start-1 col-span-full row-start-1 row-span-1 text-red-400 text-xs">{{
colorMsg
}}</span>
<span v-if="colorMsg" class="col-start-1 col-span-full row-start-1 row-span-1 text-red-400 text-xs">{{ colorMsg }}</span>
<span v-else class="col-start-1 col-span-full row-start-1 row-span-1 text-gray-300 text-sm">Setup color</span>
<div
v-for="col in colorPalette"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ const sortedServices = computed(() => {
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);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,12 @@ defineExpose({ confirmSelection });

<template>
<div class="w-3/4 max-h-[300px] grid grid-cols-6 grid-rows-8 py-4 px-8 mt-2 gap-y-1 mx-auto">
<div
class="w-full max-h-full col-start-1 col-span-full row-start-2 row-end-8 flex flex-col justify-between items-center"
>
<div class="w-full max-h-full col-start-1 col-span-full row-start-2 row-end-8 flex flex-col justify-between items-center">
<div class="w-full flex justify-between items-center">
<div
class="bg-[#336666] flex justify-center items-center shadow-md shadow-black p-1 h-12 w-[150px] font-[sans-serif] rounded-md overflow-hidden my-4 mx-auto active:shadow-none"
>
<label
for="uploadFile"
class="text-white text-md px-2 py-2.5 outline-none rounded-md cursor-pointer mx-auto w-max block"
>
<label for="uploadFile" class="text-white text-md px-2 py-2.5 outline-none rounded-md cursor-pointer mx-auto w-max block">
Import Genesis
</label>
<input id="uploadFile" type="file" class="hidden" accept=".json" @change="getGenesisFile" />
Expand All @@ -69,11 +64,9 @@ defineExpose({ confirmSelection });
<div
class="w-full h-9 bg-white text-[#333] flex items-center shadow-md shadow-black p-1 font-[sans-serif] rounded-md overflow-hidden my-4 mx-auto"
>
<span
v-if="setupStore.devnetConfigData.uploadedGenesisConfig"
class="pl-2 text-xs font-semibold overflow-clip"
>{{ setupStore.devnetConfigData.uploadedGenesisConfig.path }}</span
>
<span v-if="setupStore.devnetConfigData.uploadedGenesisConfig" class="pl-2 text-xs font-semibold overflow-clip">{{
setupStore.devnetConfigData.uploadedGenesisConfig.path
}}</span>
<span v-else-if="setupStore.isGenesisCreated">New Genesis will be created</span>
<span v-else-if="errorMessage" class="text-red-500">{{ errorMessage }}</span>
<span v-else> </span>
Expand Down

0 comments on commit 7cc45bc

Please sign in to comment.