small fix in payment logic (#614)

Author: zupzup

crates/bcr-ebill-api/src/external/bitcoin.rs

@@ -257,7 +257,9 @@ fn payment_state_from_transactions(
     for tx in txs.iter().rev() {
         for vout in tx.vout.iter() {
             // sum up outputs towards the address to check
-            if vout.scriptpubkey_address == *address {
+            if let Some(ref addr) = vout.scriptpubkey_address
+                && addr == address
+            {
                 total += vout.value;
             }
         }
@@ -349,7 +351,7 @@ pub struct Tx {
 #[derive(Deserialize, Debug, Clone)]
 pub struct Vout {
     pub value: u64,
-    pub scriptpubkey_address: String,
+    pub scriptpubkey_address: Option<String>,
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -388,7 +390,7 @@ pub mod tests {
             },
             vout: vec![Vout {
                 value: 500,
-                scriptpubkey_address: test_addr.to_owned(),
+                scriptpubkey_address: Some(test_addr.to_owned()),
             }],
         };
 

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

@@ -46,12 +46,13 @@ impl BillService {
         let address_to_pay = self
             .bitcoin_client
             .get_address_to_pay(&bill_keys.public_key, &holder_public_key.pub_key())?;
-        if let Ok(payment_state) = self
+        match self
             .bitcoin_client
             .check_payment_for_address(&address_to_pay, bill.sum)
             .await
         {
-            let should_update = match self
+            Ok(payment_state) => {
+                let should_update = match self
                     .store
                     .get_payment_state(bill_id)
                     .await {
@@ -62,17 +63,21 @@ impl BillService {
                         _ => true
                     };
 
-            if should_update {
-                debug!(
-                    "Updating bill payment state for {bill_id} to {payment_state:?} and invalidating cache"
-                );
-                self.store
-                    .set_payment_state(bill_id, &payment_state)
-                    .await?;
-                // invalidate bill cache, so payment state is updated on next fetch
-                self.store.invalidate_bill_in_cache(bill_id).await?;
+                if should_update {
+                    debug!(
+                        "Updating bill payment state for {bill_id} to {payment_state:?} and invalidating cache"
+                    );
+                    self.store
+                        .set_payment_state(bill_id, &payment_state)
+                        .await?;
+                    // invalidate bill cache, so payment state is updated on next fetch
+                    self.store.invalidate_bill_in_cache(bill_id).await?;
+                }
             }
-        }
+            Err(e) => {
+                log::error!("Error checking payment for {bill_id}: {e}");
+            }
+        };
         Ok(())
     }