Fix watchtower wait

Author: 0xfornax

rocketpool/watchtower/watchtower.go

@@ -7,6 +7,8 @@ import (
 	"math/rand"
 	"net/http"
 	"os"
+	"os/signal"
+	"syscall"
 	"time"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -70,6 +72,40 @@ func run(c *cli.Command) error {
 	// Configure
 	configureHTTP()
 
+	// Create a context that is cancelled on SIGINT/SIGTERM so the HTTP server
+	// and other background goroutines can shut down gracefully.
+	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
+	defer cancel()
+
+	for {
+		// Exit if the process received SIGINT/SIGTERM
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		default:
+		}
+
+		// Check the EC status
+		err := services.WaitEthClientSynced(c, false) // Force refresh the primary / fallback EC status
+		if err != nil {
+			if !sleepWithContext(ctx, taskCooldown) {
+				return err
+			}
+			continue
+		}
+
+		// Check the BC status
+		err = services.WaitBeaconClientSynced(c, false) // Force refresh the primary / fallback BC status
+		if err != nil {
+			if !sleepWithContext(ctx, taskCooldown) {
+				return err
+			}
+			continue
+		}
+
+		break
+	}
+
 	// Wait until the node wallet stored on disk is registered
 	if err := services.WaitNodeRegistered(c, true); err != nil {
 		return err
@@ -341,6 +377,8 @@ func run(c *cli.Command) error {
 		}
 	}()
 
+	// Block until SIGINT/SIGTERM is received.
+	<-ctx.Done()
 	return nil
 }
 
@@ -377,3 +415,13 @@ func isOnOracleDAO(rp *rocketpool.RocketPool, nodeAddress common.Address, block
 	}
 	return nodeTrusted, nil
 }
+
+// sleepWithContext sleeps for d or until ctx is cancelled, returning false if cancelled.
+func sleepWithContext(ctx context.Context, d time.Duration) bool {
+	select {
+	case <-ctx.Done():
+		return false
+	case <-time.After(d):
+		return true
+	}
+}

shared/version.txt

@@ -1 +1 @@
-1.20.1
+1.20.2-dev