Skip to content

Commit cdc96df

Browse files
authored
Merge pull request #801 from jshufro/jms/install-prysm
Switch to building prysm containers locally from upstreams
2 parents af427b8 + b72d14f commit cdc96df

8 files changed

Lines changed: 48 additions & 4 deletions

File tree

shared/services/config/external-configs.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,13 @@ type ExternalTekuConfig struct {
118118
DoppelgangerDetection config.Parameter `yaml:"doppelgangerDetection,omitempty"`
119119
}
120120

121+
// Type assertions for all ExternalConsensusConfigs
122+
var _ config.ConsensusConfig = &ExternalLighthouseConfig{}
123+
var _ config.ConsensusConfig = &ExternalLodestarConfig{}
124+
var _ config.ConsensusConfig = &ExternalNimbusConfig{}
125+
var _ config.ConsensusConfig = &ExternalPrysmConfig{}
126+
var _ config.ConsensusConfig = &ExternalTekuConfig{}
127+
121128
// Generates a new ExternalExecutionConfig configuration
122129
func NewExternalExecutionConfig(cfg *RocketPoolConfig) *ExternalExecutionConfig {
123130
return &ExternalExecutionConfig{

shared/services/config/lighthouse-config.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ type LighthouseConfig struct {
3333
P2pQuicPort config.Parameter `yaml:"p2pQuicPort,omitempty"`
3434
}
3535

36+
// Type assertion for LighthouseConfig
37+
var _ config.ConsensusConfig = &LighthouseConfig{}
38+
3639
// Generates a new Lighthouse configuration
3740
func NewLighthouseConfig(cfg *RocketPoolConfig) *LighthouseConfig {
3841
return &LighthouseConfig{

shared/services/config/lodestar-config.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ type LodestarConfig struct {
3030
AdditionalVcFlags config.Parameter `yaml:"additionalVcFlags,omitempty"`
3131
}
3232

33+
// Type assertion for LodestarConfig
34+
var _ config.ConsensusConfig = &LodestarConfig{}
35+
3336
// Generates a new Lodestar configuration
3437
func NewLodestarConfig(cfg *RocketPoolConfig) *LodestarConfig {
3538
return &LodestarConfig{

shared/services/config/nimbus-config.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ type NimbusConfig struct {
4545
AdditionalVcFlags config.Parameter `yaml:"additionalVcFlags,omitempty"`
4646
}
4747

48+
// Type assertion for NimbusConfig
49+
var _ config.ConsensusConfig = &NimbusConfig{}
50+
4851
// Generates a new Nimbus configuration
4952
func NewNimbusConfig(cfg *RocketPoolConfig) *NimbusConfig {
5053
return &NimbusConfig{

shared/services/config/prysm-config.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
)
66

77
const (
8-
prysmBnTest string = "rocketpool/prysm:v6.0.2"
9-
prysmBnProd string = "rocketpool/prysm:v6.0.2"
10-
prysmVcTest string = "rocketpool/prysm:v6.0.2"
11-
prysmVcProd string = "rocketpool/prysm:v6.0.2"
8+
prysmBnTest string = "gcr.io/offchainlabs/prysm/beacon-chain:v6.0.2"
9+
prysmBnProd string = "gcr.io/offchainlabs/prysm/beacon-chain:v6.0.2"
10+
prysmVcTest string = "gcr.io/offchainlabs/prysm/validator:v6.0.2"
11+
prysmVcProd string = "gcr.io/offchainlabs/prysm/validator:v6.0.2"
1212
defaultPrysmRpcPort uint16 = 5053
1313
defaultPrysmOpenRpcPort string = string(config.RPC_Closed)
1414
defaultPrysmMaxPeers uint16 = 70
@@ -46,6 +46,9 @@ type PrysmConfig struct {
4646
AdditionalVcFlags config.Parameter `yaml:"additionalVcFlags,omitempty"`
4747
}
4848

49+
// Type assertion for PrysmConfig
50+
var _ config.ConsensusConfig = &PrysmConfig{}
51+
4952
// Generates a new Prysm configuration
5053
func NewPrysmConfig(cfg *RocketPoolConfig) *PrysmConfig {
5154
rpcPortModes := config.PortModes("Allow connections from external hosts. This is safe if you're running your node on your local network. If you're a VPS user, this would expose your node to the internet and could make it vulnerable to MEV/tips theft")

shared/services/config/teku-config.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ type TekuConfig struct {
4040
AdditionalVcFlags config.Parameter `yaml:"additionalVcFlags,omitempty"`
4141
}
4242

43+
// Type assertion for TekuConfig
44+
var _ config.ConsensusConfig = &TekuConfig{}
45+
4346
// Generates a new Teku configuration
4447
func NewTekuConfig(cfg *RocketPoolConfig) *TekuConfig {
4548
return &TekuConfig{

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,18 @@
77

88
services:
99
eth2:
10+
{{- if eq .ConsensusClient.String "prysm"}}
11+
image: localhost/{{.GetBeaconContainerTag}}
12+
pull_policy: never
13+
build:
14+
dockerfile_inline: |
15+
FROM {{.GetBeaconContainerTag}} as upstream
16+
FROM debian:bookworm-slim
17+
RUN apt update && apt install -y wget ca-certificates && rm -rf /var/lib/apt/lists/*
18+
COPY --from=upstream /app/cmd/beacon-chain/beacon-chain /app/cmd/beacon-chain/beacon-chain
19+
{{- else}}
1020
image: {{.GetBeaconContainerTag}}
21+
{{- end}}
1122
user: root
1223
container_name: {{.Smartnode.ProjectName}}_eth2
1324
restart: unless-stopped

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,18 @@
77

88
services:
99
validator:
10+
{{- if eq .ConsensusClient.String "prysm"}}
11+
image: localhost/{{.GetVCContainerTag}}
12+
pull_policy: never
13+
build:
14+
dockerfile_inline: |
15+
FROM {{.GetVCContainerTag}} as upstream
16+
FROM debian:bookworm-slim
17+
RUN apt update && apt install -y wget ca-certificates && rm -rf /var/lib/apt/lists/*
18+
COPY --from=upstream /app/cmd/validator/validator /app/cmd/validator/validator
19+
{{- else}}
1020
image: {{.GetVCContainerTag}}
21+
{{- end}}
1122
user: root
1223
container_name: {{.Smartnode.ProjectName}}_validator
1324
restart: unless-stopped

0 commit comments

Comments
 (0)