Merge branch 'main' into ln-version-bump

README.md

@@ -75,9 +75,8 @@ See the instructions in each sub project readme on how to build, test and run.
 - [x] C# bindings 
 - [x] Python bindings 
 - [x] Spend all funds
-- [ ] Webhook for receiving payments
-- [ ] Mobile Notifications
-- [ ] Offline receive via notifications
+- [x] Webhook for receiving payments
+- [x] Offline receive via notifications
 - [ ] LSPS2 support 
 - [ ] LSPS1 support
 - [ ] Send/receive bolt12

libs/Cargo.toml

@@ -13,7 +13,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.2.10"
+version = "0.2.12"
 
 [workspace.dependencies]
 uniffi = "0.23.0"

libs/sdk-bindings/Cargo.toml

@@ -26,7 +26,7 @@ camino = "1.1.1"
 lightning-invoice = "*"
 log = "*"
 once_cell = "*"
-flutter_rust_bridge = "=1.82.4"
+flutter_rust_bridge = "=1.82.6"
 tiny-bip39 = "*"
 tonic = { version = "^0.8", features = [
     "tls",

libs/sdk-core/Cargo.toml

@@ -8,7 +8,7 @@ name = "breez_sdk_core"
 crate-type = ["staticlib", "cdylib", "lib"]
 
 [dependencies]
-flutter_rust_bridge = "=1.82.4"
+flutter_rust_bridge = "=1.82.6"
 aes = "0.8"
 anyhow = { version = "1.0", features = ["backtrace"] }
 cbc = { version = "0.1", features = ["std"] }

libs/sdk-core/src/bridge_generated.rs

@@ -9,7 +9,7 @@
     clippy::too_many_arguments
 )]
 // AUTO GENERATED FILE, DO NOT EDIT.
-// Generated by `flutter_rust_bridge`@ 1.82.4.
+// Generated by `flutter_rust_bridge`@ 1.82.6.
 
 use crate::binding::*;
 use core::panic::UnwindSafe;
