Skip to content

Commit d115d89

Browse files
committed
fix(api): copy&paste errors
1 parent d97b172 commit d115d89

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

backend/pkg/api/data_access/vdb_rewards.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func (d *DataAccessService) GetValidatorDashboardRewards(ctx context.Context, da
100100
elDs := goqu.Dialect("postgres").
101101
Select(
102102
goqu.L("b.epoch"),
103-
goqu.SUM(goqu.I("value")).As("el_rewards")).
103+
goqu.COALESCE(goqu.SUM(goqu.I("value")), 0).As("el_rewards")).
104104
From(goqu.L("users_val_dashboards_validators v")).
105105
Where(goqu.L("b.epoch >= ?", startEpoch)).
106106
LeftJoin(goqu.I("execution_rewards_finalized").As("b"), goqu.On(goqu.L("v.validator_index = b.proposer"))).
@@ -547,7 +547,7 @@ func (d *DataAccessService) GetValidatorDashboardGroupRewards(ctx context.Contex
547547

548548
elDs := goqu.Dialect("postgres").
549549
Select(
550-
goqu.SUM(goqu.I("value")).As("blocks_el_rewards")).
550+
goqu.COALESCE(goqu.SUM(goqu.I("value")), 0).As("blocks_el_rewards")).
551551
From(goqu.L("users_val_dashboards_validators v")).
552552
LeftJoin(goqu.I("execution_rewards_finalized").As("b"), goqu.On(goqu.L("v.validator_index = b.proposer"))).
553553
Where(goqu.L("b.epoch = ?", epoch))
@@ -712,7 +712,7 @@ func (d *DataAccessService) GetValidatorDashboardRewardsChart(ctx context.Contex
712712
elDs := goqu.Dialect("postgres").
713713
Select(
714714
goqu.L("b.epoch"),
715-
goqu.SUM(goqu.I("value")).As("el_rewards")).
715+
goqu.COALESCE(goqu.SUM(goqu.I("value")), 0).As("el_rewards")).
716716
From(goqu.L("users_val_dashboards_validators v")).
717717
Where(goqu.L("b.epoch >= ?", startEpoch)).
718718
LeftJoin(goqu.I("execution_rewards_finalized").As("b"), goqu.On(goqu.L("v.validator_index = b.proposer"))).
@@ -955,7 +955,7 @@ func (d *DataAccessService) GetValidatorDashboardDuties(ctx context.Context, das
955955
elDs := goqu.Dialect("postgres").
956956
Select(
957957
goqu.L("b.proposer"),
958-
goqu.SUM(goqu.I("value")).As("el_rewards")).
958+
goqu.COALESCE(goqu.SUM(goqu.I("value")), 0).As("el_rewards")).
959959
From(goqu.I("execution_rewards_finalized").As("b")).
960960
Where(goqu.L("b.epoch = ?", epoch)).
961961
GroupBy(goqu.L("b.proposer"))

backend/pkg/api/data_access/vdb_summary.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ func (d *DataAccessService) GetValidatorDashboardSummary(ctx context.Context, da
195195
elRewards := make(map[int64]decimal.Decimal)
196196
ds = goqu.Dialect("postgres").
197197
Select(
198-
goqu.SUM(goqu.I("value")).As("el_rewards")).
198+
goqu.COALESCE(goqu.SUM(goqu.I("value")), 0).As("el_rewards")).
199199
From(goqu.I("execution_rewards_finalized").As("b")).
200-
Where(goqu.L("b.epoch >= ? AND b.epoch <= ? AND b.status = '1'", epochMin, epochMax)).
200+
Where(goqu.L("b.epoch >= ? AND b.epoch <= ?", epochMin, epochMax)).
201201
GroupBy(goqu.L("result_group_id"))
202202

203203
if len(validators) > 0 {
@@ -918,8 +918,8 @@ func (d *DataAccessService) internal_getElClAPR(ctx context.Context, dashboardId
918918
}
919919

920920
elDs := goqu.Dialect("postgres").
921-
Select(goqu.SUM(goqu.I("value"))).
922-
From(goqu.I("execution_rewards_finalized")).As("b")
921+
Select(goqu.COALESCE(goqu.SUM(goqu.L("value / 1e18")), 0)).
922+
From(goqu.I("execution_rewards_finalized").As("b"))
923923

924924
if len(dashboardId.Validators) > 0 {
925925
elDs = elDs.

backend/pkg/exporter/modules/execution_rewards_finalizer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func (d *executionRewardsFinalizer) maintainTable() (err error) {
105105
goqu.I("b.epoch").As("epoch"),
106106
goqu.I("b.slot").As("slot"),
107107
goqu.I("b.proposer").As("proposer"),
108-
goqu.Func("sum", goqu.COALESCE(goqu.I("rb.value"), goqu.L("ep.fee_recipient_reward * '10e18'::numeric"), goqu.L("0::numeric"))).As("value"),
108+
goqu.Func("sum", goqu.COALESCE(goqu.I("rb.value"), goqu.L("ep.fee_recipient_reward * '1e18'::numeric"), goqu.L("0::numeric"))).As("value"),
109109
).
110110
Where(
111111
goqu.I("b.slot").Gt(lastExportedSlot),

0 commit comments

Comments
 (0)