Skip to content

fix: disable state root task when no changesets #19869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
+14 −4
Closed

fix: disable state root task when no changesets #19869

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e3e5ba
fix: disable state root task when no changesets
Rjected Nov 20, 2025
68b13a6
invert condition
Rjected Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions crates/engine/tree/src/tree/payload_validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ use reth_provider::{
StateRootProvider, TrieReader,
};
use reth_revm::db::State;
use reth_stages_api::StageId;
use reth_trie::{updates::TrieUpdates, HashedPostState, TrieInputSorted};
use reth_trie_parallel::root::{ParallelStateRoot, ParallelStateRootError};
use std::{collections::HashMap, sync::Arc, time::Instant};
Expand Down Expand Up @@ -132,6 +133,7 @@ where
+ StateProviderFactory
+ StateReader
+ HashedPostStateProvider
+ StageCheckpointReader
+ Clone
+ 'static,
Evm: ConfigureEvm<Primitives = N> + 'static,
Expand Down Expand Up @@ -368,7 +370,7 @@ where
let env = ExecutionEnv { evm_env, hash: input.hash(), parent_hash: input.parent_hash() };

// Plan the strategy used for state root computation.
let strategy = self.plan_state_root_computation();
let strategy = ensure_ok!(self.plan_state_root_computation());

debug!(
target: "engine::tree::payload_validator",
Expand Down Expand Up @@ -852,14 +854,21 @@ where
}

/// Determines the state root computation strategy based on configuration.
const fn plan_state_root_computation(&self) -> StateRootStrategy {
if self.config.state_root_fallback() {
fn plan_state_root_computation(&self) -> ProviderResult<StateRootStrategy> {
// If there are no changesets then it's not safe to use the parallel state root or state
// root task.
let changeset_progress_exists =
self.provider.get_stage_checkpoint(StageId::MerkleChangeSets)?.is_some();

let strategy = if self.config.state_root_fallback() || changeset_progress_exists {
StateRootStrategy::Synchronous
} else if self.config.use_state_root_task() {
StateRootStrategy::StateRootTask
} else {
StateRootStrategy::Parallel
}
};

Ok(strategy)
}

/// Called when an invalid block is encountered during validation.
Expand Down Expand Up @@ -1007,6 +1016,7 @@ where
+ StateProviderFactory
+ StateReader
+ HashedPostStateProvider
+ StageCheckpointReader
+ Clone
+ 'static,
N: NodePrimitives,
Expand Down
Loading