chore: bump alloy

Cargo.toml

@@ -21,11 +21,11 @@ clippy.lint_groups_priority = "allow"
 
 [dependencies]
 # eth
-alloy-sol-types = "0.6.4"
-alloy-primitives = "0.6.4"
-alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "7e39c85" }
-alloy-rpc-trace-types = { git = "https://github.com/alloy-rs/alloy", rev = "7e39c85" }
-revm = { version = "7.2", default-features = false, features = ["std"] }
+alloy-sol-types = "0.7.0"
+alloy-primitives = "0.7.0"
+alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda" }
+alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda" }
+revm = { version = "8.0", default-features = false, features = ["std"] }
 
 anstyle = "1.0"
 colorchoice = "1.0"

deny.toml

@@ -67,4 +67,4 @@ license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]
 unknown-registry = "warn"
 unknown-git = "deny"
 # TODO: remove, see ./Cargo.toml
-allow-git = ["https://github.com/alloy-rs/alloy", "https://github.com/bluealloy/revm"]
+allow-git = ["https://github.com/alloy-rs/alloy", "https://github.com/bluealloy/revm", "https://github.com/alloy-rs/core"]

src/opcode.rs

@@ -1,4 +1,4 @@
-use alloy_rpc_trace_types::opcode::OpcodeGas;
+use alloy_rpc_types_trace::opcode::OpcodeGas;
 use revm::{
     interpreter::{opcode::OpCode, Interpreter},
     Database, EvmContext, Inspector,
@@ -98,7 +98,7 @@ mod tests {
     #[test]
     fn test_opcode_counter_inspector() {
         let mut opcode_counter = OpcodeGasInspector::new();
-        let contract = Box::<Contract>::default();
+        let contract = Contract::default();
         let mut interpreter = Interpreter::new(contract, 10000, false);
         let db = CacheDB::new(EmptyDB::default());
 
@@ -118,7 +118,7 @@ mod tests {
     #[test]
     fn test_with_variety_of_opcodes() {
         let mut opcode_counter = OpcodeGasInspector::new();
-        let contract = Box::<Contract>::default();
+        let contract = Contract::default();
         let mut interpreter = Interpreter::new(contract, 2024, false);
         let db = CacheDB::new(EmptyDB::default());
 

src/tracing/builder/geth.rs

@@ -6,7 +6,7 @@ use crate::tracing::{
     TracingInspectorConfig,
 };
 use alloy_primitives::{Address, Bytes, B256, U256};
-use alloy_rpc_trace_types::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,8 @@ use crate::tracing::{
     TracingInspectorConfig,
 };
 use alloy_primitives::{Address, U64};
-use alloy_rpc_trace_types::parity::*;
 use alloy_rpc_types::TransactionInfo;
+use alloy_rpc_types_trace::parity::*;
 use revm::{
     db::DatabaseRef,
     interpreter::{

src/tracing/config.rs

@@ -1,4 +1,4 @@
-use alloy_rpc_trace_types::{
+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_trace_types::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_trace_types::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_trace_types::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_trace_types::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_trace_types::geth::FourByteFrame;
+use alloy_rpc_types_trace::geth::FourByteFrame;
 use revm::{
     interpreter::{CallInputs, CallOutcome},
     Database, EvmContext, Inspector,

src/tracing/js/mod.rs

@@ -397,7 +397,7 @@ where
             memory,
             pc: interp.program_counter() as u64,
             gas_remaining: interp.gas.remaining(),
-            cost: interp.gas.spend(),
+            cost: interp.gas.spent(),
             depth: context.journaled_state.depth(),
             refund: interp.gas.refunded() as u64,
             error: None,
@@ -425,7 +425,7 @@ where
                 memory,
                 pc: interp.program_counter() as u64,
                 gas_remaining: interp.gas.remaining(),
-                cost: interp.gas.spend(),
+                cost: interp.gas.spent(),
                 depth: context.journaled_state.depth(),
                 refund: interp.gas.refunded() as u64,
                 error: Some(format!("{:?}", interp.instruction_result)),
@@ -487,7 +487,7 @@ where
     ) -> CallOutcome {
         if self.can_call_exit() {
             let frame_result = FrameResult {
-                gas_used: outcome.result.gas.spend(),
+                gas_used: outcome.result.gas.spent(),
                 output: outcome.result.output.clone(),
                 error: None,
             };
@@ -540,7 +540,7 @@ where
     ) -> CreateOutcome {
         if self.can_call_exit() {
             let frame_result = FrameResult {
-                gas_used: outcome.result.gas.spend(),
+                gas_used: outcome.result.gas.spent(),
                 output: outcome.result.output.clone(),
                 error: None,
             };

src/tracing/mod.rs

@@ -303,9 +303,9 @@ impl TracingInspector {
         if trace_idx == 0 {
             // this is the root call which should get the gas used of the transaction
             // refunds are applied after execution, which is when the root call ends
-            trace.gas_used = gas_used(context.spec_id(), gas.spend(), gas.refunded() as u64);
+            trace.gas_used = gas_used(context.spec_id(), gas.spent(), gas.refunded() as u64);
         } else {
-            trace.gas_used = gas.spend();
+            trace.gas_used = gas.spent();
         }
 
         trace.status = result;

src/tracing/mux.rs

@@ -1,6 +1,6 @@
 use crate::tracing::{FourByteInspector, TracingInspector, TracingInspectorConfig};
 use alloy_primitives::{Address, Log, U256};
-use alloy_rpc_trace_types::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_trace_types::{
+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_trace_types::geth::{
+use alloy_rpc_types_trace::geth::{
     mux::MuxConfig, CallConfig, GethDebugBuiltInTracerType, GethDebugTracerConfig, GethTrace,
     PreStateConfig,
 };