Bump nostr and nwc to 0.44.0

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

Author: yukibtc

Cargo.lock

@@ -43,8 +43,8 @@ image = { version = "0.25", features = ["jpeg", "png", "webp"] }
 indexmap = "2.6.0"
 log = "0.4.17"
 md5 = "0.7.0"
-nostr = { version = "0.37.0", default-features = false, features = ["std", "nip49"] }
-nwc = "0.39.0"
+nostr = { version = "0.44.0", default-features = false, features = ["std", "nip49"] }
+nwc = "0.44.0"
 mio = { version = "1.0.3", features = ["os-poll", "net"] }
 nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "2b2e5e43c019b80b98f1db6a03a1b88ca699bfa3" }
 #nostrdb = "0.6.1"

Cargo.toml

@@ -105,7 +105,7 @@ impl FullKeypair {
     pub fn generate() -> Self {
         let mut rng = nostr::secp256k1::rand::rngs::OsRng;
         let (secret_key, _) = &nostr::SECP256K1.generate_keypair(&mut rng);
-        let (xopk, _) = secret_key.x_only_public_key(&nostr::SECP256K1);
+        let (xopk, _) = secret_key.x_only_public_key(nostr::SECP256K1);
         let secret_key = nostr::SecretKey::from(*secret_key);
         FullKeypair {
             pubkey: Pubkey::new(xopk.serialize()),
@@ -160,8 +160,7 @@ impl SerializableKeypair {
     pub fn to_keypair(&self, pass: &str) -> Keypair {
         Keypair::new(
             self.pubkey,
-            self.encrypted_secret_key
-                .and_then(|e| e.to_secret_key(pass).ok()),
+            self.encrypted_secret_key.and_then(|e| e.decrypt(pass).ok()),
         )
     }
 }
@@ -236,7 +235,7 @@ fn parse_seckey<'a>(parser: &mut TokenParser<'a>) -> Result<SecretKey, ParseErro
     let eseckey = EncryptedSecretKey::from_bech32(raw).map_err(|_| ParseError::DecodeFailed)?;
 
     let seckey = eseckey
-        .to_secret_key(ESECKEY_PASS)
+        .decrypt(ESECKEY_PASS)
         .map_err(|_| ParseError::DecodeFailed)?;
 
     Ok(seckey)

crates/enostr/src/keypair.rs

@@ -316,7 +316,7 @@ impl RelayPool {
             return Ok(());
         }
         let relay = Relay::new(
-            nostr::RelayUrl::parse(url).map_err(|_| Error::InvalidRelayUrl)?,
+            nostr::RelayUrl::parse(&url).map_err(|_| Error::InvalidRelayUrl)?,
             wakeup,
         )?;
         let pool_relay = PoolRelay::websocket(relay);

crates/enostr/src/relay/pool.rs

@@ -1,4 +1,5 @@
 use enostr::{ClientMessage, NoteId, Pubkey, RelayPool};
+use nostr::RelayUrl;
 use nostrdb::{Note, NoteKey};
 use tracing::error;
 
@@ -70,7 +71,11 @@ impl NoteContextSelection {
                 if note_author_is_selected_acc {
                     let nip19event = nostr::nips::nip19::Nip19Event::new(
                         nostr::event::EventId::from_byte_array(*note.id()),
-                        pool.urls(),
+                    )
+                    .relays(
+                        pool.urls()
+                            .iter()
+                            .filter_map(|url| RelayUrl::parse(url).ok()),
                     );
                     let Ok(bech) = nostr::nips::nip19::ToBech32::to_bech32(&nip19event) else {
                         return;

crates/notedeck/src/note/context.rs

@@ -1,4 +1,4 @@
-use std::{fmt::Display, sync::Arc};
+use std::sync::Arc;
 
 use nwc::{
     nostr::nips::nip47::{NostrWalletConnectURI, PayInvoiceRequest, PayInvoiceResponse},
@@ -68,7 +68,7 @@ pub enum WalletError {
 pub struct Wallet {
     pub uri: String,
     wallet: Arc<RwLock<NWC>>,
-    balance: Option<Promise<Result<u64, NwcError>>>,
+    balance: Option<Promise<Result<u64, nwc::Error>>>,
 }
 
 impl Clone for Wallet {
@@ -116,7 +116,7 @@ impl Wallet {
         })
     }
 
-    pub fn get_balance(&mut self) -> Option<&Result<u64, NwcError>> {
+    pub fn get_balance(&mut self) -> Option<&Result<u64, nwc::Error>> {
         if self.balance.is_none() {
             self.balance = Some(get_balance(self.wallet.clone()));
             return None;
@@ -138,51 +138,11 @@ impl Wallet {
     }
 }
 
-#[derive(Clone)]
-pub enum NwcError {
-    /// NIP47 error
-    NIP47(String),
-    /// Relay
-    Relay(String),
-    /// Premature exit
-    PrematureExit,
-    /// Request timeout
-    Timeout,
-}
-
-impl From<nwc::Error> for NwcError {
-    fn from(value: nwc::Error) -> Self {
-        match value {
-            nwc::error::Error::NIP47(error) => NwcError::NIP47(error.to_string()),
-            nwc::error::Error::Relay(error) => NwcError::Relay(error.to_string()),
-            nwc::error::Error::PrematureExit => NwcError::PrematureExit,
-            nwc::error::Error::Timeout => NwcError::Timeout,
-        }
-    }
-}
-
-impl Display for NwcError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            NwcError::NIP47(err) => write!(f, "NIP47 error: {err}"),
-            NwcError::Relay(err) => write!(f, "Relay error: {err}"),
-            NwcError::PrematureExit => write!(f, "Premature exit"),
-            NwcError::Timeout => write!(f, "Request timed out"),
-        }
-    }
-}
-
-fn get_balance(nwc: Arc<RwLock<NWC>>) -> Promise<Result<u64, NwcError>> {
+fn get_balance(nwc: Arc<RwLock<NWC>>) -> Promise<Result<u64, nwc::Error>> {
     let (sender, promise) = Promise::new();
 
     tokio::spawn(async move {
-        sender.send(
-            nwc.read()
-                .await
-                .get_balance()
-                .await
-                .map_err(nwc::Error::into),
-        );
+        sender.send(nwc.read().await.get_balance().await);
     });
 
     promise