jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 19:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: move TracingConfig init to tracing crate (#5546)

Browse Source
This commit is contained in:
Matthias Seitz
2023-11-23 16:02:33 +01:00
committed by GitHub
parent 61a688b04e
commit 5a1b0def35
2 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
crates/revm/revm-inspectors/src/tracing/config.rs
View File

@ -1,4 +1,5 @@
use reth_rpc_types::trace::geth::GethDefaultTracingOptions;
use reth_rpc_types::trace::{geth::GethDefaultTracingOptions, parity::TraceType};
use std::collections::HashSet;
/// What kind of tracing style this is.
///
@ -85,7 +86,21 @@ impl TracingInspectorConfig {
}
}
/// Returns the [TracingInspectorConfig] depending on the enabled [TraceType]s
///
/// Note: the parity statediffs can be populated entirely via the execution result, so we don't
/// need statediff recording
#[inline]
pub fn from_parity_config(trace_types: &HashSet<TraceType>) -> Self {
let needs_vm_trace = trace_types.contains(&TraceType::VmTrace);
TracingInspectorConfig::default_parity()
.set_steps(needs_vm_trace)
.set_stack_snapshots(needs_vm_trace)
.set_memory_snapshots(needs_vm_trace)
}
/// Returns a config for geth style traces based on the given [GethDefaultTracingOptions].
#[inline]
pub fn from_geth_config(config: &GethDefaultTracingOptions) -> Self {
Self {
record_memory_snapshots: config.enable_memory.unwrap_or_default(),
@ -148,3 +163,32 @@ impl TracingInspectorConfig {
self
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_parity_config() {
let mut s = HashSet::new();
s.insert(TraceType::StateDiff);
let config = TracingInspectorConfig::from_parity_config(&s);
// not required
assert!(!config.record_steps);
assert!(!config.record_state_diff);
let mut s = HashSet::new();
s.insert(TraceType::VmTrace);
let config = TracingInspectorConfig::from_parity_config(&s);
assert!(config.record_steps);
assert!(!config.record_state_diff);
let mut s = HashSet::new();
s.insert(TraceType::VmTrace);
s.insert(TraceType::StateDiff);
let config = TracingInspectorConfig::from_parity_config(&s);
assert!(config.record_steps);
// not required for StateDiff
assert!(!config.record_state_diff);
}
}

52
crates/rpc/rpc/src/trace.rs
View File

@ -68,7 +68,7 @@ where
/// Executes the given call and returns a number of possible traces for it.
pub async fn trace_call(&self, trace_request: TraceCallRequest) -> EthResult<TraceResults> {
let at = trace_request.block_id.unwrap_or(BlockId::Number(BlockNumberOrTag::Latest));
let config = tracing_config(&trace_request.trace_types);
let config = TracingInspectorConfig::from_parity_config(&trace_request.trace_types);
let overrides =
EvmOverrides::new(trace_request.state_overrides, trace_request.block_overrides);
let mut inspector = TracingInspector::new(config);
@ -103,7 +103,7 @@ where
let tx = tx_env_with_recovered(&tx.into_ecrecovered_transaction());
let env = Env { cfg, block, tx };
let config = tracing_config(&trace_types);
let config = TracingInspectorConfig::from_parity_config(&trace_types);
self.inner
.eth_api
@ -148,7 +148,7 @@ where
&mut db,
Default::default(),
)?;
let config = tracing_config(&trace_types);
let config = TracingInspectorConfig::from_parity_config(&trace_types);
let mut inspector = TracingInspector::new(config);
let (res, _) = inspect(&mut db, env, &mut inspector)?;
@ -180,7 +180,7 @@ where
hash: B256,
trace_types: HashSet<TraceType>,
) -> EthResult<TraceResults> {
let config = tracing_config(&trace_types);
let config = TracingInspectorConfig::from_parity_config(&trace_types);
self.inner
.eth_api
.spawn_trace_transaction_in_block(hash, config, move |_, inspector, res, db| {
@ -403,7 +403,7 @@ where
.eth_api
.trace_block_with(
block_id,
tracing_config(&trace_types),
TracingInspectorConfig::from_parity_config(&trace_types),
move |tx_info, inspector, res, state, db| {
let mut full_trace =
inspector.into_parity_builder().into_trace_results(&res, &trace_types);
@ -549,19 +549,6 @@ struct TraceApiInner<Provider, Eth> {
blocking_task_guard: BlockingTaskGuard,
}
/// Returns the [TracingInspectorConfig] depending on the enabled [TraceType]s
///
/// Note: the parity statediffs can be populated entirely via the execution result, so we don't need
/// statediff recording
#[inline]
fn tracing_config(trace_types: &HashSet<TraceType>) -> TracingInspectorConfig {
let needs_vm_trace = trace_types.contains(&TraceType::VmTrace);
TracingInspectorConfig::default_parity()
.set_steps(needs_vm_trace)
.set_stack_snapshots(needs_vm_trace)
.set_memory_snapshots(needs_vm_trace)
}
/// Helper to construct a [`LocalizedTransactionTrace`] that describes a reward to the block
/// beneficiary.
fn reward_trace(header: &SealedHeader, reward: RewardAction) -> LocalizedTransactionTrace {
@ -579,32 +566,3 @@ fn reward_trace(header: &SealedHeader, reward: RewardAction) -> LocalizedTransac
},
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_parity_config() {
let mut s = HashSet::new();
s.insert(TraceType::StateDiff);
let config = tracing_config(&s);
// not required
assert!(!config.record_steps);
assert!(!config.record_state_diff);
let mut s = HashSet::new();
s.insert(TraceType::VmTrace);
let config = tracing_config(&s);
assert!(config.record_steps);
assert!(!config.record_state_diff);
let mut s = HashSet::new();
s.insert(TraceType::VmTrace);
s.insert(TraceType::StateDiff);
let config = tracing_config(&s);
assert!(config.record_steps);
// not required for StateDiff
assert!(!config.record_state_diff);
}
}