diff --git a/backend/pkg/api/data_access/archiver.go b/backend/pkg/api/data_access/archiver.go index 5d6d80aa1..bb28571b9 100644 --- a/backend/pkg/api/data_access/archiver.go +++ b/backend/pkg/api/data_access/archiver.go @@ -91,7 +91,7 @@ func (d *DataAccessService) UpdateValidatorDashboardsArchiving(ctx context.Conte query, args, err := ds.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } _, err = d.writerDb.ExecContext(ctx, query, args...) diff --git a/backend/pkg/api/data_access/notifications.go b/backend/pkg/api/data_access/notifications.go index be09f4f2c..2c6057052 100644 --- a/backend/pkg/api/data_access/notifications.go +++ b/backend/pkg/api/data_access/notifications.go @@ -1344,7 +1344,7 @@ func (d *DataAccessService) UpdateNotificationSettingsGeneral(ctx context.Contex query, args, err := insertDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } _, err = tx.ExecContext(ctx, query, args...) @@ -1361,7 +1361,7 @@ func (d *DataAccessService) UpdateNotificationSettingsGeneral(ctx context.Contex query, args, err := deleteDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } _, err = tx.ExecContext(ctx, query, args...) @@ -1422,7 +1422,7 @@ func (d *DataAccessService) UpdateNotificationSettingsNetworks(ctx context.Conte query, args, err := insertDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } _, err = tx.ExecContext(ctx, query, args...) @@ -1439,7 +1439,7 @@ func (d *DataAccessService) UpdateNotificationSettingsNetworks(ctx context.Conte query, args, err := deleteDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } _, err = tx.ExecContext(ctx, query, args...) @@ -1964,7 +1964,7 @@ func (d *DataAccessService) UpdateNotificationSettingsValidatorDashboard(ctx con query, args, err := insertDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } _, err = tx.ExecContext(ctx, query, args...) @@ -1981,7 +1981,7 @@ func (d *DataAccessService) UpdateNotificationSettingsValidatorDashboard(ctx con query, args, err := deleteDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } _, err = tx.ExecContext(ctx, query, args...) @@ -2052,7 +2052,7 @@ func (d *DataAccessService) UpdateNotificationSettingsAccountDashboard(ctx conte // query, args, err := insertDs.Prepared(true).ToSQL() // if err != nil { - // return fmt.Errorf("error preparing query: %v", err) + // return fmt.Errorf("error preparing query: %w", err) // } // _, err = tx.ExecContext(ctx, query, args...) @@ -2069,7 +2069,7 @@ func (d *DataAccessService) UpdateNotificationSettingsAccountDashboard(ctx conte // query, args, err := deleteDs.Prepared(true).ToSQL() // if err != nil { - // return fmt.Errorf("error preparing query: %v", err) + // return fmt.Errorf("error preparing query: %w", err) // } // _, err = tx.ExecContext(ctx, query, args...) diff --git a/backend/pkg/api/data_access/vdb_rewards.go b/backend/pkg/api/data_access/vdb_rewards.go index 7f68e1b64..1221f9596 100644 --- a/backend/pkg/api/data_access/vdb_rewards.go +++ b/backend/pkg/api/data_access/vdb_rewards.go @@ -312,12 +312,12 @@ func (d *DataAccessService) GetValidatorDashboardRewards(ctx context.Context, da wg.Go(func() error { query, args, err := rewardsDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } err = d.clickhouseReader.SelectContext(ctx, &queryResult, query, args...) if err != nil { - return fmt.Errorf("error retrieving rewards data: %v", err) + return fmt.Errorf("error retrieving rewards data: %w", err) } return nil }) @@ -334,12 +334,12 @@ func (d *DataAccessService) GetValidatorDashboardRewards(ctx context.Context, da query, args, err := elDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } err = d.readerDb.SelectContext(ctx, &elQueryResult, query, args...) if err != nil { - return fmt.Errorf("error retrieving el rewards data for rewards: %v", err) + return fmt.Errorf("error retrieving el rewards data for rewards: %w", err) } for _, entry := range elQueryResult { @@ -353,7 +353,7 @@ func (d *DataAccessService) GetValidatorDashboardRewards(ctx context.Context, da err = wg.Wait() if err != nil { - return nil, nil, fmt.Errorf("error retrieving validator dashboard rewards data: %v", err) + return nil, nil, fmt.Errorf("error retrieving validator dashboard rewards data: %w", err) } // ------------------------------------------------------------------------------------------------------------------ @@ -625,12 +625,12 @@ func (d *DataAccessService) GetValidatorDashboardGroupRewards(ctx context.Contex wg.Go(func() error { query, args, err := rewardsDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } err = d.clickhouseReader.SelectContext(ctx, &queryResult, query, args...) if err != nil { - return fmt.Errorf("error retrieving group rewards data: %v", err) + return fmt.Errorf("error retrieving group rewards data: %w", err) } return nil }) @@ -641,19 +641,19 @@ func (d *DataAccessService) GetValidatorDashboardGroupRewards(ctx context.Contex wg.Go(func() error { query, args, err := elDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } err = d.readerDb.GetContext(ctx, &elRewards, query, args...) if err != nil && !errors.Is(err, sql.ErrNoRows) { - return fmt.Errorf("error retrieving el rewards data for group rewards: %v", err) + return fmt.Errorf("error retrieving el rewards data for group rewards: %w", err) } return nil }) err := wg.Wait() if err != nil { - return nil, fmt.Errorf("error retrieving validator dashboard group rewards data: %v", err) + return nil, fmt.Errorf("error retrieving validator dashboard group rewards data: %w", err) } // ------------------------------------------------------------------------------------------------------------------ @@ -800,12 +800,12 @@ func (d *DataAccessService) GetValidatorDashboardRewardsChart(ctx context.Contex wg.Go(func() error { query, args, err := rewardsDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } err = d.clickhouseReader.SelectContext(ctx, &queryResult, query, args...) if err != nil { - return fmt.Errorf("error retrieving rewards chart data: %v", err) + return fmt.Errorf("error retrieving rewards chart data: %w", err) } return nil }) @@ -822,12 +822,12 @@ func (d *DataAccessService) GetValidatorDashboardRewardsChart(ctx context.Contex query, args, err := elDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } err = d.readerDb.SelectContext(ctx, &elQueryResult, query, args...) if err != nil { - return fmt.Errorf("error retrieving el rewards data for rewards chart: %v", err) + return fmt.Errorf("error retrieving el rewards data for rewards chart: %w", err) } for _, entry := range elQueryResult { @@ -841,7 +841,7 @@ func (d *DataAccessService) GetValidatorDashboardRewardsChart(ctx context.Contex err := wg.Wait() if err != nil { - return nil, fmt.Errorf("error retrieving validator dashboard rewards chart data: %v", err) + return nil, fmt.Errorf("error retrieving validator dashboard rewards chart data: %w", err) } // ------------------------------------------------------------------------------------------------------------------ @@ -1065,12 +1065,12 @@ func (d *DataAccessService) GetValidatorDashboardDuties(ctx context.Context, das wg.Go(func() error { query, args, err := rewardsDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } err = d.clickhouseReader.SelectContext(ctx, &queryResult, query, args...) if err != nil { - return fmt.Errorf("error retrieving validator rewards data: %v", err) + return fmt.Errorf("error retrieving validator rewards data: %w", err) } return nil }) @@ -1086,12 +1086,12 @@ func (d *DataAccessService) GetValidatorDashboardDuties(ctx context.Context, das query, args, err := elDs.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } err = d.readerDb.SelectContext(ctx, &elQueryResult, query, args...) if err != nil { - return fmt.Errorf("error retrieving validator el rewards data for rewards: %v", err) + return fmt.Errorf("error retrieving validator el rewards data for rewards: %w", err) } for _, entry := range elQueryResult { @@ -1102,7 +1102,7 @@ func (d *DataAccessService) GetValidatorDashboardDuties(ctx context.Context, das err = wg.Wait() if err != nil { - return nil, nil, fmt.Errorf("error retrieving validator dashboard rewards data: %v", err) + return nil, nil, fmt.Errorf("error retrieving validator dashboard rewards data: %w", err) } // ------------------------------------------------------------------------------------------------------------------ diff --git a/backend/pkg/api/data_access/vdb_summary.go b/backend/pkg/api/data_access/vdb_summary.go index 94deef34f..4c94d8a11 100644 --- a/backend/pkg/api/data_access/vdb_summary.go +++ b/backend/pkg/api/data_access/vdb_summary.go @@ -158,12 +158,12 @@ func (d *DataAccessService) GetValidatorDashboardSummary(ctx context.Context, da query, args, err := ds.Prepared(true).ToSQL() if err != nil { - return nil, nil, fmt.Errorf("error preparing query: %v", err) + return nil, nil, fmt.Errorf("error preparing query: %w", err) } err = d.clickhouseReader.SelectContext(ctx, &queryResult, query, args...) if err != nil { - return nil, nil, fmt.Errorf("error retrieving data from table %s: %v", clickhouseTable, err) + return nil, nil, fmt.Errorf("error retrieving data from table %s: %w", clickhouseTable, err) } if len(queryResult) == 0 { @@ -228,12 +228,12 @@ func (d *DataAccessService) GetValidatorDashboardSummary(ctx context.Context, da query, args, err = ds.Prepared(true).ToSQL() if err != nil { - return nil, nil, fmt.Errorf("error preparing query: %v", err) + return nil, nil, fmt.Errorf("error preparing query: %w", err) } err = d.alloyReader.SelectContext(ctx, &elRewardsQueryResult, query, args...) if err != nil { - return nil, nil, fmt.Errorf("error retrieving data from table blocks: %v", err) + return nil, nil, fmt.Errorf("error retrieving data from table blocks: %w", err) } for _, entry := range elRewardsQueryResult { @@ -253,7 +253,7 @@ func (d *DataAccessService) GetValidatorDashboardSummary(ctx context.Context, da err = wg.Wait() if err != nil { - return nil, nil, fmt.Errorf("error retrieving validator dashboard summary data: %v", err) + return nil, nil, fmt.Errorf("error retrieving validator dashboard summary data: %w", err) } // ------------------------------------------------------------------------------------------------------------------ @@ -643,7 +643,7 @@ func (d *DataAccessService) GetValidatorDashboardGroupSummary(ctx context.Contex err = d.clickhouseReader.SelectContext(ctx, &rows, query, args...) if err != nil { - return fmt.Errorf("error retrieving validator dashboard group summary data: %v", err) + return fmt.Errorf("error retrieving validator dashboard group summary data: %w", err) } return nil @@ -748,7 +748,7 @@ func (d *DataAccessService) GetValidatorDashboardGroupSummary(ctx context.Contex currentSyncPeriod := utils.SyncPeriodOfEpoch(latestEpoch) err = d.readerDb.GetContext(ctx, &ret.SyncCommitteeCount.PastPeriods, `SELECT COUNT(*) FROM sync_committees WHERE period >= $1 AND period < $2 AND validatorindex = ANY($3)`, pastSyncPeriodCutoff, currentSyncPeriod, validatorArr) if err != nil { - return nil, fmt.Errorf("error retrieving past sync committee count: %v", err) + return nil, fmt.Errorf("error retrieving past sync committee count: %w", err) } ret.AttestationEfficiency = float64(totalAttestationRewards) / float64(totalIdealAttestationRewards) * 100 @@ -851,7 +851,7 @@ func (d *DataAccessService) internal_getElClAPR(ctx context.Context, dashboardId query, args, err := rewardsDs.Prepared(true).ToSQL() if err != nil { - return decimal.Zero, 0, decimal.Zero, 0, fmt.Errorf("error preparing query: %v", err) + return decimal.Zero, 0, decimal.Zero, 0, fmt.Errorf("error preparing query: %w", err) } err = d.clickhouseReader.GetContext(ctx, &rewardsResultTable, query, args...) @@ -880,7 +880,7 @@ func (d *DataAccessService) internal_getElClAPR(ctx context.Context, dashboardId query, args, err = rewardsDs.Prepared(true).ToSQL() if err != nil { - return decimal.Zero, 0, decimal.Zero, 0, fmt.Errorf("error preparing query: %v", err) + return decimal.Zero, 0, decimal.Zero, 0, fmt.Errorf("error preparing query: %w", err) } err = d.clickhouseReader.GetContext(ctx, &rewardsResultTotal, query, args...) @@ -926,7 +926,7 @@ func (d *DataAccessService) internal_getElClAPR(ctx context.Context, dashboardId query, args, err = elTableDs.Prepared(true).ToSQL() if err != nil { - return decimal.Zero, 0, decimal.Zero, 0, fmt.Errorf("error preparing query: %v", err) + return decimal.Zero, 0, decimal.Zero, 0, fmt.Errorf("error preparing query: %w", err) } err = d.alloyReader.GetContext(ctx, &elIncome, query, args...) @@ -945,7 +945,7 @@ func (d *DataAccessService) internal_getElClAPR(ctx context.Context, dashboardId query, args, err = elTotalDs.Prepared(true).ToSQL() if err != nil { - return decimal.Zero, 0, decimal.Zero, 0, fmt.Errorf("error preparing query: %v", err) + return decimal.Zero, 0, decimal.Zero, 0, fmt.Errorf("error preparing query: %w", err) } err = d.alloyReader.GetContext(ctx, &elIncome, query, args...) @@ -1018,7 +1018,7 @@ func (d *DataAccessService) GetValidatorDashboardSummaryChart(ctx context.Contex `, dataTable, dateColumn) err := d.clickhouseReader.SelectContext(ctx, &queryResults, query, afterTs, beforeTs, dashboardId.Validators) if err != nil { - return nil, fmt.Errorf("error retrieving data from table %s: %v", dataTable, err) + return nil, fmt.Errorf("error retrieving data from table %s: %w", dataTable, err) } } else { query := fmt.Sprintf(` @@ -1041,7 +1041,7 @@ func (d *DataAccessService) GetValidatorDashboardSummaryChart(ctx context.Contex err := d.clickhouseReader.SelectContext(ctx, &queryResults, query, afterTs, beforeTs, dashboardId.Id, groupIds, totalLineRequested) if err != nil { - return nil, fmt.Errorf("error retrieving data from table %s: %v", dataTable, err) + return nil, fmt.Errorf("error retrieving data from table %s: %w", dataTable, err) } } @@ -1178,7 +1178,7 @@ func (d *DataAccessService) GetLatestExportedChartTs(ctx context.Context, aggreg var ts time.Time err := d.clickhouseReader.GetContext(ctx, &ts, query) if err != nil { - return 0, fmt.Errorf("error retrieving latest exported chart timestamp: %v", err) + return 0, fmt.Errorf("error retrieving latest exported chart timestamp: %w", err) } return uint64(ts.Unix()), nil @@ -1518,12 +1518,12 @@ func (d *DataAccessService) GetValidatorDashboardSlashingsSummaryValidators(ctx query, args, err := ds.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } err = d.alloyReader.SelectContext(ctx, &queryResult, query, args...) if err != nil { - return fmt.Errorf("error retrieving data from table blocks_proposerslashings: %v", err) + return fmt.Errorf("error retrieving data from table blocks_proposerslashings: %w", err) } for _, queryEntry := range queryResult { @@ -1565,12 +1565,12 @@ func (d *DataAccessService) GetValidatorDashboardSlashingsSummaryValidators(ctx query, args, err := ds.Prepared(true).ToSQL() if err != nil { - return fmt.Errorf("error preparing query: %v", err) + return fmt.Errorf("error preparing query: %w", err) } err = d.alloyReader.SelectContext(ctx, &queryResult, query, args...) if err != nil { - return fmt.Errorf("error retrieving data from table blocks_attesterslashings: %v", err) + return fmt.Errorf("error retrieving data from table blocks_attesterslashings: %w", err) } for _, queryEntry := range queryResult { @@ -1707,12 +1707,12 @@ func (d *DataAccessService) GetValidatorDashboardProposalSummaryValidators(ctx c query, args, err = ds.Prepared(true).ToSQL() if err != nil { - return nil, fmt.Errorf("error preparing query: %v", err) + return nil, fmt.Errorf("error preparing query: %w", err) } err = d.alloyReader.SelectContext(ctx, &queryResult, query, args...) if err != nil { - return nil, fmt.Errorf("error retrieving data from table blocks: %v", err) + return nil, fmt.Errorf("error retrieving data from table blocks: %w", err) } // Process the data