Integrate LDK events#487

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 7 commits into from
Nov 28, 2025
Merged

Integrate LDK events #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
185c51f
Integrate LDK events
ben-kaufman Nov 28, 2025
9b1a6f0
chore: cleanup
ovitrif Nov 28, 2025
2f0122f
chore: lint
ovitrif Nov 28, 2025
83d3c6e
Remove unused istransfer
ben-kaufman Nov 28, 2025
ab38e84
Merge branch 'feat/onchain-events' into ldk-events-integration
ben-kaufman Nov 28, 2025
98e6727
Remove unused variable
ben-kaufman Nov 28, 2025
d6b6799
Fix comments
ben-kaufman Nov 28, 2025
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
17 changes: 0 additions & 17 deletions app/src/main/java/to/bitkit/data/CacheStore.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,6 @@ class CacheStore @Inject constructor(
}
}

suspend fun addActivityToPendingDelete(activityId: String) {
if (activityId.isBlank()) return
if (activityId in store.data.first().activitiesPendingDelete) return
store.updateData {
it.copy(activitiesPendingDelete = it.activitiesPendingDelete + activityId)
}
}

suspend fun removeActivityFromPendingDelete(activityId: String) {
if (activityId.isBlank()) return
if (activityId !in store.data.first().activitiesPendingDelete) return
store.updateData {
it.copy(activitiesPendingDelete = it.activitiesPendingDelete - activityId)
}
}

