From 694325fa25e281b1a4c9d7f275f1a8e0f1ad7abf Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Mon, 11 Nov 2024 13:08:35 +0000
Subject: chore: bump rust-nostr v0.36

bump all rust-nostr packages to latest issued version.

there have been some breaking changes to nip46 and this applies
these changes.
---
 src/lib/client.rs | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

(limited to 'src/lib/client.rs')

diff --git a/src/lib/client.rs b/src/lib/client.rs
index 44ac0cb..d8c5f6d 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -15,6 +15,7 @@ use std::{
     fmt::{Display, Write},
     fs::create_dir_all,
     path::Path,
+    sync::Arc,
     time::Duration,
 };
 
@@ -61,7 +62,7 @@ pub struct Client {
 pub trait Connect {
     fn default() -> Self;
     fn new(opts: Params) -> Self;
-    async fn set_signer(&mut self, signer: NostrSigner);
+    async fn set_signer(&mut self, signer: Arc<dyn NostrSigner>);
     async fn connect(&self, relay_url: &Url) -> Result<()>;
     async fn disconnect(&self) -> Result<()>;
     fn get_fallback_relays(&self) -> &Vec<String>;
@@ -167,8 +168,8 @@ impl Connect for Client {
         }
     }
 
-    async fn set_signer(&mut self, signer: NostrSigner) {
-        self.client.set_signer(Some(signer)).await;
+    async fn set_signer(&mut self, signer: Arc<dyn NostrSigner>) {
+        self.client.set_signer(signer).await;
     }
 
     async fn connect(&self, relay_url: &Url) -> Result<()> {
@@ -660,29 +661,32 @@ fn get_dedup_events(relay_results: Vec<Result<Vec<nostr::Event>>>) -> Vec<Event>
     dedup_events
 }
 
-pub async fn sign_event(event_builder: EventBuilder, signer: &NostrSigner) -> Result<nostr::Event> {
-    if signer.r#type().eq(&nostr_signer::NostrSignerType::NIP46) {
-        let term = console::Term::stderr();
-        term.write_line("signing event with remote signer...")?;
-        let event = signer
-            .sign_event_builder(event_builder)
-            .await
-            .context("failed to sign event")?;
-        term.clear_last_lines(1)?;
-        Ok(event)
-    } else {
-        signer
-            .sign_event_builder(event_builder)
-            .await
-            .context("failed to sign event")
-    }
+pub async fn sign_event(
+    event_builder: EventBuilder,
+    signer: &Arc<dyn NostrSigner>,
+) -> Result<nostr::Event> {
+    // if signer.type_id().().eq(&nostr_signer::NostrSignerType::NIP46) {
+    let term = console::Term::stderr();
+    term.write_line("signing event with remote signer...")?;
+    let event = signer
+        .sign_event(event_builder.build(signer.get_public_key().await?))
+        .await
+        .context("failed to sign event")?;
+    term.clear_last_lines(1)?;
+    Ok(event)
+    // } else {
+    //     signer
+    //         .sign_event(event_builder.build(signer.get_public_key().await?))
+    //         .await
+    //         .context("failed to sign event")
+    // }
 }
 
-pub async fn fetch_public_key(signer: &NostrSigner) -> Result<nostr::PublicKey> {
+pub async fn fetch_public_key(signer: &Arc<dyn NostrSigner>) -> Result<nostr::PublicKey> {
     let term = console::Term::stderr();
     term.write_line("fetching npub from remote signer...")?;
     let public_key = signer
-        .public_key()
+        .get_public_key()
         .await
         .context("failed to get npub from remote signer")?;
     term.clear_last_lines(1)?;
-- 
cgit v1.2.3