Update flutter_rust_bridge to 2.0.0-dev.33 & generate bindings

libs/sdk-bindings/Cargo.toml

@@ -25,7 +25,7 @@ uniffi-kotlin-multiplatform = { git = "https://gitlab.com/trixnity/uniffi-kotlin
 camino = "1.1.1"
 log = "*"
 once_cell = "*"
-flutter_rust_bridge = "2.0.0-dev.32"
+flutter_rust_bridge = "2.0.0-dev.33"
 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 = "2.0.0-dev.32"
+flutter_rust_bridge = "=2.0.0-dev.33"
 aes = "0.8"
 anyhow = { version = "1.0.79", features = ["backtrace"] }
 cbc = { version = "0.1", features = ["std"] }

libs/sdk-core/src/frb_generated.io.rs

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.
+// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33.
 
 // Section: imports
 
@@ -1000,6 +1000,7 @@ impl CstDecode<crate::models::LnPaymentDetails> for wire_cst_ln_payment_details
             open_channel_bolt11: self.open_channel_bolt11.cst_decode(),
             lnurl_success_action: self.lnurl_success_action.cst_decode(),
             lnurl_pay_domain: self.lnurl_pay_domain.cst_decode(),
+            lnurl_pay_comment: self.lnurl_pay_comment.cst_decode(),
             ln_address: self.ln_address.cst_decode(),
             lnurl_metadata: self.lnurl_metadata.cst_decode(),
             lnurl_withdraw_endpoint: self.lnurl_withdraw_endpoint.cst_decode(),
@@ -1399,6 +1400,7 @@ impl CstDecode<crate::breez_services::PaymentFailedData> for wire_cst_payment_fa
             error: self.error.cst_decode(),
             node_id: self.node_id.cst_decode(),
             invoice: self.invoice.cst_decode(),
+            label: self.label.cst_decode(),
         }
     }
 }
@@ -2170,6 +2172,7 @@ impl NewWithNullPtr for wire_cst_ln_payment_details {
             open_channel_bolt11: core::ptr::null_mut(),
             lnurl_success_action: core::ptr::null_mut(),
             lnurl_pay_domain: core::ptr::null_mut(),
+            lnurl_pay_comment: core::ptr::null_mut(),
             ln_address: core::ptr::null_mut(),
             lnurl_metadata: core::ptr::null_mut(),
             lnurl_withdraw_endpoint: core::ptr::null_mut(),
@@ -2634,6 +2637,7 @@ impl NewWithNullPtr for wire_cst_payment_failed_data {
             error: core::ptr::null_mut(),
             node_id: core::ptr::null_mut(),
             invoice: core::ptr::null_mut(),
+            label: core::ptr::null_mut(),
         }
     }
 }
