Merge branch 'master' into feat/fg-service-optional

Author: jvsena42

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.3.1] - 2026-06-26
+
+### Fixed
+- Improved LNURL-pay invoice validation. #1048
+- Improved LNURL-pay payment handling. #1051
+
 ## [2.3.0] - 2026-06-05
 
 ### Added
@@ -94,6 +100,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - About screen (content merged into Support) #857
 - Standalone General, Security, and Advanced settings screens (merged into tabs) #857
 
-[Unreleased]: https://github.com/synonymdev/bitkit-android/compare/v2.3.0...HEAD
+[Unreleased]: https://github.com/synonymdev/bitkit-android/compare/v2.3.1...HEAD
+[2.3.1]: https://github.com/synonymdev/bitkit-android/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/synonymdev/bitkit-android/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/synonymdev/bitkit-android/compare/v2.1.2...v2.2.0

app/build.gradle.kts

@@ -169,8 +169,8 @@ android {
         applicationId = "to.bitkit"
         minSdk = 28
         targetSdk = 36
-        versionCode = 182
-        versionName = "2.3.0"
+        versionCode = 184
+        versionName = "2.3.1"
         testInstrumentationRunner = "to.bitkit.test.HiltTestRunner"
         bitkitAndroidTestAnnotation?.let {
             testInstrumentationRunnerArguments["annotation"] = it

app/src/main/java/to/bitkit/ext/Coroutines.kt

@@ -5,7 +5,7 @@ import kotlinx.coroutines.Job
 import to.bitkit.utils.Logger
 
 @Suppress("TooGenericExceptionCaught")
-suspend inline fun <R> runSuspendCatching(block: () -> R): Result<R> =
+suspend inline fun <T> runSuspendCatching(crossinline block: suspend () -> T): Result<T> =
     try {
         Result.success(block())
     } catch (c: CancellationException) {

app/src/main/java/to/bitkit/repositories/LightningRepo.kt

@@ -6,6 +6,8 @@ import com.synonym.bitkitcore.AddressType
 import com.synonym.bitkitcore.ClosedChannelDetails
 import com.synonym.bitkitcore.FeeRates
 import com.synonym.bitkitcore.LightningInvoice
+import com.synonym.bitkitcore.LnurlException
+import com.synonym.bitkitcore.LnurlPayData
 import com.synonym.bitkitcore.PreActivityMetadata
 import com.synonym.bitkitcore.Scanner
 import com.synonym.bitkitcore.createChannelRequestUrl
@@ -996,20 +998,20 @@ class LightningRepo @Inject constructor(
         runCatching { lightningService.receiveMsats(amountMsats, description, expirySeconds) }
     }
 
-    @Suppress("ForbiddenComment")
     suspend fun fetchLnurlInvoice(
-        callbackUrl: String,
+        data: LnurlPayData,
         amountMsats: ULong,
         comment: String? = null,
     ): Result<LightningInvoice> {
         return runCatching {
-            // TODO use bitkit-core getLnurlInvoice if it works with callbackUrl
-            val bolt11 = lnurlService.fetchLnurlInvoice(callbackUrl, amountMsats, comment).getOrThrow().pr
+            val bolt11 = coreService.getLnurlInvoiceForPayData(data, amountMsats, comment)
             val decoded = (coreService.decode(bolt11) as Scanner.Lightning).invoice
             return@runCatching decoded
+        }.recoverCatching {
+            throw it.toLnurlPayInvoiceError()
         }.onFailure {
             Logger.error(
-                "Failed to fetch LNURL invoice, url: '$callbackUrl', amountMsats: '$amountMsats', comment: '$comment'",
+                "Failed to fetch LNURL invoice, uri: '${data.uri}', amountMsats: '$amountMsats', comment: '$comment'",
                 it,
                 context = TAG,
             )
@@ -1719,11 +1721,27 @@ class NodeStopTimeoutError : AppError("Timeout waiting for node to stop")
 class NodeRunTimeoutError(opName: String) : AppError("Timeout waiting for node to run and execute: '$opName'")
 class GetPaymentsError : AppError("It wasn't possible get the payments")
 class SyncUnhealthyError : AppError("Wallet sync failed before send")
+class LnurlPayInvoiceMismatchError : AppError("The invoice did not match the requested payment. Payment cancelled.")
 sealed class ProbeError(message: String) : AppError(message) {
     class NoProbeHandles : ProbeError("No probe handles returned")
     class TimedOut : ProbeError("Probe timed out")
 }
 
+private fun Throwable.toLnurlPayInvoiceError(): Throwable {
+    val lnurlPayValidationError = generateSequence(this) { it.cause }
+        .firstOrNull { it.isLnurlPayValidationError() }
+
+    return if (lnurlPayValidationError != null) LnurlPayInvoiceMismatchError() else this
+}
+
+private fun Throwable.isLnurlPayValidationError(): Boolean = when (this) {
+    is LnurlException.InvalidAmount,
+    is LnurlException.AmountMismatch,
+    is LnurlException.MetadataMismatch -> true
+
+    else -> false
+}
+
 @Stable
 data class LightningState(
     val nodeId: String = "",

app/src/main/java/to/bitkit/services/CoreService.kt

@@ -20,6 +20,7 @@ import com.synonym.bitkitcore.IcJitEntry
 import com.synonym.bitkitcore.LegacyRnCloseRecoveryScanResult
 import com.synonym.bitkitcore.LegacyRnCloseRecoverySweepPreview
 import com.synonym.bitkitcore.LightningActivity
+import com.synonym.bitkitcore.LnurlPayData
 import com.synonym.bitkitcore.OnchainActivity
 import com.synonym.bitkitcore.PaymentState
 import com.synonym.bitkitcore.PaymentType
@@ -102,6 +103,7 @@ import kotlin.random.Random
 import com.synonym.bitkitcore.TransactionDetails as BitkitCoreTransactionDetails
 import com.synonym.bitkitcore.TxInput as BitkitCoreTxInput
 import com.synonym.bitkitcore.TxOutput as BitkitCoreTxOutput
+import com.synonym.bitkitcore.getLnurlInvoiceForPayData as coreGetLnurlInvoiceForPayData
 import com.synonym.bitkitcore.getTransactionDetails as getBitkitCoreTransactionDetails
 
 // region Core
@@ -214,6 +216,14 @@ class CoreService @Inject constructor(
         com.synonym.bitkitcore.decode(input)
     }
 
+    suspend fun getLnurlInvoiceForPayData(
+        data: LnurlPayData,
+        amountMsats: ULong,
+        comment: String? = null,
+    ): String = ServiceQueue.CORE.background {
+        coreGetLnurlInvoiceForPayData(data, amountMsats, comment)
+    }
+
     companion object {
         private const val TAG = "CoreService"
     }

app/src/main/java/to/bitkit/services/LnurlService.kt

@@ -39,30 +39,6 @@ class LnurlService @Inject constructor(
         Logger.warn("Failed to request LNURL withdraw", it, context = TAG)
     }
 
-    suspend fun fetchLnurlInvoice(
-        callbackUrl: String,
-        amountMsats: ULong,
-        comment: String? = null,
-    ): Result<LnurlPayResponse> = runCatching {
-        Logger.debug("Fetching LNURL pay invoice from: $callbackUrl", context = TAG)
-
-        val response = client.get(callbackUrl) {
-            url {
-                parameters["amount"] = "$amountMsats"
-                comment?.takeIf { it.isNotBlank() }?.let {
-                    parameters["comment"] = it
-                }
-            }
-        }
-        Logger.debug("Http call: $response", context = TAG)
-
-        if (!response.status.isSuccess()) {
-            throw HttpError("fetchLnurlInvoice error: '${response.status.description}'", response.status.value)
-        }
-
-        return@runCatching response.body<LnurlPayResponse>()
-    }
-
     suspend fun requestLnurlChannel(url: String): Result<LnurlChannelResponse> = runCatching {
         Logger.debug("Requesting LNURL channel request via: '$url'", context = TAG)
 
@@ -101,12 +77,6 @@ data class LnurlWithdrawResponse(
     val balanceCheck: String? = null,
 )
 
-@Serializable
-data class LnurlPayResponse(
-    val pr: String,
-    val routes: List<String>,
-)
-
 @Serializable
 data class LnurlChannelResponse(
     val status: String? = null,

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -127,6 +127,7 @@ import to.bitkit.repositories.CurrencyRepo
 import to.bitkit.repositories.HealthRepo
 import to.bitkit.repositories.HwWalletRepo
 import to.bitkit.repositories.LightningRepo
+import to.bitkit.repositories.LnurlPayInvoiceMismatchError
 import to.bitkit.repositories.PaymentPendingException
 import to.bitkit.repositories.PendingPaymentNotification
 import to.bitkit.repositories.PendingPaymentRepo
@@ -2145,8 +2146,7 @@ class AppViewModel @Inject constructor(
                 lnurlPay != null -> {
                     QuickPayData.LnurlPay(
                         sats = amountSats,
-                        callback = lnurlPay.callback,
-                        amountMsats = lnurlPay.callbackAmountMsats(amountSats),
+                        data = lnurlPay,
                     )
                 }
 
@@ -2269,15 +2269,16 @@ class AppViewModel @Inject constructor(
         if (isLnurlPay) {
             val amountMsats = lnurl.data.callbackAmountMsats(amount)
             lightningRepo.fetchLnurlInvoice(
-                callbackUrl = lnurl.data.callback,
+                data = lnurl.data,
                 amountMsats = amountMsats,
                 comment = _sendUiState.value.comment.takeIf { it.isNotEmpty() },
             ).onSuccess { invoice ->
                 _sendUiState.update {
                     it.copy(decodedInvoice = invoice)
                 }
             }.onFailure {
-                toast(Exception(context.getString(R.string.wallet__error_lnurl_invoice_fetch)))
+                val message = getLnurlInvoiceFetchErrorMessage(it)
+                toast(Exception(message))
                 hideSheet()
                 return
             }
@@ -2378,6 +2379,11 @@ class AppViewModel @Inject constructor(
         }
     }
 
+    private fun getLnurlInvoiceFetchErrorMessage(error: Throwable): String = when (error) {
+        is LnurlPayInvoiceMismatchError -> context.getString(R.string.lightning__order_state__payment_canceled)
+        else -> context.getString(R.string.wallet__error_lnurl_invoice_fetch)
+    }
+
     fun onConfirmWithdraw() {
         _sendUiState.update { it.copy(isLoading = true) }
         viewModelScope.launch {
@@ -3398,7 +3404,7 @@ sealed interface QuickPayData {
     data class Bolt11(override val sats: ULong, val bolt11: String) : QuickPayData
 
     @Stable
-    data class LnurlPay(override val sats: ULong, val callback: String, val amountMsats: ULong) : QuickPayData
+    data class LnurlPay(override val sats: ULong, val data: LnurlPayData) : QuickPayData
 }
 // endregion
 

app/src/main/java/to/bitkit/viewmodels/ProbingToolViewModel.kt

@@ -13,21 +13,27 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import to.bitkit.di.BgDispatcher
+import to.bitkit.ext.callbackAmountMsats
 import to.bitkit.ext.getClipboardText
 import to.bitkit.ext.maxSendableSat
 import to.bitkit.ext.minSendableSat
+import to.bitkit.ext.nowMs
+import to.bitkit.ext.runSuspendCatching
 import to.bitkit.ext.totalNextOutboundHtlcLimitSats
 import to.bitkit.models.BITCOIN_SYMBOL
 import to.bitkit.models.Toast
-import to.bitkit.models.satsToMsat
 import to.bitkit.repositories.LightningRepo
+import to.bitkit.repositories.LnurlPayInvoiceMismatchError
 import to.bitkit.repositories.ProbeError
 import to.bitkit.repositories.ProbeOutcome
 import to.bitkit.services.CoreService
 import to.bitkit.ui.shared.toast.ToastEventBus
 import to.bitkit.utils.Logger
 import javax.inject.Inject
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
+@OptIn(ExperimentalTime::class)
 @HiltViewModel
 class ProbingToolViewModel @Inject constructor(
     @ApplicationContext private val context: Context,
@@ -77,6 +83,7 @@ class ProbingToolViewModel @Inject constructor(
 
         viewModelScope.launch(bgDispatcher) {
             _uiState.update { it.copy(isLoading = true, probeResult = null) }
+            val startTime = Clock.System.nowMs()
 
             try {
                 val state = _uiState.value
@@ -145,7 +152,6 @@ class ProbingToolViewModel @Inject constructor(
                     }
                 }
 
-                val startTime = System.currentTimeMillis()
                 val dispatch = if (isNodeIdTarget) {
                     lightningRepo.sendProbeForNode(requireNotNull(nodeId), requireNotNull(amountSats))
                 } else {
@@ -159,6 +165,8 @@ class ProbingToolViewModel @Inject constructor(
                             .onFailure { handleProbeFailure(startTime, it) }
                     }
                     .onFailure { handleProbeFailure(startTime, it) }
+            } catch (error: LnurlPayInvoiceMismatchError) {
+                handleProbeFailure(startTime, error)
             } finally {
                 _uiState.update { it.copy(isLoading = false) }
             }
@@ -221,30 +229,38 @@ class ProbingToolViewModel @Inject constructor(
         return lightning?.invoice?.amountSatoshis == 0uL
     }
 
-    private suspend fun extractBolt11Invoice(input: String, amountSats: ULong?): String? = runCatching {
-        when (val decoded = coreService.decode(input)) {
-            is Scanner.Lightning -> decoded.invoice.bolt11
-            is Scanner.OnChain -> {
-                val lightningParam = decoded.invoice.params?.get("lightning") ?: return@runCatching null
-                (coreService.decode(lightningParam) as? Scanner.Lightning)?.invoice?.bolt11
-            }
+    private suspend fun extractBolt11Invoice(input: String, amountSats: ULong?): String? {
+        return runSuspendCatching {
+            when (val decoded = coreService.decode(input)) {
+                is Scanner.Lightning -> decoded.invoice.bolt11
+                is Scanner.OnChain -> {
+                    val lightningParam = decoded.invoice.params?.get("lightning") ?: return@runSuspendCatching null
+                    (coreService.decode(lightningParam) as? Scanner.Lightning)?.invoice?.bolt11
+                }
 
-            is Scanner.LnurlPay -> {
-                val amount = amountSats ?: return@runCatching null
-                lightningRepo.fetchLnurlInvoice(decoded.data.callback, satsToMsat(amount)).getOrThrow().bolt11
-            }
+                is Scanner.LnurlPay -> {
+                    val amount = amountSats ?: return@runSuspendCatching null
+                    lightningRepo.fetchLnurlInvoice(
+                        data = decoded.data,
+                        amountMsats = decoded.data.callbackAmountMsats(amount),
+                    ).getOrThrow().bolt11
+                }
 
-            else -> null
+                else -> null
+            }
+        }.getOrElse {
+            if (it is LnurlPayInvoiceMismatchError) throw it
+            null
         }
-    }.getOrNull()
+    }
 
     private suspend fun handleProbeOutcome(
         startTime: Long,
         outcome: ProbeOutcome,
         invoice: String?,
         amountSats: ULong?,
     ) {
-        val durationMs = System.currentTimeMillis() - startTime
+        val durationMs = Clock.System.nowMs() - startTime
         when (outcome) {
             is ProbeOutcome.Success -> {
                 Logger.info(
@@ -288,7 +304,7 @@ class ProbingToolViewModel @Inject constructor(
     }
 
     private suspend fun handleProbeFailure(startTime: Long, error: Throwable) {
-        val durationMs = System.currentTimeMillis() - startTime
+        val durationMs = Clock.System.nowMs() - startTime
         Logger.error("Failed probe in '${durationMs}ms'", error, context = TAG)
 
         val friendlyMessage = getFriendlyErrorMessage(error)

app/src/main/java/to/bitkit/viewmodels/QuickPayViewModel.kt

@@ -12,6 +12,7 @@ import kotlinx.coroutines.launch
 import org.lightningdevkit.ldknode.Event
 import org.lightningdevkit.ldknode.PaymentId
 import to.bitkit.ext.WatchResult
+import to.bitkit.ext.callbackAmountMsats
 import to.bitkit.ext.toUserMessage
 import to.bitkit.ext.watchUntil
 import to.bitkit.repositories.LightningRepo
@@ -48,8 +49,8 @@ class QuickPayViewModel @Inject constructor(
                 is QuickPayData.LnurlPay -> {
                     Logger.info("QuickPay: fetching LNURL Pay invoice from callback")
                     val invoice = lightningRepo.fetchLnurlInvoice(
-                        callbackUrl = data.callback,
-                        amountMsats = data.amountMsats,
+                        data = data.data,
+                        amountMsats = data.data.callbackAmountMsats(data.sats),
                     )
                         .getOrElse { error ->
                             _uiState.update {