Concrete Identity Types

bin/chat-cli/Cargo.toml

@@ -19,6 +19,7 @@ arboard = "3"
 base64 = "0.22"
 clap = { version = "4", features = ["derive"] }
 crossterm = "0.29"
+hex = "0.4.3"
 ratatui = "0.29"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

bin/chat-cli/src/app.rs

@@ -5,7 +5,10 @@ use std::path::{Path, PathBuf};
 use anyhow::Result;
 use arboard::Clipboard;
 use crossbeam_channel::Receiver;
-use logos_chat::{AccountDirectory, ChatClient, ChatStore, Event, RegistrationService, Transport};
+use logos_chat::{
+    AccountDirectory, ChatClient, ChatStore, Event, LogosAuthVerifier, RegistrationService,
+    Transport,
+};
 use serde::{Deserialize, Serialize};
 
 use crate::utils::now;
@@ -47,7 +50,7 @@ where
     R: RegistrationService + AccountDirectory + Clone + Send + 'static,
     S: ChatStore + Send + 'static,
 {
-    pub client: ChatClient<T, R, S>,
+    pub client: ChatClient<LogosAuthVerifier, T, R, S>,
     events: Receiver<Event>,
     pub state: AppState,
     /// Ephemeral command output — not persisted, cleared on chat switch.
@@ -65,7 +68,7 @@ where
     S: ChatStore + Send,
 {
     pub fn new(
-        client: ChatClient<T, R, S>,
+        client: ChatClient<LogosAuthVerifier, T, R, S>,
         events: Receiver<Event>,
         user_name: &str,
         data_dir: &Path,
@@ -253,7 +256,8 @@ where
                 Ok(Some("Help displayed".to_string()))
             }
             "/intro" => {
-                let address = self.client.addr().to_string();
+                // The address is bytes; hex is the shareable form users paste.
+                let address = hex::encode(self.client.addr());
                 self.add_system_message("── Your Address ──");
                 self.add_system_message(&address);
                 let clipboard_msg = match Clipboard::new().and_then(|mut cb| cb.set_text(&address))
@@ -268,10 +272,13 @@ where
                 if args.is_empty() {
                     return Ok(Some("Usage: /connect <address>".to_string()));
                 }
+                let Ok(address) = hex::decode(args) else {
+                    return Ok(Some("Address must be hex".to_string()));
+                };
                 let initial = format!("Hello from {}!", self.user_name);
                 let chat_id = self
                     .client
-                    .create_direct_conversation(args)
+                    .create_direct_conversation(&address)
                     .map_err(|e| anyhow::anyhow!("{e:?}"))?;
                 self.client
                     .send_message(&chat_id, initial.as_bytes())

bin/chat-cli/src/main.rs

@@ -9,8 +9,8 @@ use anyhow::{Context, Result};
 use clap::{Parser, ValueEnum};
 use crossbeam_channel::Receiver;
 use logos_chat::{
-    AccountDirectory, ChatClient, ChatStore, Event, LogosConfig, P2pConfig, RegistrationService,
-    RegistryPublishMode, Transport,
+    AccountDirectory, ChatClient, ChatStore, Event, LogosAuthVerifier, LogosConfig, P2pConfig,
+    RegistrationService, RegistryPublishMode, Transport,
 };
 
 use app::ChatApp;
@@ -161,7 +161,7 @@ fn db_path(cli: &Cli) -> Result<String> {
 }
 
 fn launch_tui<T, R, S>(
-    client: ChatClient<T, R, S>,
+    client: ChatClient<LogosAuthVerifier, T, R, S>,
     events: Receiver<Event>,
     cli: &Cli,
 ) -> Result<()>