@@ -4646,6 +4650,7 @@ pub struct wire_cst_ln_payment_details {
     open_channel_bolt11: *mut wire_cst_list_prim_u_8_strict,
     lnurl_success_action: *mut wire_cst_success_action_processed,
     lnurl_pay_domain: *mut wire_cst_list_prim_u_8_strict,
+    lnurl_pay_comment: *mut wire_cst_list_prim_u_8_strict,
     ln_address: *mut wire_cst_list_prim_u_8_strict,
     lnurl_metadata: *mut wire_cst_list_prim_u_8_strict,
     lnurl_withdraw_endpoint: *mut wire_cst_list_prim_u_8_strict,
@@ -4976,6 +4981,7 @@ pub struct wire_cst_payment_failed_data {
     error: *mut wire_cst_list_prim_u_8_strict,
     node_id: *mut wire_cst_list_prim_u_8_strict,
     invoice: *mut wire_cst_ln_invoice,
+    label: *mut wire_cst_list_prim_u_8_strict,
 }
 #[repr(C)]
 #[derive(Clone, Copy)]

libs/sdk-core/src/frb_generated.rs

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.
+// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33.
 
 #![allow(
     non_camel_case_types,
@@ -30,7 +30,7 @@ flutter_rust_bridge::frb_generated_boilerplate!(
     default_rust_opaque = RustOpaqueNom,
     default_rust_auto_opaque = RustAutoOpaqueNom,
 );
-pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.32";
+pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.33";
 pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = -924313952;
 
 // Section: executor
@@ -1869,6 +1869,7 @@ impl SseDecode for crate::models::LnPaymentDetails {
         let mut var_lnurlSuccessAction =
             <Option<crate::lnurl::pay::model::SuccessActionProcessed>>::sse_decode(deserializer);
         let mut var_lnurlPayDomain = <Option<String>>::sse_decode(deserializer);
+        let mut var_lnurlPayComment = <Option<String>>::sse_decode(deserializer);
         let mut var_lnAddress = <Option<String>>::sse_decode(deserializer);
         let mut var_lnurlMetadata = <Option<String>>::sse_decode(deserializer);
         let mut var_lnurlWithdrawEndpoint = <Option<String>>::sse_decode(deserializer);
@@ -1886,6 +1887,7 @@ impl SseDecode for crate::models::LnPaymentDetails {
             open_channel_bolt11: var_openChannelBolt11,
             lnurl_success_action: var_lnurlSuccessAction,
             lnurl_pay_domain: var_lnurlPayDomain,
+            lnurl_pay_comment: var_lnurlPayComment,
             ln_address: var_lnAddress,
             lnurl_metadata: var_lnurlMetadata,
             lnurl_withdraw_endpoint: var_lnurlWithdrawEndpoint,
@@ -2676,10 +2678,12 @@ impl SseDecode for crate::breez_services::PaymentFailedData {
         let mut var_error = <String>::sse_decode(deserializer);
         let mut var_nodeId = <String>::sse_decode(deserializer);
         let mut var_invoice = <Option<crate::invoice::LNInvoice>>::sse_decode(deserializer);
+        let mut var_label = <Option<String>>::sse_decode(deserializer);
         return crate::breez_services::PaymentFailedData {
             error: var_error,
             node_id: var_nodeId,
             invoice: var_invoice,
+            label: var_label,
         };
     }
 }
@@ -4005,6 +4009,7 @@ impl flutter_rust_bridge::IntoDart for crate::models::LnPaymentDetails {
             self.open_channel_bolt11.into_into_dart().into_dart(),
             self.lnurl_success_action.into_into_dart().into_dart(),
             self.lnurl_pay_domain.into_into_dart().into_dart(),
+            self.lnurl_pay_comment.into_into_dart().into_dart(),
             self.ln_address.into_into_dart().into_dart(),
             self.lnurl_metadata.into_into_dart().into_dart(),
             self.lnurl_withdraw_endpoint.into_into_dart().into_dart(),
@@ -4702,6 +4707,7 @@ impl flutter_rust_bridge::IntoDart for crate::breez_services::PaymentFailedData
             self.error.into_into_dart().into_dart(),
             self.node_id.into_into_dart().into_dart(),
             self.invoice.into_into_dart().into_dart(),
+            self.label.into_into_dart().into_dart(),
         ]
         .into_dart()
     }
@@ -6219,6 +6225,7 @@ impl SseEncode for crate::models::LnPaymentDetails {
             serializer,
         );
         <Option<String>>::sse_encode(self.lnurl_pay_domain, serializer);
+        <Option<String>>::sse_encode(self.lnurl_pay_comment, serializer);
         <Option<String>>::sse_encode(self.ln_address, serializer);
         <Option<String>>::sse_encode(self.lnurl_metadata, serializer);
         <Option<String>>::sse_encode(self.lnurl_withdraw_endpoint, serializer);
@@ -6807,6 +6814,7 @@ impl SseEncode for crate::breez_services::PaymentFailedData {
         <String>::sse_encode(self.error, serializer);
         <String>::sse_encode(self.node_id, serializer);
         <Option<crate::invoice::LNInvoice>>::sse_encode(self.invoice, serializer);
+        <Option<String>>::sse_encode(self.label, serializer);
     }
 }
 

libs/sdk-flutter/README.md

@@ -26,7 +26,7 @@ cargo install cargo-ndk
 ```
 * Install [flutter_rust_bridge](https://github.com/fzyzcjy/flutter_rust_bridge): 
 ```
