Merge pull request #981 from rocket-pool/remove-keymanager-open-port

Remove OpenKeymanagerApiPort

Author: 0xfornax

shared/services/config/consensus-common-config.go

@@ -11,7 +11,6 @@ const P2pPortID string = "p2pPort"
 const P2pQuicPortID string = "p2pQuicPort"
 const ApiPortID string = "apiPort"
 const KeymanagerApiPortID string = "keymanagerApiPort"
-const OpenKeymanagerApiPortID string = "openKeymanagerApiPort"
 const OpenApiPortID string = "openApiPort"
 const DoppelgangerDetectionID string = "doppelgangerDetection"
 
@@ -22,7 +21,6 @@ const defaultP2pPort uint16 = 9001
 const defaultP2pQuicPort uint16 = 8001
 const defaultBnApiPort uint16 = 5052
 const defaultKeymanagerApiPort uint16 = 5062
-const defaultOpenKeyManagerApiPort string = string(config.RPC_OpenLocalhost)
 const defaultOpenBnApiPort string = string(config.RPC_Closed)
 const defaultDoppelgangerDetection bool = true
 
@@ -51,9 +49,6 @@ type ConsensusCommonConfig struct {
 	// The port to expose the Keymanager API on
 	KeymanagerApiPort config.Parameter `yaml:"keymanagerApiPort,omitempty"`
 
-	// Toggle for forwarding the Keymanager API port outside of Docker
-	OpenKeymanagerApiPort config.Parameter `yaml:"openKeymanagerApiPort,omitempty"`
-
 	// Toggle for enabling doppelganger detection
 	DoppelgangerDetection config.Parameter `yaml:"doppelgangerDetection,omitempty"`
 }
@@ -145,17 +140,6 @@ func NewConsensusCommonConfig(cfg *RocketPoolConfig) *ConsensusCommonConfig {
 			CanBeBlank:         false,
 			OverwriteOnUpgrade: false,
 		},
-		OpenKeymanagerApiPort: config.Parameter{
-			ID:                 OpenKeymanagerApiPortID,
-			Name:               "Expose Keymanager API Port",
-			Description:        "Select an option to expose your Keymanager API port to your localhost or external hosts on the network, so other machines can access it too.",
-			Type:               config.ParameterType_Choice,
-			Default:            map[config.Network]interface{}{config.Network_All: defaultOpenKeyManagerApiPort},
-			AffectsContainers:  []config.ContainerID{config.ContainerID_Validator},
-			CanBeBlank:         false,
-			OverwriteOnUpgrade: false,
-			Options:            portModes,
-		},
 
 		DoppelgangerDetection: config.Parameter{
 			ID:                 DoppelgangerDetectionID,
@@ -180,7 +164,6 @@ func (cfg *ConsensusCommonConfig) GetParameters() []*config.Parameter {
 		&cfg.ApiPort,
 		&cfg.OpenApiPort,
 		&cfg.KeymanagerApiPort,
-		&cfg.OpenKeymanagerApiPort,
 		&cfg.DoppelgangerDetection,
 	}
 }

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

@@ -1306,16 +1306,6 @@ func (cfg *RocketPoolConfig) GetBnOpenPorts() []string {
 	return bnOpenPorts
 }
 
