From a260533684dafe7f840abf1a3ac62dadb3db2714 Mon Sep 17 00:00:00 2001
From: ligt <me@ligt.dev>
Date: Fri, 14 Nov 2025 12:10:09 +0700
Subject: [PATCH 1/4] feat: improve persistence write batch for hashpoststate

---
 .../provider/src/providers/database/provider.rs    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/crates/storage/provider/src/providers/database/provider.rs b/crates/storage/provider/src/providers/database/provider.rs
index 42b385cf606..270e0f14454 100644
--- a/crates/storage/provider/src/providers/database/provider.rs
+++ b/crates/storage/provider/src/providers/database/provider.rs
@@ -69,7 +69,7 @@ use reth_trie::{
         TrieCursorIter,
     },
     updates::{StorageTrieUpdatesSorted, TrieUpdatesSorted},
-    HashedPostStateSorted, StoredNibbles, StoredNibblesSubKey, TrieChangeSetsEntry,
+    HashedPostState, HashedPostStateSorted, StoredNibbles, StoredNibblesSubKey, TrieChangeSetsEntry,
 };
 use reth_trie_db::{
     DatabaseAccountTrieCursor, DatabaseStorageTrieCursor, DatabaseTrieCursorFactory,
@@ -305,12 +305,14 @@ impl<TX: DbTx + DbTxMut + 'static, N: NodeTypesForProvider> DatabaseProvider<TX,
 
         debug!(target: "providers::db", block_count = %blocks.len(), "Writing blocks and execution data to storage");
 
+        let mut aggregated_hashed_state = HashedPostState::default();
+
         // TODO: Do performant / batched writes for each type of object
         // instead of a loop over all blocks,
         // meaning:
         //  * blocks
         //  * state
-        //  * hashed state
+        //  * hashed state (already done)
         //  * trie updates (cannot naively extend, need helper)
         //  * indices (already done basically)
         // Insert the blocks
@@ -324,8 +326,7 @@ impl<TX: DbTx + DbTxMut + 'static, N: NodeTypesForProvider> DatabaseProvider<TX,
             // Must be written after blocks because of the receipt lookup.
             self.write_state(&execution_output, OriginalValuesKnown::No)?;
 
-            // insert hashes and intermediate merkle nodes
-            self.write_hashed_state(&Arc::unwrap_or_clone(hashed_state).into_sorted())?;
+            aggregated_hashed_state.extend(Arc::unwrap_or_clone(hashed_state));
 
             // sort trie updates and insert changesets
             let trie_updates_sorted = (*trie_updates).clone().into_sorted();
@@ -333,6 +334,11 @@ impl<TX: DbTx + DbTxMut + 'static, N: NodeTypesForProvider> DatabaseProvider<TX,
             self.write_trie_updates_sorted(&trie_updates_sorted)?;
         }
 
+        // batch insert hashes and intermediate merkle nodes
+        if !aggregated_hashed_state.is_empty() {
+            self.write_hashed_state(&aggregated_hashed_state.into_sorted())?;
+        }
+
         // update history indices
         self.update_history_indices(first_number..=last_block_number)?;
 

From 59cd2aabc41379899ba0e8d312172174240f3fcf Mon Sep 17 00:00:00 2001
From: ligt <me@ligt.dev>
Date: Fri, 14 Nov 2025 18:47:02 +0700
Subject: [PATCH 2/4] fix: lint

---
 crates/storage/provider/src/providers/database/provider.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/storage/provider/src/providers/database/provider.rs b/crates/storage/provider/src/providers/database/provider.rs
index 270e0f14454..cece8d0abe9 100644
--- a/crates/storage/provider/src/providers/database/provider.rs
+++ b/crates/storage/provider/src/providers/database/provider.rs
@@ -69,7 +69,8 @@ use reth_trie::{
         TrieCursorIter,
     },
     updates::{StorageTrieUpdatesSorted, TrieUpdatesSorted},
