Bump Rust snippets SDK dependency to v0.2.9

snippets/rust/Cargo.lock

@@ -428,15 +428,6 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
 
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -467,8 +458,8 @@ dependencies = [
 
 [[package]]
 name = "breez-sdk-core"
-version = "0.2.3"
+version = "0.2.9"
-source = "git+https://github.com/breez/breez-sdk?rev=3486c951e2422fe4ac3978795849f0b7649a9f1e#3486c951e2422fe4ac3978795849f0b7649a9f1e"
+source = "git+https://github.com/breez/breez-sdk?tag=0.2.9#82fdc4f7d2de354fc299cc4fbf8691492d4bc642"
 dependencies = [
  "aes",
  "anyhow",
@@ -481,6 +472,7 @@ dependencies = [
  "ecies",
  "env_logger 0.10.0",
  "flutter_rust_bridge",
+ "futures",
  "gl-client",
  "hex",
  "lazy_static",
@@ -698,16 +690,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "ctr"
 version = "0.9.2"
@@ -811,7 +793,7 @@ version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer 0.10.4",
+ "block-buffer",
  "crypto-common",
  "subtle",
 ]
@@ -835,18 +817,20 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
 
 [[package]]
 name = "ecies"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99640b5549bc868ffda7e9bd98d4998d86ddb7f5fb302f25837be276ba4dfcb4"
+checksum = "53f43496fc04523aa716c5dd76133cb6d7c81eb213375684d06a8b1683f8bc1e"
 dependencies = [
  "aes-gcm",
  "getrandom",
  "hkdf",
  "libsecp256k1",
  "once_cell",
- "rand",
+ "parking_lot",
- "sha2 0.10.7",
+ "rand_core",
+ "sha2",
  "typenum",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -952,9 +936,9 @@ dependencies = [
 
 [[package]]
 name = "flutter_rust_bridge"
-version = "1.75.2"
+version = "1.80.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "934edaa5cab8c8df975c347e08014605775fb6969631b725cf2b962bd0988663"
+checksum = "fd0305ebc9f097d9826530a55fc2acd63222e912c663f7adce3ab641ecc0f346"
 dependencies = [
  "allo-isolate",
  "anyhow",
@@ -1148,7 +1132,7 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 [[package]]
 name = "gl-client"
 version = "0.1.9"
-source = "git+https://github.com/Blockstream/greenlight.git?rev=f91390734fc8a3044812f05ff8d0e102660189bb#f91390734fc8a3044812f05ff8d0e102660189bb"
+source = "git+https://github.com/Blockstream/greenlight.git?rev=c7ff67eb062c021105f5601df3ac8699ecbeb51c#c7ff67eb062c021105f5601df3ac8699ecbeb51c"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1286,17 +1270,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
 dependencies = [
- "hmac 0.12.1",
+ "hmac",
-]
-
-[[package]]
-name = "hmac"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
-dependencies = [
- "crypto-mac",
- "digest 0.9.0",
 ]
 
 [[package]]
@@ -1308,17 +1282,6 @@ dependencies = [
  "digest 0.10.7",
 ]
 
-[[package]]
-name = "hmac-drbg"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
-dependencies = [
- "digest 0.9.0",
- "generic-array",
- "hmac 0.8.1",
-]
-
 [[package]]
 name = "home"
 version = "0.5.5"
@@ -1564,14 +1527,11 @@ dependencies = [
  "arrayref",
  "base64 0.13.1",
  "digest 0.9.0",
- "hmac-drbg",
  "libsecp256k1-core",
  "libsecp256k1-gen-ecmult",
  "libsecp256k1-gen-genmult",
  "rand",
  "serde",
- "sha2 0.9.9",
- "typenum",
 ]
 
 [[package]]
@@ -2671,19 +2631,6 @@ dependencies = [
  "syn 2.0.32",
 ]
 
-[[package]]
-name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
 [[package]]
 name = "sha2"
 version = "0.10.7"
@@ -2704,7 +2651,7 @@ dependencies = [
  "async-trait",
  "bytes",
  "hex",
- "sha2 0.10.7",
+ "sha2",
  "tokio",
 ]
 
@@ -2921,12 +2868,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861"
 dependencies = [
  "anyhow",
- "hmac 0.12.1",
+ "hmac",
  "once_cell",
  "pbkdf2",
  "rand",
  "rustc-hash",
- "sha2 0.10.7",
+ "sha2",
  "thiserror",
  "unicode-normalization",
  "wasm-bindgen",

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 = "3486c951e2422fe4ac3978795849f0b7649a9f1e" }
+breez-sdk-core = { git = "https://github.com/breez/breez-sdk", tag = "0.2.9" }
 log = "0.4"
 tokio = "1.29"

snippets/rust/src/buy_btc.rs

@@ -5,10 +5,11 @@ use breez_sdk_core::*;
 
 async fn buy(sdk: Arc<BreezServices>) -> Result<()> {
     // ANCHOR: buy-btc
-    let res = sdk.buy_bitcoin(
+    let res = sdk
-        BuyBitcoinRequest {
+        .buy_bitcoin(BuyBitcoinRequest {
             provider: BuyBitcoinProvider::Moonpay,
-            opening_fee_params: None})
+            opening_fee_params: None,
+        })
         .await?;
     // ANCHOR_END: buy-btc
 

snippets/rust/src/fiat_currencies.rs

@@ -20,7 +20,9 @@ async fn get_current_rates(sdk: Arc<BreezServices>) -> Result<()> {
     Ok(())
 }
 
-async fn get_fiat_currencies_and_rates(sdk: Arc<BreezServices>) -> Result<Vec<(FiatCurrency, Rate)>> {
+async fn get_fiat_currencies_and_rates(
+    sdk: Arc<BreezServices>,
+) -> Result<Vec<(FiatCurrency, Rate)>> {
     // ANCHOR: get-fiat-currencies-and-rates
     let supported_fiat_currencies = sdk.list_fiat_currencies().await?;
     let fiat_rates = sdk.fetch_fiat_rates().await?;

snippets/rust/src/getting_started.rs

@@ -19,7 +19,7 @@ async fn getting_started() -> Result<Arc<BreezServices>> {
         breez_sdk_core::NodeConfig::Greenlight {
             config: GreenlightNodeConfig {
                 partner_credentials: None,
-                invite_code
+                invite_code,
             },
         },
     );
@@ -28,12 +28,7 @@ async fn getting_started() -> Result<Arc<BreezServices>> {
     config.working_dir = "path to an existing directory".into();
 
     // Connect to the Breez SDK make it ready for use
-    let sdk = BreezServices::connect(
+    let sdk = BreezServices::connect(config, seed.to_vec(), Box::new(AppEventListener {})).await?;
-        config,
-        seed.to_vec(),
-        Box::new(AppEventListener {}),
-    )
-    .await?;
     // ANCHOR_END: init-sdk
 
     Ok(sdk)

snippets/rust/src/list_payments.rs

@@ -5,16 +5,7 @@ use breez_sdk_core::*;
 
 async fn list_payments(sdk: Arc<BreezServices>) -> Result<Vec<Payment>> {
     // ANCHOR: list-payments
-    let payments = sdk.list_payments(
+    let payments = sdk.list_payments(ListPaymentsRequest::default()).await?;
-        ListPaymentsRequest {
-            filter: PaymentTypeFilter::All,
-            from_timestamp: None,
-            to_timestamp: None,
-            include_failures: None,
-            offset: None,
-            limit: None
-        }
-    ).await?;
     // ANCHOR_END: list-payments
 
     Ok(payments)
@@ -22,16 +13,14 @@ 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(
+    let payments = sdk
-        ListPaymentsRequest {
+        .list_payments(ListPaymentsRequest {
-            filter: PaymentTypeFilter::Sent,
+            filters: Some(vec![PaymentTypeFilter::Sent]),
             from_timestamp: Some(1696880000),
-            to_timestamp: None,
             include_failures: Some(true),
-            offset: None,
+            ..Default::default()
-            limit: None
+        })
-        }
+        .await?;
-    ).await?;
     // ANCHOR_END: list-payments-filtered
 
     Ok(payments)

snippets/rust/src/lnurl_auth.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use anyhow::Result;
-use breez_sdk_core::*;
 use breez_sdk_core::InputType::LnUrlAuth;
+use breez_sdk_core::*;
 use log::{error, info};
 
 async fn auth(sdk: Arc<BreezServices>) -> Result<()> {

snippets/rust/src/lnurl_pay.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use anyhow::Result;
-use breez_sdk_core::*;
 use breez_sdk_core::InputType::LnUrlPay;
+use breez_sdk_core::*;
 
 async fn pay(sdk: Arc<BreezServices>) -> Result<()> {
     // ANCHOR: lnurl-pay
@@ -18,8 +18,9 @@ async fn pay(sdk: Arc<BreezServices>) -> Result<()> {
         sdk.lnurl_pay(LnUrlPayRequest {
             data: pd,
             amount_msat,
-            comment: Some(comment)
+            comment: Some(comment),
-        }).await?;
+        })
+        .await?;
     }
     // ANCHOR_END: lnurl-pay
 

snippets/rust/src/lnurl_withdraw.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use anyhow::Result;
-use breez_sdk_core::*;
 use breez_sdk_core::InputType::LnUrlWithdraw;
+use breez_sdk_core::*;
 
 async fn withdraw(sdk: Arc<BreezServices>) -> Result<()> {
     // ANCHOR: lnurl-withdraw
@@ -17,8 +17,9 @@ async fn withdraw(sdk: Arc<BreezServices>) -> Result<()> {
         sdk.lnurl_withdraw(LnUrlWithdrawRequest {
             data: wd,
             amount_msat,
-            description: Some(description)
+            description: Some(description),
-        }).await?;
+        })
+        .await?;
     }
     // ANCHOR_END: lnurl-withdraw
 

snippets/rust/src/main.rs

@@ -1,16 +1,16 @@
-mod getting_started;
+mod buy_btc;
-mod receive_payment;
-mod send_payment;
-mod send_spontaneous_payment;
-mod list_payments;
 mod connecting_lsp;
-mod receive_onchain;
+mod fiat_currencies;
-mod send_onchain;
+mod getting_started;
+mod list_payments;
+mod lnurl_auth;
 mod lnurl_pay;
 mod lnurl_withdraw;
-mod lnurl_auth;
+mod receive_onchain;
-mod fiat_currencies;
+mod receive_payment;
-mod buy_btc;
+mod send_onchain;
+mod send_payment;
+mod send_spontaneous_payment;
 mod static_channel_backup;
 
 use anyhow::Result;

snippets/rust/src/receive_onchain.rs

@@ -5,8 +5,8 @@ use breez_sdk_core::*;
 
 async fn generate_receive_onchain_address(sdk: Arc<BreezServices>) -> Result<()> {
     // ANCHOR: generate-receive-onchain-address
-    let swap_info = sdk.receive_onchain(
+    let swap_info = sdk
-        ReceiveOnchainRequest { opening_fee_params: None } )
+        .receive_onchain(ReceiveOnchainRequest::default())
         .await?;
 
     // Send your funds to the below bitcoin address
@@ -32,7 +32,11 @@ async fn list_refundables(sdk: Arc<BreezServices>) -> Result<()> {
     Ok(())
 }
 
-async fn execute_refund(sdk: Arc<BreezServices>, refund_tx_fee_rate: u32, refundable: SwapInfo) -> Result<()> {
+async fn execute_refund(
+    sdk: Arc<BreezServices>,
+    refund_tx_fee_rate: u32,
+    refundable: SwapInfo,
+) -> Result<()> {
     // ANCHOR: execute-refund
     let destination_address = "...".into();
     let sat_per_vbyte = refund_tx_fee_rate;
@@ -40,8 +44,9 @@ async fn execute_refund(sdk: Arc<BreezServices>, refund_tx_fee_rate: u32, refund
     sdk.refund(RefundRequest {
         to_address: destination_address,
         sat_per_vbyte,
-        swap_address: refundable.bitcoin_address
+        swap_address: refundable.bitcoin_address,
-    }).await?;
+    })
+    .await?;
     // ANCHOR_END: execute-refund
 
     Ok(())
@@ -49,8 +54,11 @@ async fn execute_refund(sdk: Arc<BreezServices>, refund_tx_fee_rate: u32, refund
 
 async fn get_channel_opening_fees(sdk: Arc<BreezServices>, amount_msat: u64) -> Result<()> {
     // ANCHOR: get-channel-opening-fees
-    let channel_fees = sdk.open_channel_fee(
+    let channel_fees = sdk
-        OpenChannelFeeRequest { amount_msat, expiry: None })
+        .open_channel_fee(OpenChannelFeeRequest {
+            amount_msat,
+            expiry: None,
+        })
         .await?;
     // ANCHOR_END: get-channel-opening-fees
 

snippets/rust/src/receive_payment.rs

@@ -5,15 +5,11 @@ use breez_sdk_core::*;
 
 async fn receive_payment(sdk: Arc<BreezServices>) -> Result<()> {
     // ANCHOR: receive-payment
-    let res = sdk.receive_payment(
+    let res = sdk
-        ReceivePaymentRequest {
+        .receive_payment(ReceivePaymentRequest {
             amount_msat: 3_000_000,
             description: "Invoice for 3000 sats".into(),
-            cltv: None,
+            ..Default::default()
-            expiry: None,
-            opening_fee_params: None,
-            preimage: None,
-            use_description_hash: None
         })
         .await?;
     // ANCHOR_END: receive-payment

snippets/rust/src/send_onchain.rs

@@ -6,13 +6,16 @@ use log::info;
 
 async fn get_current_fees(sdk: Arc<BreezServices>) -> Result<()> {
     // ANCHOR: estimate-current-reverse-swap-total-fees
-    let current_fees = sdk.fetch_reverse_swap_fees(
+    let current_fees = sdk
-        ReverseSwapFeesRequest {
+        .fetch_reverse_swap_fees(ReverseSwapFeesRequest {
             send_amount_sat: Some(50_000),
         })
         .await?;
 
-    info!("Total estimated fees for reverse swap: {:?}", current_fees.total_estimated_fees);
+    info!(
+        "Total estimated fees for reverse swap: {:?}",
+        current_fees.total_estimated_fees
+    );
     // ANCHOR_END: estimate-current-reverse-swap-total-fees
 
     Ok(())
@@ -27,7 +30,11 @@ async fn list_current_fees(current_fees: ReverseSwapPairInfo) -> Result<()> {
     Ok(())
 }
 
-async fn start_reverse_swap(sdk: Arc<BreezServices>, current_fees: ReverseSwapPairInfo, fee_rate: u32) -> 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;
@@ -37,8 +44,9 @@ async fn start_reverse_swap(sdk: Arc<BreezServices>, current_fees: ReverseSwapPa
         pair_hash: current_fees.fees_hash,
         amount_sat,
         sat_per_vbyte,
-        onchain_recipient_address: destination_address
+        onchain_recipient_address: destination_address,
-    }).await?;
+    })
+    .await?;
     // ANCHOR_END: start-reverse-swap
 
     Ok(())
@@ -47,7 +55,10 @@ async fn start_reverse_swap(sdk: Arc<BreezServices>, current_fees: ReverseSwapPa
 async fn check_reverse_swap_status(sdk: Arc<BreezServices>) -> Result<()> {
     // ANCHOR: check-reverse-swaps-status
     for rs in sdk.in_progress_reverse_swaps().await? {
-        info!("Reverse swap {} in progress, status is {:?}", rs.id, rs.status);
+        info!(
+            "Reverse swap {} in progress, status is {:?}",
+            rs.id, rs.status
+        );
     }
     // ANCHOR_END: check-reverse-swaps-status
 

snippets/rust/src/send_spontaneous_payment.rs

@@ -9,8 +9,9 @@ async fn send_spontaneous_payment(sdk: Arc<BreezServices>) -> Result<()> {
 
     sdk.send_spontaneous_payment(SendSpontaneousPaymentRequest {
         amount_msat: 3_000_000,
-        node_id
+        node_id,
-    }).await?;
+    })
+    .await?;
     // ANCHOR_END: send-spontaneous-payment
 
     Ok(())