Merge branch 'master' into feat/wallet-scoped-core-0.3.9

piotr-iohk · web-flow · commit 2e5fba00e0ca · 2026-07-07T09:48:30.000+02:00
diff --git a/app/schemas/to.bitkit.data.AppDb/7.json b/app/schemas/to.bitkit.data.AppDb/7.json
@@ -0,0 +1,108 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 7,
+    "identityHash": "2b1cda225c170b5f1bbfbf76e5fa4cf5",
+    "entities": [
+      {
+        "tableName": "config",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`walletIndex` INTEGER NOT NULL, PRIMARY KEY(`walletIndex`))",
+        "fields": [
+          {
+            "fieldPath": "walletIndex",
+            "columnName": "walletIndex",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "walletIndex"
+          ]
+        }
+      },
+      {
+        "tableName": "transfers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `type` TEXT NOT NULL, `amountSats` INTEGER NOT NULL, `channelId` TEXT, `fundingTxId` TEXT, `lspOrderId` TEXT, `isSettled` INTEGER NOT NULL, `createdAt` INTEGER NOT NULL, `settledAt` INTEGER, `claimableAtHeight` INTEGER, `txTotalSats` INTEGER, `preTransferOnchainSats` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amountSats",
+            "columnName": "amountSats",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "channelId",
+            "columnName": "channelId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "fundingTxId",
+            "columnName": "fundingTxId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "lspOrderId",
+            "columnName": "lspOrderId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isSettled",
+            "columnName": "isSettled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "settledAt",
+            "columnName": "settledAt",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "claimableAtHeight",
+            "columnName": "claimableAtHeight",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "txTotalSats",
+            "columnName": "txTotalSats",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "preTransferOnchainSats",
+            "columnName": "preTransferOnchainSats",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '2b1cda225c170b5f1bbfbf76e5fa4cf5')"
+    ]
+  }
+}
diff --git a/app/src/main/java/to/bitkit/data/AppDb.kt b/app/src/main/java/to/bitkit/data/AppDb.kt
@@ -31,7 +31,7 @@ import to.bitkit.env.Env
         ConfigEntity::class,
         TransferEntity::class,
     ],
-    version = 6,
+    version = 7,
 )
 @TypeConverters(StringListConverter::class)
 abstract class AppDb : RoomDatabase() {
@@ -45,6 +45,13 @@ abstract class AppDb : RoomDatabase() {
             }
         }
 
+        private val MIGRATION_6_7 = object : Migration(6, 7) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE transfers ADD COLUMN txTotalSats INTEGER DEFAULT NULL")
+                db.execSQL("ALTER TABLE transfers ADD COLUMN preTransferOnchainSats INTEGER DEFAULT NULL")
+            }
+        }
+
         private const val DB_NAME = "${BuildConfig.APPLICATION_ID}.sqlite"
 
         @Volatile
@@ -72,7 +79,7 @@ abstract class AppDb : RoomDatabase() {
                         }
                     }
                 })
-                .addMigrations(MIGRATION_5_6)
+                .addMigrations(MIGRATION_5_6, MIGRATION_6_7)
                 .apply {
                     if (Env.isDebug) fallbackToDestructiveMigration(dropAllTables = true)
                 }
diff --git a/app/src/main/java/to/bitkit/data/entities/TransferEntity.kt b/app/src/main/java/to/bitkit/data/entities/TransferEntity.kt
@@ -18,4 +18,6 @@ data class TransferEntity(
     val createdAt: Long,
     val settledAt: Long? = null,
     val claimableAtHeight: Int? = null,
+    val txTotalSats: Long? = null,
+    val preTransferOnchainSats: Long? = null,
 )
