diff --git a/crates/engine/primitives/src/config.rs b/crates/engine/primitives/src/config.rs index 2cb5796648..bfdd61782d 100644 --- a/crates/engine/primitives/src/config.rs +++ b/crates/engine/primitives/src/config.rs @@ -169,8 +169,8 @@ pub struct TreeConfig { disable_proof_v2: bool, /// Whether to disable cache metrics recording (can be expensive with large cached state). disable_cache_metrics: bool, - /// Whether to enable sparse trie as cache. - enable_sparse_trie_as_cache: bool, + /// Whether to disable sparse trie cache. + disable_trie_cache: bool, /// Depth for sparse trie pruning after state root computation. sparse_trie_prune_depth: usize, /// Maximum number of storage tries to retain after pruning. @@ -204,7 +204,7 @@ impl Default for TreeConfig { account_worker_count: default_account_worker_count(), disable_proof_v2: false, disable_cache_metrics: false, - enable_sparse_trie_as_cache: false, + disable_trie_cache: false, sparse_trie_prune_depth: DEFAULT_SPARSE_TRIE_PRUNE_DEPTH, sparse_trie_max_storage_tries: DEFAULT_SPARSE_TRIE_MAX_STORAGE_TRIES, } @@ -267,7 +267,7 @@ impl TreeConfig { account_worker_count, disable_proof_v2, disable_cache_metrics, - enable_sparse_trie_as_cache: false, + disable_trie_cache: false, sparse_trie_prune_depth, sparse_trie_max_storage_tries, } @@ -586,14 +586,14 @@ impl TreeConfig { self } - /// Returns whether sparse trie as cache is enabled. - pub const fn enable_sparse_trie_as_cache(&self) -> bool { - self.enable_sparse_trie_as_cache + /// Returns whether sparse trie cache is disabled. + pub const fn disable_trie_cache(&self) -> bool { + self.disable_trie_cache } - /// Setter for whether to enable sparse trie as cache. - pub const fn with_enable_sparse_trie_as_cache(mut self, value: bool) -> Self { - self.enable_sparse_trie_as_cache = value; + /// Setter for whether to disable sparse trie cache. + pub const fn with_disable_trie_cache(mut self, value: bool) -> Self { + self.disable_trie_cache = value; self } diff --git a/crates/engine/tree/src/tree/payload_processor/mod.rs b/crates/engine/tree/src/tree/payload_processor/mod.rs index b132c7faf8..8dff23056d 100644 --- a/crates/engine/tree/src/tree/payload_processor/mod.rs +++ b/crates/engine/tree/src/tree/payload_processor/mod.rs @@ -288,7 +288,7 @@ where v2_proofs_enabled, ); - if !config.enable_sparse_trie_as_cache() { + if config.disable_trie_cache() { let multi_proof_task = MultiProofTask::new( proof_handle.clone(), to_sparse_trie, @@ -512,7 +512,7 @@ where ) { let preserved_sparse_trie = self.sparse_state_trie.clone(); let trie_metrics = self.trie_metrics.clone(); - let disable_sparse_trie_as_cache = !config.enable_sparse_trie_as_cache(); + let disable_trie_cache = config.disable_trie_cache(); let prune_depth = self.sparse_trie_prune_depth; let max_storage_tries = self.sparse_trie_max_storage_tries; let chunk_size = @@ -552,7 +552,7 @@ where .with_updates(true) }); - let mut task = if disable_sparse_trie_as_cache { + let mut task = if disable_trie_cache { SpawnedSparseTrieTask::Cleared(SparseTrieTask::new( sparse_trie_rx, proof_worker_handle, diff --git a/crates/node/core/src/args/engine.rs b/crates/node/core/src/args/engine.rs index 90bffeba9f..daa0b45b50 100644 --- a/crates/node/core/src/args/engine.rs +++ b/crates/node/core/src/args/engine.rs @@ -40,7 +40,7 @@ pub struct DefaultEngineValues { account_worker_count: Option, disable_proof_v2: bool, cache_metrics_disabled: bool, - enable_sparse_trie_as_cache: bool, + disable_trie_cache: bool, sparse_trie_prune_depth: usize, sparse_trie_max_storage_tries: usize, } @@ -179,9 +179,9 @@ impl DefaultEngineValues { self } - /// Set whether to enable sparse trie as cache by default - pub const fn with_enable_sparse_trie_as_cache(mut self, v: bool) -> Self { - self.enable_sparse_trie_as_cache = v; + /// Set whether to disable sparse trie cache by default + pub const fn with_disable_trie_cache(mut self, v: bool) -> Self { + self.disable_trie_cache = v; self } @@ -221,7 +221,7 @@ impl Default for DefaultEngineValues { account_worker_count: None, disable_proof_v2: false, cache_metrics_disabled: false, - enable_sparse_trie_as_cache: false, + disable_trie_cache: false, sparse_trie_prune_depth: DEFAULT_SPARSE_TRIE_PRUNE_DEPTH, sparse_trie_max_storage_tries: DEFAULT_SPARSE_TRIE_MAX_STORAGE_TRIES, } @@ -352,16 +352,16 @@ pub struct EngineArgs { #[arg(long = "engine.disable-cache-metrics", default_value_t = DefaultEngineValues::get_global().cache_metrics_disabled)] pub cache_metrics_disabled: bool, - /// Enable sparse trie as cache. - #[arg(long = "engine.enable-sparse-trie-as-cache", default_value_t = DefaultEngineValues::get_global().enable_sparse_trie_as_cache, conflicts_with = "disable_proof_v2")] - pub enable_sparse_trie_as_cache: bool, + /// Disable sparse trie cache. + #[arg(long = "engine.disable-trie-cache", default_value_t = DefaultEngineValues::get_global().disable_trie_cache, conflicts_with = "disable_proof_v2")] + pub disable_trie_cache: bool, /// Sparse trie prune depth. - #[arg(long = "engine.sparse-trie-prune-depth", default_value_t = DefaultEngineValues::get_global().sparse_trie_prune_depth, requires = "enable_sparse_trie_as_cache")] + #[arg(long = "engine.sparse-trie-prune-depth", default_value_t = DefaultEngineValues::get_global().sparse_trie_prune_depth)] pub sparse_trie_prune_depth: usize, /// Maximum number of storage tries to retain after sparse trie pruning. - #[arg(long = "engine.sparse-trie-max-storage-tries", default_value_t = DefaultEngineValues::get_global().sparse_trie_max_storage_tries, requires = "enable_sparse_trie_as_cache")] + #[arg(long = "engine.sparse-trie-max-storage-tries", default_value_t = DefaultEngineValues::get_global().sparse_trie_max_storage_tries)] pub sparse_trie_max_storage_tries: usize, } @@ -389,7 +389,7 @@ impl Default for EngineArgs { account_worker_count, disable_proof_v2, cache_metrics_disabled, - enable_sparse_trie_as_cache, + disable_trie_cache, sparse_trie_prune_depth, sparse_trie_max_storage_tries, } = DefaultEngineValues::get_global().clone(); @@ -418,7 +418,7 @@ impl Default for EngineArgs { account_worker_count, disable_proof_v2, cache_metrics_disabled, - enable_sparse_trie_as_cache, + disable_trie_cache, sparse_trie_prune_depth, sparse_trie_max_storage_tries, } @@ -450,7 +450,7 @@ impl EngineArgs { .with_account_worker_count_opt(self.account_worker_count) .with_disable_proof_v2(self.disable_proof_v2) .without_cache_metrics(self.cache_metrics_disabled) - .with_enable_sparse_trie_as_cache(self.enable_sparse_trie_as_cache) + .with_disable_trie_cache(self.disable_trie_cache) .with_sparse_trie_prune_depth(self.sparse_trie_prune_depth) .with_sparse_trie_max_storage_tries(self.sparse_trie_max_storage_tries) } @@ -503,7 +503,7 @@ mod tests { account_worker_count: Some(8), disable_proof_v2: false, cache_metrics_disabled: true, - enable_sparse_trie_as_cache: true, + disable_trie_cache: true, sparse_trie_prune_depth: 10, sparse_trie_max_storage_tries: 100, }; @@ -536,7 +536,7 @@ mod tests { "--engine.account-worker-count", "8", "--engine.disable-cache-metrics", - "--engine.enable-sparse-trie-as-cache", + "--engine.disable-trie-cache", "--engine.sparse-trie-prune-depth", "10", "--engine.sparse-trie-max-storage-tries", diff --git a/docs/vocs/docs/pages/cli/reth/node.mdx b/docs/vocs/docs/pages/cli/reth/node.mdx index d9949669cb..356fe24a9c 100644 --- a/docs/vocs/docs/pages/cli/reth/node.mdx +++ b/docs/vocs/docs/pages/cli/reth/node.mdx @@ -1009,8 +1009,8 @@ Engine: --engine.disable-cache-metrics Disable cache metrics recording, which can take up to 50ms with large cached state - --engine.enable-sparse-trie-as-cache - Enable sparse trie as cache + --engine.disable-trie-cache + Disable sparse trie cache --engine.sparse-trie-prune-depth Sparse trie prune depth