fix issues with chunks when handling CodecV7

Author: jonastheis

rollup/internal/controller/watcher/batch_proposer.go

@@ -291,11 +291,15 @@ func (p *BatchProposer) proposeBatch() error {
 	var batch encoding.Batch
 	batch.Index = dbParentBatch.Index + 1
 	batch.ParentBatchHash = common.HexToHash(dbParentBatch.Hash)
-	batch.TotalL1MessagePoppedBefore = firstUnbatchedChunk.TotalL1MessagesPoppedBefore
+	batch.InitialL1MessageIndex = firstUnbatchedChunk.TotalL1MessagesPoppedBefore
+	batch.TotalL1MessagePoppedBefore = firstUnbatchedChunk.TotalL1MessagesPoppedBefore // set for compatibility within relayer
 	batch.InitialL1MessageQueueHash = common.HexToHash(firstUnbatchedChunk.InitialL1MessageQueueHash)
 
 	for i, chunk := range daChunks {
 		batch.Chunks = append(batch.Chunks, chunk)
+		if codec.Version() >= encoding.CodecV7 {
+			batch.Blocks = append(batch.Blocks, chunk.Blocks...)
+		}
 		batch.LastL1MessageQueueHash = common.HexToHash(dbChunks[i].LastL1MessageQueueHash)
 
 		metrics, calcErr := utils.CalculateBatchMetrics(&batch, codec.Version())
@@ -370,7 +374,10 @@ func (p *BatchProposer) getDAChunks(dbChunks []*orm.Chunk) ([]*encoding.Chunk, e
 			return nil, err
 		}
 		chunks[i] = &encoding.Chunk{
-			Blocks: blocks,
+			Blocks:                    blocks,
+			InitialL1MessageIndex:     c.TotalL1MessagesPoppedBefore,
+			InitialL1MessageQueueHash: common.HexToHash(c.InitialL1MessageQueueHash),
+			LastL1MessageQueueHash:    common.HexToHash(c.LastL1MessageQueueHash),
 		}
 	}
 	return chunks, nil

rollup/internal/controller/watcher/chunk_proposer.go

@@ -312,20 +312,11 @@ func (p *ChunkProposer) proposeChunk() error {
 
 		// previous chunk is not CodecV7, this means this is the first chunk of the fork.
 		if encoding.CodecVersion(parentChunk.CodecVersion) < codecVersion {
-			// double check with the previous block
-			prevBlocks, err := p.l2BlockOrm.GetL2BlocksGEHeight(p.ctx, blocks[0].Header.Number.Uint64()-1, 1)
-			if err != nil || len(prevBlocks) == 0 || prevBlocks[0].Header.Hash() != blocks[0].Header.ParentHash {
-				return fmt.Errorf("failed to get parent block: %w", err)
-			}
-			// We expect the previous block to be not EuclidV2. If it is something went wrong.
-			if p.chainCfg.IsEuclidV2(prevBlocks[0].Header.Time) {
-				return fmt.Errorf("unexpected EuclidV2 block: %v, current block: %d, chunk version: %d, parent chunk version: %d, parent chunk index: %d", prevBlocks[0].Header.Number, blocks[0].Header.Number, codecVersion, parentChunk.CodecVersion, parentChunk.Index)
-			}
-
 			chunk.InitialL1MessageQueueHash = common.Hash{}
 		}
 
 		chunk.LastL1MessageQueueHash = chunk.InitialL1MessageQueueHash
+		chunk.InitialL1MessageIndex = parentChunk.TotalL1MessagesPoppedBefore + parentChunk.TotalL1MessagesPoppedInChunk
 	}
 
 	var previousLastL1MessageQueueHash common.Hash