bindings/boltz: use Bolt11Invoice type around

Author: RCasatta

lwk_bindings/src/lightning.rs

@@ -195,15 +195,16 @@ impl PreparePayResponse {
 
 #[uniffi::export]
 impl InvoiceResponse {
-    pub fn bolt11_invoice(&self) -> Result<String, LwkError> {
-        Ok(self
+    pub fn bolt11_invoice(&self) -> Result<Bolt11Invoice, LwkError> {
+        let bolt11_invoice = self
             .inner
             .lock()?
             .as_ref()
             .ok_or_else(|| LwkError::Generic {
                 msg: "This InvoiceResponse already called complete_pay or errored".to_string(),
             })?
-            .bolt11_invoice())
+            .bolt11_invoice();
+        Ok(Bolt11Invoice::from(bolt11_invoice))
     }
 
     pub fn complete_pay(&self) -> Result<bool, LwkError> {

lwk_bindings/tests/bindings/lightning.py

@@ -26,7 +26,8 @@ def log(self, level: LogLevel, message: str):
 lightning_session = LightningSession(network, client, 10, logger)
 
 invoice_response = lightning_session.invoice(1000, "ciao", claim_address)
-bolt11_invoice = invoice_response.bolt11_invoice()
+bolt11_invoice_obj = invoice_response.bolt11_invoice()
+bolt11_invoice = str(bolt11_invoice_obj)
 print(bolt11_invoice)
 assert bolt11_invoice.startswith("lnbc1")
 
@@ -37,7 +38,6 @@ def log(self, level: LogLevel, message: str):
 ## in the real world any invoice generated from a Boltz-enabled wallet will contain a MRH
 try:
     refund_address = wollet.address(3).address()
-    bolt11_invoice_obj = Bolt11Invoice(bolt11_invoice)
     prepare_pay_response = lightning_session.prepare_pay(bolt11_invoice_obj, refund_address)
 except LwkError.MagicRoutingHint as e:
     # Handle the specific MagicRoutingHint error

lwk_boltz/src/blocking.rs

@@ -79,7 +79,7 @@ impl InvoiceResponse {
         Ok(inner)
     }
 
-    pub fn bolt11_invoice(&self) -> String {
+    pub fn bolt11_invoice(&self) -> Bolt11Invoice {
         self.inner.bolt11_invoice.clone()
     }
 }

lwk_boltz/src/reverse.rs

@@ -1,3 +1,4 @@
+use std::str::FromStr;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -12,7 +13,7 @@ use boltz_client::swaps::SwapTransactionParams;
 use boltz_client::swaps::TransactionOptions;
 use boltz_client::util::secrets::Preimage;
 use boltz_client::Secp256k1;
-use boltz_client::{Keypair, PublicKey};
+use boltz_client::{Bolt11Invoice, Keypair, PublicKey};
 use lwk_wollet::elements;
 use lwk_wollet::secp256k1::rand::thread_rng;
 
@@ -23,7 +24,7 @@ pub struct InvoiceResponse {
     pub swap_id: String,
     /// The invoice to show to the payer, the invoice amount will be exactly like the amount parameter,
     /// However, the receiver will receive `amount - fee`
-    pub bolt11_invoice: String,
+    pub bolt11_invoice: Bolt11Invoice,
 
     /// The fee of the swap provider
     pub fee: u64,
@@ -69,16 +70,17 @@ impl LightningSession {
         };
 
         let reverse_resp = self.api.post_reverse_req(create_reverse_req).await?;
-        let invoice = reverse_resp
+        let invoice_str = reverse_resp
             .invoice
             .as_ref()
             .ok_or(Error::MissingInvoiceInResponse(reverse_resp.id.clone()))?
             .clone();
+        let invoice = Bolt11Invoice::from_str(&invoice_str)?;
         let fee = amount.checked_sub(reverse_resp.onchain_amount).ok_or(
             Error::ExpectedAmountLowerThanInvoice(amount, reverse_resp.id.clone()),
         )?;
 
-        let _ = check_for_mrh(&self.api, &invoice, chain).await?.ok_or(
+        let _ = check_for_mrh(&self.api, &invoice_str, chain).await?.ok_or(
             Error::InvoiceWithoutMagicRoutingHint(reverse_resp.id.clone()),
         )?;
 

lwk_boltz/tests/mrh.rs

@@ -46,7 +46,7 @@ mod tests {
         let boltz_api = BoltzApiClientV2::new(utils::BOLTZ_REGTEST.to_string(), Some(TIMEOUT));
         let mrh_result = check_for_mrh(
             &boltz_api,
-            &invoice.bolt11_invoice,
+            &invoice.bolt11_invoice.to_string(),
             Chain::Liquid(LiquidChain::LiquidRegtest),
         )
         .await
@@ -88,7 +88,7 @@ mod tests {
 
         // Sender: Detect MRH in the invoice
         let sender_session = LightningSession::new(network, client.clone(), Some(TIMEOUT));
-        let bolt11_parsed = Bolt11Invoice::from_str(&invoice.bolt11_invoice).unwrap();
+        let bolt11_parsed = invoice.bolt11_invoice.clone();
         let prepare_pay_response = sender_session
             .prepare_pay(&bolt11_parsed, &claim_address)
             .await;

lwk_boltz/tests/reverse.rs

@@ -47,7 +47,7 @@ mod tests {
                 .await;
             match invoice_response {
                 Ok(invoice_response) => {
-                    assert!(invoice_response.bolt11_invoice.starts_with("lnbc1"));
+                    assert!(invoice_response.bolt11_invoice.to_string().starts_with("lnbc1"));
                     return;
                 }
                 Err(e) => {
@@ -125,7 +125,7 @@ mod tests {
         let claim_address = elements::Address::from_str(&claim_address).unwrap();
         let invoice = session.invoice(100000, None, &claim_address).await.unwrap();
         log::info!("Invoice: {}", invoice.bolt11_invoice);
-        utils::start_pay_invoice_lnd(invoice.bolt11_invoice.clone());
+        utils::start_pay_invoice_lnd(invoice.bolt11_invoice.to_string());
         invoice.complete_pay().await.unwrap();
     }