Merge branch 'master' into feat/multiple-addresses-types

ben-kaufman · web-flow · commit 481e477926a6 · 2026-02-25T13:42:55.000+07:00
diff --git a/Bitkit.xcodeproj/project.pbxproj b/Bitkit.xcodeproj/project.pbxproj
@@ -500,7 +500,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = BitkitNotification/BitkitNotification.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 177;
+				CURRENT_PROJECT_VERSION = 178;
 				DEVELOPMENT_TEAM = KYH47R284B;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = BitkitNotification/Info.plist;
@@ -512,7 +512,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.0.4;
+				MARKETING_VERSION = 2.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -528,7 +528,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = BitkitNotification/BitkitNotification.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 177;
+				CURRENT_PROJECT_VERSION = 178;
 				DEVELOPMENT_TEAM = KYH47R284B;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = BitkitNotification/Info.plist;
@@ -540,7 +540,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.0.4;
+				MARKETING_VERSION = 2.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -674,7 +674,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Bitkit/Bitkit.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 177;
+				CURRENT_PROJECT_VERSION = 178;
 				DEVELOPMENT_ASSET_PATHS = "\"Bitkit/Preview Content\"";
 				DEVELOPMENT_TEAM = KYH47R284B;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -699,7 +699,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 2.0.4;
+				MARKETING_VERSION = 2.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -717,7 +717,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Bitkit/Bitkit.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 177;
+				CURRENT_PROJECT_VERSION = 178;
 				DEVELOPMENT_ASSET_PATHS = "\"Bitkit/Preview Content\"";
 				DEVELOPMENT_TEAM = KYH47R284B;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -742,7 +742,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 2.0.4;
