Zapper

Cargo.toml

@@ -28,6 +28,7 @@ nostr = { version = "0.27", path = "./crates/nostr", default-features = false }
 nostr-database = { version = "0.27", path = "./crates/nostr-database", default-features = false }
 nostr-relay-pool = { version = "0.27", path = "./crates/nostr-relay-pool", default-features = false }
 nostr-signer = { version = "0.27", path = "./crates/nostr-signer", default-features = false }
+nostr-zapper = { version = "0.27", path = "./crates/nostr-zapper", default-features = false }
 once_cell = "1.19"
 serde_json = { version = "1.0", default-features = false }
 thiserror = "1.0"

bindings/nostr-ffi/src/nips/nip47.rs

@@ -331,7 +331,7 @@ pub struct PayKeysendRequestParams {
     /// Optional id
     pub id: Option<String>,
     /// Amount in millisatoshis
-    pub amount: i64,
+    pub amount: u64,
     /// Receiver's node id
     pub pubkey: String,
     /// Optional preimage
@@ -418,13 +418,13 @@ impl From<nip47::TransactionType> for TransactionType {
 #[derive(Record)]
 pub struct MakeInvoiceRequestParams {
     /// Amount in millisatoshis
-    pub amount: i64,
+    pub amount: u64,
     /// Invoice description
     pub description: Option<String>,
     /// Invoice description hash
     pub description_hash: Option<String>,
     /// Invoice expiry in seconds
-    pub expiry: Option<i64>,
+    pub expiry: Option<u64>,
 }
 
 impl From<nip47::MakeInvoiceRequestParams> for MakeInvoiceRequestParams {
@@ -917,6 +917,14 @@ pub struct NostrWalletConnectURI {
     inner: nip47::NostrWalletConnectURI,
 }
 
+impl Deref for NostrWalletConnectURI {
+    type Target = nip47::NostrWalletConnectURI;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
 impl From<nip47::NostrWalletConnectURI> for NostrWalletConnectURI {
     fn from(inner: nip47::NostrWalletConnectURI) -> Self {
         Self { inner }

bindings/nostr-ffi/src/nips/nip57.rs

@@ -6,12 +6,32 @@ use std::ops::Deref;
 use std::sync::Arc;
 
 use nostr::nips::nip57;
-use uniffi::Object;
+use uniffi::{Enum, Object};
 
 use crate::error::Result;
 use crate::helper::unwrap_or_clone_arc;
 use crate::{Event, EventId, Keys, PublicKey, SecretKey};
 
+#[derive(Enum)]
+pub enum ZapType {
+    /// Public
+    Public,
+    /// Private
+    Private,
+    /// Anonymous
+    Anonymous,
+}
+
+impl From<ZapType> for nip57::ZapType {
+    fn from(value: ZapType) -> Self {
+        match value {
+            ZapType::Public => Self::Public,
+            ZapType::Private => Self::Private,
+            ZapType::Anonymous => Self::Anonymous,
+        }
+    }
+}
+
 #[derive(Clone, Object)]
 pub struct ZapRequestData {
     inner: nip57::ZapRequestData,

bindings/nostr-sdk-ffi/src/client/mod.rs

@@ -21,6 +21,7 @@ use uniffi::Object;
 mod builder;
 mod options;
 pub mod signer;
+pub mod zapper;
 
 pub use self::builder::ClientBuilder;
 pub use self::options::Options;

bindings/nostr-sdk-ffi/src/client/zapper.rs

@@ -0,0 +1,117 @@
+// Copyright (c) 2022-2023 Yuki Kishimoto
+// Copyright (c) 2023-2024 Rust Nostr Developers
+// Distributed under the MIT software license
+
+use core::ops::Deref;
+use std::sync::Arc;
+
+use nostr_ffi::helper::unwrap_or_clone_arc;
+use nostr_ffi::nips::nip47::NostrWalletConnectURI;
+use nostr_ffi::nips::nip57::ZapType;
+use nostr_ffi::{EventId, PublicKey};
+use nostr_sdk::zapper::{DynNostrZapper, IntoNostrZapper};
+use nostr_sdk::{block_on, client, NostrWalletConnectOptions, NWC};
+use uniffi::Object;
+
+use crate::error::Result;
+
+/// Zap entity
+#[derive(Object)]
+pub struct ZapEntity {
+    inner: client::ZapEntity,
+}
+
+impl Deref for ZapEntity {
+    type Target = client::ZapEntity;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+#[uniffi::export]
+impl ZapEntity {
+    #[uniffi::constructor]
+    pub fn event(event_id: Arc<EventId>) -> Self {
+        Self {
+            inner: client::ZapEntity::Event(**event_id),
+        }
+    }
+
+    #[uniffi::constructor]
+    pub fn public_key(public_key: Arc<PublicKey>) -> Self {
+        Self {
+            inner: client::ZapEntity::PublicKey(**public_key),
+        }
+    }
+}
+
+/// Nostr Zapper
+#[derive(Object)]
+pub struct NostrZapper {
+    inner: Arc<DynNostrZapper>,
+}
+
+impl Deref for NostrZapper {
+    type Target = Arc<DynNostrZapper>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+impl From<Arc<DynNostrZapper>> for NostrZapper {
+    fn from(inner: Arc<DynNostrZapper>) -> Self {
+        Self { inner }
+    }
+}
+
+#[uniffi::export]
+impl NostrZapper {
+    #[uniffi::constructor]
+    pub fn nwc(uri: Arc<NostrWalletConnectURI>) -> Result<Self> {
+        block_on(async move {
+            let uri = uri.as_ref().deref();
+            let zapper = NWC::with_opts(
+                uri.to_owned(),
+                NostrWalletConnectOptions::new().shutdown_on_drop(true),
+            )
+            .await?;
+            Ok(Self {
+                inner: zapper.into_nostr_zapper(),
+            })
+        })
+    }
+}
+
+/// Zap Details
+#[derive(Clone, Object)]
+pub struct ZapDetails {
+    inner: client::ZapDetails,
+}
+
+impl From<ZapDetails> for client::ZapDetails {
+    fn from(value: ZapDetails) -> Self {
+        value.inner
+    }
+}
+
+#[uniffi::export]
+impl ZapDetails {
+    /// Create new Zap Details
+    ///
+    /// **Note: `private` zaps are not currently supported here!**
+    #[uniffi::constructor]
+    pub fn new(zap_type: ZapType) -> Self {
+        Self {
+            inner: client::ZapDetails::new(zap_type.into()),
+        }
+    }
+
+    /// Add message
+    pub fn message(self: Arc<Self>, message: String) -> Self {
+        let mut builder = unwrap_or_clone_arc(self);
+        builder.inner = builder.inner.message(message);
+        builder
+    }
+}

bindings/nostr-sdk-ffi/src/error.rs

@@ -86,6 +86,12 @@ impl From<nostr_sdk::signer::nip46::Error> for NostrSdkError {
     }
 }
 
+impl From<nostr_sdk::nwc::Error> for NostrSdkError {
+    fn from(e: nostr_sdk::nwc::Error) -> NostrSdkError {
+        Self::Generic(e.to_string())
+    }
+}
+
 impl From<async_utility::thread::Error> for NostrSdkError {
     fn from(e: async_utility::thread::Error) -> NostrSdkError {
         Self::Generic(e.to_string())

bindings/nostr-sdk-js/src/client/zapper.rs

@@ -3,13 +3,14 @@
 // Distributed under the MIT software license
 
 use core::ops::Deref;
+use std::sync::Arc;
 
 use nostr_js::error::{into_err, Result};
 use nostr_js::event::JsEventId;
 use nostr_js::key::JsPublicKey;
 use nostr_js::nips::nip47::JsNostrWalletConnectURI;
 use nostr_js::nips::nip57::JsZapType;
-use nostr_sdk::client::{NostrZapper, ZapDetails, ZapEntity};
+use nostr_sdk::prelude::*;
 use wasm_bindgen::prelude::*;
 
 /// Zap entity
@@ -45,30 +46,43 @@ impl JsZapEntity {
 /// Nostr Zapper
 #[wasm_bindgen(js_name = NostrZapper)]
 pub struct JsNostrZapper {
-    inner: NostrZapper,
+    inner: Arc<DynNostrZapper>,
 }
 
 impl Deref for JsNostrZapper {
-    type Target = NostrZapper;
+    type Target = Arc<DynNostrZapper>;
 
     fn deref(&self) -> &Self::Target {
         &self.inner
     }
 }
 
+impl From<Arc<DynNostrZapper>> for JsNostrZapper {
+    fn from(inner: Arc<DynNostrZapper>) -> Self {
+        Self { inner }
+    }
+}
+
 #[wasm_bindgen(js_class = NostrZapper)]
 impl JsNostrZapper {
     /// Create new `WebLN` instance and compose `NostrZapper`
-    pub fn webln() -> Result<JsNostrZapper> {
+    pub async fn webln() -> Result<JsNostrZapper> {
+        let zapper = WebLNZapper::new().await.map_err(into_err)?;
         Ok(Self {
-            inner: NostrZapper::webln().map_err(into_err)?,
+            inner: zapper.into_nostr_zapper(),
         })
     }
 
-    pub fn nwc(uri: &JsNostrWalletConnectURI) -> Self {
-        Self {
-            inner: NostrZapper::NWC(uri.deref().clone()),
-        }
+    pub async fn nwc(uri: &JsNostrWalletConnectURI) -> Result<JsNostrZapper> {
+        let zapper = NWC::with_opts(
+            uri.deref().clone(),
+            NostrWalletConnectOptions::new().shutdown_on_drop(true),
+        )
+        .await
+        .map_err(into_err)?;
+        Ok(Self {
+            inner: zapper.into_nostr_zapper(),
+        })
     }
 }
 

contrib/scripts/check-crates.sh

@@ -29,8 +29,11 @@ buildargs=(
     "-p nostr --no-default-features --features alloc,all-nips"
     "-p nostr --features blocking"
     "-p nostr-database"
+    "-p nostr-zapper"
     "-p nostr-sdk"
     "-p nostr-sdk --no-default-features"
+    "-p nostr-sdk --features nip47,nip57"
+    "-p nostr-sdk --features nip47,nip57 --target wasm32-unknown-unknown"
     "-p nostr-sdk --features indexeddb,webln --target wasm32-unknown-unknown"
     "-p nostr-sdk --features sqlite"
 )

contrib/scripts/check-docs.sh

@@ -8,6 +8,8 @@ buildargs=(
     "-p nostr-database"
     "-p nostr-relay-pool"
     "-p nostr-signer"
+    "-p nostr-zapper"
+    "-p nwc"
     "-p nostr-sdk"
 )
 

contrib/scripts/release.sh

@@ -9,6 +9,9 @@ args=(
     "-p nostr-indexeddb"
     "-p nostr-relay-pool"
     "-p nostr-signer"
+    "-p nostr-zapper"
+    "-p nostr-webln"
+    "-p nwc"
     "-p nostr-sdk"
 )