fix index

Author: avalonche

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

@@ -124,11 +124,17 @@ impl BuilderTransactions<FlashblocksExtraCtx> for FlashblocksBuilderTx {
         db: &mut State<impl Database>,
     ) -> Result<Vec<BuilderTransactionCtx>, BuilderTransactionError> {
         let mut builder_txs = Vec::<BuilderTransactionCtx>::new();
-        let flashblocks_builder_tx = self.simulate_builder_tx(ctx, db)?;
-        builder_txs.extend(flashblocks_builder_tx.clone());
-        if let Some(flashtestations_builder_tx) = &self.flashtestations_builder_tx {
-            // We only include flashtestations txs in the last flashblock
-            if ctx.flashblock_index() == ctx.target_flashblock_count() - 1 {
+        if ctx.is_first_fallback_block() {
+            let flashblocks_builder_tx = self.simulate_builder_tx(ctx, db)?;
+            builder_txs.extend(flashblocks_builder_tx.clone());
+        }
+
+        if ctx.is_last_flashblock() {
+            let flashblocks_builder_tx = self.simulate_builder_tx(ctx, db)?;
+            builder_txs.extend(flashblocks_builder_tx.clone());
+            if let Some(flashtestations_builder_tx) = &self.flashtestations_builder_tx {
+                // We only include flashtestations txs in the last flashblock
+
                 let mut simulation_state = self.simulate_builder_txs_state::<FlashblocksExtraCtx>(
                     state_provider.clone(),
                     flashblocks_builder_tx.iter().collect(),

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

@@ -65,6 +65,8 @@ pub struct FlashblocksExtraCtx {
     pub flashblock_index: u64,
     /// Target flashblock count
     pub target_flashblock_count: u64,
+    /// Whether the current flashblock is the first fallback block
+    pub is_first_fallback_block: bool,
 }
 
 impl OpPayloadBuilderCtx<FlashblocksExtraCtx> {
@@ -78,6 +80,11 @@ impl OpPayloadBuilderCtx<FlashblocksExtraCtx> {
         self.extra_ctx.target_flashblock_count
     }
 
+    /// Returns if the flashblock is the first fallback block
+    pub fn is_first_fallback_block(&self) -> bool {
+        self.extra_ctx.is_first_fallback_block
+    }
+
     /// Increments the flashblock index
     pub fn increment_flashblock_index(&mut self) -> u64 {
         self.extra_ctx.flashblock_index += 1;
@@ -90,6 +97,11 @@ impl OpPayloadBuilderCtx<FlashblocksExtraCtx> {
         self.extra_ctx.target_flashblock_count
     }
 
+    /// Sets the first fallback block flag
+    pub fn set_first_fallback_block(&mut self, is_first_fallback_block: bool) {
+        self.extra_ctx.is_first_fallback_block = is_first_fallback_block;
+    }
+
     /// Returns if the flashblock is the last one
     pub fn is_last_flashblock(&self) -> bool {
         self.flashblock_index() == self.target_flashblock_count() - 1
@@ -250,6 +262,7 @@ where
             extra_ctx: FlashblocksExtraCtx {
                 flashblock_index: 0,
                 target_flashblock_count: self.config.flashblocks_per_block(),
+                is_first_fallback_block: true,
             },
         };
 
@@ -286,6 +299,8 @@ where
         self.ws_pub
             .publish(&fb_payload)
             .map_err(PayloadBuilderError::other)?;
+        // We set the first fallback block flag to false after building the first fallback block
+        ctx.set_first_fallback_block(false);
 
         info!(
             target: "payload_builder",