Enable switching of networks and server

LDKNodeMonday.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		655574802D398A750064F859 /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6555747F2D398A750064F859 /* LoadingView.swift */; };
 		655574822D3994E10064F859 /* ErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 655574812D3994E10064F859 /* ErrorView.swift */; };
+		655C19042D42AB1500AC5F72 /* WalletClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 655C19032D42AB1500AC5F72 /* WalletClient.swift */; };
 		65875A932CCB9809000D3E70 /* LDKNode in Frameworks */ = {isa = PBXBuildFile; productRef = 65875A922CCB9809000D3E70 /* LDKNode */; };
 		659EE6952CF8D4990064ED78 /* ImportWalletView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 659EE6942CF8D4990064ED78 /* ImportWalletView.swift */; };
 		65A406632D070CBD00EA331E /* NetworkSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A406622D070CBD00EA331E /* NetworkSettingsView.swift */; };
@@ -95,6 +96,7 @@
 /* Begin PBXFileReference section */
 		6555747F2D398A750064F859 /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
 		655574812D3994E10064F859 /* ErrorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorView.swift; sourceTree = "<group>"; };
+		655C19032D42AB1500AC5F72 /* WalletClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletClient.swift; sourceTree = "<group>"; };
 		659EE6942CF8D4990064ED78 /* ImportWalletView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImportWalletView.swift; sourceTree = "<group>"; };
 		65A406622D070CBD00EA331E /* NetworkSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkSettingsView.swift; sourceTree = "<group>"; };
 		AE00550D2B479EF000100797 /* OnboardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingView.swift; sourceTree = "<group>"; };
@@ -478,6 +480,7 @@
 			isa = PBXGroup;
 			children = (
 				AE17E8D929A402E30058C9C9 /* LDKNodeMondayApp.swift */,
+				655C19032D42AB1500AC5F72 /* WalletClient.swift */,
 			);
 			path = App;
 			sourceTree = "<group>";
@@ -678,6 +681,7 @@
 				AE6BB56F2A008CBA009E16E3 /* UInt64+Extensions.swift in Sources */,
 				AE49E85A2A2536D4002623E8 /* ChannelAddViewModel.swift in Sources */,
 				AE0055142B4895B500100797 /* SeedViewModel.swift in Sources */,
+				655C19042D42AB1500AC5F72 /* WalletClient.swift in Sources */,
 				AE80C2022C4AB38D006E7193 /* BIP21ViewModel.swift in Sources */,
 				AE7D3FAB2A4263AE00EAE730 /* PaymentsView.swift in Sources */,
 				AE80116D29A59AF4009B9967 /* ChannelAddView.swift in Sources */,
