fix order of requests from cahce (order by descending block index)

ethpandaops · Jan 7, 2025 · 481894e · 481894e
1 parent f588da2
commit 481894e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/services/chainservice_consolidations.go b/services/chainservice_consolidations.go
@@ -8,6 +8,7 @@ import (
 	"github.com/ethpandaops/dora/db"
 	"github.com/ethpandaops/dora/dbtypes"
 	"github.com/ethpandaops/dora/indexer/beacon"
+	"github.com/prysmaticlabs/prysm/v5/container/slice"
 	"github.com/sirupsen/logrus"
 )
 
@@ -211,6 +212,7 @@ func (bs *ChainService) GetConsolidationRequestOperationsByFilter(filter *dbtype
 				}
 
 				consolidationRequests := block.GetDbConsolidationRequests(bs.beaconIndexer)
+				slice.Reverse(consolidationRequests) // reverse as other datasources are ordered by descending block index too
 				for idx, consolidationRequest := range consolidationRequests {
 					if filter.MinSrcIndex > 0 && (consolidationRequest.SourceIndex == nil || *consolidationRequest.SourceIndex < filter.MinSrcIndex) {
 						continue

diff --git a/services/chainservice_withdrawals.go b/services/chainservice_withdrawals.go
@@ -8,6 +8,7 @@ import (
 	"github.com/ethpandaops/dora/db"
 	"github.com/ethpandaops/dora/dbtypes"
 	"github.com/ethpandaops/dora/indexer/beacon"
+	"github.com/prysmaticlabs/prysm/v5/container/slice"
 	"github.com/sirupsen/logrus"
 )
 
@@ -197,6 +198,7 @@ func (bs *ChainService) GetWithdrawalRequestOperationsByFilter(filter *dbtypes.W
 				}
 
 				withdrawalRequests := block.GetDbWithdrawalRequests(bs.beaconIndexer)
+				slice.Reverse(withdrawalRequests) // reverse as other datasources are ordered by descending block index too
 				for idx, withdrawalRequest := range withdrawalRequests {
 					if filter.MinIndex > 0 && (withdrawalRequest.ValidatorIndex == nil || *withdrawalRequest.ValidatorIndex < filter.MinIndex) {
 						continue