chore: bump alloy 00d81d7

Cargo.toml

@@ -21,10 +21,9 @@ clippy.lint_groups_priority = "allow"
 
 [dependencies]
 # eth
-alloy-sol-types = "0.7.2"
-alloy-primitives = "0.7.2"
-alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "14ed25d" }
-alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "14ed25d" }
+alloy-sol-types = "0.7"
+alloy-primitives = "0.7"
+alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "00d81d7", features = ["eth", "trace"] }
 revm = { version = "9.0", git = "https://github.com/bluealloy/revm.git", rev = "a28a543", default-features = false, features = [
     "std",
 ] }

src/opcode.rs

@@ -1,4 +1,4 @@
-use alloy_rpc_types_trace::opcode::OpcodeGas;
+use alloy_rpc_types::trace::opcode::OpcodeGas;
 use revm::{
     interpreter::{opcode::OpCode, Interpreter},
     Database, EvmContext, Inspector,

src/tracing/builder/geth.rs

@@ -6,7 +6,7 @@ use crate::tracing::{
     TracingInspectorConfig,
 };
 use alloy_primitives::{Address, Bytes, B256, U256};
-use alloy_rpc_types_trace::geth::{
+use alloy_rpc_types::trace::geth::{
     AccountChangeKind, AccountState, CallConfig, CallFrame, DefaultFrame, DiffMode,
     GethDefaultTracingOptions, PreStateConfig, PreStateFrame, PreStateMode, StructLog,
 };

src/tracing/builder/parity.rs

@@ -5,8 +5,7 @@ use crate::tracing::{
     TracingInspectorConfig,
 };
 use alloy_primitives::{Address, U64};
-use alloy_rpc_types::TransactionInfo;
-use alloy_rpc_types_trace::parity::*;
+use alloy_rpc_types::{trace::parity::*, TransactionInfo};
 use revm::{
     db::DatabaseRef,
     interpreter::{opcode, OpCode},

src/tracing/config.rs

@@ -1,4 +1,4 @@
-use alloy_rpc_types_trace::{
+use alloy_rpc_types::trace::{
     geth::{CallConfig, GethDefaultTracingOptions, PreStateConfig},
     parity::TraceType,
 };
@@ -68,7 +68,7 @@ impl TracingInspectorConfig {
     /// This config does _not_ record opcode level traces and is suited for `debug_traceTransaction`
     ///
     /// This will configure the default output of geth's default
-    /// [StructLogTracer](alloy_rpc_types_trace::geth::DefaultFrame).
+    /// [StructLogTracer](alloy_rpc_types::trace::geth::DefaultFrame).
     pub const fn default_geth() -> Self {
         Self {
             record_steps: true,
@@ -98,7 +98,7 @@ impl TracingInspectorConfig {
     /// Returns a config for geth style traces based on the given [GethDefaultTracingOptions].
     ///
     /// This will configure the output of geth's default
-    /// [StructLogTracer](alloy_rpc_types_trace::geth::DefaultFrame) according to the given config.
+    /// [StructLogTracer](alloy_rpc_types::trace::geth::DefaultFrame) according to the given config.
     #[inline]
     pub fn from_geth_config(config: &GethDefaultTracingOptions) -> Self {
         Self {
@@ -113,7 +113,7 @@ impl TracingInspectorConfig {
         }
     }
 
-    /// Returns a config for geth's [CallTracer](alloy_rpc_types_trace::geth::CallFrame).
+    /// Returns a config for geth's [CallTracer](alloy_rpc_types::trace::geth::CallFrame).
     ///
     /// This returns [Self::none] and enables [TracingInspectorConfig::record_logs] if configured in
     /// the given [CallConfig]
@@ -124,7 +124,7 @@ impl TracingInspectorConfig {
             .set_record_logs(config.with_log.unwrap_or_default())
     }
 
-    /// Returns a config for geth's [PrestateTracer](alloy_rpc_types_trace::geth::PreStateFrame).
+    /// Returns a config for geth's [PrestateTracer](alloy_rpc_types::trace::geth::PreStateFrame).
     ///
     /// Note: This currently returns [Self::none] because the prestate tracer result currently
     /// relies on the execution result entirely, see

src/tracing/fourbyte.rs

@@ -22,7 +22,7 @@
 //! See also <https://geth.ethereum.org/docs/developers/evm-tracing/built-in-tracers>
 
 use alloy_primitives::{hex, Selector};
-use alloy_rpc_types_trace::geth::FourByteFrame;
+use alloy_rpc_types::trace::geth::FourByteFrame;
 use revm::{
     interpreter::{CallInputs, CallOutcome},
     Database, EvmContext, Inspector,

src/tracing/mux.rs

@@ -1,6 +1,6 @@
 use crate::tracing::{FourByteInspector, TracingInspector, TracingInspectorConfig};
 use alloy_primitives::{Address, Log, U256};
-use alloy_rpc_types_trace::geth::{
+use alloy_rpc_types::trace::geth::{
     mux::{MuxConfig, MuxFrame},
     CallConfig, FourByteFrame, GethDebugBuiltInTracerType, GethDebugTracerConfig, GethTrace,
     NoopFrame, PreStateConfig,

src/tracing/types.rs

@@ -3,7 +3,7 @@
 use crate::tracing::{config::TraceStyle, utils, utils::convert_memory};
 pub use alloy_primitives::Log;
 use alloy_primitives::{Address, Bytes, LogData, U256, U64};
-use alloy_rpc_types_trace::{
+use alloy_rpc_types::trace::{
     geth::{CallFrame, CallLogFrame, GethDefaultTracingOptions, StructLog},
     parity::{
         Action, ActionType, CallAction, CallOutput, CallType, CreateAction, CreateOutput,

tests/it/geth.rs

@@ -2,7 +2,7 @@
 
 use crate::utils::inspect;
 use alloy_primitives::{hex, Address, Bytes};
-use alloy_rpc_types_trace::geth::{
+use alloy_rpc_types::trace::geth::{
     mux::MuxConfig, CallConfig, GethDebugBuiltInTracerType, GethDebugTracerConfig, GethTrace,
     PreStateConfig,
 };

tests/it/parity.rs

@@ -2,8 +2,10 @@
 
 use crate::utils::{inspect, print_traces};
 use alloy_primitives::{address, hex, Address, U256};
-use alloy_rpc_types::TransactionInfo;
-use alloy_rpc_types_trace::parity::{Action, SelfdestructAction, TraceType};
+use alloy_rpc_types::{
+    trace::parity::{Action, SelfdestructAction, TraceType},
+    TransactionInfo,
+};
 use revm::{
     db::{CacheDB, EmptyDB},
     primitives::{