added .live

r1b2ns · r1b2ns · commit 7b7e2ab62aa7 · 2025-06-05T19:49:50.000-03:00
diff --git a/BDKSwiftExampleWallet/App/BDKSwiftExampleWalletApp.swift b/BDKSwiftExampleWallet/App/BDKSwiftExampleWalletApp.swift
@@ -20,20 +20,20 @@ struct BDKSwiftExampleWalletApp: App {
                 if value != nil && !isOnboarding {
                     HomeView(
                         viewModel: .init(
-                            bdkClient: .esplora
+                            bdkClient: .live
                         ),
                         navigationPath: $navigationPath
                     )
                 } else {
                     OnboardingView(
                         viewModel: .init(
-                            bdkClient: .esplora
+                            bdkClient: .live
                         )
                     )
                 }
             }
             .onChange(of: isOnboarding) { oldValue, newValue in
-                BDKClient.esplora.setNeedsFullScan(true)
+                BDKClient.live.setNeedsFullScan(true)
                 navigationPath = NavigationPath()
             }
         }
diff --git a/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift b/BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift
@@ -12,15 +12,7 @@ class BDKService {
     static var shared: BDKService = BDKService()
 
     private var syncMode: SyncMode?
-    private var service: BDKClient {
-        switch try? keyClient.getSyncMode() {
-        case .kyoto:
-            return .kyoto
-        default:
-            return .esplora
-        }
-    }
-    private let keyClient: KeyClient
+    let keyClient: KeyClient
     private var needsFullScan: Bool = false
     private(set) var network: Network
     private(set) var esploraURL: String
@@ -111,67 +103,18 @@ struct BDKClient {
 }
 
 extension BDKClient {
-    // MARK: - live
-//    static let live = Self(
-//        loadWallet: { try BDKService.shared.loadWalletFromBackup() },
-//        deleteWallet: { try BDKService.shared.deleteWallet() },
-//        createWalletFromSeed: { words in try BDKService.shared.createWallet(words: words) },
-//        createWalletFromDescriptor: { descriptor in
-//            try BDKService.shared.createWallet(descriptor: descriptor)
-//        },
-//        createWalletFromXPub: { xpub in
-//            try BDKService.shared.createWallet(xpub: xpub)
-//        },
-//        getBalance: { try BDKService.shared.getBalance() },
-//        transactions: { try BDKService.shared.transactions() },
-//        listUnspent: { try BDKService.shared.listUnspent() },
-//        syncScanWithSyncScanProgress: { progress in
-//            try await BDKService.shared.syncWithInspector(progress: progress)
-//        },
-//        fullScanWithFullScanProgress: { progress in
-//            try await BDKService.shared.fullScanWithInspector(progress: progress)
-//        },
-//        getAddress: { try BDKService.shared.getAddress() },
-//        send: { (address, amount, feeRate) in
-//            Task {
-//                try await BDKService.shared.send(address: address, amount: amount, feeRate: feeRate)
-//            }
-//        },
-//        calculateFee: { tx in try BDKService.shared.calculateFee(tx: tx) },
-//        calculateFeeRate: { tx in try BDKService.shared.calculateFeeRate(tx: tx) },
-//        sentAndReceived: { tx in try BDKService.shared.sentAndReceived(tx: tx) },
-//        buildTransaction: { (address, amount, feeRate) in
-//            try BDKService.shared.buildTransaction(
-//                address: address,
-//                amount: amount,
-//                feeRate: feeRate
-//            )
-//        },
-//        getBackupInfo: { try BDKService.shared.getBackupInfo() },
-//        needsFullScan: { BDKService.shared.needsFullScanOfWallet() },
-//        setNeedsFullScan: { value in BDKService.shared.setNeedsFullScan(value) },
-//        getNetwork: {
-//            BDKService.shared.network
-//        },
-//        getEsploraURL: {
-//            BDKService.shared.esploraURL
-//        },
-//        updateNetwork: { newNetwork in
-//            BDKService.shared.updateNetwork(newNetwork)
-//        },
-//        updateEsploraURL: { newURL in
-//            BDKService.shared.updateEsploraURL(newURL)
-//        },
-//        stop: {
-//            try await BDKService.shared.stop()
-//        },
-//        upateSyncMode: { mode in
-//            BDKService.shared.updateSyncMode(mode)
-//        },
-//        getSyncMode: {
-//            BDKService.shared.getSyncMode()
-//        }
-//    )
+    static var live: BDKClient {
+        do {
+            let syncMode = try BDKService.shared.keyClient.getSyncMode()
+            if syncMode == .kyoto {
+                return .kyoto
+            } else {
+                return .esplora
+            }
+        } catch {
+            return .esplora
+        }
+    }
 }
 
 #if DEBUG
diff --git a/BDKSwiftExampleWallet/View Model/Activity/ActivityListViewModel.swift b/BDKSwiftExampleWallet/View Model/Activity/ActivityListViewModel.swift
@@ -39,7 +39,7 @@ class ActivityListViewModel {
     }
 
     init(
-        bdkClient: BDKClient = .esplora,
+        bdkClient: BDKClient = .live,
         transactions: [CanonicalTx] = [],
         walletSyncState: WalletSyncState = .notStarted
     ) {
diff --git a/BDKSwiftExampleWallet/View Model/Activity/TransactionDetailViewModel.swift b/BDKSwiftExampleWallet/View Model/Activity/TransactionDetailViewModel.swift
@@ -23,7 +23,7 @@ class TransactionDetailViewModel {
     var transactionDetailsError: AppError?
 
     init(
-        bdkClient: BDKClient = .esplora
+        bdkClient: BDKClient = .live
     ) {
         self.bdkClient = bdkClient
     }
diff --git a/BDKSwiftExampleWallet/View Model/Activity/TransactionListViewModel.swift b/BDKSwiftExampleWallet/View Model/Activity/TransactionListViewModel.swift
@@ -17,7 +17,7 @@ class TransactionListViewModel {
     var walletTransactionsViewError: AppError?
 
     init(
-        bdkClient: BDKClient = .esplora
+        bdkClient: BDKClient = .live
     ) {
         self.bdkClient = bdkClient
     }
diff --git a/BDKSwiftExampleWallet/View Model/HomeViewModel.swift b/BDKSwiftExampleWallet/View Model/HomeViewModel.swift
@@ -17,7 +17,7 @@ class HomeViewModel: ObservableObject {
     var isWalletLoaded = false
     var showingHomeViewErrorAlert = false
 
-    init(bdkClient: BDKClient = .esplora) {
+    init(bdkClient: BDKClient = .live) {
         self.bdkClient = bdkClient
     }
 
diff --git a/BDKSwiftExampleWallet/View Model/Receive/ReceiveViewModel.swift b/BDKSwiftExampleWallet/View Model/Receive/ReceiveViewModel.swift
@@ -20,7 +20,7 @@ class ReceiveViewModel: NSObject, NFCNDEFReaderSessionDelegate {
     var receiveViewError: AppError?
     var showingReceiveViewErrorAlert = false
 
-    init(bdkClient: BDKClient = .esplora) {
+    init(bdkClient: BDKClient = .live) {
         self.bdkClient = bdkClient
     }
 
diff --git a/BDKSwiftExampleWallet/View Model/Send/AmountViewModel.swift b/BDKSwiftExampleWallet/View Model/Send/AmountViewModel.swift
@@ -18,7 +18,7 @@ class AmountViewModel {
     var balanceTotal: UInt64?
     var showingAmountViewErrorAlert = false
 
-    init(bdkClient: BDKClient = .esplora) {
+    init(bdkClient: BDKClient = .live) {
         self.bdkClient = bdkClient
     }
 
diff --git a/BDKSwiftExampleWallet/View Model/Send/BuildTransactionViewModel.swift b/BDKSwiftExampleWallet/View Model/Send/BuildTransactionViewModel.swift
@@ -19,7 +19,7 @@ class BuildTransactionViewModel {
     var showingBuildTransactionViewErrorAlert = false
 
     init(
-        bdkClient: BDKClient = .esplora
+        bdkClient: BDKClient = .live
     ) {
         self.bdkClient = bdkClient
     }
diff --git a/BDKSwiftExampleWallet/View Model/Send/FeeViewModel.swift b/BDKSwiftExampleWallet/View Model/Send/FeeViewModel.swift
@@ -37,7 +37,7 @@ class FeeViewModel {
     var recommendedFees: RecommendedFees?
     var showingFeeViewErrorAlert = false
 
-    init(feeClient: FeeClient = .live, bdkClient: BDKClient = .esplora) {
+    init(feeClient: FeeClient = .live, bdkClient: BDKClient = .live) {
         self.feeClient = feeClient
         self.bdkClient = bdkClient
     }
diff --git a/BDKSwiftExampleWallet/View Model/Settings/SettingsViewModel.swift b/BDKSwiftExampleWallet/View Model/Settings/SettingsViewModel.swift
@@ -24,7 +24,7 @@ class SettingsViewModel: ObservableObject {
     let syncMode: SyncMode
 
     init(
-        bdkClient: BDKClient = .esplora
+        bdkClient: BDKClient = .live
     ) {
         self.bdkClient = bdkClient
         self.network = bdkClient.getNetwork().description
diff --git a/BDKSwiftExampleWallet/View Model/Settings/WalletRecoveryViewModel.swift b/BDKSwiftExampleWallet/View Model/Settings/WalletRecoveryViewModel.swift
@@ -21,7 +21,7 @@ class WalletRecoveryViewModel {
     var showingWalletRecoveryViewErrorAlert: Bool
 
     init(
-        bdkClient: BDKClient = .esplora,
+        bdkClient: BDKClient = .live,
         backupInfo: BackupInfo? = nil,
         walletRecoveryViewError: AppError? = nil,
         showingWalletRecoveryViewErrorAlert: Bool = false
diff --git a/BDKSwiftExampleWallet/View Model/WalletViewModel.swift b/BDKSwiftExampleWallet/View Model/WalletViewModel.swift
@@ -44,7 +44,7 @@ class WalletViewModel {
     }
 
     init(
-        bdkClient: BDKClient = .esplora,
+        bdkClient: BDKClient = .live,
         keyClient: KeyClient = .live,
         priceClient: PriceClient = .live,
         transactions: [CanonicalTx] = [],
diff --git a/BDKSwiftExampleWallet/View/Activity/TransactionListView.swift b/BDKSwiftExampleWallet/View/Activity/TransactionListView.swift
@@ -100,7 +100,7 @@ struct TransactionListView: View {
                         NavigationLink(
                             destination: TransactionDetailView(
                                 viewModel: .init(
-                                    bdkClient: .esplora
+                                    bdkClient: .live
                                 ),
                                 amount: sentAndReceivedValues.sent.toSat() == 0
                                     ? sentAndReceivedValues.received.toSat()
diff --git a/BDKSwiftExampleWallet/View/HomeView.swift b/BDKSwiftExampleWallet/View/HomeView.swift
@@ -17,7 +17,7 @@ struct HomeView: View {
 
             WalletView(
                 viewModel: .init(
-                    bdkClient: .esplora,
+                    bdkClient: .live,
                     priceClient: .live
                 ),
                 sendNavigationPath: $navigationPath

Original file line number	Diff line number	Diff line change
`@@ -20,20 +20,20 @@ struct BDKSwiftExampleWalletApp: App {`
`20`	`20`	`if value != nil && !isOnboarding {`
`21`	`21`	`HomeView(`
`22`	`22`	`viewModel: .init(`
`23`		`- bdkClient: .esplora`
	`23`	`+ bdkClient: .live`
`24`	`24`	`),`
`25`	`25`	`navigationPath: $navigationPath`
`26`	`26`	`)`
`27`	`27`	`} else {`
`28`	`28`	`OnboardingView(`
`29`	`29`	`viewModel: .init(`
`30`		`- bdkClient: .esplora`
	`30`	`+ bdkClient: .live`
`31`	`31`	`)`
`32`	`32`	`)`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`.onChange(of: isOnboarding) { oldValue, newValue in`
`36`		`- BDKClient.esplora.setNeedsFullScan(true)`
	`36`	`+ BDKClient.live.setNeedsFullScan(true)`
`37`	`37`	`navigationPath = NavigationPath()`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class ActivityListViewModel {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`init(`
`42`		`- bdkClient: BDKClient = .esplora,`
	`42`	`+ bdkClient: BDKClient = .live,`
`43`	`43`	`transactions: [CanonicalTx] = [],`
`44`	`44`	`walletSyncState: WalletSyncState = .notStarted`
`45`	`45`	`) {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class TransactionDetailViewModel {`
`23`	`23`	`var transactionDetailsError: AppError?`
`24`	`24`
`25`	`25`	`init(`
`26`		`- bdkClient: BDKClient = .esplora`
	`26`	`+ bdkClient: BDKClient = .live`
`27`	`27`	`) {`
`28`	`28`	`self.bdkClient = bdkClient`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class TransactionListViewModel {`
`17`	`17`	`var walletTransactionsViewError: AppError?`
`18`	`18`
`19`	`19`	`init(`
`20`		`- bdkClient: BDKClient = .esplora`
	`20`	`+ bdkClient: BDKClient = .live`
`21`	`21`	`) {`
`22`	`22`	`self.bdkClient = bdkClient`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class HomeViewModel: ObservableObject {`
`17`	`17`	`var isWalletLoaded = false`
`18`	`18`	`var showingHomeViewErrorAlert = false`
`19`	`19`
`20`		`- init(bdkClient: BDKClient = .esplora) {`
	`20`	`+ init(bdkClient: BDKClient = .live) {`
`21`	`21`	`self.bdkClient = bdkClient`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class ReceiveViewModel: NSObject, NFCNDEFReaderSessionDelegate {`
`20`	`20`	`var receiveViewError: AppError?`
`21`	`21`	`var showingReceiveViewErrorAlert = false`
`22`	`22`
`23`		`- init(bdkClient: BDKClient = .esplora) {`
	`23`	`+ init(bdkClient: BDKClient = .live) {`
`24`	`24`	`self.bdkClient = bdkClient`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class AmountViewModel {`
`18`	`18`	`var balanceTotal: UInt64?`
`19`	`19`	`var showingAmountViewErrorAlert = false`
`20`	`20`
`21`		`- init(bdkClient: BDKClient = .esplora) {`
	`21`	`+ init(bdkClient: BDKClient = .live) {`
`22`	`22`	`self.bdkClient = bdkClient`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class BuildTransactionViewModel {`
`19`	`19`	`var showingBuildTransactionViewErrorAlert = false`
`20`	`20`
`21`	`21`	`init(`
`22`		`- bdkClient: BDKClient = .esplora`
	`22`	`+ bdkClient: BDKClient = .live`
`23`	`23`	`) {`
`24`	`24`	`self.bdkClient = bdkClient`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class FeeViewModel {`
`37`	`37`	`var recommendedFees: RecommendedFees?`
`38`	`38`	`var showingFeeViewErrorAlert = false`
`39`	`39`
`40`		`- init(feeClient: FeeClient = .live, bdkClient: BDKClient = .esplora) {`
	`40`	`+ init(feeClient: FeeClient = .live, bdkClient: BDKClient = .live) {`
`41`	`41`	`self.feeClient = feeClient`
`42`	`42`	`self.bdkClient = bdkClient`
`43`	`43`	`}`