+				MARKETING_VERSION = 2.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
diff --git a/Bitkit/Constants/Env.swift b/Bitkit/Constants/Env.swift
@@ -177,7 +177,7 @@ enum Env {
             return [
                 .init(nodeId: "039b8b4dd1d88c2c5db374290cda397a8f5d79f312d6ea5d5bfdfc7c6ff363eae3", host: "34.65.111.104", port: 9735),
                 .init(nodeId: "03816141f1dce7782ec32b66a300783b1d436b19777e7c686ed00115bd4b88ff4b", host: "34.65.191.64", port: 9735),
-                .init(nodeId: "02a371038863605300d0b3fc9de0cf5ccb57728b7f8906535709a831b16e311187", host: "34.65.186.40", port: 9735),
+                .init(nodeId: "02a371038863605300d0b3fc9de0cf5ccb57728b7f8906535709a831b16e311187", host: "34.65.153.174", port: 9735),
             ]
         case .signet:
             return []
diff --git a/Bitkit/Services/LightningService.swift b/Bitkit/Services/LightningService.swift
@@ -309,20 +309,61 @@ class LightningService {
         Logger.info("Deleted network graph cache at: \(graphPath.path)")
     }
 
-    func connectToTrustedPeers() async throws {
+    func connectToTrustedPeers(remotePeers: [LnPeer]? = nil) async throws {
         guard let node else {
             throw AppError(serviceError: .nodeNotSetup)
         }
 
+        let peers: [LnPeer]
+        let usingRemotePeers: Bool
+        if let remotePeers, !remotePeers.isEmpty {
+            Logger.info("Using \(remotePeers.count) trusted peers from Blocktank API")
+            peers = remotePeers
+            usingRemotePeers = true
+        } else {
+            Logger.warn("No remote peers available, falling back to preconfigured env peers")
+            peers = Env.trustedLnPeers
+            usingRemotePeers = false
+        }
+
         try await ServiceQueue.background(.ldk) {
-            for peer in Env.trustedLnPeers {
+            for peer in peers {
                 do {
                     try node.connect(nodeId: peer.nodeId, address: peer.address, persist: true)
                     Logger.info("Connected to trusted peer: \(peer.nodeId)")
                 } catch {
                     Logger.error(error, context: "Peer: \(peer.nodeId)")
                 }
             }
+
+            if usingRemotePeers {
+                self.verifyTrustedPeersOrFallback(node: node, trustedPeers: peers)
+            }
+        }
+    }
+
+    private func verifyTrustedPeersOrFallback(node: Node, trustedPeers: [LnPeer]) {
+        let connectedPeerIds = Set(node.listPeers().filter(\.isConnected).map(\.nodeId))
+        let trustedConnected = trustedPeers.filter { connectedPeerIds.contains($0.nodeId) }.count
+        let trustedPeerIds = Set(trustedPeers.map(\.nodeId))
+
+        if trustedConnected == 0, !trustedPeers.isEmpty {
+            let fallbackPeers = Env.trustedLnPeers.filter { !trustedPeerIds.contains($0.nodeId) }
+            if fallbackPeers.isEmpty {
+                Logger.warn("No trusted peers connected. All preconfigured env peers overlap with API peers (not retrying with stale addresses).")
+            } else {
+                Logger.warn("No trusted peers connected, trying \(fallbackPeers.count) preconfigured env peer(s) not in API list")
+                for peer in fallbackPeers {
+                    do {
+                        try node.connect(nodeId: peer.nodeId, address: peer.address, persist: true)
+                        Logger.info("Connected to fallback peer: \(peer.nodeId)")
+                    } catch {
+                        Logger.error(error, context: "Fallback peer: \(peer.nodeId)")
+                    }
+                }
+            }
+        } else {
+            Logger.info("Connected to \(trustedConnected)/\(trustedPeers.count) trusted peers")
         }
     }
 
diff --git a/Bitkit/ViewModels/WalletViewModel.swift b/Bitkit/ViewModels/WalletViewModel.swift
@@ -52,6 +52,14 @@ class WalletViewModel: ObservableObject {
     private let transferService: TransferService
     private let sheetViewModel: SheetViewModel
 
+    enum BlocktankPeerSimulation: String, CaseIterable {
+        case none = "None"
+        case apiFailure = "API Failure"
+        case unreachablePeers = "Unreachable Peers"
+    }
+
+    static var peerSimulation: BlocktankPeerSimulation = .none
+
     @Published var isRestoringWallet = false
     @Published var balanceInTransferToSavings: Int = 0
     @Published var balanceInTransferToSpending: Int = 0
@@ -206,11 +214,7 @@ class WalletViewModel: ObservableObject {
 
         syncState()
 
-        do {
-            try await lightningService.connectToTrustedPeers()
-        } catch {
-            Logger.error("Failed to connect to trusted peers")
-        }
+        await reconnectTrustedPeers()
 
         // Migration only: fetch peers from remote backup (once) and persist in ldk-node
         let peerUris = await MigrationsService.shared.tryFetchMigrationPeersFromBackup(walletIndex: walletIndex)
@@ -233,6 +237,52 @@ class WalletViewModel: ObservableObject {
         }
     }
 
+    private func fetchTrustedPeersFromBlocktank() async -> [LnPeer]? {
+        switch Self.peerSimulation {
+        case .apiFailure:
+            Logger.warn("⚠️ [DEBUG] Simulating Blocktank API failure — returning nil")
+            return nil
+        case .unreachablePeers:
+            Logger.warn("⚠️ [DEBUG] Simulating unreachable API peers")
+            return [
+                LnPeer(nodeId: "000000000000000000000000000000000000000000000000000000000000000001",
+                       host: "192.0.2.1", port: 9735),
+            ]
+        case .none:
+            break
+        }
+
+
+        var info: IBtInfo?
+        do {
+            info = try await coreService.blocktank.info(refresh: true)
+        } catch {
+            Logger.warn("Blocktank API refresh failed, trying cache: \(error)")
+        }
+        if info == nil {
+            info = try? await coreService.blocktank.info(refresh: false)
+        }
+        guard let nodes = info?.nodes, !nodes.isEmpty else { return nil }
+        let peers = nodes.compactMap { node -> LnPeer? in
+            guard let connString = node.connectionStrings.first else { return nil }
+            let address = connString.contains("@") ? String(connString.split(separator: "@").last ?? "") : connString
+            let parts = address.split(separator: ":")
+            guard parts.count == 2, let port = UInt16(parts[1]) else { return nil }
+            return LnPeer(nodeId: node.pubkey, host: String(parts[0]), port: port)
+        }
+        Logger.info("Fetched \(peers.count) trusted peers from Blocktank API")
+        return peers.isEmpty ? nil : peers
+    }
+
+    func reconnectTrustedPeers() async {
+        do {
+            let remotePeers = await fetchTrustedPeersFromBlocktank()
+            try await lightningService.connectToTrustedPeers(remotePeers: remotePeers)
+        } catch {
+            Logger.error("Failed to connect to trusted peers")
+        }
+    }
+
     func stopLightningNode(clearEventCallback: Bool = false) async throws {
         nodeLifecycleState = .stopping
         try await lightningService.stop(clearEventCallback: clearEventCallback)
diff --git a/Bitkit/Views/Settings/LdkDebugScreen.swift b/Bitkit/Views/Settings/LdkDebugScreen.swift
@@ -66,6 +66,21 @@ struct LdkDebugScreen: View {
                             }
                         }
                     }
+
+                    // Peer Simulation
+                    VStack(alignment: .leading, spacing: 8) {
+                        CaptionMText("Peer Simulation")
+
+                        Picker("Peer Simulation", selection: Binding(
+                            get: { WalletViewModel.peerSimulation },
+                            set: { WalletViewModel.peerSimulation = $0 }
+                        )) {
+                            ForEach(WalletViewModel.BlocktankPeerSimulation.allCases, id: \.self) { mode in
+                                Text(mode.rawValue).tag(mode)
+                            }
+                        }
+                        .pickerStyle(.segmented)
+                    }
                 }
             }
         }
