Bump upstream deps to ce2ba11a

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

Author: yukibtc

CHANGELOG.md

@@ -25,6 +25,12 @@
 
 -->
 
+## Unreleased
+
+## Changed
+
+* Bump upstream deps to ce2ba11a
+
 ## 0.40.2
 
 ### Fixed

Cargo.lock

@@ -10,9 +10,9 @@ crate-type = ["cdylib"]
 [dependencies]
 console_error_panic_hook = "0.1"
 js-sys = "0.3"
-nostr-connect = "0.40"
-nostr-sdk = { version = "0.40", default-features = false, features = ["all-nips", "indexeddb"] }
-nwc = "0.40"
+nostr-connect = { git = "https://github.com/rust-nostr/nostr", rev = "ce2ba11ab4ed94d2ac9f5eb16f0340a76ae12d54" }
+nostr-sdk = { git = "https://github.com/rust-nostr/nostr", rev = "ce2ba11ab4ed94d2ac9f5eb16f0340a76ae12d54", default-features = false, features = ["all-nips", "indexeddb"] }
+nwc = { git = "https://github.com/rust-nostr/nostr", rev = "ce2ba11ab4ed94d2ac9f5eb16f0340a76ae12d54" }
 tracing = "0.1"
 tracing-subscriber = "0.3"
 wasm-bindgen = { version = "0.2", features = ["std"] }

Cargo.toml

@@ -19,7 +19,7 @@ impl From<JsAdmitStatus> for AdmitStatus {
     fn from(status: JsAdmitStatus) -> Self {
         match status {
             JsAdmitStatus::Success => Self::Success,
-            JsAdmitStatus::Rejected => Self::Rejected,
+            JsAdmitStatus::Rejected => Self::Rejected { reason: None },
         }
     }
 }

src/policy.rs

@@ -848,9 +848,9 @@ impl JsEventBuilder {
     ///
     /// <https://github.com/nostr-protocol/nips/blob/master/32.md>
     #[wasm_bindgen]
-    pub fn label(label_namespace: &str, labels: Vec<String>) -> Self {
+    pub fn label(label_namespace: &str, label: String) -> Self {
         Self {
-            inner: EventBuilder::label(label_namespace, labels),
+            inner: EventBuilder::label(label_namespace, label),
         }
     }
 

src/protocol/event/builder.rs

@@ -349,6 +349,10 @@ pub enum JsKindStandard {
     ///
     /// <https://github.com/nostr-protocol/nips/blob/master/60.md>
     CashuWalletSpendingHistory,
+    /// Code Snippet
+    ///
+    /// <https://github.com/nostr-protocol/nips/blob/master/C0.md>
+    CodeSnippet,
 }
 
 fn convert(k: Kind) -> Option<JsKindStandard> {
@@ -438,6 +442,7 @@ fn convert(k: Kind) -> Option<JsKindStandard> {
         Kind::CashuWallet => Some(JsKindStandard::CashuWallet),
         Kind::CashuWalletUnspentProof => Some(JsKindStandard::CashuWalletUnspentProof),
         Kind::CashuWalletSpendingHistory => Some(JsKindStandard::CashuWalletSpendingHistory),
+        Kind::CodeSnippet => Some(JsKindStandard::CodeSnippet),
         Kind::Custom(..) => None,
     }
 }
@@ -524,6 +529,7 @@ impl From<JsKindStandard> for Kind {
             JsKindStandard::CashuWallet => Self::CashuWallet,
             JsKindStandard::CashuWalletUnspentProof => Self::CashuWalletUnspentProof,
             JsKindStandard::CashuWalletSpendingHistory => Self::CashuWalletSpendingHistory,
+            JsKindStandard::CodeSnippet => Self::CodeSnippet,
         }
     }
 }

src/protocol/event/kind.rs

@@ -124,9 +124,10 @@ impl JsTag {
     ///
     /// <https://github.com/nostr-protocol/nips/blob/master/01.md>
     #[inline]
-    pub fn coordinate(coordinate: &JsCoordinate) -> Self {
+    pub fn coordinate(coordinate: &JsCoordinate, relay_url: Option<String>) -> Self {
+        let relay_url: Option<RelayUrl> = relay_url.and_then(|url| RelayUrl::parse(&url).ok());
         Self {
-            inner: Tag::coordinate(coordinate.deref().clone()),
+            inner: Tag::coordinate(coordinate.deref().clone(), relay_url),
         }
     }
 

src/protocol/event/tag/mod.rs

@@ -73,7 +73,7 @@ impl JsHttpData {
 
     #[wasm_bindgen(getter)]
     pub fn method(&self) -> JsHttpMethod {
-        self.inner.method.clone().into()
+        self.inner.method.into()
     }
 
     #[wasm_bindgen(getter)]

src/protocol/nips/nip98.rs

@@ -82,6 +82,8 @@ pub enum JsRelayStatus {
     Disconnected,
     /// Completely disconnected
     Terminated,
+    /// The relay has been banned.
+    Banned,
 }
 
 impl From<RelayStatus> for JsRelayStatus {
@@ -93,6 +95,7 @@ impl From<RelayStatus> for JsRelayStatus {
             RelayStatus::Connected => Self::Connected,
             RelayStatus::Disconnected => Self::Disconnected,
             RelayStatus::Terminated => Self::Terminated,
+            RelayStatus::Banned => Self::Banned,
         }
     }
 }