Add ipv6 port binding

Author: 0xfornax

rocketpool-cli/service/config/settings-native-smartnode.go

@@ -23,7 +23,7 @@ func NewNativeSmartnodeConfigPage(home *settingsNativeHome) *NativeSmartnodeConf
 	configPage.page = newPage(
 		home.homePage,
 		"settings-native-smartnode",
-		"Smartnode and TX Fees",
+		"Smart Node and TX Fees",
 		"Select this to configure the settings for the Smart Node itself, including the defaults and limits on transaction fees.",
 		configPage.layout.grid,
 	)
@@ -43,7 +43,8 @@ func (configPage *NativeSmartnodeConfigPage) createContent() {
 	layout.setupEscapeReturnHomeHandler(configPage.home.md, configPage.home.homePage)
 
 	// Set up the form items
-	formItems := createParameterizedFormItems(masterConfig.Smartnode.GetParameters(), layout.descriptionBox)
+	params := append(masterConfig.Smartnode.GetParameters(), &masterConfig.EnableIPv6, &masterConfig.Alertmanager.ShowAlertsOnCLI)
+	formItems := createParameterizedFormItems(params, layout.descriptionBox)
 	for _, formItem := range formItems {
 		if formItem.parameter.ID == config.ProjectNameID {
 			// Ignore the project name ID since it doesn't apply to native mode

rocketpool-cli/service/config/settings-smartnode.go

@@ -24,7 +24,7 @@ func NewSmartnodeConfigPage(home *settingsHome) *SmartnodeConfigPage {
 	configPage.page = newPage(
 		home.homePage,
 		"settings-smartnode",
-		"Smartnode and TX Fees",
+		"Smart Node and TX Fees",
 		"Select this to configure the settings for the Smart Node itself, including the defaults and limits on transaction fees.",
 		configPage.layout.grid,
 	)
@@ -67,7 +67,8 @@ func (configPage *SmartnodeConfigPage) createContent() {
 	})
 
 	// Set up the form items
-	formItems := createParameterizedFormItems(masterConfig.Smartnode.GetParameters(), layout.descriptionBox)
+	params := append(masterConfig.Smartnode.GetParameters(), &masterConfig.EnableIPv6, &masterConfig.Alertmanager.ShowAlertsOnCLI)
+	formItems := createParameterizedFormItems(params, layout.descriptionBox)
 	for _, formItem := range formItems {
 		layout.form.AddFormItem(formItem.item)
 		layout.parameters[formItem.item] = formItem

rocketpool/node/check-port-connectivity.go

@@ -25,11 +25,11 @@ var publicIPResolvers = []struct {
 	addr     string // host:port (IP literal)
 	hostname string // special hostname that returns the caller's public IP
 }{
-	{"208.67.222.222:53", "myip.opendns.com"},             // OpenDNS primary (IPv4)
-	{"208.67.220.220:53", "myip.opendns.com"},             // OpenDNS secondary (IPv4)
-	{"216.239.32.10:53", "o-o.myaddr.l.google.com"},       // Google ns1 (IPv4)
-	{"[2620:119:35::35]:53", "myip.opendns.com"},          // OpenDNS primary (IPv6)
-	{"[2620:119:53::53]:53", "myip.opendns.com"},          // OpenDNS secondary (IPv6)
+	{"208.67.222.222:53", "myip.opendns.com"},                // OpenDNS primary (IPv4)
+	{"208.67.220.220:53", "myip.opendns.com"},                // OpenDNS secondary (IPv4)
+	{"216.239.32.10:53", "o-o.myaddr.l.google.com"},          // Google ns1 (IPv4)
+	{"[2620:119:35::35]:53", "myip.opendns.com"},             // OpenDNS primary (IPv6)
+	{"[2620:119:53::53]:53", "myip.opendns.com"},             // OpenDNS secondary (IPv6)
 	{"[2001:4860:4860::8888]:53", "o-o.myaddr.l.google.com"}, // Google ns1 (IPv6)
 }
 

shared/services/config/teku-config.go

@@ -6,9 +6,9 @@ import (
 )
 
 const (
-	tekuTagTest           string = "consensys/teku:26.2.0"
-	tekuTagProd           string = "consensys/teku:26.2.0"
-	defaultTekuMaxPeers   uint16 = 100
+	tekuTagTest            string = "consensys/teku:26.2.0"
+	tekuTagProd            string = "consensys/teku:26.2.0"
+	defaultTekuMaxPeers    uint16 = 100
 	defaultTekuP2pIpv6Port uint16 = 9090
 )
 

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

@@ -31,10 +31,20 @@ services:
     ports:
       - "{{$p2p}}:{{$p2p}}/udp"
       - "{{$p2p}}:{{$p2p}}/tcp"
+      {{- if .IsIPv6Enabled}}
+      - "[::]:{{$p2p}}:{{$p2p}}/udp"
+      - "[::]:{{$p2p}}:{{$p2p}}/tcp"
+      {{- end}}
       {{- if eq .ConsensusClient.String "lighthouse"}}
       - "{{.Lighthouse.P2pQuicPort}}:{{.Lighthouse.P2pQuicPort}}/udp"
+      {{- if .IsIPv6Enabled}}
+      - "[::]:{{.Lighthouse.P2pQuicPort}}:{{.Lighthouse.P2pQuicPort}}/udp"
+      {{- end}}
       {{- else if eq .ConsensusClient.String "prysm"}}
       - "{{.Prysm.P2pQuicPort}}:{{.Prysm.P2pQuicPort}}/udp"
+      {{- if .IsIPv6Enabled}}
+      - "[::]:{{.Prysm.P2pQuicPort}}:{{.Prysm.P2pQuicPort}}/udp"
+      {{- end}}
       {{- end}}
       {{- if and (eq .ConsensusClient.String "teku") .IsIPv6Enabled}}
       - "{{.Teku.P2pIpv6Port}}:{{.Teku.P2pIpv6Port}}/udp"