From afdaf156ae5d588b2c39f97968e19351a9fe409a Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Mon, 9 Sep 2024 18:39:37 +0200 Subject: [PATCH] chore: bump revm inspectors (#10790) --- Cargo.lock | 9 +++++---- Cargo.toml | 2 +- crates/rpc/rpc/src/debug.rs | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8f1cccc13a..1d8fd1c4b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -416,7 +416,6 @@ checksum = "d9ae4c4fbd37d9996f501fbc7176405aab97ae3a5772789be06ef0e7c4dad6dd" dependencies = [ "alloy-rpc-types-engine", "alloy-rpc-types-eth", - "alloy-rpc-types-trace", "alloy-serde", "serde", ] @@ -8921,17 +8920,19 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48184032103bb23788e42e42c7c85207f5b0b8a248b09ea8f5233077f35ab56e" +checksum = "59710f2721248e49d99e4b02254c823c36af6ccbb27cc99a02818896670fbcfc" dependencies = [ "alloy-primitives", - "alloy-rpc-types", + "alloy-rpc-types-eth", + "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", "boa_engine", "boa_gc", "colorchoice", + "intrusive-collections", "revm", "serde_json", "thiserror", diff --git a/Cargo.toml b/Cargo.toml index 86d48bc8f2..afd8eb7849 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -410,7 +410,7 @@ revm = { version = "14.0.0", features = [ "secp256k1", "blst", ], default-features = false } -revm-inspectors = "0.6" +revm-inspectors = "0.6.1" revm-primitives = { version = "9.0.0", features = [ "std", ], default-features = false } diff --git a/crates/rpc/rpc/src/debug.rs b/crates/rpc/rpc/src/debug.rs index cd24cccfcb..781bad29da 100644 --- a/crates/rpc/rpc/src/debug.rs +++ b/crates/rpc/rpc/src/debug.rs @@ -310,7 +310,7 @@ where Ok(inspector) }) .await?; - return Ok(FourByteFrame::from(inspector).into()) + return Ok(FourByteFrame::from(&inspector).into()) } GethDebugBuiltInTracerType::CallTracer => { let call_config = tracer_config @@ -356,7 +356,7 @@ where let frame = inspector .with_transaction_gas_limit(env.tx.gas_limit) .into_geth_builder() - .geth_prestate_traces(&res, prestate_config, db) + .geth_prestate_traces(&res, &prestate_config, db) .map_err(Eth::Error::from_eth_err)?; Ok(frame) }) @@ -706,7 +706,7 @@ where GethDebugBuiltInTracerType::FourByteTracer => { let mut inspector = FourByteInspector::default(); let (res, _) = self.eth_api().inspect(db, env, &mut inspector)?; - return Ok((FourByteFrame::from(inspector).into(), res.state)) + return Ok((FourByteFrame::from(&inspector).into(), res.state)) } GethDebugBuiltInTracerType::CallTracer => { let call_config = tracer_config @@ -739,7 +739,7 @@ where let frame = inspector .with_transaction_gas_limit(env.tx.gas_limit) .into_geth_builder() - .geth_prestate_traces(&res, prestate_config, db) + .geth_prestate_traces(&res, &prestate_config, db) .map_err(Eth::Error::from_eth_err)?; return Ok((frame.into(), res.state))