chore(trie): replace ParallelStateRoot with AsyncStateRoot

crates/blockchain-tree/Cargo.toml

@@ -25,7 +25,7 @@ reth-execution-types.workspace = true
 reth-stages-api.workspace = true
 reth-trie = { workspace = true, features = ["metrics"] }
 reth-trie-db = { workspace = true, features = ["metrics"] }
-reth-trie-parallel = { workspace = true, features = ["parallel"] }
+reth-trie-parallel.workspace = true
 reth-network.workspace = true
 reth-consensus.workspace = true
 reth-node-types.workspace = true

crates/engine/tree/src/tree/mod.rs

@@ -40,7 +40,7 @@ use reth_provider::{
 use reth_revm::database::StateProviderDatabase;
 use reth_stages_api::ControlFlow;
 use reth_trie::{updates::TrieUpdates, HashedPostState, TrieInput};
-use reth_trie_parallel::async_root::{AsyncStateRoot, AsyncStateRootError};
+use reth_trie_parallel::parallel_root::{ParallelStateRoot, ParallelStateRootError};
 use std::{
     cmp::Ordering,
     collections::{btree_map, hash_map, BTreeMap, HashMap, HashSet, VecDeque},
@@ -2195,11 +2195,11 @@ where
         let persistence_in_progress = self.persistence_state.in_progress();
         if !persistence_in_progress {
             state_root_result = match self
-                .compute_state_root_async(block.parent_hash, &hashed_state)
+                .compute_state_root_parallel(block.parent_hash, &hashed_state)
             {
                 Ok((state_root, trie_output)) => Some((state_root, trie_output)),
-                Err(AsyncStateRootError::Provider(ProviderError::ConsistentView(error))) => {
-                    debug!(target: "engine::tree", %error, "Async state root computation failed consistency check, falling back");
+                Err(ParallelStateRootError::Provider(ProviderError::ConsistentView(error))) => {
+                    debug!(target: "engine", %error, "Parallel state root computation failed consistency check, falling back");
                     None
                 }
                 Err(error) => return Err(InsertBlockErrorKindTwo::Other(Box::new(error))),
@@ -2265,19 +2265,19 @@ where
         Ok(InsertPayloadOk2::Inserted(BlockStatus2::Valid))
     }
 
-    /// Compute state root for the given hashed post state asynchronously.
+    /// Compute state root for the given hashed post state in parallel.
     ///
     /// # Returns
     ///
     /// Returns `Ok(_)` if computed successfully.
     /// Returns `Err(_)` if error was encountered during computation.
     /// `Err(ProviderError::ConsistentView(_))` can be safely ignored and fallback computation
     /// should be used instead.
-    fn compute_state_root_async(
+    fn compute_state_root_parallel(
         &self,
         parent_hash: B256,
         hashed_state: &HashedPostState,
-    ) -> Result<(B256, TrieUpdates), AsyncStateRootError> {
+    ) -> Result<(B256, TrieUpdates), ParallelStateRootError> {
         let consistent_view = ConsistentDbView::new_with_latest_tip(self.provider.clone())?;
         let mut input = TrieInput::default();
 
@@ -2299,7 +2299,7 @@ where
         // Extend with block we are validating root for.
         input.append_ref(hashed_state);
 
-        AsyncStateRoot::new(consistent_view, input).incremental_root_with_updates()
+        ParallelStateRoot::new(consistent_view, input).incremental_root_with_updates()
     }
 
     /// Handles an error that occurred while inserting a block.

crates/trie/parallel/Cargo.toml

@@ -31,13 +31,8 @@ tracing.workspace = true
 # misc
 thiserror.workspace = true
 derive_more.workspace = true
-
-# `async` feature
-tokio = { workspace = true, optional = true, default-features = false }
-itertools = { workspace = true, optional = true }
-
-# `parallel` feature
-rayon = { workspace = true, optional = true }
+rayon.workspace = true
+itertools.workspace = true
 
 # `metrics` feature
 reth-metrics = { workspace = true, optional = true }
@@ -58,12 +53,9 @@ proptest.workspace = true
 proptest-arbitrary-interop.workspace = true
 
 [features]
-default = ["metrics", "async", "parallel"]
+default = ["metrics"]
 metrics = ["reth-metrics", "dep:metrics", "reth-trie/metrics"]
-async = ["tokio/sync", "itertools"]
-parallel = ["rayon"]
 
 [[bench]]
 name = "root"
-required-features = ["async", "parallel"]
 harness = false

crates/trie/parallel/benches/root.rs

@@ -13,7 +13,7 @@ use reth_trie::{
     TrieInput,
 };
 use reth_trie_db::{DatabaseHashedCursorFactory, DatabaseStateRoot};
-use reth_trie_parallel::{async_root::AsyncStateRoot, parallel_root::ParallelStateRoot};
+use reth_trie_parallel::parallel_root::ParallelStateRoot;
 use std::collections::HashMap;
 
 pub fn calculate_state_root(c: &mut Criterion) {
@@ -70,14 +70,6 @@ pub fn calculate_state_root(c: &mut Criterion) {
                 |calculator| async { calculator.incremental_root() },
             );
         });
-
-        // async root
-        group.bench_function(BenchmarkId::new("async root", size), |b| {
-            b.iter_with_setup(
-                || AsyncStateRoot::new(view.clone(), TrieInput::from_state(updated_state.clone())),
-                |calculator| calculator.incremental_root(),
-            );
-        });
     }
 }