-func (cfg *RocketPoolConfig) GetKeymanagerApiOpenPort() []string {
-	keymanagerApiPortMode := cfg.ConsensusCommon.OpenKeymanagerApiPort.Value.(config.RPCMode)
-	keyManagerOpenPorts := make([]string, 0)
-	if keymanagerApiPortMode.Open() {
-		keyManagerOpenPorts = append(keyManagerOpenPorts, keymanagerApiPortMode.DockerPortMapping(cfg.ConsensusCommon.KeymanagerApiPort.Value.(uint16)))
-
-	}
-	return keyManagerOpenPorts
-}
-
 // Used by text/template to format eth2.yml
 func (cfg *RocketPoolConfig) GetEcHttpEndpoint() string {
 	if cfg.ExecutionClientLocal() {

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

@@ -57,12 +57,6 @@ fi
 # Lighthouse startup
 if [ "$CC_CLIENT" = "lighthouse" ]; then
 
-    if [ "$NETWORK" != "devnet" ]; then
-        CMD_LH_NETWORK="--network $LH_NETWORK"
-    else
-        CMD_LH_NETWORK="--testnet-dir /devnet"
-    fi
-
     CMD="$PERF_PREFIX /usr/local/bin/lighthouse beacon \
         --network $LH_NETWORK \
         --port $BN_P2P_PORT \
@@ -112,20 +106,6 @@ fi
 # Lodestar startup
 if [ "$CC_CLIENT" = "lodestar" ]; then
 
-    if [ "$NETWORK" != "devnet" ]; then
-        CMD_NETWORK="--network $LODESTAR_NETWORK"
-    else
-        CMD_NETWORK="--paramsFile /devnet/config.yaml \
-        --genesisStateFile /devnet/genesis.ssz \
-        --eth1.depositContractDeployBlock 0 \
-        --network.connectToDiscv5Bootnodes=true \
-        --discv5=true \
-        --eth1=true \
-        --enr.ip $EXTERNAL_IP \
-        --enr.udp $BN_P2P_PORT \
-        --bootnodes $BOOTNODE_ENR_LIST"
-    fi
-
     CMD="$PERF_PREFIX /usr/local/bin/node --max-http-header-size=65536 /usr/app/packages/cli/bin/lodestar beacon \
         --network $LODESTAR_NETWORK \
         --dataDir /ethclient/lodestar \
@@ -188,14 +168,7 @@ if [ "$CC_CLIENT" = "nimbus" ]; then
             echo "Checkpoint sync complete!"
         fi
     fi
-
-    if [ "$NETWORK" != "devnet" ]; then
-        CMD_NETWORK="--network $NIMBUS_NETWORK"
-    else
-        CMD_NETWORK="--network=/devnet/ \
-        --direct-peer=$BOOTNODE_ENR_LIST"
-    fi
-
+    
     CMD="$PERF_PREFIX /home/user/nimbus-eth2/build/nimbus_beacon_node \
         --non-interactive \
         --enr-auto-update \
@@ -241,15 +214,6 @@ fi
 # Prysm startup
 if [ "$CC_CLIENT" = "prysm" ]; then
 
-    if [ "$NETWORK" != "devnet" ]; then
-        CMD_NETWORK="$PRYSM_NETWORK"
-    else
-        CMD_NETWORK="--config-file=/devnet/config.yaml \
-        --chain-config-file=/devnet/config.yaml \
-        --p2p-static-id=true \
-        --contract-deployment-block=0 \
-        --bootstrap-node=/devnet/bootstrap_nodes.yaml"
-    fi
 
     CMD="$PERF_PREFIX /app/cmd/beacon-chain/beacon-chain \
         --accept-terms-of-use \

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

@@ -19,12 +19,6 @@ services:
       - {{.RocketPoolDirectory}}/devnet:/devnet:ro
     networks:
       - net
-    {{- if gt (len .GetKeymanagerApiOpenPort) 0 }}
-    ports:
-      {{- range $entry := .GetKeymanagerApiOpenPort}}
-      - "{{$entry}}"
-      {{- end}}
-    {{- end}}
     environment:
       - NETWORK={{.Smartnode.Network}}
       - EC_CLIENT={{if .ExecutionClientLocal}}{{.ExecutionClient}}{{else}}X{{end}}
@@ -42,7 +36,6 @@ services:
       - DOPPELGANGER_DETECTION={{.IsDoppelgangerEnabled}}
       - VC_ADDITIONAL_FLAGS={{.VcAdditionalFlags}}
       - VC_KEYMANAGER_API_PORT={{.ConsensusCommon.KeymanagerApiPort}}
-      - VC_OPEN_KEYMANAGER_API_PORT={{.ConsensusCommon.OpenKeymanagerApiPort}}
       - FEE_RECIPIENT_FILE={{.FeeRecipientFile}}
       - ENABLE_BITFLY_NODE_METRICS={{.EnableBitflyNodeMetrics}}
       - BITFLY_NODE_METRICS_SECRET={{.BitflyNodeMetrics.Secret}}