fix(indexer): skip historical sync if we have reached or surpassed th…

…e Dencun fork
Blobscan · Mar 10, 2024 · 02b97e7 · 02b97e7
1 parent 0d974fc
commit 02b97e7
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/src/indexer/mod.rs b/src/indexer/mod.rs
@@ -79,9 +79,9 @@ impl Indexer {
             Some(block_id) => block_id,
             None => match &sync_state {
                 Some(state) => match state.last_lower_synced_slot {
-                    Some(slot) => BlockId::Slot(slot - 1),
+                    Some(slot) => BlockId::Slot(self._get_current_lower_slot(slot)),
                     None => match state.last_upper_synced_slot {
-                        Some(slot) => BlockId::Slot(slot - 1),
+                        Some(slot) => BlockId::Slot(self._get_current_lower_slot(slot)),
                         None => BlockId::Head,
                     },
                 },
@@ -135,6 +135,18 @@ impl Indexer {
         let target_lowest_slot = self.dencun_fork_slot;
 
         tokio::spawn(async move {
+            // Skip historical sync if we are already at the target lowest slot
+            if let BlockId::Slot(slot) = start_block_id {
+                if slot <= target_lowest_slot {
+                    debug!(
+                        target = "indexer:historical_sync",
+                        "Skip sync. Dencun fork slot reached"
+                    );
+
+                    return Ok(());
+                }
+            }
+
             let result = synchronizer
                 .run(&start_block_id, &BlockId::Slot(target_lowest_slot))
                 .await;
@@ -314,4 +326,8 @@ impl Indexer {
 
         synchronizer_builder.build(self.context.clone())
     }
+
+    fn _get_current_lower_slot(&self, last_synced_slot: u32) -> u32 {
+        cmp::max(last_synced_slot, self.dencun_fork_slot)
+    }
 }