Skip to content

fix: avoid msat truncation when paying invoices with built-in amounts #879

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

Merged
ovitrif merged 16 commits into from
Apr 5, 2026
Merged

fix: avoid msat truncation when paying invoices with built-in amounts #879

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e16b3fa
fix: avoid msat truncation when paying invoices with built-in amounts
ben-kaufman Apr 1, 2026
55dee91
fix: remove inline comments per CLAUDE.md guidelines
ben-kaufman Apr 1, 2026
912fdca
Merge branch 'master' into fix/msat-invoice-precision
piotr-iohk Apr 2, 2026
01ec250
Merge branch 'master' into fix/msat-invoice-precision
ovitrif Apr 2, 2026
03403b3
fix: preserve msat precision for LNURL pay and withdraw callbacks
ben-kaufman Apr 3, 2026
5d7614d
chore: add changelog entry and fix detekt line length
ben-kaufman Apr 3, 2026
388c669
Merge branch 'master' into fix/msat-invoice-precision
ben-kaufman Apr 3, 2026
7bfb20b
fix: address review — LNURL quickpay null amount, log quotes, changelog
ben-kaufman Apr 3, 2026
74f3972
fix: log message should start with verb per CLAUDE.md
ben-kaufman Apr 3, 2026
2a8037d
fix: use msat-precision invoices for fixed-amount LNURL withdraw
ben-kaufman Apr 3, 2026
77e62a0
fix: use satsCeil for LNURL display amounts to match BOLT11 behavior
ben-kaufman Apr 3, 2026
4750afb
fix: remove unused fixedWithdrawAmountSat import
ben-kaufman Apr 3, 2026
be28931
fix: remove dead fixedWithdrawAmountSat and simplify conditional
ben-kaufman Apr 3, 2026
c72e52c
fix: remove needless blank line flagged by detekt
ben-kaufman Apr 3, 2026
ae32b31
fix: use ceiling division for PaymentDetails.amountSats
ben-kaufman Apr 5, 2026
2608e65
fix: use ceiling for received payment notification amounts
ben-kaufman Apr 5, 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
8 changes: 4 additions & 4 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 @@ -1756,8 +1756,8 @@ class AppViewModel @Inject constructor(
val decodedInvoice = requireNotNull(_sendUiState.value.decodedInvoice)
val bolt11 = decodedInvoice.bolt11

// Determine if we should override amount
val paymentAmount = decodedInvoice.amountSatoshis.takeIf { it > 0uL } ?: amount
val paymentAmount = if (decodedInvoice.amountSatoshis > 0uL) null else amount
val displayAmountSats = decodedInvoice.amountSatoshis.takeIf { it > 0uL } ?: amount ?: 0uL

val tags = _sendUiState.value.selectedTags
var createdMetadataPaymentId: String? = null
Expand Down Expand Up @@ -1785,14 +1785,14 @@ class AppViewModel @Inject constructor(
type = NewTransactionSheetType.LIGHTNING,
direction = NewTransactionSheetDirection.SENT,
paymentHashOrTxId = actualPaymentHash,
sats = paymentAmount.toLong(), // TODO Add fee when available
sats = displayAmountSats.toLong(), // TODO Add fee when available
),
)
}.onFailure {
if (it is PaymentPendingException) {
Logger.info("Lightning payment pending", context = TAG)
pendingPaymentRepo.track(it.paymentHash)
setSendEffect(SendEffect.NavigateToPending(it.paymentHash, paymentAmount.toLong()))
setSendEffect(SendEffect.NavigateToPending(it.paymentHash, displayAmountSats.toLong()))
return@onFailure
}
// Delete pre-activity metadata on failure
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/to/bitkit/viewmodels/QuickPayViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ class QuickPayViewModel @Inject constructor(

fun pay(data: QuickPayData) {
viewModelScope.launch {
val (bolt11, amount) = when (data) {
val (bolt11, amount, displaySats) = when (data) {
is QuickPayData.Bolt11 -> {
Logger.info("QuickPay: processing bolt11 invoice")
data.bolt11 to data.sats
Triple(data.bolt11, null, data.sats)
}

is QuickPayData.LnurlPay -> {
Expand All @@ -54,7 +54,7 @@ class QuickPayViewModel @Inject constructor(
}
return@launch
}
invoice.bolt11 to data.sats
Triple(invoice.bolt11, data.sats, data.sats)
Comment thread
ovitrif marked this conversation as resolved.
Outdated
}
}

Expand All @@ -65,7 +65,7 @@ class QuickPayViewModel @Inject constructor(
it.copy(
result = QuickPayResult.Success(
paymentHash = paymentHash,
amountWithFee = amount.toLong() // TODO GET FEE WHEN AVAILABLE
amountWithFee = displaySats.toLong() // TODO GET FEE WHEN AVAILABLE
)
)
}
Expand All @@ -77,7 +77,7 @@ class QuickPayViewModel @Inject constructor(
it.copy(
result = QuickPayResult.Pending(
paymentHash = error.paymentHash,
amount = amount.toLong(),
amount = displaySats.toLong(),
)
)
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ activity-compose = { module = "androidx.activity:activity-compose", version = "1
appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
barcode-scanning = { module = "com.google.mlkit:barcode-scanning", version = "17.3.0" }
biometric = { module = "androidx.biometric:biometric", version = "1.4.0-alpha05" }
bitkit-core = { module = "com.synonym:bitkit-core-android", version = "0.1.38" }
bitkit-core = { module = "com.synonym:bitkit-core-android", version = "0.1.56" }
bouncycastle-provider-jdk = { module = "org.bouncycastle:bcprov-jdk18on", version = "1.83" }
camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "camera" }
camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camera" }
Expand Down
Loading