Move closed channels tracking to LightningRepo#474

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
jvsena42 merged 1 commit into from
Nov 20, 2025
Merged

Move closed channels tracking to LightningRepo #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 96 additions & 1 deletion app/src/main/java/to/bitkit/repositories/LightningRepo.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
package to.bitkit.repositories

import com.google.firebase.messaging.FirebaseMessaging
import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.FeeRates
import com.synonym.bitkitcore.LightningInvoice
import com.synonym.bitkitcore.Scanner
Expand All@@ -27,6 +28,7 @@ import org.lightningdevkit.ldknode.BalanceDetails
import org.lightningdevkit.ldknode.BestBlock
import org.lightningdevkit.ldknode.ChannelConfig
import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.NodeStatus
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
Expand DownExpand Up@@ -57,6 +59,7 @@ import to.bitkit.services.NodeEventHandler
import to.bitkit.utils.AppError
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.time.Duration
Expand DownExpand Up@@ -85,6 +88,8 @@ class LightningRepo @Inject constructor(
private val _isRecoveryMode = MutableStateFlow(false)
val isRecoveryMode = _isRecoveryMode.asStateFlow()

private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

/**
* Executes the provided operation only if the node is running.
* If the node is not running, waits for it to be running for a specified timeout.
Expand DownExpand Up@@ -203,12 +208,16 @@ class LightningRepo @Inject constructor(
if (getStatus()?.isRunning == true) {
Logger.info("LDK node already running", context = TAG)
_lightningState.update { it.copy(nodeLifecycleState = NodeLifecycleState.Running) }
lightningService.listenForEvents(onEvent = eventHandler)
lightningService.listenForEvents(onEvent = { event ->
handleLdkEvent(event)
eventHandler?.invoke(event)
})
return@withContext Result.success(Unit)
}

// Start the node service
lightningService.start(timeout) { event ->
handleLdkEvent(event)
eventHandler?.invoke(event)
ldkNodeEventBus.emit(event)
}
Expand All@@ -220,6 +229,7 @@ class LightningRepo @Inject constructor(
// Initial state sync
syncState()
updateGeoBlockState()
refreshChannelCache()

// Perform post-startup tasks
connectToTrustedPeers().onFailure { e ->
Expand DownExpand Up@@ -296,12 +306,96 @@ class LightningRepo @Inject constructor(

_lightningState.update { it.copy(isSyncingWallet = true) }
lightningService.sync()
refreshChannelCache()
syncState()
_lightningState.update { it.copy(isSyncingWallet = false) }

Result.success(Unit)
}

private suspend fun refreshChannelCache() = withContext(bgDispatcher) {
val channels = lightningService.channels ?: return@withContext
channels.forEach { channel ->
channelCache[channel.channelId] = channel
}
}

private fun handleLdkEvent(event: Event) {
when (event) {
is Event.ChannelPending -> {
scope.launch {
refreshChannelCache()
}
}
is Event.ChannelReady -> {
scope.launch {
refreshChannelCache()
}
}
is Event.ChannelClosed -> {
val channelId = event.channelId
val reason = event.reason?.toString() ?: ""
scope.launch {
registerClosedChannel(channelId, reason)
}
}
else -> {
// Other events don't need special handling
}
}
}

private suspend fun registerClosedChannel(channelId: String, reason: String?) = withContext(bgDispatcher) {
try {
val channel = channelCache[channelId] ?: run {
Logger.error(
"Could not find channel details for closed channel: channelId=$channelId",
context = TAG
)
return@withContext
}

val fundingTxo = channel.fundingTxo
if (fundingTxo == null) {
Logger.error(
"Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
context = TAG
)
return@withContext
}

val channelName = channel.inboundScidAlias?.toString()
?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

val closedAt = (System.currentTimeMillis() / 1000L).toULong()

val closedChannel = ClosedChannelDetails(
channelId = channel.channelId,
counterpartyNodeId = channel.counterpartyNodeId,
fundingTxoTxid = fundingTxo.txid,
fundingTxoIndex = fundingTxo.vout,
channelValueSats = channel.channelValueSats,
closedAt = closedAt,
outboundCapacityMsat = channel.outboundCapacityMsat,
inboundCapacityMsat = channel.inboundCapacityMsat,
counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
channelName = channelName,
channelClosureReason = reason.orEmpty()
)

coreService.activity.upsertClosedChannelList(listOf(closedChannel))

channelCache.remove(channelId)

Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
} catch (e: Throwable) {
Logger.error("Failed to register closed channel: $e", e, context = TAG)
}
}

suspend fun wipeStorage(walletIndex: Int): Result<Unit> = withContext(bgDispatcher) {
Logger.debug("wipeStorage called, stopping node first", context = TAG)
stop().onSuccess {
Expand DownExpand Up@@ -867,6 +961,7 @@ class LightningRepo @Inject constructor(
companion object {
private const val TAG = "LightningRepo"
private const val SYNC_TIMEOUT_MS = 20_000L
private const val CHANNEL_ID_PREVIEW_LENGTH = 10
}
}

Expand Down
85 changes: 0 additions & 85 deletions app/src/main/java/to/bitkit/services/LightningService.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
package to.bitkit.services

import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.upsertClosedChannel
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
Expand DownExpand Up@@ -51,7 +49,6 @@ import to.bitkit.utils.LdkError
import to.bitkit.utils.LdkLogWriter
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.io.path.Path
Expand All@@ -74,8 +71,6 @@ class LightningService @Inject constructor(

private lateinit var trustedPeers: List<PeerDetails>

private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

suspend fun setup(
walletIndex: Int,
customServerUrl: String? = null,
Expand DownExpand Up@@ -196,7 +191,6 @@ class LightningService @Inject constructor(
}
}

refreshChannelCache()
Logger.info("Node started")
}

Expand DownExpand Up@@ -232,79 +226,10 @@ class LightningService @Inject constructor(
node.syncWallets()
// launch { setMaxDustHtlcExposureForCurrentChannels() }
}
refreshChannelCache()

Logger.debug("LDK synced")
}

private suspend fun refreshChannelCache() {
val node = this.node ?: return

ServiceQueue.LDK.background {
val channels = node.listChannels()
channels.forEach { channel ->
channelCache[channel.channelId] = channel
}
}
}

private suspend fun registerClosedChannel(channelId: String, reason: String?) {
try {
val channel = ServiceQueue.LDK.background {
channelCache[channelId]
} ?: run {
Logger.error(
"Could not find channel details for closed channel: channelId=$channelId",
context = TAG
)
return@registerClosedChannel
}

val fundingTxo = channel.fundingTxo
if (fundingTxo == null) {
Logger.error(
"Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
context = TAG
)
return@registerClosedChannel
}

val channelName = channel.inboundScidAlias?.toString()
?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

val closedAt = (System.currentTimeMillis() / 1000L).toULong()

val closedChannel = ClosedChannelDetails(
channelId = channel.channelId,
counterpartyNodeId = channel.counterpartyNodeId,
fundingTxoTxid = fundingTxo.txid,
fundingTxoIndex = fundingTxo.vout,
channelValueSats = channel.channelValueSats,
closedAt = closedAt,
outboundCapacityMsat = channel.outboundCapacityMsat,
inboundCapacityMsat = channel.inboundCapacityMsat,
counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
channelName = channelName,
channelClosureReason = reason.orEmpty()
)

ServiceQueue.CORE.background {
upsertClosedChannel(closedChannel)
}

ServiceQueue.LDK.background {
channelCache.remove(channelId)
}

Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
} catch (e: Exception) {
Logger.error("Failed to register closed channel: $e", e, context = TAG)
}
}

// private fun setMaxDustHtlcExposureForCurrentChannels() {
// if (Env.network != Network.REGTEST) {
// Logger.debug("Not updating channel config for non-regtest network")
Expand DownExpand Up@@ -815,9 +740,6 @@ class LightningService @Inject constructor(
Logger.info(
"⏳ Channel pending: channelId: $channelId userChannelId: $userChannelId formerTemporaryChannelId: $formerTemporaryChannelId counterpartyNodeId: $counterpartyNodeId fundingTxo: $fundingTxo"
)
launch {
refreshChannelCache()
}
}

is Event.ChannelReady -> {
Expand All@@ -827,9 +749,6 @@ class LightningService @Inject constructor(
Logger.info(
"👐 Channel ready: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId"
)
launch {
refreshChannelCache()
}
}

is Event.ChannelClosed -> {
Expand All@@ -840,9 +759,6 @@ class LightningService @Inject constructor(
Logger.info(
"⛔ Channel closed: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId reason: $reason"
)
launch {
registerClosedChannel(channelId, reason)
}
}
}
}
Expand All@@ -867,7 +783,6 @@ class LightningService @Inject constructor(

companion object {
private const val TAG = "LightningService"
private const val CHANNEL_ID_PREVIEW_LENGTH = 10
}
}

Expand Down
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
Move closed channels tracking to LightningRepo#474

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

jvsena42
merged 1 commit into

from

Nov 20, 2025
 Merged


Move closed channels tracking to LightningRepo
#474
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 96 additions & 1 deletion
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
package to.bitkit.repositories

import com.google.firebase.messaging.FirebaseMessaging
import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.FeeRates
import com.synonym.bitkitcore.LightningInvoice
import com.synonym.bitkitcore.Scanner
Expand All@@ -27,6 +28,7 @@ import org.lightningdevkit.ldknode.BalanceDetails
import org.lightningdevkit.ldknode.BestBlock
import org.lightningdevkit.ldknode.ChannelConfig
import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.NodeStatus
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
Expand DownExpand Up@@ -57,6 +59,7 @@ import to.bitkit.services.NodeEventHandler
import to.bitkit.utils.AppError
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.time.Duration
Expand DownExpand Up@@ -85,6 +88,8 @@ class LightningRepo @Inject constructor(
 private val _isRecoveryMode = MutableStateFlow(false)
 val isRecoveryMode = _isRecoveryMode.asStateFlow()

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 /**
 * Executes the provided operation only if the node is running.
 * If the node is not running, waits for it to be running for a specified timeout.
Expand DownExpand Up@@ -203,12 +208,16 @@ class LightningRepo @Inject constructor(
 if (getStatus()?.isRunning == true) {
 Logger.info("LDK node already running", context = TAG)
 _lightningState.update { it.copy(nodeLifecycleState = NodeLifecycleState.Running) }
 lightningService.listenForEvents(onEvent = eventHandler)
 lightningService.listenForEvents(onEvent = { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 })
 return@withContext Result.success(Unit)
 }

 // Start the node service
 lightningService.start(timeout) { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 ldkNodeEventBus.emit(event)
 }
Expand All@@ -220,6 +229,7 @@ class LightningRepo @Inject constructor(
 // Initial state sync
 syncState()
 updateGeoBlockState()
 refreshChannelCache()

 // Perform post-startup tasks
 connectToTrustedPeers().onFailure { e ->
Expand DownExpand Up@@ -296,12 +306,96 @@ class LightningRepo @Inject constructor(

 _lightningState.update { it.copy(isSyncingWallet = true) }
 lightningService.sync()
 refreshChannelCache()
 syncState()
 _lightningState.update { it.copy(isSyncingWallet = false) }

 Result.success(Unit)
 }

 private suspend fun refreshChannelCache() = withContext(bgDispatcher) {
 val channels = lightningService.channels ?: return@withContext
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }

 private fun handleLdkEvent(event: Event) {
 when (event) {
 is Event.ChannelPending -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelReady -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelClosed -> {
 val channelId = event.channelId
 val reason = event.reason?.toString() ?: ""
 scope.launch {
 registerClosedChannel(channelId, reason)
 }
 }
 else -> {
 // Other events don't need special handling
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) = withContext(bgDispatcher) {
 try {
 val channel = channelCache[channelId] ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 coreService.activity.upsertClosedChannelList(listOf(closedChannel))

 channelCache.remove(channelId)

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Throwable) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 suspend fun wipeStorage(walletIndex: Int): Result<Unit> = withContext(bgDispatcher) {
 Logger.debug("wipeStorage called, stopping node first", context = TAG)
 stop().onSuccess {
Expand DownExpand Up@@ -867,6 +961,7 @@ class LightningRepo @Inject constructor(
 companion object {
 private const val TAG = "LightningRepo"
 private const val SYNC_TIMEOUT_MS = 20_000L
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down

85 changes: 0 additions & 85 deletions
app/src/main/java/to/bitkit/services/LightningService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
package to.bitkit.services

import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.upsertClosedChannel
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
Expand DownExpand Up@@ -51,7 +49,6 @@ import to.bitkit.utils.LdkError
import to.bitkit.utils.LdkLogWriter
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.io.path.Path
Expand All@@ -74,8 +71,6 @@ class LightningService @Inject constructor(

 private lateinit var trustedPeers: List<PeerDetails>

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 suspend fun setup(
 walletIndex: Int,
 customServerUrl: String? = null,
Expand DownExpand Up@@ -196,7 +191,6 @@ class LightningService @Inject constructor(
 }
 }

 refreshChannelCache()
 Logger.info("Node started")
 }

Expand DownExpand Up@@ -232,79 +226,10 @@ class LightningService @Inject constructor(
 node.syncWallets()
 // launch { setMaxDustHtlcExposureForCurrentChannels() }
 }
 refreshChannelCache()

 Logger.debug("LDK synced")
 }

 private suspend fun refreshChannelCache() {
 val node = this.node ?: return

 ServiceQueue.LDK.background {
 val channels = node.listChannels()
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) {
 try {
 val channel = ServiceQueue.LDK.background {
 channelCache[channelId]
 } ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 ServiceQueue.CORE.background {
 upsertClosedChannel(closedChannel)
 }

 ServiceQueue.LDK.background {
 channelCache.remove(channelId)
 }

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Exception) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 // private fun setMaxDustHtlcExposureForCurrentChannels() {
 // if (Env.network != Network.REGTEST) {
 // Logger.debug("Not updating channel config for non-regtest network")
Expand DownExpand Up@@ -815,9 +740,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⏳ Channel pending: channelId: $channelId userChannelId: $userChannelId formerTemporaryChannelId: $formerTemporaryChannelId counterpartyNodeId: $counterpartyNodeId fundingTxo: $fundingTxo"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelReady -> {
Expand All@@ -827,9 +749,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "👐 Channel ready: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelClosed -> {
Expand All@@ -840,9 +759,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⛔ Channel closed: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId reason: $reason"
 )
 launch {
 registerClosedChannel(channelId, reason)
 }
 }
 }
 }
Expand All@@ -867,7 +783,6 @@ class LightningService @Inject constructor(

 companion object {
 private const val TAG = "LightningService"
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down
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
Move closed channels tracking to LightningRepo#474

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

jvsena42
merged 1 commit into

from

Nov 20, 2025
 Merged


Move closed channels tracking to LightningRepo
#474
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 96 additions & 1 deletion
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
package to.bitkit.repositories

import com.google.firebase.messaging.FirebaseMessaging
import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.FeeRates
import com.synonym.bitkitcore.LightningInvoice
import com.synonym.bitkitcore.Scanner
Expand All@@ -27,6 +28,7 @@ import org.lightningdevkit.ldknode.BalanceDetails
import org.lightningdevkit.ldknode.BestBlock
import org.lightningdevkit.ldknode.ChannelConfig
import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.NodeStatus
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
Expand DownExpand Up@@ -57,6 +59,7 @@ import to.bitkit.services.NodeEventHandler
import to.bitkit.utils.AppError
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.time.Duration
Expand DownExpand Up@@ -85,6 +88,8 @@ class LightningRepo @Inject constructor(
 private val _isRecoveryMode = MutableStateFlow(false)
 val isRecoveryMode = _isRecoveryMode.asStateFlow()

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 /**
 * Executes the provided operation only if the node is running.
 * If the node is not running, waits for it to be running for a specified timeout.
Expand DownExpand Up@@ -203,12 +208,16 @@ class LightningRepo @Inject constructor(
 if (getStatus()?.isRunning == true) {
 Logger.info("LDK node already running", context = TAG)
 _lightningState.update { it.copy(nodeLifecycleState = NodeLifecycleState.Running) }
 lightningService.listenForEvents(onEvent = eventHandler)
 lightningService.listenForEvents(onEvent = { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 })
 return@withContext Result.success(Unit)
 }

 // Start the node service
 lightningService.start(timeout) { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 ldkNodeEventBus.emit(event)
 }
Expand All@@ -220,6 +229,7 @@ class LightningRepo @Inject constructor(
 // Initial state sync
 syncState()
 updateGeoBlockState()
 refreshChannelCache()

 // Perform post-startup tasks
 connectToTrustedPeers().onFailure { e ->
Expand DownExpand Up@@ -296,12 +306,96 @@ class LightningRepo @Inject constructor(

 _lightningState.update { it.copy(isSyncingWallet = true) }
 lightningService.sync()
 refreshChannelCache()
 syncState()
 _lightningState.update { it.copy(isSyncingWallet = false) }

 Result.success(Unit)
 }

 private suspend fun refreshChannelCache() = withContext(bgDispatcher) {
 val channels = lightningService.channels ?: return@withContext
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }

 private fun handleLdkEvent(event: Event) {
 when (event) {
 is Event.ChannelPending -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelReady -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelClosed -> {
 val channelId = event.channelId
 val reason = event.reason?.toString() ?: ""
 scope.launch {
 registerClosedChannel(channelId, reason)
 }
 }
 else -> {
 // Other events don't need special handling
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) = withContext(bgDispatcher) {
 try {
 val channel = channelCache[channelId] ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 coreService.activity.upsertClosedChannelList(listOf(closedChannel))

 channelCache.remove(channelId)

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Throwable) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 suspend fun wipeStorage(walletIndex: Int): Result<Unit> = withContext(bgDispatcher) {
 Logger.debug("wipeStorage called, stopping node first", context = TAG)
 stop().onSuccess {
Expand DownExpand Up@@ -867,6 +961,7 @@ class LightningRepo @Inject constructor(
 companion object {
 private const val TAG = "LightningRepo"
 private const val SYNC_TIMEOUT_MS = 20_000L
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down

85 changes: 0 additions & 85 deletions
app/src/main/java/to/bitkit/services/LightningService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
package to.bitkit.services

import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.upsertClosedChannel
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
Expand DownExpand Up@@ -51,7 +49,6 @@ import to.bitkit.utils.LdkError
import to.bitkit.utils.LdkLogWriter
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.io.path.Path
Expand All@@ -74,8 +71,6 @@ class LightningService @Inject constructor(

 private lateinit var trustedPeers: List<PeerDetails>

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 suspend fun setup(
 walletIndex: Int,
 customServerUrl: String? = null,
Expand DownExpand Up@@ -196,7 +191,6 @@ class LightningService @Inject constructor(
 }
 }

 refreshChannelCache()
 Logger.info("Node started")
 }

Expand DownExpand Up@@ -232,79 +226,10 @@ class LightningService @Inject constructor(
 node.syncWallets()
 // launch { setMaxDustHtlcExposureForCurrentChannels() }
 }
 refreshChannelCache()

 Logger.debug("LDK synced")
 }

 private suspend fun refreshChannelCache() {
 val node = this.node ?: return

 ServiceQueue.LDK.background {
 val channels = node.listChannels()
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) {
 try {
 val channel = ServiceQueue.LDK.background {
 channelCache[channelId]
 } ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 ServiceQueue.CORE.background {
 upsertClosedChannel(closedChannel)
 }

 ServiceQueue.LDK.background {
 channelCache.remove(channelId)
 }

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Exception) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 // private fun setMaxDustHtlcExposureForCurrentChannels() {
 // if (Env.network != Network.REGTEST) {
 // Logger.debug("Not updating channel config for non-regtest network")
Expand DownExpand Up@@ -815,9 +740,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⏳ Channel pending: channelId: $channelId userChannelId: $userChannelId formerTemporaryChannelId: $formerTemporaryChannelId counterpartyNodeId: $counterpartyNodeId fundingTxo: $fundingTxo"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelReady -> {
Expand All@@ -827,9 +749,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "👐 Channel ready: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelClosed -> {
Expand All@@ -840,9 +759,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⛔ Channel closed: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId reason: $reason"
 )
 launch {
 registerClosedChannel(channelId, reason)
 }
 }
 }
 }
Expand All@@ -867,7 +783,6 @@ class LightningService @Inject constructor(

 companion object {
 private const val TAG = "LightningService"
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down
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
Move closed channels tracking to LightningRepo#474

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

jvsena42
merged 1 commit into

from

Nov 20, 2025
 Merged


Move closed channels tracking to LightningRepo
#474
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 96 additions & 1 deletion
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
package to.bitkit.repositories

import com.google.firebase.messaging.FirebaseMessaging
import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.FeeRates
import com.synonym.bitkitcore.LightningInvoice
import com.synonym.bitkitcore.Scanner
Expand All@@ -27,6 +28,7 @@ import org.lightningdevkit.ldknode.BalanceDetails
import org.lightningdevkit.ldknode.BestBlock
import org.lightningdevkit.ldknode.ChannelConfig
import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.NodeStatus
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
Expand DownExpand Up@@ -57,6 +59,7 @@ import to.bitkit.services.NodeEventHandler
import to.bitkit.utils.AppError
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.time.Duration
Expand DownExpand Up@@ -85,6 +88,8 @@ class LightningRepo @Inject constructor(
 private val _isRecoveryMode = MutableStateFlow(false)
 val isRecoveryMode = _isRecoveryMode.asStateFlow()

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 /**
 * Executes the provided operation only if the node is running.
 * If the node is not running, waits for it to be running for a specified timeout.
Expand DownExpand Up@@ -203,12 +208,16 @@ class LightningRepo @Inject constructor(
 if (getStatus()?.isRunning == true) {
 Logger.info("LDK node already running", context = TAG)
 _lightningState.update { it.copy(nodeLifecycleState = NodeLifecycleState.Running) }
 lightningService.listenForEvents(onEvent = eventHandler)
 lightningService.listenForEvents(onEvent = { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 })
 return@withContext Result.success(Unit)
 }

 // Start the node service
 lightningService.start(timeout) { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 ldkNodeEventBus.emit(event)
 }
Expand All@@ -220,6 +229,7 @@ class LightningRepo @Inject constructor(
 // Initial state sync
 syncState()
 updateGeoBlockState()
 refreshChannelCache()

 // Perform post-startup tasks
 connectToTrustedPeers().onFailure { e ->
Expand DownExpand Up@@ -296,12 +306,96 @@ class LightningRepo @Inject constructor(

 _lightningState.update { it.copy(isSyncingWallet = true) }
 lightningService.sync()
 refreshChannelCache()
 syncState()
 _lightningState.update { it.copy(isSyncingWallet = false) }

 Result.success(Unit)
 }

 private suspend fun refreshChannelCache() = withContext(bgDispatcher) {
 val channels = lightningService.channels ?: return@withContext
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }

 private fun handleLdkEvent(event: Event) {
 when (event) {
 is Event.ChannelPending -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelReady -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelClosed -> {
 val channelId = event.channelId
 val reason = event.reason?.toString() ?: ""
 scope.launch {
 registerClosedChannel(channelId, reason)
 }
 }
 else -> {
 // Other events don't need special handling
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) = withContext(bgDispatcher) {
 try {
 val channel = channelCache[channelId] ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 coreService.activity.upsertClosedChannelList(listOf(closedChannel))

 channelCache.remove(channelId)

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Throwable) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 suspend fun wipeStorage(walletIndex: Int): Result<Unit> = withContext(bgDispatcher) {
 Logger.debug("wipeStorage called, stopping node first", context = TAG)
 stop().onSuccess {
Expand DownExpand Up@@ -867,6 +961,7 @@ class LightningRepo @Inject constructor(
 companion object {
 private const val TAG = "LightningRepo"
 private const val SYNC_TIMEOUT_MS = 20_000L
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down

85 changes: 0 additions & 85 deletions
app/src/main/java/to/bitkit/services/LightningService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
package to.bitkit.services

import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.upsertClosedChannel
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
Expand DownExpand Up@@ -51,7 +49,6 @@ import to.bitkit.utils.LdkError
import to.bitkit.utils.LdkLogWriter
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.io.path.Path
Expand All@@ -74,8 +71,6 @@ class LightningService @Inject constructor(

 private lateinit var trustedPeers: List<PeerDetails>

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 suspend fun setup(
 walletIndex: Int,
 customServerUrl: String? = null,
Expand DownExpand Up@@ -196,7 +191,6 @@ class LightningService @Inject constructor(
 }
 }

 refreshChannelCache()
 Logger.info("Node started")
 }

Expand DownExpand Up@@ -232,79 +226,10 @@ class LightningService @Inject constructor(
 node.syncWallets()
 // launch { setMaxDustHtlcExposureForCurrentChannels() }
 }
 refreshChannelCache()

 Logger.debug("LDK synced")
 }

 private suspend fun refreshChannelCache() {
 val node = this.node ?: return

 ServiceQueue.LDK.background {
 val channels = node.listChannels()
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) {
 try {
 val channel = ServiceQueue.LDK.background {
 channelCache[channelId]
 } ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 ServiceQueue.CORE.background {
 upsertClosedChannel(closedChannel)
 }

 ServiceQueue.LDK.background {
 channelCache.remove(channelId)
 }

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Exception) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 // private fun setMaxDustHtlcExposureForCurrentChannels() {
 // if (Env.network != Network.REGTEST) {
 // Logger.debug("Not updating channel config for non-regtest network")
Expand DownExpand Up@@ -815,9 +740,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⏳ Channel pending: channelId: $channelId userChannelId: $userChannelId formerTemporaryChannelId: $formerTemporaryChannelId counterpartyNodeId: $counterpartyNodeId fundingTxo: $fundingTxo"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelReady -> {
Expand All@@ -827,9 +749,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "👐 Channel ready: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelClosed -> {
Expand All@@ -840,9 +759,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⛔ Channel closed: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId reason: $reason"
 )
 launch {
 registerClosedChannel(channelId, reason)
 }
 }
 }
 }
Expand All@@ -867,7 +783,6 @@ class LightningService @Inject constructor(

 companion object {
 private const val TAG = "LightningService"
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down
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
Move closed channels tracking to LightningRepo#474

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

jvsena42
merged 1 commit into

from

Nov 20, 2025
 Merged


Move closed channels tracking to LightningRepo
#474
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 96 additions & 1 deletion
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
package to.bitkit.repositories

import com.google.firebase.messaging.FirebaseMessaging
import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.FeeRates
import com.synonym.bitkitcore.LightningInvoice
import com.synonym.bitkitcore.Scanner
Expand All@@ -27,6 +28,7 @@ import org.lightningdevkit.ldknode.BalanceDetails
import org.lightningdevkit.ldknode.BestBlock
import org.lightningdevkit.ldknode.ChannelConfig
import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.NodeStatus
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
Expand DownExpand Up@@ -57,6 +59,7 @@ import to.bitkit.services.NodeEventHandler
import to.bitkit.utils.AppError
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.time.Duration
Expand DownExpand Up@@ -85,6 +88,8 @@ class LightningRepo @Inject constructor(
 private val _isRecoveryMode = MutableStateFlow(false)
 val isRecoveryMode = _isRecoveryMode.asStateFlow()

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 /**
 * Executes the provided operation only if the node is running.
 * If the node is not running, waits for it to be running for a specified timeout.
Expand DownExpand Up@@ -203,12 +208,16 @@ class LightningRepo @Inject constructor(
 if (getStatus()?.isRunning == true) {
 Logger.info("LDK node already running", context = TAG)
 _lightningState.update { it.copy(nodeLifecycleState = NodeLifecycleState.Running) }
 lightningService.listenForEvents(onEvent = eventHandler)
 lightningService.listenForEvents(onEvent = { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 })
 return@withContext Result.success(Unit)
 }

 // Start the node service
 lightningService.start(timeout) { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 ldkNodeEventBus.emit(event)
 }
Expand All@@ -220,6 +229,7 @@ class LightningRepo @Inject constructor(
 // Initial state sync
 syncState()
 updateGeoBlockState()
 refreshChannelCache()

 // Perform post-startup tasks
 connectToTrustedPeers().onFailure { e ->
Expand DownExpand Up@@ -296,12 +306,96 @@ class LightningRepo @Inject constructor(

 _lightningState.update { it.copy(isSyncingWallet = true) }
 lightningService.sync()
 refreshChannelCache()
 syncState()
 _lightningState.update { it.copy(isSyncingWallet = false) }

 Result.success(Unit)
 }

 private suspend fun refreshChannelCache() = withContext(bgDispatcher) {
 val channels = lightningService.channels ?: return@withContext
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }

 private fun handleLdkEvent(event: Event) {
 when (event) {
 is Event.ChannelPending -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelReady -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelClosed -> {
 val channelId = event.channelId
 val reason = event.reason?.toString() ?: ""
 scope.launch {
 registerClosedChannel(channelId, reason)
 }
 }
 else -> {
 // Other events don't need special handling
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) = withContext(bgDispatcher) {
 try {
 val channel = channelCache[channelId] ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 coreService.activity.upsertClosedChannelList(listOf(closedChannel))

 channelCache.remove(channelId)

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Throwable) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 suspend fun wipeStorage(walletIndex: Int): Result<Unit> = withContext(bgDispatcher) {
 Logger.debug("wipeStorage called, stopping node first", context = TAG)
 stop().onSuccess {
Expand DownExpand Up@@ -867,6 +961,7 @@ class LightningRepo @Inject constructor(
 companion object {
 private const val TAG = "LightningRepo"
 private const val SYNC_TIMEOUT_MS = 20_000L
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down

85 changes: 0 additions & 85 deletions
app/src/main/java/to/bitkit/services/LightningService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
package to.bitkit.services

import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.upsertClosedChannel
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
Expand DownExpand Up@@ -51,7 +49,6 @@ import to.bitkit.utils.LdkError
import to.bitkit.utils.LdkLogWriter
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.io.path.Path
Expand All@@ -74,8 +71,6 @@ class LightningService @Inject constructor(

 private lateinit var trustedPeers: List<PeerDetails>

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 suspend fun setup(
 walletIndex: Int,
 customServerUrl: String? = null,
Expand DownExpand Up@@ -196,7 +191,6 @@ class LightningService @Inject constructor(
 }
 }

 refreshChannelCache()
 Logger.info("Node started")
 }

Expand DownExpand Up@@ -232,79 +226,10 @@ class LightningService @Inject constructor(
 node.syncWallets()
 // launch { setMaxDustHtlcExposureForCurrentChannels() }
 }
 refreshChannelCache()

 Logger.debug("LDK synced")
 }

 private suspend fun refreshChannelCache() {
 val node = this.node ?: return

 ServiceQueue.LDK.background {
 val channels = node.listChannels()
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) {
 try {
 val channel = ServiceQueue.LDK.background {
 channelCache[channelId]
 } ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 ServiceQueue.CORE.background {
 upsertClosedChannel(closedChannel)
 }

 ServiceQueue.LDK.background {
 channelCache.remove(channelId)
 }

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Exception) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 // private fun setMaxDustHtlcExposureForCurrentChannels() {
 // if (Env.network != Network.REGTEST) {
 // Logger.debug("Not updating channel config for non-regtest network")
Expand DownExpand Up@@ -815,9 +740,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⏳ Channel pending: channelId: $channelId userChannelId: $userChannelId formerTemporaryChannelId: $formerTemporaryChannelId counterpartyNodeId: $counterpartyNodeId fundingTxo: $fundingTxo"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelReady -> {
Expand All@@ -827,9 +749,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "👐 Channel ready: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelClosed -> {
Expand All@@ -840,9 +759,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⛔ Channel closed: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId reason: $reason"
 )
 launch {
 registerClosedChannel(channelId, reason)
 }
 }
 }
 }
Expand All@@ -867,7 +783,6 @@ class LightningService @Inject constructor(

 companion object {
 private const val TAG = "LightningService"
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down
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
Move closed channels tracking to LightningRepo#474

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

jvsena42
merged 1 commit into

from

Nov 20, 2025
 Merged


Move closed channels tracking to LightningRepo
#474
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 96 additions & 1 deletion
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
package to.bitkit.repositories

import com.google.firebase.messaging.FirebaseMessaging
import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.FeeRates
import com.synonym.bitkitcore.LightningInvoice
import com.synonym.bitkitcore.Scanner
Expand All@@ -27,6 +28,7 @@ import org.lightningdevkit.ldknode.BalanceDetails
import org.lightningdevkit.ldknode.BestBlock
import org.lightningdevkit.ldknode.ChannelConfig
import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.NodeStatus
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
Expand DownExpand Up@@ -57,6 +59,7 @@ import to.bitkit.services.NodeEventHandler
import to.bitkit.utils.AppError
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.time.Duration
Expand DownExpand Up@@ -85,6 +88,8 @@ class LightningRepo @Inject constructor(
 private val _isRecoveryMode = MutableStateFlow(false)
 val isRecoveryMode = _isRecoveryMode.asStateFlow()

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 /**
 * Executes the provided operation only if the node is running.
 * If the node is not running, waits for it to be running for a specified timeout.
Expand DownExpand Up@@ -203,12 +208,16 @@ class LightningRepo @Inject constructor(
 if (getStatus()?.isRunning == true) {
 Logger.info("LDK node already running", context = TAG)
 _lightningState.update { it.copy(nodeLifecycleState = NodeLifecycleState.Running) }
 lightningService.listenForEvents(onEvent = eventHandler)
 lightningService.listenForEvents(onEvent = { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 })
 return@withContext Result.success(Unit)
 }

 // Start the node service
 lightningService.start(timeout) { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 ldkNodeEventBus.emit(event)
 }
Expand All@@ -220,6 +229,7 @@ class LightningRepo @Inject constructor(
 // Initial state sync
 syncState()
 updateGeoBlockState()
 refreshChannelCache()

 // Perform post-startup tasks
 connectToTrustedPeers().onFailure { e ->
Expand DownExpand Up@@ -296,12 +306,96 @@ class LightningRepo @Inject constructor(

 _lightningState.update { it.copy(isSyncingWallet = true) }
 lightningService.sync()
 refreshChannelCache()
 syncState()
 _lightningState.update { it.copy(isSyncingWallet = false) }

 Result.success(Unit)
 }

 private suspend fun refreshChannelCache() = withContext(bgDispatcher) {
 val channels = lightningService.channels ?: return@withContext
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }

 private fun handleLdkEvent(event: Event) {
 when (event) {
 is Event.ChannelPending -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelReady -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelClosed -> {
 val channelId = event.channelId
 val reason = event.reason?.toString() ?: ""
 scope.launch {
 registerClosedChannel(channelId, reason)
 }
 }
 else -> {
 // Other events don't need special handling
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) = withContext(bgDispatcher) {
 try {
 val channel = channelCache[channelId] ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 coreService.activity.upsertClosedChannelList(listOf(closedChannel))

 channelCache.remove(channelId)

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Throwable) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 suspend fun wipeStorage(walletIndex: Int): Result<Unit> = withContext(bgDispatcher) {
 Logger.debug("wipeStorage called, stopping node first", context = TAG)
 stop().onSuccess {
Expand DownExpand Up@@ -867,6 +961,7 @@ class LightningRepo @Inject constructor(
 companion object {
 private const val TAG = "LightningRepo"
 private const val SYNC_TIMEOUT_MS = 20_000L
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down

85 changes: 0 additions & 85 deletions
app/src/main/java/to/bitkit/services/LightningService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
package to.bitkit.services

import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.upsertClosedChannel
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
Expand DownExpand Up@@ -51,7 +49,6 @@ import to.bitkit.utils.LdkError
import to.bitkit.utils.LdkLogWriter
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.io.path.Path
Expand All@@ -74,8 +71,6 @@ class LightningService @Inject constructor(

 private lateinit var trustedPeers: List<PeerDetails>

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 suspend fun setup(
 walletIndex: Int,
 customServerUrl: String? = null,
Expand DownExpand Up@@ -196,7 +191,6 @@ class LightningService @Inject constructor(
 }
 }

 refreshChannelCache()
 Logger.info("Node started")
 }

Expand DownExpand Up@@ -232,79 +226,10 @@ class LightningService @Inject constructor(
 node.syncWallets()
 // launch { setMaxDustHtlcExposureForCurrentChannels() }
 }
 refreshChannelCache()

 Logger.debug("LDK synced")
 }

 private suspend fun refreshChannelCache() {
 val node = this.node ?: return

 ServiceQueue.LDK.background {
 val channels = node.listChannels()
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) {
 try {
 val channel = ServiceQueue.LDK.background {
 channelCache[channelId]
 } ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 ServiceQueue.CORE.background {
 upsertClosedChannel(closedChannel)
 }

 ServiceQueue.LDK.background {
 channelCache.remove(channelId)
 }

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Exception) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 // private fun setMaxDustHtlcExposureForCurrentChannels() {
 // if (Env.network != Network.REGTEST) {
 // Logger.debug("Not updating channel config for non-regtest network")
Expand DownExpand Up@@ -815,9 +740,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⏳ Channel pending: channelId: $channelId userChannelId: $userChannelId formerTemporaryChannelId: $formerTemporaryChannelId counterpartyNodeId: $counterpartyNodeId fundingTxo: $fundingTxo"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelReady -> {
Expand All@@ -827,9 +749,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "👐 Channel ready: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelClosed -> {
Expand All@@ -840,9 +759,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⛔ Channel closed: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId reason: $reason"
 )
 launch {
 registerClosedChannel(channelId, reason)
 }
 }
 }
 }
Expand All@@ -867,7 +783,6 @@ class LightningService @Inject constructor(

 companion object {
 private const val TAG = "LightningService"
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down
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
Move closed channels tracking to LightningRepo#474

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

jvsena42
merged 1 commit into

from

Nov 20, 2025
 Merged


Move closed channels tracking to LightningRepo
#474
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 96 additions & 1 deletion
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
package to.bitkit.repositories

import com.google.firebase.messaging.FirebaseMessaging
import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.FeeRates
import com.synonym.bitkitcore.LightningInvoice
import com.synonym.bitkitcore.Scanner
Expand All@@ -27,6 +28,7 @@ import org.lightningdevkit.ldknode.BalanceDetails
import org.lightningdevkit.ldknode.BestBlock
import org.lightningdevkit.ldknode.ChannelConfig
import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.NodeStatus
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
Expand DownExpand Up@@ -57,6 +59,7 @@ import to.bitkit.services.NodeEventHandler
import to.bitkit.utils.AppError
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.time.Duration
Expand DownExpand Up@@ -85,6 +88,8 @@ class LightningRepo @Inject constructor(
 private val _isRecoveryMode = MutableStateFlow(false)
 val isRecoveryMode = _isRecoveryMode.asStateFlow()

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 /**
 * Executes the provided operation only if the node is running.
 * If the node is not running, waits for it to be running for a specified timeout.
Expand DownExpand Up@@ -203,12 +208,16 @@ class LightningRepo @Inject constructor(
 if (getStatus()?.isRunning == true) {
 Logger.info("LDK node already running", context = TAG)
 _lightningState.update { it.copy(nodeLifecycleState = NodeLifecycleState.Running) }
 lightningService.listenForEvents(onEvent = eventHandler)
 lightningService.listenForEvents(onEvent = { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 })
 return@withContext Result.success(Unit)
 }

 // Start the node service
 lightningService.start(timeout) { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 ldkNodeEventBus.emit(event)
 }
Expand All@@ -220,6 +229,7 @@ class LightningRepo @Inject constructor(
 // Initial state sync
 syncState()
 updateGeoBlockState()
 refreshChannelCache()

 // Perform post-startup tasks
 connectToTrustedPeers().onFailure { e ->
Expand DownExpand Up@@ -296,12 +306,96 @@ class LightningRepo @Inject constructor(

 _lightningState.update { it.copy(isSyncingWallet = true) }
 lightningService.sync()
 refreshChannelCache()
 syncState()
 _lightningState.update { it.copy(isSyncingWallet = false) }

 Result.success(Unit)
 }

 private suspend fun refreshChannelCache() = withContext(bgDispatcher) {
 val channels = lightningService.channels ?: return@withContext
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }

 private fun handleLdkEvent(event: Event) {
 when (event) {
 is Event.ChannelPending -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelReady -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelClosed -> {
 val channelId = event.channelId
 val reason = event.reason?.toString() ?: ""
 scope.launch {
 registerClosedChannel(channelId, reason)
 }
 }
 else -> {
 // Other events don't need special handling
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) = withContext(bgDispatcher) {
 try {
 val channel = channelCache[channelId] ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 coreService.activity.upsertClosedChannelList(listOf(closedChannel))

 channelCache.remove(channelId)

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Throwable) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 suspend fun wipeStorage(walletIndex: Int): Result<Unit> = withContext(bgDispatcher) {
 Logger.debug("wipeStorage called, stopping node first", context = TAG)
 stop().onSuccess {
Expand DownExpand Up@@ -867,6 +961,7 @@ class LightningRepo @Inject constructor(
 companion object {
 private const val TAG = "LightningRepo"
 private const val SYNC_TIMEOUT_MS = 20_000L
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down

85 changes: 0 additions & 85 deletions
app/src/main/java/to/bitkit/services/LightningService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
package to.bitkit.services

import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.upsertClosedChannel
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
Expand DownExpand Up@@ -51,7 +49,6 @@ import to.bitkit.utils.LdkError
import to.bitkit.utils.LdkLogWriter
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.io.path.Path
Expand All@@ -74,8 +71,6 @@ class LightningService @Inject constructor(

 private lateinit var trustedPeers: List<PeerDetails>

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 suspend fun setup(
 walletIndex: Int,
 customServerUrl: String? = null,
Expand DownExpand Up@@ -196,7 +191,6 @@ class LightningService @Inject constructor(
 }
 }

 refreshChannelCache()
 Logger.info("Node started")
 }

Expand DownExpand Up@@ -232,79 +226,10 @@ class LightningService @Inject constructor(
 node.syncWallets()
 // launch { setMaxDustHtlcExposureForCurrentChannels() }
 }
 refreshChannelCache()

 Logger.debug("LDK synced")
 }

 private suspend fun refreshChannelCache() {
 val node = this.node ?: return

 ServiceQueue.LDK.background {
 val channels = node.listChannels()
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) {
 try {
 val channel = ServiceQueue.LDK.background {
 channelCache[channelId]
 } ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 ServiceQueue.CORE.background {
 upsertClosedChannel(closedChannel)
 }

 ServiceQueue.LDK.background {
 channelCache.remove(channelId)
 }

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Exception) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 // private fun setMaxDustHtlcExposureForCurrentChannels() {
 // if (Env.network != Network.REGTEST) {
 // Logger.debug("Not updating channel config for non-regtest network")
Expand DownExpand Up@@ -815,9 +740,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⏳ Channel pending: channelId: $channelId userChannelId: $userChannelId formerTemporaryChannelId: $formerTemporaryChannelId counterpartyNodeId: $counterpartyNodeId fundingTxo: $fundingTxo"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelReady -> {
Expand All@@ -827,9 +749,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "👐 Channel ready: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelClosed -> {
Expand All@@ -840,9 +759,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⛔ Channel closed: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId reason: $reason"
 )
 launch {
 registerClosedChannel(channelId, reason)
 }
 }
 }
 }
Expand All@@ -867,7 +783,6 @@ class LightningService @Inject constructor(

 companion object {
 private const val TAG = "LightningService"
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down
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
Move closed channels tracking to LightningRepo#474

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

jvsena42
merged 1 commit into

from

Nov 20, 2025
 Merged


Move closed channels tracking to LightningRepo
#474
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 96 additions & 1 deletion
app/src/main/java/to/bitkit/repositories/LightningRepo.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
package to.bitkit.repositories

import com.google.firebase.messaging.FirebaseMessaging
import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.FeeRates
import com.synonym.bitkitcore.LightningInvoice
import com.synonym.bitkitcore.Scanner
Expand All@@ -27,6 +28,7 @@ import org.lightningdevkit.ldknode.BalanceDetails
import org.lightningdevkit.ldknode.BestBlock
import org.lightningdevkit.ldknode.ChannelConfig
import org.lightningdevkit.ldknode.ChannelDetails
import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.NodeStatus
import org.lightningdevkit.ldknode.PaymentDetails
import org.lightningdevkit.ldknode.PaymentId
Expand DownExpand Up@@ -57,6 +59,7 @@ import to.bitkit.services.NodeEventHandler
import to.bitkit.utils.AppError
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.time.Duration
Expand DownExpand Up@@ -85,6 +88,8 @@ class LightningRepo @Inject constructor(
 private val _isRecoveryMode = MutableStateFlow(false)
 val isRecoveryMode = _isRecoveryMode.asStateFlow()

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 /**
 * Executes the provided operation only if the node is running.
 * If the node is not running, waits for it to be running for a specified timeout.
Expand DownExpand Up@@ -203,12 +208,16 @@ class LightningRepo @Inject constructor(
 if (getStatus()?.isRunning == true) {
 Logger.info("LDK node already running", context = TAG)
 _lightningState.update { it.copy(nodeLifecycleState = NodeLifecycleState.Running) }
 lightningService.listenForEvents(onEvent = eventHandler)
 lightningService.listenForEvents(onEvent = { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 })
 return@withContext Result.success(Unit)
 }

 // Start the node service
 lightningService.start(timeout) { event ->
 handleLdkEvent(event)
 eventHandler?.invoke(event)
 ldkNodeEventBus.emit(event)
 }
Expand All@@ -220,6 +229,7 @@ class LightningRepo @Inject constructor(
 // Initial state sync
 syncState()
 updateGeoBlockState()
 refreshChannelCache()

 // Perform post-startup tasks
 connectToTrustedPeers().onFailure { e ->
Expand DownExpand Up@@ -296,12 +306,96 @@ class LightningRepo @Inject constructor(

 _lightningState.update { it.copy(isSyncingWallet = true) }
 lightningService.sync()
 refreshChannelCache()
 syncState()
 _lightningState.update { it.copy(isSyncingWallet = false) }

 Result.success(Unit)
 }

 private suspend fun refreshChannelCache() = withContext(bgDispatcher) {
 val channels = lightningService.channels ?: return@withContext
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }

 private fun handleLdkEvent(event: Event) {
 when (event) {
 is Event.ChannelPending -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelReady -> {
 scope.launch {
 refreshChannelCache()
 }
 }
 is Event.ChannelClosed -> {
 val channelId = event.channelId
 val reason = event.reason?.toString() ?: ""
 scope.launch {
 registerClosedChannel(channelId, reason)
 }
 }
 else -> {
 // Other events don't need special handling
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) = withContext(bgDispatcher) {
 try {
 val channel = channelCache[channelId] ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@withContext
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 coreService.activity.upsertClosedChannelList(listOf(closedChannel))

 channelCache.remove(channelId)

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Throwable) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 suspend fun wipeStorage(walletIndex: Int): Result<Unit> = withContext(bgDispatcher) {
 Logger.debug("wipeStorage called, stopping node first", context = TAG)
 stop().onSuccess {
Expand DownExpand Up@@ -867,6 +961,7 @@ class LightningRepo @Inject constructor(
 companion object {
 private const val TAG = "LightningRepo"
 private const val SYNC_TIMEOUT_MS = 20_000L
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down

85 changes: 0 additions & 85 deletions
app/src/main/java/to/bitkit/services/LightningService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
package to.bitkit.services

import com.synonym.bitkitcore.ClosedChannelDetails
import com.synonym.bitkitcore.upsertClosedChannel
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
Expand DownExpand Up@@ -51,7 +49,6 @@ import to.bitkit.utils.LdkError
import to.bitkit.utils.LdkLogWriter
import to.bitkit.utils.Logger
import to.bitkit.utils.ServiceError
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.io.path.Path
Expand All@@ -74,8 +71,6 @@ class LightningService @Inject constructor(

 private lateinit var trustedPeers: List<PeerDetails>

 private val channelCache = ConcurrentHashMap<String, ChannelDetails>()

 suspend fun setup(
 walletIndex: Int,
 customServerUrl: String? = null,
Expand DownExpand Up@@ -196,7 +191,6 @@ class LightningService @Inject constructor(
 }
 }

 refreshChannelCache()
 Logger.info("Node started")
 }

Expand DownExpand Up@@ -232,79 +226,10 @@ class LightningService @Inject constructor(
 node.syncWallets()
 // launch { setMaxDustHtlcExposureForCurrentChannels() }
 }
 refreshChannelCache()

 Logger.debug("LDK synced")
 }

 private suspend fun refreshChannelCache() {
 val node = this.node ?: return

 ServiceQueue.LDK.background {
 val channels = node.listChannels()
 channels.forEach { channel ->
 channelCache[channel.channelId] = channel
 }
 }
 }

 private suspend fun registerClosedChannel(channelId: String, reason: String?) {
 try {
 val channel = ServiceQueue.LDK.background {
 channelCache[channelId]
 } ?: run {
 Logger.error(
 "Could not find channel details for closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val fundingTxo = channel.fundingTxo
 if (fundingTxo == null) {
 Logger.error(
 "Channel has no funding transaction, cannot persist closed channel: channelId=$channelId",
 context = TAG
 )
 return@registerClosedChannel
 }

 val channelName = channel.inboundScidAlias?.toString()
 ?: channel.channelId.take(CHANNEL_ID_PREVIEW_LENGTH) + "…"

 val closedAt = (System.currentTimeMillis() / 1000L).toULong()

 val closedChannel = ClosedChannelDetails(
 channelId = channel.channelId,
 counterpartyNodeId = channel.counterpartyNodeId,
 fundingTxoTxid = fundingTxo.txid,
 fundingTxoIndex = fundingTxo.vout,
 channelValueSats = channel.channelValueSats,
 closedAt = closedAt,
 outboundCapacityMsat = channel.outboundCapacityMsat,
 inboundCapacityMsat = channel.inboundCapacityMsat,
 counterpartyUnspendablePunishmentReserve = channel.counterpartyUnspendablePunishmentReserve,
 unspendablePunishmentReserve = channel.unspendablePunishmentReserve ?: 0u,
 forwardingFeeProportionalMillionths = channel.config.forwardingFeeProportionalMillionths,
 forwardingFeeBaseMsat = channel.config.forwardingFeeBaseMsat,
 channelName = channelName,
 channelClosureReason = reason.orEmpty()
 )

 ServiceQueue.CORE.background {
 upsertClosedChannel(closedChannel)
 }

 ServiceQueue.LDK.background {
 channelCache.remove(channelId)
 }

 Logger.info("Registered closed channel: ${channel.userChannelId}", context = TAG)
 } catch (e: Exception) {
 Logger.error("Failed to register closed channel: $e", e, context = TAG)
 }
 }

 // private fun setMaxDustHtlcExposureForCurrentChannels() {
 // if (Env.network != Network.REGTEST) {
 // Logger.debug("Not updating channel config for non-regtest network")
Expand DownExpand Up@@ -815,9 +740,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⏳ Channel pending: channelId: $channelId userChannelId: $userChannelId formerTemporaryChannelId: $formerTemporaryChannelId counterpartyNodeId: $counterpartyNodeId fundingTxo: $fundingTxo"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelReady -> {
Expand All@@ -827,9 +749,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "👐 Channel ready: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId"
 )
 launch {
 refreshChannelCache()
 }
 }

 is Event.ChannelClosed -> {
Expand All@@ -840,9 +759,6 @@ class LightningService @Inject constructor(
 Logger.info(
 "⛔ Channel closed: channelId: $channelId userChannelId: $userChannelId counterpartyNodeId: $counterpartyNodeId reason: $reason"
 )
 launch {
 registerClosedChannel(channelId, reason)
 }
 }
 }
 }
Expand All@@ -867,7 +783,6 @@ class LightningService @Inject constructor(

 companion object {
 private const val TAG = "LightningService"
 private const val CHANNEL_ID_PREVIEW_LENGTH = 10
 }
}

Expand Down
Loading