Merge pull request #135 from worldcoin/osiris/reorg-awareness

feat: lag block scanner stream behind finality
worldcoin · Nov 6, 2024 · 38adfec · 38adfec
2 parents 41c4246 + e7e5a62
commit 38adfec
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/src/tasks/mod.rs b/src/tasks/mod.rs
@@ -31,10 +31,12 @@ pub async fn monitor_tasks(
 
 #[cfg(test)]
 mod test {
-    use super::*;
     use std::time::Instant;
+
     use tokio::time::sleep;
 
+    use super::*;
+
     #[tokio::test]
     async fn test_monitor_tasks() {
         let shutdown_delay = Duration::from_millis(100);

diff --git a/src/tree/block_scanner.rs b/src/tree/block_scanner.rs
@@ -70,16 +70,27 @@ where
                     // Update the latest block number only if required
                     if try_to > latest {
                         let provider = self.provider.clone();
-                        latest = retry(
+                        let finalized = retry(
                             Duration::from_millis(100),
                             Some(Duration::from_secs(60)),
                             move || {
                                 let provider = provider.clone();
-                                async move { provider.get_block_number().await }
+                                async move {
+                                    provider
+                                        .get_block_by_number(
+                                            BlockNumberOrTag::Finalized,
+                                            false,
+                                        )
+                                        .await
+                                }
                             },
                         )
                         .await
-                        .expect("failed to fetch latest block after retry");
+                        .expect("failed to fetch latest block after retry")
+                        .expect("no finalized block found");
+
+                        latest = finalized.header.number;
+
                         if latest < next_block {
                             tokio::time::sleep(Duration::from_secs(
                                 BLOCK_SCANNER_SLEEP_TIME,

diff --git a/tests/common/mod.rs b/tests/common/mod.rs
@@ -31,8 +31,8 @@ use world_tree::tree::WorldTreeProvider;
 macro_rules! attempt_async {
     ($e:expr) => {
         {
-            const MAX_ATTEMPTS: usize = 10;
-            const SLEEP_DURATION: Duration = Duration::from_secs(5);
+            const MAX_ATTEMPTS: usize = 20;
+            const SLEEP_DURATION: Duration = Duration::from_secs(12);
             let mut attempt = 0;
 
             loop {