1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
|
//! Filter Building Functions for Proactive Sync
//!
//! This module provides functions to construct Nostr filters for the three-layer
//! sync strategy defined in GRASP-02 v4:
//!
//! - Layer 1: Repository announcements (30617 + 30618)
//! - Layer 2: Events tagging our repos (a/A/q tags)
//! - Layer 3: Events tagging our root events (e/E/q tags)
//!
//! See `docs/explanation/grasp-02-proactive-sync-v4.md` for full design details.
use std::collections::HashSet;
use nostr_sdk::prelude::*;
/// Layer 1: Announcements filter (kinds 30617 + 10317)
///
/// Subscribed ONCE on connect - NOT included in consolidation rebuilds.
/// Note: State events (30618) are now subscribed via identifier-based filters in Layer 2
/// to avoid receiving state events for repositories we don't host.
/// Note: 10317 (User Grasp List) is synced for better GRASP discovery.
pub fn build_announcement_filter(since: Option<Timestamp>) -> Filter {
let filter = Filter::new().kinds([
Kind::GitRepoAnnouncement, // Repository announcements
Kind::GitUserGraspList, // User Grasp List
]);
match since {
Some(ts) => filter.since(ts),
None => filter,
}
}
/// State event filters for our hosted repositories
///
/// Subscribes to kind 30618 state events using #d (identifier) tags.
/// This is more efficient than Layer 1 broadcast subscription because:
/// - Only receives state events for repos we actually host
/// - One filter can include multiple identifiers (batched per 100)
/// - Avoids 1000+ rejections for repos we don't care about
///
/// # Arguments
/// * `repos` - Set of repo addressable refs (format: 30617:pubkey:identifier)
/// * `since` - Optional timestamp for incremental sync
///
/// # Returns
/// Vec of filters, one filter per 100-identifier chunk
pub fn state_event_filters_for_our_repos(
repos: &HashSet<String>,
since: Option<Timestamp>,
) -> Vec<Filter> {
if repos.is_empty() {
return vec![];
}
// Extract unique identifiers from addressable refs
let mut identifiers: HashSet<String> = HashSet::new();
for repo_ref in repos {
// Format: 30617:pubkey:identifier
if let Some(identifier) = repo_ref.split(':').nth(2) {
identifiers.insert(identifier.to_string());
}
}
if identifiers.is_empty() {
return vec![];
}
let mut filters = Vec::new();
let identifier_vec: Vec<_> = identifiers.iter().collect();
// Batch by 100 identifiers per filter
for chunk in identifier_vec.chunks(100) {
let mut filter = Filter::new().kind(Kind::RepoState); // kind 30618
// Add #d tags for all identifiers in this chunk
for identifier in chunk {
filter =
filter.custom_tag(SingleLetterTag::lowercase(Alphabet::D), identifier.as_str());
}
if let Some(ts) = since {
filter = filter.since(ts);
}
filters.push(filter);
}
filters
}
/// Layer 2: Events tagging one of our repos
///
/// Uses lowercase a, uppercase A, and q tags for comprehensive coverage.
/// Batched per 100 repo refs.
///
/// # Arguments
/// * `repos` - Set of repo addressable refs (format: 30617:pubkey:identifier)
/// * `since` - Optional timestamp for incremental sync
///
/// # Returns
/// Vec of filters, one set of 3 filters (a/A/q) per 100-repo chunk
pub fn tagged_one_of_our_repo_event_filters(
repos: &HashSet<String>,
since: Option<Timestamp>,
) -> Vec<Filter> {
if repos.is_empty() {
return vec![];
}
let mut filters = Vec::new();
let repo_refs: Vec<_> = repos.iter().collect();
for chunk in repo_refs.chunks(100) {
// Lowercase 'a' tag - standard addressable reference
let mut f1 = Filter::new();
for repo in chunk {
f1 = f1.custom_tag(SingleLetterTag::lowercase(Alphabet::A), repo.as_str());
}
// Uppercase 'A' tag - some clients use this
let mut f2 = Filter::new();
for repo in chunk {
f2 = f2.custom_tag(SingleLetterTag::uppercase(Alphabet::A), repo.as_str());
}
// Quote 'q' tag - NIP-10 quote references to addressable events
let mut f3 = Filter::new();
for repo in chunk {
f3 = f3.custom_tag(SingleLetterTag::lowercase(Alphabet::Q), repo.as_str());
}
if let Some(ts) = since {
f1 = f1.since(ts);
f2 = f2.since(ts);
f3 = f3.since(ts);
}
filters.push(f1);
filters.push(f2);
filters.push(f3);
}
filters
}
/// Layer 3: Events tagging one of our root events
///
/// Uses lowercase e, uppercase E, and q tags for comprehensive coverage.
/// Batched per 100 event IDs.
///
/// # Arguments
/// * `root_events` - Set of event IDs (1617/1618/1621 root events)
/// * `since` - Optional timestamp for incremental sync
///
/// # Returns
/// Vec of filters, one set of 3 filters (e/E/q) per 100-event chunk
pub fn tagged_one_of_our_root_event_filters(
root_events: &HashSet<EventId>,
since: Option<Timestamp>,
) -> Vec<Filter> {
if root_events.is_empty() {
return vec![];
}
// DEBUG TRACING: Log the root events we're creating Layer 3 filters for
tracing::debug!(
root_event_count = root_events.len(),
root_event_ids = ?root_events.iter().map(|id| id.to_hex()).collect::<Vec<_>>(),
since = ?since,
"Building Layer 3 filters for root events"
);
let mut filters = Vec::new();
let event_ids: Vec<String> = root_events.iter().map(|id| id.to_hex()).collect();
for (chunk_idx, chunk) in event_ids.chunks(100).enumerate() {
// Lowercase 'e' tag - standard event reference
let mut f1 = Filter::new();
for event_id in chunk {
f1 = f1.custom_tag(SingleLetterTag::lowercase(Alphabet::E), event_id.as_str());
}
// Uppercase 'E' tag - some clients use this
let mut f2 = Filter::new();
for event_id in chunk {
f2 = f2.custom_tag(SingleLetterTag::uppercase(Alphabet::E), event_id.as_str());
}
// Quote 'q' tag - NIP-10 quote references to events
let mut f3 = Filter::new();
for event_id in chunk {
f3 = f3.custom_tag(SingleLetterTag::lowercase(Alphabet::Q), event_id.as_str());
}
if let Some(ts) = since {
f1 = f1.since(ts);
f2 = f2.since(ts);
f3 = f3.since(ts);
}
// DEBUG TRACING: Log the filters being created
tracing::debug!(
chunk_idx = chunk_idx,
chunk_size = chunk.len(),
event_ids_in_chunk = ?chunk,
filter_e = ?f1,
filter_E = ?f2,
filter_q = ?f3,
"Created Layer 3 filter chunk"
);
filters.push(f1);
filters.push(f2);
filters.push(f3);
}
filters
}
/// Builds Layer 2 + Layer 3 filters only (NOT Layer 1)
///
/// Used by:
/// - compute_actions for incremental subscriptions
/// - consolidation rebuilds (Layer 1 remains active)
///
/// Includes:
/// - State event filters (kind 30618 with #d tags for our repo identifiers)
/// - Repo-tagging filters (a/A/q tags)
/// - Root event filters (e/E/q tags)
///
/// # Arguments
/// * `repos` - Set of repo addressable refs
/// * `root_events` - Set of root event IDs
/// * `since` - Optional timestamp for incremental sync
pub fn build_layer2_and_layer3_filters(
repos: &HashSet<String>,
root_events: &HashSet<EventId>,
since: Option<Timestamp>,
) -> Vec<Filter> {
let mut filters = Vec::new();
filters.extend(state_event_filters_for_our_repos(repos, since));
filters.extend(tagged_one_of_our_repo_event_filters(repos, since));
filters.extend(tagged_one_of_our_root_event_filters(root_events, since));
filters
}
/// Builds filters respecting SyncLevel for each repo
///
/// StateOnly repos only get state event filters (kind 30618).
/// Full repos get all L2/L3 filters (state + repo-tagging + root event).
///
/// # Arguments
/// * `full_repos` - Repos needing full L2+L3 sync
/// * `state_only_repos` - Repos needing only state event sync (purgatory)
/// * `root_events` - Root event IDs (only used for Full repos)
/// * `since` - Optional timestamp for incremental sync
pub fn build_sync_level_aware_filters(
full_repos: &HashSet<String>,
state_only_repos: &HashSet<String>,
root_events: &HashSet<EventId>,
since: Option<Timestamp>,
) -> Vec<Filter> {
let mut filters = Vec::new();
// All repos (both Full and StateOnly) need state event filters
let all_repos: HashSet<String> = full_repos.union(state_only_repos).cloned().collect();
filters.extend(state_event_filters_for_our_repos(&all_repos, since));
// Only Full repos get repo-tagging and root event filters
if !full_repos.is_empty() {
filters.extend(tagged_one_of_our_repo_event_filters(full_repos, since));
}
filters.extend(tagged_one_of_our_root_event_filters(root_events, since));
filters
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_announcement_filter_no_since() {
let filter = build_announcement_filter(None);
// Verify it includes both kinds
// Filter API: we can check by converting to JSON or inspecting structure
// For now we just verify it doesn't panic and returns a valid filter
assert!(!filter.is_empty());
}
#[test]
fn test_announcement_filter_with_since() {
let since = Timestamp::from(1700000000);
let filter = build_announcement_filter(Some(since));
assert!(!filter.is_empty());
}
#[test]
fn test_repo_filters_empty() {
let repos: HashSet<String> = HashSet::new();
let filters = tagged_one_of_our_repo_event_filters(&repos, None);
assert!(filters.is_empty());
}
#[test]
fn test_repo_filters_single_repo() {
let mut repos = HashSet::new();
repos.insert("30617:abc123:test-repo".to_string());
let filters = tagged_one_of_our_repo_event_filters(&repos, None);
// Should create 3 filters (a, A, q) for one chunk
assert_eq!(filters.len(), 3);
}
#[test]
fn test_repo_filters_batching() {
let mut repos = HashSet::new();
for i in 0..250 {
repos.insert(format!("30617:pubkey{}:repo{}", i, i));
}
let filters = tagged_one_of_our_repo_event_filters(&repos, None);
// Should create 9 filters (3 chunks * 3 tag types)
// 250 repos = 100 + 100 + 50 = 3 chunks
assert_eq!(filters.len(), 9);
}
#[test]
fn test_repo_filters_with_since() {
let mut repos = HashSet::new();
repos.insert("30617:abc123:test-repo".to_string());
let since = Timestamp::from(1700000000);
let filters = tagged_one_of_our_repo_event_filters(&repos, Some(since));
assert_eq!(filters.len(), 3);
}
#[test]
fn test_root_event_filters_empty() {
let root_events: HashSet<EventId> = HashSet::new();
let filters = tagged_one_of_our_root_event_filters(&root_events, None);
assert!(filters.is_empty());
}
#[test]
fn test_root_event_filters_single_event() {
let mut root_events = HashSet::new();
// Create a valid event ID (all zeros for testing)
root_events.insert(EventId::all_zeros());
let filters = tagged_one_of_our_root_event_filters(&root_events, None);
// Should create 3 filters (e, E, q) for one chunk
assert_eq!(filters.len(), 3);
}
#[test]
fn test_root_event_filters_batching() {
let mut root_events = HashSet::new();
// EventId::all_zeros() will deduplicate, so we need unique IDs
// For testing purposes, we'll just verify with one ID since HashSet
// deduplicates all_zeros(). In real usage these would be unique.
for _ in 0..250 {
root_events.insert(EventId::all_zeros());
}
let filters = tagged_one_of_our_root_event_filters(&root_events, None);
// With deduplication, we only have 1 unique ID, so 3 filters
// In real usage with 250 unique IDs, it would be 9 filters
assert_eq!(filters.len(), 3);
}
#[test]
fn test_root_event_filters_with_since() {
let mut root_events = HashSet::new();
root_events.insert(EventId::all_zeros());
let since = Timestamp::from(1700000000);
let filters = tagged_one_of_our_root_event_filters(&root_events, Some(since));
assert_eq!(filters.len(), 3);
}
#[test]
fn test_combined_filters_empty() {
let repos: HashSet<String> = HashSet::new();
let root_events: HashSet<EventId> = HashSet::new();
let filters = build_layer2_and_layer3_filters(&repos, &root_events, None);
assert!(filters.is_empty());
}
#[test]
fn test_combined_filters() {
let mut repos = HashSet::new();
repos.insert("30617:abc123:repo1".to_string());
let mut root_events = HashSet::new();
root_events.insert(EventId::all_zeros());
let filters = build_layer2_and_layer3_filters(&repos, &root_events, None);
// Should have 7 filters (1 state + 3 for repos + 3 for root events)
assert_eq!(filters.len(), 7);
}
#[test]
fn test_combined_filters_repos_only() {
let mut repos = HashSet::new();
repos.insert("30617:abc123:repo1".to_string());
let root_events: HashSet<EventId> = HashSet::new();
let filters = build_layer2_and_layer3_filters(&repos, &root_events, None);
// Should have 4 filters (1 state + 3 for repos only)
assert_eq!(filters.len(), 4);
}
#[test]
fn test_combined_filters_root_events_only() {
let repos: HashSet<String> = HashSet::new();
let mut root_events = HashSet::new();
root_events.insert(EventId::all_zeros());
let filters = build_layer2_and_layer3_filters(&repos, &root_events, None);
// Should have 3 filters (3 for root events only)
assert_eq!(filters.len(), 3);
}
#[test]
fn test_combined_filters_with_since() {
let mut repos = HashSet::new();
repos.insert("30617:abc123:repo1".to_string());
let mut root_events = HashSet::new();
root_events.insert(EventId::all_zeros());
let since = Timestamp::from(1700000000);
let filters = build_layer2_and_layer3_filters(&repos, &root_events, Some(since));
// Should have 7 filters (1 state + 3 for repos + 3 for root events)
assert_eq!(filters.len(), 7);
}
#[test]
fn test_state_event_filters_empty() {
let repos: HashSet<String> = HashSet::new();
let filters = state_event_filters_for_our_repos(&repos, None);
assert!(filters.is_empty());
}
#[test]
fn test_state_event_filters_single_repo() {
let mut repos = HashSet::new();
repos.insert("30617:abc123:test-repo".to_string());
let filters = state_event_filters_for_our_repos(&repos, None);
// Should create 1 filter with kind 30618 and #d tag
assert_eq!(filters.len(), 1);
}
#[test]
fn test_state_event_filters_batching() {
let mut repos = HashSet::new();
for i in 0..250 {
repos.insert(format!("30617:pubkey{}:repo{}", i, i));
}
let filters = state_event_filters_for_our_repos(&repos, None);
// Should create 3 filters (250 identifiers = 100 + 100 + 50 = 3 chunks)
assert_eq!(filters.len(), 3);
}
#[test]
fn test_state_event_filters_deduplicates_identifiers() {
let mut repos = HashSet::new();
// Same identifier with different pubkeys
repos.insert("30617:pubkey1:same-repo".to_string());
repos.insert("30617:pubkey2:same-repo".to_string());
repos.insert("30617:pubkey3:same-repo".to_string());
let filters = state_event_filters_for_our_repos(&repos, None);
// Should create 1 filter with deduplicated identifier
assert_eq!(filters.len(), 1);
}
#[test]
fn test_state_event_filters_with_since() {
let mut repos = HashSet::new();
repos.insert("30617:abc123:test-repo".to_string());
let since = Timestamp::from(1700000000);
let filters = state_event_filters_for_our_repos(&repos, Some(since));
assert_eq!(filters.len(), 1);
}
}
|