From eace845acd4e455c77f248526a6633089c380054 Mon Sep 17 00:00:00 2001
From: peter <1674920+peterbitfly@users.noreply.github.com>
Date: Thu, 3 Oct 2024 06:38:37 +0000
Subject: [PATCH] feat(validators): improve performance of validator status
 filters

---
 handlers/validators.go | 34 ++++++++++++++++++-------------
 services/services.go   | 45 ------------------------------------------
 types/frontend.go      |  4 ++--
 3 files changed, 22 insertions(+), 61 deletions(-)

diff --git a/handlers/validators.go b/handlers/validators.go
index cd61d43900..d33f996308 100644
--- a/handlers/validators.go
+++ b/handlers/validators.go
@@ -26,30 +26,36 @@ func Validators(w http.ResponseWriter, r *http.Request) {
 
 	validatorsPageData := types.ValidatorsPageData{}
 
-	currentStateCounts := services.LatestValidatorStateCounts()
+	var currentStateCounts []*types.ValidatorStateCountRow
+	err := db.ReaderDb.Select(&currentStateCounts, "SELECT status, validator_count FROM validators_status_counts")
+	if err != nil {
+		utils.LogError(err, "error retrieving validators state counts", 0, nil)
+		http.Error(w, "Internal server error", http.StatusInternalServerError)
+		return
+	}
 
-	for _, state := range *currentStateCounts {
-		switch state.Name {
+	for _, status := range currentStateCounts {
+		switch status.Name {
 		case "pending":
-			validatorsPageData.PendingCount = state.Count
+			validatorsPageData.PendingCount = status.Count
 		case "active_online":
-			validatorsPageData.ActiveOnlineCount = state.Count
+			validatorsPageData.ActiveOnlineCount = status.Count
 		case "active_offline":
-			validatorsPageData.ActiveOfflineCount = state.Count
+			validatorsPageData.ActiveOfflineCount = status.Count
 		case "slashing_online":
-			validatorsPageData.SlashingOnlineCount = state.Count
+			validatorsPageData.SlashingOnlineCount = status.Count
 		case "slashing_offline":
-			validatorsPageData.SlashingOfflineCount = state.Count
+			validatorsPageData.SlashingOfflineCount = status.Count
 		case "slashed":
-			validatorsPageData.Slashed = state.Count
+			validatorsPageData.Slashed = status.Count
 		case "exiting_online":
-			validatorsPageData.ExitingOnlineCount = state.Count
+			validatorsPageData.ExitingOnlineCount = status.Count
 		case "exiting_offline":
-			validatorsPageData.ExitingOfflineCount = state.Count
+			validatorsPageData.ExitingOfflineCount = status.Count
 		case "exited":
-			validatorsPageData.VoluntaryExitsCount = state.Count
+			validatorsPageData.VoluntaryExitsCount = status.Count
 		case "deposited":
-			validatorsPageData.DepositedCount = state.Count
+			validatorsPageData.DepositedCount = status.Count
 		}
 	}
 
@@ -352,7 +358,7 @@ func ValidatorsData(w http.ResponseWriter, r *http.Request) {
 	}
 	countFiltered := uint64(0)
 	if dataQuery.StateFilter != "" {
-		qry = fmt.Sprintf(`SELECT COUNT(*) FROM validators %s`, dataQuery.StateFilter)
+		qry = fmt.Sprintf(`SELECT SUM(validator_count) FROM validators_status_counts AS validators %s`, dataQuery.StateFilter)
 		err = db.ReaderDb.Get(&countFiltered, qry)
 		if err != nil {
 			utils.LogError(err, "error retrieving validators total count", 0, errFields)
diff --git a/services/services.go b/services/services.go
index b78f21451e..9dc6ca9f09 100644
--- a/services/services.go
+++ b/services/services.go
@@ -87,9 +87,6 @@ func Init() {
 	ready.Add(1)
 	go latestExportedStatisticDayUpdater(ready)
 
-	ready.Add(1)
-	go validatorStateCountsUpdater(ready)
-
 	if utils.Config.RatelimitUpdater.Enabled {
 		go ratelimit.DBUpdater()
 	}
@@ -1769,45 +1766,3 @@ func LatestExportedStatisticDay() (uint64, error) {
 	}
 	return wanted, nil
 }
-
-func validatorStateCountsUpdater(wg *sync.WaitGroup) {
-	firstRun := true
-
-	for {
-		var currentStateCounts []types.ValidatorStateCountRow
-		qry := "SELECT status AS statename, COUNT(*) AS statecount FROM validators GROUP BY status"
-		err := db.ReaderDb.Select(&currentStateCounts, qry)
-
-		if err != nil {
-			logger.Errorf("error retrieving validator state counts from the database: %v", err)
-
-			if err.Error() == "sql: database is closed" {
-				logger.Fatalf("error retrieving validator state counts from the database: %v", err)
-			}
-		} else {
-			cacheKey := fmt.Sprintf("%d:frontend:validator_state_counts", utils.Config.Chain.ClConfig.DepositChainID)
-			err := cache.TieredCache.Set(cacheKey, currentStateCounts, utils.Day)
-			if err != nil {
-				logger.Errorf("error caching validator state counts: %v", err)
-			}
-			if firstRun {
-				logger.Info("initialized validator state counts updater")
-				wg.Done()
-				firstRun = false
-			}
-		}
-		ReportStatus("validatorStateCountsUpdater", "Running", nil)
-		time.Sleep(time.Minute * 60)
-	}
-}
-
-func LatestValidatorStateCounts() *[]types.ValidatorStateCountRow {
-	wanted := []types.ValidatorStateCountRow{}
-	cacheKey := fmt.Sprintf("%d:frontend:validator_state_counts", utils.Config.Chain.ClConfig.DepositChainID)
-	if wanted, err := cache.TieredCache.GetWithLocalTimeout(cacheKey, time.Minute, &wanted); err == nil {
-		return wanted.(*[]types.ValidatorStateCountRow)
-	} else {
-		logger.Errorf("error retrieving validator state count data from cache: %v", err)
-	}
-	return &wanted
-}
diff --git a/types/frontend.go b/types/frontend.go
index 88df7b7023..6216db2f86 100644
--- a/types/frontend.go
+++ b/types/frontend.go
@@ -617,6 +617,6 @@ type SearchValidatorsByEth1Result []struct {
 }
 
 type ValidatorStateCountRow struct {
-	Name  string `db:"statename"`
-	Count uint64 `db:"statecount"`
+	Name  string `db:"status"`
+	Count uint64 `db:"validator_count"`
 }