Merge pull request #379 from synonymdev/fix/suggested-fee-calc-boost

Minimal fee checks on RBF

Author: jvsena42

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

@@ -62,7 +62,7 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
-private const val SYNC_TIMEOUT_MS = 15_000L
+private const val SYNC_TIMEOUT_MS = 20_000L
 
 @Singleton
 class LightningRepo @Inject constructor(

app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt

@@ -151,6 +151,7 @@ fun HomeScreen(
         drawerState = drawerState,
         latestActivities = latestActivities,
         onRefresh = {
+            activityListViewModel.fetchLatestActivities()
             walletViewModel.onPullToRefresh()
             homeViewModel.refreshWidgets()
             activityListViewModel.syncLdkNodePayments()

app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt

@@ -155,6 +155,7 @@ fun ActivityDetailScreen(
                             title = context.getString(R.string.wallet__boost_success_title),
                             description = context.getString(R.string.wallet__boost_success_msg)
                         )
+                        listViewModel.fetchLatestActivities()
                         onCloseClick()
                     },
                     onFailure = {

app/src/main/java/to/bitkit/ui/sheets/BoostTransactionSheet.kt

@@ -69,7 +69,7 @@ fun BoostTransactionSheet(
     val haptic = LocalHapticFeedback.current
 
     // Setup activity when component is first created
-    LaunchedEffect(item) {
+    LaunchedEffect(Unit) {
         viewModel.setupActivity(item)
     }
 

app/src/main/java/to/bitkit/ui/sheets/BoostTransactionViewModel.kt

@@ -43,15 +43,16 @@ class BoostTransactionViewModel @Inject constructor(
     private companion object {
         const val TAG = "BoostTransactionViewModel"
         const val MAX_FEE_PERCENTAGE = 0.5
-        const val MIN_FEE_RATE = 1UL
         const val MAX_FEE_RATE = 100UL
         const val FEE_RATE_STEP = 1UL
+        const val RBF_MIN_INCREASE = 2UL
     }
 
     // State variables
     private var totalFeeSatsRecommended: ULong = 0U
     private var maxTotalFee: ULong = 0U
     private var feeRateRecommended: ULong = 0U
+    private var minFeeRate: ULong = 2U
     private var activity: Activity.Onchain? = null
 
     fun setupActivity(activity: Activity.Onchain) {
@@ -71,7 +72,6 @@ class BoostTransactionViewModel @Inject constructor(
     private fun initializeFeeEstimates() {
         viewModelScope.launch {
             try {
-                val speed = TransactionSpeed.Fast
                 val activityContent = activity?.v1 ?: run {
                     handleError("Activity value is null")
                     return@launch
@@ -85,7 +85,12 @@ class BoostTransactionViewModel @Inject constructor(
 
                 // Get recommended fee estimates
                 val feeRateResult = when (activityContent.txType) {
-                    PaymentType.SENT -> lightningRepo.getFeeRateForSpeed(speed = speed)
+                    PaymentType.SENT -> {
+                        // For RBF, use at least the original fee rate + 2 sat/vbyte, with a minimum of 2 sat/vbyte
+                        minFeeRate = (activityContent.feeRate + RBF_MIN_INCREASE)
+                        lightningRepo.getFeeRateForSpeed(speed = TransactionSpeed.Fast)
+                    }
+
                     PaymentType.RECEIVED -> lightningRepo.calculateCpfpFeeRate(activityContent.txId)
                 }
 
@@ -96,18 +101,29 @@ class BoostTransactionViewModel @Inject constructor(
                 val totalFeeResult = lightningRepo.calculateTotalFee(
                     amountSats = activityContent.value,
                     utxosToSpend = sortedUtxos,
-                    speed = TransactionSpeed.Custom(feeRateResult.getOrDefault(0u).toUInt()),
+                    speed = TransactionSpeed.Custom(
+                        feeRateResult
+                            .getOrDefault(minFeeRate)
+                            .coerceAtLeast(minFeeRate)
+                            .toUInt()
+                    ),
                 )
 
                 when {
                     totalFeeResult.isSuccess && feeRateResult.isSuccess -> {
                         totalFeeSatsRecommended = totalFeeResult.getOrThrow()
-                        feeRateRecommended = feeRateResult.getOrThrow()
+                        feeRateRecommended = feeRateResult
+                            .getOrDefault(minFeeRate)
+                            .coerceAtLeast(minFeeRate)
 
                         updateUiStateWithFeeData(
                             totalFee = totalFeeSatsRecommended,
                             feeRate = feeRateRecommended
                         )
+
+                        if (_uiState.value.totalFeeSats >= maxTotalFee) {
+                            setBoostTransactionEffect(BoostTransactionEffects.OnMaxFee)
+                        }
                     }
 
                     else -> {
@@ -124,7 +140,7 @@ class BoostTransactionViewModel @Inject constructor(
     private fun updateUiStateWithFeeData(totalFee: ULong, feeRate: ULong) {
         val currentFee = activity?.v1?.fee ?: 0u
         val isIncreaseEnabled = totalFee < maxTotalFee && feeRate < MAX_FEE_RATE
-        val isDecreaseEnabled = totalFee > currentFee && feeRate > MIN_FEE_RATE
+        val isDecreaseEnabled = totalFee > currentFee && feeRate > minFeeRate
 
         _uiState.update {
             it.copy(
@@ -220,7 +236,7 @@ class BoostTransactionViewModel @Inject constructor(
         val newFeeRate = if (increase) {
             (currentFeeRate + FEE_RATE_STEP).coerceAtMost(MAX_FEE_RATE)
         } else {
-            (currentFeeRate - FEE_RATE_STEP).coerceAtLeast(MIN_FEE_RATE)
+            (currentFeeRate - FEE_RATE_STEP).coerceAtLeast(minFeeRate)
         }
 
         if (newFeeRate == currentFeeRate) {
@@ -315,6 +331,7 @@ class BoostTransactionViewModel @Inject constructor(
             v1 = currentActivity.copy(
                 isBoosted = true,
                 feeRate = _uiState.value.feeRate,
+                fee = _uiState.value.totalFeeSats,
                 updatedAt = nowTimestamp().toEpochMilli().toULong()
             )
         )

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

@@ -92,7 +92,7 @@ class ActivityListViewModel @Inject constructor(
         observeDateRange()
         observeSelectedTags()
 
-        syncState()
+        fetchLatestActivities()
     }
 
     @OptIn(FlowPreview::class)
@@ -129,7 +129,7 @@ class ActivityListViewModel @Inject constructor(
         }
     }
 
-    private fun syncState() {
+    fun fetchLatestActivities() {
         viewModelScope.launch(bgDispatcher) {
             try {
                 // Fetch latest activities for the home screen
@@ -221,22 +221,22 @@ class ActivityListViewModel @Inject constructor(
     fun syncLdkNodePayments() {
         viewModelScope.launch {
             activityRepo.syncActivities().onSuccess {
-                syncState()
+                fetchLatestActivities()
             }
         }
     }
 
     fun generateRandomTestData(count: Int) {
         viewModelScope.launch(bgDispatcher) {
             coreService.activity.generateRandomTestData(count)
-            syncState()
+            fetchLatestActivities()
         }
     }
 
     fun removeAllActivities() {
         viewModelScope.launch(bgDispatcher) {
             coreService.activity.removeAll()
-            syncState()
+            fetchLatestActivities()
         }
     }
 }