From 0ce6b818adcab30d0ef13ca11cc52957263e6a4d Mon Sep 17 00:00:00 2001
From: sprites0 <199826320+sprites0@users.noreply.github.com>
Date: Sat, 19 Jul 2025 17:04:01 -0400
Subject: [PATCH] fix: Handle incomplete line when handling local-block-ingest

---
 bin/reth/src/block_ingest.rs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/bin/reth/src/block_ingest.rs b/bin/reth/src/block_ingest.rs
index 09b99e9b6..03e67ea0e 100644
--- a/bin/reth/src/block_ingest.rs
+++ b/bin/reth/src/block_ingest.rs
@@ -73,8 +73,23 @@ fn scan_hour_file(path: &Path, last_line: &mut usize, start_height: u64) -> Scan
             continue;
         }
 
-        let LocalBlockAndReceipts(_block_timestamp, parsed_block): LocalBlockAndReceipts =
-            serde_json::from_str(&line).expect("Failed to parse local block and receipts");
+        let (_block_timestamp, parsed_block) = match serde_json::from_str(&line) {
+            Ok(LocalBlockAndReceipts(_block_timestamp, parsed_block)) => {
+                (_block_timestamp, parsed_block)
+            }
+            Err(_) => {
+                // Possible scenarios:
+                let is_last_line = line_idx == lines.len() - 1;
+                if is_last_line {
+                    // 1. It's not written fully yet - in this case, just wait for the next line
+                    break;
+                } else {
+                    // 2. hl-node previously terminated while writing the lines
+                    // In this case, try to skip this line
+                    continue;
+                }
+            }
+        };
 
         let height = match &parsed_block.block {
             EvmBlock::Reth115(b) => {