Update rust-nostr

MutinyWallet · Jan 19, 2024 · dba03dc · dba03dc
1 parent 3249a40
commit dba03dc
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 84 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,5 +20,3 @@ lightning-invoice = { git = 'https://github.com/MutinyWallet/rust-lightning.git'
 lightning-rapid-gossip-sync = { git = 'https://github.com/MutinyWallet/rust-lightning.git', rev = "686a84236f54bf8d7270a5fbec07801e5281691f" }
 lightning-background-processor = { git = 'https://github.com/MutinyWallet/rust-lightning.git', rev = "686a84236f54bf8d7270a5fbec07801e5281691f" }
 lightning-transaction-sync  = { git = 'https://github.com/MutinyWallet/rust-lightning.git', rev = "686a84236f54bf8d7270a5fbec07801e5281691f" }
-nostr  = { git = 'https://github.com/benthecarman/nostr.git', rev = "7195b8d537db5fe0612b3d94794893bc0021aa11" }
-nostr-sdk  = { git = 'https://github.com/benthecarman/nostr.git', rev = "7195b8d537db5fe0612b3d94794893bc0021aa11" }
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.26.0", default-features = false, features = ["nip05", "nip47"] }
-nostr-sdk = { version = "0.26.0", default-features = false }
+nostr = { version = "0.27.0", default-features = false, features = ["nip05", "nip47"] }
+nostr-sdk = { version = "0.27.0", default-features = false }
 cbc = { version = "0.1", features = ["alloc"] }
 aes = { version = "0.8" }
 jwt-compact = { version = "0.8.0-beta.1", features = ["es256k"] }

diff --git a/mutiny-core/src/lib.rs b/mutiny-core/src/lib.rs
@@ -1516,6 +1516,7 @@ impl<S: MutinyStorage> MutinyWallet<S> {
                                 public_key: zap_npub,
                                 relay_url: None,
                                 alias: None,
+                                uppercase: false,
                             },
                             Tag::Amount {
                                 millisats: msats,

diff --git a/mutiny-core/src/nostr/mod.rs b/mutiny-core/src/nostr/mod.rs
@@ -587,6 +587,7 @@ impl<S: MutinyStorage> NostrManager<S> {
             public_key: inv.pubkey,
             relay_url: None,
             alias: None,
+            uppercase: false,
         };
         let e_tag = Tag::Event {
             event_id: inv.event_id,
@@ -718,6 +719,7 @@ impl<S: MutinyStorage> NostrManager<S> {
                     public_key: inv.pubkey,
                     relay_url: None,
                     alias: None,
+                    uppercase: false,
                 };
                 let e_tag = Tag::Event {
                     event_id: inv.event_id,
@@ -855,6 +857,7 @@ impl<S: MutinyStorage> NostrManager<S> {
             public_key: nwc.public_key,
             relay_url: None,
             alias: None,
+            uppercase: false,
         };
         let request_event =
             EventBuilder::new(Kind::WalletConnectRequest, encrypted, [p_tag]).to_event(&secret)?;

diff --git a/mutiny-core/src/nostr/nwc.rs b/mutiny-core/src/nostr/nwc.rs
@@ -390,6 +390,7 @@ impl NostrWalletConnect {
             public_key: event.pubkey,
             relay_url: None,
             alias: None,
+            uppercase: false,
         };
         let e_tag = Tag::Event {
             event_id: event.id,
@@ -625,6 +626,7 @@ impl NostrWalletConnect {
                         public_key: event.pubkey,
                         relay_url: None,
                         alias: None,
+                        uppercase: false,
                     };
                     let e_tag = Tag::Event {
                         event_id: event.id,
@@ -794,6 +796,7 @@ impl NostrWalletConnect {
                         public_key: event.pubkey,
                         relay_url: None,
                         alias: None,
+                        uppercase: false,
                     };
                     let e_tag = Tag::Event {
                         event_id: event.id,
@@ -1318,6 +1321,7 @@ mod wasm_test {
                 public_key: uri.public_key,
                 relay_url: None,
                 alias: None,
+                uppercase: false,
             };
             EventBuilder::new(Kind::WalletConnectRequest, encrypted, [p_tag])
                 .to_event(&Keys::new(uri.secret))
@@ -1346,6 +1350,7 @@ mod wasm_test {
                 public_key: uri.public_key,
                 relay_url: None,
                 alias: None,
+                uppercase: false,
             };
             EventBuilder::new(Kind::WalletConnectRequest, encrypted, [p_tag])
                 .to_event(&Keys::new(uri.secret))

diff --git a/mutiny-core/src/test_utils.rs b/mutiny-core/src/test_utils.rs
@@ -48,6 +48,7 @@ pub fn create_nwc_request(nwc: &NostrWalletConnectURI, invoice: String) -> Event
         public_key: nwc.public_key,
         relay_url: None,
         alias: None,
+        uppercase: false,
     };
 
     EventBuilder::new(Kind::WalletConnectRequest, encrypted, [p_tag])

diff --git a/mutiny-core/src/utils.rs b/mutiny-core/src/utils.rs
@@ -188,7 +188,7 @@ pub(crate) fn parse_profile_metadata(data: Vec<Value>) -> HashMap<XOnlyPublicKey
         .filter_map(|v| {
             Event::from_value(v)
                 .ok()
-                .and_then(|e| Metadata::from_json(e.content).ok().map(|m| (e.pubkey, m)))
+                .and_then(|e| Metadata::from_json(&e.content).ok().map(|m| (e.pubkey, m)))
         })
         .collect()
 }

diff --git a/mutiny-wasm/Cargo.toml b/mutiny-wasm/Cargo.toml
@@ -30,7 +30,7 @@ lightning-invoice = { version = "0.26.0" }
 thiserror = "1.0"
 instant = { version = "0.1", features = ["wasm-bindgen"] }
 lnurl-rs = { version = "0.3.1", default-features = false }
-nostr = { version = "0.26.0", default-features = false }
+nostr = { version = "0.27.0", default-features = false }
 wasm-logger = "0.2.0"
 log = "0.4.17"
 rexie = "0.5.0"