record metrics on cancel

Author: jowparks

crates/op-rbuilder/src/monitoring.rs

@@ -8,7 +8,7 @@ use reth_node_api::{FullNodeComponents, NodeTypes};
 use reth_optimism_primitives::{OpPrimitives, OpReceipt, OpTransactionSigned};
 use reth_primitives::{Block, RecoveredBlock};
 use reth_provider::{Chain, ExecutionOutcome};
-use tracing::{info, warn};
+use tracing::{info, warn, error};
 
 use crate::{metrics::OpRBuilderMetrics, tx_signer::Signer};
 
@@ -147,19 +147,51 @@ fn decode_chain_into_builder_txs(
         .blocks_and_receipts()
         // Get all receipts
         .map(|(block, receipts)| {
+            error!(
+                block_number = block.number,
+                tx_count = block.body().transactions.len(),
+                "Processing block transactions"
+            );
+            
             let has_builder_tx =
                 block
                     .body()
                     .transactions
                     .iter()
                     .zip(receipts.iter())
                     .any(move |(tx, receipt)| {
-                        receipt.status()
-                            && tx.input().starts_with(OP_BUILDER_TX_PREFIX)
-                            && tx.recover_signer().is_ok_and(|signer| {
-                                builder_signer.is_some_and(|bs| signer == bs.address)
-                            })
+                        let starts_with_prefix = tx.input().starts_with(OP_BUILDER_TX_PREFIX);
+                        let is_successful = receipt.status();
+                        let sender_recovery = tx.recover_signer();
+                        error!(
+                            tx_hash = ?tx.hash(),
+                            sender_recovery = ?sender_recovery,
+                            "Transaction builder check details"
+                        );
+                        let sender_matches = sender_recovery.is_ok_and(|signer| {
+                            builder_signer.is_some_and(|bs| signer == bs.address)
+                        });
+                        
+                        error!(
+                            tx_hash = ?tx.hash(),
+                            starts_with_prefix,
+                            is_successful,
+                            sender_matches,
+                            expected_signer = ?builder_signer.as_ref().map(|s| s.address),
+                            "Transaction builder check details"
+                        );
+                        
+                        is_successful && starts_with_prefix && sender_matches
                     });
+                    
+            if !has_builder_tx && builder_signer.is_some() {
+                error!(
+                    block_number = block.number,
+                    expected_signer = ?builder_signer.as_ref().map(|s| s.address),
+                    "No builder transactions found in block"
+                );
+            }
+            
             (block, has_builder_tx)
         })
         .collect()

crates/op-rbuilder/src/payload_builder.rs

@@ -1157,6 +1157,7 @@ where
 
             // check if the job was cancelled, if so we can exit early
             if self.cancel.is_cancelled() {
+                self.record_tx_metrics(num_txs_considered, num_txs_simulated, num_txs_simulated_success, num_txs_simulated_fail);
                 return Ok(Some(()));
             }
 
@@ -1224,20 +1225,23 @@ where
             info.executed_senders.push(tx.signer());
             info.executed_transactions.push(tx.into_inner());
         }
+        self.record_tx_metrics(num_txs_considered, num_txs_simulated, num_txs_simulated_success, num_txs_simulated_fail);
+        Ok(None)
+    }
 
+    /// Record transaction metrics for payload building
+    fn record_tx_metrics(&self, considered: usize, simulated: usize, success: usize, fail: usize) {
         self.metrics
             .payload_num_tx_considered
-            .record(num_txs_considered as f64);
+            .record(considered as f64);
         self.metrics
             .payload_num_tx_simulated
-            .record(num_txs_simulated as f64);
+            .record(simulated as f64);
         self.metrics
             .payload_num_tx_simulated_success
-            .record(num_txs_simulated_success as f64);
+            .record(success as f64);
         self.metrics
             .payload_num_tx_simulated_fail
-            .record(num_txs_simulated_fail as f64);
-
-        Ok(None)
+            .record(fail as f64);
     }
 }