hot fixes to utc-6

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

@@ -3,6 +3,7 @@
 use super::RpcHandler;
 use crate::identity_manager::{IdentityManager, IdentityPurpose};
 use anyhow::{Context, Result};
+use nostr_sdk::ToBech32;
 
 impl RpcHandler {
     /// List all identities with their default status.
@@ -25,6 +26,8 @@ impl RpcHandler {
                     "did": id.did,
                     "created_at": id.created_at,
                     "is_default": is_default,
+                    "nostr_pubkey": id.nostr_pubkey,
+                    "nostr_npub": id.nostr_npub,
                 })
             })
             .collect();
@@ -65,6 +68,8 @@ impl RpcHandler {
             "pubkey": record.pubkey_hex,
             "did": record.did,
             "created_at": record.created_at,
+            "nostr_pubkey": record.nostr_pubkey,
+            "nostr_npub": record.nostr_npub,
         }))
     }
 
@@ -92,6 +97,8 @@ impl RpcHandler {
             "did": record.did,
             "created_at": record.created_at,
             "is_default": is_default,
+            "nostr_pubkey": record.nostr_pubkey,
+            "nostr_npub": record.nostr_npub,
         }))
     }
 
@@ -189,17 +196,27 @@ impl RpcHandler {
         let params = params.unwrap_or_default();
 
         // If a DID is provided, resolve it; otherwise use the node's DID
+        let is_local = params.get("did").and_then(|v| v.as_str()).is_none();
         let pubkey_hex = if let Some(did) = params.get("did").and_then(|v| v.as_str()) {
-            // Extract pubkey from did:key format
             let pubkey_bytes = crate::identity::pubkey_bytes_from_did_key(did)?;
             hex::encode(pubkey_bytes)
         } else {
-            // Use node's own pubkey
             let (data, _) = self.state_manager.get_snapshot().await;
             data.server_info.pubkey.clone()
         };
 
-        let document = crate::identity::did_document_from_pubkey_hex(&pubkey_hex)?;
+        // For local node, include Nostr secp256k1 key in DID Document (paired identity)
+        let document = if is_local {
+            let identity_dir = self.config.data_dir.join("identity");
+            match crate::nostr_discovery::get_nostr_pubkey(&identity_dir).await {
+                Ok(nostr_pubkey) => {
+                    crate::identity::did_document_with_nostr(&pubkey_hex, &nostr_pubkey)?
+                }
+                Err(_) => crate::identity::did_document_from_pubkey_hex(&pubkey_hex)?,
+            }
+        } else {
+            crate::identity::did_document_from_pubkey_hex(&pubkey_hex)?
+        };
         Ok(document)
     }
 
@@ -287,10 +304,16 @@ impl RpcHandler {
             .ok_or_else(|| anyhow::anyhow!("Missing required parameter: id"))?;
 
         let manager = IdentityManager::new(&self.config.data_dir).await?;
-        let pubkey = manager.create_nostr_key(id).await?;
+        let pubkey_hex = manager.create_nostr_key(id).await?;
+
+        // Derive npub (bech32 NIP-19) from hex
+        let npub = nostr_sdk::PublicKey::from_hex(&pubkey_hex)
+            .ok()
+            .and_then(|pk| pk.to_bech32().ok());
 
         Ok(serde_json::json!({
-            "nostr_pubkey": pubkey,
+            "nostr_pubkey": pubkey_hex,
+            "nostr_npub": npub,
         }))
     }