hot fixes to utc-6

core/archipelago/src/api/rpc/handshake.rs

@@ -1,6 +1,7 @@
 use super::RpcHandler;
 use crate::{nostr_handshake, peers};
 use anyhow::Result;
+use nostr_sdk::FromBech32;
 
 impl RpcHandler {
     /// Discover nodes (presence-only — returns Nostr pubkeys + DIDs, no onion addresses).
@@ -22,10 +23,19 @@ impl RpcHandler {
         params: Option<serde_json::Value>,
     ) -> Result<serde_json::Value> {
         let params = params.ok_or_else(|| anyhow::anyhow!("Missing params"))?;
-        let recipient = params
+        // Accept either hex pubkey or npub1... bech32 format
+        let recipient_raw = params
             .get("recipient_nostr_pubkey")
             .and_then(|v| v.as_str())
             .ok_or_else(|| anyhow::anyhow!("Missing recipient_nostr_pubkey"))?;
+        let recipient = if recipient_raw.starts_with("npub1") {
+            nostr_sdk::PublicKey::from_bech32(recipient_raw)
+                .map_err(|e| anyhow::anyhow!("Invalid npub: {}", e))?
+                .to_hex()
+        } else {
+            recipient_raw.to_string()
+        };
+        let recipient = recipient.as_str();
 
         let (data, _) = self.state_manager.get_snapshot().await;
         let our_onion = data
@@ -124,6 +134,7 @@ impl RpcHandler {
             .map(|hs| {
                 serde_json::json!({
                     "from_nostr_pubkey": hs.from_nostr_pubkey,
+                    "from_nostr_npub": hs.from_nostr_npub,
                     "message": hs.message,
                     "timestamp": hs.timestamp,
                 })