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

chore: reuse alloy Log type (#5548)

Browse Source
This commit is contained in:
Matthias Seitz
2023-11-23 16:40:38 +01:00
committed by GitHub
parent 30f4114702
commit fc9bdea320
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/revm/revm-inspectors/src/tracing/mod.rs
View File

@@ -1,8 +1,8 @@
use crate::tracing::{
types::{CallKind, LogCallOrder, RawLog},
types::{CallKind, LogCallOrder},
utils::get_create_address,
};
use alloy_primitives::{Address, Bytes, B256, U256};
use alloy_primitives::{Address, Bytes, Log, B256, U256};
pub use arena::CallTraceArena;
use revm::{
inspectors::GasInspector,
@@ -408,7 +408,7 @@ where
if self.config.record_logs {
trace.ordering.push(LogCallOrder::Log(trace.logs.len()));
trace.logs.push(RawLog { topics: topics.to_vec(), data: data.clone() });
trace.logs.push(Log::new_unchecked(topics.to_vec(), data.clone()));
}
}

18
crates/revm/revm-inspectors/src/tracing/types.rs
View File

@@ -1,7 +1,8 @@
//! Types for representing call trace items.
use crate::tracing::{config::TraceStyle, utils::convert_memory};
use alloy_primitives::{Address, Bytes, B256, U256, U64};
pub use alloy_primitives::Log;
use alloy_primitives::{Address, Bytes, U256, U64};
use alloy_sol_types::decode_revert_reason;
use reth_rpc_types::trace::{
geth::{CallFrame, CallLogFrame, GethDefaultTracingOptions, StructLog},
@@ -128,8 +129,8 @@ pub struct CallTraceNode {
pub idx: usize,
/// The call trace
pub trace: CallTrace,
/// Logs
pub logs: Vec<RawLog>,
/// Recorded logs, if enabled
pub logs: Vec<Log>,
/// Ordering of child calls and logs
pub ordering: Vec<LogCallOrder>,
}
@@ -357,7 +358,7 @@ impl CallTraceNode {
.iter()
.map(|log| CallLogFrame {
address: Some(self.execution_address()),
topics: Some(log.topics.clone()),
topics: Some(log.topics().to_vec()),
data: Some(log.data.clone()),
})
.collect();
@@ -489,15 +490,6 @@ pub enum LogCallOrder {
Call(usize),
}
/// Ethereum log.
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct RawLog {
/// Indexed event params are represented as log topics.
pub topics: Vec<B256>,
/// Others are just plain data.
pub data: Bytes,
}
/// Represents a tracked call step during execution
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct CallTraceStep {