feat(revm): Integrate State

Cargo.toml

@@ -77,14 +77,9 @@ lto = "fat"
 codegen-units = 1
 incremental = false
 
-[patch.crates-io]
-revm = { git = "https://github.com/bluealloy/revm/", branch = "release/v25" }
-revm-primitives = { git = "https://github.com/bluealloy/revm/", branch = "release/v25" }
-
 [workspace.dependencies]
-## reth
-revm = { version = "3" }
-revm-primitives = "1.1"
+revm = { git = "https://github.com/bluealloy/revm.git" }
+revm-primitives = { git = "https://github.com/bluealloy/revm.git" }
 reth = { path = "./bin/reth" }
 reth-primitives = { path = "./crates/primitives" }
 reth-interfaces = { path = "./crates/interfaces" }
@@ -105,6 +100,7 @@ reth-network-api = { path = "./crates/net/network-api" }
 reth-rpc-types-compat = { path = "./crates/rpc/rpc-types-compat"}
 
 
+
 ## eth
 ethers-core = { version = "2.0", default-features = false }
 ethers-providers = { version = "2.0", default-features = false }

bin/reth/src/chain/import.rs

@@ -184,6 +184,7 @@ impl ImportCommand {
                     ExecutionStageThresholds {
                         max_blocks: config.stages.execution.max_blocks,
                         max_changes: config.stages.execution.max_changes,
+                        max_cumulative_gas: config.stages.execution.max_cumulative_gas,
                     },
                     config
                         .stages

bin/reth/src/debug_cmd/execution.rs

@@ -135,7 +135,11 @@ impl Command {
                 })
                 .set(ExecutionStage::new(
                     factory,
-                    ExecutionStageThresholds { max_blocks: None, max_changes: None },
+                    ExecutionStageThresholds {
+                        max_blocks: None,
+                        max_changes: None,
+                        max_cumulative_gas: None,
+                    },
                     stage_conf
                         .merkle
                         .clean_threshold

bin/reth/src/debug_cmd/in_memory_merkle.rs

@@ -14,7 +14,7 @@ use reth_network::NetworkHandle;
 use reth_network_api::NetworkInfo;
 use reth_primitives::{fs, stage::StageId, BlockHashOrNumber, ChainSpec};
 use reth_provider::{
-    AccountExtReader, BlockExecutor, BlockWriter, ExecutorFactory, HashingWriter, HeaderProvider,
+    AccountExtReader, BlockWriter, ExecutorFactory, HashingWriter, HeaderProvider,
     LatestStateProviderRef, ProviderFactory, StageCheckpointReader, StorageReader,
 };
 use reth_tasks::TaskExecutor;
@@ -168,13 +168,14 @@ impl Command {
 
         let merkle_block_td =
             provider.header_td_by_number(merkle_block_number)?.unwrap_or_default();
-        let block_state = executor.execute_and_verify_receipt(
+        executor.execute_and_verify_receipt(
             &block.clone().unseal(),
             merkle_block_td + block.difficulty,
             None,
         )?;
+        let block_state = executor.take_output_state();
 
-        // Unpacked `PostState::state_root_slow` function
+        // Unpacked `BundleState::state_root_slow` function
         let hashed_post_state = block_state.hash_state_slow().sorted();
         let (account_prefix_set, storage_prefix_set) = hashed_post_state.construct_prefix_sets();
         let tx = provider.tx_ref();
@@ -194,7 +195,7 @@ impl Command {
 
         // Insert block, state and hashes
         provider_rw.insert_block(block.clone(), None)?;
-        block_state.write_to_db(provider_rw.tx_ref(), block.number)?;
+        block_state.write_to_db(provider_rw.tx_ref(), false)?;
         let storage_lists = provider_rw.changed_storages_with_range(block.number..=block.number)?;
         let storages = provider_rw.plainstate_storages(storage_lists)?;
         provider_rw.insert_storage_for_hashing(storages)?;

bin/reth/src/debug_cmd/merkle.rs

@@ -205,7 +205,11 @@ impl Command {
         let factory = reth_revm::Factory::new(self.chain.clone());
         let mut execution_stage = ExecutionStage::new(
             factory,
-            ExecutionStageThresholds { max_blocks: Some(1), max_changes: None },
+            ExecutionStageThresholds {
+                max_blocks: Some(1),
+                max_changes: None,
+                max_cumulative_gas: None,
+            },
             MERKLE_STAGE_DEFAULT_CLEAN_THRESHOLD,
             PruneModes::all(),
         );