add sig identifier to cast run (foundry-rs#2047)

joshieDo · Jun 21, 2022 · 8b33ded · 8b33ded
1 parent 103b12a
commit 8b33ded
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/cli/src/cmd/cast/run.rs b/cli/src/cmd/cast/run.rs
@@ -1,5 +1,5 @@
 use crate::{cmd::Cmd, utils, utils::consume_config_rpc_url};
-use cast::trace::CallTraceDecoder;
+use cast::trace::{identifier::SignaturesIdentifier, CallTraceDecoder};
 use clap::Parser;
 use ethers::{
     abi::Address,
@@ -163,6 +163,9 @@ impl RunArgs {
 
             let mut decoder = CallTraceDecoderBuilder::new().with_labels(labeled_addresses).build();
 
+            decoder
+                .add_signature_identifier(SignaturesIdentifier::new(Config::foundry_cache_dir())?);
+
             for (_, trace) in &mut result.traces {
                 decoder.identify(trace, &etherscan_identifier);
             }

diff --git a/evm/src/trace/node.rs b/evm/src/trace/node.rs
@@ -131,13 +131,17 @@ impl CallTraceNode {
                         if let Some(tokens) =
                             funcs.iter().find_map(|func| func.decode_output(&bytes[..]).ok())
                         {
-                            self.trace.output = RawOrDecodedReturnData::Decoded(
-                                tokens
-                                    .iter()
-                                    .map(|token| utils::label(token, labels))
-                                    .collect::<Vec<_>>()
-                                    .join(", "),
-                            );
+                            // Functions coming from an external database do not have any outputs
+                            // specified, and will lead to returning an empty list of tokens.
+                            if !tokens.is_empty() {
+                                self.trace.output = RawOrDecodedReturnData::Decoded(
+                                    tokens
+                                        .iter()
+                                        .map(|token| utils::label(token, labels))
+                                        .collect::<Vec<_>>()
+                                        .join(", "),
+                                );
+                            }
                         }
                     } else if let Ok(decoded_error) =
                         foundry_utils::decode_revert(&bytes[..], Some(errors))