From 03f3b2b60df908434bdbd92e87ff0aefa21d2c63 Mon Sep 17 00:00:00 2001
From: colin <102356659+colinlyguo@users.noreply.github.com>
Date: Mon, 26 Aug 2024 17:15:29 +0800
Subject: [PATCH] fix(rollup-verifier): delete committed batch meta when
 reverting a batch (#1000)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(rollup-verifier): delete committed batch metadata when reverting a batch

* chore: auto version bump [bot]

* remove a comment

---------

Co-authored-by: colinlyguo <colinlyguo@users.noreply.github.com>
---
 core/rawdb/accessors_rollup_event.go              |  8 ++++++++
 core/rawdb/accessors_rollup_event_test.go         | 15 ++++++++++++++-
 params/version.go                                 |  2 +-
 rollup/rollup_sync_service/rollup_sync_service.go |  1 +
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/core/rawdb/accessors_rollup_event.go b/core/rawdb/accessors_rollup_event.go
index db12b6e671..6670b4b7b8 100644
--- a/core/rawdb/accessors_rollup_event.go
+++ b/core/rawdb/accessors_rollup_event.go
@@ -208,3 +208,11 @@ func ReadCommittedBatchMeta(db ethdb.Reader, batchIndex uint64) *CommittedBatchM
 	}
 	return cbm
 }
+
+// DeleteCommittedBatchMeta removes the block ranges of all chunks associated with a specific batch from the database.
+// Note: Only non-finalized batches can be reverted.
+func DeleteCommittedBatchMeta(db ethdb.KeyValueWriter, batchIndex uint64) {
+	if err := db.Delete(committedBatchMetaKey(batchIndex)); err != nil {
+		log.Crit("failed to delete committed batch metadata", "batch index", batchIndex, "err", err)
+	}
+}
diff --git a/core/rawdb/accessors_rollup_event_test.go b/core/rawdb/accessors_rollup_event_test.go
index 6110812944..c74e935243 100644
--- a/core/rawdb/accessors_rollup_event_test.go
+++ b/core/rawdb/accessors_rollup_event_test.go
@@ -211,7 +211,7 @@ func TestBatchChunkRanges(t *testing.T) {
 	DeleteBatchChunkRanges(db, uint64(len(chunks)+1))
 }
 
-func TestWriteReadCommittedBatchMeta(t *testing.T) {
+func TestWriteReadDeleteCommittedBatchMeta(t *testing.T) {
 	db := NewMemoryDatabase()
 
 	testCases := []struct {
@@ -261,6 +261,19 @@ func TestWriteReadCommittedBatchMeta(t *testing.T) {
 	if got := ReadCommittedBatchMeta(db, 256); got != nil {
 		t.Fatalf("Expected nil for non-existing value, got %+v", got)
 	}
+
+	// delete: revert batch
+	for _, tc := range testCases {
+		DeleteCommittedBatchMeta(db, tc.batchIndex)
+
+		readChunkRange := ReadCommittedBatchMeta(db, tc.batchIndex)
+		if readChunkRange != nil {
+			t.Fatal("Committed batch metadata was not deleted", "batch index", tc.batchIndex)
+		}
+	}
+
+	// delete non-existing value: ensure the delete operation handles non-existing values without errors.
+	DeleteCommittedBatchMeta(db, 256)
 }
 
 func TestOverwriteCommittedBatchMeta(t *testing.T) {
diff --git a/params/version.go b/params/version.go
index 47b277677a..fedc375ed9 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 = 6         // Minor version component of the current release
-	VersionPatch = 4         // Patch version component of the current release
+	VersionPatch = 5         // Patch version component of the current release
 	VersionMeta  = "mainnet" // Version metadata to append to the version string
 )
 
diff --git a/rollup/rollup_sync_service/rollup_sync_service.go b/rollup/rollup_sync_service/rollup_sync_service.go
index b5f86205b8..3991debcb1 100644
--- a/rollup/rollup_sync_service/rollup_sync_service.go
+++ b/rollup/rollup_sync_service/rollup_sync_service.go
@@ -219,6 +219,7 @@ func (s *RollupSyncService) parseAndUpdateRollupEventLogs(logs []types.Log, endB
 			batchIndex := event.BatchIndex.Uint64()
 			log.Trace("found new RevertBatch event", "batch index", batchIndex)
 
+			rawdb.DeleteCommittedBatchMeta(s.db, batchIndex)
 			rawdb.DeleteBatchChunkRanges(s.db, batchIndex)
 
 		case s.l1FinalizeBatchEventSignature: