Add receiver amount to FetchPaymentProposedFeesResponse

breez · Jan 3, 2025 · fa70c0b · fa70c0b
1 parent b18ad6d
commit fa70c0b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 4 deletions.
diff --git a/cli/src/commands.rs b/cli/src/commands.rs
@@ -527,8 +527,8 @@ pub(crate) async fn handle_command(
                 .await?;
 
             let confirmation_msg = format!(
-                "Payer amount: {} sat. Fees: {} sat. Are the fees acceptable? (y/N) ",
-                fetch_response.payer_amount_sat, fetch_response.fees_sat
+                "Payer amount: {} sat. Fees: {} sat. Resulting received amount: {} sat. Are the fees acceptable? (y/N) ",
+                fetch_response.payer_amount_sat, fetch_response.fees_sat, fetch_response.receiver_amount_sat
             );
 
             wait_confirmation!(confirmation_msg, "Payment proposed fees review halted");

diff --git a/lib/bindings/src/breez_sdk_liquid.udl b/lib/bindings/src/breez_sdk_liquid.udl
@@ -550,6 +550,7 @@ dictionary FetchPaymentProposedFeesResponse {
     string swap_id;
     u64 fees_sat;
     u64 payer_amount_sat;
+    u64 receiver_amount_sat;
 };
 
 dictionary AcceptPaymentProposedFeesRequest {

diff --git a/lib/core/src/model.rs b/lib/core/src/model.rs
@@ -1796,6 +1796,8 @@ pub struct FetchPaymentProposedFeesResponse {
     pub fees_sat: u64,
     /// Amount sent by the swap payer
     pub payer_amount_sat: u64,
+    /// Amount that will be received if these fees are accepted
+    pub receiver_amount_sat: u64,
 }
 
 /// An argument when calling [crate::sdk::LiquidSdk::accept_payment_proposed_fees].

diff --git a/lib/core/src/sdk.rs b/lib/core/src/sdk.rs
@@ -2614,6 +2614,7 @@ impl LiquidSdk {
             swap_id: req.swap_id.clone(),
             fees_sat,
             payer_amount_sat: actual_payer_amount_sat,
+            receiver_amount_sat: actual_payer_amount_sat - fees_sat,
         })
     }
 
@@ -2628,6 +2629,7 @@ impl LiquidSdk {
             swap_id,
             fees_sat,
             payer_amount_sat,
+            ..
         } = req.clone().response;
 
         let chain_swap =

diff --git a/packages/react-native/android/src/main/java/com/breezsdkliquid/BreezSDKLiquidMapper.kt b/packages/react-native/android/src/main/java/com/breezsdkliquid/BreezSDKLiquidMapper.kt
@@ -552,6 +552,7 @@ fun asFetchPaymentProposedFeesResponse(fetchPaymentProposedFeesResponse: Readabl
                 "swapId",
                 "feesSat",
                 "payerAmountSat",
+                "receiverAmountSat",
             ),
         )
     ) {
@@ -560,14 +561,16 @@ fun asFetchPaymentProposedFeesResponse(fetchPaymentProposedFeesResponse: Readabl
     val swapId = fetchPaymentProposedFeesResponse.getString("swapId")!!
     val feesSat = fetchPaymentProposedFeesResponse.getDouble("feesSat").toULong()
     val payerAmountSat = fetchPaymentProposedFeesResponse.getDouble("payerAmountSat").toULong()
-    return FetchPaymentProposedFeesResponse(swapId, feesSat, payerAmountSat)
+    val receiverAmountSat = fetchPaymentProposedFeesResponse.getDouble("receiverAmountSat").toULong()
+    return FetchPaymentProposedFeesResponse(swapId, feesSat, payerAmountSat, receiverAmountSat)
 }
 
 fun readableMapOf(fetchPaymentProposedFeesResponse: FetchPaymentProposedFeesResponse): ReadableMap =
     readableMapOf(
         "swapId" to fetchPaymentProposedFeesResponse.swapId,
         "feesSat" to fetchPaymentProposedFeesResponse.feesSat,
         "payerAmountSat" to fetchPaymentProposedFeesResponse.payerAmountSat,
+        "receiverAmountSat" to fetchPaymentProposedFeesResponse.receiverAmountSat,
     )
 
 fun asFetchPaymentProposedFeesResponseList(arr: ReadableArray): List<FetchPaymentProposedFeesResponse> {

diff --git a/packages/react-native/ios/BreezSDKLiquidMapper.swift b/packages/react-native/ios/BreezSDKLiquidMapper.swift
@@ -633,15 +633,19 @@ enum BreezSDKLiquidMapper {
         guard let payerAmountSat = fetchPaymentProposedFeesResponse["payerAmountSat"] as? UInt64 else {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "payerAmountSat", typeName: "FetchPaymentProposedFeesResponse"))
         }
+        guard let receiverAmountSat = fetchPaymentProposedFeesResponse["receiverAmountSat"] as? UInt64 else {
+            throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "receiverAmountSat", typeName: "FetchPaymentProposedFeesResponse"))
+        }
 
-        return FetchPaymentProposedFeesResponse(swapId: swapId, feesSat: feesSat, payerAmountSat: payerAmountSat)
+        return FetchPaymentProposedFeesResponse(swapId: swapId, feesSat: feesSat, payerAmountSat: payerAmountSat, receiverAmountSat: receiverAmountSat)
     }
 
     static func dictionaryOf(fetchPaymentProposedFeesResponse: FetchPaymentProposedFeesResponse) -> [String: Any?] {
         return [
             "swapId": fetchPaymentProposedFeesResponse.swapId,
             "feesSat": fetchPaymentProposedFeesResponse.feesSat,
             "payerAmountSat": fetchPaymentProposedFeesResponse.payerAmountSat,
+            "receiverAmountSat": fetchPaymentProposedFeesResponse.receiverAmountSat,
         ]
     }
 

diff --git a/packages/react-native/src/index.ts b/packages/react-native/src/index.ts
@@ -111,6 +111,7 @@ export interface FetchPaymentProposedFeesResponse {
     swapId: string
     feesSat: number
     payerAmountSat: number
+    receiverAmountSat: number
 }
 
 export interface FiatCurrency {