implement find and sync bill from dht (#380)

Author: zupzup

src/dht/client.rs

@@ -869,16 +869,20 @@ impl Client {
     pub async fn receive_updates_for_all_bills_topics(&mut self) -> Result<()> {
         let bill_ids = self.bill_store.get_ids().await?;
 
-        for bill in bill_ids {
-            let event =
-                GossipsubEvent::new(GossipsubEventId::CommandGetBillBlockchain, vec![0; 24]);
-            let message = event.to_byte_array()?;
-
-            self.add_message_to_bill_topic(message, &bill).await?;
+        for bill_id in bill_ids {
+            self.receive_updates_for_bill_topic(&bill_id).await?;
         }
         Ok(())
     }
 
+    pub async fn receive_updates_for_bill_topic(&mut self, bill_id: &str) -> Result<()> {
+        let event = GossipsubEvent::new(GossipsubEventId::CommandGetBillBlockchain, vec![0; 24]);
+        let message = event.to_byte_array()?;
+
+        self.add_message_to_bill_topic(message, bill_id).await?;
+        Ok(())
+    }
+
     // -------------------------------------------------------------
     // Utility Functions for the DHT -------------------------------
     // -------------------------------------------------------------

src/dht/event_loop.rs

@@ -342,6 +342,7 @@ impl EventLoop {
                                         if let Ok(mut local_chain) =
                                             self.bill_blockchain_store.get_chain(bill_id).await
                                         {
+                                            info!("Received blockchain for bill: {bill_id} from peer: {node_id}, local block height: {}, remote block height: {}", local_chain.block_height(), remote_chain.block_height());
                                             let blocks_to_add = local_chain
                                                 .get_blocks_to_add_from_other_chain(&remote_chain);
                                             for block in blocks_to_add {

src/service/bill_service.rs

@@ -306,13 +306,8 @@ pub trait BillServiceApi: Send + Sync {
     /// Gets the bill for the given bill id
     async fn get_bill(&self, bill_id: &str) -> Result<BitcreditBill>;
 
-    /// Try to get the given bill from the dht and saves it locally, if found
-    async fn find_bill_in_dht(
-        &self,
-        bill_id: &str,
-        caller_public_data: &IdentityPublicData,
-        caller_keys: &BcrKeys,
-    ) -> Result<()>;
+    /// Try to get the given bill chain from the dht and sync the blocks, if found
+    async fn find_and_sync_with_bill_in_dht(&self, bill_id: &str) -> Result<()>;
 
     /// Gets the keys for a given bill
     async fn get_bill_keys(&self, bill_id: &str) -> Result<BillKeys>;
@@ -1930,20 +1925,12 @@ impl BillServiceApi for BillService {
         Ok(bill)
     }
 
-    async fn find_bill_in_dht(
-        &self,
-        bill_id: &str,
-        caller_public_data: &IdentityPublicData,
-        caller_keys: &BcrKeys,
-    ) -> Result<()> {
-        self.client
-            .clone()
-            .get_bill_data_from_the_network(
-                bill_id,
-                &caller_public_data.node_id,
-                &caller_keys.get_private_key_string(),
-            )
-            .await?;
+    async fn find_and_sync_with_bill_in_dht(&self, bill_id: &str) -> Result<()> {
+        if !self.store.exists(bill_id).await {
+            return Err(Error::NotFound);
+        }
+        let mut dht_client = self.client.clone();
+        dht_client.receive_updates_for_bill_topic(bill_id).await?;
         Ok(())
     }
 

src/web/handlers/bill.rs

@@ -249,15 +249,14 @@ pub async fn numbers_to_words_for_sum(
 }
 
 #[get("/dht/<bill_id>")]
-pub async fn find_bill_in_dht(
+pub async fn find_and_sync_with_bill_in_dht(
     _identity: IdentityCheck,
     state: &State<ServiceContext>,
     bill_id: &str,
 ) -> Result<Status> {
-    let (caller_public_data, caller_keys) = get_signer_public_data_and_keys(state).await?;
     state
         .bill_service
-        .find_bill_in_dht(bill_id, &caller_public_data, &caller_keys)
+        .find_and_sync_with_bill_in_dht(bill_id)
         .await?;
     Ok(Status::Ok)
 }

src/web/mod.rs

@@ -145,7 +145,7 @@ pub fn rocket_main(context: ServiceContext) -> Rocket<Build> {
                 handlers::bill::check_payment,
                 handlers::bill::bitcoin_key,
                 handlers::bill::numbers_to_words_for_sum,
-                handlers::bill::find_bill_in_dht,
+                handlers::bill::find_and_sync_with_bill_in_dht,
                 handlers::bill::check_dht_for_bills,
                 handlers::bill::holder,
                 handlers::bill::search,