Separate unspendable balance amounts

as timeLocked and notRelayed
horizontalsystems · Mar 28, 2024 · 8322e5c · 8322e5c
1 parent d0d3283
commit 8322e5c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/BalanceFragment.kt b/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/BalanceFragment.kt
@@ -41,7 +41,7 @@ class BalanceFragment : Fragment() {
                 }
                 else -> {
                     balanceValue.text = NumberFormatHelper.cryptoAmountFormat.format(balance.spendable / 100_000_000.0)
-                    balanceUnspendableValue.text = NumberFormatHelper.cryptoAmountFormat.format(balance.unspendable / 100_000_000.0)
+                    balanceUnspendableValue.text = NumberFormatHelper.cryptoAmountFormat.format((balance.unspendableTimeLocked + balance.unspendableNotRelayed) / 100_000_000.0)
                 }
             }
         })

diff --git a/...incore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/UnspentOutputProvider.kt b/...incore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/UnspentOutputProvider.kt
@@ -18,17 +18,20 @@ class UnspentOutputProvider(
         }
     }
 
-    private fun getUnspendableUtxo(): List<UnspentOutput> {
-        return allUtxo().filter {
-            !pluginManager.isSpendable(it) || it.transaction.status != Transaction.Status.RELAYED
-        }
+    private fun getUnspendableTimeLockedUtxo() = allUtxo().filter {
+        !pluginManager.isSpendable(it)
+    }
+
+    private fun getUnspendableNotRelayedUtxo() = allUtxo().filter {
+        it.transaction.status != Transaction.Status.RELAYED
     }
 
     fun getBalance(): BalanceInfo {
         val spendable = getSpendableUtxo().sumOf { it.output.value }
-        val unspendable = getUnspendableUtxo().sumOf { it.output.value }
+        val unspendableTimeLocked = getUnspendableTimeLockedUtxo().sumOf { it.output.value }
+        val unspendableNotRelayed = getUnspendableNotRelayedUtxo().sumOf { it.output.value }
 
-        return BalanceInfo(spendable, unspendable)
+        return BalanceInfo(spendable, unspendableTimeLocked, unspendableNotRelayed)
     }
 
     // Only confirmed spendable outputs

diff --git a/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/models/TransactionInfo.kt b/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/models/TransactionInfo.kt
@@ -187,4 +187,4 @@ data class BlockInfo(
         val timestamp: Long
 )
 
-data class BalanceInfo(val spendable: Long, val unspendable: Long)
+data class BalanceInfo(val spendable: Long, val unspendableTimeLocked: Long, val unspendableNotRelayed: Long)