feat(witness): use block executor to execute block inside debug_execution_witness

crates/ethereum/evm/src/execute.rs

@@ -31,7 +31,7 @@ use reth_revm::{
         BundleAccount, State,
     },
     state_change::post_block_balance_increments,
-    Evm,
+    Evm, State
 };
 use revm_primitives::{
     db::{Database, DatabaseCommit},
@@ -382,7 +382,13 @@ where
         // NOTE: we need to merge keep the reverts for the bundle retention
         self.state.merge_transitions(BundleRetention::Reverts);
 
-        Ok(BlockExecutionOutput { state: self.state.take_bundle(), receipts, requests, gas_used })
+        Ok(BlockExecutionOutput {
+            state: self.state.take_bundle(),
+            cache: core::mem::take(&mut self.state.cache),
+            receipts,
+            requests,
+            gas_used,
+        })
     }
 }
 

crates/evm/execution-types/src/execute.rs

@@ -1,5 +1,5 @@
 use reth_primitives::{Request, U256};
-use revm::db::BundleState;
+use revm::{db::BundleState, CacheState};
 
 /// A helper type for ethereum block inputs that consists of a block and the total difficulty.
 #[derive(Debug)]
@@ -30,6 +30,8 @@ impl<'a, Block> From<(&'a Block, U256)> for BlockExecutionInput<'a, Block> {
 pub struct BlockExecutionOutput<T> {
     /// The changed state of the block after execution.
     pub state: BundleState,
+    /// cache state of the block after execution.
+    pub cache: CacheState,
     /// All the receipts of the transactions in the block.
     pub receipts: Vec<T>,
     /// All the EIP-7685 requests of the transactions in the block.

crates/evm/src/test_utils.rs

@@ -55,6 +55,7 @@ impl<DB> Executor<DB> for MockExecutorProvider {
             self.exec_results.lock().pop().unwrap();
         Ok(BlockExecutionOutput {
             state: bundle,
+            cache: Default::default(),
             receipts: receipts.into_iter().flatten().flatten().collect(),
             requests: requests.into_iter().flatten().collect(),
             gas_used: 0,

crates/node/builder/src/rpc.rs

@@ -192,6 +192,7 @@ pub struct RpcRegistry<Node: FullNodeComponents, EthApi: EthApiTypes> {
         TaskExecutor,
         Node::Provider,
         EthApi,
+        Node::Executor,
     >,
 }
 
@@ -207,6 +208,7 @@ where
         TaskExecutor,
         Node::Provider,
         EthApi,
+        Node::Executor,
     >;
 
     fn deref(&self) -> &Self::Target {
@@ -322,6 +324,7 @@ where
         .with_events(node.provider().clone())
         .with_executor(node.task_executor().clone())
         .with_evm_config(node.evm_config().clone())
+        .with_block_executor(node.block_executor().clone())
         .build_with_auth_server(module_config, engine_api, EthApi::eth_api_builder());
 
     let mut registry = RpcRegistry { registry };

crates/optimism/evm/src/execute.rs

@@ -364,6 +364,7 @@ where
 
         Ok(BlockExecutionOutput {
             state: self.state.take_bundle(),
+            cache: core::mem::take(&mut self.state.cache),
             receipts,
             requests: vec![],
             gas_used,