Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 LDKNodeMonday.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@
repositoryURL = "https://github.com/lightningdevkit/ldk-node.git";
requirement = {
kind = exactVersion;
version = 0.6.1;
version = 0.6.2;
};
};
AE01C5AE2AB3BEED00F28C7E /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {
Expand Down

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

9 changes: 5 additions & 4 deletions LDKNodeMonday/App/WalletClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,15 @@ public class WalletClient {
await MainActor.run {
self.network = lightningClient.getNetwork()
self.server = lightningClient.getServer()

// Load LSP from keychain if available
if let savedLSPNodeId = try? self.keyClient.getLSP(),
!savedLSPNodeId.isEmpty,
let savedLSP = LightningServiceProvider.getByNodeId(savedLSPNodeId) {
!savedLSPNodeId.isEmpty,
let savedLSP = LightningServiceProvider.getByNodeId(savedLSPNodeId)
{
self.lsp = savedLSP
}

self.appState = .wallet
}
} catch let error {
Expand Down
8 changes: 4 additions & 4 deletions LDKNodeMonday/Extensions/UInt64+Extensions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,18 @@ extension UInt64 {
numberFormatter.usesGroupingSeparator = true
numberFormatter.groupingSeparator = ","
numberFormatter.generatesDecimalNumbers = false

return numberFormatter
}

func formattedBip177() -> String {
if self != .zero && self >= 1_000_000 && self % 1_000_000 == .zero {
return "\(self / 1_000_000)M"

} else if self != .zero && self % 1_000 == 0 {
return "\(self / 1_000)K"
}

return numberFormatter.string(from: NSNumber(value: self)) ?? "0"
}
}
Expand Down
19 changes: 13 additions & 6 deletions LDKNodeMonday/Service/Lightning Service/LightningNodeService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,13 @@ class LightningNodeService {
config.network = self.network
config.trustedPeers0conf = [self.lsp.nodeId]
// config.logLevel = .trace

// Faster sync intervals for better balance updates
config.onchainWalletSyncIntervalSecs = 20 // Default: 80 seconds
config.lightningWalletSyncIntervalSecs = 10 // Default: 30 seconds

// Faster sync intervals for better balance updates (moved under EsploraSyncConfig)
let backgroundSync = BackgroundSyncConfig(
onchainWalletSyncIntervalSecs: 20, // Default: 80 seconds
lightningWalletSyncIntervalSecs: 10, // Default: 30 seconds
feeRateCacheUpdateIntervalSecs: 600 // Default: 600 seconds
)

let anchor_cfg = AnchorChannelsConfig(
trustedPeersNoReserve: [self.lsp.nodeId],
Expand All @@ -108,7 +111,11 @@ class LightningNodeService {
config.anchorChannelsConfig = .some(anchor_cfg)

let nodeBuilder = Builder.fromConfig(config: config)
nodeBuilder.setChainSourceEsplora(serverUrl: self.server.url, config: nil)
// Enable filesystem logging
let logFilePath = logPath + "/ldk-node.log"
nodeBuilder.setFilesystemLogger(logFilePath: logFilePath, maxLogLevel: .trace)
let esploraSyncConfig = EsploraSyncConfig(backgroundSyncConfig: .some(backgroundSync))
nodeBuilder.setChainSourceEsplora(serverUrl: self.server.url, config: esploraSyncConfig)

switch self.network {
case .bitcoin:
Expand Down Expand Up @@ -394,7 +401,7 @@ extension LightningNodeService {
}
}
}

func syncWallets() throws {
try self.ldkNode.syncWallets()
}
Expand Down
6 changes: 4 additions & 2 deletions LDKNodeMonday/View Model/Home/Receive/ReceiveViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ class ReceiveViewModel: ObservableObject {
self.addressGenerationStatus = .generating
}
let receiveCapacity = maxReceiveCapacity()
let needsJIT = amountSat.satsAsMsats > receiveCapacity || (amountSat == 0 && receiveCapacity == 0)
let needsJIT =
amountSat.satsAsMsats > receiveCapacity || (amountSat == 0 && receiveCapacity == 0)
if needsJIT {
// Generate onchain and bolt11Jit, create BIP21 from those
let addresses = await generateUnifiedWithJIT()
Expand Down Expand Up @@ -105,7 +106,8 @@ class ReceiveViewModel: ObservableObject {

// Bolt11
let receiveCapacity = maxReceiveCapacity()
let needsJIT = amountSat.satsAsMsats > receiveCapacity || (amountSat == 0 && receiveCapacity == 0)
let needsJIT =
amountSat.satsAsMsats > receiveCapacity || (amountSat == 0 && receiveCapacity == 0)

// Always try to generate bolt11 invoice
// The needsJIT flag will handle JIT channel creation when capacity is insufficient
Expand Down