fixes

Author: frisitano

crates/chain-orchestrator/src/lib.rs

@@ -415,6 +415,10 @@ impl<
                         self.engine.update_fcs(None, Some(block_info), None).await?;
                     }
                 }
+
+                // Revert the L1 watcher to the specified block.
+                self.l1_watcher.revert_to_l1_block(block_number);
+
                 self.notify(ChainOrchestratorEvent::UnwoundToL1Block(block_number));
                 let _ = tx.send(true);
             }

crates/node/tests/e2e.rs

@@ -1025,6 +1025,16 @@ async fn can_revert_to_l1_block() -> eyre::Result<()> {
     // Wait for the chain to be unwound
     fixture.expect_event().revert_to_l1_block().await?;
 
+    // Now have the L1 watcher mock handle the command to rewind the L1 head.
+    fixture
+        .follower(0)
+        .rollup_manager_handle
+        .l1_watcher_mock
+        .as_mut()
+        .unwrap()
+        .handle_command()
+        .await;
+
     // Get the node status
     let status = fixture.get_status(0).await?;
 

crates/watcher/src/handle/mod.rs

@@ -34,13 +34,15 @@ impl L1WatcherHandle {
     }
 
     /// Reset the L1 Watcher to a specific block number with a fresh notification channel.
-    pub fn revert_to_l1_block(&self, block: u64) -> mpsc::Receiver<Arc<L1Notification>> {
+    pub fn revert_to_l1_block(&mut self, block: u64) {
         // Create a fresh notification channel with the same capacity as the original channel
         let capacity = self.l1_notification_rx.max_capacity();
         let (tx, rx) = mpsc::channel(capacity);
 
+        // Send the reset command to the watcher
         self.send_command(L1WatcherCommand::ResetToBlock { block, tx });
 
-        rx
+        // Replace the old receiver with the new one
+        self.l1_notification_rx = rx;
     }
 }

crates/watcher/src/lib.rs

@@ -338,7 +338,6 @@ where
 
                 // reset the state.
                 self.current_block_number = block;
-                self.unfinalized_blocks.clear();
                 self.is_synced = false;
 
                 // replace the notification sender.

crates/watcher/src/test_utils/mod.rs

@@ -21,6 +21,22 @@ pub struct L1WatcherMock {
     pub notification_tx: mpsc::Sender<Arc<L1Notification>>,
 }
 
+impl L1WatcherMock {
+    /// Handle commands sent to the L1 watcher mock.
+    pub async fn handle_command(&mut self) {
+        let mut commands = self.command_rx.lock().await;
+        if let Some(command) = commands.recv().await {
+            match command {
+                L1WatcherCommand::ResetToBlock { block, tx } => {
+                    // For testing purposes, we can just log the reset action.
+                    tracing::info!(target: "scroll::watcher::test_utils", "L1 Watcher Mock resetting to block {}", block);
+                    self.notification_tx = tx;
+                }
+            }
+        }
+    }
+}
+
 /// Returns a chain of random headers of size `len`.
 pub fn chain(len: usize) -> (Header, Header, Vec<Header>) {
     assert!(len >= 2, "chain should have a minimal length of two");