fix: improve some traces

Author: prestwich

src/tasks/submit/task.rs

@@ -303,20 +303,29 @@ impl SubmitTask {
                 self.config.clone(),
                 self.constants.clone(),
             );
-            let bumpable = res_unwrap_or_continue!(
-                prep.prep_transaction(&sim_result.env.prev_host)
-                    .instrument(submission_span.clone())
-                    .await,
-                submission_span,
-                error!("failed to prepare transaction for submission - skipping block submission")
-            );
+            let bumpable = match prep
+                .prep_transaction(&prev_host.header)
+                .instrument(submission_span.clone())
+                .await
+            {
+                Ok(bumpable) => bumpable,
+                Err(error) => {
+                    submission_span.in_scope(|| {
+                        error!(%error, "failed to prepare transaction for submission - skipping block submission");
+                    });
+                    continue;
+                }
+            };
 
             // Simulate the transaction to check for reverts
-            res_unwrap_or_continue!(
-                self.sim_with_call(bumpable.req()).instrument(submission_span.clone()).await,
-                submission_span,
-                error!("simulation failed for transaction - skipping block submission")
-            );
+            if let Err(error) =
+                self.sim_with_call(bumpable.req()).instrument(submission_span.clone()).await
+            {
+                submission_span.in_scope(|| {
+                    error!(%error, "simulation failed for transaction - skipping block submission");
+                });
+                continue;
+            };
 
             // Now send the transaction
             let _ = res_unwrap_or_continue!(