fix: prysm vc key manager ports (#639)

ethpandaops · May 28, 2024 · 81c1ee7 · 81c1ee7
1 parent 3dcf888
commit 81c1ee7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/.github/tests/mix-with-tools-minimal.yaml b/.github/tests/mix-with-tools-minimal.yaml
@@ -3,24 +3,16 @@ participants:
     cl_type: teku
   - el_type: geth
     cl_type: prysm
-    cl_extra_params: [--minimal-config=true]
-    cl_image: ethpandaops/prysm-beacon-chain:develop-minimal
   - el_type: erigon
     cl_type: nimbus
-    cl_image: ethpandaops/nimbus-eth2:unstable-minimal
   - el_type: besu
     cl_type: lighthouse
-    cl_image: ethpandaops/lighthouse:unstable-minimal
   - el_type: reth
     cl_type: lodestar
-    cl_extra_env_vars: { LODESTAR_PRESET: minimal }
-    vc_extra_env_vars: { LODESTAR_PRESET: minimal }
   - el_type: geth
     cl_type: grandine
-    cl_image: ethpandaops/grandine:develop-minimal
 network_params:
   preset: minimal
-  seconds_per_slot: 6
 additional_services:
   - tx_spammer
   - blob_spammer

diff --git a/.github/tests/mix-with-tools.yaml b/.github/tests/mix-with-tools.yaml
@@ -3,7 +3,6 @@ participants:
     cl_type: teku
   - el_type: nethermind
     cl_type: prysm
-    cl_image: ethpandaops/prysm-beacon-chain:webfix
   - el_type: erigon
     cl_type: nimbus
   - el_type: besu

diff --git a/src/vc/prysm.star b/src/vc/prysm.star
@@ -4,6 +4,16 @@ vc_shared = import_module("./shared.star")
 
 PRYSM_PASSWORD_MOUNT_DIRPATH_ON_SERVICE_CONTAINER = "/prysm-password"
 PRYSM_BEACON_RPC_PORT = 4000
+VALIDATOR_GRPC_PORT_NUM = 7500
+VALDIATOR_GRPC_PORT_ID = "grpc"
+
+EXTRA_PORTS = {
+    VALDIATOR_GRPC_PORT_ID: shared_utils.new_port_spec(
+        VALIDATOR_GRPC_PORT_NUM,
+        shared_utils.TCP_PROTOCOL,
+        shared_utils.HTTP_APPLICATION_PROTOCOL,
+    )
+}
 
 
 def get_config(
@@ -57,6 +67,8 @@ def get_config(
         "--rpc",
         "--rpc-port={0}".format(vc_shared.VALIDATOR_HTTP_PORT_NUM),
         "--rpc-host=0.0.0.0",
+        "--grpc-gateway-port={0}".format(VALIDATOR_GRPC_PORT_NUM),
+        "--grpc-gateway-host=0.0.0.0",
         "--keymanager-token-file=" + constants.KEYMANAGER_MOUNT_PATH_ON_CONTAINER,
     ]
 
@@ -85,6 +97,7 @@ def get_config(
         files[constants.KEYMANAGER_MOUNT_PATH_ON_CLIENTS] = keymanager_file
         cmd.extend(keymanager_api_cmd)
         ports.update(vc_shared.VALIDATOR_KEYMANAGER_USED_PORTS)
+        ports.update(EXTRA_PORTS)
 
     return ServiceConfig(
         image=image,