fix(db-common): compute state root when initializing from genesis (#17731)

Cargo.lock

@@ -2264,7 +2264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2690,7 +2690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976"
 dependencies = [
  "data-encoding",
- "syn 1.0.109",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -3134,7 +3134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4391,7 +4391,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core 0.61.2",
+ "windows-core 0.57.0",
 ]
 
 [[package]]
@@ -4836,7 +4836,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5192,7 +5192,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if",
- "windows-targets 0.53.2",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -6738,7 +6738,7 @@ dependencies = [
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7586,6 +7586,7 @@ dependencies = [
  "reth-db",
  "reth-db-api",
  "reth-etl",
+ "reth-execution-errors",
  "reth-fs-util",
  "reth-node-types",
  "reth-primitives-traits",
@@ -10596,8 +10597,7 @@ dependencies = [
 [[package]]
 name = "revm"
 version = "26.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b2a493c73054a0f6635bad6e840cdbef34838e6e6186974833c901dff7dd709"
+source = "git+https://github.com/bluealloy/revm?branch=performance-modexp#0d28a202be2555808ab61a2e3cfa7063df92b6a7"
 dependencies = [
  "revm-bytecode",
  "revm-context",
@@ -10615,8 +10615,7 @@ dependencies = [
 [[package]]
 name = "revm-bytecode"
 version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b395ee2212d44fcde20e9425916fee685b5440c3f8e01fabae8b0f07a2fd7f08"
+source = "git+https://github.com/bluealloy/revm?branch=performance-modexp#0d28a202be2555808ab61a2e3cfa7063df92b6a7"
 dependencies = [
  "bitvec",
  "once_cell",
@@ -10628,8 +10627,7 @@ dependencies = [
 [[package]]
 name = "revm-context"
 version = "7.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b97b69d05651509b809eb7215a6563dc64be76a941666c40aabe597ab544d38"
+source = "git+https://github.com/bluealloy/revm?branch=performance-modexp#0d28a202be2555808ab61a2e3cfa7063df92b6a7"
 dependencies = [
  "cfg-if",
  "derive-where",
@@ -10644,8 +10642,7 @@ dependencies = [
 [[package]]
 name = "revm-context-interface"
 version = "7.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f8f4f06a1c43bf8e6148509aa06a6c4d28421541944842b9b11ea1a6e53468f"
+source = "git+https://github.com/bluealloy/revm?branch=performance-modexp#0d28a202be2555808ab61a2e3cfa7063df92b6a7"
 dependencies = [
  "alloy-eip2930",
  "alloy-eip7702",
@@ -10660,8 +10657,7 @@ dependencies = [
 [[package]]
 name = "revm-database"
 version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763eb5867a109a85f8e47f548b9d88c9143c0e443ec056742052f059fa32f4f1"
+source = "git+https://github.com/bluealloy/revm?branch=performance-modexp#0d28a202be2555808ab61a2e3cfa7063df92b6a7"
 dependencies = [
  "alloy-eips",
  "revm-bytecode",
@@ -10674,8 +10670,7 @@ dependencies = [
 [[package]]
 name = "revm-database-interface"
 version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf5ecd19a5b75b862841113b9abdd864ad4b22e633810e11e6d620e8207e361d"
+source = "git+https://github.com/bluealloy/revm?branch=performance-modexp#0d28a202be2555808ab61a2e3cfa7063df92b6a7"
 dependencies = [
  "auto_impl",
  "revm-primitives",
@@ -10686,8 +10681,7 @@ dependencies = [
 [[package]]
 name = "revm-handler"
 version = "7.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b61f992beaa7a5fc3f5fcf79f1093624fa1557dc42d36baa42114c2d836b59"
+source = "git+https://github.com/bluealloy/revm?branch=performance-modexp#0d28a202be2555808ab61a2e3cfa7063df92b6a7"
 dependencies = [
  "auto_impl",
  "derive-where",
@@ -10705,8 +10699,7 @@ dependencies = [
 [[package]]
 name = "revm-inspector"
 version = "7.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7e4400a109a2264f4bf290888ac6d02432b6d5d070492b9dcf134b0c7d51354"
+source = "git+https://github.com/bluealloy/revm?branch=performance-modexp#0d28a202be2555808ab61a2e3cfa7063df92b6a7"
 dependencies = [
  "auto_impl",
  "either",
@@ -10743,8 +10736,7 @@ dependencies = [
 [[package]]
 name = "revm-interpreter"
 version = "22.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2481ef059708772cec0ce6bc4c84b796a40111612efb73b01adf1caed7ff9ac"
+source = "git+https://github.com/bluealloy/revm?branch=performance-modexp#0d28a202be2555808ab61a2e3cfa7063df92b6a7"
 dependencies = [
  "revm-bytecode",
  "revm-context-interface",
@@ -10755,8 +10747,7 @@ dependencies = [
 [[package]]
 name = "revm-precompile"
 version = "23.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d581e78c8f132832bd00854fb5bf37efd95a52582003da35c25cd2cbfc63849"
+source = "git+https://github.com/bluealloy/revm?branch=performance-modexp#0d28a202be2555808ab61a2e3cfa7063df92b6a7"
 dependencies = [
  "ark-bls12-381",
  "ark-bn254",
@@ -10781,8 +10772,7 @@ dependencies = [
 [[package]]
 name = "revm-primitives"
 version = "20.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52cdf897b3418f2ee05bcade64985e5faed2dbaa349b2b5f27d3d6bfd10fff2a"
+source = "git+https://github.com/bluealloy/revm?branch=performance-modexp#0d28a202be2555808ab61a2e3cfa7063df92b6a7"
 dependencies = [
  "alloy-primitives",
  "num_enum",
@@ -10792,8 +10782,7 @@ dependencies = [
 [[package]]
 name = "revm-state"
 version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d6274928dd78f907103740b10800d3c0db6caeca391e75a159c168a1e5c78f8"
+source = "git+https://github.com/bluealloy/revm?branch=performance-modexp#0d28a202be2555808ab61a2e3cfa7063df92b6a7"
 dependencies = [
  "bitflags 2.9.1",
  "revm-bytecode",
@@ -11037,7 +11026,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -11050,7 +11039,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -11108,7 +11097,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -11886,7 +11875,7 @@ dependencies = [
  "getrandom 0.3.3",
  "once_cell",
  "rustix 1.0.7",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12532,7 +12521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c032d68a49d25d9012a864fef1c64ac17aee43c87e0477bf7301d8ae8bfea7b7"
 dependencies = [
  "cc",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -13078,7 +13067,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]

Cargo.toml

@@ -734,6 +734,17 @@ alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "08fa0
 alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "08fa016ed950b6e65f810fc9cdef7cf38fbc63f6" }
 alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "08fa016ed950b6e65f810fc9cdef7cf38fbc63f6" }
 
+revm = { git = "https://github.com/bluealloy/revm", branch = "performance-modexp" }
+revm-bytecode = { git = "https://github.com/bluealloy/revm", branch = "performance-modexp" }
+revm-database = { git = "https://github.com/bluealloy/revm", branch = "performance-modexp" }
+revm-state = { git = "https://github.com/bluealloy/revm", branch = "performance-modexp" }
+revm-primitives = { git = "https://github.com/bluealloy/revm", branch = "performance-modexp" }
+revm-interpreter = { git = "https://github.com/bluealloy/revm", branch = "performance-modexp" }
+revm-inspector = { git = "https://github.com/bluealloy/revm", branch = "performance-modexp" }
+revm-context = { git = "https://github.com/bluealloy/revm", branch = "performance-modexp" }
+revm-context-interface = { git = "https://github.com/bluealloy/revm", branch = "performance-modexp" }
+revm-database-interface = { git = "https://github.com/bluealloy/revm", branch = "performance-modexp" }
+
 # op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }
 # op-alloy-network = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }
 # op-alloy-rpc-types = { git = "https://github.com/alloy-rs/op-alloy", rev = "a79d6fc" }

crates/revm/Cargo.toml

@@ -22,7 +22,7 @@ reth-trie = { workspace = true, optional = true }
 alloy-primitives.workspace = true
 
 # revm
-revm.workspace = true
+revm = { workspace = true, features = ["gmp"] }
 
 [dev-dependencies]
 reth-trie.workspace = true

crates/storage/db-common/Cargo.toml

@@ -22,6 +22,7 @@ reth-stages-types.workspace = true
 reth-fs-util.workspace = true
 reth-node-types.workspace = true
 reth-static-file-types.workspace = true
+reth-execution-errors.workspace = true
 
 # eth
 alloy-consensus.workspace = true

crates/storage/db-common/src/init.rs

@@ -8,6 +8,7 @@ use reth_codecs::Compact;
 use reth_config::config::EtlConfig;
 use reth_db_api::{tables, transaction::DbTxMut, DatabaseError};
 use reth_etl::Collector;
+use reth_execution_errors::StateRootError;
 use reth_primitives_traits::{Account, Bytecode, GotExpected, NodePrimitives, StorageEntry};
 use reth_provider::{
     errors::provider::ProviderResult, providers::StaticFileWriter, writer::UnifiedStorageWriter,
@@ -63,6 +64,9 @@ pub enum InitStorageError {
     /// Provider error.
     #[error(transparent)]
     Provider(#[from] ProviderError),
+    /// State root error while computing the state root
+    #[error(transparent)]
+    StateRootError(#[from] StateRootError),
     /// State root doesn't match the expected one.
     #[error("state root mismatch: {_0}")]
     StateRootMismatch(GotExpected<B256>),
@@ -88,6 +92,7 @@ where
         + HeaderProvider
         + HashingWriter
         + StateWriter
+        + TrieWriter
         + AsRef<PF::ProviderRW>,
     PF::ChainSpec: EthChainSpec<Header = <PF::Primitives as NodePrimitives>::BlockHeader>,
 {
@@ -138,6 +143,9 @@ where
 
     insert_genesis_state(&provider_rw, alloc.iter())?;
 
+    // compute state root to populate trie tables
+    compute_state_root(&provider_rw)?;
+
     // insert sync stage
     for stage in StageId::ALL {
         provider_rw.save_stage_checkpoint(stage, Default::default())?;
@@ -552,7 +560,7 @@ where
 
 /// Computes the state root (from scratch) based on the accounts and storages present in the
 /// database.
-fn compute_state_root<Provider>(provider: &Provider) -> eyre::Result<B256>
+fn compute_state_root<Provider>(provider: &Provider) -> Result<B256, InitStorageError>
 where
     Provider: DBProvider<Tx: DbTxMut> + TrieWriter,
 {