Apply payment status and lnurlWithdraw changes

Persist failed payments breez/breez-sdk-greenlight#463 Return invoice on successful lnurl-withdraw breez/breez-sdk-greenlight#436
breez · Sep 21, 2023 · 836754a · 836754a
1 parent b92e9a9
commit 836754a
Show file tree

Hide file tree

Showing 11 changed files with 173 additions and 179 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,50 +1,44 @@
 PODS:
-  - breez_sdk (0.1.4):
-    - breez_sdk/breez_sdkFFI (= 0.1.4)
-    - breez_sdkFFI
+  - breez_sdk (0.1.9):
     - Flutter
-  - breez_sdk/breez_sdkFFI (0.1.4):
-    - breez_sdkFFI
-    - Flutter
-  - breez_sdkFFI (0.1.4)
   - clipboard_watcher (0.0.1):
     - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
     - ReachabilitySwift
-  - Firebase/CoreOnly (10.12.0):
-    - FirebaseCore (= 10.12.0)
-  - Firebase/DynamicLinks (10.12.0):
+  - Firebase/CoreOnly (10.15.0):
+    - FirebaseCore (= 10.15.0)
+  - Firebase/DynamicLinks (10.15.0):
     - Firebase/CoreOnly
-    - FirebaseDynamicLinks (~> 10.12.0)
-  - Firebase/Messaging (10.12.0):
+    - FirebaseDynamicLinks (~> 10.15.0)
+  - Firebase/Messaging (10.15.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 10.12.0)
-  - firebase_core (2.15.0):
-    - Firebase/CoreOnly (= 10.12.0)
+    - FirebaseMessaging (~> 10.15.0)
+  - firebase_core (2.16.0):
+    - Firebase/CoreOnly (= 10.15.0)
     - Flutter
-  - firebase_dynamic_links (5.3.4):
-    - Firebase/DynamicLinks (= 10.12.0)
+  - firebase_dynamic_links (5.3.6):
+    - Firebase/DynamicLinks (= 10.15.0)
     - firebase_core
     - Flutter
-  - firebase_messaging (14.6.5):
-    - Firebase/Messaging (= 10.12.0)
+  - firebase_messaging (14.6.8):
+    - Firebase/Messaging (= 10.15.0)
     - firebase_core
     - Flutter
