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
3 changes: 3 additions & 0 deletions BDKSwiftExampleWallet/Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,9 @@
}
}
}
},
"Testnet4" : {

},
"To" : {
"extractionState" : "stale",
Expand Down
32 changes: 28 additions & 4 deletions BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,21 @@ private class BDKService {
self.keyClient = keyClient
let storedNetworkString = try? keyClient.getNetwork() ?? Network.signet.description
self.network = Network(stringValue: storedNetworkString ?? "") ?? .signet
self.esploraURL =
try! keyClient.getEsploraURL() ?? Constants.Config.EsploraServerURLNetwork.Signet.mutiny

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 @@ -188,8 +201,19 @@ private class BDKService {
} else {
}

let baseUrl =
try keyClient.getEsploraURL() ?? Constants.Config.EsploraServerURLNetwork.Signet.mutiny
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 ?? ""
}

guard let descriptorString = descriptor, !descriptorString.isEmpty else {
throw WalletError.walletNotFound
Expand Down
22 changes: 21 additions & 1 deletion BDKSwiftExampleWallet/View/Activity/TransactionListView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ struct TransactionListView: View {
if let mutinyFaucetURL,
let signetFaucetURL,
viewModel.getNetwork() != Network.testnet.description
&& viewModel.getNetwork() != Network.testnet4.description
{

Button {
UIApplication.shared.open(
viewModel.getEsploraURL()
Expand All @@ -59,7 +59,27 @@ struct TransactionListView: View {
.underline()
}
.buttonStyle(.plain)
}

let testnet4FaucetURL = URL(string: "https://mempool.space/testnet4/faucet")

if let testnet4FaucetURL,
viewModel.getNetwork() == Network.testnet4.description
{
Button {
UIApplication.shared.open(
testnet4FaucetURL
)
} label: {
HStack(spacing: 2) {
Text("Get sats from faucet")
Image(systemName: "arrow.right")
}
.font(.caption)
.foregroundStyle(.secondary)
.underline()
}
.buttonStyle(.plain)
}

}
Expand Down
1 change: 1 addition & 0 deletions BDKSwiftExampleWallet/View/OnboardingView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ struct OnboardingView: View {
Picker("Network", selection: $viewModel.selectedNetwork) {
Text("Signet").tag(Network.signet)
Text("Testnet").tag(Network.testnet)
Text("Testnet4").tag(Network.testnet4)
}
.pickerStyle(.automatic)
.tint(.primary)
Expand Down