return unknown validators

listener/cmd/listener/main.go

@@ -69,10 +69,9 @@ func main() {
 		apiCron.RemoveOldSignatures(dbCollection, 720)
 
 	})
-	// c.AddFunc("* * * * *", func() {
-	// 	apiCron.RemoveUnknownSignatures(dbCollection, config.BeaconNodeURLs)
-
-	// })
+	c.AddFunc("* * * * *", func() {
+		apiCron.RemoveUnknownSignatures(dbCollection, config.BeaconNodeURLs)
+	})
 	c.Start()
 
 	// Set up signal handling for graceful shutdown

listener/internal/api/handlers/postNewSignature.go

@@ -77,8 +77,12 @@ func filterAndVerifySignatures(requests []types.SignatureRequestDecoded, validat
 	validSignatures := []types.SignatureRequestDecodedWithStatus{}
 	for _, req := range requests {
 		status, ok := validatorsStatusMap[req.Pubkey]
-		if !ok || status == types.Inactive {
-			logger.Warn("Validator not found or inactive: " + req.Pubkey)
+		if !ok {
+			logger.Warn("Validator not found: " + req.Pubkey)
+			continue
+		}
+		if status == types.Inactive {
+			logger.Warn("Inactive validator: " + req.Pubkey)
 			continue
 		}
 		reqWithStatus := types.SignatureRequestDecodedWithStatus{

listener/internal/api/validation/GetValidatorsStatus.go

@@ -42,6 +42,9 @@ func GetValidatorsStatus(pubkeys []string, beaconNodeUrl string) (map[string]typ
 		return nil, fmt.Errorf("no public keys provided to retrieve active validators from beacon node")
 	}
 
+	// Use a map to store validator statuses
+	statusMap := make(map[string]types.Status)
+
 	// Serialize the request body to JSON
 	// See https://ethereum.github.io/beacon-APIs/#/Beacon/postStateValidators
 	// returns only active validators
@@ -64,15 +67,19 @@ func GetValidatorsStatus(pubkeys []string, beaconNodeUrl string) (map[string]typ
 	// Make API call
 	resp, err := client.Post(apiUrl, "application/json", bytes.NewBuffer(jsonData))
 	if err != nil {
-		return nil, fmt.Errorf("error making API call to " + apiUrl + ": " + err.Error())
+		logger.Error("Failed to make request to beacon node: " + err.Error())
+		// return the pubkeys to be stored with status unknown
+		for _, pubkey := range pubkeys {
+			statusMap[pubkey] = types.Unknown
+		}
+		return statusMap, nil
 	}
 	defer resp.Body.Close()
 
 	// Check if it's any server error 5xx
 	if resp.StatusCode >= 500 && resp.StatusCode < 600 {
 		logger.Error("internal server error due to server issue, keeping signatures to be stored with status unknown: " + resp.Status)
 		// return the pubkeys to be stored with status unknown
-		statusMap := make(map[string]types.Status)
 		for _, pubkey := range pubkeys {
 			statusMap[pubkey] = types.Unknown
 		}
@@ -90,8 +97,6 @@ func GetValidatorsStatus(pubkeys []string, beaconNodeUrl string) (map[string]typ
 		return nil, fmt.Errorf("error decoding response data from beacon node: " + err.Error())
 	}
 
-	// Use a map to store validator statuses
-	statusMap := make(map[string]types.Status)
 	for _, pubkey := range pubkeys {
 		statusMap[pubkey] = types.Inactive
 	}