Skip to content

fix: orphaned channel recovery pre-startup #826

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

Draft
jvsena42 wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

fix: orphaned channel recovery pre-startup #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b5da1f0
fix: don't override channel manager and move the check to pre start node
jvsena42 Mar 6, 2026
8b9fa79
chore: add log
jvsena42 Mar 6, 2026
544bc53
chore: add log
jvsena42 Mar 6, 2026
50aff0d
fix: restart node to apply channel migration if node was already running
jvsena42 Mar 6, 2026
e73fba5
fix: restore master code and don't override channel manager on channe…
jvsena42 Mar 6, 2026
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
2 changes: 2 additions & 0 deletions app/src/main/java/to/bitkit/services/MigrationService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ class MigrationService @Inject constructor(
suspend fun markChannelRecoveryChecked() {
val key = stringPreferencesKey(RN_CHANNEL_RECOVERY_CHECKED_KEY)
rnMigrationStore.edit { it[key] = "true" }
Logger.info("markChannelRecoveryChecked", TAG)
}

suspend fun hasRNWalletData(): Boolean {
Expand Down Expand Up @@ -1488,6 +1489,7 @@ class MigrationService @Inject constructor(
}

if (monitors.isNotEmpty()) {
Logger.info("Found ${monitors.size} channel monitors", TAG)
pendingChannelMigration = PendingChannelMigration(
channelManager = managerData,
channelMonitors = monitors,
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,10 @@ class WalletViewModel @Inject constructor(

val allMonitorsRetrieved = runCatching {
val allRetrieved = migrationService.fetchRNRemoteLdkData()
val channelMigration = buildChannelMigrationIfAvailable()
// don't overwrite channel manager, we only need the monitors for the sweep
val channelMigration = buildChannelMigrationIfAvailable()?.let {
ChannelDataMigration(channelManager = null, channelMonitors = it.channelMonitors)
}

if (channelMigration == null) {
Logger.info("No channel monitors found on RN backup", context = TAG)
Expand Down
Loading