From 9a00d130b05d1e8e762c1e5df12c709c5c38890c Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Wed, 1 Nov 2023 00:00:00 +0000
Subject: build(deps) update nostr nostr-sdk

fix breaking changes
---
 Cargo.lock                     | 19 +++++++++++++------
 Cargo.toml                     |  4 ++--
 src/key_handling/users.rs      |  4 ++--
 src/sub_commands/prs/create.rs |  8 ++++----
 test_utils/Cargo.toml          |  2 +-
 test_utils/src/relay.rs        |  2 +-
 6 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3e7c5e4..ed8bcc3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1569,6 +1569,12 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "negentropy"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e664971378a3987224f7a0e10059782035e89899ae403718ee07de85bec42afe"
+
 [[package]]
 name = "ngit"
 version = "0.0.1"
@@ -1636,9 +1642,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
 [[package]]
 name = "nostr"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df0af088a37ea0026bf96dcd66db8bf21ed7ff528b7cbe34b7f32f6af3ae14a0"
+checksum = "1b65a1b93d2c78550f8e7f84ce475b44c4f04e46b08d30be98523eaa498abae4"
 dependencies = [
  "aes 0.8.3",
  "base64",
@@ -1648,6 +1654,7 @@ dependencies = [
  "chacha20",
  "getrandom",
  "instant",
+ "negentropy",
  "once_cell",
  "reqwest",
  "serde",
@@ -1658,9 +1665,9 @@ dependencies = [
 
 [[package]]
 name = "nostr-sdk"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5facab78c73baf3853f8c807006e23567dd3825392ef13a3a07122f4ce18b56d"
+checksum = "f887f45f344828e14740eb37b32c6ae3b6ac5dc7ea94dd60817507c44a770b01"
 dependencies = [
  "async-utility",
  "nostr",
@@ -1673,9 +1680,9 @@ dependencies = [
 
 [[package]]
 name = "nostr-sdk-net"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4058b0267a1537c25b4674db9ed7a18152fc4c33df246dd4a88701007084ee"
+checksum = "18d66a499ce2e1ab5ac03626df913d4fe2aa544231ec8b04f312cc13b74d50b2"
 dependencies = [
  "futures-util",
  "thiserror",
diff --git a/Cargo.toml b/Cargo.toml
index 1571c02..f578333 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.24.0"
-nostr-sdk = "0.24.0"
+nostr = "0.25.0"
+nostr-sdk = "0.25.0"
 passwords = "3.1.13"
 scrypt = "0.11.0"
 serde = { version = "1.0.181", features = ["derive"] }
diff --git a/src/key_handling/users.rs b/src/key_handling/users.rs
index a486296..75a0a00 100644
--- a/src/key_handling/users.rs
+++ b/src/key_handling/users.rs
@@ -190,11 +190,11 @@ impl UserManagement for UserManager {
                     relays_to_search,
                     vec![
                         nostr::Filter::default()
-                            .author(public_key.to_string())
+                            .author(*public_key)
                             .since(nostr::Timestamp::from(user_ref.metadata.created_at + 1))
                             .kind(Kind::Metadata),
                         nostr::Filter::default()
-                            .author(public_key.to_string())
+                            .author(*public_key)
                             .since(nostr::Timestamp::from(user_ref.relays.created_at + 1))
                             .kind(Kind::RelayList),
                     ],
diff --git a/src/sub_commands/prs/create.rs b/src/sub_commands/prs/create.rs
index 0249488..5986235 100644
--- a/src/sub_commands/prs/create.rs
+++ b/src/sub_commands/prs/create.rs
@@ -90,7 +90,7 @@ pub async fn launch(
     let keys = login::launch(&cli_args.nsec, &cli_args.password, None).await?;
 
     let events =
-        generate_pr_and_patch_events(&title, &description, &to_branch, &git_repo, &ahead, keys)?;
+        generate_pr_and_patch_events(&title, &description, &to_branch, &git_repo, &ahead, &keys)?;
 
     let my_write_relays: Vec<String> = vec![
         "ws://localhost:8051".to_string(),
@@ -318,7 +318,7 @@ fn generate_pr_and_patch_events(
     to_branch: &str,
     git_repo: &Repo,
     commits: &Vec<Sha1Hash>,
-    keys: nostr::Keys,
+    keys: &nostr::Keys,
 ) -> Result<Vec<nostr::Event>> {
     let root_commit = git_repo
         .get_root_commit(to_branch)
@@ -337,7 +337,7 @@ fn generate_pr_and_patch_events(
         // TODO: people tag maintainers
         // TODO: add relay tags
     )
-    .to_event(&keys)
+    .to_event(keys)
     .context("failed to create pr event")?;
 
     let pr_event_id = pr_event.id;
@@ -375,7 +375,7 @@ fn generate_pr_and_patch_events(
                     // TODO: add relay tags
                 ],
             )
-            .to_event(&keys)?,
+            .to_event(keys)?,
         );
     }
     Ok(events)
diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml
index 7901b13..944f6df 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.24.0"
+nostr = "0.25.0"
 once_cell = "1.18.0"
 rand = "0.8"
 rexpect = { git = "https://github.com/phaer/rexpect.git", branch= "skip-ansi-escape-codes" }
diff --git a/test_utils/src/relay.rs b/test_utils/src/relay.rs
index db6a96c..87eb081 100644
--- a/test_utils/src/relay.rs
+++ b/test_utils/src/relay.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use anyhow::{bail, Result};
-use nostr::{ClientMessage, RelayMessage};
+use nostr::{ClientMessage, JsonUtil, RelayMessage};
 
 use crate::CliTester;
 
-- 
cgit v1.2.3