refactor(db): use hashed state as canonical state representation (#21115)

Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: Dan Cline <6798349+Rjected@users.noreply.github.com>
Co-authored-by: joshieDo <93316087+joshieDo@users.noreply.github.com>

crates/node/core/src/args/mod.rs

@@ -80,7 +80,7 @@ pub use static_files::{StaticFilesArgs, MINIMAL_BLOCKS_PER_FILE};
 mod rocksdb;
 pub use rocksdb::{RocksDbArgs, RocksDbArgsError};
 
-/// `StorageArgs` for configuring storage mode (v2 vs v1/legacy).
+/// `StorageArgs` for configuring storage settings.
 mod storage;
 pub use storage::StorageArgs;
 

crates/node/core/src/args/storage.rs

@@ -1,11 +1,13 @@
-//! clap [Args](clap::Args) for storage mode configuration
+//! clap [Args](clap::Args) for storage configuration
 
 use clap::{ArgAction, Args};
 
-/// Parameters for storage mode configuration.
+/// Parameters for storage configuration.
 ///
 /// This controls whether the node uses v2 storage defaults (with `RocksDB` and static file
 /// optimizations) or v1/legacy storage defaults.
+///
+/// Individual storage settings can be overridden with `--static-files.*` and `--rocksdb.*` flags.
 #[derive(Debug, Args, PartialEq, Eq, Clone, Copy, Default)]
 #[command(next_help_heading = "Storage")]
 pub struct StorageArgs {
@@ -40,21 +42,24 @@ mod tests {
     use super::*;
     use clap::Parser;
 
+    /// A helper type to parse Args more easily
     #[derive(Parser)]
-    struct CommandParser {
+    struct CommandParser<T: Args> {
         #[command(flatten)]
-        args: StorageArgs,
+        args: T,
     }
 
     #[test]
     fn test_default_storage_args() {
-        let args = CommandParser::parse_from(["reth"]).args;
+        let default_args = StorageArgs::default();
+        let args = CommandParser::<StorageArgs>::parse_from(["reth"]).args;
+        assert_eq!(args, default_args);
         assert!(!args.v2);
     }
 
     #[test]
     fn test_parse_v2_flag() {
-        let args = CommandParser::parse_from(["reth", "--storage.v2"]).args;
+        let args = CommandParser::<StorageArgs>::parse_from(["reth", "--storage.v2"]).args;
         assert!(args.v2);
     }
 }

crates/node/core/src/node_config.rs

@@ -155,7 +155,7 @@ pub struct NodeConfig<ChainSpec> {
     /// All `RocksDB` table routing arguments
     pub rocksdb: RocksDbArgs,
 
-    /// Storage mode configuration (v2 vs v1/legacy)
+    /// All storage related arguments with --storage prefix
     pub storage: StorageArgs,
 }
 
@@ -355,6 +355,12 @@ impl<ChainSpec> NodeConfig<ChainSpec> {
         self
     }
 
+    /// Set the storage args for the node
+    pub const fn with_storage(mut self, storage: StorageArgs) -> Self {
+        self.storage = storage;
+        self
+    }
+
     /// Returns pruning configuration.
     pub fn prune_config(&self) -> Option<PruneConfig>
     where
@@ -398,6 +404,13 @@ impl<ChainSpec> NodeConfig<ChainSpec> {
 
         s = s.with_use_hashed_state(self.storage.use_hashed_state);
 
+        if s.use_hashed_state {
+            s = s.with_storage_changesets_in_static_files(true);
+        }
+        if s.storage_changesets_in_static_files {
+            s = s.with_use_hashed_state(true);
+        }
+
         s
     }