Merge branch 'main' into staking_issues

stereum-dev · Dec 19, 2024 · 867982a · 867982a
2 parents d38e867 + add9967
commit 867982a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/launcher/src/backend/ethereum-services/PrysmBeaconService.js b/launcher/src/backend/ethereum-services/PrysmBeaconService.js
@@ -95,7 +95,6 @@ export class PrysmBeaconService extends NodeService {
       "--accept-terms-of-use=true",
       `--datadir=${dataDir}`,
       "--rpc-host=0.0.0.0",
-      "--http-host=0.0.0.0",
       `--execution-endpoint=${executionEndpoint}`,
       `--jwt-secret=${JWTDir}`,
       "--monitoring-host=0.0.0.0",
@@ -114,6 +113,7 @@ export class PrysmBeaconService extends NodeService {
         "--suggested-fee-recipient=0x0000000000000000000000000000000000000000",
         "--minimum-peers-per-subnet=0",
         "--force-clear-db",
+        "--grpc-gateway-host=0.0.0.0",
       ];
     } else {
       return [
@@ -123,6 +123,7 @@ export class PrysmBeaconService extends NodeService {
         "--p2p-max-peers=100",
         "--p2p-tcp-port=13001",
         "--p2p-udp-port=12001",
+        "--http-host=0.0.0.0",
       ];
     }
   }

diff --git a/launcher/src/backend/ethereum-services/PrysmValidatorService.js b/launcher/src/backend/ethereum-services/PrysmValidatorService.js
@@ -31,8 +31,10 @@ export class PrysmValidatorService extends NodeService {
         if (network === "devnet") {
           const consensusDir = client.volumes.find((vol) => vol.servicePath.includes("/consensus")).destinationPath;
           volumes.push(new ServiceVolume(consensusDir, configYamlDir));
+          return client.buildConsensusClientEndpoint();
+        } else {
+          return client.buildConsensusClientHttpEndpointUrl();
         }
-        return client.buildConsensusClientHttpEndpointUrl();
       })
       .join();
 
@@ -59,13 +61,7 @@ export class PrysmValidatorService extends NodeService {
   }
 
   generatePrysmValidatorCommand(network, dataDir, walletDir, passwordDir, graffitiDir, configYamlDir, provider) {
-    const commonCmd = [
-      "--accept-terms-of-use=true",
-      `--enable-beacon-rest-api`,
-      `--beacon-rest-api-provider=${provider}`,
-      "--monitoring-host=0.0.0.0",
-      "--monitoring-port=8081",
-    ];
+    const commonCmd = ["--accept-terms-of-use=true", "--monitoring-host=0.0.0.0", "--monitoring-port=8081"];
 
     if (network === "devnet") {
       return [
@@ -75,6 +71,7 @@ export class PrysmValidatorService extends NodeService {
         "--interop-start-index=0",
         `--chain-config-file=${configYamlDir}/config.yml`,
         "--force-clear-db",
+        `--beacon-rpc-provider=${provider}`,
       ];
     } else {
       return [
@@ -88,6 +85,8 @@ export class PrysmValidatorService extends NodeService {
         "--http-port=7500",
         "--http-host=0.0.0.0",
         '--http-cors-domain="*"',
+        `--enable-beacon-rest-api`,
+        `--beacon-rest-api-provider=${provider}`,
         "--suggested-fee-recipient=0x0000000000000000000000000000000000000000",
         `--graffiti-file=${graffitiDir}/graffitis.yaml`,
         "--enable-builder=true",

diff --git a/launcher/src/components/UI/edit-page/components/drawer/SetupsDrawer.vue b/launcher/src/components/UI/edit-page/components/drawer/SetupsDrawer.vue
@@ -25,13 +25,12 @@
     </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 border border-gray-700"
+      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"
-        :class="{ 'cursor-not-allowed pointer-events-none opacity-40': isDisabled }"
         @click="createDevnet"
       >
         <span class="text-sm text-gray-200">Setup Devnet</span>
@@ -41,12 +40,12 @@
 </template>
 
 <script setup>
-import { ref } from "vue";
+// import { ref } from "vue";
 import { useNodeManage } from "../../../../../store/nodeManage";
 
 const emit = defineEmits(["getNetwork", "createDevnet"]);
 const manageStore = useNodeManage();
-const isDisabled = ref(true);
+// const isDisabled = ref(true);
 
 const getNetwork = (network) => {
   emit("getNetwork", network);