Add default contracts events and functions to decoder by default

crates/evm/traces/src/decoder/mod.rs

@@ -42,6 +42,15 @@ impl CallTraceDecoderBuilder {
  self
  }
 
+ /// Add known functions to the decoder.
+ #[inline]
+ pub fn with_functions(mut self, functions: impl IntoIterator<Item = Function>) -> Self {
+ for function in functions {
+ self.decoder.functions.entry(function.selector()).or_default().push(function);
+ }
+ self
+ }
+
  /// Add known events to the decoder.
  #[inline]
  pub fn with_events(mut self, events: impl IntoIterator<Item = Event>) -> Self {

crates/evm/traces/src/identifier/local.rs

@@ -1,5 +1,5 @@
 use super::{AddressIdentity, TraceIdentifier};
-use alloy_json_abi::Event;
+use alloy_json_abi::{Event, Function};
 use alloy_primitives::Address;
 use foundry_common::contracts::{diff_score, ContractsByArtifact};
 use ordered_float::OrderedFloat;
@@ -15,6 +15,11 @@ impl<'a> LocalTraceIdentifier<'a> {
  Self { known_contracts }
  }
 
+ /// Get all the functions of the local contracts.
+ pub fn functions(&self) -> impl Iterator<Item = &Function> {
+ self.known_contracts.iter().flat_map(|(_, (abi, _))| abi.functions())
+ }
+
  /// Get all the events of the local contracts.
  pub fn events(&self) -> impl Iterator<Item = &Event> {
  self.known_contracts.iter().flat_map(|(_, (abi, _))| abi.events())

crates/forge/bin/cmd/script/mod.rs

@@ -220,6 +220,8 @@ impl ScriptArgs {
  let mut decoder = CallTraceDecoderBuilder::new()
  .with_labels(result.labeled_addresses.clone())
  .with_verbosity(verbosity)
+ .with_events(local_identifier.events().cloned())
+ .with_functions(local_identifier.functions().cloned())
  .with_signature_identifier(SignaturesIdentifier::new(
  Config::foundry_cache_dir(),
  script_config.config.offline,

crates/forge/bin/cmd/test/mod.rs

@@ -243,6 +243,7 @@ impl TestArgs {
  let mut builder = CallTraceDecoderBuilder::new()
  .with_labels(result.labeled_addresses.clone())
  .with_events(local_identifier.events().cloned())
+ .with_functions(local_identifier.functions().cloned())
  .with_verbosity(verbosity);
 
  // Signatures are of no value for gas reports
@@ -692,6 +693,7 @@ async fn test(
  let mut builder = CallTraceDecoderBuilder::new()
  .with_labels(result.labeled_addresses.iter().map(|(a, s)| (*a, s.clone())))
  .with_events(local_identifier.events().cloned())
+ .with_functions(local_identifier.functions().cloned())
  .with_verbosity(verbosity);
 
  // Signatures are of no value for gas reports