connect: drop support for NIP-46 event decryption with NIP-04

Ref nostr-protocol/nips#1248

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

CHANGELOG.md

@@ -31,6 +31,7 @@
 
 - pool: drop support for deprecated negentropy protocol ([Yuki Kishimoto] at https://github.com/rust-nostr/nostr/pull/853)
 - connect: encrypt NIP-46 events with NIP-44 instead of NIP-04 ([reyamir] at https://github.com/rust-nostr/nostr/pull/862)
+- connect: drop support for NIP-46 event decryption with NIP-04 ([Yuki Kishimoto] at https://github.com/rust-nostr/nostr/pull/864)
 
 ### Changed
 

crates/nostr-connect/src/client.rs

@@ -16,7 +16,6 @@ use tokio::sync::broadcast::Receiver;
 use tokio::sync::OnceCell;
 
 use crate::error::Error;
-use crate::util;
 
 /// Nostr Connect Client
 ///
@@ -259,7 +258,8 @@ impl NostrConnect {
             while let Ok(notification) = notifications.recv().await {
                 if let RelayPoolNotification::Event { event, .. } = notification {
                     if event.kind == Kind::NostrConnect {
-                        let msg: String = util::decrypt(secret_key, &event)?;
+                        let msg: String =
+                            nip44::decrypt(secret_key, &event.pubkey, event.content.as_str())?;
                         let msg: Message = Message::from_json(msg)?;
 
                         tracing::debug!("Received NIP46 message: '{msg}'");
@@ -414,7 +414,11 @@ async fn get_remote_signer_public_key(
             if let RelayPoolNotification::Event { event, .. } = notification {
                 if event.kind == Kind::NostrConnect {
                     // Decrypt content
-                    let msg: String = util::decrypt(app_keys.secret_key(), &event)?;
+                    let msg: String = nip44::decrypt(
+                        app_keys.secret_key(),
+                        &event.pubkey,
+                        event.content.as_str(),
+                    )?;
 
                     tracing::debug!("Received Nostr Connect message: '{msg}'");
 

crates/nostr-connect/src/lib.rs

@@ -15,4 +15,3 @@ pub mod client;
 pub mod error;
 pub mod prelude;
 pub mod signer;
-mod util;

crates/nostr-connect/src/signer.rs

@@ -11,7 +11,6 @@ use nostr::nips::nip46::{Message, Request, ResponseResult};
 use nostr_relay_pool::prelude::*;
 
 use crate::error::Error;
-use crate::util;
 
 /// Nostr Connect Keys
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -176,7 +175,11 @@ impl NostrConnectRemoteSigner {
             .handle_notifications(|notification| async {
                 if let RelayPoolNotification::Event { event, .. } = notification {
                     if event.kind == Kind::NostrConnect {
-                        match util::decrypt(self.keys.signer.secret_key(), &event) {
+                        match nip44::decrypt(
+                            self.keys.signer.secret_key(),
+                            &event.pubkey,
+                            &event.content,
+                        ) {
                             Ok(msg) => {
                                 tracing::debug!("New Nostr Connect message received: {msg}");