github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-02-19 03:04:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove duplicate apply_pre_execution_changes from Trace trait (#22333)

Browse Source
This commit is contained in:
stevencartavia
2026-02-18 22:32:42 -06:00
committed by GitHub
parent 93d546a36d
commit 8fa539225b
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
crates/rpc/rpc-eth-api/src/helpers/trace.rs
View File

@@ -1,25 +1,24 @@
//! Loads a pending block from database. Helper trait for `eth_` call and trace RPC methods.
use super::{Call, LoadBlock, LoadState, LoadTransaction};
use crate::FromEvmError;
use crate::{FromEthApiError, FromEvmError};
use alloy_consensus::{transaction::TxHashRef, BlockHeader};
use alloy_primitives::B256;
use alloy_rpc_types_eth::{BlockId, TransactionInfo};
use futures::Future;
use reth_chainspec::ChainSpecProvider;
use reth_errors::ProviderError;
use reth_errors::{ProviderError, RethError};
use reth_evm::{
evm::EvmFactoryExt, system_calls::SystemCaller, tracing::TracingCtx, ConfigureEvm, Database,
Evm, EvmEnvFor, EvmFor, HaltReasonFor, InspectorFor, TxEnvFor,
block::BlockExecutor, evm::EvmFactoryExt, tracing::TracingCtx, ConfigureEvm, Database, Evm,
EvmEnvFor, EvmFor, HaltReasonFor, InspectorFor, TxEnvFor,
};
use reth_primitives_traits::{BlockBody, Recovered, RecoveredBlock};
use reth_revm::{
database::StateProviderDatabase,
db::{bal::EvmDatabaseError, State},
};
use reth_rpc_eth_types::{cache::db::StateCacheDb, EthApiError};
use reth_rpc_eth_types::cache::db::StateCacheDb;
use reth_storage_api::{ProviderBlock, ProviderTx};
use revm::{context::Block, context_interface::result::ResultAndState, DatabaseCommit};
use revm::{context::Block, context_interface::result::ResultAndState};
use revm_inspectors::tracing::{TracingInspector, TracingInspectorConfig};
use std::sync::Arc;
@@ -180,7 +179,7 @@ pub trait Trace: LoadState<Error: FromEvmError<Self::Evm>> + Call {
self.spawn_with_state_at_block(parent_block, move |this, mut db| {
let block_txs = block.transactions_recovered();
this.apply_pre_execution_changes(&block, &mut db, &evm_env)?;
this.apply_pre_execution_changes(&block, &mut db)?;
// replay all transactions prior to the targeted transaction
this.replay_transactions_until(&mut db, evm_env.clone(), block_txs, *tx.tx_hash())?;
@@ -291,7 +290,7 @@ pub trait Trace: LoadState<Error: FromEvmError<Self::Evm>> + Call {
let block_number = evm_env.block_env.number().saturating_to();
let base_fee = evm_env.block_env.basefee();
this.apply_pre_execution_changes(&block, &mut db, &evm_env)?;
this.apply_pre_execution_changes(&block, &mut db)?;
// prepare transactions, we do everything upfront to reduce time spent with open
// state
@@ -412,22 +411,19 @@ pub trait Trace: LoadState<Error: FromEvmError<Self::Evm>> + Call {
/// Applies chain-specific state transitions required before executing a block.
///
/// Note: This should only be called when tracing an entire block vs individual transactions.
/// When tracing transaction on top of an already committed block state, those transitions are
/// When tracing transactions on top of an already committed block state, those transitions are
/// already applied.
fn apply_pre_execution_changes<DB: Send + Database + DatabaseCommit>(
fn apply_pre_execution_changes(
&self,
block: &RecoveredBlock<ProviderBlock<Self::Provider>>,
db: &mut DB,
evm_env: &EvmEnvFor<Self::Evm>,
db: &mut StateCacheDb,
) -> Result<(), Self::Error> {
let mut system_caller = SystemCaller::new(self.provider().chain_spec());
// apply relevant system calls
let mut evm = self.evm_config().evm_with_env(db, evm_env.clone());
system_caller.apply_pre_execution_changes(block.header(), &mut evm).map_err(|err| {
EthApiError::EvmCustom(format!("failed to apply 4788 system call {err}"))
})?;
self.evm_config()
.executor_for_block(db, block.sealed_block())
.map_err(RethError::other)
.map_err(Self::Error::from_eth_err)?
.apply_pre_execution_changes()
.map_err(Self::Error::from_eth_err)?;
Ok(())
}
}

6
crates/rpc/rpc/src/debug.rs
View File

@@ -117,7 +117,7 @@ where
.spawn_with_state_at_block(block.parent_hash(), move |eth_api, mut db| {
let mut results = Vec::with_capacity(block.body().transactions().len());
eth_api.apply_pre_execution_changes(&block, &mut db, &evm_env)?;
eth_api.apply_pre_execution_changes(&block, &mut db)?;
let mut transactions = block.transactions_recovered().enumerate().peekable();
let mut inspector = DebugInspector::new(opts).map_err(Eth::Error::from_eth_err)?;
@@ -240,7 +240,7 @@ where
// configure env for the target transaction
let tx = transaction.into_recovered();
eth_api.apply_pre_execution_changes(&block, &mut db, &evm_env)?;
eth_api.apply_pre_execution_changes(&block, &mut db)?;
// replay all transactions prior to the targeted transaction
let index = eth_api.replay_transactions_until(
@@ -360,7 +360,7 @@ where
self.eth_api()
.spawn_with_state_at_block(state_at, move |eth_api, mut db| {
// 1. apply pre-execution changes
eth_api.apply_pre_execution_changes(&block, &mut db, &evm_env)?;
eth_api.apply_pre_execution_changes(&block, &mut db)?;
// 2. replay the required number of transactions
for tx in block.transactions_recovered().take(tx_index) {