Skip to content

fix: unified invoice validation with zero on-chain balance #675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jvsena42 wants to merge 5 commits into
base: master
Choose a base branch
from
+45 −25
Open

fix: unified invoice validation with zero on-chain balance #675

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a5aa75
fix: check for viable lightning invoice when setting the BIP21 on tex…
jvsena42 Jan 19, 2026
82afb0d
fix: only trigger checks for on-chain if the payment method is on-chain
jvsena42 Jan 19, 2026
13f92b1
Merge branch 'master' into fix/zero-savings-validation-uniffied-invoice
jvsena42 Jan 19, 2026
1822fee
Merge branch 'master' into fix/zero-savings-validation-uniffied-invoice
jvsena42 Jan 20, 2026
3e9e02d
Merge branch 'master' into fix/zero-savings-validation-uniffied-invoice
jvsena42 Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 45 additions & 25 deletions app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,18 @@ class AppViewModel @Inject constructor(
return
}

extractViableLightningInvoice(invoice.params)?.let { lnInvoice ->
_sendUiState.update {
it.copy(
isAddressInputValid = true,
isUnified = true,
decodedInvoice = lnInvoice,
payMethod = SendMethod.LIGHTNING,
)
}
return
}

val maxSendOnchain = walletRepo.balanceState.value.maxSendOnchainSats

if (maxSendOnchain == 0uL) {
Expand All @@ -805,6 +817,30 @@ class AppViewModel @Inject constructor(
_sendUiState.update { it.copy(isAddressInputValid = true) }
}

private suspend fun extractViableLightningInvoice(params: Map<String, String>?): LightningInvoice? =
params?.get("lightning")?.let { bolt11 ->
runCatching { decode(bolt11) }.getOrNull()
?.let { it as? Scanner.Lightning }
?.invoice
?.takeIf { lnInv ->
if (lnInv.isExpired) {
Logger.debug(
"Lightning invoice expired in unified URI, defaulting to onchain-only",
context = TAG
)
return@takeIf false
}
val canSend = lightningRepo.canSend(lnInv.amountSatoshis.coerceAtLeast(1u))
if (!canSend) {
Logger.debug(
"Cannot pay unified invoice using LN, defaulting to onchain-only",
context = TAG
)
}
return@takeIf canSend
}
}

private fun showAddressValidationError(
@StringRes titleRes: Int,
@StringRes descriptionRes: Int,
Expand Down Expand Up @@ -1055,35 +1091,16 @@ class AppViewModel @Inject constructor(
)
return
}
val maxSendOnchain = walletRepo.balanceState.value.maxSendOnchainSats

val lnInvoice: LightningInvoice? = invoice.params?.get("lightning")?.let { bolt11 ->
runCatching { decode(bolt11) }.getOrNull()
?.let { it as? Scanner.Lightning }
?.invoice
?.takeIf { invoice ->
if (invoice.isExpired) {
Logger.debug(
"Lightning invoice expired in unified URI, defaulting to onchain-only",
context = TAG
)
return@takeIf false
}

// Then check sending capacity
val canSend = lightningRepo.canSend(invoice.amountSatoshis.coerceAtLeast(1u))
if (!canSend) {
Logger.debug("Cannot pay unified invoice using LN, defaulting to onchain-only", context = TAG)
}
return@takeIf canSend
}
}
val lnInvoice = extractViableLightningInvoice(invoice.params)
_sendUiState.update {
it.copy(
address = invoice.address,
addressInput = scanResult,
isAddressInputValid = true,
amount = invoice.amountSatoshis,
isUnified = lnInvoice != null,
isUnified = lnInvoice != null && invoice.amountSatoshis <= maxSendOnchain && maxSendOnchain > 0u,
decodedInvoice = lnInvoice,
payMethod = lnInvoice?.let { SendMethod.LIGHTNING } ?: SendMethod.ONCHAIN,
)
Expand All @@ -1109,8 +1126,7 @@ class AppViewModel @Inject constructor(
}

// Check on-chain balance before proceeding to amount screen
val maxSendOnchain = walletRepo.balanceState.value.maxSendOnchainSats
if (maxSendOnchain == 0uL) {
if (maxSendOnchain == 0uL && _sendUiState.value.payMethod == SendMethod.ONCHAIN) {
toast(
type = Toast.ToastType.ERROR,
title = context.getString(R.string.other__pay_insufficient_savings),
Expand All @@ -1121,7 +1137,11 @@ class AppViewModel @Inject constructor(
}

// Check if on-chain invoice amount exceeds available balance
if (invoice.amountSatoshis > 0uL && invoice.amountSatoshis > maxSendOnchain) {
if (
invoice.amountSatoshis > 0uL &&
invoice.amountSatoshis > maxSendOnchain &&
_sendUiState.value.payMethod == SendMethod.ONCHAIN
) {
val shortfall = invoice.amountSatoshis - maxSendOnchain
toast(
type = Toast.ToastType.ERROR,
Expand Down
Loading