Restore from nostr dms and identity/company block (#612)

* Colapse if let stuff

* First iteration of DM processing in recovery.

* Logging and minor fixes

* Restore identity chain test

* Bill keys in block payload, add bills in processor

* Ensure all identity and company blocks published

* Less verbose logging

* Compile error fix for enum match

* Un-commited fixes

* Review fixes

Author: tompro

crates/bcr-ebill-api/src/service/bill_service/blocks.rs

@@ -23,7 +23,10 @@ use bcr_ebill_core::{
     util::BcrKeys,
 };
 
-use crate::data::validate_node_id_network;
+use crate::{
+    data::validate_node_id_network,
+    service::notification_service::event::{CompanyChainEvent, IdentityChainEvent},
+};
 
 use super::{BillAction, Result, error::Error, service::BillService};
 
@@ -414,9 +417,10 @@ impl BillService {
             signer_public_data,
             &bill_id,
             &block,
-            &identity.key_pair,
+            identity,
             signer_keys,
             timestamp,
+            None,
         )
         .await?;
 
@@ -443,19 +447,17 @@ impl BillService {
         signer_public_data: &BillParticipant,
         bill_id: &BillId,
         block: &BillBlock,
-        identity_keys: &BcrKeys,
+        identity: &IdentityWithAll,
         signer_keys: &BcrKeys,
         timestamp: u64,
+        bill_keys: Option<BillKeys>,
     ) -> Result<()> {
         match signer_public_data {
             BillParticipant::Ident(identified) => {
                 match identified.t {
                     ContactType::Person | ContactType::Anon => {
                         self.add_block_to_identity_chain_for_signed_bill_action(
-                            bill_id,
-                            block,
-                            identity_keys,
-                            timestamp,
+                            bill_id, block, identity, timestamp, bill_keys,
                         )
                         .await?;
                     }
@@ -464,20 +466,21 @@ impl BillService {
                             &identified.node_id, // company id
                             bill_id,
                             block,
-                            identity_keys,
+                            identity,
                             &CompanyKeys {
                                 private_key: signer_keys.get_private_key(),
                                 public_key: signer_keys.pub_key(),
                             },
                             timestamp,
+                            bill_keys,
                         )
                         .await?;
 
                         self.add_block_to_identity_chain_for_signed_company_bill_action(
                             &identified.node_id, // company id
                             bill_id,
                             block,
-                            identity_keys,
+                            identity,
                             timestamp,
                         )
                         .await?;
@@ -487,10 +490,7 @@ impl BillService {
             // for anon, we only add to our identity chain, since we're no company
             BillParticipant::Anon(_) => {
                 self.add_block_to_identity_chain_for_signed_bill_action(
-                    bill_id,
-                    block,
-                    identity_keys,
-                    timestamp,
+                    bill_id, block, identity, timestamp, bill_keys,
                 )
                 .await?;
             }
@@ -502,8 +502,9 @@ impl BillService {
         &self,
         bill_id: &BillId,
         block: &BillBlock,
-        keys: &BcrKeys,
+        identity: &IdentityWithAll,
         timestamp: u64,
+        bill_keys: Option<BillKeys>,
     ) -> Result<()> {
         let previous_block = self.identity_blockchain_store.get_latest_block().await?;
         let new_block = IdentityBlock::create_block_for_sign_person_bill(
@@ -513,11 +514,19 @@ impl BillService {
                 block_id: block.id,
                 block_hash: block.hash.to_owned(),
                 operation: block.op_code.clone(),
+                bill_key: bill_keys.map(|k| k.private_key.display_secret().to_string()),
             },
-            keys,
+            &identity.key_pair,
             timestamp,
         )?;
         self.identity_blockchain_store.add_block(&new_block).await?;
+        self.notification_service
+            .send_identity_chain_events(IdentityChainEvent::new(
+                &identity.identity,
+                &new_block,
+                &identity.key_pair,
+            ))
+            .await?;
         Ok(())
     }
 
@@ -526,7 +535,7 @@ impl BillService {
         company_id: &NodeId,
         bill_id: &BillId,
         block: &BillBlock,
-        keys: &BcrKeys,
+        identity: &IdentityWithAll,
         timestamp: u64,
     ) -> Result<()> {
         let previous_block = self.identity_blockchain_store.get_latest_block().await?;
@@ -539,10 +548,17 @@ impl BillService {
                 company_id: company_id.to_owned(),
                 operation: block.op_code.clone(),
             },
-            keys,
+            &identity.key_pair,
             timestamp,
         )?;
         self.identity_blockchain_store.add_block(&new_block).await?;
+        self.notification_service
+            .send_identity_chain_events(IdentityChainEvent::new(
+                &identity.identity,
+                &new_block,
+                &identity.key_pair,
+            ))
+            .await?;
         Ok(())
     }
 
@@ -551,9 +567,10 @@ impl BillService {
         company_id: &NodeId,
         bill_id: &BillId,
         block: &BillBlock,
-        signatory_keys: &BcrKeys,
+        signatory_identity: &IdentityWithAll,
         company_keys: &CompanyKeys,
         timestamp: u64,
+        bill_keys: Option<BillKeys>,
     ) -> Result<()> {
         let previous_block = self
             .company_blockchain_store
@@ -567,14 +584,27 @@ impl BillService {
                 block_id: block.id,
                 block_hash: block.hash.to_owned(),
                 operation: block.op_code.clone(),
+                bill_key: bill_keys.map(|k| k.private_key.display_secret().to_string()),
             },
-            signatory_keys,
+            &signatory_identity.key_pair,
             company_keys,
             timestamp,
         )?;
         self.company_blockchain_store
             .add_block(company_id, &new_block)
             .await?;
+
+        let chain = self.company_blockchain_store.get_chain(company_id).await?;
+        let company = self.company_store.get(company_id).await?;
+        self.notification_service
+            .send_company_chain_events(CompanyChainEvent::new(
+                &company,
+                &chain,
+                company_keys,
+                None,
+                true,
+            ))
+            .await?;
         Ok(())
     }
 }

crates/bcr-ebill-api/src/service/bill_service/issue.rs

@@ -223,9 +223,10 @@ impl BillService {
             &data.drawer_public_data.clone(), // drawer is identified
             &bill_id,
             block,
-            &identity.key_pair,
+            &identity,
             &data.drawer_keys,
             data.timestamp,
+            Some(bill_keys.clone()),
         )
         .await?;