From fcd44d9b57a4cc8bd3b82a74693d48e0eb4144f5 Mon Sep 17 00:00:00 2001
From: "Peter (bitfly)" <1674920+peterbitfly@users.noreply.github.com>
Date: Tue, 5 Nov 2024 09:14:54 +0100
Subject: [PATCH] fix(dashboard): properly filter data set in blocks query
 (#1082)

---
 backend/pkg/api/data_access/vdb_blocks.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/pkg/api/data_access/vdb_blocks.go b/backend/pkg/api/data_access/vdb_blocks.go
index 47bbd651f..57270353f 100644
--- a/backend/pkg/api/data_access/vdb_blocks.go
+++ b/backend/pkg/api/data_access/vdb_blocks.go
@@ -145,6 +145,7 @@ func (d *DataAccessService) GetValidatorDashboardBlocks(ctx context.Context, das
 					goqu.I("relays_blocks.exec_block_hash"),
 					goqu.I("relays_blocks.proposer_fee_recipient"),
 					goqu.MAX(goqu.I("relays_blocks.value")).As("value")).
+				Where(goqu.I("relays_blocks.exec_block_hash").Eq(blocks.Col("exec_block_hash"))).
 				GroupBy(
 					"exec_block_hash",
 					"proposer_fee_recipient",
@@ -310,10 +311,12 @@ func (d *DataAccessService) GetValidatorDashboardBlocks(ctx context.Context, das
 		Reward decimal.Decimal
 	}
 	startTime := time.Now()
-	query, args, err := blocksDs.Prepared(true).ToSQL()
+	query, args, err := blocksDs.Prepared(false).ToSQL()
 	if err != nil {
 		return nil, nil, err
 	}
+
+	log.Info(query)
 	err = d.alloyReader.SelectContext(ctx, &proposals, query, args...)
 	log.Debugf("=== getting past blocks took %s", time.Since(startTime))
 	if err != nil {