BidObserver has SubmitBlockRequest again

Author: ZanCorDX

crates/rbuilder/src/live_builder/block_output/bid_observer.rs

@@ -1,7 +1,10 @@
 use alloy_primitives::U256;
 use reth_primitives::SealedBlock;
 
-use crate::{building::BuiltBlockTrace, live_builder::payload_events::MevBoostSlotData};
+use crate::{
+    building::BuiltBlockTrace, live_builder::payload_events::MevBoostSlotData,
+    mev_boost::submission::SubmitBlockRequest,
+};
 
 /// Trait that receives every bid made by us to the relays.
 pub trait BidObserver: std::fmt::Debug {
@@ -11,6 +14,7 @@ pub trait BidObserver: std::fmt::Debug {
         &self,
         slot_data: &MevBoostSlotData,
         sealed_block: &SealedBlock,
+        submit_block_request: &SubmitBlockRequest,
         built_block_trace: &BuiltBlockTrace,
         builder_name: String,
         best_bid_value: U256,
@@ -25,6 +29,7 @@ impl BidObserver for NullBidObserver {
         &self,
         _slot_data: &MevBoostSlotData,
         _sealed_block: &SealedBlock,
+        _submit_block_request: &SubmitBlockRequest,
         _built_block_trace: &BuiltBlockTrace,
         _builder_name: String,
         _best_bid_value: U256,

crates/rbuilder/src/live_builder/block_output/bid_observer_multiplexer.rs

@@ -1,6 +1,9 @@
 use reth_primitives::SealedBlock;
 
-use crate::{building::BuiltBlockTrace, live_builder::payload_events::MevBoostSlotData};
+use crate::{
+    building::BuiltBlockTrace, live_builder::payload_events::MevBoostSlotData,
+    mev_boost::submission::SubmitBlockRequest,
+};
 
 use super::bid_observer::BidObserver;
 
@@ -27,6 +30,7 @@ impl BidObserver for BidObserverMultiplexer {
         &self,
         slot_data: &MevBoostSlotData,
         sealed_block: &SealedBlock,
+        submit_block_request: &SubmitBlockRequest,
         built_block_trace: &BuiltBlockTrace,
         builder_name: String,
         best_bid_value: alloy_primitives::U256,
@@ -35,6 +39,7 @@ impl BidObserver for BidObserverMultiplexer {
             obs.block_submitted(
                 slot_data,
                 sealed_block,
+                submit_block_request,
                 built_block_trace,
                 builder_name.clone(),
                 best_bid_value,

crates/rbuilder/src/live_builder/block_output/relay_submit.rs

@@ -307,7 +307,7 @@ async fn run_submit_to_relays_job(
             &cancel,
         );
 
-        if let Some((optimistic_signed_block, _)) = optimistic_signed_block {
+        let signed_block = if let Some((optimistic_signed_block, _)) = optimistic_signed_block {
             submit_block_to_relays(
                 &config.chain_spec,
                 &optimistic_signed_block,
@@ -320,6 +320,7 @@ async fn run_submit_to_relays_job(
                 &submission_span,
                 &cancel,
             );
+            optimistic_signed_block
         } else {
             // non-optimistic submission to optimistic relays
             submit_block_to_relays(
@@ -334,18 +335,27 @@ async fn run_submit_to_relays_job(
                 &submission_span,
                 &cancel,
             );
-        }
+            normal_signed_block
+        };
 
-        submission_span.in_scope(|| {
-            // NOTE: we only notify normal submission here because they have the same contents but different pubkeys
-            config.bid_observer.block_submitted(
-                &slot_data,
-                &block.sealed_block,
-                &block.trace,
-                builder_name,
-                bid_metadata.value.top_competitor_bid.unwrap_or_default(),
-            );
-        })
+        match signed_block.into_request(&config.chain_spec, None) {
+            Ok(request) => {
+                submission_span.in_scope(|| {
+                    // NOTE: we only notify normal submission here because they have the same contents but different pubkeys
+                    config.bid_observer.block_submitted(
+                        &slot_data,
+                        &block.sealed_block,
+                        &request,
+                        &block.trace,
+                        builder_name,
+                        bid_metadata.value.top_competitor_bid.unwrap_or_default(),
+                    );
+                })
+            }
+            Err(err) => {
+                error!(parent: &submission_span, err = ?err, "Error converting request for bid observer");
+            }
+        };
     }
 }