Merge pull request #86 from Blobscan/fix/forwarded-blocks-fix

fix: update reorg logic

Author: PJColombo

src/slots_processor/mod.rs

@@ -4,7 +4,7 @@ use alloy::{
 use anyhow::{anyhow, Context as AnyhowContext, Result};
 
 use crate::clients::beacon::types::BlockHeader;
-use tracing::{debug, info};
+use tracing::{debug, info, Instrument};
 
 use crate::{
     clients::{
@@ -287,6 +287,18 @@ impl SlotsProcessor<ReqwestTransport> {
                     let canonical_block_path =
                         canonical_block_path.into_iter().rev().collect::<Vec<_>>();
 
+                    let forwarded_blocks = canonical_block_path
+                        .iter()
+                        .map(|block| block.execution_block_hash)
+                        .collect::<Vec<_>>();
+
+                    self.context
+                        .blobscan_client()
+                        .handle_reorg(rewinded_blocks.clone(), forwarded_blocks.clone())
+                        .await?;
+
+                    info!(rewinded_blocks = ?rewinded_blocks, forwarded_blocks = ?forwarded_blocks, "Reorg handled!");
+
                     let canonical_block_headers: Vec<BlockHeader> = canonical_block_path
                         .iter()
                         .map(|block| block.into())
@@ -296,24 +308,18 @@ impl SlotsProcessor<ReqwestTransport> {
                     // they were skipped and must be processed.
                     for block in canonical_block_headers.iter() {
                         if block.slot != new_head_header.slot {
+                            let reorg_span = tracing::info_span!(
+                                parent: &tracing::Span::current(),
+                                "forwarded_block",
+                            );
+
                             self.process_block(block)
+                                .instrument(reorg_span)
                                 .await
                                 .with_context(|| format!("Failed to sync forwarded block"))?;
                         }
                     }
 
-                    let forwarded_blocks = canonical_block_path
-                        .iter()
-                        .map(|block| block.execution_block_hash)
-                        .collect::<Vec<_>>();
-
-                    self.context
-                        .blobscan_client()
-                        .handle_reorg(rewinded_blocks.clone(), forwarded_blocks.clone())
-                        .await?;
-
-                    info!(rewinded_blocks = ?rewinded_blocks, forwarded_blocks = ?forwarded_blocks, "Reorg handled!");
-
                     return Ok(());
                 }