Use prysm containers directly

Author: jshufro

shared/services/config/rocket-pool-config.go

@@ -925,6 +925,14 @@ func (cfg *RocketPoolConfig) ConsensusClientApiUrl() (string, error) {
 	return cCfg.(config.ExternalConsensusConfig).GetApiUrl(), nil
 }
 
+func stripScheme(url string) string {
+	idx := strings.Index(url, "://")
+	if idx != -1 {
+		url = url[idx+3:]
+	}
+	return url
+}
+
 // Used by text/template to format validator.yml
 func (cfg *RocketPoolConfig) ConsensusClientRpcUrl() (string, error) {
 	// Check if Rescue Node is in-use
@@ -947,8 +955,8 @@ func (cfg *RocketPoolConfig) ConsensusClientRpcUrl() (string, error) {
 		return fmt.Sprintf("%s:%d", Eth2ContainerName, cfg.Prysm.RpcPort.Value), nil
 	}
 
-	// Use the external RPC endpoint
-	return cfg.ExternalPrysm.JsonRpcUrl.Value.(string), nil
+	// Use the external RPC endpoint, but strip any scheme
+	return stripScheme(cfg.ExternalPrysm.JsonRpcUrl.Value.(string)), nil
 }
 
 // Used by text/template to format validator.yml
@@ -976,7 +984,7 @@ func (cfg *RocketPoolConfig) FallbackCcRpcUrl() string {
 		return ""
 	}
 
-	return cfg.FallbackPrysm.JsonRpcUrl.Value.(string)
+	return stripScheme(cfg.FallbackPrysm.JsonRpcUrl.Value.(string))
 }
 
 // Used by text/template to format validator.yml

shared/services/rocketpool/assets/install/scripts/start-vc.sh

@@ -168,12 +168,6 @@ if [ "$CC_CLIENT" = "prysm" ]; then
     # Make the Prysm dir
     mkdir -p /validators/prysm-non-hd/
 
-    # Get rid of the protocol prefix
-    CC_RPC_ENDPOINT=$(echo $CC_RPC_ENDPOINT | sed -E 's/.*\:\/\/(.*)/\1/')
-    if [ ! -z "$FALLBACK_CC_RPC_ENDPOINT" ]; then
-        FALLBACK_CC_RPC_ENDPOINT=$(echo $FALLBACK_CC_RPC_ENDPOINT | sed -E 's/.*\:\/\/(.*)/\1/')
-    fi
-
     # Set up the CC + fallback string
     CC_URL_STRING=$CC_RPC_ENDPOINT
     if [ ! -z "$FALLBACK_CC_RPC_ENDPOINT" ]; then

shared/services/rocketpool/assets/install/templates/eth2.tmpl

@@ -7,18 +7,7 @@
 
 services:
   eth2:
-    {{- if eq .ConsensusClient.String "prysm"}}
-    image: localhost/{{.GetBeaconContainerTag}}
-    pull_policy: never
-    build:
-      dockerfile_inline: |
-        FROM {{.GetBeaconContainerTag}} as upstream
-        FROM debian:bookworm-slim
-        RUN apt update && apt install -y wget ca-certificates && rm -rf /var/lib/apt/lists/*
-        COPY --from=upstream /app/cmd/beacon-chain/beacon-chain /app/cmd/beacon-chain/beacon-chain
-    {{- else}}
     image: {{.GetBeaconContainerTag}}
-    {{- end}}
     user: root
     container_name: {{.Smartnode.ProjectName}}_eth2
     restart: unless-stopped
@@ -83,7 +72,11 @@ services:
       {{- else if eq .ConsensusClient.String "lighthouse"}}
       - BN_P2P_QUIC_PORT={{.Lighthouse.P2pQuicPort}}
       {{- end}}
+    {{- if eq .ConsensusClient.String "prysm"}}
+    entrypoint: bash
+    {{- else}}
     entrypoint: sh
+    {{- end}}
     command: "/setup/start-bn.sh"
     cap_drop:
       - all

shared/services/rocketpool/assets/install/templates/validator.tmpl

@@ -7,18 +7,7 @@
 
 services:
   validator:
-    {{- if eq .ConsensusClient.String "prysm"}}
-    image: localhost/{{.GetVCContainerTag}}
-    pull_policy: never
-    build:
-      dockerfile_inline: |
-        FROM {{.GetVCContainerTag}} as upstream
-        FROM debian:bookworm-slim
-        RUN apt update && apt install -y wget ca-certificates && rm -rf /var/lib/apt/lists/*
-        COPY --from=upstream /app/cmd/validator/validator /app/cmd/validator/validator
-    {{- else}}
     image: {{.GetVCContainerTag}}
-    {{- end}}
     user: root
     container_name: {{.Smartnode.ProjectName}}_validator
     restart: unless-stopped
@@ -56,7 +45,11 @@ services:
       {{- if eq .ConsensusClient.String "teku"}}
       - TEKU_USE_SLASHING_PROTECTION={{.Teku.UseSlashingProtection}}
       {{- end}}
+    {{- if eq .ConsensusClient.String "prysm"}}
+    entrypoint: bash
+    {{- else}}
     entrypoint: sh
+    {{- end}}
     command: "/setup/start-vc.sh"
     cap_drop:
       - all