Skip to content

fix: use send-all fee for channel funding #823

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 1 commit into from
Mar 5, 2026
+5 −7
Merged

fix: use send-all fee for channel funding #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions app/src/main/java/to/bitkit/usecases/DeriveBalanceStateUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,9 @@ class DeriveBalanceStateUseCase @Inject constructor(
if (fundableBalance == 0uL) return 0u

val fallback = (fundableBalance.toDouble() * FALLBACK_FEE_PERCENT).toULong()
val fee = lightningRepo.calculateTotalFee(
amountSats = fundableBalance,
val speed = settingsStore.data.first().defaultTransactionSpeed
val fee = lightningRepo.estimateSendAllFee(
speed = speed,
).onFailure {
Logger.debug("Could not calculate channel funding fee, using fallback of: $fallback", context = TAG)
}.getOrDefault(fallback)
Expand Down
7 changes: 2 additions & 5 deletions app/src/test/java/to/bitkit/usecases/DeriveBalanceStateUseCaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ class DeriveBalanceStateUseCaseTest : BaseUnitTest() {
whenever(transferRepo.activeTransfers).thenReturn(flowOf(emptyList()))
wheneverBlocking { lightningRepo.listSpendableOutputs() }.thenReturn(Result.success(emptyList()))
wheneverBlocking { lightningRepo.getChannelFundableBalance() }.thenReturn(0uL)
wheneverBlocking {
lightningRepo.calculateTotalFee(any(), anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull())
}.thenReturn(Result.success(1000uL))
wheneverBlocking {
lightningRepo.estimateSendAllFee(anyOrNull(), anyOrNull(), anyOrNull())
}.thenReturn(Result.success(1000uL))
Expand Down Expand Up @@ -107,7 +104,7 @@ class DeriveBalanceStateUseCaseTest : BaseUnitTest() {
whenever(lightningRepo.getChannels()).thenReturn(emptyList())
whenever(transferRepo.activeTransfers).thenReturn(flowOf(emptyList()))
wheneverBlocking {
lightningRepo.calculateTotalFee(any(), anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull())
lightningRepo.estimateSendAllFee(anyOrNull(), anyOrNull(), anyOrNull())
}.thenReturn(Result.success(fee))

val result = sut()
Expand All @@ -133,7 +130,7 @@ class DeriveBalanceStateUseCaseTest : BaseUnitTest() {
whenever(lightningRepo.getChannels()).thenReturn(emptyList())
whenever(transferRepo.activeTransfers).thenReturn(flowOf(emptyList()))
wheneverBlocking {
lightningRepo.calculateTotalFee(any(), anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull())
lightningRepo.estimateSendAllFee(anyOrNull(), anyOrNull(), anyOrNull())
}.thenReturn(Result.failure(Exception("Fee estimation failed")))

val result = sut()
Expand Down
Loading