diff --git a/app/src/main/java/to/bitkit/models/BalanceState.kt b/app/src/main/java/to/bitkit/models/BalanceState.kt
@@ -15,7 +15,14 @@ data class BalanceState(
     val balanceInTransferToSpending: ULong = 0uL,
     val hardwareWallets: List<HwWalletBalance> = emptyList(),
 ) {
-    val totalSats get() = totalOnchainSats + totalLightningSats
+    val totalSats
+        get() = totalOnchainSats
+            .safe()
+            .plus(totalLightningSats.safe())
+            .safe()
+            .plus(balanceInTransferToSavings.safe())
+            .safe()
+            .plus(balanceInTransferToSpending.safe())
 
     val totalHardwareSats get() = hardwareWallets.fold(0uL) { acc, wallet -> acc.safe() + wallet.sats.safe() }
 
diff --git a/app/src/main/java/to/bitkit/repositories/TransferRepo.kt b/app/src/main/java/to/bitkit/repositories/TransferRepo.kt
@@ -62,6 +62,8 @@ class TransferRepo @Inject constructor(
         fundingTxId: String? = null,
         lspOrderId: String? = null,
         claimableAtHeight: UInt? = null,
+        txTotalSats: Long? = null,
+        preTransferOnchainSats: Long? = null,
     ): Result<String> = withContext(bgDispatcher) {
         runCatching {
             val id = UUID.randomUUID().toString()
@@ -76,6 +78,8 @@ class TransferRepo @Inject constructor(
                     isSettled = false,
                     createdAt = clock.now().epochSeconds,
                     claimableAtHeight = claimableAtHeight?.toInt(),
+                    txTotalSats = txTotalSats,
+                    preTransferOnchainSats = preTransferOnchainSats,
                 )
             )
             Logger.info("Created transfer: id=$id type=$type channelId=$channelId", context = TAG)
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt
@@ -164,6 +164,7 @@ fun ActivityExploreScreen(
                 val toastMessage = stringResource(R.string.common__copied)
                 ActivityExploreContent(
                     item = item,
+                    isHardware = uiState.isHardwareActivity,
                     txDetails = txDetails,
                     boostTxDoesExist = boostTxDoesExist,
                     onCopy = { text ->
@@ -187,6 +188,7 @@ fun ActivityExploreScreen(
 @Composable
 private fun ActivityExploreContent(
     item: Activity,
+    isHardware: Boolean = false,
     txDetails: TransactionDetails? = null,
     boostTxDoesExist: Map<String, Boolean> = emptyMap(),
     onCopy: (String) -> Unit = {},
@@ -210,7 +212,7 @@ private fun ActivityExploreContent(
                 showBitcoinSymbol = false,
                 modifier = Modifier.weight(1f),
             )
-            ActivityIcon(activity = item, size = 48.dp)
+            ActivityIcon(activity = item, size = 48.dp, isHardware = isHardware)
         }
 
         Spacer(modifier = Modifier.height(16.dp))
@@ -219,6 +221,7 @@ private fun ActivityExploreContent(
             is Activity.Onchain -> {
                 OnchainDetails(
                     onchain = item,
+                    isHardware = isHardware,
                     onCopy = onCopy,
                     txDetails = txDetails,
                     boostTxDoesExist = boostTxDoesExist,
@@ -281,6 +284,7 @@ private fun LightningDetails(
 @Composable
 private fun ColumnScope.OnchainDetails(
     onchain: Activity.Onchain,
+    isHardware: Boolean,
     onCopy: (String) -> Unit,
     txDetails: TransactionDetails?,
     boostTxDoesExist: Map<String, Boolean> = emptyMap(),
@@ -323,7 +327,7 @@ private fun ColumnScope.OnchainDetails(
                 }
             },
         )
-    } else {
+    } else if (!isHardware && !onchain.v1.isTransfer) {
         CircularProgressIndicator(
             strokeWidth = 2.dp,
             modifier = Modifier
diff --git a/app/src/main/java/to/bitkit/usecases/DeriveBalanceStateUseCase.kt b/app/src/main/java/to/bitkit/usecases/DeriveBalanceStateUseCase.kt
@@ -47,8 +47,12 @@ class DeriveBalanceStateUseCase @Inject constructor(
             val coopCloseSavingsSats = getCoopCloseTransferSats(activeTransfers, channels, balanceDetails)
             val lingeringCoopCloseSats = getLingeringCoopCloseSats(activeTransfers, channels, balanceDetails)
             val toSpendingAmount = paidOrdersSats.safe() + pendingChannelsSats.safe()
+            val orderPaymentsOnchainToSubtract = getOrderPaymentOnchainToSubtract(
+                activeTransfers = activeTransfers,
+                currentOnchainSats = balanceDetails.totalOnchainBalanceSats,
+            )
 
-            val totalOnchainSats = balanceDetails.totalOnchainBalanceSats
+            val totalOnchainSats = balanceDetails.totalOnchainBalanceSats.safe() - orderPaymentsOnchainToSubtract.safe()
             val channelFundableBalance = getMaxChannelFundableAmount(lightningRepo.getChannelFundableBalance())
             val afterPendingChannels = balanceDetails.totalLightningBalanceSats.safe() - pendingChannelsSats.safe()
             val afterClosingChannels = afterPendingChannels.safe() - toSavingsAmount.safe()
@@ -95,6 +99,27 @@ class DeriveBalanceStateUseCase @Inject constructor(
         return amount
     }
 
+    private fun getOrderPaymentOnchainToSubtract(
+        activeTransfers: List<TransferEntity>,
+        currentOnchainSats: ULong,
+    ): ULong {
+        var amount = 0uL
+        val orderPayments = activeTransfers.filter {
+            it.type.isToSpending() && it.fundingTxId != null && it.lspOrderId != null
+        }
+
+        for (transfer in orderPayments) {
+            val txTotalSats = transfer.txTotalSats?.takeIf { it > 0 }?.toULong()
+            val preTransferOnchainSats = transfer.preTransferOnchainSats?.takeIf { it > 0 }?.toULong()
+
+            if (txTotalSats != null && preTransferOnchainSats != null && currentOnchainSats >= preTransferOnchainSats) {
+                amount = amount.safe() + txTotalSats.safe()
+            }
+        }
+
+        return amount
+    }
+
     private suspend fun getPendingChannelsSats(
         transfers: List<TransferEntity>,
         channels: List<ChannelDetails>,
diff --git a/app/src/main/java/to/bitkit/viewmodels/TransferViewModel.kt b/app/src/main/java/to/bitkit/viewmodels/TransferViewModel.kt
@@ -206,8 +206,8 @@ class TransferViewModel @Inject constructor(
             val address = order.payment?.onchain?.address.orEmpty()
 
             // Use live spendableOnchainBalanceSats (not cached) to respect anchor reserves
-            val spendableBalance =
-                lightningRepo.getBalancesAsync().getOrNull()?.spendableOnchainBalanceSats ?: 0uL
+            val balanceDetails = lightningRepo.getBalancesAsync().getOrNull()
+            val spendableBalance = balanceDetails?.spendableOnchainBalanceSats ?: 0uL
             val sendAllFee = lightningRepo.estimateSendAllFee(
                 address = address,
                 speed = speed,
@@ -222,6 +222,24 @@ class TransferViewModel @Inject constructor(
             val shouldUseSendAll =
                 expectedChange >= 0 && expectedChange < TRANSFER_SEND_ALL_THRESHOLD_SATS
 
+            val miningFee = if (shouldUseSendAll) {
+                sendAllFee
+            } else {
+                lightningRepo.calculateTotalFee(
+                    amountSats = order.feeSat,
+                    address = address,
+                    speed = speed,
+                ).getOrElse {
+                    Logger.warn("Failed to estimate transfer funding fee", it, context = TAG)
+                    0uL
+                }
+            }
+            val txTotalSats = if (shouldUseSendAll) {
+                spendableBalance
+            } else {
+                order.feeSat.safe() + miningFee.safe()
+            }
+
             Logger.debug(
                 "BT confirm: spendable=$spendableBalance, feeSat=${order.feeSat}, " +
                     "sendAllFee=$sendAllFee, expectedChange=$expectedChange, sendAll=$shouldUseSendAll",
@@ -237,7 +255,14 @@ class TransferViewModel @Inject constructor(
                     channelId = order.channel?.shortChannelId,
                     isMaxAmount = shouldUseSendAll,
                 )
-                .onSuccess { txId -> fundPaidOrder(order, txId) }
+                .onSuccess { txId ->
+                    fundPaidOrder(
+                        order = order,
+                        txId = txId,
+                        txTotalSats = txTotalSats,
+                        preTransferOnchainSats = balanceDetails?.totalOnchainBalanceSats ?: spendableBalance,
+                    )
+                }
                 .onFailure { error ->
                     ToastEventBus.send(error)
                 }
@@ -251,13 +276,17 @@ class TransferViewModel @Inject constructor(
         createTransferActivity: Boolean = false,
         fee: ULong = 0uL,
         feeRate: ULong = 0uL,
+        txTotalSats: ULong? = null,
+        preTransferOnchainSats: ULong? = null,
     ) {
         cacheStore.addPaidOrder(orderId = order.id, txId = txId)
         transferRepo.createTransfer(
             type = TransferType.TO_SPENDING,
             amountSats = order.clientBalanceSat.toLong(),
             fundingTxId = txId,
             lspOrderId = order.id,
+            txTotalSats = txTotalSats?.toLong(),
+            preTransferOnchainSats = preTransferOnchainSats?.toLong(),
         )
         if (createTransferActivity) {
             transferRepo.createPendingToSpendingActivity(
diff --git a/app/src/test/java/to/bitkit/models/BalanceStateTest.kt b/app/src/test/java/to/bitkit/models/BalanceStateTest.kt
@@ -11,6 +11,17 @@ class BalanceStateTest {
         assertEquals(150uL, state.totalSats)
     }
 
+    @Test
+    fun `totalSats includes balances in transfer`() {
+        val state = BalanceState(
+            totalOnchainSats = 100uL,
+            totalLightningSats = 50uL,
+            balanceInTransferToSavings = 10uL,
+            balanceInTransferToSpending = 15uL,
+        )
+        assertEquals(175uL, state.totalSats)
+    }
+
     @Test
     fun `totalHardwareSats sums all hardware wallet balances`() {
         val state = BalanceState(
@@ -27,9 +38,10 @@ class BalanceStateTest {
         val state = BalanceState(
             totalOnchainSats = 100uL,
             totalLightningSats = 50uL,
+            balanceInTransferToSpending = 15uL,
             hardwareWallets = listOf(HwWalletBalance(id = "dev1", sats = 25uL)),
         )
-        assertEquals(175uL, state.totalWithHardwareSats)
+        assertEquals(190uL, state.totalWithHardwareSats)
     }
 
     @Test
@@ -46,4 +58,13 @@ class BalanceStateTest {
         )
         assertEquals(ULong.MAX_VALUE, state.totalWithHardwareSats)
     }
+
+    @Test
+    fun `totalSats saturates instead of overflowing`() {
+        val state = BalanceState(
+            totalOnchainSats = ULong.MAX_VALUE,
+            balanceInTransferToSpending = 10uL,
+        )
+        assertEquals(ULong.MAX_VALUE, state.totalSats)
+    }
 }
diff --git a/app/src/test/java/to/bitkit/usecases/DeriveBalanceStateUseCaseTest.kt b/app/src/test/java/to/bitkit/usecases/DeriveBalanceStateUseCaseTest.kt
diff --git a/app/src/test/java/to/bitkit/viewmodels/TransferViewModelTest.kt b/app/src/test/java/to/bitkit/viewmodels/TransferViewModelTest.kt
diff --git a/changelog.d/next/1058.fixed.md b/changelog.d/next/1058.fixed.md

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import to.bitkit.env.Env`
`31`	`31`	`ConfigEntity::class,`
`32`	`32`	`TransferEntity::class,`
`33`	`33`	`],`
`34`		`- version = 6,`
	`34`	`+ version = 7,`
`35`	`35`	`)`
`36`	`36`	`@TypeConverters(StringListConverter::class)`
`37`	`37`	`abstract class AppDb : RoomDatabase() {`
`@@ -45,6 +45,13 @@ abstract class AppDb : RoomDatabase() {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ private val MIGRATION_6_7 = object : Migration(6, 7) {`
	`49`	`+ override fun migrate(db: SupportSQLiteDatabase) {`
	`50`	`+ db.execSQL("ALTER TABLE transfers ADD COLUMN txTotalSats INTEGER DEFAULT NULL")`
	`51`	`+ db.execSQL("ALTER TABLE transfers ADD COLUMN preTransferOnchainSats INTEGER DEFAULT NULL")`
	`52`	`+ }`
	`53`	`+ }`
	`54`	`+`
`48`	`55`	`private const val DB_NAME = "${BuildConfig.APPLICATION_ID}.sqlite"`
`49`	`56`
`50`	`57`	`@Volatile`
`@@ -72,7 +79,7 @@ abstract class AppDb : RoomDatabase() {`
`72`	`79`	`}`
`73`	`80`	`}`
`74`	`81`	`})`
`75`		`- .addMigrations(MIGRATION_5_6)`
	`82`	`+ .addMigrations(MIGRATION_5_6, MIGRATION_6_7)`
`76`	`83`	`.apply {`
`77`	`84`	`if (Env.isDebug) fallbackToDestructiveMigration(dropAllTables = true)`
`78`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,6 @@ data class TransferEntity(`
`18`	`18`	`val createdAt: Long,`
`19`	`19`	`val settledAt: Long? = null,`
`20`	`20`	`val claimableAtHeight: Int? = null,`
	`21`	`+ val txTotalSats: Long? = null,`
	`22`	`+ val preTransferOnchainSats: Long? = null,`
`21`	`23`	`)`