Skip to content

fix: avoid trace executor panics #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
umeeSthein wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −12
Open

fix: avoid trace executor panics #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 27 additions & 12 deletions bin/debug-trace-server/src/tracing_executor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,15 +295,18 @@ fn trace_block_with_tracing_inspector(
// Convert DefaultFrame to JSON and fix returnValue serialization.
// alloy-rpc-types-trace 1.1.2 serializes Bytes with "0x" prefix,
// but mega-reth uses v1.0.23 which serializes without prefix.
let mut frame_value = serde_json::to_value(frame).unwrap();
if let Some(rv) = frame_value.get_mut("returnValue") &&
let Some(s) = rv.as_str()
{
*rv = serde_json::Value::String(
s.strip_prefix("0x").unwrap_or(s).to_string(),
);
}
Ok(GethTrace::JS(frame_value))
serde_json::to_value(frame)
.map(|mut frame_value| {
if let Some(rv) = frame_value.get_mut("returnValue") &&
let Some(s) = rv.as_str()
{
*rv = serde_json::Value::String(
s.strip_prefix("0x").unwrap_or(s).to_string(),
);
}
GethTrace::JS(frame_value)
})
.map_err(|e| format!("Default trace serialization failed: {e}"))
}
};

Expand Down Expand Up @@ -413,7 +416,8 @@ fn trace_tx_with_tracing_inspector(
inspector.set_transaction_gas_limit(tx_gas_limit);
let frame = inspector.geth_builder().geth_traces(gas_used, return_value, opts.config);

let mut frame_value = serde_json::to_value(frame).unwrap();
let mut frame_value = serde_json::to_value(frame)
.map_err(|e| replay_error(format!("Default trace serialization failed: {e}")))?;
if let Some(rv) = frame_value.get_mut("returnValue") &&
let Some(s) = rv.as_str()
{
Expand Down Expand Up @@ -542,6 +546,19 @@ pub fn trace_block(
let info = tx_info_at(block, tx, index);
trace!(tx_index = index, tx_hash = %tx_hash, "Tracing transaction");

if index > 0 {
match MuxInspector::try_from_config(mux_config.clone()) {
Ok(insp) => *executor.inspector_mut() = insp,
Err(e) => {
results.push(TraceResult::Error {
error: format!("MuxInspector creation failed: {:?}", e),
tx_hash: Some(tx_hash),
});
continue;
}
}
}

match executor.run_transaction(recovered_tx) {
Ok(outcome) => {
let result = outcome.inner.result;
Expand All @@ -557,8 +574,6 @@ pub fn trace_block(
inspector.try_into_mux_frame(&result_and_state, db, info)
};

*executor.inspector_mut() =
MuxInspector::try_from_config(mux_config.clone()).unwrap();
executor.evm.db_mut().commit(state_changes);

match mux_result {
Expand Down