nwc: subscribe to the response using the request event ID

This fixes the compatibility issues with some NWC services, like Primal.

Pull-Request: #1073
Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

Cargo.lock

@@ -25,11 +25,19 @@
 
 ## Unreleased
 
+### Changed
+
+- Subscribe to the response using the request event ID (https://github.com/rust-nostr/nostr/pull/1073)
+
 ### Added
 
 - Add `NWC::reconnect_relay` (https://github.com/rust-nostr/nostr/pull/1020)
 - Add `NWC::uri`
 
+### Fixed
+
+- Fix the compatibility issues with some NWC services, like Primal (https://github.com/rust-nostr/nostr/pull/1073)
+
 ## v0.43.0 - 2025/07/28
 
 ### Added

crates/nwc/CHANGELOG.md

@@ -16,7 +16,6 @@ default = []
 tor = ["nostr-relay-pool/tor"]
 
 [dependencies]
-async-utility.workspace = true
 nostr = { workspace = true, features = ["std", "nip47"] }
 nostr-relay-pool.workspace = true
 tracing = { workspace = true, features = ["std"] }

crates/nwc/Cargo.toml

@@ -18,7 +18,6 @@ use std::sync::Arc;
 
 pub extern crate nostr;
 
-use async_utility::time;
 use nostr::nips::nip47::{Notification, Request, Response};
 use nostr_relay_pool::prelude::*;
 
@@ -31,7 +30,6 @@ pub use self::error::Error;
 #[doc(hidden)]
 pub use self::options::NostrWalletConnectOptions;
 
-const ID: &str = "nwc";
 const NOTIFICATIONS_ID: &str = "nwc-notifications";
 
 /// Nostr Wallet Connect client
@@ -94,16 +92,6 @@ impl NWC {
         // Connect to relays
         self.pool.connect().await;
 
-        let filter = Filter::new()
-            .author(self.uri.public_key)
-            .kind(Kind::WalletConnectResponse)
-            .limit(0); // Limit to 0 means give me 0 events until EOSE
-
-        // Subscribe
-        self.pool
-            .subscribe_with_id(SubscriptionId::new(ID), filter, SubscribeOptions::default())
-            .await?;
-
         // Mark as bootstrapped
         self.bootstrapped.store(true, Ordering::SeqCst);
 
@@ -119,26 +107,29 @@ impl NWC {
         // Convert request to event
         let event: Event = req.to_event(&self.uri)?;
 
-        let mut notifications = self.pool.notifications();
+        // Construct the filter to wait for the response
+        let filter = Filter::new()
+            .author(self.uri.public_key)
+            .kind(Kind::WalletConnectResponse)
+            .event(event.id);
 
-        // Send request
-        let output: Output<EventId> = self.pool.send_event(&event).await?;
+        // Subscribe to filter and create the stream
+        let mut stream = self
+            .pool
+            .stream_events(filter, self.opts.timeout, ReqExitPolicy::WaitForEvents(1))
+            .await?;
 
-        time::timeout(Some(self.opts.timeout), async {
-            while let Ok(notification) = notifications.recv().await {
-                if let RelayPoolNotification::Event { event, .. } = notification {
-                    if event.kind == Kind::WalletConnectResponse
-                        && event.tags.event_ids().next() == Some(output.id())
-                    {
-                        return Ok(Response::from_event(&self.uri, &event)?);
-                    }
-                }
-            }
+        // Send the request
+        self.pool.send_event(&event).await?;
+
+        // Wait for the response event
+        let received_event: Event = stream.next().await.ok_or(Error::PrematureExit)?;
+
+        // Parse response
+        let response: Response = Response::from_event(&self.uri, &received_event)?;
 
-            Err(Error::PrematureExit)
-        })
-        .await
-        .ok_or(Error::Timeout)?
+        // Return response
+        Ok(response)
     }
 
     /// Pay invoice