@@ -109,6 +124,7 @@ struct LdkDebugScreen: View {
             isRestartingNode = true
             let lightningService = LightningService.shared
             try await lightningService.restart()
+            await wallet.reconnectTrustedPeers()
             app.toast(type: .success, title: "Node Restarted", description: "Node restarted successfully")
         } catch {
             Logger.error("Failed to restart node: \(error)")

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ enum Env {`
`177`	`177`	`return [`
`178`	`178`	`.init(nodeId: "039b8b4dd1d88c2c5db374290cda397a8f5d79f312d6ea5d5bfdfc7c6ff363eae3", host: "34.65.111.104", port: 9735),`
`179`	`179`	`.init(nodeId: "03816141f1dce7782ec32b66a300783b1d436b19777e7c686ed00115bd4b88ff4b", host: "34.65.191.64", port: 9735),`
`180`		`- .init(nodeId: "02a371038863605300d0b3fc9de0cf5ccb57728b7f8906535709a831b16e311187", host: "34.65.186.40", port: 9735),`
	`180`	`+ .init(nodeId: "02a371038863605300d0b3fc9de0cf5ccb57728b7f8906535709a831b16e311187", host: "34.65.153.174", port: 9735),`
`181`	`181`	`]`
`182`	`182`	`case .signet:`
`183`	`183`	`return []`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,21 @@ struct LdkDebugScreen: View {`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`
	`69`	`+`
	`70`	`+ // Peer Simulation`
	`71`	`+ VStack(alignment: .leading, spacing: 8) {`
	`72`	`+ CaptionMText("Peer Simulation")`
	`73`	`+`
	`74`	`+ Picker("Peer Simulation", selection: Binding(`
	`75`	`+ get: { WalletViewModel.peerSimulation },`
	`76`	`+ set: { WalletViewModel.peerSimulation = $0 }`
	`77`	`+ )) {`
	`78`	`+ ForEach(WalletViewModel.BlocktankPeerSimulation.allCases, id: \.self) { mode in`
	`79`	`+ Text(mode.rawValue).tag(mode)`
	`80`	`+ }`
	`81`	`+ }`
	`82`	`+ .pickerStyle(.segmented)`
	`83`	`+ }`
`69`	`84`	`}`
`70`	`85`	`}`
`71`	`86`	`}`
`@@ -109,6 +124,7 @@ struct LdkDebugScreen: View {`
`109`	`124`	`isRestartingNode = true`
`110`	`125`	`let lightningService = LightningService.shared`
`111`	`126`	`try await lightningService.restart()`
	`127`	`+ await wallet.reconnectTrustedPeers()`
`112`	`128`	`app.toast(type: .success, title: "Node Restarted", description: "Node restarted successfully")`
`113`	`129`	`} catch {`
`114`	`130`	`Logger.error("Failed to restart node: \(error)")`