1 files changed, 39 insertions, 1 deletions

diff --git a/src/sync/mod.rs b/src/sync/mod.rs
index f296c0f..93b0e38 100644
--- a/src/sync/mod.rs
+++ b/src/sync/mod.rs
@@ -367,12 +367,14 @@ async fn run_daily_timer(
 /// Run the combined health and metrics checker
 ///
 /// This function runs in a loop with a 2-second interval, performing three tasks:
-/// Background task for cleaning up expired entries from the rejected events index
+/// Background task for cleaning up expired entries from the rejected events indexes
 ///
 /// This task runs two cleanup operations at different intervals:
 /// 1. **Hot cache cleanup (60s)**: Remove events older than 2 minutes from hot cache
 /// 2. **Cold index cleanup (daily)**: Remove metadata older than 7 days from cold index
 ///
+/// Cleans up both the announcements index and the states index.
+///
 /// The hot cache cleanup runs frequently to keep memory usage low (events expire quickly).
 /// The cold index cleanup runs daily since metadata is small and expires slowly.
 async fn run_rejected_index_cleanup(
@@ -397,6 +399,8 @@ async fn run_rejected_index_cleanup(
         tokio::select! {
             _ = hot_cache_timer.tick() => {
                 let manager = sync_manager.lock().await;
+                
+                // Clean up announcements index
                 let (hot_expired, _) = manager.rejected_events_index.cleanup_expired();
                 if hot_expired > 0 {
                     tracing::debug!(
@@ -404,9 +408,20 @@ async fn run_rejected_index_cleanup(
                         hot_expired
                     );
                 }
+                
+                // Clean up states index
+                let (states_hot_expired, _) = manager.rejected_states_index.cleanup_states_expired();
+                if states_hot_expired > 0 {
+                    tracing::debug!(
+                        "Cleaned up {} expired entries from rejected states hot cache",
+                        states_hot_expired
+                    );
+                }
             }
             _ = cold_index_timer.tick() => {
                 let manager = sync_manager.lock().await;
+                
+                // Clean up announcements index
                 let (_, cold_expired) = manager.rejected_events_index.cleanup_expired();
                 if cold_expired > 0 {
                     tracing::info!(
@@ -414,6 +429,15 @@ async fn run_rejected_index_cleanup(
                         cold_expired
                     );
                 }
+                
+                // Clean up states index
+                let (_, states_cold_expired) = manager.rejected_states_index.cleanup_states_expired();
+                if states_cold_expired > 0 {
+                    tracing::info!(
+                        "Cleaned up {} expired entries from rejected states cold index",
+                        states_cold_expired
+                    );
+                }
             }
             _ = shutdown_rx.recv() => {
                 tracing::info!("Rejected index cleanup received shutdown signal");
@@ -507,6 +531,8 @@ pub struct SyncManager {
     pending_sync_index: PendingSyncIndex,
     /// Rejected announcement events (30617/30618) - two-tier storage for re-processing
     rejected_events_index: Arc<RejectedEventsIndex>,
+    /// Rejected state events (30618) - two-tier storage for re-processing
+    rejected_states_index: Arc<RejectedEventsIndex>,
     /// Active relay connections - keyed by relay URL
     connections: HashMap<String, RelayConnection>,
     /// Health tracker for relay connection state
@@ -571,6 +597,18 @@ impl SyncManager {
                     Duration::from_secs(config.rejected_cold_index_expiry_secs),
                 )
             }),
+            rejected_states_index: Arc::new(if let Some(ref metrics) = sync_metrics {
+                RejectedEventsIndex::with_metrics(
+                    Duration::from_secs(config.rejected_hot_cache_duration_secs),
+                    Duration::from_secs(config.rejected_cold_index_expiry_secs),
+                    metrics.clone(),
+                )
+            } else {
+                RejectedEventsIndex::new(
+                    Duration::from_secs(config.rejected_hot_cache_duration_secs),
+                    Duration::from_secs(config.rejected_cold_index_expiry_secs),
+                )
+            }),
             connections: HashMap::new(),
             health_tracker: Arc::new(RelayHealthTracker::new(config)),
             next_batch_id: 0,