address review comments

Author: jonastheis

core/rawdb/accessors_l1_message.go

@@ -210,7 +210,8 @@ func (it *L1MessageIterator) Error() error {
 
 // L1MessageV1Iterator is a wrapper around L1MessageIterator that allows us to iterate over L1 messages V1.
 type L1MessageV1Iterator struct {
-	db ethdb.Database
+	db           ethdb.Database
+	v2StartIndex *uint64
 	L1MessageIterator
 }
 
@@ -220,6 +221,7 @@ type L1MessageV1Iterator struct {
 func IterateL1MessagesV1From(db ethdb.Database, fromQueueIndex uint64) L1MessageV1Iterator {
 	return L1MessageV1Iterator{
 		db:                db,
+		v2StartIndex:      ReadL1MessageV2StartIndex(db),
 		L1MessageIterator: iterateL1MessagesFrom(db, fromQueueIndex),
 	}
 }
@@ -228,9 +230,12 @@ func (it *L1MessageV1Iterator) Next() bool {
 	for it.L1MessageIterator.Next() {
 		// L1MessageV2StartIndex is the first queue index of L1 messages that are from L1MessageQueueV2.
 		// Therefore, we stop reading L1 messages V1 when we reach this index.
-		// We need to check in every iteration as the start index can be set in the meantime when we are reading L1 messages.
-		v2StartIndex := ReadL1MessageV2StartIndex(it.db)
-		if v2StartIndex != nil && it.QueueIndex() >= *v2StartIndex {
+		// We need to check in every iteration if not yet set as the start index can be set in the meantime when we are reading L1 messages.
+		if it.v2StartIndex == nil {
+			it.v2StartIndex = ReadL1MessageV2StartIndex(it.db)
+		}
+
+		if it.v2StartIndex != nil && it.QueueIndex() >= *it.v2StartIndex {
 			return false
 		}
 		return true

core/rawdb/schema.go

@@ -109,8 +109,8 @@ var (
 	l1MessagePrefix                   = []byte("L1") // l1MessagePrefix + queueIndex (uint64 big endian) -> L1MessageTx
 	firstQueueIndexNotInL2BlockPrefix = []byte("q")  // firstQueueIndexNotInL2BlockPrefix + L2 block hash -> enqueue index
 	highestSyncedQueueIndexKey        = []byte("HighestSyncedQueueIndex")
-	l1MessageV2StartIndexKey          = []byte("L1MessageV2StartIndex")
-	l1MessageV2FirstL1BlockNumberKey  = []byte("L1MessageV2FirstL1BlockNumber")
+	l1MessageV2StartIndexKey          = []byte("MessageQueueV2StartIndex")
+	l1MessageV2FirstL1BlockNumberKey  = []byte("MessageQueueV2FirstL1BlockNumber")
 
 	// Scroll rollup event store
 	rollupEventSyncedL1BlockNumberKey = []byte("R-LastRollupEventSyncedL1BlockNumber")

rollup/sync_service/sync_service.go

@@ -262,6 +262,7 @@ func (s *SyncService) fetchMessages() {
 		// write start index of very first L1MessageV2 to database. This is true only once.
 		if len(msgsV2) > 0 && l1MessageV2StartIndex == nil {
 			firstL1MessageV2 := msgsV2[0]
+			log.Info("Received first L1Message from MessageQueueV2", "queueIndex", firstL1MessageV2.QueueIndex, "L1 blockNumber", to)
 			l1MessageV2StartIndex = &firstL1MessageV2.QueueIndex
 			rawdb.WriteL1MessageV2StartIndex(batchWriter, firstL1MessageV2.QueueIndex)
 			rawdb.WriteL1MessageV2FirstL1BlockNumber(batchWriter, to)