chore: basic tracing

Author: prestwich

crates/rpc/src/debug/endpoints.rs

@@ -16,6 +16,7 @@ use reth_node_api::FullNodeComponents;
 use signet_evm::EvmErrored;
 use signet_node_types::Pnt;
 use signet_types::MagicSig;
+use tracing::Instrument;
 
 /// Params for the `debug_traceBlockByNumber` and `debug_traceBlockByHash`
 /// endpoints.
@@ -38,6 +39,8 @@ where
     Signet: Pnt,
 {
     let id = id.into();
+    let span = tracing::debug_span!("traceBlock", ?id, tracer = ?opts.as_ref().and_then(|o| o.tracer.as_ref()));
+
     let fut = async move {
         // Fetch the block by ID
         let Some((hash, block)) = response_tri!(ctx.signet().raw_block(id).await) else {
@@ -46,13 +49,19 @@ where
             );
         };
 
+        tracing::debug!(number = block.number(), "Loaded block");
+
         // Allocate space for the frames
         let mut frames = Vec::with_capacity(block.transaction_count());
+
         // Instantiate the EVM with the block
         let mut trevm = response_tri!(ctx.trevm(crate::LoadState::Before, block.header()));
 
         // Apply all transactions in the block up, tracing each one
         let opts = opts.unwrap_or_default();
+
+        tracing::trace!(?opts, "Tracing block transactions");
+
         let mut txns = block.body().transactions().enumerate().peekable();
         for (idx, tx) in txns
             .by_ref()
@@ -71,10 +80,13 @@ where
             let frame;
             (frame, trevm) = response_tri!(crate::debug::tracer::trace(t, &opts, tx_info));
             frames.push(TraceResult::Success { result: frame, tx_hash: Some(*tx.hash()) });
+
+            tracing::debug!(tx_index = idx, tx_hash = ?tx.hash(), "Traced transaction");
         }
 
         ResponsePayload::Success(frames)
-    };
+    }
+    .instrument(span);
 
     await_handler!(@response_option hctx.spawn_blocking(fut))
 }
@@ -89,18 +101,24 @@ where
     Host: FullNodeComponents,
     Signet: Pnt,
 {
+    let span = tracing::debug_span!("traceTransaction", %tx_hash, tracer = ?opts.as_ref().and_then(|o| o.tracer.as_ref()));
+
     let fut = async move {
         // Load the transaction by hash
         let (tx, meta) = response_tri!(
             response_tri!(ctx.signet().raw_transaction_by_hash(tx_hash))
                 .ok_or(EthApiError::TransactionNotFound)
         );
 
+        tracing::debug!("Loaded transaction metadata");
+
         // Load the block containing the transaction
         let res = response_tri!(ctx.signet().raw_block(meta.block_hash).await);
         let (_, block) =
             response_tri!(res.ok_or_else(|| EthApiError::HeaderNotFound(meta.block_hash.into())));
 
+        tracing::debug!(number = block.number(), "Loaded containing block");
+
         // Load trevm at the start of the block (i.e. before any transactions are applied)
         let mut trevm = response_tri!(ctx.trevm(crate::LoadState::Before, block.header()));
 
@@ -133,7 +151,8 @@ where
             response_tri!(crate::debug::tracer::trace(trevm, &opts.unwrap_or_default(), tx_info)).0;
 
         ResponsePayload::Success(res)
-    };
+    }
+    .instrument(span);
 
     await_handler!(@response_option hctx.spawn_blocking(fut))
 }

crates/rpc/src/debug/mod.rs

@@ -7,7 +7,7 @@ pub use error::DebugError;
 mod tracer;
 
 use crate::ctx::RpcCtx;
-use alloy::primitives::{B256, U64};
+use alloy::{eips::BlockNumberOrTag, primitives::B256};
 use reth_node_api::FullNodeComponents;
 use signet_node_types::Pnt;
 
@@ -18,7 +18,7 @@ where
     Signet: Pnt,
 {
     ajj::Router::new()
-        .route("traceBlockByNumber", trace_block::<U64, _, _>)
+        .route("traceBlockByNumber", trace_block::<BlockNumberOrTag, _, _>)
         .route("traceBlockByHash", trace_block::<B256, _, _>)
         .route("traceTransaction", trace_transaction)
 }

crates/rpc/src/debug/tracer.rs

@@ -20,12 +20,14 @@ use revm_inspectors::tracing::{
     FourByteInspector, MuxInspector, TracingInspector, TracingInspectorConfig,
 };
 use signet_evm::{EvmNeedsTx, EvmReady};
+use tracing::instrument;
 use trevm::{
     helpers::Ctx,
     revm::{Database, DatabaseCommit, Inspector},
 };
 
 /// Trace a transaction using the provided EVM and tracing options.
+#[instrument(skip(trevm, config, tx_info), fields(tx_hash = ?tx_info.hash))]
 pub(super) fn trace<Db, Insp>(
     trevm: EvmReady<Db, Insp>,
     config: &GethDebugTracingOptions,