Filter expired options and swaps via client-side filtering

Author: KyrylR

crates/options-relay/src/client/read_only.rs

@@ -1,5 +1,6 @@
 use crate::config::NostrRelayConfig;
 use crate::error::{ParseError, RelayError};
+use crate::events::kinds::TAG_EXPIRY;
 use crate::events::{ActionCompletedEvent, OptionCreatedEvent, SwapCreatedEvent, filters};
 
 use nostr::prelude::*;
@@ -8,6 +9,18 @@ use nostr_sdk::prelude::Events;
 use simplicityhl::elements::AddressParams;
 use tracing::instrument;
 
+/// Check if an event is still active (not expired) based on its expiry tag.
+/// Returns `false` if the expiry tag is missing or if the contract has expired.
+fn is_active(event: &Event) -> bool {
+    let now = Timestamp::now().as_secs();
+    event
+        .tags
+        .iter()
+        .find(|t| matches!(t.kind(), TagKind::Custom(s) if s.as_ref() == TAG_EXPIRY))
+        .and_then(|t| t.content()?.parse::<u64>().ok())
+        .is_some_and(|expiry| expiry > now)
+}
+
 #[derive(Debug, Clone)]
 pub struct ReadOnlyClient {
     client: Client,
@@ -50,6 +63,7 @@ impl ReadOnlyClient {
         let events = self.fetch_events(filters::option_created()).await?;
         Ok(events
             .iter()
+            .filter(|e| is_active(e))
             .map(|e| OptionCreatedEvent::from_event(e, params))
             .collect())
     }
@@ -59,7 +73,11 @@ impl ReadOnlyClient {
         params: &'static AddressParams,
     ) -> Result<Vec<Result<SwapCreatedEvent, ParseError>>, RelayError> {
         let events = self.fetch_events(filters::swap_created()).await?;
-        Ok(events.iter().map(|e| SwapCreatedEvent::from_event(e, params)).collect())
+        Ok(events
+            .iter()
+            .filter(|e| is_active(e))
+            .map(|e| SwapCreatedEvent::from_event(e, params))
+            .collect())
     }
 
     pub async fn fetch_actions_for_event(

crates/options-relay/src/events/kinds.rs

@@ -11,6 +11,7 @@ pub const TAG_SWAP_UTXO: &str = "swap_utxo";
 pub const TAG_TAPROOT_GEN: &str = "t";
 pub const TAG_ACTION: &str = "action";
 pub const TAG_OUTPOINT: &str = "outpoint";
+pub const TAG_EXPIRY: &str = "expiry";
 
 pub const ACTION_SWAP_EXERCISED: &str = "swap_exercised";
 pub const ACTION_SWAP_CANCELLED: &str = "swap_cancelled";

crates/options-relay/src/events/option_created.rs

@@ -1,5 +1,5 @@
 use crate::error::{ParseError, RelayError};
-use crate::events::kinds::{OPTION_CREATED, TAG_OPTIONS_ARGS, TAG_OPTIONS_UTXO, TAG_TAPROOT_GEN};
+use crate::events::kinds::{OPTION_CREATED, TAG_EXPIRY, TAG_OPTIONS_ARGS, TAG_OPTIONS_UTXO, TAG_TAPROOT_GEN};
 
 use contracts::options::{OptionsArguments, get_options_address};
 use contracts::sdk::taproot_pubkey_gen::TaprootPubkeyGen;
@@ -40,6 +40,10 @@ impl OptionCreatedEvent {
             .tag(Tag::custom(
                 TagKind::custom(TAG_TAPROOT_GEN),
                 [self.taproot_pubkey_gen.to_string()],
+            ))
+            .tag(Tag::custom(
+                TagKind::custom(TAG_EXPIRY),
+                [self.options_args.expiry_time().to_string()],
             )))
     }
 

crates/options-relay/src/events/swap_created.rs

@@ -1,5 +1,5 @@
 use crate::error::{ParseError, RelayError};
-use crate::events::kinds::{SWAP_CREATED, TAG_SWAP_ARGS, TAG_SWAP_UTXO, TAG_TAPROOT_GEN};
+use crate::events::kinds::{SWAP_CREATED, TAG_EXPIRY, TAG_SWAP_ARGS, TAG_SWAP_UTXO, TAG_TAPROOT_GEN};
 
 use contracts::sdk::taproot_pubkey_gen::TaprootPubkeyGen;
 use contracts::swap_with_change::{SwapWithChangeArguments, get_swap_with_change_address};
@@ -40,6 +40,10 @@ impl SwapCreatedEvent {
             .tag(Tag::custom(
                 TagKind::custom(TAG_TAPROOT_GEN),
                 [self.taproot_pubkey_gen.to_string()],
+            ))
+            .tag(Tag::custom(
+                TagKind::custom(TAG_EXPIRY),
+                [self.swap_args.expiry_time().to_string()],
             )))
     }