Consume nostr contacts (#659)

* Enable NIP-17 private messages

* Company contact sharing

* Review fixes

Author: tompro

crates/bcr-ebill-api/src/service/company_service.rs

@@ -111,6 +111,9 @@ pub trait CompanyServiceApi: ServiceTraitBounds {
         file_name: &str,
         private_key: &SecretKey,
     ) -> Result<Vec<u8>>;
+
+    /// Shares derived keys for given company contact information.
+    async fn share_contact_details(&self, share_to: &NodeId, company_id: NodeId) -> Result<()>;
 }
 
 /// The company service is responsible for managing the companies
@@ -229,11 +232,9 @@ impl CompanyService {
     }
 }
 
-/// Derives an identity child key, encrypts the contact data from company with it and returns the bcr metadata
+/// Derives a company contact encryption key, encrypts the contact data with it and returns the BCR metadata.
 fn get_bcr_data(company: &Company, keys: &CompanyKeys, relays: Vec<String>) -> Result<BcrMetadata> {
-    // we derive via BcrKeys bcs it creates a Identity chain keypair
-    let bcr_keys: BcrKeys = keys.clone().try_into()?;
-    let derived_keys = bcr_keys.derive_keypair()?;
+    let derived_keys = keys.derive_keypair()?;
     let contact = Contact {
         t: ContactType::Company,
         node_id: company.id.clone(),
@@ -908,6 +909,16 @@ impl CompanyServiceApi for CompanyService {
             return Err(super::Error::NotFound);
         }
     }
+
+    async fn share_contact_details(&self, share_to: &NodeId, company_id: NodeId) -> Result<()> {
+        let company_keys = self.store.get_key_pair(&company_id).await?;
+        let derived_keys = company_keys.derive_keypair()?;
+        let keys = BcrKeys::from_private_key(&derived_keys.secret_key())?;
+        self.notification_service
+            .share_contact_details_keys(share_to, &company_id, &keys)
+            .await?;
+        Ok(())
+    }
 }
 
 #[cfg(test)]

crates/bcr-ebill-api/src/service/contact_service.rs

@@ -210,8 +210,8 @@ impl ContactService {
             .by_node_id(&contact.node_id)
             .await?
         {
-            Some(nostr_contact) => nostr_contact.merge_contact(contact),
-            None => NostrContact::from_contact(contact)?,
+            Some(nostr_contact) => nostr_contact.merge_contact(contact, None),
+            None => NostrContact::from_contact(contact, None)?,
         };
         self.nostr_contact_store.upsert(&nostr_contact).await?;
         Ok(())
@@ -1267,6 +1267,7 @@ pub mod tests {
                 relays: vec![],
                 trust_level: TrustLevel::Participant,
                 handshake_status: HandshakeStatus::None,
+                contact_private_key: None,
             }))
         });
         let result = get_service(

crates/bcr-ebill-api/src/service/identity_service.rs

@@ -105,6 +105,9 @@ pub trait IdentityServiceApi: ServiceTraitBounds {
 
     /// Returns the local key pair
     async fn get_keys(&self) -> Result<BcrKeys>;
+
+    /// Shares derived keys for private identity contact information. Recipient is the given node id.
+    async fn share_contact_details(&self, share_to: &NodeId) -> Result<()>;
 }
 
 /// The identity service is responsible for managing the local identity
@@ -730,6 +733,16 @@ impl IdentityServiceApi for IdentityService {
     async fn get_keys(&self) -> Result<BcrKeys> {
         Ok(self.store.get_key_pair().await?)
     }
+
+    async fn share_contact_details(&self, share_to: &NodeId) -> Result<()> {
+        let identity = self.get_full_identity().await?;
+        let derived_keys = identity.key_pair.derive_keypair()?;
+        let keys = BcrKeys::from_private_key(&derived_keys.secret_key())?;
+        self.notification_service
+            .share_contact_details_keys(share_to, &identity.identity.node_id, &keys)
+            .await?;
+        Ok(())
+    }
 }
 
 #[cfg(test)]

crates/bcr-ebill-api/src/service/notification_service/event/contact.rs

@@ -0,0 +1,14 @@
+use bcr_ebill_core::NodeId;
+use secp256k1::SecretKey;
+use serde::{Deserialize, Serialize};
+
+/// Event payload when keys for contact details are shared. This is used for both personal identity
+/// and company. The shared keys are derived from the private key of the identity or company and
+/// all the recipents to decrypt the private Nostr profile data that is stored on relays.
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct ContactShareEvent {
+    /// The node id of the contact that is shared
+    pub node_id: NodeId,
+    /// The private key of the contact that is shared
+    pub private_key: SecretKey,
+}

crates/bcr-ebill-api/src/service/notification_service/event/mod.rs

@@ -1,6 +1,7 @@
 mod bill_events;
 mod blockchain_event;
 mod company_events;
+mod contact;
 mod identity_events;
 
 use crate::service::notification_service::{Error, Result};
@@ -12,6 +13,7 @@ pub use blockchain_event::{
     BillBlockEvent, ChainInvite, ChainKeys, CompanyBlockEvent, IdentityBlockEvent,
 };
 pub use company_events::CompanyChainEvent;
+pub use contact::ContactShareEvent;
 pub use identity_events::IdentityChainEvent;
 
 /// The global event type that is used for all events.
@@ -29,6 +31,8 @@ pub enum EventType {
     CompanyChain,
     /// Private company invites with keys
     CompanyChainInvite,
+    /// Share private company or identity contact details
+    ContactShare,
 }
 
 impl EventType {
@@ -39,6 +43,8 @@ impl EventType {
             EventType::BillChainInvite,
             EventType::IdentityChain,
             EventType::CompanyChain,
+            EventType::CompanyChainInvite,
+            EventType::ContactShare,
         ]
     }
 }
