fix(forge): decode traces when an onchain simulation fails (foundry-r…

…s#2875) * decode err on onchain simulation failures * change message * add deployment fail reason
iFrostizz · Nov 9, 2022 · 881a3a2 · 881a3a2
1 parent 2fb5710
commit 881a3a2
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/cli/src/cmd/forge/script/broadcast.rs b/cli/src/cmd/forge/script/broadcast.rs
@@ -220,8 +220,7 @@ impl ScriptArgs {
                     .await
                     .map_err(|_| {
                         eyre::eyre!(
-                            "One or more transactions failed when simulating the
-                    on-chain version. Check the trace by re-running with `-vvv`"
+                            "Transaction failed when running the on-chain simulation. Check the trace above for more information."
                         )
                     })?
                 };

diff --git a/cli/src/cmd/forge/script/executor.rs b/cli/src/cmd/forge/script/executor.rs
@@ -88,7 +88,6 @@ impl ScriptArgs {
         let mut runner = self
             .prepare_runner(script_config, script_config.evm_opts.sender, SimulationStage::OnChain)
             .await;
-        let mut failed = false;
 
         if script_config.evm_opts.verbosity > 3 {
             println!("==========================");
@@ -130,6 +129,17 @@ impl ScriptArgs {
                         )
                     }
 
+                    if !result.success || script_config.evm_opts.verbosity > 3 {
+                        for (_kind, trace) in &mut result.traces {
+                            decoder.decode(trace).await;
+                            println!("{}", trace);
+                        }
+                    }
+
+                    if !result.success {
+                        eyre::bail!("Simulated execution failed");
+                    }
+
                     let created_contracts = result
                         .traces
                         .iter()
@@ -155,17 +165,6 @@ impl ScriptArgs {
                     // We inflate the gas used by the user specified percentage
                     tx.gas = Some(U256::from(result.gas * self.gas_estimate_multiplier / 100));
 
-                    if !result.success {
-                        failed = true;
-                    }
-
-                    if script_config.evm_opts.verbosity > 3 {
-                        for (_kind, trace) in &mut result.traces {
-                            decoder.decode(trace).await;
-                            println!("{}", trace);
-                        }
-                    }
-
                     final_txs.push_back(TransactionWithMetadata::new(
                         tx.into(),
                         &result,
@@ -178,11 +177,7 @@ impl ScriptArgs {
             }
         }
 
-        if failed {
-            eyre::bail!("Simulated execution failed")
-        } else {
-            Ok(final_txs)
-        }
+        Ok(final_txs)
     }
 
     /// Creates the Runner that drives script execution

diff --git a/cli/src/cmd/forge/script/runner.rs b/cli/src/cmd/forge/script/runner.rs
@@ -161,16 +161,26 @@ impl ScriptRunner {
         if let Some(NameOrAddress::Address(to)) = to {
             self.call(from, to, calldata.unwrap_or_default(), value.unwrap_or(U256::zero()), true)
         } else if to.is_none() {
-            let DeployResult { address, gas, logs, traces, debug } = self.executor.deploy(
+            let (address, gas, logs, traces, debug) = match self.executor.deploy(
                 from,
                 calldata.expect("No data for create transaction").0,
                 value.unwrap_or(U256::zero()),
                 None,
-            )?;
+            ) {
+                Ok(DeployResult { address, gas, logs, traces, debug }) => {
+                    (address, gas, logs, traces, debug)
+                }
+                Err(EvmError::Execution { reason, traces, gas, logs, debug, .. }) => {
+                    println!("{}", Paint::red(format!("\nFailed with `{reason}`:\n")));
+
+                    (Address::zero(), gas, logs, traces, debug)
+                }
+                e => eyre::bail!("Unrecoverable error: {:?}", e),
+            };
 
             Ok(ScriptResult {
                 returned: bytes::Bytes::new(),
-                success: true,
+                success: address != Address::zero(),
                 gas,
                 logs,
                 traces: traces