feat: DatabaseCommit::commit_iter (#3197)

0xForerunner · rakita · web-flow · commit 049da177f341 · 2025-12-03T10:43:21.000+01:00
* feat: DatabaseCommit::commit_iter * feat: DatabaseCommit::commit_iter for State * revert: return Iterator for apply_evm_state * Apply suggestion from @rakita --------- Co-authored-by: rakita <rakita@users.noreply.github.com>
diff --git a/crates/database/interface/src/lib.rs b/crates/database/interface/src/lib.rs
@@ -71,6 +71,16 @@ pub trait Database {
 pub trait DatabaseCommit {
     /// Commit changes to the database.
     fn commit(&mut self, changes: HashMap<Address, Account>);
+
+    /// Commit changes to the database with an iterator.
+    ///
+    /// Implementors of [`DatabaseCommit`] should override this method when possible for efficiency.
+    ///
+    /// Callers should prefer using [`DatabaseCommit::commit`] when they already have a [`HashMap`].
+    fn commit_iter(&mut self, changes: impl IntoIterator<Item = (Address, Account)>) {
+        let changes: HashMap<Address, Account> = changes.into_iter().collect();
+        self.commit(changes);
+    }
 }
 
 /// EVM database interface.
diff --git a/crates/database/src/states/cache.rs b/crates/database/src/states/cache.rs
@@ -3,7 +3,7 @@ use super::{
 };
 use bytecode::Bytecode;
 use primitives::{Address, HashMap, B256};
-use state::{Account, AccountInfo, EvmState};
+use state::{Account, AccountInfo};
 use std::vec::Vec;
 
 /// Cache state contains both modified and original values
@@ -89,14 +89,18 @@ impl CacheState {
     }
 
     /// Applies output of revm execution and create account transitions that are used to build BundleState.
-    pub fn apply_evm_state(&mut self, evm_state: EvmState) -> Vec<(Address, TransitionAccount)> {
-        let mut transitions = Vec::with_capacity(evm_state.len());
-        for (address, account) in evm_state {
-            if let Some(transition) = self.apply_account_state(address, account) {
-                transitions.push((address, transition));
-            }
-        }
-        transitions
+    #[inline]
+    pub fn apply_evm_state(
+        &mut self,
+        evm_state: impl IntoIterator<Item = (Address, Account)>,
+    ) -> Vec<(Address, TransitionAccount)> {
+        evm_state
+            .into_iter()
+            .filter_map(|(address, account)| {
+                self.apply_account_state(address, account)
+                    .map(|transition| (address, transition))
+            })
+            .collect()
     }
 
     /// Pretty print the cache state for debugging purposes.
diff --git a/crates/database/src/states/state.rs b/crates/database/src/states/state.rs
@@ -166,7 +166,10 @@ impl<DB: Database> State<DB> {
     }
 
     /// Applies evm transitions to transition state.
-    pub fn apply_transition(&mut self, transitions: Vec<(Address, TransitionAccount)>) {
+    pub fn apply_transition(
+        &mut self,
+        transitions: impl IntoIterator<Item = (Address, TransitionAccount)>,
+    ) {
         // Add transition to transition state.
         if let Some(s) = self.transition_state.as_mut() {
             s.add_transitions(transitions)
@@ -315,9 +318,18 @@ impl<DB: Database> Database for State<DB> {
 }
 
 impl<DB: Database> DatabaseCommit for State<DB> {
-    fn commit(&mut self, evm_state: HashMap<Address, Account>) {
-        let transitions = self.cache.apply_evm_state(evm_state);
-        self.apply_transition(transitions);
+    fn commit(&mut self, changes: HashMap<Address, Account>) {
+        let transitions = self.cache.apply_evm_state(changes);
+        if let Some(s) = self.transition_state.as_mut() {
+            s.add_transitions(transitions)
+        }
+    }
+
+    fn commit_iter(&mut self, changes: impl IntoIterator<Item = (Address, Account)>) {
+        let transitions = self.cache.apply_evm_state(changes);
+        if let Some(s) = self.transition_state.as_mut() {
+            s.add_transitions(transitions)
+        }
     }
 }
 
diff --git a/crates/database/src/states/transition_state.rs b/crates/database/src/states/transition_state.rs
@@ -1,6 +1,5 @@
 use super::TransitionAccount;
 use primitives::{hash_map::Entry, Address, HashMap};
-use std::vec::Vec;
 
 /// State of accounts in transition between transaction executions.
 #[derive(Clone, Default, Debug, PartialEq, Eq)]
@@ -29,7 +28,10 @@ impl TransitionState {
     ///
     /// This will insert new [`TransitionAccount`]s, or update existing ones via
     /// [`update`][TransitionAccount::update].
-    pub fn add_transitions(&mut self, transitions: Vec<(Address, TransitionAccount)>) {
+    pub fn add_transitions(
+        &mut self,
+        transitions: impl IntoIterator<Item = (Address, TransitionAccount)>,
+    ) {
         for (address, account) in transitions {
             match self.transitions.entry(address) {
                 Entry::Occupied(entry) => {
