Skip to content

service: default signet + ensure wallet delete #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2024
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
26 changes: 19 additions & 7 deletions BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion BDKSwiftExampleWallet/Utilities/Constants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion BDKSwiftExampleWallet/View/OnboardingView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading