missed rewards rework

Author: sasha-bitfly

backend/pkg/api/data_access/vdb_summary.go

@@ -690,6 +690,10 @@ func (d *DataAccessService) GetValidatorDashboardGroupSummary(ctx context.Contex
 	totalSyncExpected := float64(0)
 	totalProposals := uint32(0)
 
+	totalMissedRewardsCl := int64(0)
+	totalMissedRewardsAttestations := int64(0)
+	totalMissedRewardsSync := int64(0)
+
 	validatorArr := make([]t.VDBValidator, 0)
 	for _, row := range rows {
 		validatorArr = append(validatorArr, t.VDBValidator(row.ValidatorIndex))
@@ -705,9 +709,9 @@ func (d *DataAccessService) GetValidatorDashboardGroupSummary(ctx context.Contex
 		ret.AttestationsTarget.Success += uint64(row.AttestationsTargetExecuted)
 		ret.AttestationsTarget.Failed += uint64(row.AttestationsScheduled) - uint64(row.AttestationsTargetExecuted)
 
-		ret.MissedRewards.ProposerRewards.Cl += uint64(row.BlocksCLMissedReward)
-		ret.MissedRewards.Attestations += uint64(row.AttestationsIdealReward) - uint64(row.AttestationsRewardRewardsOnly)
-		ret.MissedRewards.Sync += uint64(row.SyncLocalizedMaxRewards) - uint64(row.SyncRewardRewardsOnly)
+		totalMissedRewardsCl += row.BlocksCLMissedReward
+		totalMissedRewardsAttestations += row.AttestationsIdealReward - row.AttestationsRewardRewardsOnly
+		totalMissedRewardsSync += row.SyncLocalizedMaxRewards - row.SyncRewardRewardsOnly
 
 		if row.ValidatorIndex == 0 && row.BlocksProposed > 0 && row.BlocksProposed != row.BlocksScheduled {
 			row.BlocksProposed-- // subtract the genesis block from validator 0 (TODO: remove when fixed in the dashoard data exporter)
@@ -756,6 +760,10 @@ func (d *DataAccessService) GetValidatorDashboardGroupSummary(ctx context.Contex
 		}
 	}
 
+	ret.MissedRewards.Attestations = ret.MissedRewards.Attestations.Add(decimal.NewFromInt(totalMissedRewardsAttestations))
+	ret.MissedRewards.Sync = ret.MissedRewards.Sync.Add(decimal.NewFromInt(totalMissedRewardsSync))
+	ret.MissedRewards.ProposerRewards.Cl = ret.MissedRewards.ProposerRewards.Cl.Add(decimal.NewFromInt(totalMissedRewardsCl))
+
 	_, ret.Apr.El, _, ret.Apr.Cl, err = d.internal_getElClAPR(ctx, dashboardId, groupId, hours)
 	if err != nil {
 		return nil, err

backend/pkg/api/types/validator_dashboard.go

@@ -77,9 +77,9 @@ type VDBGroupSummarySyncCount struct {
 }
 
 type VDBGroupSummaryMissedRewards struct {
-	ProposerRewards ClElValue[uint64] `json:"proposer_rewards"`
-	Attestations    uint64            `json:"attestations"`
-	Sync            uint64            `json:"sync"`
+	ProposerRewards ClElValue[decimal.Decimal] `json:"proposer_rewards"`
+	Attestations    decimal.Decimal            `json:"attestations"`
+	Sync            decimal.Decimal            `json:"sync"`
 }
 type VDBGroupSummaryData struct {
 	AttestationsHead       StatusCount `json:"attestations_head"`