From 8da5bd2ee880c20a2c95ced54e4486549ac6707c Mon Sep 17 00:00:00 2001 From: Adrian Date: Tue, 28 Oct 2025 12:08:28 +0100 Subject: [PATCH 1/3] Update debug.rs --- crates/rpc/rpc/src/debug.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crates/rpc/rpc/src/debug.rs b/crates/rpc/rpc/src/debug.rs index 99b37a09d9d..25f67446db2 100644 --- a/crates/rpc/rpc/src/debug.rs +++ b/crates/rpc/rpc/src/debug.rs @@ -645,7 +645,12 @@ where let (mut exec_witness, lowest_block_number) = self .eth_api() .spawn_with_state_at_block(block.parent_hash().into(), move |state_provider| { - let db = StateProviderDatabase::new(&state_provider); + let mut db = State::builder().with_database(StateProviderDatabase::new(&state_provider)).build(); + let evm_env = this.eth_api().evm_config().evm_env(block.header()).map_err(RethError::other).map_err(Eth::Error::from_eth_err)?; + + // Apply pre-execution changes to ensure correct state setup, especially for pruned nodes + this.eth_api().apply_pre_execution_changes(&block, &mut db, &evm_env)?; + let block_executor = this.eth_api().evm_config().executor(db); let mut witness_record = ExecutionWitnessRecord::default(); From c58b2007346477c3f4dc3265541db452ac08340a Mon Sep 17 00:00:00 2001 From: Adrian Date: Tue, 28 Oct 2025 12:10:49 +0100 Subject: [PATCH 2/3] Update debug.rs --- crates/rpc/rpc/src/debug.rs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/crates/rpc/rpc/src/debug.rs b/crates/rpc/rpc/src/debug.rs index 25f67446db2..6b53c0b55b4 100644 --- a/crates/rpc/rpc/src/debug.rs +++ b/crates/rpc/rpc/src/debug.rs @@ -645,10 +645,18 @@ where let (mut exec_witness, lowest_block_number) = self .eth_api() .spawn_with_state_at_block(block.parent_hash().into(), move |state_provider| { - let mut db = State::builder().with_database(StateProviderDatabase::new(&state_provider)).build(); - let evm_env = this.eth_api().evm_config().evm_env(block.header()).map_err(RethError::other).map_err(Eth::Error::from_eth_err)?; + let mut db = State::builder() + .with_database(StateProviderDatabase::new(&state_provider)) + .build(); + let evm_env = this + .eth_api() + .evm_config() + .evm_env(block.header()) + .map_err(RethError::other) + .map_err(Eth::Error::from_eth_err)?; - // Apply pre-execution changes to ensure correct state setup, especially for pruned nodes + // Apply pre-execution changes to ensure correct state setup, especially for pruned + // nodes this.eth_api().apply_pre_execution_changes(&block, &mut db, &evm_env)?; let block_executor = this.eth_api().evm_config().executor(db); From c1b31a203d6e1e66cf5745d4e62daa0e94d9f367 Mon Sep 17 00:00:00 2001 From: Adrian Date: Sat, 1 Nov 2025 01:46:22 +0100 Subject: [PATCH 3/3] Update debug.rs --- crates/rpc/rpc/src/debug.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/crates/rpc/rpc/src/debug.rs b/crates/rpc/rpc/src/debug.rs index 6b53c0b55b4..b27171bdd9d 100644 --- a/crates/rpc/rpc/src/debug.rs +++ b/crates/rpc/rpc/src/debug.rs @@ -655,10 +655,6 @@ where .map_err(RethError::other) .map_err(Eth::Error::from_eth_err)?; - // Apply pre-execution changes to ensure correct state setup, especially for pruned - // nodes - this.eth_api().apply_pre_execution_changes(&block, &mut db, &evm_env)?; - let block_executor = this.eth_api().evm_config().executor(db); let mut witness_record = ExecutionWitnessRecord::default();