4 files changed, 33 insertions, 21 deletions

diff --git a/src/sub_commands/init.rs b/src/sub_commands/init.rs
index 4f098c0..56129a6 100644
--- a/src/sub_commands/init.rs
+++ b/src/sub_commands/init.rs
@@ -1,5 +1,5 @@
 use anyhow::{Context, Result};
-use nostr::{secp256k1::XOnlyPublicKey, FromBech32, ToBech32};
+use nostr::{FromBech32, PublicKey, ToBech32};
 
 use super::send::send_events;
 #[cfg(not(test))]
@@ -163,7 +163,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
         args.web.clone()
     };
 
-    let maintainers: Vec<XOnlyPublicKey> = {
+    let maintainers: Vec<PublicKey> = {
         let mut dont_ask = !args.other_maintainers.is_empty();
         let mut maintainers_string = if !args.other_maintainers.is_empty() {
             [args.other_maintainers.clone()].concat().join(" ")
@@ -185,7 +185,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
             };
             // add current user if not present
             if maintainers.iter().any(|m| {
-                if let Ok(m_pubkey) = XOnlyPublicKey::from_bech32(m) {
+                if let Ok(m_pubkey) = PublicKey::from_bech32(m) {
                     user_ref.public_key.eq(&m_pubkey)
                 } else {
                     false
@@ -210,9 +210,9 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
                     .map(std::string::ToString::to_string)
                     .collect();
             }
-            let mut maintainers: Vec<XOnlyPublicKey> = vec![];
+            let mut maintainers: Vec<PublicKey> = vec![];
             for m in maintainers_string.split(' ') {
-                if let Ok(m_pubkey) = XOnlyPublicKey::from_bech32(m) {
+                if let Ok(m_pubkey) = PublicKey::from_bech32(m) {
                     maintainers.push(m_pubkey);
                 } else {
                     println!("not a valid set of npubs seperated by a space");
diff --git a/src/sub_commands/list.rs b/src/sub_commands/list.rs
index 2d81164..1a30b9b 100644
--- a/src/sub_commands/list.rs
+++ b/src/sub_commands/list.rs
@@ -730,9 +730,12 @@ pub async fn find_proposal_events(
             vec![
                 nostr::Filter::default()
                     .kind(nostr::Kind::Custom(PATCH_KIND))
-                    .custom_tag(nostr::Alphabet::T, vec!["root"])
                     .custom_tag(
-                        nostr::Alphabet::A,
+                        nostr::SingleLetterTag::lowercase(nostr::Alphabet::T),
+                        vec!["root"],
+                    )
+                    .custom_tag(
+                        nostr::SingleLetterTag::lowercase(nostr::Alphabet::A),
                         repo_ref
                             .maintainers
                             .iter()
@@ -742,7 +745,10 @@ pub async fn find_proposal_events(
                 // events
                 nostr::Filter::default()
                     .kind(nostr::Kind::Custom(PATCH_KIND))
-                    .custom_tag(nostr::Alphabet::T, vec!["root"])
+                    .custom_tag(
+                        nostr::SingleLetterTag::lowercase(nostr::Alphabet::T),
+                        vec!["root"],
+                    )
                     .reference(root_commit),
             ],
         )
diff --git a/src/sub_commands/push.rs b/src/sub_commands/push.rs
index 651b250..bb50ee2 100644
--- a/src/sub_commands/push.rs
+++ b/src/sub_commands/push.rs
@@ -1,5 +1,5 @@
 use anyhow::{bail, Context, Result};
-use nostr::prelude::sha1::Hash as Sha1Hash;
+use nostr_sdk::hashes::sha1::Hash as Sha1Hash;
 
 #[cfg(not(test))]
 use crate::client::Client;
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}")),