@@ -2138,4 +2138,4 @@ support::lazy_static! {
 #[path = "bridge_generated.io.rs"]
 mod io;
 #[cfg(not(target_family = "wasm"))]
-pub use io::*;
+pub use self::io::*;

libs/sdk-flutter/ios/Classes/bridge_generated.h

@@ -91,9 +91,20 @@ typedef struct wire_SendPaymentRequest {
   uint64_t *amount_msat;
 } wire_SendPaymentRequest;
 
+typedef struct wire_TlvEntry {
+  uint64_t field_number;
+  struct wire_uint_8_list *value;
+} wire_TlvEntry;
+
+typedef struct wire_list_tlv_entry {
+  struct wire_TlvEntry *ptr;
+  int32_t len;
+} wire_list_tlv_entry;
+
 typedef struct wire_SendSpontaneousPaymentRequest {
   struct wire_uint_8_list *node_id;
   uint64_t amount_msat;
+  struct wire_list_tlv_entry *extra_tlvs;
 } wire_SendSpontaneousPaymentRequest;
 
 typedef struct wire_OpeningFeeParams {
@@ -186,15 +197,15 @@ typedef struct wire_BuyBitcoinRequest {
   struct wire_OpeningFeeParams *opening_fee_params;
 } wire_BuyBitcoinRequest;
 
-typedef struct wire_SweepRequest {
+typedef struct wire_RedeemOnchainFundsRequest {
   struct wire_uint_8_list *to_address;
   uint32_t sat_per_vbyte;
-} wire_SweepRequest;
+} wire_RedeemOnchainFundsRequest;
 
-typedef struct wire_PrepareSweepRequest {
+typedef struct wire_PrepareRedeemOnchainFundsRequest {
   struct wire_uint_8_list *to_address;
-  uint64_t sat_per_vbyte;
-} wire_PrepareSweepRequest;
+  uint32_t sat_per_vbyte;
+} wire_PrepareRedeemOnchainFundsRequest;
 
 typedef struct wire_PrepareRefundRequest {
   struct wire_uint_8_list *swap_address;
@@ -312,9 +323,10 @@ void wire_receive_onchain(int64_t port_, struct wire_ReceiveOnchainRequest *req)
 
 void wire_buy_bitcoin(int64_t port_, struct wire_BuyBitcoinRequest *req);
 
-void wire_sweep(int64_t port_, struct wire_SweepRequest *req);
+void wire_redeem_onchain_funds(int64_t port_, struct wire_RedeemOnchainFundsRequest *req);
 
-void wire_prepare_sweep(int64_t port_, struct wire_PrepareSweepRequest *req);
+void wire_prepare_redeem_onchain_funds(int64_t port_,
+                                       struct wire_PrepareRedeemOnchainFundsRequest *req);
 
 void wire_list_refundables(int64_t port_);
 
@@ -362,14 +374,16 @@ struct wire_OpenChannelFeeRequest *new_box_autoadd_open_channel_fee_request_0(vo
 
 struct wire_OpeningFeeParams *new_box_autoadd_opening_fee_params_0(void);
 
-struct wire_PrepareRefundRequest *new_box_autoadd_prepare_refund_request_0(void);
+struct wire_PrepareRedeemOnchainFundsRequest *new_box_autoadd_prepare_redeem_onchain_funds_request_0(void);
 
-struct wire_PrepareSweepRequest *new_box_autoadd_prepare_sweep_request_0(void);
+struct wire_PrepareRefundRequest *new_box_autoadd_prepare_refund_request_0(void);
 
 struct wire_ReceiveOnchainRequest *new_box_autoadd_receive_onchain_request_0(void);
 
 struct wire_ReceivePaymentRequest *new_box_autoadd_receive_payment_request_0(void);
 
+struct wire_RedeemOnchainFundsRequest *new_box_autoadd_redeem_onchain_funds_request_0(void);
+
 struct wire_RefundRequest *new_box_autoadd_refund_request_0(void);
 
 struct wire_ReportIssueRequest *new_box_autoadd_report_issue_request_0(void);
@@ -388,14 +402,14 @@ struct wire_SignMessageRequest *new_box_autoadd_sign_message_request_0(void);
 
 struct wire_StaticBackupRequest *new_box_autoadd_static_backup_request_0(void);
 
-struct wire_SweepRequest *new_box_autoadd_sweep_request_0(void);
-
 uint32_t *new_box_autoadd_u32_0(uint32_t value);
 
 uint64_t *new_box_autoadd_u64_0(uint64_t value);
 
 struct wire_list_payment_type_filter *new_list_payment_type_filter_0(int32_t len);
 
+struct wire_list_tlv_entry *new_list_tlv_entry_0(int32_t len);
+
 struct wire_uint_8_list *new_uint_8_list_0(int32_t len);
 
 union NodeConfigKind *inflate_NodeConfig_Greenlight(void);
@@ -446,8 +460,8 @@ static int64_t dummy_method_to_enforce_bundling(void) {
     dummy_var ^= ((int64_t) (void*) wire_send_onchain);
     dummy_var ^= ((int64_t) (void*) wire_receive_onchain);
     dummy_var ^= ((int64_t) (void*) wire_buy_bitcoin);
-    dummy_var ^= ((int64_t) (void*) wire_sweep);
-    dummy_var ^= ((int64_t) (void*) wire_prepare_sweep);
+    dummy_var ^= ((int64_t) (void*) wire_redeem_onchain_funds);
+    dummy_var ^= ((int64_t) (void*) wire_prepare_redeem_onchain_funds);
     dummy_var ^= ((int64_t) (void*) wire_list_refundables);
     dummy_var ^= ((int64_t) (void*) wire_prepare_refund);
     dummy_var ^= ((int64_t) (void*) wire_refund);
@@ -471,10 +485,11 @@ static int64_t dummy_method_to_enforce_bundling(void) {
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_node_config_0);
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_open_channel_fee_request_0);
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_opening_fee_params_0);
+    dummy_var ^= ((int64_t) (void*) new_box_autoadd_prepare_redeem_onchain_funds_request_0);
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_prepare_refund_request_0);
-    dummy_var ^= ((int64_t) (void*) new_box_autoadd_prepare_sweep_request_0);
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_receive_onchain_request_0);
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_receive_payment_request_0);
+    dummy_var ^= ((int64_t) (void*) new_box_autoadd_redeem_onchain_funds_request_0);
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_refund_request_0);
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_report_issue_request_0);
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_report_payment_failure_details_0);
@@ -484,10 +499,10 @@ static int64_t dummy_method_to_enforce_bundling(void) {
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_send_spontaneous_payment_request_0);
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_sign_message_request_0);
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_static_backup_request_0);
-    dummy_var ^= ((int64_t) (void*) new_box_autoadd_sweep_request_0);
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_u32_0);
     dummy_var ^= ((int64_t) (void*) new_box_autoadd_u64_0);
     dummy_var ^= ((int64_t) (void*) new_list_payment_type_filter_0);
