Integrate SDK Request / Response changes

snippets/rust/Cargo.lock

@@ -468,7 +468,7 @@ dependencies = [
 [[package]]
 name = "breez-sdk-core"
 version = "0.2.3"
-source = "git+https://github.com/breez/breez-sdk?branch=main#576c1a892563f867c2b48fceb48f0a49d6efd61e"
+source = "git+https://github.com/breez/breez-sdk?rev=3486c951e2422fe4ac3978795849f0b7649a9f1e#3486c951e2422fe4ac3978795849f0b7649a9f1e"
 dependencies = [
  "aes",
  "anyhow",

snippets/rust/Cargo.toml

@@ -6,6 +6,6 @@ edition = "2021"
 [dependencies]
 anyhow = "1"
 bip39 = { version = "2", features = ["rand"] }
-breez-sdk-core = { git = "https://github.com/breez/breez-sdk", rev = "d6365dc90263f3ad3f65a113fdc016a0bf070d9d" }
+breez-sdk-core = { git = "https://github.com/breez/breez-sdk", rev = "3486c951e2422fe4ac3978795849f0b7649a9f1e" }
 log = "0.4"
 tokio = "1.29"

snippets/rust/src/fiat_currencies.rs

@@ -31,7 +31,7 @@ async fn get_fiat_currencies_and_rates(sdk: Arc<BreezServices>) -> Result<Vec<(F
     }
 
     let mut sorted = supported_fiat_currencies.clone();
-    sorted.sort_by_key(|f| f.info.name);
+    sorted.sort_by_key(|f| f.info.name.clone());
 
     let mut result : Vec<(FiatCurrency, Rate)> = Vec::new();
     for currency in sorted {

snippets/rust/src/getting_started.rs

@@ -41,10 +41,9 @@ async fn getting_started() -> Result<Arc<BreezServices>> {
 
 async fn getting_started_node_info(sdk: Arc<BreezServices>) -> Result<()> {
     // ANCHOR: fetch-balance
-    if let Some(node_state) = sdk.node_info()? {
+    let node_state = sdk.node_info()?;
     let balance_ln = node_state.channels_balance_msat;
     let balance_onchain = node_state.onchain_balance_msat;
-    }
     // ANCHOR_END: fetch-balance
 
     Ok(())

snippets/rust/src/list_payments.rs

@@ -6,11 +6,13 @@ use breez_sdk_core::*;
 async fn list_payments(sdk: Arc<BreezServices>) -> Result<Vec<Payment>> {
     // ANCHOR: list-payments
     let payments = sdk.list_payments(
-        ListPaymentRequest {
+        ListPaymentsRequest {
             filter: PaymentTypeFilter::All,
             from_timestamp: None,
             to_timestamp: None,
             include_failures: None,
+            offset: None,
+            limit: None
         }
     ).await?;
     // ANCHOR_END: list-payments
@@ -21,11 +23,13 @@ async fn list_payments(sdk: Arc<BreezServices>) -> Result<Vec<Payment>> {
 async fn list_payments_filtered(sdk: Arc<BreezServices>) -> Result<Vec<Payment>> {
     // ANCHOR: list-payments-filtered
     let payments = sdk.list_payments(
-        ListPaymentRequest {
+        ListPaymentsRequest {
             filter: PaymentTypeFilter::Sent,
-            from_timestamp: 1696880000,
+            from_timestamp: Some(1696880000),
             to_timestamp: None,
-            include_failures: true,
+            include_failures: Some(true),
+            offset: None,
+            limit: None
         }
     ).await?;
     // ANCHOR_END: list-payments-filtered

snippets/rust/src/lnurl_pay.rs

@@ -12,11 +12,14 @@ async fn pay(sdk: Arc<BreezServices>) -> Result<()> {
     let lnurl_pay_url = "lightning@address.com";
 
     if let Ok(LnUrlPay{data: pd}) = parse(lnurl_pay_url).await {
-        // TODO Show payment details in UI, read user input
         let amount_msat = pd.min_sendable;
         let comment = "Test payment".to_string();
 
-        sdk.lnurl_pay(amount_msat, Some(comment), pd).await?;
+        sdk.lnurl_pay(LnUrlPayRequest {
+            data: pd,
+            amount_msat,
+            comment: Some(comment)
+        }).await?;
     }
     // ANCHOR_END: lnurl-pay
 

snippets/rust/src/lnurl_withdraw.rs

@@ -2,6 +2,7 @@ use std::sync::Arc;
 
 use anyhow::Result;
 use breez_sdk_core::*;
+use breez_sdk_core::InputType::LnUrlWithdraw;
 
 async fn withdraw(sdk: Arc<BreezServices>) -> Result<()> {
     // ANCHOR: lnurl-withdraw
@@ -13,7 +14,11 @@ async fn withdraw(sdk: Arc<BreezServices>) -> Result<()> {
         let amount_msat = wd.min_withdrawable;
         let description = "Test withdraw".to_string();
 
-        sdk.lnurl_withdraw(wd, amount_msat, Some(description)).await?;
+        sdk.lnurl_withdraw(LnUrlWithdrawRequest {
+            data: wd,
+            amount_msat,
+            description: Some(description)
+        }).await?;
     }
     // ANCHOR_END: lnurl-withdraw
 

snippets/rust/src/receive_onchain.rs

@@ -36,7 +36,12 @@ async fn execute_refund(sdk: Arc<BreezServices>, refund_tx_fee_rate: u32, refund
     // ANCHOR: execute-refund
     let destination_address = "...".into();
     let sat_per_vbyte = refund_tx_fee_rate;
-    sdk.refund(refundable.bitcoin_address, destination_address, sat_per_vbyte).await?;
+
+    sdk.refund(RefundRequest {
+        to_address: destination_address,
+        sat_per_vbyte,
+        swap_address: refundable.bitcoin_address
+    }).await?;
     // ANCHOR_END: execute-refund
 
     Ok(())

snippets/rust/src/receive_payment.rs

@@ -7,7 +7,7 @@ async fn receive_payment(sdk: Arc<BreezServices>) -> Result<()> {
     // ANCHOR: receive-payment
     let res = sdk.receive_payment(
         ReceivePaymentRequest {
-            amount_sats: 3000,
+            amount_msat: 3_000_000,
             description: "Invoice for 3000 sats".into(),
             cltv: None,
             expiry: None,

snippets/rust/src/send_onchain.rs

@@ -18,7 +18,7 @@ async fn get_current_fees(sdk: Arc<BreezServices>) -> Result<()> {
     Ok(())
 }
 
-async fn list_current_fees(sdk: Arc<BreezServices>, current_fees: ReverseSwapPairInfo) -> Result<()> {
+async fn list_current_fees(current_fees: ReverseSwapPairInfo) -> Result<()> {
     // ANCHOR: get-current-reverse-swap-min-max
     info!("Minimum amount, in sats: {}", current_fees.min);
     info!("Maximum amount, in sats: {}", current_fees.max);
@@ -27,14 +27,19 @@ async fn list_current_fees(sdk: Arc<BreezServices>, current_fees: ReverseSwapPai
     Ok(())
 }
 
-async fn start_reverse_swap(sdk: Arc<BreezServices>, current_fees: ReverseSwapPairInfo, fee_rate: u64) -> Result<()> {
+async fn start_reverse_swap(sdk: Arc<BreezServices>, current_fees: ReverseSwapPairInfo, fee_rate: u32) -> Result<()> {
     // ANCHOR: start-reverse-swap
     let destination_address = String::from("bc1..");
     let amount_sat = current_fees.min;
-    let satPerVbyte = fee_rate;
+    let sat_per_vbyte = fee_rate;
-    // ANCHOR_END: start-reverse-swap
 
-    sdk.send_onchain(amount_sat, destination_address, current_fees.fees_hash, satPerVbyte).await?;
+    sdk.send_onchain(SendOnchainRequest {
+        pair_hash: current_fees.fees_hash,
+        amount_sat,
+        sat_per_vbyte,
+        onchain_recipient_address: destination_address
+    }).await?;
+    // ANCHOR_END: start-reverse-swap
 
     Ok(())
 }

snippets/rust/src/send_payment.rs

@@ -5,8 +5,12 @@ use breez_sdk_core::*;
 
 async fn send_payment(sdk: Arc<BreezServices>) -> Result<()> {
     // ANCHOR: send-payment
-    let bolt11 = "...";
+    let bolt11 = "...".into();
-    sdk.send_payment(bolt11.into(), None).await?;
+
+    sdk.send_payment(SendPaymentRequest {
+        bolt11,
+        amount_msat: None
+    }).await?;
     // ANCHOR_END: send-payment
 
     Ok(())

snippets/rust/src/send_spontaneous_payment.rs

@@ -5,8 +5,12 @@ use breez_sdk_core::*;
 
 async fn send_spontaneous_payment(sdk: Arc<BreezServices>) -> Result<()> {
     // ANCHOR: send-spontaneous-payment
-    let node_id = "...";
+    let node_id = "...".into();
-    sdk.send_spontaneous_payment(node_id.into(), 3000).await?;
+
+    sdk.send_spontaneous_payment(SendSpontaneousPaymentRequest {
+        amount_msat: 3_000_000,
+        node_id
+    }).await?;
     // ANCHOR_END: send-spontaneous-payment
 
     Ok(())