Improve pendConsolidations checks, update map to use struct

Author: martinmsb

metrics/beaconstate.go

@@ -492,36 +492,38 @@ func isBitSet(input uint8, n int) bool {
 func GetProcessedConsolidations(
 	prevBeaconState *spec.VersionedBeaconState,
 	currentBeaconState *spec.VersionedBeaconState,
-) map[uint64][]*electra.PendingConsolidation {
+) (map[uint64][]*electra.PendingConsolidation, error) {
 	consolidations := make(map[uint64][]*electra.PendingConsolidation)
 
 	validators := GetValidators(currentBeaconState)
 	prevPendingConsolidations := GetPendingConsolidations(prevBeaconState)
 	currPendingConsolidations := GetPendingConsolidations(currentBeaconState)
 
-	if prevPendingConsolidations == nil {
-		return consolidations
+	if prevPendingConsolidations == nil || currPendingConsolidations == nil {
+		return nil, errors.New("state with nil pending consolidations found")
+	}
+
+	if len(validators) == 0 {
+		return consolidations, nil
 	}
 
 	// Set of current pending consolidations
-	currPendingConsolidationsSet := make(map[string]bool)
+	currPendingConsolidationsSet := make(map[electra.PendingConsolidation]bool)
 	for _, consolidation := range currPendingConsolidations {
-		key := fmt.Sprintf("%d-%d", consolidation.SourceIndex, consolidation.TargetIndex)
-		currPendingConsolidationsSet[key] = true
+		currPendingConsolidationsSet[*consolidation] = true
 	}
 
 	// If the consolidation is not in the current set, it was processed or source slashed
 	for _, consolidation := range prevPendingConsolidations {
-		key := fmt.Sprintf("%d-%d", consolidation.SourceIndex, consolidation.TargetIndex)
-		if _, ok := currPendingConsolidationsSet[key]; !ok {
+		if _, ok := currPendingConsolidationsSet[*consolidation]; !ok {
 			sourceValidator := validators[consolidation.SourceIndex]
 			if sourceValidator.Slashed {
 				continue
 			}
 			consolidations[uint64(consolidation.TargetIndex)] = append(consolidations[uint64(consolidation.TargetIndex)], consolidation)
 		}
 	}
-	return consolidations
+	return consolidations, nil
 }
 
 func logMetrics(

metrics/beaconstate_test.go

@@ -281,10 +281,27 @@ func Test_GetProcessedConsolidations(t *testing.T) {
 			},
 		},
 	}
-	processedConsolidations := GetProcessedConsolidations(prevBeaconState, currentBeaconState)
+	processedConsolidations, err := GetProcessedConsolidations(prevBeaconState, currentBeaconState)
+	require.NoError(t, err)
 
 	require.Equal(t, len(processedConsolidations), 1)
 	require.Equal(t, len(processedConsolidations[1]), 1)
 	require.Equal(t, processedConsolidations[1][0].SourceIndex, phase0.ValidatorIndex(0))
 	require.Equal(t, processedConsolidations[1][0].TargetIndex, phase0.ValidatorIndex(1))
 }
+
+func Test_GetProcessedConsolidations_NilPendingConsolidations(t *testing.T) {
+	prevBeaconState := &spec.VersionedBeaconState{
+		Electra: &electra.BeaconState{
+			PendingConsolidations: nil,
+		},
+	}
+	currentBeaconState := &spec.VersionedBeaconState{
+		Electra: &electra.BeaconState{
+			PendingConsolidations: nil,
+		},
+	}
+	processedConsolidations, err := GetProcessedConsolidations(prevBeaconState, currentBeaconState)
+	require.Error(t, err)
+	require.Nil(t, processedConsolidations)
+}

metrics/metrics.go

@@ -358,7 +358,10 @@ func (a *Metrics) ProcessEpoch(
 	// Map to quickly convert public keys to index
 	valKeyToIndex := PopulateKeysToIndexesMap(currentBeaconState)
 
-	processedConsolidations := GetProcessedConsolidations(prevBeaconState, currentBeaconState)
+	processedConsolidations, err := GetProcessedConsolidations(prevBeaconState, currentBeaconState)
+	if err != nil {
+		return nil, errors.Wrap(err, "error getting processed consolidations")
+	}
 
 	relayRewardsPerPool, slotsWithMEVRewards, err := a.relayRewards.GetRelayRewards(currentEpoch)
 	if err != nil {