-    HashedPostState, HashedPostStateSorted, StoredNibbles, StoredNibblesSubKey, TrieChangeSetsEntry,
+    HashedPostState, HashedPostStateSorted, StoredNibbles, StoredNibblesSubKey,
+    TrieChangeSetsEntry,
 };
 use reth_trie_db::{
     DatabaseAccountTrieCursor, DatabaseStorageTrieCursor, DatabaseTrieCursorFactory,

From 82eec04777ec51d4bf82f017ad8dd8c56ce12548 Mon Sep 17 00:00:00 2001
From: ligt <me@ligt.dev>
Date: Fri, 14 Nov 2025 20:25:32 +0700
Subject: [PATCH 3/4] fix: nit

---
 crates/storage/provider/src/providers/database/provider.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/storage/provider/src/providers/database/provider.rs b/crates/storage/provider/src/providers/database/provider.rs
index cece8d0abe9..8a1ab6b9787 100644
--- a/crates/storage/provider/src/providers/database/provider.rs
+++ b/crates/storage/provider/src/providers/database/provider.rs
@@ -335,7 +335,7 @@ impl<TX: DbTx + DbTxMut + 'static, N: NodeTypesForProvider> DatabaseProvider<TX,
             self.write_trie_updates_sorted(&trie_updates_sorted)?;
         }
 
-        // batch insert hashes and intermediate merkle nodes
+        // batch insert hashes
         if !aggregated_hashed_state.is_empty() {
             self.write_hashed_state(&aggregated_hashed_state.into_sorted())?;
         }

From 6b71deb942044948e56d48d2e1fc51537814d3d5 Mon Sep 17 00:00:00 2001
From: ligt <me@ligt.dev>
Date: Fri, 14 Nov 2025 22:10:06 +0700
Subject: [PATCH 4/4] feat: improve write batch trie updates

---
 .../storage/provider/src/providers/database/provider.rs   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/crates/storage/provider/src/providers/database/provider.rs b/crates/storage/provider/src/providers/database/provider.rs
index 8a1ab6b9787..ed8e46b0475 100644
--- a/crates/storage/provider/src/providers/database/provider.rs
+++ b/crates/storage/provider/src/providers/database/provider.rs
@@ -307,6 +307,7 @@ impl<TX: DbTx + DbTxMut + 'static, N: NodeTypesForProvider> DatabaseProvider<TX,
         debug!(target: "providers::db", block_count = %blocks.len(), "Writing blocks and execution data to storage");
 
         let mut aggregated_hashed_state = HashedPostState::default();
+        let mut aggregated_trie_updates_sorted = TrieUpdatesSorted::default();
 
         // TODO: Do performant / batched writes for each type of object
         // instead of a loop over all blocks,
@@ -314,7 +315,7 @@ impl<TX: DbTx + DbTxMut + 'static, N: NodeTypesForProvider> DatabaseProvider<TX,
         //  * blocks
         //  * state
         //  * hashed state (already done)
-        //  * trie updates (cannot naively extend, need helper)
+        //  * trie updates sorted (already done)
         //  * indices (already done basically)
         // Insert the blocks
         for ExecutedBlock { recovered_block, execution_output, hashed_state, trie_updates } in
@@ -332,7 +333,7 @@ impl<TX: DbTx + DbTxMut + 'static, N: NodeTypesForProvider> DatabaseProvider<TX,
             // sort trie updates and insert changesets
             let trie_updates_sorted = (*trie_updates).clone().into_sorted();
             self.write_trie_changesets(block_number, &trie_updates_sorted, None)?;
-            self.write_trie_updates_sorted(&trie_updates_sorted)?;
+            aggregated_trie_updates_sorted.extend_ref(&trie_updates_sorted);
         }
 
         // batch insert hashes
@@ -340,6 +341,9 @@ impl<TX: DbTx + DbTxMut + 'static, N: NodeTypesForProvider> DatabaseProvider<TX,
             self.write_hashed_state(&aggregated_hashed_state.into_sorted())?;
         }
 
+        // batch write trie updates sorted
+        self.write_trie_updates_sorted(&aggregated_trie_updates_sorted)?;
+
         // update history indices
         self.update_history_indices(first_number..=last_block_number)?;