periodically remove old missing fetch info

Author: eval-exec

light-client-lib/src/protocols/light_client/mod.rs

@@ -705,6 +705,11 @@ impl LightClientProtocol {
     }
 
     async fn get_idle_blocks(&mut self, nc: &BoxedCKBProtocolContext) {
+        // Clean up old missing headers (uncle blocks) older than 1 hour
+        // to prevent unbounded memory growth in fetching_headers
+        const MAX_MISSING_AGE_MS: u64 = 3_600_000; // 1 hour
+        self.peers.cleanup_old_missing_headers(MAX_MISSING_AGE_MS);
+
         let tip_header = self.storage.get_tip_header();
         let matched_blocks = self.peers.matched_blocks().read().await;
 

light-client-lib/src/protocols/light_client/peers.rs

@@ -1242,6 +1242,32 @@ impl Peers {
             }
         }
     }
+
+    /// Clean up old missing entries from fetching_headers to prevent unbounded memory growth
+    /// This is called periodically to remove uncle blocks that were marked as missing
+    /// but are no longer needed (older than max_age_ms)
+    pub(crate) fn cleanup_old_missing_headers(&self, max_age_ms: u64) {
+        let now = unix_time_as_millis();
+        let mut removed_count = 0;
+
+        self.fetching_headers.retain(|_hash, info| {
+            if info.missing && now.saturating_sub(info.added_ts) > max_age_ms {
+                removed_count += 1;
+                false // Remove this entry
+            } else {
+                true // Keep this entry
+            }
+        });
+
+        if removed_count > 0 {
+            log::debug!(
+                "Cleaned up {} old missing headers (age > {}ms)",
+                removed_count,
+                max_age_ms
+            );
+        }
+    }
+
     // mark all fetching hashes (headers/txs) as timeout
     pub(crate) fn mark_fetching_headers_timeout(&self, peer_index: PeerIndex) {
         if let Some(peer) = self.get_peer(&peer_index) {

light-client-lib/src/storage/db/native.rs

@@ -18,7 +18,6 @@ use ckb_types::{
     utilities::{build_filter_data, calc_filter_hash},
     U256,
 };
-use log::info;
 use rocksdb::{
     ops::{Delete, GetPinned},
     prelude::{Get, Iterate, Open, Put, WriteOps},

light-client-lib/src/tests/protocols/light_client/send_last_state_proof.rs

@@ -2035,12 +2035,15 @@ async fn test_with_reorg_blocks(param: ReorgTestParameter) {
             } else {
                 assert!(earliest_matched_blocks_opt.is_some());
                 assert_eq!(
-                    earliest_matched_blocks_opt.unwrap().0,
+                    earliest_matched_blocks_opt.unwrap().start_number,
                     earliest_matched_number
                 );
                 assert!(latest_matched_blocks_opt.is_some());
                 let expected_latest = cmp::min(prev_last_number, latest_kept_matched_block);
-                assert_eq!(latest_matched_blocks_opt.unwrap().0, expected_latest);
+                assert_eq!(
+                    latest_matched_blocks_opt.unwrap().start_number,
+                    expected_latest
+                );
             }
         }
         assert_eq!(