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
28 changes: 14 additions & 14 deletions BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ private class BDKService {
private var balance: Balance?
private var connection: Connection?
private let esploraClient: EsploraClient
private let keyService: KeyClient
private let keyClient: KeyClient
private var needsFullScan: Bool = false
var network: Network
private var wallet: Wallet?

init(
keyService: KeyClient = .live
keyClient: KeyClient = .live
) {
let storedNetworkString = try! keyService.getNetwork() ?? Network.signet.description
let storedNetworkString = try! keyClient.getNetwork() ?? Network.signet.description
let storedEsploraURL =
try! keyService.getEsploraURL()
try! keyClient.getEsploraURL()
?? Constants.Config.EsploraServerURLNetwork.Signet.mutiny

self.network = Network(stringValue: storedNetworkString) ?? .signet
self.keyService = keyService
self.keyClient = keyClient
self.esploraClient = EsploraClient(url: storedEsploraURL)
}

Expand Down Expand Up @@ -79,7 +79,7 @@ private class BDKService {
}

let baseUrl =
try keyService.getEsploraURL() ?? Constants.Config.EsploraServerURLNetwork.Signet.mutiny
try keyClient.getEsploraURL() ?? Constants.Config.EsploraServerURLNetwork.Signet.mutiny

var words12: String
if let words = words, !words.isEmpty {
Expand Down Expand Up @@ -112,9 +112,9 @@ private class BDKService {
changeDescriptor: changeDescriptor.toStringWithSecret()
)

try keyService.saveBackupInfo(backupInfo)
try keyService.saveNetwork(self.network.description)
try keyService.saveEsploraURL(baseUrl)
try keyClient.saveBackupInfo(backupInfo)
try keyClient.saveNetwork(self.network.description)
try keyClient.saveEsploraURL(baseUrl)

try FileManager.default.ensureDirectoryExists(at: walletDataDirectoryURL)
try FileManager.default.removeOldFlatFileIfNeeded(at: documentsDirectoryURL)
Expand Down Expand Up @@ -149,7 +149,7 @@ private class BDKService {
}

func loadWalletFromBackup() throws {
let backupInfo = try keyService.getBackupInfo()
let backupInfo = try keyClient.getBackupInfo()
let descriptor = try Descriptor(descriptor: backupInfo.descriptor, network: self.network)
let changeDescriptor = try Descriptor(
descriptor: backupInfo.changeDescriptor,
Expand All @@ -162,9 +162,9 @@ private class BDKService {
if let bundleID = Bundle.main.bundleIdentifier {
UserDefaults.standard.removePersistentDomain(forName: bundleID)
}
try self.keyService.deleteBackupInfo()
try self.keyService.deleteEsplora()
try self.keyService.deleteNetwork()
try self.keyClient.deleteBackupInfo()
try self.keyClient.deleteEsplora()
try self.keyClient.deleteNetwork()

let documentsDirectoryURL = URL.documentsDirectory
let walletDataDirectoryURL = documentsDirectoryURL.appendingPathComponent("wallet_data")
Expand All @@ -177,7 +177,7 @@ private class BDKService {
}

func getBackupInfo() throws -> BackupInfo {
let backupInfo = try keyService.getBackupInfo()
let backupInfo = try keyClient.getBackupInfo()
return backupInfo
}

Expand Down
8 changes: 4 additions & 4 deletions BDKSwiftExampleWallet/View Model/Settings/SeedViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@ import SwiftUI
@Observable
@MainActor
class SeedViewModel {
let bdkService: BDKClient
let bdkClient: BDKClient

var seed: BackupInfo?
var seedViewError: AppError?
var showingSeedViewErrorAlert: Bool

init(
bdkService: BDKClient = .live,
bdkClient: BDKClient = .live,
seed: BackupInfo? = nil,
seedViewError: AppError? = nil,
showingSeedViewErrorAlert: Bool = false
) {
self.bdkService = bdkService
self.bdkClient = bdkClient
self.seed = seed
self.seedViewError = seedViewError
self.showingSeedViewErrorAlert = showingSeedViewErrorAlert
}

func getSeed() {
do {
let seed = try bdkService.getBackupInfo()
let seed = try bdkClient.getBackupInfo()
self.seed = seed
} catch {
self.seedViewError = .generic(message: error.localizedDescription)
Expand Down
2 changes: 1 addition & 1 deletion BDKSwiftExampleWallet/View/Settings/SeedView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,6 @@ struct SeedView: View {

#if DEBUG
#Preview {
SeedView(viewModel: .init(bdkService: .mock))
SeedView(viewModel: .init(bdkClient: .mock))
}
#endif
Loading