Skip to content

fix: saved esplora and wallet load #281

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.

Sign up for GitHub

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 2 commits into from
Feb 27, 2025
Merged

fix: saved esplora and wallet load #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c29f840
fix: saved esplora
reez Feb 27, 2025
3835d7f
fix: wallet loading
reez Feb 27, 2025
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
3 changes: 3 additions & 0 deletions BDKSwiftExampleWallet/Resources/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,9 @@
}
}
}
},
"Loading wallet..." : {

},
"Navigation Title" : {
"extractionState" : "stale",
Expand Down
146 changes: 91 additions & 55 deletions BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,26 @@ private class BDKService {
let storedNetworkString = try? keyClient.getNetwork() ?? Network.signet.description
self.network = Network(stringValue: storedNetworkString ?? "") ?? .signet

switch self.network {
case .bitcoin:
self.esploraURL = Constants.Config.EsploraServerURLNetwork.Bitcoin.allValues.first ?? ""
case .testnet:
self.esploraURL = Constants.Config.EsploraServerURLNetwork.Testnet.allValues.first ?? ""
case .regtest:
self.esploraURL = Constants.Config.EsploraServerURLNetwork.Regtest.allValues.first ?? ""
case .signet:
self.esploraURL = Constants.Config.EsploraServerURLNetwork.Signet.allValues.first ?? ""
case .testnet4:
self.esploraURL =
Constants.Config.EsploraServerURLNetwork.Testnet4.allValues.first ?? ""
if let savedURL = try? keyClient.getEsploraURL() {
self.esploraURL = savedURL
} else {
switch self.network {
case .bitcoin:
self.esploraURL =
Constants.Config.EsploraServerURLNetwork.Bitcoin.allValues.first ?? ""
case .testnet:
self.esploraURL =
Constants.Config.EsploraServerURLNetwork.Testnet.allValues.first ?? ""
case .regtest:
self.esploraURL =
Constants.Config.EsploraServerURLNetwork.Regtest.allValues.first ?? ""
case .signet:
self.esploraURL =
Constants.Config.EsploraServerURLNetwork.Signet.allValues.first ?? ""
case .testnet4:
self.esploraURL =
Constants.Config.EsploraServerURLNetwork.Testnet4.allValues.first ?? ""
}
}

self.esploraClient = EsploraClient(url: self.esploraURL)
Expand Down Expand Up @@ -119,26 +127,33 @@ private class BDKService {
}

func createWallet(words: String?) throws {
let savedURL = try? keyClient.getEsploraURL()

let documentsDirectoryURL = URL.documentsDirectory
let walletDataDirectoryURL = documentsDirectoryURL.appendingPathComponent("wallet_data")

if FileManager.default.fileExists(atPath: walletDataDirectoryURL.path) {
try FileManager.default.removeItem(at: walletDataDirectoryURL)
}

let baseUrl: String
switch self.network {
case .bitcoin:
baseUrl = Constants.Config.EsploraServerURLNetwork.Bitcoin.allValues.first ?? ""
case .testnet:
baseUrl = Constants.Config.EsploraServerURLNetwork.Testnet.allValues.first ?? ""
case .regtest:
baseUrl = Constants.Config.EsploraServerURLNetwork.Regtest.allValues.first ?? ""
case .signet:
baseUrl = Constants.Config.EsploraServerURLNetwork.Signet.allValues.first ?? ""
case .testnet4:
baseUrl = Constants.Config.EsploraServerURLNetwork.Testnet4.allValues.first ?? ""
}
let baseUrl =
savedURL
?? {
let defaultURL =
switch self.network {
case .bitcoin:
Constants.Config.EsploraServerURLNetwork.Bitcoin.allValues.first ?? ""
case .testnet:
Constants.Config.EsploraServerURLNetwork.Testnet.allValues.first ?? ""
case .regtest:
Constants.Config.EsploraServerURLNetwork.Regtest.allValues.first ?? ""
case .signet:
Constants.Config.EsploraServerURLNetwork.Signet.allValues.first ?? ""
case .testnet4:
Constants.Config.EsploraServerURLNetwork.Testnet4.allValues.first ?? ""
}
return defaultURL
}()

var words12: String
if let words = words, !words.isEmpty {
Expand Down Expand Up @@ -193,27 +208,33 @@ private class BDKService {
}

func createWallet(descriptor: String?) throws {
let savedURL = try? keyClient.getEsploraURL()

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: String
switch self.network {
case .bitcoin:
baseUrl = Constants.Config.EsploraServerURLNetwork.Bitcoin.allValues.first ?? ""
case .testnet:
baseUrl = Constants.Config.EsploraServerURLNetwork.Testnet.allValues.first ?? ""
case .regtest:
baseUrl = Constants.Config.EsploraServerURLNetwork.Regtest.allValues.first ?? ""
case .signet:
baseUrl = Constants.Config.EsploraServerURLNetwork.Signet.allValues.first ?? ""
case .testnet4:
baseUrl = Constants.Config.EsploraServerURLNetwork.Testnet4.allValues.first ?? ""
}
let baseUrl =
savedURL
?? {
let defaultURL =
switch self.network {
case .bitcoin:
Constants.Config.EsploraServerURLNetwork.Bitcoin.allValues.first ?? ""
case .testnet:
Constants.Config.EsploraServerURLNetwork.Testnet.allValues.first ?? ""
case .regtest:
Constants.Config.EsploraServerURLNetwork.Regtest.allValues.first ?? ""
case .signet:
Constants.Config.EsploraServerURLNetwork.Signet.allValues.first ?? ""
case .testnet4:
Constants.Config.EsploraServerURLNetwork.Testnet4.allValues.first ?? ""
}
return defaultURL
}()

guard let descriptorString = descriptor, !descriptorString.isEmpty else {
throw WalletError.walletNotFound
Expand Down Expand Up @@ -268,26 +289,33 @@ private class BDKService {
}

func createWallet(xpub: String?) throws {
let savedURL = try? keyClient.getEsploraURL()

let documentsDirectoryURL = URL.documentsDirectory
let walletDataDirectoryURL = documentsDirectoryURL.appendingPathComponent("wallet_data")

if FileManager.default.fileExists(atPath: walletDataDirectoryURL.path) {
try FileManager.default.removeItem(at: walletDataDirectoryURL)
}

let baseUrl: String
switch self.network {
case .bitcoin:
baseUrl = Constants.Config.EsploraServerURLNetwork.Bitcoin.allValues.first ?? ""
case .testnet:
baseUrl = Constants.Config.EsploraServerURLNetwork.Testnet.allValues.first ?? ""
case .regtest:
baseUrl = Constants.Config.EsploraServerURLNetwork.Regtest.allValues.first ?? ""
case .signet:
baseUrl = Constants.Config.EsploraServerURLNetwork.Signet.allValues.first ?? ""
case .testnet4:
baseUrl = Constants.Config.EsploraServerURLNetwork.Testnet4.allValues.first ?? ""
}
let baseUrl =
savedURL
?? {
let defaultURL =
switch self.network {
case .bitcoin:
Constants.Config.EsploraServerURLNetwork.Bitcoin.allValues.first ?? ""
case .testnet:
Constants.Config.EsploraServerURLNetwork.Testnet.allValues.first ?? ""
case .regtest:
Constants.Config.EsploraServerURLNetwork.Regtest.allValues.first ?? ""
case .signet:
Constants.Config.EsploraServerURLNetwork.Signet.allValues.first ?? ""
case .testnet4:
Constants.Config.EsploraServerURLNetwork.Testnet4.allValues.first ?? ""
}
return defaultURL
}()

guard let xpubString = xpub, !xpubString.isEmpty else {
throw WalletError.walletNotFound
Expand Down Expand Up @@ -363,20 +391,28 @@ private class BDKService {
}

func deleteWallet() throws {
let savedURL = try? keyClient.getEsploraURL()
let savedNetwork = try? keyClient.getNetwork()

if let bundleID = Bundle.main.bundleIdentifier {
UserDefaults.standard.removePersistentDomain(forName: bundleID)
}

try self.keyClient.deleteBackupInfo()
try self.keyClient.deleteEsplora()
try self.keyClient.deleteNetwork()

let documentsDirectoryURL = URL.documentsDirectory
let walletDataDirectoryURL = documentsDirectoryURL.appendingPathComponent("wallet_data")

if FileManager.default.fileExists(atPath: walletDataDirectoryURL.path) {
try FileManager.default.removeItem(at: walletDataDirectoryURL)
}

if let savedURL = savedURL {
try keyClient.saveEsploraURL(savedURL)
}
if let savedNetwork = savedNetwork {
try keyClient.saveNetwork(savedNetwork)
}

needsFullScan = true
}

Expand Down
2 changes: 2 additions & 0 deletions BDKSwiftExampleWallet/View Model/HomeViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class HomeViewModel: ObservableObject {
let bdkClient: BDKClient

var homeViewError: AppError?
var isWalletLoaded = false
var showingHomeViewErrorAlert = false

init(bdkClient: BDKClient = .live) {
Expand All @@ -23,6 +24,7 @@ class HomeViewModel: ObservableObject {
func loadWallet() {
do {
try bdkClient.loadWallet()
isWalletLoaded = true
} catch let error as DescriptorError {
let errorMessage: String
switch error {
Expand Down
26 changes: 14 additions & 12 deletions BDKSwiftExampleWallet/View/HomeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,24 @@ struct HomeView: View {
@Binding var navigationPath: NavigationPath

var body: some View {

ZStack {
Color(uiColor: UIColor.systemBackground)

WalletView(
viewModel: .init(
bdkClient: .live,
priceClient: .live
),
sendNavigationPath: $navigationPath
)
.tint(.primary)
.onAppear {
viewModel.loadWallet()
if !viewModel.isWalletLoaded {
ProgressView("Loading wallet...")
} else {
WalletView(
viewModel: .init(
bdkClient: .live,
priceClient: .live
),
sendNavigationPath: $navigationPath
)
.tint(.primary)
}

}
.onAppear {
viewModel.loadWallet()
}
.alert(isPresented: $viewModel.showingHomeViewErrorAlert) {
Alert(
Expand Down