Add payment_hash to Lightning exceptions

Author: angelix

common/src/commonMain/kotlin/com/blockstream/common/CountlyBase.kt

@@ -6,6 +6,7 @@ import com.blockstream.common.data.ApplicationSettings
 import com.blockstream.common.data.Banner
 import com.blockstream.common.data.CountlyAsset
 import com.blockstream.common.data.CredentialType
+import com.blockstream.common.data.ExceptionWithSupportData
 import com.blockstream.common.data.GreenWallet
 import com.blockstream.common.data.Promo
 import com.blockstream.common.data.SetupArgs
@@ -691,6 +692,7 @@ abstract class CountlyBase(
                     ?.also {
                         map[PARAM_NODE_ID] = it
                     }
+                (error as? ExceptionWithSupportData)?.supportData?.paymentHash?.also { map[PAYMENT_HASH] = it }
             }
         )
     }
@@ -945,7 +947,8 @@ abstract class CountlyBase(
         const val PARAM_FIRMWARE = "firmware"
         const val PARAM_CONNECTION = "connection"
         const val PARAM_ERROR = "error"
-        const val PARAM_NODE_ID = "NODE_ID"
+        const val PARAM_NODE_ID = "node_id"
+        const val PAYMENT_HASH = "payment_hash"
         const val PARAM_FLOW = "flow"
         const val PARAM_EPHEMERAL_BIP39 = "ephemeral_bip39"
         const val PARAM_MAINNET = "mainnet"

common/src/commonMain/kotlin/com/blockstream/common/gdk/GdkSession.kt

@@ -2777,7 +2777,7 @@ class GdkSession constructor(
 
                 try {
                     val response = lightningSdk.sendPayment(
-                        bolt11 = inputType.invoice.bolt11,
+                        invoice = inputType.invoice,
                         satoshi = satoshi.takeIf { inputType.invoice.amountMsat == null }
                     )
 

common/src/commonMain/kotlin/com/blockstream/common/lightning/LightningBridge.kt

@@ -13,6 +13,7 @@ import breez_sdk.GreenlightNodeConfig
 import breez_sdk.HealthCheckStatus
 import breez_sdk.InputType
 import breez_sdk.ListPaymentsRequest
+import breez_sdk.LnInvoice
 import breez_sdk.LnUrlAuthRequestData
 import breez_sdk.LnUrlCallbackStatus
 import breez_sdk.LnUrlPayRequest
@@ -492,10 +493,10 @@ class LightningBridge constructor(
         }
     }
 
-    fun sendPayment(bolt11: String, satoshi: Long?): SendPaymentResponse {
+    fun sendPayment(invoice: LnInvoice, satoshi: Long?): SendPaymentResponse {
         return try {
             breezSdk.sendPayment(
-                SendPaymentRequest(bolt11 = bolt11, amountMsat = satoshi?.milliSatoshi(), useTrampoline = true)
+                SendPaymentRequest(bolt11 = invoice.bolt11, amountMsat = satoshi?.milliSatoshi(), useTrampoline = true)
             )
         } catch (e: Exception) {
             throw exceptionWithNodeId(e)
@@ -571,7 +572,14 @@ class LightningBridge constructor(
     }
 
     private fun exceptionWithNodeId(exception: Exception) =
-        Exception("${exception.message}\nNodeId: ${_nodeInfoStateFlow.value.id}\nTimestamp: ${Clock.System.now().epochSeconds}", exception.cause)
+        Exception(
+            listOfNotNull(
+                exception.message,
+                "NodeId: ${_nodeInfoStateFlow.value.id}",
+                "Timestamp: ${Clock.System.now().epochSeconds}",
+            ).joinToString("\n"),
+            exception.cause
+        )
 
     fun release(){
         lightningManager.release(this)