Fix channels sync on migration

Author: ben-kaufman

app/src/main/java/to/bitkit/services/MigrationService.kt

@@ -31,6 +31,7 @@ import kotlinx.serialization.json.jsonPrimitive
 import kotlinx.serialization.json.put
 import to.bitkit.data.SettingsStore
 import to.bitkit.data.WidgetsStore
+import to.bitkit.data.resetPin
 import to.bitkit.data.keychain.Keychain
 import to.bitkit.di.json
 import to.bitkit.env.Env
@@ -355,13 +356,14 @@ class MigrationService @Inject constructor(
                 migratePin()
 
                 if (hasRNLdkData()) {
-                    migrateLdkData().onFailure { e ->
-                        Logger.warn(
-                            "LDK data migration failed, continuing with other migrations: $e",
-                            e,
-                            context = TAG
-                        )
-                    }
+                    migrateLdkData()
+                        .onFailure { e ->
+                            Logger.warn(
+                                "LDK data migration failed, continuing with other migrations: $e",
+                                e,
+                                context = TAG
+                            )
+                        }
                 }
 
                 if (hasRNMmkvData()) {
@@ -1011,6 +1013,7 @@ class MigrationService @Inject constructor(
     private suspend fun applyRNRemoteSettings(data: ByteArray) {
         runCatching {
             applyRNSettings(decodeBackupData<RNSettings>(data))
+            settingsStore.update { it.resetPin() }
         }.onFailure { e ->
             Logger.warn("Failed to decode RN remote settings backup: $e", context = TAG)
         }

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -48,6 +48,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
+import org.lightningdevkit.ldknode.ChannelDataMigration
 import org.lightningdevkit.ldknode.Event
 import org.lightningdevkit.ldknode.PaymentId
 import org.lightningdevkit.ldknode.SpendableUtxo
@@ -320,11 +321,14 @@ class AppViewModel @Inject constructor(
     private suspend fun handleSyncCompleted() {
         walletRepo.debounceSyncByEvent()
 
+        val isShowingLoading = migrationService.isShowingMigrationLoading.value
+        val isRestoringRemote = migrationService.isRestoringFromRNRemoteBackup.value
+
         when {
-            migrationService.isShowingMigrationLoading.value && !isCompletingMigration -> {
+            isShowingLoading && !isCompletingMigration -> {
                 completeMigration()
             }
-            migrationService.isRestoringFromRNRemoteBackup.value -> {
+            isRestoringRemote -> {
                 completeRNRemoteBackupRestore()
             }
         }
@@ -338,8 +342,18 @@ class AppViewModel @Inject constructor(
         migrationService.setShowingMigrationLoading(false)
     }
 
+    private fun buildChannelMigrationIfAvailable(): ChannelDataMigration? {
+        val migration = migrationService.peekPendingChannelMigration() ?: return null
+        return ChannelDataMigration(
+            channelManager = migration.channelManager.map { it.toUByte() },
+            channelMonitors = migration.channelMonitors.map { monitor -> monitor.map { it.toUByte() } },
+        )
+    }
+
     private suspend fun completeMigration() {
-        if (isCompletingMigration) return
+        if (isCompletingMigration) {
+            return
+        }
         isCompletingMigration = true
 
         try {
@@ -350,8 +364,14 @@ class AppViewModel @Inject constructor(
             }
             activityRepo.markAllUnseenActivitiesAsSeen()
 
-            lightningRepo.restart()
+            val channelMigration = buildChannelMigrationIfAvailable()
+            lightningRepo.stop().onFailure {
+                Logger.error("Failed to stop node during migration restart", it, context = TAG)
+            }
+            delay(500)
+            lightningRepo.start(channelMigration = channelMigration, shouldRetry = false)
                 .onSuccess {
+                    migrationService.consumePendingChannelMigration()
                     walletRepo.syncNodeAndWallet()
                         .onSuccess {
                             lightningRepo.getPayments().onSuccess { payments ->

app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt

@@ -215,14 +215,6 @@ class WalletViewModel @Inject constructor(
         runCatching {
             migrationService.restoreFromRNRemoteBackup()
             walletRepo.loadFromCache()
-
-            val pendingMigration = migrationService.peekPendingChannelMigration() ?: return@runCatching
-            val nodeState = lightningState.value.nodeLifecycleState
-            if (nodeState.isRunningOrStarting()) {
-                lightningRepo.stop()
-                delay(NODE_RESTART_DELAY_MS)
-                startWithChannelMigration(pendingMigration)
-            }
         }.onFailure { e ->
             Logger.warn("RN remote backup restore failed, falling back to VSS", e, context = TAG)
             backupRepo.performFullRestoreFromLatestBackup(onCacheRestored = walletRepo::loadFromCache)
@@ -253,15 +245,6 @@ class WalletViewModel @Inject constructor(
             try {
                 waitForRestoreIfNeeded()
 
-                val hasPendingMigration = migrationService.peekPendingChannelMigration() != null
-                val nodeState = lightningState.value.nodeLifecycleState
-                val nodeAlreadyRunning = nodeState.isRunningOrStarting()
-
-                if (hasPendingMigration && nodeAlreadyRunning) {
-                    lightningRepo.stop()
-                    delay(NODE_RESTART_DELAY_MS)
-                }
-
                 val channelMigration = buildChannelMigrationIfAvailable()
                 startNode(walletIndex, channelMigration)
             } finally {
@@ -278,7 +261,7 @@ class WalletViewModel @Inject constructor(
     }
 
     private fun buildChannelMigrationIfAvailable(): ChannelDataMigration? {
-        val migration = migrationService.consumePendingChannelMigration() ?: return null
+        val migration = migrationService.peekPendingChannelMigration() ?: return null
         return ChannelDataMigration(
             channelManager = migration.channelManager.map { it.toUByte() },
             channelMonitors = migration.channelMonitors.map { monitor -> monitor.map { it.toUByte() } },
@@ -305,34 +288,6 @@ class WalletViewModel @Inject constructor(
             }
     }
 
-    private fun startWithChannelMigration(migration: PendingChannelMigration) {
-        if (!walletExists || isStarting) return
-
-        viewModelScope.launch(bgDispatcher) {
-            isStarting = true
-            try {
-                val channelMigration = ChannelDataMigration(
-                    channelManager = migration.channelManager.map { it.toUByte() },
-                    channelMonitors = migration.channelMonitors.map { monitor -> monitor.map { it.toUByte() } },
-                )
-                migrationService.consumePendingChannelMigration()
-
-                lightningRepo.start(channelMigration = channelMigration)
-                    .onSuccess {
-                        walletRepo.syncBalances()
-                        migrationService.setRestoringFromRNRemoteBackup(true)
-                    }
-                    .onFailure { error ->
-                        Logger.error("Node restart with migration error", error, context = TAG)
-                        if (error !is RecoveryModeException) {
-                            ToastEventBus.send(error)
-                        }
-                    }
-            } finally {
-                isStarting = false
-            }
-        }
-    }
 
     fun stop() {
         if (!walletExists) return