-  - FirebaseCore (10.12.0):
+  - FirebaseCore (10.15.0):
     - FirebaseCoreInternal (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/Logger (~> 7.8)
-  - FirebaseCoreInternal (10.13.0):
+  - FirebaseCoreInternal (10.15.0):
     - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseDynamicLinks (10.12.0):
+  - FirebaseDynamicLinks (10.15.0):
     - FirebaseCore (~> 10.0)
-  - FirebaseInstallations (10.13.0):
+  - FirebaseInstallations (10.15.0):
     - FirebaseCore (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
     - PromisesObjC (~> 2.1)
-  - FirebaseMessaging (10.12.0):
+  - FirebaseMessaging (10.15.0):
     - FirebaseCore (~> 10.0)
     - FirebaseInstallations (~> 10.0)
     - GoogleDataTransport (~> 9.2)
@@ -158,18 +152,18 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqlite3 (3.41.2):
-    - sqlite3/common (= 3.41.2)
-  - sqlite3/common (3.41.2)
-  - sqlite3/fts5 (3.41.2):
+  - sqlite3 (3.43.1):
+    - sqlite3/common (= 3.43.1)
+  - sqlite3/common (3.43.1)
+  - sqlite3/fts5 (3.43.1):
     - sqlite3/common
-  - sqlite3/perf-threadsafe (3.41.2):
+  - sqlite3/perf-threadsafe (3.43.1):
     - sqlite3/common
-  - sqlite3/rtree (3.41.2):
+  - sqlite3/rtree (3.43.1):
     - sqlite3/common
   - sqlite3_flutter_libs (0.0.1):
     - Flutter
-    - sqlite3 (~> 3.41.2)
+    - sqlite3 (~> 3.43.1)
     - sqlite3/fts5
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
@@ -210,7 +204,6 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
-    - breez_sdkFFI
     - Firebase
     - FirebaseCore
     - FirebaseCoreInternal
@@ -287,19 +280,18 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/workmanager/ios"
 
 SPEC CHECKSUMS:
-  breez_sdk: ef1b25b92c62ff061239b98f86784e25608a7c1f
-  breez_sdkFFI: 8ad47f4cfec4c3f26ece06a5ea60e03fa4258669
+  breez_sdk: 233b05873a9e87762e4da7f12eb7a91cf2caff0b
   clipboard_watcher: 86fb70421aca6f4944e0591a8292605da7784666
   connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
-  Firebase: 07150e75d142fb9399f6777fa56a187b17f833a0
-  firebase_core: e477125798fc37cd4ab43ca6a8536bf7e0929c00
-  firebase_dynamic_links: d85cf455646322fd101c8a5a5942c3d47132fe80
-  firebase_messaging: 334d68c3a36b6d4d5cd91e4f42509e0d4ae49828
-  FirebaseCore: f86a1394906b97ac445ae49c92552a9425831bed
-  FirebaseCoreInternal: b342e37cd4f5b4454ec34308f073420e7920858e
-  FirebaseDynamicLinks: 1a387da899779e5ef34f4d6f8bdba882f90d0e67
-  FirebaseInstallations: b28af1b9f997f1a799efe818c94695a3728c352f
-  FirebaseMessaging: bb2c4f6422a753038fe137d90ae7c1af57251316
+  Firebase: 66043bd4579e5b73811f96829c694c7af8d67435
+  firebase_core: 77172d0a9d8d19d07606e24406e4c2fc14d3265b
+  firebase_dynamic_links: 27625ac999a9353d6e323c07db85c3b55c5c6839
+  firebase_messaging: 6aff54d420b7ce7080c26dd131b08bc632666852
+  FirebaseCore: 2cec518b43635f96afe7ac3a9c513e47558abd2e
+  FirebaseCoreInternal: 2f4bee5ed00301b5e56da0849268797a2dd31fb4
+  FirebaseDynamicLinks: 206d4ed3efd2b722822598017f3980d9fda89815
+  FirebaseInstallations: cae95cab0f965ce05b805189de1d4c70b11c76fb
+  FirebaseMessaging: 0c0ae1eb722ef0c07f7801e5ded8dccd1357d6d4
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_fgbg: 31c0d1140a131daea2d342121808f6aa0dcd879d
   flutter_fimber: ec011dfb08d7cbfa16ab6bad8450b99574e6f6a4
@@ -329,8 +321,8 @@ SPEC CHECKSUMS:
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
-  sqlite3: fd89671d969f3e73efe503ce203e28b016b58f68
-  sqlite3_flutter_libs: 04ba0d14a04335a2fbf9a331e8664f401fbccdd5
+  sqlite3: e0a0623a33a20a47cb5921552aebc6e9e437dc91
+  sqlite3_flutter_libs: 0d61e18fab1bed977dbd2d2fc76a726044ca00e7
   TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4

diff --git a/lib/background/payment_hash_poller.dart b/lib/background/payment_hash_poller.dart
@@ -41,7 +41,7 @@ class PaymentHashPoller {
       for (var payment in paymentList) {
         final detailsData = payment.details.data;
         final isPaymentReceived =
-            !payment.pending && detailsData is LnPaymentDetails && detailsData.paymentHash == paymentHash;
+            payment.status != PaymentStatus.Pending && detailsData is LnPaymentDetails && detailsData.paymentHash == paymentHash;
         if (isPaymentReceived) {
           print("Payment received! Stop polling.");
           timer.cancel();

diff --git a/lib/bloc/account/account_bloc.dart b/lib/bloc/account/account_bloc.dart
@@ -128,7 +128,7 @@ class AccountBloc extends Cubit<AccountState> with HydratedMixin {
     });
   }
 
-  Future<sdk.LnUrlCallbackStatus> lnurlWithdraw({
+  Future<sdk.LnUrlWithdrawResult> lnurlWithdraw({
     required int amountSats,
     required sdk.LnUrlWithdrawRequestData reqData,
     String? description,

diff --git a/lib/models/payment_minutiae.dart b/lib/models/payment_minutiae.dart
@@ -72,7 +72,7 @@ class PaymentMinutiae {
       amountSat: factory._amountSat(),
       hasMetadata: factory._hasMetadata(),
       isKeySend: factory._isKeySend(),
-      isPending: payment.pending,
+      isPending: payment.status == PaymentStatus.Pending,
     );
   }
 }

diff --git a/lib/routes/home/widgets/payments_list/payment_item_amount.dart b/lib/routes/home/widgets/payments_list/payment_item_amount.dart
@@ -102,7 +102,7 @@ void main() async {
                   feeMsat: 0,
                   paymentTime: 1661791810,
                   amountMsat: 4321000,
-                  pending: false,
+                  status: PaymentStatus.Complete,
                   description: "",
                   details: PaymentDetails.ln(
                     data: LnPaymentDetails(
@@ -128,7 +128,7 @@ void main() async {
                   feeMsat: 1234,
                   paymentTime: 1661791810,
                   amountMsat: 4321000,
-                  pending: true,
+                  status: PaymentStatus.Pending,
                   description: "",
                   details: PaymentDetails.ln(
                     data: LnPaymentDetails(
@@ -154,7 +154,7 @@ void main() async {
                   feeMsat: 1234,
                   paymentTime: 1661791810,
                   amountMsat: 4321000,
-                  pending: false,
+                  status: PaymentStatus.Complete,
                   description: "",
                   details: PaymentDetails.ln(
                     data: LnPaymentDetails(
@@ -180,7 +180,7 @@ void main() async {
                   feeMsat: 1234,
                   paymentTime: 1661791810,
                   amountMsat: 4321000,
-                  pending: false,
+                  status: PaymentStatus.Complete,
                   description: "",
                   details: PaymentDetails.ln(
                     data: LnPaymentDetails(

diff --git a/lib/routes/home/widgets/payments_list/payment_item_subtitle.dart b/lib/routes/home/widgets/payments_list/payment_item_subtitle.dart
@@ -55,7 +55,7 @@ void main() {
               feeMsat: 1234,
               paymentTime: 1661791810,
               amountMsat: 4321000,
-              pending: false,
+              status: PaymentStatus.Complete,
               description: "",
               details: PaymentDetails.ln(
                 data: LnPaymentDetails(
@@ -81,7 +81,7 @@ void main() {
               feeMsat: 1234,
               paymentTime: 1661791810,
               amountMsat: 4321000,
-              pending: true,
+              status: PaymentStatus.Pending,
               description: "",
               details: PaymentDetails.ln(
                 data: LnPaymentDetails(

diff --git a/lib/routes/home/widgets/payments_list/payment_item_title.dart b/lib/routes/home/widgets/payments_list/payment_item_title.dart
@@ -36,7 +36,7 @@ void main() {
               feeMsat: 0,
               paymentTime: 1661791810,
               amountMsat: 4321000,
-              pending: false,
+              status: PaymentStatus.Complete,
               description: "",
               details: PaymentDetails.ln(
                 data: LnPaymentDetails(
@@ -62,7 +62,7 @@ void main() {
               feeMsat: 0,
               paymentTime: 1661791810,
               amountMsat: 4321000,
-              pending: false,
+              status: PaymentStatus.Complete,
               description: "A long title\nwith a new line",
               details: PaymentDetails.ln(
                 data: LnPaymentDetails(
@@ -88,7 +88,7 @@ void main() {
               feeMsat: 0,
               paymentTime: 1661791810,
               amountMsat: 4321000,
-              pending: false,
+              status: PaymentStatus.Complete,
               description: "A short title",
               details: PaymentDetails.ln(
                 data: LnPaymentDetails(

diff --git a/lib/routes/home/widgets/payments_list/payments_list.dart b/lib/routes/home/widgets/payments_list/payments_list.dart
@@ -66,7 +66,7 @@ void main() async {
         feeMsat: 0,
         paymentTime: 1661791810,
         amountMsat: 4321000,
-        pending: false,
+        status: PaymentStatus.Complete,
         description: "A title",
         details: PaymentDetails.ln(
           data: LnPaymentDetails(
@@ -88,7 +88,7 @@ void main() async {
         feeMsat: 12,
         paymentTime: 1661791810,
         amountMsat: 4321000,
-        pending: false,
+        status: PaymentStatus.Complete,
         description: "A title",
         details: PaymentDetails.ln(
           data: LnPaymentDetails(
@@ -110,7 +110,7 @@ void main() async {
         feeMsat: 3456,
         paymentTime: DateTime.now().millisecondsSinceEpoch ~/ 1000,
         amountMsat: 4321000,
-        pending: false,
+        status: PaymentStatus.Complete,
         description: "A title",
         details: const PaymentDetails.ln(
           data: LnPaymentDetails(

diff --git a/lib/routes/lnurl/withdraw/lnurl_withdraw_dialog.dart b/lib/routes/lnurl/withdraw/lnurl_withdraw_dialog.dart
@@ -148,14 +148,16 @@ class _LNURLWithdrawDialogState extends State<LNURLWithdrawDialog> with SingleTi
         amountSats: widget.amountSats,
         description: description,
       );
-      if (resp is sdk.LnUrlCallbackStatus_Ok) {
-        _log.v("LNURL withdraw success");
+      if (resp is sdk.LnUrlWithdrawSuccessData) {
+        final paymentHash = (resp as sdk.LnUrlWithdrawSuccessData).invoice.paymentHash;
+        _log.v("LNURL withdraw success for $paymentHash");
         return const LNURLPageResult(protocol: LnUrlProtocol.Withdraw);
-      } else if (resp is sdk.LnUrlCallbackStatus_ErrorStatus) {
-        _log.v("LNURL withdraw failed: ${resp.data.reason}");
+      } else if (resp is sdk.LnUrlErrorData) {
+        final reason = (resp as sdk.LnUrlErrorData).reason;
+        _log.v("LNURL withdraw failed: $reason");
         return LNURLPageResult(
           protocol: LnUrlProtocol.Withdraw,
-          error: resp.data.reason,
+          error: reason,
         );
       } else {
         _log.w("Unknown response from lnurlWithdraw: $resp");