feat: answer comments

Author: greged93

crates/chain-orchestrator/src/lib.rs

@@ -275,13 +275,6 @@ impl<
                 optimistic_headers.push_front(header);
             }
 
-            // Persist the head block to the database.
-            persist_l2_head_with_retry(
-                database.clone(),
-                optimistic_headers.last().expect("chain can not be empty").into(),
-            )
-            .await?;
-
             *chain.lock().await = optimistic_headers;
             *optimistic_mode.lock().await = true;
             return Ok(ChainOrchestratorEvent::OptimisticSync(received_block));
@@ -447,13 +440,6 @@ impl<
             validate_l1_messages(&new_blocks, &database).await?;
         }
 
-        // Persist the head block to the database.
-        persist_l2_head_with_retry(
-            database.clone(),
-            new_blocks.last().expect("chain can not be empty").into(),
-        )
-        .await?;
-
         match reorg_index {
             // If this is a simple chain extension, we can just extend the in-memory chain and emit
             // a ChainExtended event.
@@ -550,6 +536,7 @@ impl<
                     .retry("update_l1_messages_from_l2_blocks", || async {
                         let tx = database.tx_mut().await?;
                         tx.update_l1_messages_from_l2_blocks(block_info.clone()).await?;
+                        tx.set_l2_head_block_info(head.block_info).await?;
                         tx.commit().await?;
                         Ok::<_, ChainOrchestratorError>(())
                     })
@@ -900,21 +887,6 @@ async fn init_chain_from_db<P: Provider<Scroll> + 'static>(
     Ok(chain)
 }
 
-/// Persists the L2 head block info with retries.
-async fn persist_l2_head_with_retry(
-    db: Arc<Database>,
-    block: BlockInfo,
-) -> Result<(), ChainOrchestratorError> {
-    Retry::default()
-        .retry("set_l2_head_block_info", || async {
-            let tx = db.tx_mut().await?;
-            tx.set_l2_head_block_info(block).await?;
-            tx.commit().await?;
-            Ok::<_, ChainOrchestratorError>(())
-        })
-        .await
-}
-
 impl<
         ChainSpec: ScrollHardforks + 'static,
         BC: BlockClient<Block = ScrollBlock> + Send + Sync + 'static,