From d11e12832290ae7ac49cd38ef0fd8ef3fcd9e6b0 Mon Sep 17 00:00:00 2001
From: Daniel Liu <139250065@qq.com>
Date: Wed, 12 Nov 2025 12:47:58 +0800
Subject: [PATCH] trie: handle more batch commit errors in Database #25674
 (#1118)

Co-authored-by: Amir Hossein <77993374+Kamandlou@users.noreply.github.com>
---
 trie/database.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/trie/database.go b/trie/database.go
index 913770327e..c14ecb3852 100644
--- a/trie/database.go
+++ b/trie/database.go
@@ -677,8 +677,9 @@ func (db *Database) Commit(node common.Hash, report bool) error {
 	// Uncache any leftovers in the last batch
 	db.lock.Lock()
 	defer db.lock.Unlock()
-
-	batch.Replay(uncacher)
+	if err := batch.Replay(uncacher); err != nil {
+		return err
+	}
 	batch.Reset()
 
 	// Reset the storage counters and bumped metrics
@@ -723,9 +724,12 @@ func (db *Database) commit(hash common.Hash, batch ethdb.Batch, uncacher *cleane
 			return err
 		}
 		db.lock.Lock()
-		batch.Replay(uncacher)
+		err := batch.Replay(uncacher)
 		batch.Reset()
 		db.lock.Unlock()
+		if err != nil {
+			return err
+		}
 	}
 	return nil
 }