new tmp fin/prefin w/o root hash

Author: dvush

crates/eth-sparse-mpt/Cargo.toml

@@ -17,7 +17,7 @@ rustc-hash = "2.0.0"
 rayon = "1.10.0"
 smallvec = "1.13.2"
 alloy-trie.workspace = true
-nybbles = { version = "0.3.3" }
+nybbles = { version = "0.3.3", features = ["serde"] }
 
 tracing.workspace = true
 

crates/eth-sparse-mpt/src/lib.rs

@@ -8,9 +8,8 @@
 
 use crate::utils::{HashMap, HashSet};
 use alloy_primitives::{Address, Bytes, B256};
-use reth_provider::{
-    providers::ConsistentDbView, BlockReader, DatabaseProviderFactory, ExecutionOutcome,
-};
+use reth_provider::{providers::ConsistentDbView, BlockReader, DatabaseProviderFactory};
+use revm::database::BundleState;
 use std::sync::Arc;
 
 #[cfg(any(test, feature = "benchmark-utils"))]
@@ -140,7 +139,7 @@ impl SparseTrieError {
 
 pub fn calculate_account_proofs_with_sparse_trie<Provider>(
     consistent_db_view: ConsistentDbView<Provider>,
-    outcome: &ExecutionOutcome,
+    outcome: &BundleState,
     proof_targets: &HashSet<Address>,
     shared_cache: &SparseTrieSharedCache,
     local_cache: &mut SparseTrieLocalCache,
@@ -165,6 +164,7 @@ where
                 consistent_db_view,
                 shared_cache.cache_v2.clone(),
                 outcome,
+		&[],
                 proof_targets,
             );
             match result {
@@ -182,7 +182,8 @@ where
 
 pub fn calculate_root_hash_with_sparse_trie<Provider>(
     consistent_db_view: ConsistentDbView<Provider>,
-    outcome: &ExecutionOutcome,
+    outcome: &BundleState,
+    incremental_change: &[Address],
     shared_cache: &SparseTrieSharedCache,
     local_cache: &mut SparseTrieLocalCache,
     thread_pool: &Option<RootHashThreadPool>,
@@ -196,6 +197,7 @@ where
             calculate_root_hash_with_sparse_trie_internal(
                 consistent_db_view,
                 outcome,
+		incremental_change,
                 shared_cache,
                 local_cache,
                 version,
@@ -205,6 +207,7 @@ where
         calculate_root_hash_with_sparse_trie_internal(
             consistent_db_view,
             outcome,
+	    incremental_change,
             shared_cache,
             local_cache,
             version,
@@ -214,7 +217,8 @@ where
 
 pub fn calculate_root_hash_with_sparse_trie_internal<Provider>(
     consistent_db_view: ConsistentDbView<Provider>,
-    outcome: &ExecutionOutcome,
+    outcome: &BundleState,
+    incremental_change: &[Address],
     shared_cache: &SparseTrieSharedCache,
     local_cache: &mut SparseTrieLocalCache,
     version: ETHSpareMPTVersion,
@@ -239,6 +243,7 @@ where
                 consistent_db_view,
                 shared_cache.cache_v2.clone(),
                 outcome,
+		incremental_change,
                 &Default::default(),
             );
             match result {

crates/eth-sparse-mpt/src/v1/reth_sparse_trie/mod.rs

@@ -2,8 +2,9 @@ use alloy_primitives::B256;
 use change_set::{prepare_change_set, prepare_change_set_for_prefetch};
 use hash::RootHashError;
 use reth_provider::{
-    providers::ConsistentDbView, BlockReader, DatabaseProviderFactory, ExecutionOutcome,
+    providers::ConsistentDbView, BlockReader, DatabaseProviderFactory, 
 };
+use revm::database::BundleState;
 use std::time::{Duration, Instant};
 
 pub mod change_set;
@@ -105,7 +106,7 @@ where
 /// * It uses rayon for parallelism and the thread pool should be configured from outside.
 pub fn calculate_root_hash_with_sparse_trie<Provider>(
     consistent_db_view: ConsistentDbView<Provider>,
-    outcome: &ExecutionOutcome,
+    outcome: &BundleState,
     shared_cache: SparseTrieSharedCache,
 ) -> (Result<B256, SparseTrieError>, SparseTrieMetrics)
 where
@@ -116,7 +117,7 @@ where
     let fetcher = TrieFetcher::new(consistent_db_view);
 
     let start = Instant::now();
-    let change_set = prepare_change_set(outcome.bundle_accounts_iter());
+    let change_set = prepare_change_set(outcome.state.iter().map(|(a, acc)| (*a, acc)));
     metrics.change_set_time += start.elapsed();
 
     // {