+    dummy_var ^= ((int64_t) (void*) new_list_tlv_entry_0);
     dummy_var ^= ((int64_t) (void*) new_uint_8_list_0);
     dummy_var ^= ((int64_t) (void*) inflate_NodeConfig_Greenlight);
     dummy_var ^= ((int64_t) (void*) inflate_ReportIssueRequest_PaymentFailure);

libs/sdk-flutter/ios/breez_sdk.podspec

@@ -2,7 +2,7 @@
 # Run `pod lib lint breez_sdk.podspec` to validate before publishing.
 Pod::Spec.new do |s|
   s.name             = 'breez_sdk'
-  s.version          = '0.2.10'
+  s.version          = '0.2.12'
   s.summary          = 'BreezSDK flutter plugin.'
   s.description      = <<-DESC
   BreezSDK flutter plugin.

libs/sdk-flutter/ios/breez_sdk.podspec.production

@@ -2,7 +2,7 @@
 # Run `pod lib lint breez_sdk.podspec` to validate before publishing.
 Pod::Spec.new do |s|
   s.name             = 'breez_sdk'
-  s.version          = '0.2.10'
+  s.version          = '0.2.12'
   s.summary          = 'BreezSDK flutter plugin.'
   s.description      = <<-DESC
   BreezSDK flutter plugin.
@@ -20,5 +20,5 @@ Pod::Spec.new do |s|
   # Flutter.framework does not contain a i386 slice.
   s.pod_target_xcconfig = {'STRIP_STYLE' => 'non-global', 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
   s.swift_version = '5.0'
-  s.dependency "breez_sdkFFI", "0.2.10"
+  s.dependency "breez_sdkFFI", "0.2.12"
 end

libs/sdk-flutter/lib/bridge_generated.dart

@@ -1,5 +1,5 @@
 // AUTO GENERATED FILE, DO NOT EDIT.
-// Generated by `flutter_rust_bridge`@ 1.82.4.
+// Generated by `flutter_rust_bridge`@ 1.82.6.
 // ignore_for_file: non_constant_identifier_names, unused_element, duplicate_ignore, directives_ordering, curly_braces_in_flow_control_structures, unnecessary_lambdas, slash_for_doc_comments, prefer_const_literals_to_create_immutables, implicit_dynamic_list_literal, duplicate_import, unused_import, unnecessary_import, prefer_single_quotes, prefer_const_constructors, use_super_parameters, always_use_package_imports, annotate_overrides, invalid_use_of_protected_member, constant_identifier_names, invalid_use_of_internal_member, prefer_is_empty, unnecessary_const
 
 import 'dart:convert';