From 70749ea9df1f6061c332112c617b615f91d79d48 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Mon, 23 Feb 2026 11:17:10 +0000
Subject: fix: re-process hot-cache maintainer announcements after git push
 promotion

When an owner announcement is promoted from purgatory via a git push,
any maintainer announcements sitting in the rejected_events_index hot
cache were never re-processed. The invalidate_and_get call only existed
in SyncManager::process_event_static (the nostr sync path); the git push
promotion path (http -> handlers -> git::sync) had no access to the
rejected_events_index at all.

Thread rejected_events_index and write_policy through the git push path:
- process_purgatory_announcements: after saving the promoted announcement,
  parse its maintainers tag and call invalidate_and_get() for each, then
  re-process any returned hot-cache events via admit_event + save
- process_newly_available_git_data: accept optional write_policy and
  rejected_events_index, pass them through to process_purgatory_announcements
- handle_receive_pack: accept Arc<Nip34WritePolicy> and
  Arc<RejectedEventsIndex>, pass them to process_newly_available_git_data
- HttpService / run_server: carry the two new fields, clone into each
  handle_receive_pack call
- main.rs: obtain rejected_events_index from sync_manager before moving
  it into its task; wrap write_policy in Arc for the HTTP server
- RealSyncContext::process_newly_available_git_data: pass None for both
  new params (purgatory sync path already handles this via
  SyncManager::process_event_static)

Also rewrite the maintainer_reprocessing integration tests to correctly
exercise the hot-cache path now that announcements require git data
before being released from purgatory:
- Start relay_b with relay_a as bootstrap so its SyncManager syncs
  maintainer announcements via negentropy before the owner git push
- Use push_unique_git_data_to_relay (new helper) to give each maintainer
  a distinct commit hash, preventing git from skipping pack transfer
- Make wait_for_event_on_relay poll in a retry loop so transient timing
  gaps between DB write and query do not cause false negatives
---
 src/http/mod.rs | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'src/http')

diff --git a/src/http/mod.rs b/src/http/mod.rs
index ffb1562..cfd7c52 100644
--- a/src/http/mod.rs
+++ b/src/http/mod.rs
@@ -26,8 +26,9 @@ use tokio::net::TcpListener;
 use crate::config::Config;
 use crate::git;
 use crate::metrics::Metrics;
-use crate::nostr::builder::SharedDatabase;
+use crate::nostr::builder::{Nip34WritePolicy, SharedDatabase};
 use crate::purgatory::Purgatory;
+use crate::sync::rejected_index::RejectedEventsIndex;
 
 /// CORS headers required by GRASP-01 specification (lines 40-47)
 const CORS_ALLOW_ORIGIN: &str = "*";
@@ -97,6 +98,10 @@ struct HttpService {
     metrics: Option<Arc<Metrics>>,
     /// Purgatory for event/git coordination
     purgatory: Arc<Purgatory>,
+    /// Write policy for re-processing hot-cache events after git push promotion
+    write_policy: Arc<Nip34WritePolicy>,
+    /// Rejected events index for hot-cache re-processing after git push promotion
+    rejected_events_index: Arc<RejectedEventsIndex>,
 }
 
 impl HttpService {
@@ -107,6 +112,8 @@ impl HttpService {
         database: SharedDatabase,
         metrics: Option<Arc<Metrics>>,
         purgatory: Arc<Purgatory>,
+        write_policy: Arc<Nip34WritePolicy>,
+        rejected_events_index: Arc<RejectedEventsIndex>,
     ) -> Self {
         Self {
             relay,
@@ -115,6 +122,8 @@ impl HttpService {
             database,
             metrics,
             purgatory,
+            write_policy,
+            rejected_events_index,
         }
     }
 }
@@ -132,6 +141,8 @@ impl Service<Request<Incoming>> for HttpService {
         let git_data_path = self.config.effective_git_data_path();
         let database = self.database.clone();
         let purgatory = self.purgatory.clone();
+        let write_policy = self.write_policy.clone();
+        let rejected_events_index = self.rejected_events_index.clone();
 
         // Handle OPTIONS preflight requests (CORS)
         // GRASP-01 spec line 47: Respond to OPTIONS with 204 No Content
@@ -293,6 +304,8 @@ impl Service<Request<Incoming>> for HttpService {
                             purgatory.clone(),
                             &git_data_path,
                             git_protocol.as_deref(),
+                            write_policy.clone(),
+                            rejected_events_index.clone(),
                         )
                         .await;
 
@@ -557,12 +570,17 @@ fn derive_accept_key(request_key: &[u8]) -> String {
 /// * `relay` - The LocalRelay for WebSocket connections
 /// * `database` - The database for direct queries (e.g., push authorization)
 /// * `metrics` - Optional metrics for Prometheus endpoint
+/// * `purgatory` - Purgatory for event/git coordination
+/// * `write_policy` - Write policy for re-processing hot-cache events after git push promotion
+/// * `rejected_events_index` - Rejected events index for hot-cache re-processing
 pub async fn run_server(
     config: Config,
     relay: LocalRelay,
     database: SharedDatabase,
     metrics: Option<Arc<Metrics>>,
     purgatory: Arc<Purgatory>,
+    write_policy: Arc<Nip34WritePolicy>,
+    rejected_events_index: Arc<RejectedEventsIndex>,
 ) -> anyhow::Result<()> {
     let bind_addr: SocketAddr = config.bind_address.parse()?;
 
@@ -582,6 +600,8 @@ pub async fn run_server(
             database.clone(),
             metrics.clone(),
             purgatory.clone(),
+            write_policy.clone(),
+            rejected_events_index.clone(),
         );
 
         tokio::spawn(async move {
-- 
cgit v1.2.3