Merge pull request #209 from ethpandaops/pk910/fix-dequeue-block-calc…

…ulation fix dequeue block calculation
ethpandaops · Jan 8, 2025 · 2f6af44 · 2f6af44
2 parents 265c43f + 481894e
commit 2f6af44
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/indexer/execution/contract_indexer.go b/indexer/execution/contract_indexer.go
@@ -240,16 +240,9 @@ func (ci *contractIndexer[TxType]) processFinalizedBlocks(finalizedBlockNumber u
 		var txBlockHeader *types.Header
 
 		requestTxs := []*TxType{}
-		queueBlock := ci.state.FinalBlock
+		queueBlock := ci.state.FinalBlock + 1
 		queueLength := ci.state.FinalQueueLen
 
-		// we start crawling from the next block, so we need to decrease the queue length for the current block
-		if queueLength > ci.options.dequeueRate {
-			queueLength -= ci.options.dequeueRate
-		} else {
-			queueLength = 0
-		}
-
 		for idx := range logs {
 			log := &logs[idx]
 

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