diff --git a/rocketpool-cli/service/config/review-page.go b/rocketpool-cli/service/config/review-page.go index e6bb2bcdf..222999e63 100644 --- a/rocketpool-cli/service/config/review-page.go +++ b/rocketpool-cli/service/config/review-page.go @@ -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 diff --git a/rocketpool-cli/service/config/step-finished.go b/rocketpool-cli/service/config/step-finished.go index 550eaac12..68e793ef7 100644 --- a/rocketpool-cli/service/config/step-finished.go +++ b/rocketpool-cli/service/config/step-finished.go @@ -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 } diff --git a/shared/services/config/consensus-common-config.go b/shared/services/config/consensus-common-config.go index e4368847a..46bde4bee 100644 --- a/shared/services/config/consensus-common-config.go +++ b/shared/services/config/consensus-common-config.go @@ -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, }, diff --git a/shared/services/config/execution-common-config.go b/shared/services/config/execution-common-config.go index b78a54af1..31a70a145 100644 --- a/shared/services/config/execution-common-config.go +++ b/shared/services/config/execution-common-config.go @@ -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, }, diff --git a/shared/services/config/external-configs.go b/shared/services/config/external-configs.go index 19e6ea00d..613539b8a 100644 --- a/shared/services/config/external-configs.go +++ b/shared/services/config/external-configs.go @@ -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, }, @@ -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, }, @@ -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, }, @@ -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, }, @@ -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, }, @@ -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, }, @@ -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, }, diff --git a/shared/services/config/fallback-configs.go b/shared/services/config/fallback-configs.go index b3388a587..fc3f8a47c 100644 --- a/shared/services/config/fallback-configs.go +++ b/shared/services/config/fallback-configs.go @@ -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, }, @@ -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, }, @@ -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, }, @@ -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, }, diff --git a/shared/services/config/rocket-pool-config.go b/shared/services/config/rocket-pool-config.go index 5d63252d4..484328964 100644 --- a/shared/services/config/rocket-pool-config.go +++ b/shared/services/config/rocket-pool-config.go @@ -29,7 +29,6 @@ import ( const ( rootConfigName string = "root" - ApiContainerName string = "api" Eth1ContainerName string = "eth1" Eth1FallbackContainerName string = "eth1-fallback" Eth2ContainerName string = "eth2" @@ -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, @@ -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, }, @@ -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, }, @@ -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, @@ -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{{ @@ -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{{ @@ -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, }, diff --git a/shared/services/config/smartnode-config.go b/shared/services/config/smartnode-config.go index 65b35a4ed..57266be5c 100644 --- a/shared/services/config/smartnode-config.go +++ b/shared/services/config/smartnode-config.go @@ -235,7 +235,7 @@ func NewSmartnodeConfig(cfg *RocketPoolConfig) *SmartnodeConfig { Description: "This is the prefix that will be attached to all of the Docker containers managed by the Smart Node.", Type: config.ParameterType_String, Default: map[config.Network]interface{}{config.Network_All: defaultProjectName}, - 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_Exporter}, + 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_Exporter}, CanBeBlank: false, OverwriteOnUpgrade: false, }, @@ -246,7 +246,7 @@ func NewSmartnodeConfig(cfg *RocketPoolConfig) *SmartnodeConfig { Description: "The absolute path of the `data` folder that contains your node wallet's encrypted file, the password for your node wallet, and all of the validator keys for your minipools. You may use environment variables in this string.", Type: config.ParameterType_String, Default: map[config.Network]interface{}{config.Network_All: getDefaultDataDir(cfg)}, - AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Validator}, + AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Validator}, CanBeBlank: false, OverwriteOnUpgrade: false, }, @@ -268,7 +268,7 @@ func NewSmartnodeConfig(cfg *RocketPoolConfig) *SmartnodeConfig { Description: "The Ethereum network you want to use - select Hoodi Testnet to practice with fake ETH, or Mainnet to stake on the real network using real ETH.", Type: config.ParameterType_Choice, Default: map[config.Network]interface{}{config.Network_All: config.Network_Mainnet}, - AffectsContainers: []config.ContainerID{config.ContainerID_Api, config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth1, config.ContainerID_Eth2, config.ContainerID_Validator}, + AffectsContainers: []config.ContainerID{config.ContainerID_Node, config.ContainerID_Watchtower, config.ContainerID_Eth1, config.ContainerID_Eth2, config.ContainerID_Validator}, CanBeBlank: false, OverwriteOnUpgrade: false, Options: getNetworkOptions(), diff --git a/shared/types/config/types.go b/shared/types/config/types.go index 32aef0e66..7e10970b1 100644 --- a/shared/types/config/types.go +++ b/shared/types/config/types.go @@ -16,7 +16,6 @@ type PBSubmissionRef int // ones to restart upon a settings change const ( ContainerID_Unknown ContainerID = "" - ContainerID_Api ContainerID = "api" ContainerID_Node ContainerID = "node" ContainerID_Watchtower ContainerID = "watchtower" ContainerID_Eth1 ContainerID = "eth1"