chore: upgrade rust-nostr v0.27.0v0.1.1

this is a contribution from jk (sectore) that I rebased and squashed
into this commit.

the tests were broken in the last few commits to rush out some fixes.
this change may introduce more issues because of
Relay.respond_standard_req.

11 files changed, 120 insertions, 88 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 0528b37..4119420 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -313,6 +313,24 @@ dependencies = [
 ]
 
 [[package]]
+name = "async-wsocket"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82d55992e9155e571208dc012c2a5c056572d1ab167bc299a63810ebf910226c"
+dependencies = [
+ "async-utility",
+ "futures-util",
+ "thiserror",
+ "tokio",
+ "tokio-rustls",
+ "tokio-socks",
+ "tokio-tungstenite",
+ "url-fork",
+ "wasm-ws",
+ "webpki-roots",
+]
+
+[[package]]
 name = "async_io_stream"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1653,9 +1671,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
 [[package]]
 name = "nostr"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b65a1b93d2c78550f8e7f84ce475b44c4f04e46b08d30be98523eaa498abae4"
+checksum = "3e47228d958fd65ef3e04650a3b1dd80f16f10f0243c80ed969556dead0f48c8"
 dependencies = [
  "aes 0.8.3",
  "base64",
@@ -1665,6 +1683,7 @@ dependencies = [
  "chacha20",
  "getrandom",
  "instant",
+ "js-sys",
  "negentropy",
  "once_cell",
  "reqwest",
@@ -1672,38 +1691,38 @@ dependencies = [
  "serde_json",
  "tracing",
  "url-fork",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
 ]
 
 [[package]]
-name = "nostr-sdk"
-version = "0.25.0"
+name = "nostr-database"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f887f45f344828e14740eb37b32c6ae3b6ac5dc7ea94dd60817507c44a770b01"
+checksum = "aa0550256c8d4f0aaf74891ac986bd5ba46b2957c2c7e20f51838fa5819285f8"
 dependencies = [
- "async-utility",
+ "async-trait",
  "nostr",
- "nostr-sdk-net",
- "once_cell",
  "thiserror",
  "tokio",
  "tracing",
 ]
 
 [[package]]
-name = "nostr-sdk-net"
-version = "0.25.0"
+name = "nostr-sdk"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d66a499ce2e1ab5ac03626df913d4fe2aa544231ec8b04f312cc13b74d50b2"
+checksum = "3cf190e41230721f0ce64f5ea72ed36cbc431d3b305eb166e24a94f5d7e4a425"
 dependencies = [
- "futures-util",
+ "async-utility",
+ "async-wsocket",
+ "nostr",
+ "nostr-database",
+ "once_cell",
  "thiserror",
  "tokio",
- "tokio-rustls",
- "tokio-socks",
- "tokio-tungstenite",
- "url-fork",
- "webpki-roots",
- "ws_stream_wasm",
+ "tracing",
 ]
 
 [[package]]
@@ -1809,9 +1828,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
@@ -2537,6 +2556,7 @@ version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
+ "indexmap 2.1.0",
  "itoa",
  "ryu",
  "serde",
@@ -3228,6 +3248,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
 
 [[package]]
+name = "wasm-ws"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5b3a482e27ff54809c0848629d9033179705c5ea2f58e26cf45dc77c34c4984"
+dependencies = [
+ "async_io_stream",
+ "futures",
+ "js-sys",
+ "pharos",
+ "send_wrapper",
+ "thiserror",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
 name = "web-sys"
 version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3417,25 +3454,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "ws_stream_wasm"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5"
-dependencies = [
- "async_io_stream",
- "futures",
- "js-sys",
- "log",
- "pharos",
- "rustc_version",
- "send_wrapper",
- "thiserror",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
 name = "xdg-home"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 511774a..98026fb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,8 +23,8 @@ futures = "0.3.28"
 git2 = "0.18.1"
 indicatif = "0.17.7"
 keyring = "2.0.5"
-nostr = "0.25.0"
-nostr-sdk = "0.25.0"
+nostr = "0.27.0"
+nostr-sdk = "0.27.0"
 passwords = "3.1.13"
 scrypt = "0.11.0"
 serde = { version = "1.0.181", features = ["derive"] }
diff --git a/flake.lock b/flake.lock
index 6bec3de..0ea50b5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701436327,
-        "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
+        "lastModified": 1705856552,
+        "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
+        "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1701829002,
-        "narHash": "sha256-zUQTSNujRESm2s0SvL4EXx1l5BqX7VNDAaFWGnaylUY=",
+        "lastModified": 1706235145,
+        "narHash": "sha256-3jh5nahTlcsX6QFcMPqxtLn9p9CgT9RSce5GLqjcpi4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "1fdfc1689218998460983986501bd65ba5bbee0f",
+        "rev": "3a57c4e29cb2beb777b2e6ae7309a680585b8b2f",
         "type": "github"
       },
       "original": {
diff --git a/src/client.rs b/src/client.rs
index 9aa574d..237ff24 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -16,7 +16,9 @@ use futures::stream::{self, StreamExt};
 #[cfg(test)]
 use mockall::*;
 use nostr::Event;
+use nostr_sdk::ClientSigner;
 
+#[allow(clippy::struct_field_names)]
 pub struct Client {
     client: nostr_sdk::Client,
     fallback_relays: Vec<String>,
@@ -87,7 +89,9 @@ impl Connect for Client {
     }
 
     async fn set_keys(&mut self, keys: &nostr::Keys) {
-        self.client.set_keys(keys).await;
+        self.client
+            .set_signer(Some(ClientSigner::Keys(keys.clone())))
+            .await;
     }
 
     async fn disconnect(&self) -> Result<()> {
@@ -104,7 +108,7 @@ impl Connect for Client {
     }
 
     async fn send_event_to(&self, url: &str, event: Event) -> Result<nostr::EventId> {
-        self.client.add_relay(url, None).await?;
+        self.client.add_relay(url).await?;
         self.client.connect_relay(url).await?;
         Ok(self.client.send_event_to(url, event).await?)
     }
@@ -117,7 +121,7 @@ impl Connect for Client {
         // add relays
         for relay in &relays {
             self.client
-                .add_relay(relay.as_str(), None)
+                .add_relay(relay.as_str())
                 .await
                 .context("cannot add relay")?;
         }
@@ -134,10 +138,6 @@ impl Connect for Client {
                 )
             })
             .map(|(relay, filters)| async {
-                if !relay.is_connected().await {
-                    relay.connect(false).await;
-                }
-
                 match get_events_of(relay, filters).await {
                     Err(error) => {
                         println!("{} {}", error, relay.url());
@@ -159,7 +159,9 @@ async fn get_events_of(
     filters: Vec<nostr::Filter>,
 ) -> Result<Vec<Event>> {
     println!("fetching from {}", relay.url());
-
+    if !relay.is_connected().await {
+        relay.connect(None).await;
+    }
     let events = relay
         .get_events_of(
             filters,
diff --git a/src/key_handling/users.rs b/src/key_handling/users.rs
index 42104f7..caa57e6 100644
--- a/src/key_handling/users.rs
+++ b/src/key_handling/users.rs
@@ -551,7 +551,7 @@ mod tests {
             nostr::event::EventBuilder::new(
                 nostr::Kind::RelayList,
                 "",
-                &[
+                [
                     nostr::Tag::RelayMetadata(
                         "wss://fredswrite1.relay".into(),
                         Some(nostr::RelayMetadata::Write),
@@ -571,7 +571,7 @@ mod tests {
             nostr::event::EventBuilder::new(
                 nostr::Kind::RelayList,
                 "",
-                &[
+                [
                     nostr::Tag::RelayMetadata(
                         "wss://carolswrite1.relay".into(),
                         Some(nostr::RelayMetadata::Write),
diff --git a/src/repo_ref.rs b/src/repo_ref.rs
index d12c681..22236f7 100644
--- a/src/repo_ref.rs
+++ b/src/repo_ref.rs
@@ -75,7 +75,7 @@ impl RepoRef {
         nostr_sdk::EventBuilder::new(
             nostr::event::Kind::Custom(REPO_REF_KIND),
             "",
-            &[
+            [
                 vec![
                     Tag::Identifier(self.root_commit.to_string()),
                     Tag::Reference(format!("r-{}", self.root_commit)),
@@ -90,7 +90,7 @@ impl RepoRef {
                 self.relays.iter().map(|r| Tag::Relay(r.into())).collect(),
                 self.maintainers
                     .iter()
-                    .map(|pk| Tag::PubKey(*pk, None))
+                    .map(|pk| Tag::public_key(*pk))
                     .collect(),
                 // code languages and hashtags
             ]
diff --git a/src/sub_commands/prs/create.rs b/src/sub_commands/prs/create.rs
index ced1edd..ad6a61a 100644
--- a/src/sub_commands/prs/create.rs
+++ b/src/sub_commands/prs/create.rs
@@ -329,7 +329,7 @@ pub fn generate_pr_and_patch_events(
     let pr_event = EventBuilder::new(
         nostr::event::Kind::Custom(PR_KIND),
         format!("{title}\r\n\r\n{description}"),
-        &pr_tags,
+        pr_tags,
         // TODO: add Repo event as root
         // TODO: people tag maintainers
         // TODO: add relay tags
@@ -364,15 +364,15 @@ pub fn generate_patch_event(
         git_repo
             .make_patch_from_commit(commit)
             .context(format!("cannot make patch for commit {commit}"))?,
-        &[
+        [
             Tag::Reference(format!("r-{root_commit}")),
             Tag::Reference(commit.to_string()),
             Tag::Reference(commit_parent.to_string()),
-            Tag::Event(
-                pr_event_id,
-                None, // TODO: add relay
-                Some(Marker::Root),
-            ),
+            Tag::Event {
+                event_id: pr_event_id,
+                relay_url: None, // TODO: add relay
+                marker: Some(Marker::Root),
+            },
             Tag::Generic(
                 TagKind::Custom("commit".to_string()),
                 vec![commit.to_string()],
diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml
index d4d8132..adb8909 100644
--- a/test_utils/Cargo.toml
+++ b/test_utils/Cargo.toml
@@ -9,7 +9,7 @@ assert_cmd = "2.0.12"
 dialoguer = "0.10.4"
 directories = "5.0.1"
 git2 = "0.18.1"
-nostr = "0.25.0"
+nostr = "0.27.0"
 once_cell = "1.18.0"
 rand = "0.8"
 rexpect = { git = "https://github.com/rust-cli/rexpect.git", rev = "9eb61dd" }
diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs
index f509039..f3f9dcf 100644
--- a/test_utils/src/lib.rs
+++ b/test_utils/src/lib.rs
@@ -3,7 +3,7 @@ use std::{ffi::OsStr, path::PathBuf};
 use anyhow::{ensure, Context, Result};
 use dialoguer::theme::{ColorfulTheme, Theme};
 use directories::ProjectDirs;
-use nostr::{self, prelude::FromSkStr, Tag};
+use nostr::{self, prelude::FromSkStr, Kind, Tag};
 use once_cell::sync::Lazy;
 use rexpect::session::{Options, PtySession};
 use strip_ansi_escapes::strip_str;
@@ -28,10 +28,11 @@ pub static TEST_KEY_1_KEYS: Lazy<nostr::Keys> =
     Lazy::new(|| nostr::Keys::from_sk_str(TEST_KEY_1_NSEC).unwrap());
 
 pub fn generate_test_key_1_metadata_event(name: &str) -> nostr::Event {
-    nostr::event::EventBuilder::set_metadata(nostr::Metadata::new().name(name))
+    nostr::event::EventBuilder::metadata(&nostr::Metadata::new().name(name))
         .to_event(&TEST_KEY_1_KEYS)
         .unwrap()
 }
+
 pub fn generate_test_key_1_metadata_event_old(name: &str) -> nostr::Event {
     make_event_old_or_change_user(
         generate_test_key_1_metadata_event(name),
@@ -40,11 +41,17 @@ pub fn generate_test_key_1_metadata_event_old(name: &str) -> nostr::Event {
     )
 }
 
+pub fn generate_test_key_1_kind_event(kind: Kind) -> nostr::Event {
+    nostr::event::EventBuilder::new(kind, "", [])
+        .to_event(&TEST_KEY_1_KEYS)
+        .unwrap()
+}
+
 pub fn generate_test_key_1_relay_list_event() -> nostr::Event {
     nostr::event::EventBuilder::new(
         nostr::Kind::RelayList,
         "",
-        &[
+        [
             nostr::Tag::RelayMetadata(
                 "ws://localhost:8053".into(),
                 Some(nostr::RelayMetadata::Write),
@@ -64,7 +71,7 @@ pub fn generate_test_key_1_relay_list_event_same_as_fallback() -> nostr::Event {
     nostr::event::EventBuilder::new(
         nostr::Kind::RelayList,
         "",
-        &[
+        [
             nostr::Tag::RelayMetadata(
                 "ws://localhost:8051".into(),
                 Some(nostr::RelayMetadata::Write),
@@ -90,7 +97,7 @@ pub static TEST_KEY_2_KEYS: Lazy<nostr::Keys> =
     Lazy::new(|| nostr::Keys::from_sk_str(TEST_KEY_2_NSEC).unwrap());
 
 pub fn generate_test_key_2_metadata_event(name: &str) -> nostr::Event {
-    nostr::event::EventBuilder::set_metadata(nostr::Metadata::new().name(name))
+    nostr::event::EventBuilder::metadata(&nostr::Metadata::new().name(name))
         .to_event(&TEST_KEY_2_KEYS)
         .unwrap()
 }
@@ -106,13 +113,12 @@ pub fn make_event_old_or_change_user(
     keys: &nostr::Keys,
     how_old_in_secs: u64,
 ) -> nostr::Event {
-    let mut unsigned = nostr::event::EventBuilder::new(event.kind, event.content, &event.tags)
-        .to_unsigned_event(keys.public_key());
+    let mut unsigned =
+        nostr::event::EventBuilder::new(event.kind, event.content.clone(), event.tags.clone())
+            .to_unsigned_event(keys.public_key());
 
-    unsigned.created_at = nostr::types::Timestamp::try_from(
-        nostr::types::Timestamp::now().as_u64() - how_old_in_secs,
-    )
-    .unwrap();
+    unsigned.created_at =
+        nostr::types::Timestamp::from(nostr::types::Timestamp::now().as_u64() - how_old_in_secs);
     unsigned.id = nostr::EventId::new(
         &keys.public_key(),
         unsigned.created_at,
@@ -130,15 +136,15 @@ pub fn generate_repo_ref_event() -> nostr::Event {
     nostr::event::EventBuilder::new(
         nostr::Kind::Custom(REPOSITORY_KIND),
         "",
-        &[
+        [
             Tag::Identifier(root_commit.to_string()),
             Tag::Reference(format!("r-{}", root_commit)),
             Tag::Name("example name".to_string()),
             Tag::Description("example description".to_string()),
             Tag::Relay("ws://localhost:8055".into()),
             Tag::Relay("ws://localhost:8056".into()),
-            Tag::PubKey(TEST_KEY_1_KEYS.public_key(), None),
-            Tag::PubKey(TEST_KEY_2_KEYS.public_key(), None),
+            Tag::public_key(TEST_KEY_1_KEYS.public_key()),
+            Tag::public_key(TEST_KEY_2_KEYS.public_key()),
         ],
     )
     .to_event(&TEST_KEY_1_KEYS)
diff --git a/test_utils/src/relay.rs b/test_utils/src/relay.rs
index 50f6337..e47ab5d 100644
--- a/test_utils/src/relay.rs
+++ b/test_utils/src/relay.rs
@@ -96,18 +96,25 @@ impl<'a> Relay<'a> {
         &self,
         client_id: u64,
         subscription_id: &nostr::SubscriptionId,
-        filters: &[nostr::Filter],
+        // TODO: enable filters
+        _filters: &[nostr::Filter],
     ) -> Result<bool> {
         // let t: Vec<nostr::Kind> = self.events.iter().map(|e| e.kind).collect();
         // .filter(|e| filters.iter().any(|filter| filter.match_event(e)))
         // println!("letsgo{:?}", t);
+
         self.respond_events(
             client_id,
             subscription_id,
             &self
                 .events
                 .iter()
-                .filter(|e| filters.iter().any(|filter| filter.match_event(e)))
+                // FIXME:
+                // `filter.match_events` does not exist anymore
+                // it has been moved to `nostr_database_::FilterIndex`
+                // but it's private now
+                // .filter(|e| filters.iter().any(|filter|filter.match_event(e)))
+                .filter(|_| true)
                 .cloned()
                 .collect(),
         )
diff --git a/tests/login.rs b/tests/login.rs
index e6ead6b..4141a59 100644
--- a/tests/login.rs
+++ b/tests/login.rs
@@ -207,8 +207,7 @@ mod with_relays {
                 fn when_some_relays_return_other_event_kinds() -> Result<()> {
                     futures::executor::block_on(run_test_displays_correct_name(
                         Some(&|relay, client_id, subscription_id, _| -> Result<()> {
-                            let mut event = generate_test_key_1_metadata_event("Fred");
-                            event.kind = nostr::Kind::TextNote;
+                            let event = generate_test_key_1_kind_event(nostr::Kind::TextNote);
                             relay.respond_events(
                                 client_id,
                                 &subscription_id,