🐛 fix validator balances and summaries when no retain array is set

wealdtech · Mar 4, 2024 · a8633bf · a8633bf
1 parent 6c4633e
commit a8633bf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 39 deletions.
diff --git a/services/chaindb/postgresql/validatorepochsummaries.go b/services/chaindb/postgresql/validatorepochsummaries.go
@@ -530,36 +530,28 @@ func (s *Service) PruneValidatorEpochSummaries(ctx context.Context, to phase0.Ep
 	// Build the query.
 	queryBuilder := strings.Builder{}
 	queryVals := make([]any, 0)
-
-	queryBuilder.WriteString(`
-DELETE FROM t_validator_epoch_summaries
-`)
-	if len(retain) > 0 {
-		queryBuilder.WriteString(`
-USING t_validators
-`)
-	}
-	queryBuilder.WriteString(`
-WHERE t_validator_epoch_summaries.f_validator_index = t_validators.f_index
-AND f_epoch <= $1
-`)
 	queryVals = append(queryVals, to)
 
 	if len(retain) > 0 {
 		queryBuilder.WriteString(`
-AND NOT (t_validators.f_public_key = ANY($2))
-`)
+DELETE FROM t_validator_epoch_summaries
+USING t_validators
+WHERE f_epoch <= $1
+AND t_validator_epoch_summaries.f_validator_index = t_validators.f_index
+AND NOT (t_validators.f_public_key = ANY($2))`)
 
 		pubkeysBytes := make([][]byte, 0, len(retain))
 
-		for _, pubkey := range retain {
-			pubkeyBytes := make([]byte, len(pubkey))
-			copy(pubkeyBytes, pubkey[:])
-
-			pubkeysBytes = append(pubkeysBytes, pubkeyBytes)
+		for i := range retain {
+			pubkeysBytes = append(pubkeysBytes, retain[i][:])
 		}
 
 		queryVals = append(queryVals, pubkeysBytes)
+
+	} else {
+		queryBuilder.WriteString(`
+DELETE FROM t_validator_epoch_summaries
+WHERE f_epoch <= $1`)
 	}
 
 	if e := log.Trace(); e.Enabled() {

diff --git a/services/chaindb/postgresql/validators.go b/services/chaindb/postgresql/validators.go
@@ -729,35 +729,28 @@ func (s *Service) PruneValidatorBalances(ctx context.Context, to phase0.Epoch, r
 	queryBuilder := strings.Builder{}
 	queryVals := make([]any, 0)
 
-	queryBuilder.WriteString(`
-DELETE FROM t_validator_balances
-`)
-	if len(retain) > 0 {
-		queryBuilder.WriteString(`
-USING t_validators
-`)
-	}
-	queryBuilder.WriteString(`
-WHERE t_validator_balances.f_validator_index = t_validators.f_index
-AND f_epoch <= $1
-`)
 	queryVals = append(queryVals, to)
 
 	if len(retain) > 0 {
 		queryBuilder.WriteString(`
-AND NOT (t_validators.f_public_key = ANY($2))
-`)
+DELETE FROM t_validator_balances
+USING t_validators
+WHERE f_epoch <= $1
+AND t_validator_balances.f_validator_index = t_validators.f_index
+AND NOT (t_validators.f_public_key = ANY($2))`)
 
 		pubkeysBytes := make([][]byte, 0, len(retain))
 
-		for _, pubkey := range retain {
-			pubkeyBytes := make([]byte, len(pubkey))
-			copy(pubkeyBytes, pubkey[:])
-
-			pubkeysBytes = append(pubkeysBytes, pubkeyBytes)
+		for i := range retain {
+			pubkeysBytes = append(pubkeysBytes, retain[i][:])
 		}
 
 		queryVals = append(queryVals, pubkeysBytes)
+
+	} else {
+		queryBuilder.WriteString(`
+DELETE FROM t_validator_balances
+WHERE f_epoch <= $1`)
 	}
 
 	if e := log.Trace(); e.Enabled() {