feat: stale channel monitors recovery

Bitkit.xcodeproj/project.pbxproj

@@ -928,7 +928,7 @@
 			repositoryURL = "https://github.com/synonymdev/ldk-node";
 			requirement = {
 				kind = revision;
-				revision = c5698d00066e0e50f33696afc562d71023da2373;
+				revision = ae38eadab70fceb5dbe242bc02bf895581cb7c3f;
 			};
 		};
 		96DEA0382DE8BBA1009932BF /* XCRemoteSwiftPackageReference "bitkit-core" */ = {

Bitkit/Services/LightningService.swift

@@ -95,7 +95,8 @@
                 onchainWalletSyncIntervalSecs: Env.walletSyncIntervalSecs,
                 lightningWalletSyncIntervalSecs: Env.walletSyncIntervalSecs,
                 feeRateCacheUpdateIntervalSecs: Env.walletSyncIntervalSecs
-            )
+            ),
+            connectionTimeoutSecs: 10
         )
         builder.setChainSourceElectrum(serverUrl: resolvedElectrumServerUrl, config: electrumConfig)
 
@@ -124,19 +125,46 @@
         builder.setEntropyBip39Mnemonic(mnemonic: mnemonic, passphrase: passphrase)
 
         try await ServiceQueue.background(.ldk) {
-            if !lnurlAuthServerUrl.isEmpty {
-                self.node = try builder.buildWithVssStore(
-                    vssUrl: vssUrl,
-                    storeId: storeId,
-                    lnurlAuthServerUrl: lnurlAuthServerUrl,
-                    fixedHeaders: [:]
-                )
-            } else {
-                self.node = try builder.buildWithVssStoreAndFixedHeaders(
-                    vssUrl: vssUrl,
-                    storeId: storeId,
-                    fixedHeaders: [:]
+            do {
+                if !lnurlAuthServerUrl.isEmpty {
+                    self.node = try builder.buildWithVssStore(
+                        vssUrl: vssUrl,
+                        storeId: storeId,
+                        lnurlAuthServerUrl: lnurlAuthServerUrl,
+                        fixedHeaders: [:]
+                    )
+                } else {
+                    self.node = try builder.buildWithVssStoreAndFixedHeaders(
+                        vssUrl: vssUrl,
+                        storeId: storeId,
+                        fixedHeaders: [:]
+                    )
+                }
+            } catch let error as BuildError {
+                guard case .DangerousValue = error else { throw error }
+
+                // Stale ChannelMonitor vs ChannelManager — retry with accept_stale to recover.
+                Logger.warn(
+                    "Build failed with DangerousValue. Retrying with accept_stale_channel_monitors for recovery.",
+                    context: "Recovery"
                 )
+                builder.setAcceptStaleChannelMonitors(accept: true)
+
+                if !lnurlAuthServerUrl.isEmpty {
+                    self.node = try builder.buildWithVssStore(
+                        vssUrl: vssUrl,
+                        storeId: storeId,
+                        lnurlAuthServerUrl: lnurlAuthServerUrl,
+                        fixedHeaders: [:]
+                    )
+                } else {
+                    self.node = try builder.buildWithVssStoreAndFixedHeaders(
+                        vssUrl: vssUrl,
+                        storeId: storeId,
+                        fixedHeaders: [:]
+                    )
+                }
+                Logger.info("Stale monitor recovery: build succeeded with accept_stale", context: "Recovery")
             }
         }
 
@@ -595,7 +623,7 @@
     }
 
     func closeChannel(_ channel: ChannelDetails, force: Bool = false, forceCloseReason: String? = nil) async throws {
         guard let node else {
             throw AppError(serviceError: .nodeNotStarted)
         }
 
@@ -1068,7 +1096,7 @@
                 onEvent?(event)
 
                 switch event {
                 case let .paymentSuccessful(paymentId, paymentHash, paymentPreimage, feePaidMsat):
                     Logger.info("✅ Payment successful: paymentId: \(paymentId ?? "?") paymentHash: \(paymentHash) feePaidMsat: \(feePaidMsat ?? 0)")
                     Task {
                         let hash = paymentId ?? paymentHash
@@ -1093,7 +1121,7 @@
                             Logger.warn("No paymentId or paymentHash available for failed payment", context: "LightningService")
                         }
                     }
                 case let .paymentReceived(paymentId, paymentHash, amountMsat, feePaidMsat):
                     Logger.info("🤑 Payment received: paymentId: \(paymentId ?? "?") paymentHash: \(paymentHash) amountMsat: \(amountMsat)")
                     Task {
                         let hash = paymentId ?? paymentHash
@@ -1103,7 +1131,7 @@
                             Logger.error("Failed to handle payment received for \(hash): \(error)", context: "LightningService")
                         }
                     }
                 case let .paymentClaimable(paymentId, paymentHash, claimableAmountMsat, claimDeadline, customRecords):
                     Logger.info(
                         "🫰 Payment claimable: paymentId: \(paymentId) paymentHash: \(paymentHash) claimableAmountMsat: \(claimableAmountMsat)"
                     )
@@ -1132,7 +1160,7 @@
 
                     if let channel {
                         await registerClosedChannel(channel: channel, reason: reasonString)
                         await MainActor.run {
                             channelCache.removeValue(forKey: channelIdString)
                         }
                     } else {
@@ -1155,7 +1183,7 @@
                             Logger.error("Failed to handle transaction received for \(txid): \(error)", context: "LightningService")
                         }
                     }
                 case let .onchainTransactionConfirmed(txid, blockHash, blockHeight, confirmationTime, details):
                     Logger.info("✅ Onchain transaction confirmed: txid=\(txid) blockHeight=\(blockHeight) amountSats=\(details.amountSats)")
                     Task {
                         do {
@@ -1209,7 +1237,7 @@
 
                 // MARK: Balance Events
 
                 case let .balanceChanged(oldSpendableOnchain, newSpendableOnchain, oldTotalOnchain, newTotalOnchain, oldLightning, newLightning):
                     Logger
                         .info("💰 Balance changed: onchain=\(oldSpendableOnchain)->\(newSpendableOnchain) lightning=\(oldLightning)->\(newLightning)")
 

Bitkit/Utilities/Errors.swift

@@ -185,6 +185,9 @@ struct AppError: LocalizedError {
         case let .ReadFailed(message: ldkMessage):
             message = "Read failed"
             debugMessage = ldkMessage
+        case let .DangerousValue(message: ldkMessage):
+            message = "Dangerous value"
+            debugMessage = ldkMessage
         case let .WriteFailed(message: ldkMessage):
             message = "Write failed"
             debugMessage = ldkMessage

Bitkit/ViewModels/WalletViewModel.swift

@@ -138,20 +138,20 @@ class WalletViewModel: ObservableObject {
             }
 
             // If no local migration data, try fetching from RN remote backup (one-time)
-            // if channelMigration == nil {
-            //     let (remoteMigration, allRetrieved) = await fetchOrphanedChannelMonitorsIfNeeded(walletIndex: walletIndex)
-            //     if let remoteMigration {
-            //         channelMigration = ChannelDataMigration(
-            //             // don't overwrite channel manager, we only need the monitors for the sweep
-            //             channelManager: nil,
-            //             channelMonitors: remoteMigration.channelMonitors.map { [UInt8]($0) }
-            //         )
-            //         MigrationsService.shared.pendingChannelMigration = nil
-            //     }
-            //     if allRetrieved {
-            //         MigrationsService.shared.isChannelRecoveryChecked = true
-            //     }
-            // }
+            if channelMigration == nil {
+                let (remoteMigration, allRetrieved) = await fetchOrphanedChannelMonitorsIfNeeded(walletIndex: walletIndex)
+                if let remoteMigration {
+                    channelMigration = ChannelDataMigration(
+                        // don't overwrite channel manager, we only need the monitors for the sweep
+                        channelManager: nil,
+                        channelMonitors: remoteMigration.channelMonitors.map { [UInt8]($0) }
+                    )
+                    MigrationsService.shared.pendingChannelMigration = nil
+                }
+                if allRetrieved {
+                    MigrationsService.shared.isChannelRecoveryChecked = true
+                }
+            }
 
             await runLegacyNetworkGraphCleanupIfNeeded()