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, 10 insertions, 9 deletions

diff --git a/src/repo_ref.rs b/src/repo_ref.rs
index c7b42fa..2dab79c 100644
--- a/src/repo_ref.rs
+++ b/src/repo_ref.rs
@@ -1,7 +1,7 @@
 use std::{fs::File, io::BufReader, str::FromStr};
 
 use anyhow::{bail, Context, Result};
-use nostr::{nips::nip19::Nip19, secp256k1::XOnlyPublicKey, FromBech32, Tag, ToBech32};
+use nostr::{nips::nip19::Nip19, FromBech32, PublicKey, Tag, ToBech32};
 use serde::{Deserialize, Serialize};
 
 #[cfg(not(test))]
@@ -23,7 +23,7 @@ pub struct RepoRef {
     pub git_server: String,
     pub web: Vec<String>,
     pub relays: Vec<String>,
-    pub maintainers: Vec<XOnlyPublicKey>,
+    pub maintainers: Vec<PublicKey>,
     // code languages and hashtags
 }
 
@@ -78,7 +78,7 @@ impl TryFrom<nostr::Event> for RepoRef {
             }
             for pk in maintainers {
                 r.maintainers.push(
-                nostr_sdk::prelude::XOnlyPublicKey::from_str(&pk)
+                nostr_sdk::prelude::PublicKey::from_str(&pk)
                     .context(format!("cannot convert entry from maintainers tag {pk} into a valid nostr public key. it should be in hex format"))
                     .context("invalid repository event")?,
                 );
@@ -200,8 +200,9 @@ pub async fn fetch(
                     nostr::Filter::default().kind(nostr::Kind::Custom(REPO_REF_KIND));
                 match nip19 {
                     Nip19::Coordinate(c) => {
-                        repo_event_filter =
-                            repo_event_filter.identifier(c.identifier).author(c.pubkey);
+                        repo_event_filter = repo_event_filter
+                            .identifier(c.identifier)
+                            .author(c.public_key);
                         for r in c.relays {
                             relays.push(r);
                         }
@@ -246,11 +247,11 @@ pub fn get_repo_config_from_yaml(git_repo: &Repo) -> Result<RepoConfigYaml> {
     Ok(repo_config_yaml)
 }
 
-pub fn extract_pks(pk_strings: Vec<String>) -> Result<Vec<XOnlyPublicKey>> {
-    let mut pks: Vec<XOnlyPublicKey> = vec![];
+pub fn extract_pks(pk_strings: Vec<String>) -> Result<Vec<PublicKey>> {
+    let mut pks: Vec<PublicKey> = vec![];
     for s in pk_strings {
         pks.push(
-            nostr_sdk::prelude::XOnlyPublicKey::from_bech32(s.clone())
+            nostr_sdk::prelude::PublicKey::from_bech32(s.clone())
                 .context(format!("cannot convert {s} into a valid nostr public key"))?,
         );
     }
@@ -259,7 +260,7 @@ pub fn extract_pks(pk_strings: Vec<String>) -> Result<Vec<XOnlyPublicKey>> {
 
 pub fn save_repo_config_to_yaml(
     git_repo: &Repo,
-    maintainers: Vec<XOnlyPublicKey>,
+    maintainers: Vec<PublicKey>,
     relays: Vec<String>,
 ) -> Result<()> {
     let path = git_repo.get_path()?.join("maintainers.yaml");