proper impl

Author: julienrbrt

sequencers/based/sequencer.go

@@ -37,6 +37,8 @@ type BasedSequencer struct {
 
 	// Cached transactions from the current DA block being processed
 	currentBatchTxs [][]byte
+	// DA epoch end time for timestamp calculation
+	currentDAEndTime time.Time
 }
 
 // NewBasedSequencer creates a new based sequencer instance
@@ -97,7 +99,6 @@ func (s *BasedSequencer) GetNextBatch(ctx context.Context, req coresequencer.Get
 	// If we have no cached transactions or we've consumed all from the current DA block,
 	// fetch the next DA epoch
 	daHeight := s.GetDAHeight()
-	t := time.Time{}
 
 	if len(s.currentBatchTxs) == 0 || s.checkpoint.TxIndex >= uint64(len(s.currentBatchTxs)) {
 		daEndTime, daEndHeight, err := s.fetchNextDAEpoch(ctx, req.MaxBytes)
@@ -106,7 +107,7 @@ func (s *BasedSequencer) GetNextBatch(ctx context.Context, req coresequencer.Get
 		}
 
 		daHeight = daEndHeight
-		t = daEndTime
+		s.currentDAEndTime = daEndTime
 	}
 
 	// Create batch from current position up to MaxBytes
@@ -132,11 +133,15 @@ func (s *BasedSequencer) GetNextBatch(ctx context.Context, req coresequencer.Get
 		}
 	}
 
+	// Calculate timestamp based on remaining transactions after this batch
+	// timestamp correspond to the last block time of a DA epoch, based on the remaining transactions to be executed
+	// this is done in order to handle the case where a DA epoch must fit in multiple blocks
+	remainingTxs := uint64(len(s.currentBatchTxs)) - s.checkpoint.TxIndex
+	timestamp := s.currentDAEndTime.Add(-time.Duration(remainingTxs) * time.Millisecond)
+
 	return &coresequencer.GetNextBatchResponse{
-		Batch: batch,
-		// timestamp correspond to the last block time of a DA epoch, based on the remaining transactions to be executed
-		// this is done in order to handle the case where a DA epoch must fit in multiple blocks
-		Timestamp: t.Add(-time.Duration(len(batch.Transactions)) * time.Millisecond),
+		Batch:     batch,
+		Timestamp: timestamp,
 		BatchData: req.LastBatchData,
 	}, nil
 }