Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion rocketpool-cli/service/config/review-page.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ func NewReviewPage(md *MainDisplay, oldConfig *config.RocketPoolConfig, newConfi
changedSettings, totalAffectedContainers, changeNetworks = newConfig.GetChanges(oldConfig)

if md.isUpdate {
totalAffectedContainers[cfgtypes.ContainerID_Api] = true
totalAffectedContainers[cfgtypes.ContainerID_Node] = true
totalAffectedContainers[cfgtypes.ContainerID_Watchtower] = true

Expand Down
1 change: 0 additions & 1 deletion rocketpool-cli/service/config/step-finished.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ func processConfigAfterQuit(md *MainDisplay) {
_, totalAffectedContainers, changeNetworks := md.Config.GetChanges(md.PreviousConfig)

if md.isUpdate {
totalAffectedContainers[cfgtypes.ContainerID_Api] = true
totalAffectedContainers[cfgtypes.ContainerID_Node] = true
totalAffectedContainers[cfgtypes.ContainerID_Watchtower] = true
}
Expand Down
2 changes: 1 addition & 1 deletion shared/services/config/consensus-common-config.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func NewConsensusCommonConfig(cfg *RocketPoolConfig) *ConsensusCommonConfig {
Description: "The port your Consensus client should run its HTTP API on.",
Type: config.ParameterType_Uint16,
Default: map[config.Network]interface{}{config.Network_All: defaultBnApiPort},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth2, config.ContainerID_Validator, config.ContainerID_Prometheus},
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth2, config.ContainerID_Validator, config.ContainerID_Prometheus},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand Down
2 changes: 1 addition & 1 deletion shared/services/config/execution-common-config.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func NewExecutionCommonConfig(cfg *RocketPoolConfig) *ExecutionCommonConfig {
Description: "The port your Execution client should use for its HTTP API endpoint (also known as HTTP RPC API endpoint).",
Type: config.ParameterType_Uint16,
Default: map[config.Network]interface{}{config.Network_All: defaultEcHttpPort},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth1, config.ContainerID_Eth2},
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth1, config.ContainerID_Eth2},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand Down
14 changes: 7 additions & 7 deletions shared/services/config/external-configs.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func NewExternalExecutionConfig(cfg *RocketPoolConfig) *ExternalExecutionConfig
Description: "The URL of the HTTP RPC endpoint for your external Execution client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead, for example 'http://192.168.1.100:8545'.",
Type: config.ParameterType_String,
Default: map[config.Network]interface{}{config.Network_All: ""},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Watchtower},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Watchtower},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand All @@ -177,7 +177,7 @@ func NewExternalExecutionConfig(cfg *RocketPoolConfig) *ExternalExecutionConfig
Description: "The URL of the Websocket RPC endpoint for your external Execution client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead, for example 'http://192.168.1.100:8546'.",
Type: config.ParameterType_String,
Default: map[config.Network]interface{}{config.Network_All: ""},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Watchtower},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Watchtower},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand All @@ -195,7 +195,7 @@ func NewExternalLighthouseConfig(cfg *RocketPoolConfig) *ExternalLighthouseConfi
Description: "The URL of the HTTP Beacon API endpoint for your external client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
Type: config.ParameterType_String,
Default: map[config.Network]interface{}{config.Network_All: ""},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Api, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand Down Expand Up @@ -284,7 +284,7 @@ func NewExternalLodestarConfig(cfg *RocketPoolConfig) *ExternalLodestarConfig {
Description: "The URL of the HTTP Beacon API endpoint for your external client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
Type: config.ParameterType_String,
Default: map[config.Network]interface{}{config.Network_All: ""},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Api, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand Down Expand Up @@ -374,7 +374,7 @@ func NewExternalNimbusConfig(cfg *RocketPoolConfig) *ExternalNimbusConfig {
Description: "The URL of the HTTP Beacon API endpoint for your external client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
Type: config.ParameterType_String,
Default: map[config.Network]interface{}{config.Network_All: ""},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Api, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand Down Expand Up @@ -463,7 +463,7 @@ func NewExternalPrysmConfig(cfg *RocketPoolConfig) *ExternalPrysmConfig {
Description: "The URL of the HTTP Beacon API endpoint for your external client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
Type: config.ParameterType_String,
Default: map[config.Network]interface{}{config.Network_All: ""},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Api, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand Down Expand Up @@ -563,7 +563,7 @@ func NewExternalTekuConfig(cfg *RocketPoolConfig) *ExternalTekuConfig {
Description: "The URL of the HTTP Beacon API endpoint for your external client.\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
Type: config.ParameterType_String,
Default: map[config.Network]interface{}{config.Network_All: ""},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Api, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Validator, config.ContainerID_Watchtower, config.ContainerID_Node},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand Down
8 changes: 4 additions & 4 deletions shared/services/config/fallback-configs.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func NewFallbackNormalConfig(cfg *RocketPoolConfig) *FallbackNormalConfig {
Description: "The URL of the HTTP API endpoint for your fallback Execution client.\n\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
Type: config.ParameterType_String,
Default: map[config.Network]interface{}{config.Network_All: ""},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower},
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand All @@ -51,7 +51,7 @@ func NewFallbackNormalConfig(cfg *RocketPoolConfig) *FallbackNormalConfig {
Description: "The URL of the HTTP Beacon API endpoint for your fallback Consensus client.\n\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
Type: config.ParameterType_String,
Default: map[config.Network]interface{}{config.Network_All: ""},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Validator, config.ContainerID_Watchtower},
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Validator, config.ContainerID_Watchtower},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand All @@ -69,7 +69,7 @@ func NewFallbackPrysmConfig(cfg *RocketPoolConfig) *FallbackPrysmConfig {
Description: "The URL of the HTTP API endpoint for your fallback Execution client.\n\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
Type: config.ParameterType_String,
Default: map[config.Network]interface{}{config.Network_All: ""},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower},
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand All @@ -80,7 +80,7 @@ func NewFallbackPrysmConfig(cfg *RocketPoolConfig) *FallbackPrysmConfig {
Description: "The URL of the HTTP Beacon API endpoint for your fallback Prysm client.\n\nNOTE: If you are running it on the same machine as the Smart Node, addresses like `localhost` and `127.0.0.1` will not work due to Docker limitations. Enter your machine's LAN IP address instead.",
Type: config.ParameterType_String,
Default: map[config.Network]interface{}{config.Network_All: ""},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Validator, config.ContainerID_Watchtower},
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Validator, config.ContainerID_Watchtower},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand Down
15 changes: 7 additions & 8 deletions shared/services/config/rocket-pool-config.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
const (
rootConfigName string = "root"

ApiContainerName string = "api"
Eth1ContainerName string = "eth1"
Eth1FallbackContainerName string = "eth1-fallback"
Eth2ContainerName string = "eth2"
Expand Down Expand Up @@ -223,7 +222,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
Description: "Choose which mode to use for your Execution client - locally managed (Docker Mode), or externally managed (Hybrid Mode).",
Type: config.ParameterType_Choice,
Default: map[config.Network]interface{}{},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Eth1, config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Watchtower},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth1, config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Watchtower},
CanBeBlank: false,
OverwriteOnUpgrade: false,
Options: clientModes,
Expand Down Expand Up @@ -263,7 +262,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
Description: "Enable this if you would like to specify a fallback Execution and Consensus Client, which will temporarily be used by the Smart Node and your Validator Client if your primary Execution / Consensus client pair ever go offline (e.g. if you switch, prune, or resync your clients).",
Type: config.ParameterType_Bool,
Default: map[config.Network]interface{}{config.Network_All: false},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Validator, config.ContainerID_Node, config.ContainerID_Watchtower},
AffectsContainers: []config.ContainerID{config.ContainerID_Validator, config.ContainerID_Node, config.ContainerID_Watchtower},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand All @@ -274,7 +273,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
Description: "The delay to wait after your primary Execution or Consensus clients fail before trying to reconnect to them. An example format is \"10h20m30s\" - this would make it 10 hours, 20 minutes, and 30 seconds.",
Type: config.ParameterType_String,
Default: map[config.Network]interface{}{config.Network_All: "60s"},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower},
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand All @@ -285,7 +284,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
Description: "Choose which mode to use for your Consensus client - locally managed (Docker Mode), or externally managed (Hybrid Mode).",
Type: config.ParameterType_Choice,
Default: map[config.Network]interface{}{config.Network_All: config.Mode_Local},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Prometheus, config.ContainerID_Validator, config.ContainerID_Watchtower},
AffectsContainers: []config.ContainerID{config.ContainerID_Eth2, config.ContainerID_Node, config.ContainerID_Prometheus, config.ContainerID_Validator, config.ContainerID_Watchtower},
CanBeBlank: false,
OverwriteOnUpgrade: false,
Options: clientModes,
Expand All @@ -297,7 +296,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
Description: "Select which Consensus client you would like to use.",
Type: config.ParameterType_Choice,
Default: map[config.Network]interface{}{config.Network_All: config.ConsensusClient_Nimbus},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth2, config.ContainerID_Validator},
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth2, config.ContainerID_Validator},
CanBeBlank: false,
OverwriteOnUpgrade: false,
Options: []config.ParameterOption{{
Expand Down Expand Up @@ -329,7 +328,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
Description: "Select which Consensus client your externally managed client is.",
Type: config.ParameterType_Choice,
Default: map[config.Network]interface{}{config.Network_All: config.ConsensusClient_Lighthouse},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth2, config.ContainerID_Validator},
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth2, config.ContainerID_Validator},
CanBeBlank: false,
OverwriteOnUpgrade: false,
Options: []config.ParameterOption{{
Expand Down Expand Up @@ -361,7 +360,7 @@ func NewRocketPoolConfig(rpDir string, isNativeMode bool) *RocketPoolConfig {
Description: "Enables dual-stack (IPv4 + IPv6) networking for the Smart Node. When enabled, your Ethereum clients will listen on both IPv4 and IPv6 and can peer with IPv6 nodes in addition to IPv4. Enable this if your machine has only an IPv6 address, or if you want your node to participate in IPv6 peering.",
Type: config.ParameterType_Bool,
Default: map[config.Network]interface{}{config.Network_All: false},
AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth1, config.ContainerID_Eth2, config.ContainerID_Validator, config.ContainerID_Grafana, config.ContainerID_Prometheus, config.ContainerID_Alertmanager, config.ContainerID_Exporter, config.ContainerID_MevBoost, config.ContainerID_CommitBoost},
AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth1, config.ContainerID_Eth2, config.ContainerID_Validator, config.ContainerID_Grafana, config.ContainerID_Prometheus, config.ContainerID_Alertmanager, config.ContainerID_Exporter, config.ContainerID_MevBoost, config.ContainerID_CommitBoost},
CanBeBlank: false,
OverwriteOnUpgrade: false,
},
Expand Down
Loading
Loading