perf(api): remove redundant eb calculations

Author: remoterami

backend/pkg/api/data_access/mobile.go

@@ -261,9 +261,13 @@ func (d *DataAccessService) GetValidatorDashboardMobileWidget(ctx context.Contex
 		return nil
 	})
 
+	investedAmount, err := d.GetValidatorDashboardEffectiveBalanceTotal(ctx, t.VDBId{Id: dashboardId}, true)
+	if err != nil {
+		return nil, err
+	}
 	retrieveApr := func(hours int, apr *float64) {
 		eg.Go(func() error {
-			incomeInfo, err := d.getElClAPR(ctx, wrappedDashboardId, -1, hours)
+			incomeInfo, err := d.getElClAPR(ctx, wrappedDashboardId, -1, hours, investedAmount)
 			if err != nil {
 				return err
 			}
@@ -274,7 +278,7 @@ func (d *DataAccessService) GetValidatorDashboardMobileWidget(ctx context.Contex
 
 	retrieveRewards := func(hours int, rewards *t.ClElValue[decimal.Decimal]) {
 		eg.Go(func() error {
-			incomeInfo, err := d.getElClAPR(ctx, wrappedDashboardId, -1, hours)
+			incomeInfo, err := d.getElClAPR(ctx, wrappedDashboardId, -1, hours, investedAmount)
 			if err != nil {
 				return err
 			}

backend/pkg/api/data_access/vdb_helpers.go

@@ -162,7 +162,7 @@ type IncomeInfo struct {
 	Apr t.ClElValue[float64]
 }
 
-func (d *DataAccessService) getElClAPR(ctx context.Context, dashboardId t.VDBId, groupId int64, hours int) (rewardsApr IncomeInfo, err error) {
+func (d *DataAccessService) getElClAPR(ctx context.Context, dashboardId t.VDBId, groupId int64, hours int, investedAmount uint64) (rewardsApr IncomeInfo, err error) {
 	result := IncomeInfo{}
 	table := ""
 
@@ -233,15 +233,11 @@ func (d *DataAccessService) getElClAPR(ctx context.Context, dashboardId t.VDBId,
 		aprDivisor = 90 * 24
 	}
 
-	investedAmountUInt, err := d.GetValidatorDashboardEffectiveBalanceTotal(ctx, dashboardId, true)
-	if err != nil {
-		return IncomeInfo{}, fmt.Errorf("error retrieving total effective balance: %w", err)
-	}
 	// invested amount is wrong if the effective balance changed during the period (because of auto compound, consolidation, partial withdrawal etc.)
 	// would need to split at eb changes and weigh results
-	investedAmount := d.convertClToMain(decimal.NewFromUint64(investedAmountUInt))
+	investedAmountDec := d.convertClToMain(decimal.NewFromUint64(investedAmount))
 
-	result.Apr.Cl = calcAPR(d.convertClToMain(decimal.NewFromInt(rewardsResultTable.Reward.Int64)), investedAmount, aprDivisor)
+	result.Apr.Cl = calcAPR(d.convertClToMain(decimal.NewFromInt(rewardsResultTable.Reward.Int64)), investedAmountDec, aprDivisor)
 
 	result.Rewards.Cl = decimal.NewFromInt(rewardsResultTable.Reward.Int64).Mul(decimal.NewFromInt(1e9))
 
@@ -293,7 +289,7 @@ func (d *DataAccessService) getElClAPR(ctx context.Context, dashboardId t.VDBId,
 		return IncomeInfo{}, err
 	}
 
-	result.Apr.El = calcAPR(d.convertElToMain(result.Rewards.El), investedAmount, aprDivisor)
+	result.Apr.El = calcAPR(d.convertElToMain(result.Rewards.El), investedAmountDec, aprDivisor)
 
 	if hours == -1 {
 		elTotalDs := elDs.

backend/pkg/api/data_access/vdb_management.go

@@ -377,10 +377,15 @@ func (d *DataAccessService) GetValidatorDashboardOverview(ctx context.Context, d
 		return nil
 	})
 
+	investedAmount, err := d.GetValidatorDashboardEffectiveBalanceTotal(ctx, dashboardId, true)
+	if err != nil {
+		return nil, err
+	}
+
 	retrieveRewardsAndEfficiency := func(table string, hours int, rewards *t.ClElValue[decimal.Decimal], apr *t.ClElValue[float64], efficiency *float64) {
 		// Rewards + APR
 		eg.Go(func() error {
-			incomeInfo, err := d.getElClAPR(ctx, dashboardId, -1, hours)
+			incomeInfo, err := d.getElClAPR(ctx, dashboardId, -1, hours, investedAmount)
 			if err != nil {
 				return err
 			}

backend/pkg/api/data_access/vdb_summary.go

@@ -721,7 +721,11 @@ func (d *DataAccessService) GetValidatorDashboardGroupSummary(ctx context.Contex
 	ret.MissedRewards.ProposerRewards.Cl = utils.GWeiToWei(big.NewInt(totalMissedRewardsCl))
 	ret.MissedRewards.ProposerRewards.El = decimal.NewFromFloat(totalMissedRewardsEl)
 
-	incomeInfo, err := d.getElClAPR(ctx, dashboardId, groupId, hours)
+	investedAmount, err := d.GetValidatorDashboardEffectiveBalanceTotal(ctx, dashboardId, true)
+	if err != nil {
+		return nil, err
+	}
+	incomeInfo, err := d.getElClAPR(ctx, dashboardId, groupId, hours, investedAmount)
 	if err != nil {
 		return nil, err
 	}