test: add BuilderTxValidation assertions to existing tests

Updates smoke, flashblocks, and revert tests to use the BuilderTxValidation
utility for validating builder transactions in blocks:

- smoke.rs: Added builder tx count assertions to chain_produces_blocks,
  chain_produces_big_tx_with_gas_limit, and chain_produces_big_tx_without_gas_limit
- flashblocks.rs: Added builder tx count assertions to smoke_dynamic_base,
  smoke_dynamic_unichain, smoke_classic_unichain, and smoke_classic_base
- revert.rs: Added builder tx validation to monitor_transaction_gc,
  disabled, and allow_reverted_transactions_without_bundle tests

Author: Himess

crates/op-rbuilder/src/tests/flashblocks.rs

@@ -9,8 +9,9 @@ use std::time::Duration;
 use crate::{
     args::{FlashblocksArgs, OpRbuilderArgs},
     tests::{
-        BlockTransactionsExt, BundleOpts, ChainDriver, FLASHBLOCKS_NUMBER_ADDRESS, LocalInstance,
-        TransactionBuilderExt, flashblocks_number_contract::FlashblocksNumber,
+        BlockTransactionsExt, BuilderTxValidation, BundleOpts, ChainDriver,
+        FLASHBLOCKS_NUMBER_ADDRESS, LocalInstance, TransactionBuilderExt,
+        flashblocks_number_contract::FlashblocksNumber,
     },
 };
 
@@ -43,6 +44,10 @@ async fn smoke_dynamic_base(rbuilder: LocalInstance) -> eyre::Result<()> {
         }
         let block = driver.build_new_block_with_current_timestamp(None).await?;
         assert_eq!(block.transactions.len(), 8, "Got: {:?}", block.transactions); // 5 normal txn + deposit + 2 builder txn
+
+        // Validate builder transactions using BuilderTxValidation
+        block.assert_builder_tx_count(2);
+
         tokio::time::sleep(std::time::Duration::from_secs(1)).await;
     }
 
@@ -81,6 +86,10 @@ async fn smoke_dynamic_unichain(rbuilder: LocalInstance) -> eyre::Result<()> {
         }
         let block = driver.build_new_block_with_current_timestamp(None).await?;
         assert_eq!(block.transactions.len(), 8, "Got: {:?}", block.transactions); // 5 normal txn + deposit + 2 builder txn
+
+        // Validate builder transactions using BuilderTxValidation
+        block.assert_builder_tx_count(2);
+
         tokio::time::sleep(std::time::Duration::from_secs(1)).await;
     }
 
@@ -119,6 +128,10 @@ async fn smoke_classic_unichain(rbuilder: LocalInstance) -> eyre::Result<()> {
         }
         let block = driver.build_new_block().await?;
         assert_eq!(block.transactions.len(), 8, "Got: {:?}", block.transactions); // 5 normal txn + deposit + 2 builder txn
+
+        // Validate builder transactions using BuilderTxValidation
+        block.assert_builder_tx_count(2);
+
         tokio::time::sleep(std::time::Duration::from_secs(1)).await;
     }
 
@@ -157,6 +170,10 @@ async fn smoke_classic_base(rbuilder: LocalInstance) -> eyre::Result<()> {
         }
         let block = driver.build_new_block().await?;
         assert_eq!(block.transactions.len(), 8, "Got: {:?}", block.transactions); // 5 normal txn + deposit + 2 builder txn
+
+        // Validate builder transactions using BuilderTxValidation
+        block.assert_builder_tx_count(2);
+
         tokio::time::sleep(std::time::Duration::from_secs(1)).await;
     }
 

crates/op-rbuilder/src/tests/revert.rs

@@ -6,8 +6,8 @@ use crate::{
     args::OpRbuilderArgs,
     primitives::bundle::MAX_BLOCK_RANGE_BLOCKS,
     tests::{
-        BlockTransactionsExt, BundleOpts, ChainDriver, ChainDriverExt, LocalInstance, ONE_ETH,
-        OpRbuilderArgsTestExt, TransactionBuilderExt,
+        BlockTransactionsExt, BuilderTxValidation, BundleOpts, ChainDriver, ChainDriverExt,
+        LocalInstance, ONE_ETH, OpRbuilderArgsTestExt, TransactionBuilderExt,
     },
 };
 
@@ -53,6 +53,14 @@ async fn monitor_transaction_gc(rbuilder: LocalInstance) -> eyre::Result<()> {
             assert_eq!(generated_block.transactions.len(), 3);
         }
 
+        // Validate builder transactions using BuilderTxValidation
+        if_standard! {
+            generated_block.assert_builder_tx_count(1);
+        }
+        if_flashblocks! {
+            generated_block.assert_builder_tx_count(2);
+        }
+
         // since we created the 10 transactions with increasing block ranges, as we generate blocks
         // one transaction will be gc on each block.
         // transactions from [0, i] should be dropped, transactions from [i+1, 10] should be queued
@@ -88,6 +96,9 @@ async fn disabled(rbuilder: LocalInstance) -> eyre::Result<()> {
 
         assert!(block.includes(valid_tx.tx_hash()));
         assert!(block.includes(reverting_tx.tx_hash()));
+
+        // Validate builder transactions are present
+        assert!(block.has_builder_tx());
     }
 
     Ok(())
@@ -396,6 +407,9 @@ async fn allow_reverted_transactions_without_bundle(rbuilder: LocalInstance) ->
 
         assert!(block.includes(valid_tx.tx_hash()));
         assert!(block.includes(reverting_tx.tx_hash()));
+
+        // Validate builder transactions are present
+        assert!(block.has_builder_tx());
     }
 
     Ok(())

crates/op-rbuilder/src/tests/smoke.rs

@@ -53,6 +53,14 @@ async fn chain_produces_blocks(rbuilder: LocalInstance) -> eyre::Result<()> {
                 "Empty blocks should have exactly three transactions"
             );
         }
+
+        // Validate builder transactions are present
+        if_standard! {
+            block.assert_builder_tx_count(1);
+        }
+        if_flashblocks! {
+            block.assert_builder_tx_count(2);
+        }
     }
 
     // ensure that transactions are included in blocks and each block has all the transactions
@@ -103,6 +111,14 @@ async fn chain_produces_blocks(rbuilder: LocalInstance) -> eyre::Result<()> {
                 tx_hash
             );
         }
+
+        // Validate builder transactions are present
+        if_standard! {
+            block.assert_builder_tx_count(1);
+        }
+        if_flashblocks! {
+            block.assert_builder_tx_count(2);
+        }
     }
     Ok(())
 }
@@ -249,6 +265,14 @@ async fn chain_produces_big_tx_with_gas_limit(rbuilder: LocalInstance) -> eyre::
     let exclusion_result = txs.hashes().find(|hash| hash == tx_high_gas.tx_hash());
     assert!(exclusion_result.is_none());
 
+    // Validate builder transactions are present
+    if_standard! {
+        block.assert_builder_tx_count(1);
+    }
+    if_flashblocks! {
+        block.assert_builder_tx_count(2);
+    }
+
     Ok(())
 }
 
@@ -294,6 +318,14 @@ async fn chain_produces_big_tx_without_gas_limit(rbuilder: LocalInstance) -> eyr
         );
     }
 
+    // Validate builder transactions are present
+    if_standard! {
+        block.assert_builder_tx_count(1);
+    }
+    if_flashblocks! {
+        block.assert_builder_tx_count(2);
+    }
+
     Ok(())
 }