Fixed some bugs

Author: jclapis

src/rocketpool-daemon/node/metrics-exporter.go

@@ -15,11 +15,12 @@ import (
 	"github.com/rocket-pool/node-manager-core/log"
 	"github.com/rocket-pool/smartnode/rocketpool-daemon/common/services"
 	"github.com/rocket-pool/smartnode/rocketpool-daemon/node/collectors"
-	"github.com/rocket-pool/smartnode/rocketpool-daemon/watchtower"
+	wc "github.com/rocket-pool/smartnode/rocketpool-daemon/watchtower/collectors"
 	"github.com/rocket-pool/smartnode/shared/keys"
 )
 
-func runMetricsServer(ctx context.Context, sp *services.ServiceProvider, logger *log.Logger, stateLocker *collectors.StateLocker, wg *sync.WaitGroup, watchtower *watchtower.TaskManager) *http.Server {
+func runMetricsServer(ctx context.Context, sp *services.ServiceProvider, logger *log.Logger, stateLocker *collectors.StateLocker, wg *sync.WaitGroup,
+	scrubCollector *wc.ScrubCollector, bondReductionCollector *wc.BondReductionCollector, soloMigrationCollector *wc.SoloMigrationCollector) *http.Server {
 	// Get services
 	cfg := sp.GetConfig()
 
@@ -58,9 +59,9 @@ func runMetricsServer(ctx context.Context, sp *services.ServiceProvider, logger
 	registry.MustRegister(snapshotCollector)
 
 	// Watchtower collectors
-	registry.MustRegister(watchtower.ScrubCollector)
-	registry.MustRegister(watchtower.BondReductionCollector)
-	registry.MustRegister(watchtower.SoloMigrationCollector)
+	registry.MustRegister(scrubCollector)
+	registry.MustRegister(bondReductionCollector)
+	registry.MustRegister(soloMigrationCollector)
 
 	// Start the HTTP server
 	handler := promhttp.HandlerFor(registry, promhttp.HandlerOpts{})

src/rocketpool-daemon/node/node.go

@@ -28,6 +28,7 @@ import (
 	"github.com/rocket-pool/smartnode/rocketpool-daemon/common/state"
 	"github.com/rocket-pool/smartnode/rocketpool-daemon/node/collectors"
 	"github.com/rocket-pool/smartnode/rocketpool-daemon/watchtower"
+	wc "github.com/rocket-pool/smartnode/rocketpool-daemon/watchtower/collectors"
 	"github.com/rocket-pool/smartnode/shared/config"
 )
 
@@ -73,6 +74,11 @@ type TaskLoop struct {
 	defendPdaoProps         *DefendPdaoProps
 	verifyPdaoProps         *VerifyPdaoProps
 
+	// Watchtower metrics
+	scrubCollector         *wc.ScrubCollector
+	bondReductionCollector *wc.BondReductionCollector
+	soloMigrationCollector *wc.SoloMigrationCollector
+
 	// Internal
 	wasExecutionClientSynced    bool
 	wasBeaconClientSynced       bool
@@ -101,6 +107,9 @@ func NewTaskLoop(sp *services.ServiceProvider, wg *sync.WaitGroup) *TaskLoop {
 		downloadRewardsTrees:        NewDownloadRewardsTrees(sp, logger),
 		reduceBonds:                 NewReduceBonds(sp, logger),
 		defendPdaoProps:             NewDefendPdaoProps(ctx, sp, logger),
+		scrubCollector:              wc.NewScrubCollector(),
+		bondReductionCollector:      wc.NewBondReductionCollector(),
+		soloMigrationCollector:      wc.NewSoloMigrationCollector(),
 
 		// We assume clients are synced on startup so that we don't send unnecessary alerts
 		wasExecutionClientSynced: true,
@@ -156,7 +165,7 @@ func (t *TaskLoop) Run() error {
 	}()
 
 	// Run metrics loop
-	t.metricsServer = runMetricsServer(t.ctx, t.sp, t.logger, t.stateLocker, t.wg, t.watchtowerTaskMgr)
+	t.metricsServer = runMetricsServer(t.ctx, t.sp, t.logger, t.stateLocker, t.wg, t.scrubCollector, t.bondReductionCollector, t.soloMigrationCollector)
 
 	return nil
 }
@@ -240,7 +249,7 @@ func (t *TaskLoop) waitUntilReady() waitUntilReadyResult {
 
 	// Create the watchtower task manager
 	if t.watchtowerTaskMgr == nil {
-		t.watchtowerTaskMgr = watchtower.NewTaskManager(t.sp, t.stateMgr)
+		t.watchtowerTaskMgr = watchtower.NewTaskManager(t.sp, t.stateMgr, t.scrubCollector, t.bondReductionCollector, t.soloMigrationCollector)
 		err = t.watchtowerTaskMgr.Initialize(t.stateMgr)
 		if err != nil {
 			t.logger.Error("Error creating watchtower task manager", log.Err(err))

src/rocketpool-daemon/node/verify-pdao-props.go

@@ -131,6 +131,9 @@ func (t *VerifyPdaoProps) Run(state *state.NetworkState) error {
 	}
 
 	// Submit transactions
+	if len(submissions) == 0 {
+		return nil
+	}
 	err = t.submitTxs(submissions)
 	if err != nil {
 		return fmt.Errorf("error submitting transactions: %w", err)

src/rocketpool-daemon/watchtower/watchtower.go

@@ -55,7 +55,13 @@ type TaskManager struct {
 	initialized       bool
 }
 
-func NewTaskManager(sp *services.ServiceProvider, stateMgr *state.NetworkStateManager) *TaskManager {
+func NewTaskManager(
+	sp *services.ServiceProvider,
+	stateMgr *state.NetworkStateManager,
+	scrubCollector *collectors.ScrubCollector,
+	bondReductionCollector *collectors.BondReductionCollector,
+	soloMigrationCollector *collectors.SoloMigrationCollector,
+) *TaskManager {
 	logger := sp.GetWatchtowerLogger()
 	ctx := logger.CreateContextWithLogger(sp.GetBaseContext())
 	cfg := sp.GetConfig()
@@ -77,11 +83,6 @@ func NewTaskManager(sp *services.ServiceProvider, stateMgr *state.NetworkStateMa
 		logger.Info("Rolling records are disabled.")
 	}
 
-	// Initialize metrics
-	scrubCollector := collectors.NewScrubCollector()
-	bondReductionCollector := collectors.NewBondReductionCollector()
-	soloMigrationCollector := collectors.NewSoloMigrationCollector()
-
 	// Initialize tasks
 	generateRewardsTree := NewGenerateRewardsTree(ctx, sp, logger)
 	respondChallenges := NewRespondChallenges(sp, logger, stateMgr)