6 files changed, 71 insertions, 64 deletions

diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs
index db86c04..c57e21f 100644
--- a/src/bin/git_remote_nostr/push.rs
+++ b/src/bin/git_remote_nostr/push.rs
@@ -29,9 +29,8 @@ use ngit::{
 };
 use nostr::nips::nip10::Marker;
 use nostr_sdk::{
-    hashes::sha1::Hash as Sha1Hash, Event, EventBuilder, EventId, Kind, PublicKey, Tag,
+    hashes::sha1::Hash as Sha1Hash, Event, EventBuilder, EventId, Kind, NostrSigner, PublicKey, Tag,
 };
-use nostr_signer::NostrSigner;
 use repo_ref::RepoRef;
 use repo_state::RepoState;
 
@@ -868,7 +867,7 @@ async fn get_merged_status_events(
     repo_ref: &RepoRef,
     git_repo: &Repo,
     remote_nostr_url: &str,
-    signer: &NostrSigner,
+    signer: &Arc<dyn NostrSigner>,
     refspecs_to_git_server: &Vec<String>,
 ) -> Result<Vec<Event>> {
     let mut events = vec![];
@@ -944,7 +943,7 @@ async fn get_merged_status_events(
 }
 
 async fn create_merge_status(
-    signer: &NostrSigner,
+    signer: &Arc<dyn NostrSigner>,
     repo_ref: &RepoRef,
     proposal: &Event,
     revision: &Option<Event>,
@@ -1186,14 +1185,14 @@ trait BuildRepoState {
     async fn build(
         identifier: String,
         state: HashMap<String, String>,
-        signer: &NostrSigner,
+        signer: &Arc<dyn NostrSigner>,
     ) -> Result<RepoState>;
 }
 impl BuildRepoState for RepoState {
     async fn build(
         identifier: String,
         state: HashMap<String, String>,
-        signer: &NostrSigner,
+        signer: &Arc<dyn NostrSigner>,
     ) -> Result<RepoState> {
         let mut tags = vec![Tag::identifier(identifier.clone())];
         for (name, value) in &state {
diff --git a/src/bin/ngit/sub_commands/init.rs b/src/bin/ngit/sub_commands/init.rs
index 8f9ff0d..50b8b3c 100644
--- a/src/bin/ngit/sub_commands/init.rs
+++ b/src/bin/ngit/sub_commands/init.rs
@@ -212,7 +212,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
         let mut maintainers_string = if !args.other_maintainers.is_empty() {
             [args.other_maintainers.clone()].concat().join(" ")
         } else if repo_ref.is_none() && repo_config_result.is_err() {
-            signer.public_key().await?.to_bech32()?
+            signer.get_public_key().await?.to_bech32()?
         } else {
             let maintainers = if let Ok(config) = &repo_config_result {
                 config.maintainers.clone()
@@ -225,7 +225,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
                     .collect()
             } else {
                 //unreachable
-                vec![signer.public_key().await?.to_bech32()?]
+                vec![signer.get_public_key().await?.to_bech32()?]
             };
             // add current user if not present
             if maintainers.iter().any(|m| {
@@ -237,9 +237,12 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
             }) {
                 maintainers.join(" ")
             } else {
-                [maintainers, vec![signer.public_key().await?.to_bech32()?]]
-                    .concat()
-                    .join(" ")
+                [
+                    maintainers,
+                    vec![signer.get_public_key().await?.to_bech32()?],
+                ]
+                .concat()
+                .join(" ")
             }
         };
         'outer: loop {
@@ -263,7 +266,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
             }
             // add current user incase removed
             if !maintainers.iter().any(|m| user_ref.public_key.eq(m)) {
-                maintainers.push(signer.public_key().await?);
+                maintainers.push(signer.get_public_key().await?);
             }
             break maintainers;
         }
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)?;
diff --git a/src/lib/git_events.rs b/src/lib/git_events.rs
index 2adc205..29c4cf2 100644
--- a/src/lib/git_events.rs
+++ b/src/lib/git_events.rs
@@ -1,12 +1,11 @@
-use std::str::FromStr;
+use std::{str::FromStr, sync::Arc};
 
 use anyhow::{bail, Context, Result};
 use nostr::nips::{nip01::Coordinate, nip10::Marker, nip19::Nip19};
 use nostr_sdk::{
-    hashes::sha1::Hash as Sha1Hash, Event, EventBuilder, EventId, FromBech32, Kind, PublicKey, Tag,
-    TagKind, TagStandard, UncheckedUrl,
+    hashes::sha1::Hash as Sha1Hash, Event, EventBuilder, EventId, FromBech32, Kind, NostrSigner,
+    PublicKey, Tag, TagKind, TagStandard, UncheckedUrl,
 };
-use nostr_signer::NostrSigner;
 
 use crate::{
     cli_interactor::{Interactor, InteractorPrompt, PromptInputParms},
@@ -86,7 +85,7 @@ pub async fn generate_patch_event(
     root_commit: &Sha1Hash,
     commit: &Sha1Hash,
     thread_event_id: Option<nostr::EventId>,
-    signer: &nostr_sdk::NostrSigner,
+    signer: &Arc<dyn NostrSigner>,
     repo_ref: &RepoRef,
     parent_patch_event_id: Option<nostr::EventId>,
     series_count: Option<(u64, u64)>,
@@ -309,7 +308,7 @@ pub async fn generate_cover_letter_and_patch_events(
     cover_letter_title_description: Option<(String, String)>,
     git_repo: &Repo,
     commits: &[Sha1Hash],
-    signer: &NostrSigner,
+    signer: &Arc<dyn NostrSigner>,
     repo_ref: &RepoRef,
     root_proposal_id: &Option<String>,
     mentions: &[nostr::Tag],
@@ -624,7 +623,7 @@ mod tests {
                     Tag::hashtag("root"),
                 ],
             )
-            .to_event(&nostr::Keys::generate())?)
+            .sign_with_keys(&nostr::Keys::generate())?)
         }
 
         #[test]
diff --git a/src/lib/login/mod.rs b/src/lib/login/mod.rs
index d774426..148b9d7 100644
--- a/src/lib/login/mod.rs
+++ b/src/lib/login/mod.rs
@@ -7,11 +7,11 @@ use nostr::{
     nips::{nip05, nip46::NostrConnectURI},
     PublicKey,
 };
+use nostr_connect::client::NostrConnect;
 use nostr_sdk::{
     Alphabet, FromBech32, JsonUtil, Keys, Kind, NostrSigner, SingleLetterTag, Timestamp, ToBech32,
     Url,
 };
-use nostr_signer::Nip46Signer;
 use qrcode::QrCode;
 use tokio::sync::{oneshot, Mutex};
 
@@ -45,7 +45,7 @@ pub async fn launch(
     #[cfg(not(test))] client: Option<&Client>,
     change_user: bool,
     silent: bool,
-) -> Result<(NostrSigner, UserRef)> {
+) -> Result<(Arc<dyn NostrSigner>, UserRef)> {
     if let Ok(signer) = match get_signer_without_prompts(
         git_repo,
         bunker_uri,
@@ -86,7 +86,7 @@ pub async fn launch(
                         .password(PromptPasswordParms::default().with_prompt("password"))
                         .context("failed to get password input from interactor.password")?;
                     if let Ok(keys) = get_keys_with_password(git_repo, &password) {
-                        break Ok(NostrSigner::Keys(keys));
+                        break Ok(Arc::new(keys) as Arc<dyn NostrSigner>);
                     }
                     eprintln!("incorrect password");
                 }
@@ -101,7 +101,7 @@ pub async fn launch(
         // get user ref
         let user_ref = get_user_details(
             &signer
-                .public_key()
+                .get_public_key()
                 .await
                 .context("cannot get public key from signer")?,
             client,
@@ -139,15 +139,13 @@ async fn get_signer_without_prompts(
     nsec: &Option<String>,
     password: &Option<String>,
     save_local: bool,
-) -> Result<NostrSigner> {
+) -> Result<Arc<dyn NostrSigner>> {
     if let Some(nsec) = nsec {
-        Ok(NostrSigner::Keys(get_keys_from_nsec(
+        Ok(Arc::new(get_keys_from_nsec(
             git_repo, nsec, password, save_local,
         )?))
     } else if let Some(password) = password {
-        Ok(NostrSigner::Keys(get_keys_with_password(
-            git_repo, password,
-        )?))
+        Ok(Arc::new(get_keys_with_password(git_repo, password)?))
     } else if let Some(bunker_uri) = bunker_uri {
         if let Some(bunker_app_key) = bunker_app_key {
             let signer = get_nip46_signer_from_uri_and_key(bunker_uri, bunker_app_key)
@@ -156,7 +154,7 @@ async fn get_signer_without_prompts(
             if save_local {
                 save_to_git_config(
                     git_repo,
-                    &signer.public_key().await?.to_bech32()?,
+                    &signer.get_public_key().await?.to_bech32()?,
                     &None,
                     &Some((bunker_uri.to_string(),bunker_app_key.to_string())),
                     false,
@@ -286,11 +284,14 @@ fn get_keys_with_password(git_repo: &Repo, password: &str) -> Result<nostr::Keys
     .context("failed to decrypt stored nsec key with provided password")
 }
 
-async fn get_nip46_signer_from_uri_and_key(uri: &str, app_key: &str) -> Result<NostrSigner> {
+async fn get_nip46_signer_from_uri_and_key(
+    uri: &str,
+    app_key: &str,
+) -> Result<Arc<dyn NostrSigner>> {
     let term = console::Term::stderr();
     term.write_line("connecting to remote signer...")?;
     let uri = NostrConnectURI::parse(uri)?;
-    let signer = NostrSigner::nip46(Nip46Signer::new(
+    let signer = Arc::new(NostrConnect::new(
         uri,
         nostr::Keys::from_str(app_key).context("invalid app key")?,
         Duration::from_secs(10 * 60),
@@ -302,7 +303,7 @@ async fn get_nip46_signer_from_uri_and_key(uri: &str, app_key: &str) -> Result<N
 
 async fn get_signer_with_git_config_nsec_or_bunker_without_prompts(
     git_repo: &Repo,
-) -> Result<NostrSigner> {
+) -> Result<Arc<dyn NostrSigner>> {
     if let Ok(local_nsec) = &git_repo
         .get_git_config_item("nostr.nsec", Some(false))
         .context("failed get local git config")?
@@ -311,7 +312,7 @@ async fn get_signer_with_git_config_nsec_or_bunker_without_prompts(
         if local_nsec.contains("ncryptsec") {
             bail!("git global config item nostr.nsec is an ncryptsec")
         }
-        Ok(NostrSigner::Keys(
+        Ok(Arc::new(
             nostr::Keys::from_str(local_nsec).context("invalid nsec parameter")?,
         ))
     } else if let Ok((uri, app_key)) = get_git_config_bunker_uri_and_app_key(git_repo, Some(false))
@@ -325,7 +326,7 @@ async fn get_signer_with_git_config_nsec_or_bunker_without_prompts(
         if global_nsec.contains("ncryptsec") {
             bail!("git global config item nostr.nsec is an ncryptsec")
         }
-        Ok(NostrSigner::Keys(
+        Ok(Arc::new(
             nostr::Keys::from_str(global_nsec).context("invalid nsec parameter")?,
         ))
     } else if let Ok((uri, app_key)) = get_git_config_bunker_uri_and_app_key(git_repo, Some(true)) {
@@ -358,7 +359,7 @@ async fn fresh_login(
     #[cfg(test)] client: Option<&MockConnect>,
     #[cfg(not(test))] client: Option<&Client>,
     always_save: bool,
-) -> Result<(NostrSigner, UserRef)> {
+) -> Result<(Arc<dyn NostrSigner>, UserRef)> {
     let app_key = Keys::generate();
     let app_key_secret = app_key.secret_key().to_secret_hex();
     let relays = if let Some(client) = client {
@@ -403,13 +404,13 @@ async fn fresh_login(
         if offline {
             return;
         }
-        if let Ok(nip46_signer) = Nip46Signer::new(
+        if let Ok(nostr_connect) = NostrConnect::new(
             nostr_connect_url.clone(),
             app_key.clone(),
             Duration::from_secs(10 * 60),
             None,
         ) {
-            let signer = NostrSigner::nip46(nip46_signer);
+            let signer: Arc<dyn NostrSigner> = Arc::new(nostr_connect);
             if let Ok(pub_key) = fetch_public_key(&signer).await {
                 let mut printer_locked = printer_clone.lock().await;
                 printer_locked.clear_all();
@@ -437,7 +438,7 @@ async fn fresh_login(
     let (signer, public_key) = {
         if let Ok(Some((signer, public_key))) = rx.await {
             let bunker_url = NostrConnectURI::Bunker {
-                signer_public_key: public_key,
+                remote_signer_public_key: public_key,
                 relays: relays.clone(),
                 secret: None,
             };
@@ -455,7 +456,7 @@ async fn fresh_login(
             let mut public_key: Option<PublicKey> = None;
             // prompt for nsec
             let mut prompt = "login with nsec / bunker url / nostr address";
-            let signer = loop {
+            let signer: Arc<dyn NostrSigner> = loop {
                 let input = Interactor::default()
                     .input(PromptInputParms::default().with_prompt(prompt))
                     .context("failed to get nsec input from interactor")?;
@@ -463,7 +464,7 @@ async fn fresh_login(
                     if let Err(error) = save_keys(git_repo, &keys, always_save) {
                         eprintln!("{error}");
                     }
-                    break NostrSigner::Keys(keys);
+                    break Arc::new(keys);
                 }
                 let uri = if let Ok(uri) = NostrConnectURI::parse(&input) {
                     uri
@@ -501,7 +502,7 @@ async fn fresh_login(
             let public_key = if let Some(public_key) = public_key {
                 public_key
             } else {
-                signer.public_key().await?
+                signer.get_public_key().await?
             };
             (signer, public_key)
         }
@@ -561,7 +562,7 @@ pub async fn fetch_nip46_uri_from_nip05(nip05: &str) -> Result<NostrConnectURI>
                 bail!("nip05 provider isn't configured for remote login")
             }
             Ok(NostrConnectURI::Bunker {
-                signer_public_key: profile.public_key,
+                remote_signer_public_key: profile.public_key,
                 relays: profile.nip46,
                 secret: None,
             })
diff --git a/src/lib/repo_ref.rs b/src/lib/repo_ref.rs
index 9bee641..8b48824 100644
--- a/src/lib/repo_ref.rs
+++ b/src/lib/repo_ref.rs
@@ -3,6 +3,7 @@ use std::{
     fs::File,
     io::BufReader,
     str::FromStr,
+    sync::Arc,
 };
 
 use anyhow::{bail, Context, Result};
@@ -116,7 +117,7 @@ impl TryFrom<nostr::Event> for RepoRef {
 }
 
 impl RepoRef {
-    pub async fn to_event(&self, signer: &NostrSigner) -> Result<nostr::Event> {
+    pub async fn to_event(&self, signer: &Arc<dyn NostrSigner>) -> Result<nostr::Event> {
         sign_event(
             nostr_sdk::EventBuilder::new(
                 nostr::event::Kind::GitRepoAnnouncement,