From c00352023b8fe2368e399670eeee88e3a943ecf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= <peter@scroll.io>
Date: Thu, 20 Jun 2024 14:00:07 +0200
Subject: [PATCH] fix: update l1 db entry for curie transition block (#835)

---
 miner/scroll_worker.go | 16 +++++++++++-----
 params/version.go      |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/miner/scroll_worker.go b/miner/scroll_worker.go
index 749f290fb9..08bf4e3150 100644
--- a/miner/scroll_worker.go
+++ b/miner/scroll_worker.go
@@ -404,6 +404,11 @@ func (w *worker) startNewPipeline(timestamp int64) {
 	if w.chainConfig.CurieBlock != nil && w.chainConfig.CurieBlock.Cmp(header.Number) == 0 {
 		misc.ApplyCurieHardFork(parentState)
 
+		var nextL1MsgIndex uint64
+		if dbVal := rawdb.ReadFirstQueueIndexNotInL2Block(w.eth.ChainDb(), header.ParentHash); dbVal != nil {
+			nextL1MsgIndex = *dbVal
+		}
+
 		// zkEVM requirement: Curie transition block contains 0 transactions, bypass pipeline.
 		err = w.commit(&pipeline.Result{
 			// Note: Signer nodes will not store CCC results for empty blocks in their database.
@@ -411,11 +416,12 @@ func (w *worker) startNewPipeline(timestamp int64) {
 			// nodes will still store CCC results.
 			Rows: &types.RowConsumption{},
 			FinalBlock: &pipeline.BlockCandidate{
-				Header:        header,
-				State:         parentState,
-				Txs:           types.Transactions{},
-				Receipts:      types.Receipts{},
-				CoalescedLogs: []*types.Log{},
+				Header:         header,
+				State:          parentState,
+				Txs:            types.Transactions{},
+				Receipts:       types.Receipts{},
+				CoalescedLogs:  []*types.Log{},
+				NextL1MsgIndex: nextL1MsgIndex,
 			},
 		})
 
diff --git a/params/version.go b/params/version.go
index 620583445b..87e50a0db9 100644
--- a/params/version.go
+++ b/params/version.go
@@ -24,7 +24,7 @@ import (
 const (
 	VersionMajor = 5         // Major version component of the current release
 	VersionMinor = 4         // Minor version component of the current release
-	VersionPatch = 5         // Patch version component of the current release
+	VersionPatch = 6         // Patch version component of the current release
 	VersionMeta  = "mainnet" // Version metadata to append to the version string
 )