Skip to content

Commit a0dc85f

Browse files
authored
chore: bump revm inspectors (#20132)
1 parent 3c1fc99 commit a0dc85f

File tree

4 files changed

+73
-326
lines changed

4 files changed

+73
-326
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ revm-primitives = { version = "21.0.2", default-features = false }
480480
revm-interpreter = { version = "31.1.0", default-features = false }
481481
revm-database-interface = { version = "8.0.5", default-features = false }
482482
op-revm = { version = "14.1.0", default-features = false }
483-
revm-inspectors = "0.33.0"
483+
revm-inspectors = "0.33.1"
484484

485485
# eth
486486
alloy-chains = { version = "0.2.5", default-features = false }

crates/rpc/rpc-eth-types/src/error/mod.rs

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use reth_transaction_pool::error::{
2222
use revm::context_interface::result::{
2323
EVMError, HaltReason, InvalidHeader, InvalidTransaction, OutOfGasError,
2424
};
25-
use revm_inspectors::tracing::MuxError;
25+
use revm_inspectors::tracing::{DebugInspectorError, MuxError};
2626
use std::convert::Infallible;
2727
use tokio::sync::oneshot::error::RecvError;
2828

@@ -407,6 +407,25 @@ impl From<revm_inspectors::tracing::js::JsInspectorError> for EthApiError {
407407
}
408408
}
409409

410+
impl<Err> From<DebugInspectorError<Err>> for EthApiError
411+
where
412+
Err: core::error::Error + Send + Sync + 'static,
413+
{
414+
fn from(error: DebugInspectorError<Err>) -> Self {
415+
match error {
416+
DebugInspectorError::InvalidTracerConfig => Self::InvalidTracerConfig,
417+
DebugInspectorError::UnsupportedTracer => Self::Unsupported("unsupported tracer"),
418+
DebugInspectorError::JsTracerNotEnabled => {
419+
Self::Unsupported("JS Tracer is not enabled")
420+
}
421+
DebugInspectorError::MuxInspector(err) => err.into(),
422+
DebugInspectorError::Database(err) => Self::Internal(RethError::other(err)),
423+
#[cfg(feature = "js-tracer")]
424+
DebugInspectorError::JsInspector(err) => err.into(),
425+
}
426+
}
427+
}
428+
410429
impl From<RethError> for EthApiError {
411430
fn from(error: RethError) -> Self {
412431
match error {

0 commit comments

Comments
 (0)