Merge upgrade rust-nostr v0.29

refactor to address breaking changes in rust-nostr
fix a number of in dependancy which have been upstreamed

1 files changed, 18 insertions, 12 deletions

diff --git a/src/sub_commands/send.rs b/src/sub_commands/send.rs
index 35c2c81..d9caf9b 100644
--- a/src/sub_commands/send.rs
+++ b/src/sub_commands/send.rs
@@ -5,9 +5,10 @@ use console::Style;
 use futures::future::join_all;
 use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 use nostr::{
-    nips::nip19::Nip19, prelude::sha1::Hash as Sha1Hash, EventBuilder, FromBech32, Marker, Tag,
-    TagKind, UncheckedUrl,
+    nips::{nip01::Coordinate, nip19::Nip19},
+    EventBuilder, FromBech32, Marker, Tag, TagKind, UncheckedUrl,
 };
+use nostr_sdk::hashes::sha1::Hash as Sha1Hash;
 
 use super::list::tag_value;
 #[cfg(not(test))]
@@ -541,11 +542,13 @@ pub fn generate_cover_letter_and_patch_events(
             vec![
                 // TODO: why not tag all maintainer identifiers?
                 Tag::A {
-                    kind: nostr::Kind::Custom(REPO_REF_KIND),
-                    public_key: *repo_ref.maintainers.first()
-                        .context("repo reference should always have at least one maintainer - the issuer of the repo event")
-                        ?,
-                    identifier: repo_ref.identifier.to_string(),
+                    coordinate: Coordinate {
+                        kind: nostr::Kind::Custom(REPO_REF_KIND),
+                        public_key: *repo_ref.maintainers.first()
+                            .context("repo reference should always have at least one maintainer")?,
+                        identifier: repo_ref.identifier.to_string(),
+                        relays: repo_ref.relays.clone(),
+                    },
                     relay_url: repo_ref.relays.first().map(nostr::UncheckedUrl::from).clone(),
                 },
                 Tag::Reference(format!("{root_commit}")),
@@ -797,11 +800,14 @@ pub fn generate_patch_event(
         [
             vec![
                 Tag::A {
-                    kind: nostr::Kind::Custom(REPO_REF_KIND),
-                    public_key: *repo_ref.maintainers.first()
-                        .context("repo reference should always have at least one maintainer - the issuer of the repo event")
-                        ?,
-                    identifier: repo_ref.identifier.to_string(),
+                    coordinate: Coordinate {
+                        kind: nostr::Kind::Custom(REPO_REF_KIND),
+                        public_key: *repo_ref.maintainers.first()
+                            .context("repo reference should always have at least one maintainer - the issuer of the repo event")
+                            ?,
+                        identifier: repo_ref.identifier.to_string(),
+                        relays: repo_ref.relays.clone(),
+                    },
                     relay_url: relay_hint.clone(),
                 },
                 Tag::Reference(format!("{root_commit}")),