merge w main

crates/op-rbuilder/Cargo.toml

@@ -128,6 +128,8 @@ moka = "0.12"
 http = "1.0"
 sha3 = "0.10"
 ureq = "2.10"
+reqwest = "0.12.23"
+k256 = "0.13.4"
 
 rollup-boost = { git = "https://github.com/flashbots/rollup-boost", rev = "b86af43969557bee18f17ec1d6bcd3e984f910b2" }
 

crates/op-rbuilder/src/builders/flashblocks/payload.rs

@@ -630,7 +630,7 @@ where
             state,
             best_txs,
             target_gas_for_batch.min(ctx.block_gas_limit()),
-            total_da_per_batch,
+            target_da_per_batch,
         )
         .wrap_err("failed to execute best transactions")?;
         // Extract last transactions

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

@@ -1,20 +1,17 @@
 use alloy_consensus::Transaction;
 use alloy_eips::Decodable2718;
-use alloy_primitives::{Address, TxHash, U256, address, b128, b256};
+use alloy_primitives::{Address, TxHash, U256, address};
 use alloy_provider::Provider;
-use alloy_sol_types::SolCall;
 use macros::rb_test;
 use op_alloy_consensus::OpTxEnvelope;
 use std::time::Duration;
 
 use crate::{
     args::{FlashblocksArgs, OpRbuilderArgs},
     tests::{
-        BUILDER_PRIVATE_KEY, BlockTransactionsExt, BundleOpts, ChainDriver, ChainDriverExt,
-        FUNDED_PRIVATE_KEY, LocalInstance, ONE_ETH, TransactionBuilderExt,
+        BlockTransactionsExt, BundleOpts, ChainDriver, LocalInstance, TransactionBuilderExt,
         flashblocks_number_contract::FlashblocksNumber,
     },
-    tx_signer::Signer,
 };
 
 // If the order of deployment from the signer changes the address will change
@@ -34,6 +31,7 @@ const FLASHBLOCKS_NUMBER_ADDRESS: Address = address!("5fbdb2315678afecb367f032d9
         flashblocks_p2p_private_key_hex: String::new(),
         flashblocks_known_peers: String::new(),
         flashblocks_number_contract_address: None,
+        ..Default::default()
     },
     ..Default::default()
 })]
@@ -76,6 +74,7 @@ async fn smoke_dynamic_base(rbuilder: LocalInstance) -> eyre::Result<()> {
         flashblocks_p2p_private_key_hex: String::new(),
         flashblocks_known_peers: String::new(),
         flashblocks_number_contract_address: None,
+        ..Default::default()
     },
     ..Default::default()
 })]
@@ -118,6 +117,7 @@ async fn smoke_dynamic_unichain(rbuilder: LocalInstance) -> eyre::Result<()> {
         flashblocks_p2p_private_key_hex: String::new(),
         flashblocks_known_peers: String::new(),
         flashblocks_number_contract_address: None,
+        ..Default::default()
     },
     ..Default::default()
 })]
@@ -160,6 +160,7 @@ async fn smoke_classic_unichain(rbuilder: LocalInstance) -> eyre::Result<()> {
         flashblocks_p2p_private_key_hex: String::new(),
         flashblocks_known_peers: String::new(),
         flashblocks_number_contract_address: None,
+        ..Default::default()
     },
     ..Default::default()
 })]
@@ -202,6 +203,7 @@ async fn smoke_classic_base(rbuilder: LocalInstance) -> eyre::Result<()> {
         flashblocks_p2p_private_key_hex: String::new(),
         flashblocks_known_peers: String::new(),
         flashblocks_number_contract_address: None,
+        ..Default::default()
     },
     ..Default::default()
 })]
@@ -251,6 +253,7 @@ async fn unichain_dynamic_with_lag(rbuilder: LocalInstance) -> eyre::Result<()>
         flashblocks_p2p_private_key_hex: String::new(),
         flashblocks_known_peers: String::new(),
         flashblocks_number_contract_address: None,
+        ..Default::default()
     },
     ..Default::default()
 })]
@@ -293,6 +296,7 @@ async fn dynamic_with_full_block_lag(rbuilder: LocalInstance) -> eyre::Result<()
         flashblocks_p2p_private_key_hex: String::new(),
         flashblocks_known_peers: String::new(),
         flashblocks_number_contract_address: None,
+        ..Default::default()
     },
     ..Default::default()
 })]
@@ -357,6 +361,7 @@ async fn test_flashblock_min_filtering(rbuilder: LocalInstance) -> eyre::Result<
         flashblocks_p2p_private_key_hex: String::new(),
         flashblocks_known_peers: String::new(),
         flashblocks_number_contract_address: None,
+        ..Default::default()
     },
     ..Default::default()
 })]
@@ -417,6 +422,7 @@ async fn test_flashblock_max_filtering(rbuilder: LocalInstance) -> eyre::Result<
         flashblocks_p2p_private_key_hex: String::new(),
         flashblocks_known_peers: String::new(),
         flashblocks_number_contract_address: None,
+        ..Default::default()
     },
     ..Default::default()
 })]
@@ -466,6 +472,7 @@ async fn test_flashblock_min_max_filtering(rbuilder: LocalInstance) -> eyre::Res
         flashblocks_p2p_private_key_hex: String::new(),
         flashblocks_known_peers: String::new(),
         flashblocks_number_contract_address: None,
+        ..Default::default()
     },
     ..Default::default()
 })]