Merge pull request #967 from MutinyWallet/requests

DM requests for invoices
MutinyWallet · Jan 23, 2024 · 6512e70 · 6512e70
2 parents 24b74a9 + fadc167
commit 6512e70
Show file tree

Hide file tree

Showing 11 changed files with 909 additions and 266 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mutiny-core/Cargo.toml b/mutiny-core/Cargo.toml
@@ -38,8 +38,8 @@ futures-util = { version = "0.3", default-features = false }
 reqwest = { version = "0.11", default-features = false, features = ["json"] }
 async-trait = "0.1.68"
 url = { version = "2.3.1", features = ["serde"] }
-nostr = { version = "0.27.0", default-features = false, features = ["nip05", "nip47", "nip57"] }
-nostr-sdk = { version = "0.27.0", default-features = false }
+nostr = { version = "0.27.0", default-features = false, features = ["nip04", "nip05", "nip47", "nip57"] }
+nostr-sdk = { version = "0.27.0", default-features = false, features = ["nip04", "nip05", "nip47", "nip57"] }
 cbc = { version = "0.1", features = ["alloc"] }
 aes = { version = "0.8" }
 jwt-compact = { version = "0.8.0-beta.1", features = ["es256k"] }
@@ -82,6 +82,9 @@ js-sys = "0.3.65"
 gloo-net = { version = "0.4.0" }
 instant = { version = "0.1", features = ["wasm-bindgen"] }
 getrandom = { version = "0.2", features = ["js"] }
+# add nip07 feature for wasm32
+nostr = { version = "0.27.0", default-features = false, features = ["nip04", "nip05", "nip07", "nip47", "nip57"] }
+nostr-sdk = { version = "0.27.0", default-features = false, features = ["nip04", "nip05", "nip07", "nip47", "nip57"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 tokio = { version = "1", features = ["rt"] }

diff --git a/mutiny-core/src/error.rs b/mutiny-core/src/error.rs
@@ -143,6 +143,9 @@ pub enum MutinyError {
     /// Error getting nostr data
     #[error("Failed to get nostr data.")]
     NostrError,
+    /// Error with Nip07 Extension
+    #[error("Error with NIP-07 extension")]
+    Nip07Extension,
     /// Incorrect password entered.
     #[error("Incorrect password entered.")]
     IncorrectPassword,
@@ -463,6 +466,13 @@ impl From<nostr::nips::nip04::Error> for MutinyError {
     }
 }
 
+#[cfg(target_arch = "wasm32")]
+impl From<nostr::nips::nip07::Error> for MutinyError {
+    fn from(_e: nostr::nips::nip07::Error) -> Self {
+        Self::Nip07Extension
+    }
+}
+
 impl From<nostr::nips::nip57::Error> for MutinyError {
     fn from(_e: nostr::nips::nip57::Error) -> Self {
         Self::NostrError