@@ -85,6 +91,10 @@ impl<T: Serialize> Event<T> {
     pub fn new_company_invite(data: T) -> Self {
         Self::new(EventType::CompanyChainInvite, data)
     }
+
+    pub fn new_contact_share(data: T) -> Self {
+        Self::new(EventType::ContactShare, data)
+    }
 }
 
 /// The event version that is used for all events if no specific version

crates/bcr-ebill-api/src/service/notification_service/mod.rs

@@ -97,6 +97,14 @@ impl NostrContactData {
             relays: relays.into_iter().filter_map(|r| r.parse().ok()).collect(),
         }
     }
+
+    pub fn get_bcr_metadata(&self) -> Option<BcrMetadata> {
+        self.metadata
+            .custom
+            .get("bcr")
+            .cloned()
+            .and_then(|c| serde_json::from_value(c).ok())
+    }
 }
 
 /// Our custom data on nostr Metadata messages

crates/bcr-ebill-api/src/service/notification_service/service.rs

@@ -206,4 +206,12 @@ pub trait NotificationServiceApi: ServiceTraitBounds {
 
     /// Resync bill chain
     async fn resync_bill_chain(&self, bill_id: &BillId) -> Result<()>;
+
+    /// Shares derived keys for private contact information via DM.
+    async fn share_contact_details_keys(
+        &self,
+        recipient: &NodeId,
+        contact_id: &NodeId,
+        keys: &BcrKeys,
+    ) -> Result<()>;
 }

crates/bcr-ebill-core/src/lib.rs

@@ -264,6 +264,15 @@ impl OptionalPostalAddress {
         }
     }
 
+    pub fn from_postal_address(address: &PostalAddress) -> Self {
+        Self {
+            country: Some(address.country.clone()),
+            city: Some(address.city.clone()),
+            zip: address.zip.clone(),
+            address: Some(address.address.clone()),
+        }
+    }
+
     pub fn is_fully_set(&self) -> bool {
         self.country.is_some() && self.city.is_some() && self.address.is_some()
     }

crates/bcr-ebill-core/src/nostr_contact.rs

@@ -1,5 +1,6 @@
 use std::collections::BTreeSet;
 
+use secp256k1::SecretKey;
 use serde::{Deserialize, Serialize};
 
 use crate::{ValidationError, contact::Contact};
@@ -21,25 +22,31 @@ pub struct NostrContact {
     pub trust_level: TrustLevel,
     /// The handshake status with this contact.
     pub handshake_status: HandshakeStatus,
+    /// The keys to decrypt private nostr contact details.
+    pub contact_private_key: Option<SecretKey>,
 }
 
 impl NostrContact {
     /// Creates a new Nostr contact from a contact. This is used when we have a contact and want to
     /// create the Nostr contact from it. Handshake is set to complete and we trust the contact.
-    pub fn from_contact(contact: &Contact) -> Result<Self, ValidationError> {
+    pub fn from_contact(
+        contact: &Contact,
+        private_key: Option<SecretKey>,
+    ) -> Result<Self, ValidationError> {
         let npub = contact.node_id.npub();
         Ok(Self {
             npub,
             name: Some(contact.name.clone()),
             relays: contact.nostr_relays.clone(),
             trust_level: TrustLevel::Trusted,
             handshake_status: HandshakeStatus::Added,
+            contact_private_key: private_key,
         })
     }
 
     /// Merges contact data into a nostr contact. This assumes at that point the handskake is
     /// complete and we trust the contact.
-    pub fn merge_contact(&self, contact: &Contact) -> Self {
+    pub fn merge_contact(&self, contact: &Contact, private_key: Option<SecretKey>) -> Self {
         let mut relays: BTreeSet<String> = BTreeSet::from_iter(self.relays.clone());
         relays.extend(contact.nostr_relays.clone());
         Self {
@@ -48,6 +55,7 @@ impl NostrContact {
             relays: relays.into_iter().collect(),
             trust_level: TrustLevel::Trusted,
             handshake_status: HandshakeStatus::Added,
+            contact_private_key: private_key.or(self.contact_private_key),
         }
     }
 }

crates/bcr-ebill-persistence/src/db/nostr_contact_store.rs

@@ -8,7 +8,7 @@ use crate::{
 };
 use async_trait::async_trait;
 use bcr_ebill_core::{
-    NodeId, ServiceTraitBounds,
+    NodeId, SecretKey, ServiceTraitBounds,
     nostr_contact::{HandshakeStatus, NostrContact, NostrPublicKey, TrustLevel},
 };
 use serde::{Deserialize, Serialize};
@@ -123,6 +123,8 @@ pub struct NostrContactDb {
     pub trust_level: TrustLevel,
     /// The handshake status with this contact.
     pub handshake_status: HandshakeStatus,
+    /// The keys to decrypt private contact details.
+    pub contact_private_key: Option<SecretKey>,
 }
 
 impl From<NostrContact> for NostrContactDb {
@@ -136,6 +138,7 @@ impl From<NostrContact> for NostrContactDb {
             relays: contact.relays,
             trust_level: contact.trust_level,
             handshake_status: contact.handshake_status,
+            contact_private_key: contact.contact_private_key,
         }
     }
 }
@@ -149,6 +152,7 @@ impl TryFrom<NostrContactDb> for NostrContact {
             relays: db.relays,
             trust_level: db.trust_level,
             handshake_status: db.handshake_status,
+            contact_private_key: db.contact_private_key,
         })
     }
 }
@@ -345,6 +349,7 @@ mod tests {
             relays: vec!["test_relay".to_string()],
             trust_level: TrustLevel::None,
             handshake_status: HandshakeStatus::None,
+            contact_private_key: None,
         }
     }
 }