diff --git a/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift b/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift index 653f79e7..3e2b0850 100644 --- a/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift +++ b/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift @@ -21,12 +21,12 @@ private class BDKService { init( keyService: KeyClient = .live ) { - let storedNetworkString = try! keyService.getNetwork() ?? Network.testnet.description + let storedNetworkString = try! keyService.getNetwork() ?? Network.signet.description let storedEsploraURL = try! keyService.getEsploraURL() - ?? Constants.Config.EsploraServerURLNetwork.Testnet.mempoolspace + ?? Constants.Config.EsploraServerURLNetwork.Signet.mutiny - self.network = Network(stringValue: storedNetworkString) ?? .testnet + self.network = Network(stringValue: storedNetworkString) ?? .signet self.keyService = keyService self.esploraClient = EsploraClient(url: storedEsploraURL) } @@ -66,10 +66,16 @@ private class BDKService { } func createWallet(words: String?) throws { + let documentsDirectoryURL = URL.documentsDirectory + let walletDataDirectoryURL = documentsDirectoryURL.appendingPathComponent("wallet_data") + + if FileManager.default.fileExists(atPath: walletDataDirectoryURL.path) { + try FileManager.default.removeItem(at: walletDataDirectoryURL) + } else { + } let baseUrl = - try keyService.getEsploraURL() - ?? Constants.Config.EsploraServerURLNetwork.Testnet.mempoolspace + try keyService.getEsploraURL() ?? Constants.Config.EsploraServerURLNetwork.Signet.mutiny var words12: String if let words = words, !words.isEmpty { @@ -106,8 +112,6 @@ private class BDKService { try keyService.saveNetwork(self.network.description) try keyService.saveEsploraURL(baseUrl) - let documentsDirectoryURL = URL.documentsDirectory - let walletDataDirectoryURL = documentsDirectoryURL.appendingPathComponent("wallet_data") try FileManager.default.ensureDirectoryExists(at: walletDataDirectoryURL) try FileManager.default.removeOldFlatFileIfNeeded(at: documentsDirectoryURL) let persistenceBackendPath = walletDataDirectoryURL.appendingPathComponent("wallet.sqlite") @@ -157,6 +161,14 @@ private class BDKService { try self.keyService.deleteBackupInfo() try self.keyService.deleteEsplora() try self.keyService.deleteNetwork() + + let documentsDirectoryURL = URL.documentsDirectory + let walletDataDirectoryURL = documentsDirectoryURL.appendingPathComponent("wallet_data") + + if FileManager.default.fileExists(atPath: walletDataDirectoryURL.path) { + try FileManager.default.removeItem(at: walletDataDirectoryURL) + } + needsFullScan = true } diff --git a/BDKSwiftExampleWallet/Utilities/Constants.swift b/BDKSwiftExampleWallet/Utilities/Constants.swift index 20493a13..42e08ac7 100644 --- a/BDKSwiftExampleWallet/Utilities/Constants.swift +++ b/BDKSwiftExampleWallet/Utilities/Constants.swift @@ -29,8 +29,8 @@ struct Constants { static let bdk = "http://signet.bitcoindevkit.net" static let mutiny = "https://mutinynet.com/api" static let allValues = [ - bdk, mutiny, + bdk, ] } struct Testnet { diff --git a/BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift b/BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift index c101853d..19bf3519 100644 --- a/BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift +++ b/BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift @@ -26,7 +26,7 @@ class OnboardingViewModel: ObservableObject { } } @Published var wordArray: [String] = [] - @Published var selectedNetwork: Network = .testnet { + @Published var selectedNetwork: Network = .signet { didSet { do { let networkString = selectedNetwork.description @@ -82,9 +82,9 @@ class OnboardingViewModel: ObservableObject { self.bdkClient = bdkClient do { if let networkString = try KeyClient.live.getNetwork() { - self.selectedNetwork = Network(stringValue: networkString) ?? .testnet + self.selectedNetwork = Network(stringValue: networkString) ?? .signet } else { - self.selectedNetwork = .testnet + self.selectedNetwork = .signet } if let esploraURL = try KeyClient.live.getEsploraURL() { self.selectedURL = esploraURL diff --git a/BDKSwiftExampleWallet/View/OnboardingView.swift b/BDKSwiftExampleWallet/View/OnboardingView.swift index 08ccbe3c..e59b4d34 100644 --- a/BDKSwiftExampleWallet/View/OnboardingView.swift +++ b/BDKSwiftExampleWallet/View/OnboardingView.swift @@ -47,8 +47,8 @@ struct OnboardingView: View { "Network", selection: $viewModel.selectedNetwork ) { - Text("Testnet").tag(Network.testnet) Text("Signet").tag(Network.signet) + Text("Testnet").tag(Network.testnet) Text("Regtest").tag(Network.regtest) } .pickerStyle(.automatic)