fix tests

Author: avalonche

crates/op-rbuilder/src/builders/builder_tx.rs

@@ -83,7 +83,7 @@ pub trait BuilderTransactions<ExtraCtx: Debug + Default = ()>: Debug {
         info: &mut ExecutionInfo<Extra>,
         builder_ctx: &OpPayloadBuilderCtx<ExtraCtx>,
         db: &mut State<impl Database>,
-    ) -> Result<(), BuilderTransactionError> {
+    ) -> Result<Vec<BuilderTransactionCtx>, BuilderTransactionError> {
         {
             let mut evm = builder_ctx
                 .evm_config
@@ -93,7 +93,7 @@ pub trait BuilderTransactions<ExtraCtx: Debug + Default = ()>: Debug {
 
             let builder_txs =
                 self.simulate_builder_txs(state_provider, info, builder_ctx, evm.db_mut())?;
-            for builder_tx in builder_txs {
+            for builder_tx in builder_txs.iter() {
                 if invalid.contains(&builder_tx.signed_tx.signer()) {
                     debug!(target: "payload_builder", tx_hash = ?builder_tx.signed_tx.tx_hash(), "builder signer invalid as previous builder tx reverted");
                     continue;
@@ -128,13 +128,13 @@ pub trait BuilderTransactions<ExtraCtx: Debug + Default = ()>: Debug {
                 // Append sender and transaction to the respective lists
                 info.executed_senders.push(builder_tx.signed_tx.signer());
                 info.executed_transactions
-                    .push(builder_tx.signed_tx.into_inner());
+                    .push(builder_tx.signed_tx.clone().into_inner());
             }
 
             // Release the db reference by dropping evm
             drop(evm);
 
-            Ok(())
+            Ok(builder_txs)
         }
     }
 

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

@@ -282,14 +282,11 @@ where
         ctx.metrics.sequencer_tx_gauge.set(sequencer_tx_time);
 
         // If we have payload with txpool we add first builder tx right after deposits
-        self.builder_tx
-            .add_builder_txs(&state_provider, &mut info, &ctx, &mut db)?;
+        let builder_txs =
+            self.builder_tx
+                .add_builder_txs(&state_provider, &mut info, &ctx, &mut db)?;
 
         // We subtract gas limit and da limit for builder transaction from the whole limit
-        let builder_txs = self
-            .builder_tx
-            .simulate_builder_txs(&state_provider, &mut info, &ctx, &mut db)
-            .map_err(|err| PayloadBuilderError::Other(Box::new(err)))?;
         let builder_tx_gas = builder_txs.iter().fold(0, |acc, tx| acc + tx.gas_used);
         let builder_tx_da_size: u64 = builder_txs.iter().fold(0, |acc, tx| acc + tx.da_size);
 
@@ -430,19 +427,28 @@ where
                     );
                     let flashblock_build_start_time = Instant::now();
                     let state = StateProviderDatabase::new(&state_provider);
+                    let mut db = State::builder()
+                        .with_database(state)
+                        .with_bundle_update()
+                        .with_bundle_prestate(bundle_state.clone())
+                        .build();
+
+                    let builder_txs = self.builder_tx.simulate_builder_txs(
+                        &state_provider,
+                        &mut info,
+                        &ctx,
+                        &mut db,
+                    )?;
+                    let builder_tx_gas = builder_txs.iter().fold(0, |acc, tx| acc + tx.gas_used);
+                    let builder_tx_da_size: u64 =
+                        builder_txs.iter().fold(0, |acc, tx| acc + tx.da_size);
 
                     total_gas_per_batch = total_gas_per_batch.saturating_sub(builder_tx_gas);
                     // saturating sub just in case, we will log an error if da_limit too small for builder_tx_da_size
                     if let Some(da_limit) = total_da_per_batch.as_mut() {
                         *da_limit = da_limit.saturating_sub(builder_tx_da_size);
                     }
 
-                    let mut db = State::builder()
-                        .with_database(state)
-                        .with_bundle_update()
-                        .with_bundle_prestate(bundle_state.clone())
-                        .build();
-
                     let best_txs_start_time = Instant::now();
                     let best_txs = BestPayloadTransactions::new(
                         // We are not using without_updates in here, so arriving transaction could target the current block