-cargo install flutter_rust_bridge_codegen --version 2.0.0-dev.32
+cargo install flutter_rust_bridge_codegen --version 2.0.0-dev.33
 ```
 
 ## Building the plugin

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

@@ -407,6 +407,7 @@ typedef struct wire_cst_ln_payment_details {
   struct wire_cst_list_prim_u_8_strict *open_channel_bolt11;
   struct wire_cst_success_action_processed *lnurl_success_action;
   struct wire_cst_list_prim_u_8_strict *lnurl_pay_domain;
+  struct wire_cst_list_prim_u_8_strict *lnurl_pay_comment;
   struct wire_cst_list_prim_u_8_strict *ln_address;
   struct wire_cst_list_prim_u_8_strict *lnurl_metadata;
   struct wire_cst_list_prim_u_8_strict *lnurl_withdraw_endpoint;
@@ -549,11 +550,12 @@ typedef struct wire_cst_payment_failed_data {
   struct wire_cst_list_prim_u_8_strict *error;
   struct wire_cst_list_prim_u_8_strict *node_id;
   struct wire_cst_ln_invoice *invoice;
+  struct wire_cst_list_prim_u_8_strict *label;
 } wire_cst_payment_failed_data;
 
 typedef struct wire_cst_symbol {
   struct wire_cst_list_prim_u_8_strict *grapheme;
-  struct wire_cst_list_prim_u_8_strict *template;
+  struct wire_cst_list_prim_u_8_strict *template_;
   bool *rtl;
   uint32_t *position;
 } wire_cst_symbol;

libs/sdk-flutter/lib/generated/binding.dart

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.
+// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 

libs/sdk-flutter/lib/generated/breez_services.dart

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.
+// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 
@@ -147,15 +147,17 @@ class PaymentFailedData {
   final String error;
   final String nodeId;
   final LNInvoice? invoice;
+  final String? label;
 
   const PaymentFailedData({
     required this.error,
     required this.nodeId,
     this.invoice,
+    this.label,
   });
 
   @override
-  int get hashCode => error.hashCode ^ nodeId.hashCode ^ invoice.hashCode;
+  int get hashCode => error.hashCode ^ nodeId.hashCode ^ invoice.hashCode ^ label.hashCode;
 
   @override
   bool operator ==(Object other) =>
@@ -164,7 +166,8 @@ class PaymentFailedData {
           runtimeType == other.runtimeType &&
           error == other.error &&
           nodeId == other.nodeId &&
-          invoice == other.invoice;
+          invoice == other.invoice &&
+          label == other.label;
 }
 
 /// Request to sign a message with the node's private key.

libs/sdk-flutter/lib/generated/chain.dart

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.
+// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 

libs/sdk-flutter/lib/generated/fiat.dart

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.
+// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 

libs/sdk-flutter/lib/generated/frb_generated.dart

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.
+// Generated by `flutter_rust_bridge`@ 2.0.0-dev.33.
 
 // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field
 
@@ -58,7 +58,7 @@ class BreezSdkBindings
   ExternalLibraryLoaderConfig get defaultExternalLibraryLoaderConfig => kDefaultExternalLibraryLoaderConfig;
 
   @override
-  String get codegenVersion => '2.0.0-dev.32';
+  String get codegenVersion => '2.0.0-dev.33';
 
   @override
   int get rustContentHash => -924313952;
@@ -2441,7 +2441,7 @@ class BreezSdkBindingsApiImpl extends BreezSdkBindingsApiImplPlatform implements
   LnPaymentDetails dco_decode_ln_payment_details(dynamic raw) {
     // Codec=Dco (DartCObject based), see doc to use other codecs
     final arr = raw as List<dynamic>;
-    if (arr.length != 15) throw Exception('unexpected arr length: expect 15 but see ${arr.length}');
+    if (arr.length != 16) throw Exception('unexpected arr length: expect 16 but see ${arr.length}');
     return LnPaymentDetails(
       paymentHash: dco_decode_String(arr[0]),
       label: dco_decode_String(arr[1]),
@@ -2452,12 +2452,13 @@ class BreezSdkBindingsApiImpl extends BreezSdkBindingsApiImplPlatform implements
       openChannelBolt11: dco_decode_opt_String(arr[6]),
       lnurlSuccessAction: dco_decode_opt_box_autoadd_success_action_processed(arr[7]),
       lnurlPayDomain: dco_decode_opt_String(arr[8]),
-      lnAddress: dco_decode_opt_String(arr[9]),
-      lnurlMetadata: dco_decode_opt_String(arr[10]),
-      lnurlWithdrawEndpoint: dco_decode_opt_String(arr[11]),
-      swapInfo: dco_decode_opt_box_autoadd_swap_info(arr[12]),
-      reverseSwapInfo: dco_decode_opt_box_autoadd_reverse_swap_info(arr[13]),
-      pendingExpirationBlock: dco_decode_opt_box_autoadd_u_32(arr[14]),
+      lnurlPayComment: dco_decode_opt_String(arr[9]),
+      lnAddress: dco_decode_opt_String(arr[10]),
+      lnurlMetadata: dco_decode_opt_String(arr[11]),
+      lnurlWithdrawEndpoint: dco_decode_opt_String(arr[12]),
+      swapInfo: dco_decode_opt_box_autoadd_swap_info(arr[13]),
+      reverseSwapInfo: dco_decode_opt_box_autoadd_reverse_swap_info(arr[14]),
+      pendingExpirationBlock: dco_decode_opt_box_autoadd_u_32(arr[15]),
     );
   }
 
@@ -3015,11 +3016,12 @@ class BreezSdkBindingsApiImpl extends BreezSdkBindingsApiImplPlatform implements
   PaymentFailedData dco_decode_payment_failed_data(dynamic raw) {
     // Codec=Dco (DartCObject based), see doc to use other codecs
     final arr = raw as List<dynamic>;
-    if (arr.length != 3) throw Exception('unexpected arr length: expect 3 but see ${arr.length}');
+    if (arr.length != 4) throw Exception('unexpected arr length: expect 4 but see ${arr.length}');
     return PaymentFailedData(
       error: dco_decode_String(arr[0]),
       nodeId: dco_decode_String(arr[1]),
       invoice: dco_decode_opt_box_autoadd_ln_invoice(arr[2]),
+      label: dco_decode_opt_String(arr[3]),
     );
   }
 
@@ -4529,6 +4531,7 @@ class BreezSdkBindingsApiImpl extends BreezSdkBindingsApiImplPlatform implements
     var var_openChannelBolt11 = sse_decode_opt_String(deserializer);
     var var_lnurlSuccessAction = sse_decode_opt_box_autoadd_success_action_processed(deserializer);
     var var_lnurlPayDomain = sse_decode_opt_String(deserializer);
+    var var_lnurlPayComment = sse_decode_opt_String(deserializer);
     var var_lnAddress = sse_decode_opt_String(deserializer);
     var var_lnurlMetadata = sse_decode_opt_String(deserializer);
     var var_lnurlWithdrawEndpoint = sse_decode_opt_String(deserializer);
@@ -4545,6 +4548,7 @@ class BreezSdkBindingsApiImpl extends BreezSdkBindingsApiImplPlatform implements
         openChannelBolt11: var_openChannelBolt11,
         lnurlSuccessAction: var_lnurlSuccessAction,
         lnurlPayDomain: var_lnurlPayDomain,
+        lnurlPayComment: var_lnurlPayComment,
         lnAddress: var_lnAddress,
         lnurlMetadata: var_lnurlMetadata,
         lnurlWithdrawEndpoint: var_lnurlWithdrawEndpoint,
@@ -5201,7 +5205,8 @@ class BreezSdkBindingsApiImpl extends BreezSdkBindingsApiImplPlatform implements
     var var_error = sse_decode_String(deserializer);
     var var_nodeId = sse_decode_String(deserializer);
     var var_invoice = sse_decode_opt_box_autoadd_ln_invoice(deserializer);
-    return PaymentFailedData(error: var_error, nodeId: var_nodeId, invoice: var_invoice);
+    var var_label = sse_decode_opt_String(deserializer);
+    return PaymentFailedData(error: var_error, nodeId: var_nodeId, invoice: var_invoice, label: var_label);
   }
 
   @protected
@@ -6676,6 +6681,7 @@ class BreezSdkBindingsApiImpl extends BreezSdkBindingsApiImplPlatform implements
     sse_encode_opt_String(self.openChannelBolt11, serializer);
     sse_encode_opt_box_autoadd_success_action_processed(self.lnurlSuccessAction, serializer);
     sse_encode_opt_String(self.lnurlPayDomain, serializer);
+    sse_encode_opt_String(self.lnurlPayComment, serializer);
     sse_encode_opt_String(self.lnAddress, serializer);
     sse_encode_opt_String(self.lnurlMetadata, serializer);
     sse_encode_opt_String(self.lnurlWithdrawEndpoint, serializer);
@@ -7210,6 +7216,7 @@ class BreezSdkBindingsApiImpl extends BreezSdkBindingsApiImplPlatform implements
     sse_encode_String(self.error, serializer);
     sse_encode_String(self.nodeId, serializer);
     sse_encode_opt_box_autoadd_ln_invoice(self.invoice, serializer);
+    sse_encode_opt_String(self.label, serializer);
   }
 
   @protected