suspend fun addActivityToPendingBoost(pendingBoostActivity: PendingBoostActivity) {
if (pendingBoostActivity in store.data.first().pendingBoostActivities) return
store.updateData {
Expand DownExpand Up@@ -137,7 +121,6 @@ data class AppCacheData(
val balance: BalanceState? = null,
val backupStatuses: Map<BackupCategory, BackupItemStatus> = mapOf(),
val deletedActivities: List<String> = listOf(),
val activitiesPendingDelete: List<String> = listOf(),
val lastLightningPaymentId: String? = null,
val pendingBoostActivities: List<PendingBoostActivity> = listOf(),
)
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ class NotifyPaymentReceivedHandler @Inject constructor(
is NotifyPaymentReceived.Command.Lightning -> true
is NotifyPaymentReceived.Command.Onchain -> {
delay(DELAY_FOR_ACTIVITY_SYNC_MS)
activityRepo.shouldShowPaymentReceived(command.paymentHashOrTxId, command.sats)
activityRepo.shouldShowReceivedSheet(command.paymentHashOrTxId, command.sats)
}
}

Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/to/bitkit/ext/Activities.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,6 @@ fun Activity.totalValue() = when (this) {
}
}

fun Activity.canBeBoosted() = when (this) {
is Activity.Onchain -> !v1.confirmed && v1.doesExist && !v1.isBoosted && !v1.isTransfer && v1.value > 0uL
else -> false
}

fun Activity.isBoosted() = when (this) {
is Activity.Onchain -> v1.isBoosted
else -> false
Expand Down
162 changes: 56 additions & 106 deletions app/src/main/java/to/bitkit/repositories/ActivityRepo.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentDirection
import org.lightningdevkit.ldknode.PaymentKind
import org.lightningdevkit.ldknode.TransactionDetails
import to.bitkit.data.CacheStore
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.di.BgDispatcher
Expand All@@ -36,7 +37,6 @@ import to.bitkit.ext.nowTimestamp
import to.bitkit.ext.rawId
import to.bitkit.models.ActivityBackupV1
import to.bitkit.services.CoreService
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton
Expand All@@ -50,7 +50,6 @@ class ActivityRepo @Inject constructor(
private val coreService: CoreService,
private val lightningRepo: LightningRepo,
private val blocktankRepo: BlocktankRepo,
private val addressChecker: AddressChecker,
private val cacheStore: CacheStore,
private val transferRepo: TransferRepo,
private val clock: Clock,
Expand DownExpand Up@@ -83,8 +82,6 @@ class ActivityRepo @Inject constructor(

isSyncingLdkNodePayments.update { true }

deletePendingActivities()

lightningRepo.getPayments().mapCatching { payments ->
Logger.debug("Got payments with success, syncing activities", context = TAG)
syncLdkNodePayments(payments).getOrThrow()
Expand DownExpand Up@@ -167,67 +164,13 @@ class ActivityRepo @Inject constructor(
}

private suspend fun findClosedChannelForTransaction(txid: String): String? {
return try {
val closedChannelsResult = getClosedChannels(SortDirection.DESC)
val closedChannels = closedChannelsResult.getOrNull() ?: return null
if (closedChannels.isEmpty()) return null

val txDetails = addressChecker.getTransaction(txid)

txDetails.vin.firstNotNullOfOrNull { input ->
val inputTxid = input.txid ?: return@firstNotNullOfOrNull null
val inputVout = input.vout ?: return@firstNotNullOfOrNull null

closedChannels.firstOrNull { channel ->
channel.fundingTxoTxid == inputTxid && channel.fundingTxoIndex == inputVout.toUInt()
}?.channelId
}
} catch (e: Exception) {
Logger.warn(
"Failed to check if transaction $txid spends closed channel funding UTXO",
e,
context = TAG
)
null
}
return coreService.activity.findClosedChannelForTransaction(txid, null)
}

private suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
return coreService.activity.getOnchainActivityByTxId(txid)
}

/**
* Determines whether to show the payment received UI for an onchain transaction.
* Returns false for:
* - Zero value transactions
* - Channel closure transactions (transfers to savings)
* - RBF replacement transactions with the same value as the original
*/
suspend fun shouldShowPaymentReceived(txid: String, value: ULong): Boolean = withContext(bgDispatcher) {
if (value == 0uL) return@withContext false

if (findClosedChannelForTransaction(txid) != null) {
Logger.debug("Skipping payment received UI for channel closure tx: $txid", context = TAG)
return@withContext false
}

val onchainActivity = getOnchainActivityByTxId(txid)
if (onchainActivity != null && onchainActivity.boostTxIds.isNotEmpty()) {
for (replacedTxid in onchainActivity.boostTxIds) {
val replacedActivity = getOnchainActivityByTxId(replacedTxid)
if (replacedActivity != null && replacedActivity.value == value) {
Logger.info(
"Skipping payment received UI for RBF replacement $txid with same value as $replacedTxid",
context = TAG
)
return@withContext false
}
}
}

return@withContext true
}

/**
* Checks if a transaction is inbound (received) by looking up the payment direction.
*/
Expand All@@ -247,6 +190,58 @@ class ActivityRepo @Inject constructor(
return@withContext !onchainActivity.doesExist
}

suspend fun handleOnchainTransactionReceived(
txid: String,
details: TransactionDetails,
) {
coreService.activity.handleOnchainTransactionReceived(txid, details)
notifyActivitiesChanged()
}

suspend fun handleOnchainTransactionConfirmed(
txid: String,
details: TransactionDetails,
) {
coreService.activity.handleOnchainTransactionConfirmed(txid, details)
notifyActivitiesChanged()
}

suspend fun handleOnchainTransactionReplaced(txid: String, conflicts: List<String>) {
coreService.activity.handleOnchainTransactionReplaced(txid, conflicts)
notifyActivitiesChanged()
}

suspend fun handleOnchainTransactionReorged(txid: String) {
coreService.activity.handleOnchainTransactionReorged(txid)
notifyActivitiesChanged()
}

suspend fun handleOnchainTransactionEvicted(txid: String) {
coreService.activity.handleOnchainTransactionEvicted(txid)
notifyActivitiesChanged()
}

suspend fun handlePaymentEvent(paymentHash: String) {
coreService.activity.handlePaymentEvent(paymentHash)
notifyActivitiesChanged()
}

suspend fun shouldShowReceivedSheet(txid: String, value: ULong): Boolean {
return coreService.activity.shouldShowReceivedSheet(txid, value)
}

suspend fun getBoostTxDoesExist(boostTxIds: List<String>): Map<String, Boolean> {
return coreService.activity.getBoostTxDoesExist(boostTxIds)
}

suspend fun isCpfpChildTransaction(txId: String): Boolean {
return coreService.activity.isCpfpChildTransaction(txId)
}

suspend fun getTxIdsInBoostTxIds(): Set<String> {
return coreService.activity.getTxIdsInBoostTxIds()
}

/**
* Gets a specific activity by payment hash or txID with retry logic
*/
Expand DownExpand Up@@ -392,22 +387,13 @@ class ActivityRepo @Inject constructor(
).fold(
onSuccess = {
Logger.debug(
"Activity $id updated with success. new data: $activity. " +
"Marking activity $activityIdToDelete as removed from mempool",
"Activity $id updated with success. new data: $activity",
context = TAG
)

val tags = coreService.activity.tags(activityIdToDelete)
addTagsToActivity(activityId = id, tags = tags)

markActivityAsRemovedFromMempool(activityIdToDelete).onFailure { e ->
Logger.warn(
"Failed to mark $activityIdToDelete as removed from mempool, caching to retry on next sync",
e = e,
context = TAG
)
cacheStore.addActivityToPendingDelete(activityId = activityIdToDelete)
}
Result.success(Unit)
},
onFailure = { e ->
Expand All@@ -422,16 +408,6 @@ class ActivityRepo @Inject constructor(
)
}

private suspend fun deletePendingActivities() = withContext(bgDispatcher) {
cacheStore.data.first().activitiesPendingDelete.map { activityId ->
async {
markActivityAsRemovedFromMempool(activityId).onSuccess {
cacheStore.removeActivityFromPendingDelete(activityId)
}
}
}.awaitAll()
}

private suspend fun boostPendingActivities() = withContext(bgDispatcher) {
cacheStore.data.first().pendingBoostActivities.map { pendingBoostActivity ->
async {
Expand DownExpand Up@@ -484,32 +460,6 @@ class ActivityRepo @Inject constructor(
}.awaitAll()
}

/**
* Marks an activity as removed from mempool (sets doesExist = false).
* Used for RBFed transactions that are replaced.
*/
private suspend fun markActivityAsRemovedFromMempool(activityId: String): Result<Unit> = withContext(bgDispatcher) {
return@withContext runCatching {
val existingActivity = getActivity(activityId).getOrNull()
?: return@withContext Result.failure(Exception("Activity $activityId not found"))

if (existingActivity is Activity.Onchain) {
val updatedActivity = Activity.Onchain(
v1 = existingActivity.v1.copy(
doesExist = false,
updatedAt = nowTimestamp().toEpochMilli().toULong()
)
)
updateActivity(id = activityId, activity = updatedActivity, forceUpdate = true).getOrThrow()
notifyActivitiesChanged()
} else {
return@withContext Result.failure(Exception("Activity $activityId is not an onchain activity"))
}
}.onFailure { e ->
Logger.error("markActivityAsRemovedFromMempool error for ID: $activityId", e, context = TAG)
}
}

/**
* Deletes an activity
*/
Expand Down
13 changes: 13 additions & 0 deletions app/src/main/java/to/bitkit/repositories/LightningRepo.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
import org.lightningdevkit.ldknode.PeerDetails
import org.lightningdevkit.ldknode.SpendableUtxo
import org.lightningdevkit.ldknode.TransactionDetails
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
Expand DownExpand Up@@ -717,6 +718,18 @@ class LightningRepo @Inject constructor(
Result.success(payments)
}

suspend fun getTransactionDetails(txid: Txid): Result<TransactionDetails?> = executeWhenNodeRunning(
"Get transaction details by txid"
) {
Result.success(lightningService.getTransactionDetails(txid))
}

suspend fun getAddressBalance(address: String): Result<ULong> = executeWhenNodeRunning("Get address balance") {
runCatching {
lightningService.getAddressBalance(address)
}
}

suspend fun listSpendableOutputs(): Result<List<SpendableUtxo>> = executeWhenNodeRunning("List spendable outputs") {
lightningService.listSpendableOutputs()
}
Expand Down
7 changes: 2 additions & 5 deletions app/src/main/java/to/bitkit/repositories/WalletRepo.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ import to.bitkit.models.toDerivationPath
import to.bitkit.services.CoreService
import to.bitkit.usecases.DeriveBalanceStateUseCase
import to.bitkit.usecases.WipeWalletUseCase
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Bip21Utils
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
Expand All@@ -43,7 +42,6 @@ class WalletRepo @Inject constructor(
private val keychain: Keychain,
private val coreService: CoreService,
private val settingsStore: SettingsStore,
private val addressChecker: AddressChecker,
private val lightningRepo: LightningRepo,
private val cacheStore: CacheStore,
private val preActivityMetadataRepo: PreActivityMetadataRepo,
Expand DownExpand Up@@ -83,9 +81,8 @@ class WalletRepo @Inject constructor(

suspend fun checkAddressUsage(address: String): Result<Boolean> = withContext(bgDispatcher) {
return@withContext try {
val addressInfo = addressChecker.getAddressInfo(address)
val hasTransactions = addressInfo.chain_stats.tx_count > 0 || addressInfo.mempool_stats.tx_count > 0
Result.success(hasTransactions)
val result = coreService.isAddressUsed(address)
Result.success(result)
} catch (e: Exception) {
Logger.error("checkAddressUsage error", e, context = TAG)
Result.failure(e)
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Integrate LDK events#487

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 7 commits into

from

Nov 28, 2025
 Merged


Integrate LDK events
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
185c51f

Integrate LDK events


ben-kaufman Nov 28, 2025
9b1a6f0

chore: cleanup


ovitrif Nov 28, 2025
2f0122f

chore: lint


ovitrif Nov 28, 2025
83d3c6e

Remove unused istransfer


ben-kaufman Nov 28, 2025
ab38e84

Merge branch 'feat/onchain-events' into ldk-events-integration


ben-kaufman Nov 28, 2025
98e6727

Remove unused variable


ben-kaufman Nov 28, 2025
d6b6799

Fix comments


ben-kaufman Nov 28, 2025

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


17 changes: 0 additions & 17 deletions
app/src/main/java/to/bitkit/data/CacheStore.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,6 @@ class CacheStore @Inject constructor(
 }
 }

 suspend fun addActivityToPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete + activityId)
 }
 }

 suspend fun removeActivityFromPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId !in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete - activityId)
 }
 }

 suspend fun addActivityToPendingBoost(pendingBoostActivity: PendingBoostActivity) {
 if (pendingBoostActivity in store.data.first().pendingBoostActivities) return
 store.updateData {
Expand DownExpand Up@@ -137,7 +121,6 @@ data class AppCacheData(
 val balance: BalanceState? = null,
 val backupStatuses: Map<BackupCategory, BackupItemStatus> = mapOf(),
 val deletedActivities: List<String> = listOf(),
 val activitiesPendingDelete: List<String> = listOf(),
 val lastLightningPaymentId: String? = null,
 val pendingBoostActivities: List<PendingBoostActivity> = listOf(),
)

2 changes: 1 addition & 1 deletion
app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ class NotifyPaymentReceivedHandler @Inject constructor(
 is NotifyPaymentReceived.Command.Lightning -> true
 is NotifyPaymentReceived.Command.Onchain -> {
 delay(DELAY_FOR_ACTIVITY_SYNC_MS)
 activityRepo.shouldShowPaymentReceived(command.paymentHashOrTxId, command.sats)
 activityRepo.shouldShowReceivedSheet(command.paymentHashOrTxId, command.sats)
 }
 }

Expand Down

5 changes: 0 additions & 5 deletions
app/src/main/java/to/bitkit/ext/Activities.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,6 @@ fun Activity.totalValue() = when (this) {
 }
}

fun Activity.canBeBoosted() = when (this) {
 is Activity.Onchain -> !v1.confirmed && v1.doesExist && !v1.isBoosted && !v1.isTransfer && v1.value > 0uL
 else -> false
}

fun Activity.isBoosted() = when (this) {
 is Activity.Onchain -> v1.isBoosted
 else -> false
Expand Down

162 changes: 56 additions & 106 deletions
app/src/main/java/to/bitkit/repositories/ActivityRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentDirection
import org.lightningdevkit.ldknode.PaymentKind
import org.lightningdevkit.ldknode.TransactionDetails
import to.bitkit.data.CacheStore
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.di.BgDispatcher
Expand All@@ -36,7 +37,6 @@ import to.bitkit.ext.nowTimestamp
import to.bitkit.ext.rawId
import to.bitkit.models.ActivityBackupV1
import to.bitkit.services.CoreService
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton
Expand All@@ -50,7 +50,6 @@ class ActivityRepo @Inject constructor(
 private val coreService: CoreService,
 private val lightningRepo: LightningRepo,
 private val blocktankRepo: BlocktankRepo,
 private val addressChecker: AddressChecker,
 private val cacheStore: CacheStore,
 private val transferRepo: TransferRepo,
 private val clock: Clock,
Expand DownExpand Up@@ -83,8 +82,6 @@ class ActivityRepo @Inject constructor(

 isSyncingLdkNodePayments.update { true }

 deletePendingActivities()

 lightningRepo.getPayments().mapCatching { payments ->
 Logger.debug("Got payments with success, syncing activities", context = TAG)
 syncLdkNodePayments(payments).getOrThrow()
Expand DownExpand Up@@ -167,67 +164,13 @@ class ActivityRepo @Inject constructor(
 }

 private suspend fun findClosedChannelForTransaction(txid: String): String? {
 return try {
 val closedChannelsResult = getClosedChannels(SortDirection.DESC)
 val closedChannels = closedChannelsResult.getOrNull() ?: return null
 if (closedChannels.isEmpty()) return null

 val txDetails = addressChecker.getTransaction(txid)

 txDetails.vin.firstNotNullOfOrNull { input ->
 val inputTxid = input.txid ?: return@firstNotNullOfOrNull null
 val inputVout = input.vout ?: return@firstNotNullOfOrNull null

 closedChannels.firstOrNull { channel ->
 channel.fundingTxoTxid == inputTxid && channel.fundingTxoIndex == inputVout.toUInt()
 }?.channelId
 }
 } catch (e: Exception) {
 Logger.warn(
 "Failed to check if transaction $txid spends closed channel funding UTXO",
 e,
 context = TAG
 )
 null
 }
 return coreService.activity.findClosedChannelForTransaction(txid, null)
 }

private suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 return coreService.activity.getOnchainActivityByTxId(txid)
 }

 /**
 * Determines whether to show the payment received UI for an onchain transaction.
 * Returns false for:
 * - Zero value transactions
 * - Channel closure transactions (transfers to savings)
 * - RBF replacement transactions with the same value as the original
 */
 suspend fun shouldShowPaymentReceived(txid: String, value: ULong): Boolean = withContext(bgDispatcher) {
 if (value == 0uL) return@withContext false

 if (findClosedChannelForTransaction(txid) != null) {
 Logger.debug("Skipping payment received UI for channel closure tx: $txid", context = TAG)
 return@withContext false
 }

 val onchainActivity = getOnchainActivityByTxId(txid)
 if (onchainActivity != null && onchainActivity.boostTxIds.isNotEmpty()) {
 for (replacedTxid in onchainActivity.boostTxIds) {
 val replacedActivity = getOnchainActivityByTxId(replacedTxid)
 if (replacedActivity != null && replacedActivity.value == value) {
 Logger.info(
 "Skipping payment received UI for RBF replacement $txid with same value as $replacedTxid",
 context = TAG
 )
 return@withContext false
 }
 }
 }

 return@withContext true
 }

 /**
 * Checks if a transaction is inbound (received) by looking up the payment direction.
 */
Expand All@@ -247,6 +190,58 @@ class ActivityRepo @Inject constructor(
 return@withContext !onchainActivity.doesExist
 }

 suspend fun handleOnchainTransactionReceived(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionReceived(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionConfirmed(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionConfirmed(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReplaced(txid: String, conflicts: List<String>) {
 coreService.activity.handleOnchainTransactionReplaced(txid, conflicts)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReorged(txid: String) {
 coreService.activity.handleOnchainTransactionReorged(txid)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionEvicted(txid: String) {
 coreService.activity.handleOnchainTransactionEvicted(txid)
 notifyActivitiesChanged()
 }

 suspend fun handlePaymentEvent(paymentHash: String) {
 coreService.activity.handlePaymentEvent(paymentHash)
 notifyActivitiesChanged()
 }

 suspend fun shouldShowReceivedSheet(txid: String, value: ULong): Boolean {
 return coreService.activity.shouldShowReceivedSheet(txid, value)
 }

 suspend fun getBoostTxDoesExist(boostTxIds: List<String>): Map<String, Boolean> {
 return coreService.activity.getBoostTxDoesExist(boostTxIds)
 }

 suspend fun isCpfpChildTransaction(txId: String): Boolean {
 return coreService.activity.isCpfpChildTransaction(txId)
 }

 suspend fun getTxIdsInBoostTxIds(): Set<String> {
 return coreService.activity.getTxIdsInBoostTxIds()
 }

 /**
 * Gets a specific activity by payment hash or txID with retry logic
 */
Expand DownExpand Up@@ -392,22 +387,13 @@ class ActivityRepo @Inject constructor(
 ).fold(
 onSuccess = {
 Logger.debug(
 "Activity $id updated with success. new data: $activity. " +
 "Marking activity $activityIdToDelete as removed from mempool",
 "Activity $id updated with success. new data: $activity",
 context = TAG
 )

 val tags = coreService.activity.tags(activityIdToDelete)
 addTagsToActivity(activityId = id, tags = tags)

 markActivityAsRemovedFromMempool(activityIdToDelete).onFailure { e ->
 Logger.warn(
 "Failed to mark $activityIdToDelete as removed from mempool, caching to retry on next sync",
 e = e,
 context = TAG
 )
 cacheStore.addActivityToPendingDelete(activityId = activityIdToDelete)
 }
 Result.success(Unit)
 },
 onFailure = { e ->
Expand All@@ -422,16 +408,6 @@ class ActivityRepo @Inject constructor(
 )
 }

 private suspend fun deletePendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().activitiesPendingDelete.map { activityId ->
 async {
 markActivityAsRemovedFromMempool(activityId).onSuccess {
 cacheStore.removeActivityFromPendingDelete(activityId)
 }
 }
 }.awaitAll()
 }

 private suspend fun boostPendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().pendingBoostActivities.map { pendingBoostActivity ->
 async {
Expand DownExpand Up@@ -484,32 +460,6 @@ class ActivityRepo @Inject constructor(
 }.awaitAll()
 }

 /**
 * Marks an activity as removed from mempool (sets doesExist = false).
 * Used for RBFed transactions that are replaced.
 */
 private suspend fun markActivityAsRemovedFromMempool(activityId: String): Result<Unit> = withContext(bgDispatcher) {
 return@withContext runCatching {
 val existingActivity = getActivity(activityId).getOrNull()
 ?: return@withContext Result.failure(Exception("Activity $activityId not found"))

 if (existingActivity is Activity.Onchain) {
 val updatedActivity = Activity.Onchain(
 v1 = existingActivity.v1.copy(
 doesExist = false,
 updatedAt = nowTimestamp().toEpochMilli().toULong()
 )
 )
 updateActivity(id = activityId, activity = updatedActivity, forceUpdate = true).getOrThrow()
 notifyActivitiesChanged()
 } else {
 return@withContext Result.failure(Exception("Activity $activityId is not an onchain activity"))
 }
 }.onFailure { e ->
 Logger.error("markActivityAsRemovedFromMempool error for ID: $activityId", e, context = TAG)
 }
 }

 /**
 * Deletes an activity
 */
Expand Down

13 changes: 13 additions & 0 deletions
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
import org.lightningdevkit.ldknode.PeerDetails
import org.lightningdevkit.ldknode.SpendableUtxo
import org.lightningdevkit.ldknode.TransactionDetails
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
Expand DownExpand Up@@ -717,6 +718,18 @@ class LightningRepo @Inject constructor(
 Result.success(payments)
 }

 suspend fun getTransactionDetails(txid: Txid): Result<TransactionDetails?> = executeWhenNodeRunning(
 "Get transaction details by txid"
 ) {
 Result.success(lightningService.getTransactionDetails(txid))
 }

 suspend fun getAddressBalance(address: String): Result<ULong> = executeWhenNodeRunning("Get address balance") {
 runCatching {
 lightningService.getAddressBalance(address)
 }
 }

 suspend fun listSpendableOutputs(): Result<List<SpendableUtxo>> = executeWhenNodeRunning("List spendable outputs") {
 lightningService.listSpendableOutputs()
 }
Expand Down

7 changes: 2 additions & 5 deletions
app/src/main/java/to/bitkit/repositories/WalletRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ import to.bitkit.models.toDerivationPath
import to.bitkit.services.CoreService
import to.bitkit.usecases.DeriveBalanceStateUseCase
import to.bitkit.usecases.WipeWalletUseCase
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Bip21Utils
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
Expand All@@ -43,7 +42,6 @@ class WalletRepo @Inject constructor(
 private val keychain: Keychain,
 private val coreService: CoreService,
 private val settingsStore: SettingsStore,
 private val addressChecker: AddressChecker,
 private val lightningRepo: LightningRepo,
 private val cacheStore: CacheStore,
 private val preActivityMetadataRepo: PreActivityMetadataRepo,
Expand DownExpand Up@@ -83,9 +81,8 @@ class WalletRepo @Inject constructor(

 suspend fun checkAddressUsage(address: String): Result<Boolean> = withContext(bgDispatcher) {
 return@withContext try {
 val addressInfo = addressChecker.getAddressInfo(address)
 val hasTransactions = addressInfo.chain_stats.tx_count > 0 || addressInfo.mempool_stats.tx_count > 0
 Result.success(hasTransactions)
 val result = coreService.isAddressUsed(address)
 Result.success(result)
 } catch (e: Exception) {
 Logger.error("checkAddressUsage error", e, context = TAG)
 Result.failure(e)
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Integrate LDK events#487

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 7 commits into

from

Nov 28, 2025
 Merged


Integrate LDK events
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
185c51f

Integrate LDK events


ben-kaufman Nov 28, 2025
9b1a6f0

chore: cleanup


ovitrif Nov 28, 2025
2f0122f

chore: lint


ovitrif Nov 28, 2025
83d3c6e

Remove unused istransfer


ben-kaufman Nov 28, 2025
ab38e84

Merge branch 'feat/onchain-events' into ldk-events-integration


ben-kaufman Nov 28, 2025
98e6727

Remove unused variable


ben-kaufman Nov 28, 2025
d6b6799

Fix comments


ben-kaufman Nov 28, 2025

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


17 changes: 0 additions & 17 deletions
app/src/main/java/to/bitkit/data/CacheStore.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,6 @@ class CacheStore @Inject constructor(
 }
 }

 suspend fun addActivityToPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete + activityId)
 }
 }

 suspend fun removeActivityFromPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId !in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete - activityId)
 }
 }

 suspend fun addActivityToPendingBoost(pendingBoostActivity: PendingBoostActivity) {
 if (pendingBoostActivity in store.data.first().pendingBoostActivities) return
 store.updateData {
Expand DownExpand Up@@ -137,7 +121,6 @@ data class AppCacheData(
 val balance: BalanceState? = null,
 val backupStatuses: Map<BackupCategory, BackupItemStatus> = mapOf(),
 val deletedActivities: List<String> = listOf(),
 val activitiesPendingDelete: List<String> = listOf(),
 val lastLightningPaymentId: String? = null,
 val pendingBoostActivities: List<PendingBoostActivity> = listOf(),
)

2 changes: 1 addition & 1 deletion
app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ class NotifyPaymentReceivedHandler @Inject constructor(
 is NotifyPaymentReceived.Command.Lightning -> true
 is NotifyPaymentReceived.Command.Onchain -> {
 delay(DELAY_FOR_ACTIVITY_SYNC_MS)
 activityRepo.shouldShowPaymentReceived(command.paymentHashOrTxId, command.sats)
 activityRepo.shouldShowReceivedSheet(command.paymentHashOrTxId, command.sats)
 }
 }

Expand Down

5 changes: 0 additions & 5 deletions
app/src/main/java/to/bitkit/ext/Activities.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,6 @@ fun Activity.totalValue() = when (this) {
 }
}

fun Activity.canBeBoosted() = when (this) {
 is Activity.Onchain -> !v1.confirmed && v1.doesExist && !v1.isBoosted && !v1.isTransfer && v1.value > 0uL
 else -> false
}

fun Activity.isBoosted() = when (this) {
 is Activity.Onchain -> v1.isBoosted
 else -> false
Expand Down

162 changes: 56 additions & 106 deletions
app/src/main/java/to/bitkit/repositories/ActivityRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentDirection
import org.lightningdevkit.ldknode.PaymentKind
import org.lightningdevkit.ldknode.TransactionDetails
import to.bitkit.data.CacheStore
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.di.BgDispatcher
Expand All@@ -36,7 +37,6 @@ import to.bitkit.ext.nowTimestamp
import to.bitkit.ext.rawId
import to.bitkit.models.ActivityBackupV1
import to.bitkit.services.CoreService
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton
Expand All@@ -50,7 +50,6 @@ class ActivityRepo @Inject constructor(
 private val coreService: CoreService,
 private val lightningRepo: LightningRepo,
 private val blocktankRepo: BlocktankRepo,
 private val addressChecker: AddressChecker,
 private val cacheStore: CacheStore,
 private val transferRepo: TransferRepo,
 private val clock: Clock,
Expand DownExpand Up@@ -83,8 +82,6 @@ class ActivityRepo @Inject constructor(

 isSyncingLdkNodePayments.update { true }

 deletePendingActivities()

 lightningRepo.getPayments().mapCatching { payments ->
 Logger.debug("Got payments with success, syncing activities", context = TAG)
 syncLdkNodePayments(payments).getOrThrow()
Expand DownExpand Up@@ -167,67 +164,13 @@ class ActivityRepo @Inject constructor(
 }

 private suspend fun findClosedChannelForTransaction(txid: String): String? {
 return try {
 val closedChannelsResult = getClosedChannels(SortDirection.DESC)
 val closedChannels = closedChannelsResult.getOrNull() ?: return null
 if (closedChannels.isEmpty()) return null

 val txDetails = addressChecker.getTransaction(txid)

 txDetails.vin.firstNotNullOfOrNull { input ->
 val inputTxid = input.txid ?: return@firstNotNullOfOrNull null
 val inputVout = input.vout ?: return@firstNotNullOfOrNull null

 closedChannels.firstOrNull { channel ->
 channel.fundingTxoTxid == inputTxid && channel.fundingTxoIndex == inputVout.toUInt()
 }?.channelId
 }
 } catch (e: Exception) {
 Logger.warn(
 "Failed to check if transaction $txid spends closed channel funding UTXO",
 e,
 context = TAG
 )
 null
 }
 return coreService.activity.findClosedChannelForTransaction(txid, null)
 }

private suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 return coreService.activity.getOnchainActivityByTxId(txid)
 }

 /**
 * Determines whether to show the payment received UI for an onchain transaction.
 * Returns false for:
 * - Zero value transactions
 * - Channel closure transactions (transfers to savings)
 * - RBF replacement transactions with the same value as the original
 */
 suspend fun shouldShowPaymentReceived(txid: String, value: ULong): Boolean = withContext(bgDispatcher) {
 if (value == 0uL) return@withContext false

 if (findClosedChannelForTransaction(txid) != null) {
 Logger.debug("Skipping payment received UI for channel closure tx: $txid", context = TAG)
 return@withContext false
 }

 val onchainActivity = getOnchainActivityByTxId(txid)
 if (onchainActivity != null && onchainActivity.boostTxIds.isNotEmpty()) {
 for (replacedTxid in onchainActivity.boostTxIds) {
 val replacedActivity = getOnchainActivityByTxId(replacedTxid)
 if (replacedActivity != null && replacedActivity.value == value) {
 Logger.info(
 "Skipping payment received UI for RBF replacement $txid with same value as $replacedTxid",
 context = TAG
 )
 return@withContext false
 }
 }
 }

 return@withContext true
 }

 /**
 * Checks if a transaction is inbound (received) by looking up the payment direction.
 */
Expand All@@ -247,6 +190,58 @@ class ActivityRepo @Inject constructor(
 return@withContext !onchainActivity.doesExist
 }

 suspend fun handleOnchainTransactionReceived(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionReceived(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionConfirmed(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionConfirmed(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReplaced(txid: String, conflicts: List<String>) {
 coreService.activity.handleOnchainTransactionReplaced(txid, conflicts)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReorged(txid: String) {
 coreService.activity.handleOnchainTransactionReorged(txid)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionEvicted(txid: String) {
 coreService.activity.handleOnchainTransactionEvicted(txid)
 notifyActivitiesChanged()
 }

 suspend fun handlePaymentEvent(paymentHash: String) {
 coreService.activity.handlePaymentEvent(paymentHash)
 notifyActivitiesChanged()
 }

 suspend fun shouldShowReceivedSheet(txid: String, value: ULong): Boolean {
 return coreService.activity.shouldShowReceivedSheet(txid, value)
 }

 suspend fun getBoostTxDoesExist(boostTxIds: List<String>): Map<String, Boolean> {
 return coreService.activity.getBoostTxDoesExist(boostTxIds)
 }

 suspend fun isCpfpChildTransaction(txId: String): Boolean {
 return coreService.activity.isCpfpChildTransaction(txId)
 }

 suspend fun getTxIdsInBoostTxIds(): Set<String> {
 return coreService.activity.getTxIdsInBoostTxIds()
 }

 /**
 * Gets a specific activity by payment hash or txID with retry logic
 */
Expand DownExpand Up@@ -392,22 +387,13 @@ class ActivityRepo @Inject constructor(
 ).fold(
 onSuccess = {
 Logger.debug(
 "Activity $id updated with success. new data: $activity. " +
 "Marking activity $activityIdToDelete as removed from mempool",
 "Activity $id updated with success. new data: $activity",
 context = TAG
 )

 val tags = coreService.activity.tags(activityIdToDelete)
 addTagsToActivity(activityId = id, tags = tags)

 markActivityAsRemovedFromMempool(activityIdToDelete).onFailure { e ->
 Logger.warn(
 "Failed to mark $activityIdToDelete as removed from mempool, caching to retry on next sync",
 e = e,
 context = TAG
 )
 cacheStore.addActivityToPendingDelete(activityId = activityIdToDelete)
 }
 Result.success(Unit)
 },
 onFailure = { e ->
Expand All@@ -422,16 +408,6 @@ class ActivityRepo @Inject constructor(
 )
 }

 private suspend fun deletePendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().activitiesPendingDelete.map { activityId ->
 async {
 markActivityAsRemovedFromMempool(activityId).onSuccess {
 cacheStore.removeActivityFromPendingDelete(activityId)
 }
 }
 }.awaitAll()
 }

 private suspend fun boostPendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().pendingBoostActivities.map { pendingBoostActivity ->
 async {
Expand DownExpand Up@@ -484,32 +460,6 @@ class ActivityRepo @Inject constructor(
 }.awaitAll()
 }

 /**
 * Marks an activity as removed from mempool (sets doesExist = false).
 * Used for RBFed transactions that are replaced.
 */
 private suspend fun markActivityAsRemovedFromMempool(activityId: String): Result<Unit> = withContext(bgDispatcher) {
 return@withContext runCatching {
 val existingActivity = getActivity(activityId).getOrNull()
 ?: return@withContext Result.failure(Exception("Activity $activityId not found"))

 if (existingActivity is Activity.Onchain) {
 val updatedActivity = Activity.Onchain(
 v1 = existingActivity.v1.copy(
 doesExist = false,
 updatedAt = nowTimestamp().toEpochMilli().toULong()
 )
 )
 updateActivity(id = activityId, activity = updatedActivity, forceUpdate = true).getOrThrow()
 notifyActivitiesChanged()
 } else {
 return@withContext Result.failure(Exception("Activity $activityId is not an onchain activity"))
 }
 }.onFailure { e ->
 Logger.error("markActivityAsRemovedFromMempool error for ID: $activityId", e, context = TAG)
 }
 }

 /**
 * Deletes an activity
 */
Expand Down

13 changes: 13 additions & 0 deletions
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
import org.lightningdevkit.ldknode.PeerDetails
import org.lightningdevkit.ldknode.SpendableUtxo
import org.lightningdevkit.ldknode.TransactionDetails
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
Expand DownExpand Up@@ -717,6 +718,18 @@ class LightningRepo @Inject constructor(
 Result.success(payments)
 }

 suspend fun getTransactionDetails(txid: Txid): Result<TransactionDetails?> = executeWhenNodeRunning(
 "Get transaction details by txid"
 ) {
 Result.success(lightningService.getTransactionDetails(txid))
 }

 suspend fun getAddressBalance(address: String): Result<ULong> = executeWhenNodeRunning("Get address balance") {
 runCatching {
 lightningService.getAddressBalance(address)
 }
 }

 suspend fun listSpendableOutputs(): Result<List<SpendableUtxo>> = executeWhenNodeRunning("List spendable outputs") {
 lightningService.listSpendableOutputs()
 }
Expand Down

7 changes: 2 additions & 5 deletions
app/src/main/java/to/bitkit/repositories/WalletRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ import to.bitkit.models.toDerivationPath
import to.bitkit.services.CoreService
import to.bitkit.usecases.DeriveBalanceStateUseCase
import to.bitkit.usecases.WipeWalletUseCase
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Bip21Utils
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
Expand All@@ -43,7 +42,6 @@ class WalletRepo @Inject constructor(
 private val keychain: Keychain,
 private val coreService: CoreService,
 private val settingsStore: SettingsStore,
 private val addressChecker: AddressChecker,
 private val lightningRepo: LightningRepo,
 private val cacheStore: CacheStore,
 private val preActivityMetadataRepo: PreActivityMetadataRepo,
Expand DownExpand Up@@ -83,9 +81,8 @@ class WalletRepo @Inject constructor(

 suspend fun checkAddressUsage(address: String): Result<Boolean> = withContext(bgDispatcher) {
 return@withContext try {
 val addressInfo = addressChecker.getAddressInfo(address)
 val hasTransactions = addressInfo.chain_stats.tx_count > 0 || addressInfo.mempool_stats.tx_count > 0
 Result.success(hasTransactions)
 val result = coreService.isAddressUsed(address)
 Result.success(result)
 } catch (e: Exception) {
 Logger.error("checkAddressUsage error", e, context = TAG)
 Result.failure(e)
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Integrate LDK events#487

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 7 commits into

from

Nov 28, 2025
 Merged


Integrate LDK events
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
185c51f

Integrate LDK events


ben-kaufman Nov 28, 2025
9b1a6f0

chore: cleanup


ovitrif Nov 28, 2025
2f0122f

chore: lint


ovitrif Nov 28, 2025
83d3c6e

Remove unused istransfer


ben-kaufman Nov 28, 2025
ab38e84

Merge branch 'feat/onchain-events' into ldk-events-integration


ben-kaufman Nov 28, 2025
98e6727

Remove unused variable


ben-kaufman Nov 28, 2025
d6b6799

Fix comments


ben-kaufman Nov 28, 2025

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


17 changes: 0 additions & 17 deletions
app/src/main/java/to/bitkit/data/CacheStore.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,6 @@ class CacheStore @Inject constructor(
 }
 }

 suspend fun addActivityToPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete + activityId)
 }
 }

 suspend fun removeActivityFromPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId !in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete - activityId)
 }
 }

 suspend fun addActivityToPendingBoost(pendingBoostActivity: PendingBoostActivity) {
 if (pendingBoostActivity in store.data.first().pendingBoostActivities) return
 store.updateData {
Expand DownExpand Up@@ -137,7 +121,6 @@ data class AppCacheData(
 val balance: BalanceState? = null,
 val backupStatuses: Map<BackupCategory, BackupItemStatus> = mapOf(),
 val deletedActivities: List<String> = listOf(),
 val activitiesPendingDelete: List<String> = listOf(),
 val lastLightningPaymentId: String? = null,
 val pendingBoostActivities: List<PendingBoostActivity> = listOf(),
)

2 changes: 1 addition & 1 deletion
app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ class NotifyPaymentReceivedHandler @Inject constructor(
 is NotifyPaymentReceived.Command.Lightning -> true
 is NotifyPaymentReceived.Command.Onchain -> {
 delay(DELAY_FOR_ACTIVITY_SYNC_MS)
 activityRepo.shouldShowPaymentReceived(command.paymentHashOrTxId, command.sats)
 activityRepo.shouldShowReceivedSheet(command.paymentHashOrTxId, command.sats)
 }
 }

Expand Down

5 changes: 0 additions & 5 deletions
app/src/main/java/to/bitkit/ext/Activities.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,6 @@ fun Activity.totalValue() = when (this) {
 }
}

fun Activity.canBeBoosted() = when (this) {
 is Activity.Onchain -> !v1.confirmed && v1.doesExist && !v1.isBoosted && !v1.isTransfer && v1.value > 0uL
 else -> false
}

fun Activity.isBoosted() = when (this) {
 is Activity.Onchain -> v1.isBoosted
 else -> false
Expand Down

162 changes: 56 additions & 106 deletions
app/src/main/java/to/bitkit/repositories/ActivityRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentDirection
import org.lightningdevkit.ldknode.PaymentKind
import org.lightningdevkit.ldknode.TransactionDetails
import to.bitkit.data.CacheStore
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.di.BgDispatcher
Expand All@@ -36,7 +37,6 @@ import to.bitkit.ext.nowTimestamp
import to.bitkit.ext.rawId
import to.bitkit.models.ActivityBackupV1
import to.bitkit.services.CoreService
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton
Expand All@@ -50,7 +50,6 @@ class ActivityRepo @Inject constructor(
 private val coreService: CoreService,
 private val lightningRepo: LightningRepo,
 private val blocktankRepo: BlocktankRepo,
 private val addressChecker: AddressChecker,
 private val cacheStore: CacheStore,
 private val transferRepo: TransferRepo,
 private val clock: Clock,
Expand DownExpand Up@@ -83,8 +82,6 @@ class ActivityRepo @Inject constructor(

 isSyncingLdkNodePayments.update { true }

 deletePendingActivities()

 lightningRepo.getPayments().mapCatching { payments ->
 Logger.debug("Got payments with success, syncing activities", context = TAG)
 syncLdkNodePayments(payments).getOrThrow()
Expand DownExpand Up@@ -167,67 +164,13 @@ class ActivityRepo @Inject constructor(
 }

 private suspend fun findClosedChannelForTransaction(txid: String): String? {
 return try {
 val closedChannelsResult = getClosedChannels(SortDirection.DESC)
 val closedChannels = closedChannelsResult.getOrNull() ?: return null
 if (closedChannels.isEmpty()) return null

 val txDetails = addressChecker.getTransaction(txid)

 txDetails.vin.firstNotNullOfOrNull { input ->
 val inputTxid = input.txid ?: return@firstNotNullOfOrNull null
 val inputVout = input.vout ?: return@firstNotNullOfOrNull null

 closedChannels.firstOrNull { channel ->
 channel.fundingTxoTxid == inputTxid && channel.fundingTxoIndex == inputVout.toUInt()
 }?.channelId
 }
 } catch (e: Exception) {
 Logger.warn(
 "Failed to check if transaction $txid spends closed channel funding UTXO",
 e,
 context = TAG
 )
 null
 }
 return coreService.activity.findClosedChannelForTransaction(txid, null)
 }

private suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 return coreService.activity.getOnchainActivityByTxId(txid)
 }

 /**
 * Determines whether to show the payment received UI for an onchain transaction.
 * Returns false for:
 * - Zero value transactions
 * - Channel closure transactions (transfers to savings)
 * - RBF replacement transactions with the same value as the original
 */
 suspend fun shouldShowPaymentReceived(txid: String, value: ULong): Boolean = withContext(bgDispatcher) {
 if (value == 0uL) return@withContext false

 if (findClosedChannelForTransaction(txid) != null) {
 Logger.debug("Skipping payment received UI for channel closure tx: $txid", context = TAG)
 return@withContext false
 }

 val onchainActivity = getOnchainActivityByTxId(txid)
 if (onchainActivity != null && onchainActivity.boostTxIds.isNotEmpty()) {
 for (replacedTxid in onchainActivity.boostTxIds) {
 val replacedActivity = getOnchainActivityByTxId(replacedTxid)
 if (replacedActivity != null && replacedActivity.value == value) {
 Logger.info(
 "Skipping payment received UI for RBF replacement $txid with same value as $replacedTxid",
 context = TAG
 )
 return@withContext false
 }
 }
 }

 return@withContext true
 }

 /**
 * Checks if a transaction is inbound (received) by looking up the payment direction.
 */
Expand All@@ -247,6 +190,58 @@ class ActivityRepo @Inject constructor(
 return@withContext !onchainActivity.doesExist
 }

 suspend fun handleOnchainTransactionReceived(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionReceived(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionConfirmed(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionConfirmed(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReplaced(txid: String, conflicts: List<String>) {
 coreService.activity.handleOnchainTransactionReplaced(txid, conflicts)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReorged(txid: String) {
 coreService.activity.handleOnchainTransactionReorged(txid)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionEvicted(txid: String) {
 coreService.activity.handleOnchainTransactionEvicted(txid)
 notifyActivitiesChanged()
 }

 suspend fun handlePaymentEvent(paymentHash: String) {
 coreService.activity.handlePaymentEvent(paymentHash)
 notifyActivitiesChanged()
 }

 suspend fun shouldShowReceivedSheet(txid: String, value: ULong): Boolean {
 return coreService.activity.shouldShowReceivedSheet(txid, value)
 }

 suspend fun getBoostTxDoesExist(boostTxIds: List<String>): Map<String, Boolean> {
 return coreService.activity.getBoostTxDoesExist(boostTxIds)
 }

 suspend fun isCpfpChildTransaction(txId: String): Boolean {
 return coreService.activity.isCpfpChildTransaction(txId)
 }

 suspend fun getTxIdsInBoostTxIds(): Set<String> {
 return coreService.activity.getTxIdsInBoostTxIds()
 }

 /**
 * Gets a specific activity by payment hash or txID with retry logic
 */
Expand DownExpand Up@@ -392,22 +387,13 @@ class ActivityRepo @Inject constructor(
 ).fold(
 onSuccess = {
 Logger.debug(
 "Activity $id updated with success. new data: $activity. " +
 "Marking activity $activityIdToDelete as removed from mempool",
 "Activity $id updated with success. new data: $activity",
 context = TAG
 )

 val tags = coreService.activity.tags(activityIdToDelete)
 addTagsToActivity(activityId = id, tags = tags)

 markActivityAsRemovedFromMempool(activityIdToDelete).onFailure { e ->
 Logger.warn(
 "Failed to mark $activityIdToDelete as removed from mempool, caching to retry on next sync",
 e = e,
 context = TAG
 )
 cacheStore.addActivityToPendingDelete(activityId = activityIdToDelete)
 }
 Result.success(Unit)
 },
 onFailure = { e ->
Expand All@@ -422,16 +408,6 @@ class ActivityRepo @Inject constructor(
 )
 }

 private suspend fun deletePendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().activitiesPendingDelete.map { activityId ->
 async {
 markActivityAsRemovedFromMempool(activityId).onSuccess {
 cacheStore.removeActivityFromPendingDelete(activityId)
 }
 }
 }.awaitAll()
 }

 private suspend fun boostPendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().pendingBoostActivities.map { pendingBoostActivity ->
 async {
Expand DownExpand Up@@ -484,32 +460,6 @@ class ActivityRepo @Inject constructor(
 }.awaitAll()
 }

 /**
 * Marks an activity as removed from mempool (sets doesExist = false).
 * Used for RBFed transactions that are replaced.
 */
 private suspend fun markActivityAsRemovedFromMempool(activityId: String): Result<Unit> = withContext(bgDispatcher) {
 return@withContext runCatching {
 val existingActivity = getActivity(activityId).getOrNull()
 ?: return@withContext Result.failure(Exception("Activity $activityId not found"))

 if (existingActivity is Activity.Onchain) {
 val updatedActivity = Activity.Onchain(
 v1 = existingActivity.v1.copy(
 doesExist = false,
 updatedAt = nowTimestamp().toEpochMilli().toULong()
 )
 )
 updateActivity(id = activityId, activity = updatedActivity, forceUpdate = true).getOrThrow()
 notifyActivitiesChanged()
 } else {
 return@withContext Result.failure(Exception("Activity $activityId is not an onchain activity"))
 }
 }.onFailure { e ->
 Logger.error("markActivityAsRemovedFromMempool error for ID: $activityId", e, context = TAG)
 }
 }

 /**
 * Deletes an activity
 */
Expand Down

13 changes: 13 additions & 0 deletions
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
import org.lightningdevkit.ldknode.PeerDetails
import org.lightningdevkit.ldknode.SpendableUtxo
import org.lightningdevkit.ldknode.TransactionDetails
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
Expand DownExpand Up@@ -717,6 +718,18 @@ class LightningRepo @Inject constructor(
 Result.success(payments)
 }

 suspend fun getTransactionDetails(txid: Txid): Result<TransactionDetails?> = executeWhenNodeRunning(
 "Get transaction details by txid"
 ) {
 Result.success(lightningService.getTransactionDetails(txid))
 }

 suspend fun getAddressBalance(address: String): Result<ULong> = executeWhenNodeRunning("Get address balance") {
 runCatching {
 lightningService.getAddressBalance(address)
 }
 }

 suspend fun listSpendableOutputs(): Result<List<SpendableUtxo>> = executeWhenNodeRunning("List spendable outputs") {
 lightningService.listSpendableOutputs()
 }
Expand Down

7 changes: 2 additions & 5 deletions
app/src/main/java/to/bitkit/repositories/WalletRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ import to.bitkit.models.toDerivationPath
import to.bitkit.services.CoreService
import to.bitkit.usecases.DeriveBalanceStateUseCase
import to.bitkit.usecases.WipeWalletUseCase
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Bip21Utils
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
Expand All@@ -43,7 +42,6 @@ class WalletRepo @Inject constructor(
 private val keychain: Keychain,
 private val coreService: CoreService,
 private val settingsStore: SettingsStore,
 private val addressChecker: AddressChecker,
 private val lightningRepo: LightningRepo,
 private val cacheStore: CacheStore,
 private val preActivityMetadataRepo: PreActivityMetadataRepo,
Expand DownExpand Up@@ -83,9 +81,8 @@ class WalletRepo @Inject constructor(

 suspend fun checkAddressUsage(address: String): Result<Boolean> = withContext(bgDispatcher) {
 return@withContext try {
 val addressInfo = addressChecker.getAddressInfo(address)
 val hasTransactions = addressInfo.chain_stats.tx_count > 0 || addressInfo.mempool_stats.tx_count > 0
 Result.success(hasTransactions)
 val result = coreService.isAddressUsed(address)
 Result.success(result)
 } catch (e: Exception) {
 Logger.error("checkAddressUsage error", e, context = TAG)
 Result.failure(e)
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Integrate LDK events#487

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 7 commits into

from

Nov 28, 2025
 Merged


Integrate LDK events
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
185c51f

Integrate LDK events


ben-kaufman Nov 28, 2025
9b1a6f0

chore: cleanup


ovitrif Nov 28, 2025
2f0122f

chore: lint


ovitrif Nov 28, 2025
83d3c6e

Remove unused istransfer


ben-kaufman Nov 28, 2025
ab38e84

Merge branch 'feat/onchain-events' into ldk-events-integration


ben-kaufman Nov 28, 2025
98e6727

Remove unused variable


ben-kaufman Nov 28, 2025
d6b6799

Fix comments


ben-kaufman Nov 28, 2025

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


17 changes: 0 additions & 17 deletions
app/src/main/java/to/bitkit/data/CacheStore.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,6 @@ class CacheStore @Inject constructor(
 }
 }

 suspend fun addActivityToPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete + activityId)
 }
 }

 suspend fun removeActivityFromPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId !in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete - activityId)
 }
 }

 suspend fun addActivityToPendingBoost(pendingBoostActivity: PendingBoostActivity) {
 if (pendingBoostActivity in store.data.first().pendingBoostActivities) return
 store.updateData {
Expand DownExpand Up@@ -137,7 +121,6 @@ data class AppCacheData(
 val balance: BalanceState? = null,
 val backupStatuses: Map<BackupCategory, BackupItemStatus> = mapOf(),
 val deletedActivities: List<String> = listOf(),
 val activitiesPendingDelete: List<String> = listOf(),
 val lastLightningPaymentId: String? = null,
 val pendingBoostActivities: List<PendingBoostActivity> = listOf(),
)

2 changes: 1 addition & 1 deletion
app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ class NotifyPaymentReceivedHandler @Inject constructor(
 is NotifyPaymentReceived.Command.Lightning -> true
 is NotifyPaymentReceived.Command.Onchain -> {
 delay(DELAY_FOR_ACTIVITY_SYNC_MS)
 activityRepo.shouldShowPaymentReceived(command.paymentHashOrTxId, command.sats)
 activityRepo.shouldShowReceivedSheet(command.paymentHashOrTxId, command.sats)
 }
 }

Expand Down

5 changes: 0 additions & 5 deletions
app/src/main/java/to/bitkit/ext/Activities.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,6 @@ fun Activity.totalValue() = when (this) {
 }
}

fun Activity.canBeBoosted() = when (this) {
 is Activity.Onchain -> !v1.confirmed && v1.doesExist && !v1.isBoosted && !v1.isTransfer && v1.value > 0uL
 else -> false
}

fun Activity.isBoosted() = when (this) {
 is Activity.Onchain -> v1.isBoosted
 else -> false
Expand Down

162 changes: 56 additions & 106 deletions
app/src/main/java/to/bitkit/repositories/ActivityRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentDirection
import org.lightningdevkit.ldknode.PaymentKind
import org.lightningdevkit.ldknode.TransactionDetails
import to.bitkit.data.CacheStore
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.di.BgDispatcher
Expand All@@ -36,7 +37,6 @@ import to.bitkit.ext.nowTimestamp
import to.bitkit.ext.rawId
import to.bitkit.models.ActivityBackupV1
import to.bitkit.services.CoreService
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton
Expand All@@ -50,7 +50,6 @@ class ActivityRepo @Inject constructor(
 private val coreService: CoreService,
 private val lightningRepo: LightningRepo,
 private val blocktankRepo: BlocktankRepo,
 private val addressChecker: AddressChecker,
 private val cacheStore: CacheStore,
 private val transferRepo: TransferRepo,
 private val clock: Clock,
Expand DownExpand Up@@ -83,8 +82,6 @@ class ActivityRepo @Inject constructor(

 isSyncingLdkNodePayments.update { true }

 deletePendingActivities()

 lightningRepo.getPayments().mapCatching { payments ->
 Logger.debug("Got payments with success, syncing activities", context = TAG)
 syncLdkNodePayments(payments).getOrThrow()
Expand DownExpand Up@@ -167,67 +164,13 @@ class ActivityRepo @Inject constructor(
 }

 private suspend fun findClosedChannelForTransaction(txid: String): String? {
 return try {
 val closedChannelsResult = getClosedChannels(SortDirection.DESC)
 val closedChannels = closedChannelsResult.getOrNull() ?: return null
 if (closedChannels.isEmpty()) return null

 val txDetails = addressChecker.getTransaction(txid)

 txDetails.vin.firstNotNullOfOrNull { input ->
 val inputTxid = input.txid ?: return@firstNotNullOfOrNull null
 val inputVout = input.vout ?: return@firstNotNullOfOrNull null

 closedChannels.firstOrNull { channel ->
 channel.fundingTxoTxid == inputTxid && channel.fundingTxoIndex == inputVout.toUInt()
 }?.channelId
 }
 } catch (e: Exception) {
 Logger.warn(
 "Failed to check if transaction $txid spends closed channel funding UTXO",
 e,
 context = TAG
 )
 null
 }
 return coreService.activity.findClosedChannelForTransaction(txid, null)
 }

private suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 return coreService.activity.getOnchainActivityByTxId(txid)
 }

 /**
 * Determines whether to show the payment received UI for an onchain transaction.
 * Returns false for:
 * - Zero value transactions
 * - Channel closure transactions (transfers to savings)
 * - RBF replacement transactions with the same value as the original
 */
 suspend fun shouldShowPaymentReceived(txid: String, value: ULong): Boolean = withContext(bgDispatcher) {
 if (value == 0uL) return@withContext false

 if (findClosedChannelForTransaction(txid) != null) {
 Logger.debug("Skipping payment received UI for channel closure tx: $txid", context = TAG)
 return@withContext false
 }

 val onchainActivity = getOnchainActivityByTxId(txid)
 if (onchainActivity != null && onchainActivity.boostTxIds.isNotEmpty()) {
 for (replacedTxid in onchainActivity.boostTxIds) {
 val replacedActivity = getOnchainActivityByTxId(replacedTxid)
 if (replacedActivity != null && replacedActivity.value == value) {
 Logger.info(
 "Skipping payment received UI for RBF replacement $txid with same value as $replacedTxid",
 context = TAG
 )
 return@withContext false
 }
 }
 }

 return@withContext true
 }

 /**
 * Checks if a transaction is inbound (received) by looking up the payment direction.
 */
Expand All@@ -247,6 +190,58 @@ class ActivityRepo @Inject constructor(
 return@withContext !onchainActivity.doesExist
 }

 suspend fun handleOnchainTransactionReceived(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionReceived(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionConfirmed(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionConfirmed(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReplaced(txid: String, conflicts: List<String>) {
 coreService.activity.handleOnchainTransactionReplaced(txid, conflicts)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReorged(txid: String) {
 coreService.activity.handleOnchainTransactionReorged(txid)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionEvicted(txid: String) {
 coreService.activity.handleOnchainTransactionEvicted(txid)
 notifyActivitiesChanged()
 }

 suspend fun handlePaymentEvent(paymentHash: String) {
 coreService.activity.handlePaymentEvent(paymentHash)
 notifyActivitiesChanged()
 }

 suspend fun shouldShowReceivedSheet(txid: String, value: ULong): Boolean {
 return coreService.activity.shouldShowReceivedSheet(txid, value)
 }

 suspend fun getBoostTxDoesExist(boostTxIds: List<String>): Map<String, Boolean> {
 return coreService.activity.getBoostTxDoesExist(boostTxIds)
 }

 suspend fun isCpfpChildTransaction(txId: String): Boolean {
 return coreService.activity.isCpfpChildTransaction(txId)
 }

 suspend fun getTxIdsInBoostTxIds(): Set<String> {
 return coreService.activity.getTxIdsInBoostTxIds()
 }

 /**
 * Gets a specific activity by payment hash or txID with retry logic
 */
Expand DownExpand Up@@ -392,22 +387,13 @@ class ActivityRepo @Inject constructor(
 ).fold(
 onSuccess = {
 Logger.debug(
 "Activity $id updated with success. new data: $activity. " +
 "Marking activity $activityIdToDelete as removed from mempool",
 "Activity $id updated with success. new data: $activity",
 context = TAG
 )

 val tags = coreService.activity.tags(activityIdToDelete)
 addTagsToActivity(activityId = id, tags = tags)

 markActivityAsRemovedFromMempool(activityIdToDelete).onFailure { e ->
 Logger.warn(
 "Failed to mark $activityIdToDelete as removed from mempool, caching to retry on next sync",
 e = e,
 context = TAG
 )
 cacheStore.addActivityToPendingDelete(activityId = activityIdToDelete)
 }
 Result.success(Unit)
 },
 onFailure = { e ->
Expand All@@ -422,16 +408,6 @@ class ActivityRepo @Inject constructor(
 )
 }

 private suspend fun deletePendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().activitiesPendingDelete.map { activityId ->
 async {
 markActivityAsRemovedFromMempool(activityId).onSuccess {
 cacheStore.removeActivityFromPendingDelete(activityId)
 }
 }
 }.awaitAll()
 }

 private suspend fun boostPendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().pendingBoostActivities.map { pendingBoostActivity ->
 async {
Expand DownExpand Up@@ -484,32 +460,6 @@ class ActivityRepo @Inject constructor(
 }.awaitAll()
 }

 /**
 * Marks an activity as removed from mempool (sets doesExist = false).
 * Used for RBFed transactions that are replaced.
 */
 private suspend fun markActivityAsRemovedFromMempool(activityId: String): Result<Unit> = withContext(bgDispatcher) {
 return@withContext runCatching {
 val existingActivity = getActivity(activityId).getOrNull()
 ?: return@withContext Result.failure(Exception("Activity $activityId not found"))

 if (existingActivity is Activity.Onchain) {
 val updatedActivity = Activity.Onchain(
 v1 = existingActivity.v1.copy(
 doesExist = false,
 updatedAt = nowTimestamp().toEpochMilli().toULong()
 )
 )
 updateActivity(id = activityId, activity = updatedActivity, forceUpdate = true).getOrThrow()
 notifyActivitiesChanged()
 } else {
 return@withContext Result.failure(Exception("Activity $activityId is not an onchain activity"))
 }
 }.onFailure { e ->
 Logger.error("markActivityAsRemovedFromMempool error for ID: $activityId", e, context = TAG)
 }
 }

 /**
 * Deletes an activity
 */
Expand Down

13 changes: 13 additions & 0 deletions
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
import org.lightningdevkit.ldknode.PeerDetails
import org.lightningdevkit.ldknode.SpendableUtxo
import org.lightningdevkit.ldknode.TransactionDetails
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
Expand DownExpand Up@@ -717,6 +718,18 @@ class LightningRepo @Inject constructor(
 Result.success(payments)
 }

 suspend fun getTransactionDetails(txid: Txid): Result<TransactionDetails?> = executeWhenNodeRunning(
 "Get transaction details by txid"
 ) {
 Result.success(lightningService.getTransactionDetails(txid))
 }

 suspend fun getAddressBalance(address: String): Result<ULong> = executeWhenNodeRunning("Get address balance") {
 runCatching {
 lightningService.getAddressBalance(address)
 }
 }

 suspend fun listSpendableOutputs(): Result<List<SpendableUtxo>> = executeWhenNodeRunning("List spendable outputs") {
 lightningService.listSpendableOutputs()
 }
Expand Down

7 changes: 2 additions & 5 deletions
app/src/main/java/to/bitkit/repositories/WalletRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ import to.bitkit.models.toDerivationPath
import to.bitkit.services.CoreService
import to.bitkit.usecases.DeriveBalanceStateUseCase
import to.bitkit.usecases.WipeWalletUseCase
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Bip21Utils
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
Expand All@@ -43,7 +42,6 @@ class WalletRepo @Inject constructor(
 private val keychain: Keychain,
 private val coreService: CoreService,
 private val settingsStore: SettingsStore,
 private val addressChecker: AddressChecker,
 private val lightningRepo: LightningRepo,
 private val cacheStore: CacheStore,
 private val preActivityMetadataRepo: PreActivityMetadataRepo,
Expand DownExpand Up@@ -83,9 +81,8 @@ class WalletRepo @Inject constructor(

 suspend fun checkAddressUsage(address: String): Result<Boolean> = withContext(bgDispatcher) {
 return@withContext try {
 val addressInfo = addressChecker.getAddressInfo(address)
 val hasTransactions = addressInfo.chain_stats.tx_count > 0 || addressInfo.mempool_stats.tx_count > 0
 Result.success(hasTransactions)
 val result = coreService.isAddressUsed(address)
 Result.success(result)
 } catch (e: Exception) {
 Logger.error("checkAddressUsage error", e, context = TAG)
 Result.failure(e)
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Integrate LDK events#487

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 7 commits into

from

Nov 28, 2025
 Merged


Integrate LDK events
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
185c51f

Integrate LDK events


ben-kaufman Nov 28, 2025
9b1a6f0

chore: cleanup


ovitrif Nov 28, 2025
2f0122f

chore: lint


ovitrif Nov 28, 2025
83d3c6e

Remove unused istransfer


ben-kaufman Nov 28, 2025
ab38e84

Merge branch 'feat/onchain-events' into ldk-events-integration


ben-kaufman Nov 28, 2025
98e6727

Remove unused variable


ben-kaufman Nov 28, 2025
d6b6799

Fix comments


ben-kaufman Nov 28, 2025

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


17 changes: 0 additions & 17 deletions
app/src/main/java/to/bitkit/data/CacheStore.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,6 @@ class CacheStore @Inject constructor(
 }
 }

 suspend fun addActivityToPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete + activityId)
 }
 }

 suspend fun removeActivityFromPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId !in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete - activityId)
 }
 }

 suspend fun addActivityToPendingBoost(pendingBoostActivity: PendingBoostActivity) {
 if (pendingBoostActivity in store.data.first().pendingBoostActivities) return
 store.updateData {
Expand DownExpand Up@@ -137,7 +121,6 @@ data class AppCacheData(
 val balance: BalanceState? = null,
 val backupStatuses: Map<BackupCategory, BackupItemStatus> = mapOf(),
 val deletedActivities: List<String> = listOf(),
 val activitiesPendingDelete: List<String> = listOf(),
 val lastLightningPaymentId: String? = null,
 val pendingBoostActivities: List<PendingBoostActivity> = listOf(),
)

2 changes: 1 addition & 1 deletion
app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ class NotifyPaymentReceivedHandler @Inject constructor(
 is NotifyPaymentReceived.Command.Lightning -> true
 is NotifyPaymentReceived.Command.Onchain -> {
 delay(DELAY_FOR_ACTIVITY_SYNC_MS)
 activityRepo.shouldShowPaymentReceived(command.paymentHashOrTxId, command.sats)
 activityRepo.shouldShowReceivedSheet(command.paymentHashOrTxId, command.sats)
 }
 }

Expand Down

5 changes: 0 additions & 5 deletions
app/src/main/java/to/bitkit/ext/Activities.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,6 @@ fun Activity.totalValue() = when (this) {
 }
}

fun Activity.canBeBoosted() = when (this) {
 is Activity.Onchain -> !v1.confirmed && v1.doesExist && !v1.isBoosted && !v1.isTransfer && v1.value > 0uL
 else -> false
}

fun Activity.isBoosted() = when (this) {
 is Activity.Onchain -> v1.isBoosted
 else -> false
Expand Down

162 changes: 56 additions & 106 deletions
app/src/main/java/to/bitkit/repositories/ActivityRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentDirection
import org.lightningdevkit.ldknode.PaymentKind
import org.lightningdevkit.ldknode.TransactionDetails
import to.bitkit.data.CacheStore
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.di.BgDispatcher
Expand All@@ -36,7 +37,6 @@ import to.bitkit.ext.nowTimestamp
import to.bitkit.ext.rawId
import to.bitkit.models.ActivityBackupV1
import to.bitkit.services.CoreService
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton
Expand All@@ -50,7 +50,6 @@ class ActivityRepo @Inject constructor(
 private val coreService: CoreService,
 private val lightningRepo: LightningRepo,
 private val blocktankRepo: BlocktankRepo,
 private val addressChecker: AddressChecker,
 private val cacheStore: CacheStore,
 private val transferRepo: TransferRepo,
 private val clock: Clock,
Expand DownExpand Up@@ -83,8 +82,6 @@ class ActivityRepo @Inject constructor(

 isSyncingLdkNodePayments.update { true }

 deletePendingActivities()

 lightningRepo.getPayments().mapCatching { payments ->
 Logger.debug("Got payments with success, syncing activities", context = TAG)
 syncLdkNodePayments(payments).getOrThrow()
Expand DownExpand Up@@ -167,67 +164,13 @@ class ActivityRepo @Inject constructor(
 }

 private suspend fun findClosedChannelForTransaction(txid: String): String? {
 return try {
 val closedChannelsResult = getClosedChannels(SortDirection.DESC)
 val closedChannels = closedChannelsResult.getOrNull() ?: return null
 if (closedChannels.isEmpty()) return null

 val txDetails = addressChecker.getTransaction(txid)

 txDetails.vin.firstNotNullOfOrNull { input ->
 val inputTxid = input.txid ?: return@firstNotNullOfOrNull null
 val inputVout = input.vout ?: return@firstNotNullOfOrNull null

 closedChannels.firstOrNull { channel ->
 channel.fundingTxoTxid == inputTxid && channel.fundingTxoIndex == inputVout.toUInt()
 }?.channelId
 }
 } catch (e: Exception) {
 Logger.warn(
 "Failed to check if transaction $txid spends closed channel funding UTXO",
 e,
 context = TAG
 )
 null
 }
 return coreService.activity.findClosedChannelForTransaction(txid, null)
 }

private suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 return coreService.activity.getOnchainActivityByTxId(txid)
 }

 /**
 * Determines whether to show the payment received UI for an onchain transaction.
 * Returns false for:
 * - Zero value transactions
 * - Channel closure transactions (transfers to savings)
 * - RBF replacement transactions with the same value as the original
 */
 suspend fun shouldShowPaymentReceived(txid: String, value: ULong): Boolean = withContext(bgDispatcher) {
 if (value == 0uL) return@withContext false

 if (findClosedChannelForTransaction(txid) != null) {
 Logger.debug("Skipping payment received UI for channel closure tx: $txid", context = TAG)
 return@withContext false
 }

 val onchainActivity = getOnchainActivityByTxId(txid)
 if (onchainActivity != null && onchainActivity.boostTxIds.isNotEmpty()) {
 for (replacedTxid in onchainActivity.boostTxIds) {
 val replacedActivity = getOnchainActivityByTxId(replacedTxid)
 if (replacedActivity != null && replacedActivity.value == value) {
 Logger.info(
 "Skipping payment received UI for RBF replacement $txid with same value as $replacedTxid",
 context = TAG
 )
 return@withContext false
 }
 }
 }

 return@withContext true
 }

 /**
 * Checks if a transaction is inbound (received) by looking up the payment direction.
 */
Expand All@@ -247,6 +190,58 @@ class ActivityRepo @Inject constructor(
 return@withContext !onchainActivity.doesExist
 }

 suspend fun handleOnchainTransactionReceived(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionReceived(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionConfirmed(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionConfirmed(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReplaced(txid: String, conflicts: List<String>) {
 coreService.activity.handleOnchainTransactionReplaced(txid, conflicts)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReorged(txid: String) {
 coreService.activity.handleOnchainTransactionReorged(txid)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionEvicted(txid: String) {
 coreService.activity.handleOnchainTransactionEvicted(txid)
 notifyActivitiesChanged()
 }

 suspend fun handlePaymentEvent(paymentHash: String) {
 coreService.activity.handlePaymentEvent(paymentHash)
 notifyActivitiesChanged()
 }

 suspend fun shouldShowReceivedSheet(txid: String, value: ULong): Boolean {
 return coreService.activity.shouldShowReceivedSheet(txid, value)
 }

 suspend fun getBoostTxDoesExist(boostTxIds: List<String>): Map<String, Boolean> {
 return coreService.activity.getBoostTxDoesExist(boostTxIds)
 }

 suspend fun isCpfpChildTransaction(txId: String): Boolean {
 return coreService.activity.isCpfpChildTransaction(txId)
 }

 suspend fun getTxIdsInBoostTxIds(): Set<String> {
 return coreService.activity.getTxIdsInBoostTxIds()
 }

 /**
 * Gets a specific activity by payment hash or txID with retry logic
 */
Expand DownExpand Up@@ -392,22 +387,13 @@ class ActivityRepo @Inject constructor(
 ).fold(
 onSuccess = {
 Logger.debug(
 "Activity $id updated with success. new data: $activity. " +
 "Marking activity $activityIdToDelete as removed from mempool",
 "Activity $id updated with success. new data: $activity",
 context = TAG
 )

 val tags = coreService.activity.tags(activityIdToDelete)
 addTagsToActivity(activityId = id, tags = tags)

 markActivityAsRemovedFromMempool(activityIdToDelete).onFailure { e ->
 Logger.warn(
 "Failed to mark $activityIdToDelete as removed from mempool, caching to retry on next sync",
 e = e,
 context = TAG
 )
 cacheStore.addActivityToPendingDelete(activityId = activityIdToDelete)
 }
 Result.success(Unit)
 },
 onFailure = { e ->
Expand All@@ -422,16 +408,6 @@ class ActivityRepo @Inject constructor(
 )
 }

 private suspend fun deletePendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().activitiesPendingDelete.map { activityId ->
 async {
 markActivityAsRemovedFromMempool(activityId).onSuccess {
 cacheStore.removeActivityFromPendingDelete(activityId)
 }
 }
 }.awaitAll()
 }

 private suspend fun boostPendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().pendingBoostActivities.map { pendingBoostActivity ->
 async {
Expand DownExpand Up@@ -484,32 +460,6 @@ class ActivityRepo @Inject constructor(
 }.awaitAll()
 }

 /**
 * Marks an activity as removed from mempool (sets doesExist = false).
 * Used for RBFed transactions that are replaced.
 */
 private suspend fun markActivityAsRemovedFromMempool(activityId: String): Result<Unit> = withContext(bgDispatcher) {
 return@withContext runCatching {
 val existingActivity = getActivity(activityId).getOrNull()
 ?: return@withContext Result.failure(Exception("Activity $activityId not found"))

 if (existingActivity is Activity.Onchain) {
 val updatedActivity = Activity.Onchain(
 v1 = existingActivity.v1.copy(
 doesExist = false,
 updatedAt = nowTimestamp().toEpochMilli().toULong()
 )
 )
 updateActivity(id = activityId, activity = updatedActivity, forceUpdate = true).getOrThrow()
 notifyActivitiesChanged()
 } else {
 return@withContext Result.failure(Exception("Activity $activityId is not an onchain activity"))
 }
 }.onFailure { e ->
 Logger.error("markActivityAsRemovedFromMempool error for ID: $activityId", e, context = TAG)
 }
 }

 /**
 * Deletes an activity
 */
Expand Down

13 changes: 13 additions & 0 deletions
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
import org.lightningdevkit.ldknode.PeerDetails
import org.lightningdevkit.ldknode.SpendableUtxo
import org.lightningdevkit.ldknode.TransactionDetails
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
Expand DownExpand Up@@ -717,6 +718,18 @@ class LightningRepo @Inject constructor(
 Result.success(payments)
 }

 suspend fun getTransactionDetails(txid: Txid): Result<TransactionDetails?> = executeWhenNodeRunning(
 "Get transaction details by txid"
 ) {
 Result.success(lightningService.getTransactionDetails(txid))
 }

 suspend fun getAddressBalance(address: String): Result<ULong> = executeWhenNodeRunning("Get address balance") {
 runCatching {
 lightningService.getAddressBalance(address)
 }
 }

 suspend fun listSpendableOutputs(): Result<List<SpendableUtxo>> = executeWhenNodeRunning("List spendable outputs") {
 lightningService.listSpendableOutputs()
 }
Expand Down

7 changes: 2 additions & 5 deletions
app/src/main/java/to/bitkit/repositories/WalletRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ import to.bitkit.models.toDerivationPath
import to.bitkit.services.CoreService
import to.bitkit.usecases.DeriveBalanceStateUseCase
import to.bitkit.usecases.WipeWalletUseCase
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Bip21Utils
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
Expand All@@ -43,7 +42,6 @@ class WalletRepo @Inject constructor(
 private val keychain: Keychain,
 private val coreService: CoreService,
 private val settingsStore: SettingsStore,
 private val addressChecker: AddressChecker,
 private val lightningRepo: LightningRepo,
 private val cacheStore: CacheStore,
 private val preActivityMetadataRepo: PreActivityMetadataRepo,
Expand DownExpand Up@@ -83,9 +81,8 @@ class WalletRepo @Inject constructor(

 suspend fun checkAddressUsage(address: String): Result<Boolean> = withContext(bgDispatcher) {
 return@withContext try {
 val addressInfo = addressChecker.getAddressInfo(address)
 val hasTransactions = addressInfo.chain_stats.tx_count > 0 || addressInfo.mempool_stats.tx_count > 0
 Result.success(hasTransactions)
 val result = coreService.isAddressUsed(address)
 Result.success(result)
 } catch (e: Exception) {
 Logger.error("checkAddressUsage error", e, context = TAG)
 Result.failure(e)
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Integrate LDK events#487

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 7 commits into

from

Nov 28, 2025
 Merged


Integrate LDK events
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
185c51f

Integrate LDK events


ben-kaufman Nov 28, 2025
9b1a6f0

chore: cleanup


ovitrif Nov 28, 2025
2f0122f

chore: lint


ovitrif Nov 28, 2025
83d3c6e

Remove unused istransfer


ben-kaufman Nov 28, 2025
ab38e84

Merge branch 'feat/onchain-events' into ldk-events-integration


ben-kaufman Nov 28, 2025
98e6727

Remove unused variable


ben-kaufman Nov 28, 2025
d6b6799

Fix comments


ben-kaufman Nov 28, 2025

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


17 changes: 0 additions & 17 deletions
app/src/main/java/to/bitkit/data/CacheStore.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,6 @@ class CacheStore @Inject constructor(
 }
 }

 suspend fun addActivityToPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete + activityId)
 }
 }

 suspend fun removeActivityFromPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId !in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete - activityId)
 }
 }

 suspend fun addActivityToPendingBoost(pendingBoostActivity: PendingBoostActivity) {
 if (pendingBoostActivity in store.data.first().pendingBoostActivities) return
 store.updateData {
Expand DownExpand Up@@ -137,7 +121,6 @@ data class AppCacheData(
 val balance: BalanceState? = null,
 val backupStatuses: Map<BackupCategory, BackupItemStatus> = mapOf(),
 val deletedActivities: List<String> = listOf(),
 val activitiesPendingDelete: List<String> = listOf(),
 val lastLightningPaymentId: String? = null,
 val pendingBoostActivities: List<PendingBoostActivity> = listOf(),
)

2 changes: 1 addition & 1 deletion
app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ class NotifyPaymentReceivedHandler @Inject constructor(
 is NotifyPaymentReceived.Command.Lightning -> true
 is NotifyPaymentReceived.Command.Onchain -> {
 delay(DELAY_FOR_ACTIVITY_SYNC_MS)
 activityRepo.shouldShowPaymentReceived(command.paymentHashOrTxId, command.sats)
 activityRepo.shouldShowReceivedSheet(command.paymentHashOrTxId, command.sats)
 }
 }

Expand Down

5 changes: 0 additions & 5 deletions
app/src/main/java/to/bitkit/ext/Activities.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,6 @@ fun Activity.totalValue() = when (this) {
 }
}

fun Activity.canBeBoosted() = when (this) {
 is Activity.Onchain -> !v1.confirmed && v1.doesExist && !v1.isBoosted && !v1.isTransfer && v1.value > 0uL
 else -> false
}

fun Activity.isBoosted() = when (this) {
 is Activity.Onchain -> v1.isBoosted
 else -> false
Expand Down

162 changes: 56 additions & 106 deletions
app/src/main/java/to/bitkit/repositories/ActivityRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentDirection
import org.lightningdevkit.ldknode.PaymentKind
import org.lightningdevkit.ldknode.TransactionDetails
import to.bitkit.data.CacheStore
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.di.BgDispatcher
Expand All@@ -36,7 +37,6 @@ import to.bitkit.ext.nowTimestamp
import to.bitkit.ext.rawId
import to.bitkit.models.ActivityBackupV1
import to.bitkit.services.CoreService
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton
Expand All@@ -50,7 +50,6 @@ class ActivityRepo @Inject constructor(
 private val coreService: CoreService,
 private val lightningRepo: LightningRepo,
 private val blocktankRepo: BlocktankRepo,
 private val addressChecker: AddressChecker,
 private val cacheStore: CacheStore,
 private val transferRepo: TransferRepo,
 private val clock: Clock,
Expand DownExpand Up@@ -83,8 +82,6 @@ class ActivityRepo @Inject constructor(

 isSyncingLdkNodePayments.update { true }

 deletePendingActivities()

 lightningRepo.getPayments().mapCatching { payments ->
 Logger.debug("Got payments with success, syncing activities", context = TAG)
 syncLdkNodePayments(payments).getOrThrow()
Expand DownExpand Up@@ -167,67 +164,13 @@ class ActivityRepo @Inject constructor(
 }

 private suspend fun findClosedChannelForTransaction(txid: String): String? {
 return try {
 val closedChannelsResult = getClosedChannels(SortDirection.DESC)
 val closedChannels = closedChannelsResult.getOrNull() ?: return null
 if (closedChannels.isEmpty()) return null

 val txDetails = addressChecker.getTransaction(txid)

 txDetails.vin.firstNotNullOfOrNull { input ->
 val inputTxid = input.txid ?: return@firstNotNullOfOrNull null
 val inputVout = input.vout ?: return@firstNotNullOfOrNull null

 closedChannels.firstOrNull { channel ->
 channel.fundingTxoTxid == inputTxid && channel.fundingTxoIndex == inputVout.toUInt()
 }?.channelId
 }
 } catch (e: Exception) {
 Logger.warn(
 "Failed to check if transaction $txid spends closed channel funding UTXO",
 e,
 context = TAG
 )
 null
 }
 return coreService.activity.findClosedChannelForTransaction(txid, null)
 }

private suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 return coreService.activity.getOnchainActivityByTxId(txid)
 }

 /**
 * Determines whether to show the payment received UI for an onchain transaction.
 * Returns false for:
 * - Zero value transactions
 * - Channel closure transactions (transfers to savings)
 * - RBF replacement transactions with the same value as the original
 */
 suspend fun shouldShowPaymentReceived(txid: String, value: ULong): Boolean = withContext(bgDispatcher) {
 if (value == 0uL) return@withContext false

 if (findClosedChannelForTransaction(txid) != null) {
 Logger.debug("Skipping payment received UI for channel closure tx: $txid", context = TAG)
 return@withContext false
 }

 val onchainActivity = getOnchainActivityByTxId(txid)
 if (onchainActivity != null && onchainActivity.boostTxIds.isNotEmpty()) {
 for (replacedTxid in onchainActivity.boostTxIds) {
 val replacedActivity = getOnchainActivityByTxId(replacedTxid)
 if (replacedActivity != null && replacedActivity.value == value) {
 Logger.info(
 "Skipping payment received UI for RBF replacement $txid with same value as $replacedTxid",
 context = TAG
 )
 return@withContext false
 }
 }
 }

 return@withContext true
 }

 /**
 * Checks if a transaction is inbound (received) by looking up the payment direction.
 */
Expand All@@ -247,6 +190,58 @@ class ActivityRepo @Inject constructor(
 return@withContext !onchainActivity.doesExist
 }

 suspend fun handleOnchainTransactionReceived(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionReceived(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionConfirmed(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionConfirmed(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReplaced(txid: String, conflicts: List<String>) {
 coreService.activity.handleOnchainTransactionReplaced(txid, conflicts)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReorged(txid: String) {
 coreService.activity.handleOnchainTransactionReorged(txid)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionEvicted(txid: String) {
 coreService.activity.handleOnchainTransactionEvicted(txid)
 notifyActivitiesChanged()
 }

 suspend fun handlePaymentEvent(paymentHash: String) {
 coreService.activity.handlePaymentEvent(paymentHash)
 notifyActivitiesChanged()
 }

 suspend fun shouldShowReceivedSheet(txid: String, value: ULong): Boolean {
 return coreService.activity.shouldShowReceivedSheet(txid, value)
 }

 suspend fun getBoostTxDoesExist(boostTxIds: List<String>): Map<String, Boolean> {
 return coreService.activity.getBoostTxDoesExist(boostTxIds)
 }

 suspend fun isCpfpChildTransaction(txId: String): Boolean {
 return coreService.activity.isCpfpChildTransaction(txId)
 }

 suspend fun getTxIdsInBoostTxIds(): Set<String> {
 return coreService.activity.getTxIdsInBoostTxIds()
 }

 /**
 * Gets a specific activity by payment hash or txID with retry logic
 */
Expand DownExpand Up@@ -392,22 +387,13 @@ class ActivityRepo @Inject constructor(
 ).fold(
 onSuccess = {
 Logger.debug(
 "Activity $id updated with success. new data: $activity. " +
 "Marking activity $activityIdToDelete as removed from mempool",
 "Activity $id updated with success. new data: $activity",
 context = TAG
 )

 val tags = coreService.activity.tags(activityIdToDelete)
 addTagsToActivity(activityId = id, tags = tags)

 markActivityAsRemovedFromMempool(activityIdToDelete).onFailure { e ->
 Logger.warn(
 "Failed to mark $activityIdToDelete as removed from mempool, caching to retry on next sync",
 e = e,
 context = TAG
 )
 cacheStore.addActivityToPendingDelete(activityId = activityIdToDelete)
 }
 Result.success(Unit)
 },
 onFailure = { e ->
Expand All@@ -422,16 +408,6 @@ class ActivityRepo @Inject constructor(
 )
 }

 private suspend fun deletePendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().activitiesPendingDelete.map { activityId ->
 async {
 markActivityAsRemovedFromMempool(activityId).onSuccess {
 cacheStore.removeActivityFromPendingDelete(activityId)
 }
 }
 }.awaitAll()
 }

 private suspend fun boostPendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().pendingBoostActivities.map { pendingBoostActivity ->
 async {
Expand DownExpand Up@@ -484,32 +460,6 @@ class ActivityRepo @Inject constructor(
 }.awaitAll()
 }

 /**
 * Marks an activity as removed from mempool (sets doesExist = false).
 * Used for RBFed transactions that are replaced.
 */
 private suspend fun markActivityAsRemovedFromMempool(activityId: String): Result<Unit> = withContext(bgDispatcher) {
 return@withContext runCatching {
 val existingActivity = getActivity(activityId).getOrNull()
 ?: return@withContext Result.failure(Exception("Activity $activityId not found"))

 if (existingActivity is Activity.Onchain) {
 val updatedActivity = Activity.Onchain(
 v1 = existingActivity.v1.copy(
 doesExist = false,
 updatedAt = nowTimestamp().toEpochMilli().toULong()
 )
 )
 updateActivity(id = activityId, activity = updatedActivity, forceUpdate = true).getOrThrow()
 notifyActivitiesChanged()
 } else {
 return@withContext Result.failure(Exception("Activity $activityId is not an onchain activity"))
 }
 }.onFailure { e ->
 Logger.error("markActivityAsRemovedFromMempool error for ID: $activityId", e, context = TAG)
 }
 }

 /**
 * Deletes an activity
 */
Expand Down

13 changes: 13 additions & 0 deletions
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
import org.lightningdevkit.ldknode.PeerDetails
import org.lightningdevkit.ldknode.SpendableUtxo
import org.lightningdevkit.ldknode.TransactionDetails
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
Expand DownExpand Up@@ -717,6 +718,18 @@ class LightningRepo @Inject constructor(
 Result.success(payments)
 }

 suspend fun getTransactionDetails(txid: Txid): Result<TransactionDetails?> = executeWhenNodeRunning(
 "Get transaction details by txid"
 ) {
 Result.success(lightningService.getTransactionDetails(txid))
 }

 suspend fun getAddressBalance(address: String): Result<ULong> = executeWhenNodeRunning("Get address balance") {
 runCatching {
 lightningService.getAddressBalance(address)
 }
 }

 suspend fun listSpendableOutputs(): Result<List<SpendableUtxo>> = executeWhenNodeRunning("List spendable outputs") {
 lightningService.listSpendableOutputs()
 }
Expand Down

7 changes: 2 additions & 5 deletions
app/src/main/java/to/bitkit/repositories/WalletRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ import to.bitkit.models.toDerivationPath
import to.bitkit.services.CoreService
import to.bitkit.usecases.DeriveBalanceStateUseCase
import to.bitkit.usecases.WipeWalletUseCase
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Bip21Utils
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
Expand All@@ -43,7 +42,6 @@ class WalletRepo @Inject constructor(
 private val keychain: Keychain,
 private val coreService: CoreService,
 private val settingsStore: SettingsStore,
 private val addressChecker: AddressChecker,
 private val lightningRepo: LightningRepo,
 private val cacheStore: CacheStore,
 private val preActivityMetadataRepo: PreActivityMetadataRepo,
Expand DownExpand Up@@ -83,9 +81,8 @@ class WalletRepo @Inject constructor(

 suspend fun checkAddressUsage(address: String): Result<Boolean> = withContext(bgDispatcher) {
 return@withContext try {
 val addressInfo = addressChecker.getAddressInfo(address)
 val hasTransactions = addressInfo.chain_stats.tx_count > 0 || addressInfo.mempool_stats.tx_count > 0
 Result.success(hasTransactions)
 val result = coreService.isAddressUsed(address)
 Result.success(result)
 } catch (e: Exception) {
 Logger.error("checkAddressUsage error", e, context = TAG)
 Result.failure(e)
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Integrate LDK events#487

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 7 commits into

from

Nov 28, 2025
 Merged


Integrate LDK events
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
185c51f

Integrate LDK events


ben-kaufman Nov 28, 2025
9b1a6f0

chore: cleanup


ovitrif Nov 28, 2025
2f0122f

chore: lint


ovitrif Nov 28, 2025
83d3c6e

Remove unused istransfer


ben-kaufman Nov 28, 2025
ab38e84

Merge branch 'feat/onchain-events' into ldk-events-integration


ben-kaufman Nov 28, 2025
98e6727

Remove unused variable


ben-kaufman Nov 28, 2025
d6b6799

Fix comments


ben-kaufman Nov 28, 2025

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


17 changes: 0 additions & 17 deletions
app/src/main/java/to/bitkit/data/CacheStore.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,6 @@ class CacheStore @Inject constructor(
 }
 }

 suspend fun addActivityToPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete + activityId)
 }
 }

 suspend fun removeActivityFromPendingDelete(activityId: String) {
 if (activityId.isBlank()) return
 if (activityId !in store.data.first().activitiesPendingDelete) return
 store.updateData {
 it.copy(activitiesPendingDelete = it.activitiesPendingDelete - activityId)
 }
 }

 suspend fun addActivityToPendingBoost(pendingBoostActivity: PendingBoostActivity) {
 if (pendingBoostActivity in store.data.first().pendingBoostActivities) return
 store.updateData {
Expand DownExpand Up@@ -137,7 +121,6 @@ data class AppCacheData(
 val balance: BalanceState? = null,
 val backupStatuses: Map<BackupCategory, BackupItemStatus> = mapOf(),
 val deletedActivities: List<String> = listOf(),
 val activitiesPendingDelete: List<String> = listOf(),
 val lastLightningPaymentId: String? = null,
 val pendingBoostActivities: List<PendingBoostActivity> = listOf(),
)

2 changes: 1 addition & 1 deletion
app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ class NotifyPaymentReceivedHandler @Inject constructor(
 is NotifyPaymentReceived.Command.Lightning -> true
 is NotifyPaymentReceived.Command.Onchain -> {
 delay(DELAY_FOR_ACTIVITY_SYNC_MS)
 activityRepo.shouldShowPaymentReceived(command.paymentHashOrTxId, command.sats)
 activityRepo.shouldShowReceivedSheet(command.paymentHashOrTxId, command.sats)
 }
 }

Expand Down

5 changes: 0 additions & 5 deletions
app/src/main/java/to/bitkit/ext/Activities.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,11 +33,6 @@ fun Activity.totalValue() = when (this) {
 }
}

fun Activity.canBeBoosted() = when (this) {
 is Activity.Onchain -> !v1.confirmed && v1.doesExist && !v1.isBoosted && !v1.isTransfer && v1.value > 0uL
 else -> false
}

fun Activity.isBoosted() = when (this) {
 is Activity.Onchain -> v1.isBoosted
 else -> false
Expand Down

162 changes: 56 additions & 106 deletions
app/src/main/java/to/bitkit/repositories/ActivityRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentDirection
import org.lightningdevkit.ldknode.PaymentKind
import org.lightningdevkit.ldknode.TransactionDetails
import to.bitkit.data.CacheStore
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.di.BgDispatcher
Expand All@@ -36,7 +37,6 @@ import to.bitkit.ext.nowTimestamp
import to.bitkit.ext.rawId
import to.bitkit.models.ActivityBackupV1
import to.bitkit.services.CoreService
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton
Expand All@@ -50,7 +50,6 @@ class ActivityRepo @Inject constructor(
 private val coreService: CoreService,
 private val lightningRepo: LightningRepo,
 private val blocktankRepo: BlocktankRepo,
 private val addressChecker: AddressChecker,
 private val cacheStore: CacheStore,
 private val transferRepo: TransferRepo,
 private val clock: Clock,
Expand DownExpand Up@@ -83,8 +82,6 @@ class ActivityRepo @Inject constructor(

 isSyncingLdkNodePayments.update { true }

 deletePendingActivities()

 lightningRepo.getPayments().mapCatching { payments ->
 Logger.debug("Got payments with success, syncing activities", context = TAG)
 syncLdkNodePayments(payments).getOrThrow()
Expand DownExpand Up@@ -167,67 +164,13 @@ class ActivityRepo @Inject constructor(
 }

 private suspend fun findClosedChannelForTransaction(txid: String): String? {
 return try {
 val closedChannelsResult = getClosedChannels(SortDirection.DESC)
 val closedChannels = closedChannelsResult.getOrNull() ?: return null
 if (closedChannels.isEmpty()) return null

 val txDetails = addressChecker.getTransaction(txid)

 txDetails.vin.firstNotNullOfOrNull { input ->
 val inputTxid = input.txid ?: return@firstNotNullOfOrNull null
 val inputVout = input.vout ?: return@firstNotNullOfOrNull null

 closedChannels.firstOrNull { channel ->
 channel.fundingTxoTxid == inputTxid && channel.fundingTxoIndex == inputVout.toUInt()
 }?.channelId
 }
 } catch (e: Exception) {
 Logger.warn(
 "Failed to check if transaction $txid spends closed channel funding UTXO",
 e,
 context = TAG
 )
 null
 }
 return coreService.activity.findClosedChannelForTransaction(txid, null)
 }

private suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
 return coreService.activity.getOnchainActivityByTxId(txid)
 }

 /**
 * Determines whether to show the payment received UI for an onchain transaction.
 * Returns false for:
 * - Zero value transactions
 * - Channel closure transactions (transfers to savings)
 * - RBF replacement transactions with the same value as the original
 */
 suspend fun shouldShowPaymentReceived(txid: String, value: ULong): Boolean = withContext(bgDispatcher) {
 if (value == 0uL) return@withContext false

 if (findClosedChannelForTransaction(txid) != null) {
 Logger.debug("Skipping payment received UI for channel closure tx: $txid", context = TAG)
 return@withContext false
 }

 val onchainActivity = getOnchainActivityByTxId(txid)
 if (onchainActivity != null && onchainActivity.boostTxIds.isNotEmpty()) {
 for (replacedTxid in onchainActivity.boostTxIds) {
 val replacedActivity = getOnchainActivityByTxId(replacedTxid)
 if (replacedActivity != null && replacedActivity.value == value) {
 Logger.info(
 "Skipping payment received UI for RBF replacement $txid with same value as $replacedTxid",
 context = TAG
 )
 return@withContext false
 }
 }
 }

 return@withContext true
 }

 /**
 * Checks if a transaction is inbound (received) by looking up the payment direction.
 */
Expand All@@ -247,6 +190,58 @@ class ActivityRepo @Inject constructor(
 return@withContext !onchainActivity.doesExist
 }

 suspend fun handleOnchainTransactionReceived(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionReceived(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionConfirmed(
 txid: String,
 details: TransactionDetails,
 ) {
 coreService.activity.handleOnchainTransactionConfirmed(txid, details)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReplaced(txid: String, conflicts: List<String>) {
 coreService.activity.handleOnchainTransactionReplaced(txid, conflicts)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionReorged(txid: String) {
 coreService.activity.handleOnchainTransactionReorged(txid)
 notifyActivitiesChanged()
 }

 suspend fun handleOnchainTransactionEvicted(txid: String) {
 coreService.activity.handleOnchainTransactionEvicted(txid)
 notifyActivitiesChanged()
 }

 suspend fun handlePaymentEvent(paymentHash: String) {
 coreService.activity.handlePaymentEvent(paymentHash)
 notifyActivitiesChanged()
 }

 suspend fun shouldShowReceivedSheet(txid: String, value: ULong): Boolean {
 return coreService.activity.shouldShowReceivedSheet(txid, value)
 }

 suspend fun getBoostTxDoesExist(boostTxIds: List<String>): Map<String, Boolean> {
 return coreService.activity.getBoostTxDoesExist(boostTxIds)
 }

 suspend fun isCpfpChildTransaction(txId: String): Boolean {
 return coreService.activity.isCpfpChildTransaction(txId)
 }

 suspend fun getTxIdsInBoostTxIds(): Set<String> {
 return coreService.activity.getTxIdsInBoostTxIds()
 }

 /**
 * Gets a specific activity by payment hash or txID with retry logic
 */
Expand DownExpand Up@@ -392,22 +387,13 @@ class ActivityRepo @Inject constructor(
 ).fold(
 onSuccess = {
 Logger.debug(
 "Activity $id updated with success. new data: $activity. " +
 "Marking activity $activityIdToDelete as removed from mempool",
 "Activity $id updated with success. new data: $activity",
 context = TAG
 )

 val tags = coreService.activity.tags(activityIdToDelete)
 addTagsToActivity(activityId = id, tags = tags)

 markActivityAsRemovedFromMempool(activityIdToDelete).onFailure { e ->
 Logger.warn(
 "Failed to mark $activityIdToDelete as removed from mempool, caching to retry on next sync",
 e = e,
 context = TAG
 )
 cacheStore.addActivityToPendingDelete(activityId = activityIdToDelete)
 }
 Result.success(Unit)
 },
 onFailure = { e ->
Expand All@@ -422,16 +408,6 @@ class ActivityRepo @Inject constructor(
 )
 }

 private suspend fun deletePendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().activitiesPendingDelete.map { activityId ->
 async {
 markActivityAsRemovedFromMempool(activityId).onSuccess {
 cacheStore.removeActivityFromPendingDelete(activityId)
 }
 }
 }.awaitAll()
 }

 private suspend fun boostPendingActivities() = withContext(bgDispatcher) {
 cacheStore.data.first().pendingBoostActivities.map { pendingBoostActivity ->
 async {
Expand DownExpand Up@@ -484,32 +460,6 @@ class ActivityRepo @Inject constructor(
 }.awaitAll()
 }

 /**
 * Marks an activity as removed from mempool (sets doesExist = false).
 * Used for RBFed transactions that are replaced.
 */
 private suspend fun markActivityAsRemovedFromMempool(activityId: String): Result<Unit> = withContext(bgDispatcher) {
 return@withContext runCatching {
 val existingActivity = getActivity(activityId).getOrNull()
 ?: return@withContext Result.failure(Exception("Activity $activityId not found"))

 if (existingActivity is Activity.Onchain) {
 val updatedActivity = Activity.Onchain(
 v1 = existingActivity.v1.copy(
 doesExist = false,
 updatedAt = nowTimestamp().toEpochMilli().toULong()
 )
 )
 updateActivity(id = activityId, activity = updatedActivity, forceUpdate = true).getOrThrow()
 notifyActivitiesChanged()
 } else {
 return@withContext Result.failure(Exception("Activity $activityId is not an onchain activity"))
 }
 }.onFailure { e ->
 Logger.error("markActivityAsRemovedFromMempool error for ID: $activityId", e, context = TAG)
 }
 }

 /**
 * Deletes an activity
 */
Expand Down

13 changes: 13 additions & 0 deletions
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
import org.lightningdevkit.ldknode.PeerDetails
import org.lightningdevkit.ldknode.SpendableUtxo
import org.lightningdevkit.ldknode.TransactionDetails
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
Expand DownExpand Up@@ -717,6 +718,18 @@ class LightningRepo @Inject constructor(
 Result.success(payments)
 }

 suspend fun getTransactionDetails(txid: Txid): Result<TransactionDetails?> = executeWhenNodeRunning(
 "Get transaction details by txid"
 ) {
 Result.success(lightningService.getTransactionDetails(txid))
 }

 suspend fun getAddressBalance(address: String): Result<ULong> = executeWhenNodeRunning("Get address balance") {
 runCatching {
 lightningService.getAddressBalance(address)
 }
 }

 suspend fun listSpendableOutputs(): Result<List<SpendableUtxo>> = executeWhenNodeRunning("List spendable outputs") {
 lightningService.listSpendableOutputs()
 }
Expand Down

7 changes: 2 additions & 5 deletions
app/src/main/java/to/bitkit/repositories/WalletRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,6 @@ import to.bitkit.models.toDerivationPath
import to.bitkit.services.CoreService
import to.bitkit.usecases.DeriveBalanceStateUseCase
import to.bitkit.usecases.WipeWalletUseCase
import to.bitkit.utils.AddressChecker
import to.bitkit.utils.Bip21Utils
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
Expand All@@ -43,7 +42,6 @@ class WalletRepo @Inject constructor(
 private val keychain: Keychain,
 private val coreService: CoreService,
 private val settingsStore: SettingsStore,
 private val addressChecker: AddressChecker,
 private val lightningRepo: LightningRepo,
 private val cacheStore: CacheStore,
 private val preActivityMetadataRepo: PreActivityMetadataRepo,
Expand DownExpand Up@@ -83,9 +81,8 @@ class WalletRepo @Inject constructor(

 suspend fun checkAddressUsage(address: String): Result<Boolean> = withContext(bgDispatcher) {
 return@withContext try {
 val addressInfo = addressChecker.getAddressInfo(address)
 val hasTransactions = addressInfo.chain_stats.tx_count > 0 || addressInfo.mempool_stats.tx_count > 0
 Result.success(hasTransactions)
 val result = coreService.isAddressUsed(address)
 Result.success(result)
 } catch (e: Exception) {
 Logger.error("checkAddressUsage error", e, context = TAG)
 Result.failure(e)
Expand Down
Loading
Loading