Add legacy RN close recovery flow

Bitkit.xcodeproj/project.pbxproj

@@ -1200,7 +1200,7 @@
 			repositoryURL = "https://github.com/synonymdev/bitkit-core";
 			requirement = {
 				kind = exactVersion;
-				version = 0.1.58;
+				version = 0.1.64;
 			};
 		};
 		96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {

Bitkit/MainNavView.swift

@@ -538,6 +538,7 @@ struct MainNavView: View {
                 case .ldkDebug: LdkDebugScreen()
                 case .vssDebug: VssDebugScreen()
                 case .probingTool: ProbingToolScreen()
+                case .legacyRnRecovery: LegacyRnRecoveryScreen()
                 case .orders: ChannelOrders()
                 case .logs: LogView()
                 case .trezor: TrezorRootView()

Bitkit/Services/CoreService.swift

@@ -1916,6 +1916,61 @@ class UtilityService {
         self.coreService = coreService
     }
 
+    private func recoveryWalletCredentials(walletIndex: Int) throws -> (mnemonic: String, passphrase: String?) {
+        guard let mnemonic = try Keychain.loadString(key: .bip39Mnemonic(index: walletIndex)) else {
+            throw AppError(message: "Mnemonic not found", debugMessage: "Unable to load mnemonic for wallet index \(walletIndex)")
+        }
+
+        let passphrase = try Keychain.loadString(key: .bip39Passphrase(index: walletIndex))
+        return (mnemonic, passphrase)
+    }
+
+    func scanLegacyRnNativeSegwitRecoveryFunds(
+        walletIndex: Int = 0,
+        indexLimit: UInt32,
+        electrumUrl: String = Env.electrumServerUrl
+    ) async throws -> LegacyRnCloseRecoveryScanResult {
+        try await ServiceQueue.background(.core) {
+            let credentials = try self.recoveryWalletCredentials(walletIndex: walletIndex)
+
+            return try await BitkitCore.scanLegacyRnNativeSegwitRecoveryFunds(
+                mnemonicPhrase: credentials.mnemonic,
+                network: Env.bitkitCoreNetwork,
+                electrumUrl: electrumUrl,
+                indexLimit: indexLimit,
+                bip39Passphrase: credentials.passphrase
+            )
+        }
+    }
+
+    func prepareLegacyRnNativeSegwitRecoverySweep(
+        destinationAddress: String,
+        feeRateSatsPerVbyte: UInt32?,
+        walletIndex: Int = 0,
+        indexLimit: UInt32,
+        electrumUrl: String = Env.electrumServerUrl
+    ) async throws -> LegacyRnCloseRecoverySweepPreview {
+        try await ServiceQueue.background(.core) {
+            let credentials = try self.recoveryWalletCredentials(walletIndex: walletIndex)
+
+            return try await BitkitCore.prepareLegacyRnNativeSegwitRecoverySweep(
+                mnemonicPhrase: credentials.mnemonic,
+                network: Env.bitkitCoreNetwork,
+                electrumUrl: electrumUrl,
+                destinationAddress: destinationAddress,
+                feeRateSatsPerVbyte: feeRateSatsPerVbyte,
+                indexLimit: indexLimit,
+                bip39Passphrase: credentials.passphrase
+            )
+        }
+    }
+
+    func broadcastRawTx(txHex: String, electrumUrl: String = Env.electrumServerUrl) async throws -> String {
+        try await ServiceQueue.background(.core) {
+            return try await onchainBroadcastRawTx(serializedTx: txHex, electrumUrl: electrumUrl)
+        }
+    }
+
     func getAccountAddresses(
         walletIndex: Int = 0,
         isChange: Bool? = nil,

Bitkit/Services/Trezor/TrezorService.swift

@@ -71,7 +71,7 @@ class TrezorService {
     func connect(deviceId: String) async throws -> TrezorFeatures {
         try await ServiceQueue.background(.core) { [self] in
             ensureCallbacksRegistered()
-            return try await trezorConnect(deviceId: deviceId)
+            return try await trezorConnect(deviceId: deviceId, selection: .standard)
         }
     }
 

Bitkit/Services/Trezor/TrezorUiHandler.swift

@@ -1,5 +1,5 @@
 import BitkitCore
 import Combine
 import Foundation
 
 /// Implementation of TrezorUiCallback protocol for PIN and passphrase handling.
@@ -11,9 +11,9 @@
     // MARK: - PIN Handling
 
     /// Publisher to notify UI when PIN entry is needed
     let needsPinPublisher = PassthroughSubject<Void, Never>()
 
     private var submittedPin: String = ""
     private let pinLock = NSLock()
     private let pinSemaphore = DispatchSemaphore(value: 0)
 
@@ -24,6 +24,7 @@
     let needsPassphrasePublisher = PassthroughSubject<Bool, Never>()
 
     private var submittedPassphrase: String = ""
+    private var didCancelPassphrase = false
     private let passphraseLock = NSLock()
     private let passphraseSemaphore = DispatchSemaphore(value: 0)
 
@@ -75,11 +76,12 @@
         return pin
     }
 
-    func onPassphraseRequest(onDevice: Bool) -> String {
+    func onPassphraseRequest(onDevice: Bool) -> PassphraseResponse {
         debugLog("onPassphraseRequest: onDevice=\(onDevice), waiting for user input...")
 
         passphraseLock.lock()
         submittedPassphrase = ""
+        didCancelPassphrase = false
         passphraseLock.unlock()
 
         awaitingLock.lock()
@@ -101,21 +103,26 @@
 
         if result == .timedOut {
             debugLog("onPassphraseRequest: timed out")
-            return ""
+            return .cancel
         }
 
         if onDevice {
-            // For on-device entry, return any non-empty string to acknowledge
             debugLog("onPassphraseRequest(onDevice): acknowledged")
-            return "ok"
+            return .onDevice
         }
 
         passphraseLock.lock()
         let passphrase = submittedPassphrase
+        let wasCancelled = didCancelPassphrase
         passphraseLock.unlock()
 
-        debugLog("onPassphraseRequest: \(passphrase.isEmpty ? "cancelled" : "received")")
-        return passphrase
+        if wasCancelled {
+            debugLog("onPassphraseRequest: cancelled")
+            return .cancel
+        }
+
+        debugLog("onPassphraseRequest: \(passphrase.isEmpty ? "standard wallet" : "received")")
+        return passphrase.isEmpty ? .standard : .hidden(value: passphrase)
     }
 
     // MARK: - UI Submit/Cancel Methods
@@ -152,6 +159,7 @@
         debugLog("cancelPassphrase")
         passphraseLock.lock()
         submittedPassphrase = ""
+        didCancelPassphrase = true
         passphraseLock.unlock()
         passphraseSemaphore.signal()
     }

Bitkit/ViewModels/NavigationViewModel.swift

@@ -101,6 +101,7 @@ enum Route: Hashable {
     case ldkDebug
     case vssDebug
     case probingTool
+    case legacyRnRecovery
     case orders
     case logs
     case trezor