Remove LnUrlPaySuccessData payment_hash

breez · Apr 8, 2024 · 7465c77 · 7465c77
1 parent a1b837c
commit 7465c77
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 21 deletions.
diff --git a/libs/sdk-bindings/src/breez_sdk.udl b/libs/sdk-bindings/src/breez_sdk.udl
@@ -600,7 +600,6 @@ dictionary BitcoinAddressData {
 
 dictionary LnUrlPaySuccessData {
     SuccessActionProcessed? success_action;
-    string payment_hash;
     Payment payment;
 };
 

diff --git a/libs/sdk-core/src/breez_services.rs b/libs/sdk-core/src/breez_services.rs
@@ -451,7 +451,6 @@ impl BreezServices {
 
                 Ok(LnUrlPayResult::EndpointSuccess {
                     data: LnUrlPaySuccessData {
-                        payment_hash: details.payment_hash.clone(),
                         payment,
                         success_action: maybe_sa_processed,
                     },

diff --git a/libs/sdk-core/src/bridge_generated.rs b/libs/sdk-core/src/bridge_generated.rs
@@ -1508,7 +1508,6 @@ impl rust2dart::IntoIntoDart<LnUrlPayResult> for LnUrlPayResult {
 impl support::IntoDart for LnUrlPaySuccessData {
     fn into_dart(self) -> support::DartAbi {
         vec![
-            self.payment_hash.into_into_dart().into_dart(),
             self.payment.into_into_dart().into_dart(),
             self.success_action.into_dart(),
         ]

diff --git a/libs/sdk-core/src/lnurl/pay.rs b/libs/sdk-core/src/lnurl/pay.rs
@@ -159,7 +159,6 @@ pub(crate) mod model {
 
     #[derive(Serialize, Deserialize, Debug)]
     pub struct LnUrlPaySuccessData {
-        pub payment_hash: String,
         pub payment: Payment,
         pub success_action: Option<SuccessActionProcessed>,
     }
@@ -973,7 +972,7 @@ mod tests {
             })
             .await?
         {
-            LnUrlPayResult::EndpointSuccess { data } => match data.payment_hash {
+            LnUrlPayResult::EndpointSuccess { data } => match data.payment.id {
                 s if s == inv.payment_hash().to_hex() => Ok(()),
                 _ => Err(anyhow!("Unexpected payment hash")),
             },

diff --git a/libs/sdk-flutter/lib/bridge_generated.dart b/libs/sdk-flutter/lib/bridge_generated.dart
@@ -958,12 +958,10 @@ sealed class LnUrlPayResult with _$LnUrlPayResult {
 }
 
 class LnUrlPaySuccessData {
-  final String paymentHash;
   final Payment payment;
   final SuccessActionProcessed? successAction;
 
   const LnUrlPaySuccessData({
-    required this.paymentHash,
     required this.payment,
     this.successAction,
   });
@@ -3642,11 +3640,10 @@ class BreezSdkCoreImpl implements BreezSdkCore {
 
   LnUrlPaySuccessData _wire2api_ln_url_pay_success_data(dynamic raw) {
     final arr = raw as List<dynamic>;
-    if (arr.length != 3) throw Exception('unexpected arr length: expect 3 but see ${arr.length}');
+    if (arr.length != 2) throw Exception('unexpected arr length: expect 2 but see ${arr.length}');
     return LnUrlPaySuccessData(
-      paymentHash: _wire2api_String(arr[0]),
-      payment: _wire2api_payment(arr[1]),
-      successAction: _wire2api_opt_box_autoadd_success_action_processed(arr[2]),
+      payment: _wire2api_payment(arr[0]),
+      successAction: _wire2api_opt_box_autoadd_success_action_processed(arr[1]),
     );
   }
 

diff --git a/libs/sdk-react-native/android/src/main/java/com/breezsdk/BreezSDKMapper.kt b/libs/sdk-react-native/android/src/main/java/com/breezsdk/BreezSDKMapper.kt
@@ -1244,7 +1244,6 @@ fun asLnUrlPaySuccessData(lnUrlPaySuccessData: ReadableMap): LnUrlPaySuccessData
     if (!validateMandatoryFields(
             lnUrlPaySuccessData,
             arrayOf(
-                "paymentHash",
                 "payment",
             ),
         )
@@ -1259,19 +1258,16 @@ fun asLnUrlPaySuccessData(lnUrlPaySuccessData: ReadableMap): LnUrlPaySuccessData
         } else {
             null
         }
-    val paymentHash = lnUrlPaySuccessData.getString("paymentHash")!!
     val payment = lnUrlPaySuccessData.getMap("payment")?.let { asPayment(it) }!!
     return LnUrlPaySuccessData(
         successAction,
-        paymentHash,
         payment,
     )
 }
 
 fun readableMapOf(lnUrlPaySuccessData: LnUrlPaySuccessData): ReadableMap {
     return readableMapOf(
         "successAction" to lnUrlPaySuccessData.successAction?.let { readableMapOf(it) },
-        "paymentHash" to lnUrlPaySuccessData.paymentHash,
         "payment" to readableMapOf(lnUrlPaySuccessData.payment),
     )
 }

diff --git a/libs/sdk-react-native/ios/BreezSDKMapper.swift b/libs/sdk-react-native/ios/BreezSDKMapper.swift
@@ -1393,25 +1393,20 @@ enum BreezSDKMapper {
             successAction = try asSuccessActionProcessed(successActionProcessed: successActionTmp)
         }
 
-        guard let paymentHash = lnUrlPaySuccessData["paymentHash"] as? String else {
-            throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "paymentHash", typeName: "LnUrlPaySuccessData"))
-        }
         guard let paymentTmp = lnUrlPaySuccessData["payment"] as? [String: Any?] else {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "payment", typeName: "LnUrlPaySuccessData"))
         }
         let payment = try asPayment(payment: paymentTmp)
 
         return LnUrlPaySuccessData(
             successAction: successAction,
-            paymentHash: paymentHash,
             payment: payment
         )
     }
 
     static func dictionaryOf(lnUrlPaySuccessData: LnUrlPaySuccessData) -> [String: Any?] {
         return [
             "successAction": lnUrlPaySuccessData.successAction == nil ? nil : dictionaryOf(successActionProcessed: lnUrlPaySuccessData.successAction!),
-            "paymentHash": lnUrlPaySuccessData.paymentHash,
             "payment": dictionaryOf(payment: lnUrlPaySuccessData.payment),
         ]
     }

diff --git a/libs/sdk-react-native/src/index.ts b/libs/sdk-react-native/src/index.ts
@@ -201,7 +201,6 @@ export type LnUrlPayRequestData = {
 
 export type LnUrlPaySuccessData = {
     successAction?: SuccessActionProcessed
-    paymentHash: string
     payment: Payment
 }