Skip to content

feat: stale channel monitors recovery #502

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
piotr-iohk merged 10 commits into from
Mar 24, 2026
Merged

feat: stale channel monitors recovery #502

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8eb83db
feat: one-time stale channel monitor recovery
ben-kaufman Mar 18, 2026
e3cd736
fix: catch DangerousValue instead of ReadFailed
ben-kaufman Mar 18, 2026
bcedd42
fix: simplify stale monitor recovery, drop one-shot flag
ben-kaufman Mar 18, 2026
16d0324
chore: bump ldk-node to rc.34 (stale monitor recovery + secrets reset)
ben-kaufman Mar 18, 2026
1b9fea2
fix: add required connectionTimeoutSecs for ElectrumSyncConfig
ben-kaufman Mar 18, 2026
6bea39c
fix: add DangerousValue case to BuildError switch in Errors.swift
ben-kaufman Mar 19, 2026
6db9f6d
chore: bump ldk-node to db5ce1b (rc.35 with chain sync fix)
ben-kaufman Mar 19, 2026
165b7b1
chore: bump ldk-node to rc.36
pwltr Mar 20, 2026
119957b
fix: reenable orphaned channel recovery
pwltr Mar 20, 2026
ab797aa
fix: comment out orphaned channel monitor recovery
pwltr Mar 23, 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: 1 addition & 1 deletion Bitkit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@
repositoryURL = "https://github.com/synonymdev/ldk-node";
requirement = {
kind = revision;
revision = c5698d00066e0e50f33696afc562d71023da2373;
revision = 153ecbeb44c8f68fbc8faf1ea6e15c258053507a;
};
};
96DEA0382DE8BBA1009932BF /* XCRemoteSwiftPackageReference "bitkit-core" */ = {
Expand Down
2 changes: 1 addition & 1 deletion Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 41 additions & 13 deletions Bitkit/Services/LightningService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ class LightningService {
onchainWalletSyncIntervalSecs: Env.walletSyncIntervalSecs,
lightningWalletSyncIntervalSecs: Env.walletSyncIntervalSecs,
feeRateCacheUpdateIntervalSecs: Env.walletSyncIntervalSecs
)
),
connectionTimeoutSecs: 10
)
builder.setChainSourceElectrum(serverUrl: resolvedElectrumServerUrl, config: electrumConfig)

Expand Down Expand Up @@ -124,19 +125,46 @@ class LightningService {
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 {
Comment thread
ben-kaufman marked this conversation as resolved.
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: [:]
)
Comment thread
jvsena42 marked this conversation as resolved.
}
Logger.info("Stale monitor recovery: build succeeded with accept_stale", context: "Recovery")
}
}

Expand Down
Loading