Bump nostr upstream deps to 0.42.0

Pull-Request: #11
Signed-off-by: Yuki Kishimoto <yukikishimoto@protonmail.com>

Author: yukibtc

CHANGELOG.md

@@ -25,9 +25,14 @@
 
 ## Unreleased
 
+### Breaking changes
+
+- Rename `ExtractedComment` to `CommentTarget` (https://github.com/rust-nostr/nostr-sdk-ffi/pull/11)
+
 ### Changed
 
 * Publish python wheels with cp39-abi3 (https://github.com/rust-nostr/nostr-sdk-ffi/pull/7)
+* Bump nostr upstream deps to 0.42.0 (see the [Upstream CHANGELOG] for more details, https://github.com/rust-nostr/nostr-sdk-ffi/pull/11)
 
 ### Added
 

Cargo.lock

@@ -24,10 +24,10 @@ uniffi-cli = ["uniffi/cli"] # required for the `uniffi-bindgen` binary
 async-trait = "0.1"
 async-wsocket = "0.13"
 futures-util = "0.3.31"
-nostr = { version = "0.41.0", features = ["std", "all-nips"] }
-nostr-connect = "0.41.0"
-nostr-sdk  = { version = "0.41.0", default-features = false, features = ["all-nips"] }
-nwc = "0.41.0"
+nostr = { git = "https://github.com/rust-nostr/nostr", rev = "184e686260daa5f631a94b97749547f7c2b28008", features = ["std", "all-nips"] }
+nostr-connect = { git = "https://github.com/rust-nostr/nostr", rev = "184e686260daa5f631a94b97749547f7c2b28008" }
+nostr-sdk  = { git = "https://github.com/rust-nostr/nostr", rev = "184e686260daa5f631a94b97749547f7c2b28008", default-features = false, features = ["all-nips"] }
+nwc = { git = "https://github.com/rust-nostr/nostr", rev = "184e686260daa5f631a94b97749547f7c2b28008" }
 tokio = { version = "1", features = ["sync"] }
 tracing = { version = "0.1", features = ["std"] }
 tracing-subscriber = "0.3"

Cargo.toml

@@ -132,6 +132,8 @@ pub enum KindStandard {
     Reaction,
     /// Badge Award (NIP58)
     BadgeAward,
+    /// Blossom Authorization
+    BlossomAuth,
     /// Channel Creation (NIP28)
     ChannelCreation,
     /// Channel Metadata (NIP28)
@@ -436,6 +438,7 @@ fn convert(k: nostr::Kind) -> Option<KindStandard> {
         nostr::Kind::CashuWalletUnspentProof => Some(KindStandard::CashuWalletUnspentProof),
         nostr::Kind::CashuWalletSpendingHistory => Some(KindStandard::CashuWalletSpendingHistory),
         nostr::Kind::CodeSnippet => Some(KindStandard::CodeSnippet),
+        nostr::Kind::BlossomAuth => Some(KindStandard::BlossomAuth),
         nostr::Kind::Custom(..) => None,
     }
 }
@@ -453,6 +456,7 @@ impl From<KindStandard> for nostr::Kind {
             KindStandard::Comment => Self::Comment,
             KindStandard::Reaction => Self::Reaction,
             KindStandard::BadgeAward => Self::BadgeAward,
+            KindStandard::BlossomAuth => Self::BlossomAuth,
             KindStandard::ChannelCreation => Self::ChannelCreation,
             KindStandard::ChannelMetadata => Self::ChannelMetadata,
             KindStandard::ChannelMessage => Self::ChannelMessage,

src/protocol/event/kind.rs

@@ -103,6 +103,8 @@ pub enum TagKind {
     Streaming,
     /// Recording
     Recording,
+    /// Server
+    Server,
     /// Starts
     Starts,
     /// Ends
@@ -186,6 +188,7 @@ impl From<tag::TagKind<'_>> for TagKind {
             tag::TagKind::Blurhash => Self::Blurhash,
             tag::TagKind::Streaming => Self::Streaming,
             tag::TagKind::Recording => Self::Recording,
+            tag::TagKind::Server => Self::Server,
             tag::TagKind::Starts => Self::Starts,
             tag::TagKind::Ends => Self::Ends,
             tag::TagKind::Status => Self::Status,
@@ -255,6 +258,7 @@ impl From<TagKind> for tag::TagKind<'_> {
             TagKind::Blurhash => Self::Blurhash,
             TagKind::Streaming => Self::Streaming,
             TagKind::Recording => Self::Recording,
+            TagKind::Server => Self::Server,
             TagKind::Starts => Self::Starts,
             TagKind::Ends => Self::Ends,
             TagKind::Status => Self::Status,

src/protocol/event/tag/kind.rs

@@ -219,6 +219,9 @@ pub enum TagStandard {
         key: String,
         iv: String,
     },
+    Server {
+        url: String,
+    },
     Sha256 {
         hash: String,
     },
@@ -504,6 +507,9 @@ impl From<tag::TagStandard> for TagStandard {
             },
             tag::TagStandard::MimeType(mime) => Self::MimeType { mime },
             tag::TagStandard::Aes256Gcm { key, iv } => Self::Aes256Gcm { key, iv },
+            tag::TagStandard::Server(url) => Self::Server {
+                url: url.to_string(),
+            },
             tag::TagStandard::Sha256(hash) => Self::Sha256 {
                 hash: hash.to_string(),
             },
@@ -753,6 +759,7 @@ impl TryFrom<TagStandard> for tag::TagStandard {
             TagStandard::UrlTag { url } => Ok(Self::Url(Url::parse(&url)?)),
             TagStandard::MimeType { mime } => Ok(Self::MimeType(mime)),
             TagStandard::Aes256Gcm { key, iv } => Ok(Self::Aes256Gcm { key, iv }),
+            TagStandard::Server { url } => Ok(Self::Server(Url::parse(&url)?)),
             TagStandard::Sha256 { hash } => Ok(Self::Sha256(Sha256Hash::from_str(&hash)?)),
             TagStandard::Size { size } => Ok(Self::Size(size as usize)),
             TagStandard::Dim { dimensions } => Ok(Self::Dim(dimensions.into())),

src/protocol/event/tag/standard.rs

@@ -5,19 +5,19 @@
 use std::ops::Deref;
 use std::sync::Arc;
 
-use nostr::nips::nip22::{self, Comment};
+use nostr::nips::nip22;
 use uniffi::Enum;
 
 use super::nip01::Coordinate;
 use super::nip73::ExternalContentId;
 use crate::protocol::event::{Event, EventId, Kind};
 use crate::protocol::key::PublicKey;
 
-/// Extracted NIP22 comment
+/// Comment target
 ///
 /// <https://github.com/nostr-protocol/nips/blob/master/22.md>
 #[derive(Enum)]
-pub enum ExtractedComment {
+pub enum CommentTarget {
     /// Event
     Event {
         /// Event ID
@@ -49,10 +49,10 @@ pub enum ExtractedComment {
     },
 }
 
-impl From<Comment<'_>> for ExtractedComment {
-    fn from(comment: Comment<'_>) -> Self {
+impl From<nip22::CommentTarget<'_>> for CommentTarget {
+    fn from(comment: nip22::CommentTarget<'_>) -> Self {
         match comment {
-            Comment::Event {
+            nip22::CommentTarget::Event {
                 id,
                 relay_hint,
                 pubkey_hint,
@@ -63,7 +63,7 @@ impl From<Comment<'_>> for ExtractedComment {
                 pubkey_hint: pubkey_hint.map(|p| Arc::new((*p).into())),
                 kind: kind.map(|k| Arc::new((*k).into())),
             },
-            Comment::Coordinate {
+            nip22::CommentTarget::Coordinate {
                 address,
                 relay_hint,
                 kind,
@@ -72,20 +72,20 @@ impl From<Comment<'_>> for ExtractedComment {
                 relay_hint: relay_hint.map(|u| u.to_string()),
                 kind: kind.map(|k| Arc::new((*k).into())),
             },
-            Comment::External { content, hint } => Self::External {
+            nip22::CommentTarget::External { content, hint } => Self::External {
                 content: content.clone().into(),
                 hint: hint.map(|u| u.to_string()),
             },
         }
     }
 }
 
-/// Extract NIP22 root comment data
-pub fn nip22_extract_root(event: &Event) -> Option<ExtractedComment> {
+/// Extract NIP22 root comment target
+pub fn nip22_extract_root(event: &Event) -> Option<CommentTarget> {
     nip22::extract_root(event.deref()).map(|c| c.into())
 }
 
-/// Extract NIP22 parent comment data
-pub fn nip22_extract_parent(event: &Event) -> Option<ExtractedComment> {
+/// Extract NIP22 parent comment target
+pub fn nip22_extract_parent(event: &Event) -> Option<CommentTarget> {
     nip22::extract_parent(event.deref()).map(|c| c.into())
 }