From abc46ea25c9aa035b422de8ade1e1386b14f20b8 Mon Sep 17 00:00:00 2001 From: Wodann Date: Mon, 5 Oct 2026 20:12:25 +0000 Subject: [PATCH 1/2] fix: recognise console calls by the Hardhat console address The nested trace conversion defined its own copy of the Hardhat console address. That copy held the `ecrecover` precompile address instead. Console calls therefore got a placeholder instead of their address as code. Reuse the console and cheatcode addresses from foundry-evm-core. --- .changeset/fix-stack-trace-console-address.md | 5 +++ Cargo.lock | 1 + crates/edr_solidity/Cargo.toml | 1 + .../src/nested_trace/conversion.rs | 45 ++++++++++++++----- 4 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 .changeset/fix-stack-trace-console-address.md diff --git a/.changeset/fix-stack-trace-console-address.md b/.changeset/fix-stack-trace-console-address.md new file mode 100644 index 0000000000..52540f145a --- /dev/null +++ b/.changeset/fix-stack-trace-console-address.md @@ -0,0 +1,5 @@ +--- +"@nomicfoundation/edr": patch +--- + +Fixed Solidity stack-trace construction to recognise `console.log` calls by the Hardhat console address. It previously checked the `ecrecover` precompile address instead. diff --git a/Cargo.lock b/Cargo.lock index 600001bcd1..b3039c4ba3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3613,6 +3613,7 @@ dependencies = [ "edr_primitives", "edr_tracing", "foundry-compilers", + "foundry-evm-core", "foundry-evm-traces", "gimli", "indexmap 2.14.2", diff --git a/crates/edr_solidity/Cargo.toml b/crates/edr_solidity/Cargo.toml index ac4e0bf4d2..c8b990be61 100644 --- a/crates/edr_solidity/Cargo.toml +++ b/crates/edr_solidity/Cargo.toml @@ -20,6 +20,7 @@ edr_defaults.workspace = true edr_primitives.workspace = true edr_tracing.workspace = true foundry-compilers.workspace = true +foundry-evm-core.workspace = true foundry-evm-traces.workspace = true addr2line = { version = "0.25", default-features = false, features = ["std", "fallible-iterator", "smallvec"] } gimli = { version = "0.32", default-features = false, features = ["read", "std", "endian-reader"] } diff --git a/crates/edr_solidity/src/nested_trace/conversion.rs b/crates/edr_solidity/src/nested_trace/conversion.rs index 1fdd837591..160480d30f 100644 --- a/crates/edr_solidity/src/nested_trace/conversion.rs +++ b/crates/edr_solidity/src/nested_trace/conversion.rs @@ -2,6 +2,7 @@ use edr_chain_spec::{EvmHaltReason, HaltReasonTrait}; use edr_primitives::{Address, Bytes, HashMap, U160}; +use foundry_evm_core::constants::{CHEATCODE_ADDRESS, HARDHAT_CONSOLE_ADDRESS}; use revm_inspectors::tracing::{types::CallTraceStep, CallTraceArena}; use revm_interpreter::{InternalResult, SuccessOrHalt}; @@ -36,18 +37,6 @@ fn convert_node( arena: &CallTraceArena, node_idx: usize, ) -> Result, CallTraceArenaConversionError> { - // Handle regular calls - // HACK: use address as code for contracts implemented in Rust - // (console/cheatcodes) - const CHEATCODE_ADDRESS: Address = Address::new([ - 0x71, 0x09, 0x70, 0x9E, 0xcf, 0xa9, 0x1a, 0x80, 0x62, 0x6f, 0xf3, 0x98, 0x9d, 0x68, 0xf6, - 0x7f, 0x5b, 0x1d, 0xd1, 0x2d, - ]); - const HARDHAT_CONSOLE_ADDRESS: Address = Address::new([ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x01, - ]); - let node = arena .nodes() .get(node_idx) @@ -121,6 +110,8 @@ fn convert_node( })); } + // HACK: use address as code for contracts implemented in Rust + // (console/cheatcodes) let code = if trace.address == HARDHAT_CONSOLE_ADDRESS || trace.address == CHEATCODE_ADDRESS { Bytes::from(trace.address.to_vec()) } else { @@ -213,3 +204,33 @@ fn is_calllike_op(step: &CallTraceStep) -> bool { | opcode::CREATE2 ) } + +#[cfg(test)] +mod tests { + use edr_chain_spec::EvmHaltReason; + + use super::*; + + fn convert_call_without_known_code(address: Address) -> CallMessage { + let mut arena = CallTraceArena::default(); + arena.nodes_mut()[0].trace.address = address; + + let no_code = HashMap::default(); + match convert_from_arena(&no_code, &no_code, &arena).expect("arena has a root node") { + NestedTrace::Call(call) => call, + _ => panic!("root node is a call"), + } + } + + #[test] + fn console_call_uses_address_as_code() { + let call = convert_call_without_known_code(HARDHAT_CONSOLE_ADDRESS); + assert_eq!(call.code, *HARDHAT_CONSOLE_ADDRESS.as_slice()); + } + + #[test] + fn cheatcode_call_uses_address_as_code() { + let call = convert_call_without_known_code(CHEATCODE_ADDRESS); + assert_eq!(call.code, *CHEATCODE_ADDRESS.as_slice()); + } +} From fc09b82773d7f67a47ff5a1a670af44c3f12befe Mon Sep 17 00:00:00 2001 From: Wodann Date: Mon, 5 Oct 2026 20:21:49 +0000 Subject: [PATCH 2/2] docs: shorten the console address changeset --- .changeset/fix-stack-trace-console-address.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/fix-stack-trace-console-address.md b/.changeset/fix-stack-trace-console-address.md index 52540f145a..a30a6baa3b 100644 --- a/.changeset/fix-stack-trace-console-address.md +++ b/.changeset/fix-stack-trace-console-address.md @@ -2,4 +2,4 @@ "@nomicfoundation/edr": patch --- -Fixed Solidity stack-trace construction to recognise `console.log` calls by the Hardhat console address. It previously checked the `ecrecover` precompile address instead. +Fixed Solidity stack-trace construction to recognise `console.log` calls by the Hardhat console address.