From a6805f9bdb9f87011941e7609a97dddb11565414 Mon Sep 17 00:00:00 2001
From: James <james@prestwi.ch>
Date: Wed, 17 Dec 2025 13:18:06 -0500
Subject: [PATCH] fix: more tracing cleanup

---
 src/config.rs                 |  2 +-
 src/tasks/block/sim.rs        |  2 +-
 src/tasks/env.rs              | 24 +++++++++++++++---------
 src/tasks/submit/flashbots.rs |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index b33d9f1e..a4788285 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -215,7 +215,7 @@ impl BuilderConfig {
     }
 
     /// Connect to a Flashbots bundle provider.
-    pub async fn connect_flashbots(&self) -> Result<FlashbotsProvider, eyre::Error> {
+    pub async fn connect_flashbots(&self) -> Result<FlashbotsProvider> {
         self.connect_builder_signer().await.map(|signer| {
             ProviderBuilder::new().wallet(signer).connect_http(self.flashbots_endpoint.clone())
         })
diff --git a/src/tasks/block/sim.rs b/src/tasks/block/sim.rs
index f33a4e67..29f11571 100644
--- a/src/tasks/block/sim.rs
+++ b/src/tasks/block/sim.rs
@@ -204,7 +204,7 @@ impl SimulatorTask {
             let Some(sim_env) = self.envs.borrow_and_update().clone() else { return };
 
             let span = sim_env.span();
-            span_info!(span, "new block environment received");
+            span_info!(span, "Starting simulator iteration for new block environment");
 
             // Calculate the deadline for this block simulation.
             // NB: This must happen _after_ taking a reference to the sim cache,
diff --git a/src/tasks/env.rs b/src/tasks/env.rs
index 8135fc0e..85d38f25 100644
--- a/src/tasks/env.rs
+++ b/src/tasks/env.rs
@@ -280,9 +280,11 @@ impl EnvTask {
         let mut span = info_span!(
             parent: None,
             "SimEnv",
-            host_block.number = "initial",
-            rollup_header.number = "initial",
-            rollup_header.hash = "initial",
+            confirmed_host.number = "initial",
+            confirmed_ru.number = "initial",
+            confirmed_ru.hash = "initial",
+            sim_host.number = "initial",
+            sim_ru.number = "initial",
             trace_id = tracing::field::Empty,
         );
 
@@ -299,9 +301,11 @@ impl EnvTask {
             let rollup_block_number = rollup_header.number;
 
             // Populate span fields.
-            span.record("host_block.number", host_block_number);
-            span.record("rollup_header.number", rollup_block_number);
-            span.record("rollup_header.hash", rollup_header.hash.to_string());
+            span.record("confirmed_host.number", host_block_number);
+            span.record("confirmed_ru.number", rollup_block_number);
+            span.record("confirmed_ru.hash", rollup_header.hash.to_string());
+            span.record("sim_host.number", host_block_number + 1);
+            span.record("sim_ru.number", rollup_block_number + 1);
 
             let (host_block_res, quincey_res) = tokio::join!(
                 self.host_provider
@@ -365,9 +369,11 @@ impl EnvTask {
             // Create a new span for the next iteration.
             span = info_span!(
                 "SimEnv",
-                host_block.number = host_block_number + 1,
-                rollup_header.number = rollup_block_number + 1,
-                rollup_header.hash = tracing::field::Empty,
+                confirmed_host.number = host_block_number + 1,
+                confirmed_ru.number = rollup_block_number + 1,
+                confirmed_ru.hash = tracing::field::Empty,
+                sim_host.number = host_block_number + 2,
+                sim_ru.number = rollup_block_number + 2,
                 trace_id = tracing::field::Empty,
             );
         }
diff --git a/src/tasks/submit/flashbots.rs b/src/tasks/submit/flashbots.rs
index f7c3a9f7..76e56d46 100644
--- a/src/tasks/submit/flashbots.rs
+++ b/src/tasks/submit/flashbots.rs
@@ -204,7 +204,7 @@ impl FlashbotsTask {
                             counter!("signet.builder.flashbots.bundles_submitted").increment(1);
                             debug!(
                                 hash = resp.map(|r| r.bundle_hash.to_string()),
-                                "received bundle hash after submitted to flashbots"
+                                "Submitted MEV bundle to Flashbots, received OK response"
                             );
                         }
                         Err(err) => {