Merge pull request #477 from rocket-pool/dev_v2

Rolled the Watchtower into the Node

Author: jclapis

install/deploy/override/watchtower.yml

@@ -229,6 +229,10 @@ if [ "$CLIENT" = "teku" ]; then
         --validators-proposer-default-fee-recipient=$(cat $VALIDATORS_DIR/$FEE_RECIPIENT_FILE) \
         $VC_ADDITIONAL_FLAGS"
 
+    if [ "$TEKU_SHUT_DOWN_WHEN_SLASHED" = "true" ]; then
+        CMD="$CMD --shut-down-when-validator-slashed-enabled=true"
+    fi
+
     if [ "$DOPPELGANGER_DETECTION" = "true" ]; then
         CMD="$CMD --doppelganger-detection-enabled"
     fi

install/deploy/scripts/start-vc.sh

@@ -17,7 +17,6 @@ services:
     command:
       - --user-dir
       - "{{.RocketPoolDirectory}}"
-      - "node"
     networks:
       - net
     cap_drop:

install/deploy/templates/node.tmpl

@@ -37,12 +37,6 @@ scrape_configs:
     static_configs:
       - targets: ['{{.DaemonContainerName}}:{{or .Metrics.DaemonMetricsPort.Value "9102"}}']
 
-  - job_name: 'watchtower'
-    scrape_interval: 5m
-    scrape_timeout: 5m
-    static_configs:
-      - targets: ['{{.WatchtowerContainerName}}:{{or .Metrics.WatchtowerMetricsPort.Value "9104"}}']
-
   - job_name: 'custom_jobs' # Mandatory field, but will be ignored.
     file_sd_configs:
       - files:

install/deploy/templates/prometheus-cfg.tmpl

@@ -40,6 +40,10 @@ services:
       - ENABLE_MEV_BOOST={{.MevBoost.Enable}}
       - VALIDATORS_DIR={{.GetValidatorsFolderPath}}
       - GWW_GRAFFITI_FILE={{.GetGwwGraffitiFilePath}}
+      {{- /* Client-specific values */}}
+      {{- if eq .LocalBeaconClient.BeaconNode.String "teku"}}
+      - TEKU_SHUT_DOWN_WHEN_SLASHED={{.ValidatorClient.Teku.UseSlashingProtection}}
+      {{- end}}
     entrypoint: sh
     command: "/usr/share/rocketpool/scripts/{{.GetVcStartScript}}"
     cap_drop:

install/deploy/templates/validator.tmpl

@@ -369,4 +369,3 @@ install() {
 }
 
 install "$@"
-

install/deploy/templates/watchtower.tmpl

@@ -3,7 +3,6 @@ package client
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/rocket-pool/node-manager-core/api/client"
 	"github.com/rocket-pool/node-manager-core/api/types"
 	"github.com/rocket-pool/smartnode/shared/types/api"
@@ -87,21 +86,3 @@ func (r *NetworkRequester) Stats() (*types.ApiResponse[api.NetworkStatsData], er
 func (r *NetworkRequester) TimezoneMap() (*types.ApiResponse[api.NetworkTimezonesData], error) {
 	return client.SendGetRequest[api.NetworkTimezonesData](r, "timezone-map", "TimezoneMap", nil)
 }
-
-// Initialize voting so the node can vote on Protocol DAO proposals
-func (r *NetworkRequester) InitializeVoting() (*types.ApiResponse[api.NetworkInitializeVotingData], error) {
-	return client.SendGetRequest[api.NetworkInitializeVotingData](r, "initialize-voting", "InitializeVoting", nil)
-}
-
-// Set the delegate for voting on Protocol DAO proposals
-func (r *NetworkRequester) SetVotingDelegate(delegate common.Address) (*types.ApiResponse[types.TxInfoData], error) {
-	args := map[string]string{
-		"delegate": delegate.Hex(),
-	}
-	return client.SendGetRequest[types.TxInfoData](r, "voting-delegate/set", "SetVotingDelegate", args)
-}
-
-// Get the address that's assigned as the delegate for voting on Protocol DAO proposals
-func (r *NetworkRequester) GetCurrentVotingDelegate() (*types.ApiResponse[api.NetworkCurrentVotingDelegateData], error) {
-	return client.SendGetRequest[api.NetworkCurrentVotingDelegateData](r, "voting-delegate", "GetCurrentVotingDelegate", nil)
-}

install/install.sh

@@ -194,3 +194,21 @@ func (r *PDaoRequester) ProposeSetting(contractName rocketpool.ContractName, set
 	}
 	return client.SendGetRequest[api.ProtocolDaoProposeSettingData](r, "setting/propose", "ProposeSetting", args)
 }
+
+// Initialize voting so the node can vote on Protocol DAO proposals
+func (r *PDaoRequester) InitializeVoting() (*types.ApiResponse[api.ProtocolDaoInitializeVotingData], error) {
+	return client.SendGetRequest[api.ProtocolDaoInitializeVotingData](r, "initialize-voting", "InitializeVoting", nil)
+}
+
+// Set the delegate for voting on Protocol DAO proposals
+func (r *PDaoRequester) SetVotingDelegate(delegate common.Address) (*types.ApiResponse[types.TxInfoData], error) {
+	args := map[string]string{
+		"delegate": delegate.Hex(),
+	}
+	return client.SendGetRequest[types.TxInfoData](r, "voting-delegate/set", "SetVotingDelegate", args)
+}
+
+// Get the address that's assigned as the delegate for voting on Protocol DAO proposals
+func (r *PDaoRequester) GetCurrentVotingDelegate() (*types.ApiResponse[api.ProtocolDaoCurrentVotingDelegateData], error) {
+	return client.SendGetRequest[api.ProtocolDaoCurrentVotingDelegateData](r, "voting-delegate", "GetCurrentVotingDelegate", nil)
+}

src/client/network.go

@@ -28,8 +28,8 @@ require (
 	github.com/prometheus/client_golang v1.19.0
 	github.com/prysmaticlabs/prysm/v5 v5.0.2
 	github.com/rivo/tview v0.0.0-20230208211350-7dfff1ce7854 // DO NOT UPGRADE
-	github.com/rocket-pool/node-manager-core v0.2.0
-	github.com/rocket-pool/rocketpool-go v1.8.3-0.20240327034231-ad6fd7e143ff
+	github.com/rocket-pool/node-manager-core v0.2.1-0.20240407161311-95eaf78834a0
+	github.com/rocket-pool/rocketpool-go v1.8.3-0.20240405153840-e60a37585be4
 	github.com/shirou/gopsutil/v3 v3.24.2
 	github.com/tyler-smith/go-bip39 v1.1.0
 	github.com/wealdtech/go-ens/v3 v3.6.0
@@ -169,12 +169,11 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa // indirect
 	google.golang.org/grpc v1.62.1 // indirect
 	google.golang.org/protobuf v1.33.0
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
-gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 )
 
-
 replace github.com/wealdtech/go-merkletree v1.0.1-0.20190605192610-2bb163c2ea2a => github.com/rocket-pool/go-merkletree v1.0.1-0.20220406020931-c262d9b976dd
 
 // replace github.com/web3-storage/go-w3s-client => github.com/rocket-pool/go-w3s-client v0.0.0-20221006052217-dbd9938d11d8