github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-27 08:08:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: apply 4788 system call in tracing (#11417)

Browse Source
This commit is contained in:
Matthias Seitz
2024-10-02 13:50:06 +02:00
committed by GitHub
parent 2a4f46b750
commit afbe2bb5e9
1 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,11 @@
//! Loads a pending block from database. Helper trait for `eth_` call and trace RPC methods.
use crate::FromEvmError;
use alloy_primitives::B256;
use alloy_rpc_types::{BlockId, TransactionInfo};
use futures::Future;
use reth_evm::{ConfigureEvm, ConfigureEvmEnv};
use reth_chainspec::ChainSpecProvider;
use reth_evm::{system_calls::SystemCaller, ConfigureEvm, ConfigureEvmEnv};
use reth_primitives::Header;
use reth_revm::database::StateProviderDatabase;
use reth_rpc_eth_types::{
@@ -14,8 +16,6 @@ use revm::{db::CacheDB, Database, DatabaseCommit, GetInspector, Inspector};
use revm_inspectors::tracing::{TracingInspector, TracingInspectorConfig};
use revm_primitives::{EnvWithHandlerCfg, EvmState, ExecutionResult, ResultAndState};
use crate::FromEvmError;
use super::{Call, LoadBlock, LoadPendingBlock, LoadState, LoadTransaction};
/// Executes CPU heavy tasks.
@@ -190,12 +190,31 @@ pub trait Trace: LoadState {
// we need to get the state of the parent block because we're essentially replaying the
// block the transaction is included in
let parent_block = block.parent_hash;
let parent_beacon_block_root = block.parent_beacon_block_root;
let block_txs = block.into_transactions_ecrecovered();
let this = self.clone();
self.spawn_with_state_at_block(parent_block.into(), move |state| {
let mut db = CacheDB::new(StateProviderDatabase::new(state));
// apply relevant system calls
let mut system_caller = SystemCaller::new(
Trace::evm_config(&this),
LoadState::provider(&this).chain_spec(),
);
system_caller
.pre_block_beacon_root_contract_call(
&mut db,
&cfg,
&block_env,
parent_beacon_block_root,
)
.map_err(|_| {
EthApiError::EvmCustom(
"failed to apply 4788 beacon root system call".to_string(),
)
})?;
// replay all transactions prior to the targeted transaction
this.replay_transactions_until(
&mut db,
@@ -306,6 +325,27 @@ pub trait Trace: LoadState {
let block_number = block_env.number.saturating_to::<u64>();
let base_fee = block_env.basefee.saturating_to::<u128>();
// now get the state
let state = this.state_at_block_id(state_at.into())?;
let mut db =
CacheDB::new(StateProviderDatabase::new(StateProviderTraitObjWrapper(&state)));
// apply relevant system calls
let mut system_caller = SystemCaller::new(
Trace::evm_config(&this),
LoadState::provider(&this).chain_spec(),
);
system_caller
.pre_block_beacon_root_contract_call(
&mut db,
&cfg,
&block_env,
block.header().parent_beacon_block_root,
)
.map_err(|_| {
EthApiError::EvmCustom("failed to apply 4788 system call".to_string())
})?;
// prepare transactions, we do everything upfront to reduce time spent with open
// state
let max_transactions =
@@ -332,11 +372,6 @@ pub trait Trace: LoadState {
})
.peekable();
// now get the state
let state = this.state_at_block_id(state_at.into())?;
let mut db =
CacheDB::new(StateProviderDatabase::new(StateProviderTraitObjWrapper(&state)));
while let Some((tx_info, tx)) = transactions.next() {
let env =
EnvWithHandlerCfg::new_with_cfg_env(cfg.clone(), block_env.clone(), tx);