@@ -909,7 +913,7 @@
 			repositoryURL = "https://github.com/lightningdevkit/ldk-node.git";
 			requirement = {
 				kind = exactVersion;
-				version = 0.4.3;
+				version = 0.4.2;
 			};
 		};
 		AE01C5AE2AB3BEED00F28C7E /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {

LDKNodeMonday/App/LDKNodeMondayApp.swift

@@ -12,29 +12,30 @@ struct LDKNodeMondayApp: App {
 
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
 
-    private let lightningClient: LightningNodeClient = .live
-    @State private var appState = AppState.loading
+    @State private var walletClient = WalletClient(keyClient: .live)
     @State private var appError: Error?
     @State private var navigationPath = NavigationPath()
 
     init() {
-        AppDelegate.shared.lightningClient = lightningClient
+        AppDelegate.shared.walletClient = walletClient
     }
 
     var body: some Scene {
         WindowGroup {
             NavigationStack(path: $navigationPath) {
-                switch appState {
+                switch walletClient.appState {
                 case .onboarding:
                     OnboardingView(
-                        viewModel: .init(appState: $appState, lightningClient: lightningClient)
+                        viewModel: .init(
+                            walletClient: $walletClient
+                        )
                     )
                 case .wallet:
                     BitcoinView(
                         viewModel: .init(
-                            appState: $appState,
+                            walletClient: $walletClient,
                             priceClient: .live,
-                            lightningClient: lightningClient
+                            lightningClient: walletClient.lightningClient
                         ),
                         sendNavigationPath: $navigationPath
                     )
@@ -44,54 +45,21 @@ struct LDKNodeMondayApp: App {
                     LoadingView()
                 }
             }
-            .onChange(of: appState) { oldValue, newValue in
+            .onChange(of: walletClient.appState) { oldValue, newValue in
                 navigationPath = NavigationPath()
             }
             .task {
-                await start()
-            }
-        }
-    }
-
-    func start() async {
-        var backupInfo: BackupInfo?
-
-        backupInfo = try? KeyClient.live.getBackupInfo()
-
-        if backupInfo != nil {
-            do {
-                // TODO: .start could take parameters from backupInfo (seed, network, url, lsp)
-                try await lightningClient.start()
-                lightningClient.listenForEvents()
-                await MainActor.run {
-                    self.appState = .wallet
-                }
-            } catch let error {
-                await MainActor.run {
-                    self.appError = error
-                    self.appState = .error
-                }
-            }
-        } else {
-            await MainActor.run {
-                self.appState = .onboarding
+                await walletClient.start()
             }
         }
     }
 }
 
 class AppDelegate: NSObject, UIApplicationDelegate {
     static let shared = AppDelegate()
-    var lightningClient: LightningNodeClient?
+    var walletClient: WalletClient?
 
     func applicationWillTerminate(_ application: UIApplication) {
-        try? lightningClient?.stop()
+        walletClient?.stop()
     }
 }
-
-public enum AppState {
-    case onboarding
-    case wallet
-    case loading
-    case error
-}

LDKNodeMonday/App/WalletClient.swift

@@ -0,0 +1,121 @@
+//
+//  WalletClient.swift
+//  LDKNodeMonday
+//
+//  Created by Daniel Nordh on 23/01/2025.
+//
+
+import Foundation
+import LDKNode
+import SwiftUI
+
+@Observable
+public class WalletClient {
+
+    public var keyClient: KeyClient
+    public var lightningClient: LightningNodeClient
+    public var network = Network.signet
+    public var server = EsploraServer.mutiny_signet
+    public var appState = AppState.loading
+    public var appError: Error?
+
+    public init(keyClient: KeyClient) {
+        self.keyClient = keyClient
+        self.lightningClient = .live
+    }
+
+    func createWallet(seedPhrase: String, network: Network, server: EsploraServer) async {
+        do {
+            let backupInfo = BackupInfo(
+                mnemonic: seedPhrase == "" ? generateEntropyMnemonic() : seedPhrase,
+                networkString: network.description,
+                serverURL: server.url
+            )
+            try keyClient.saveBackupInfo(backupInfo)
+            await self.start()
+        } catch let error {
+            await MainActor.run {
+                self.appError = error
+                self.appState = .error
+            }
+        }
+    }
+
+    func start() async {
+        var backupInfo: BackupInfo?
+        backupInfo = try? KeyClient.live.getBackupInfo()
+
+        if backupInfo != nil {
+            do {
+                try await lightningClient.start()
+                lightningClient.listenForEvents()
+                await MainActor.run {
+                    self.network = lightningClient.getNetwork()
+                    self.server = lightningClient.getServer()
+                    self.appState = .wallet
+                }
+            } catch let error {
+                await MainActor.run {
+                    self.appError = error
+                    self.appState = .error
+                }
+            }
+        } else {
+            await MainActor.run {
+                self.appState = .onboarding
+            }
+        }
+    }
+
+    func stop() {
+        try? self.lightningClient.stop()
+    }
+
+    func restart(newNetwork: Network, newServer: EsploraServer) async {
+        do {
+            await MainActor.run {
+                self.appState = .loading
+            }
+            try await lightningClient.restart()
+            lightningClient.listenForEvents()
+            await MainActor.run {
+                self.network = newNetwork
+                self.server = newServer
+                self.appState = .wallet
+            }
+        } catch let error {
+            debugPrint(error)
+            await MainActor.run {
+                self.appError = error
+                self.appState = .error
+            }
+        }
+    }
+
+    func delete() async {
+        do {
+            if lightningClient.status().isRunning {
+                try lightningClient.stop()
+            }
+            try lightningClient.deleteDocuments()
+            try lightningClient.deleteWallet()
+            try lightningClient.reset()
+
+            await MainActor.run {
+                self.appState = .onboarding
+            }
+        } catch let error {
+            await MainActor.run {
+                self.appError = error
+                self.appState = .error
+            }
+        }
+    }
+}
+
+public enum AppState {
+    case onboarding
+    case wallet
+    case loading
+    case error
+}

LDKNodeMonday/Service/KeyService/KeyService.swift

@@ -80,7 +80,7 @@ extension KeyService {
     }
 }
 
-struct KeyClient {
+public struct KeyClient {
     let saveBackupInfo: (BackupInfo) throws -> Void
     let getBackupInfo: () throws -> BackupInfo
     let deleteBackupInfo: () throws -> Void

LDKNodeMonday/Service/Lightning Service/LightningNodeService.swift

@@ -11,7 +11,23 @@ import SwiftUI
 import os
 
 class LightningNodeService {
-    static var shared: LightningNodeService = LightningNodeService()
+    private static let lock = NSLock()
+    private static var _shared: LightningNodeService?
+    static var shared: LightningNodeService {
+        get {
+            lock.lock()
+            defer { lock.unlock() }
+            if _shared == nil {
+                _shared = LightningNodeService()
+            }
+            return _shared!
+        }
+        set {
+            lock.lock()
+            _shared = newValue
+            lock.unlock()
+        }
+    }
     private let ldkNode: Node
     private let keyService: KeyClient
     var networkColor = Color.black
@@ -128,6 +144,21 @@ class LightningNodeService {
         try ldkNode.stop()
     }
 
+    func restart() async throws {
+        if LightningNodeService.shared.status().isRunning {
+            try LightningNodeService.shared.stop()
+        }
+        LightningNodeService._shared = nil
+        try await LightningNodeService.shared.start()
+    }
+
+    func reset() throws {
+        if LightningNodeService.shared.status().isRunning {
+            try LightningNodeService.shared.stop()
+        }
+        LightningNodeService._shared = nil
+    }
+
     func nodeId() -> String {
         let nodeId = ldkNode.nodeId()
         return nodeId
@@ -295,9 +326,11 @@ extension LightningNodeService {
     }
 }
 
-struct LightningNodeClient {
+public struct LightningNodeClient {
     let start: () async throws -> Void
     let stop: () throws -> Void
+    let restart: () async throws -> Void
+    let reset: () throws -> Void
     let nodeId: () -> String
     let newAddress: () async throws -> String
     let spendableOnchainBalanceSats: () async -> UInt64
@@ -321,6 +354,7 @@ struct LightningNodeClient {
     let getBackupInfo: () throws -> BackupInfo
     let deleteDocuments: () throws -> Void
     let getNetwork: () -> Network
+    let getServer: () -> EsploraServer
     let getNetworkColor: () -> Color
     let listenForEvents: () -> Void
 }
@@ -329,6 +363,8 @@ extension LightningNodeClient {
     static let live = Self(
         start: { try await LightningNodeService.shared.start() },
         stop: { try LightningNodeService.shared.stop() },
+        restart: { try await LightningNodeService.shared.restart() },
+        reset: { try LightningNodeService.shared.reset() },
         nodeId: { LightningNodeService.shared.nodeId() },
         newAddress: { try await LightningNodeService.shared.newAddress() },
         spendableOnchainBalanceSats: {
@@ -390,8 +426,9 @@ extension LightningNodeClient {
         getBackupInfo: { try LightningNodeService.shared.getBackupInfo() },
         deleteDocuments: { try LightningNodeService.shared.deleteDocuments() },
         getNetwork: { LightningNodeService.shared.network },
+        getServer: { LightningNodeService.shared.server },
         getNetworkColor: { LightningNodeService.shared.networkColor },
-        listenForEvents: {}
+        listenForEvents: { LightningNodeService.shared.listenForEvents() }
     )
 }
 
@@ -400,6 +437,8 @@ extension LightningNodeClient {
         static let mock = Self(
             start: {},
             stop: {},
+            restart: {},
+            reset: {},
             nodeId: { "038474837483784378437843784378437843784378" },
             newAddress: { "tb1qw508d6qejxtdg4y5r3zarvary0c5xw7kxpjzsx" },
             spendableOnchainBalanceSats: { 100_000 },
@@ -445,6 +484,7 @@ extension LightningNodeClient {
             },
             deleteDocuments: {},
             getNetwork: { .signet },
+            getServer: { .mutiny_signet },
             getNetworkColor: { .orange },
             listenForEvents: {}
         )

LDKNodeMonday/View Model/Home/BitcoinViewModel.swift

@@ -9,7 +9,7 @@ import LDKNode
 import SwiftUI
 
 class BitcoinViewModel: ObservableObject {
-    @Binding var appState: AppState
+    @Binding var walletClient: WalletClient
     @Published var bitcoinViewError: MondayError?
     @Published var networkColor = Color.gray
     @Published var status: NodeStatus?
@@ -39,11 +39,11 @@ class BitcoinViewModel: ObservableObject {
     }
 
     init(
-        appState: Binding<AppState>,
+        walletClient: Binding<WalletClient>,
         priceClient: PriceClient,
         lightningClient: LightningNodeClient
     ) {
-        _appState = appState
+        _walletClient = walletClient
         self.priceClient = priceClient
         self.lightningClient = lightningClient
     }