added isNeedFullScan as a @AppStorage

Author: r1b2ns

BDKSwiftExampleWallet/App/BDKSwiftExampleWalletApp.swift

@@ -11,6 +11,7 @@ import SwiftUI
 @main
 struct BDKSwiftExampleWalletApp: App {
     @AppStorage("isOnboarding") var isOnboarding: Bool = true
+    @AppStorage("isNeedFullScan") var isNeedFullScan: Bool = false
     @State private var navigationPath = NavigationPath()
 
     var body: some Scene {
@@ -21,6 +22,7 @@ struct BDKSwiftExampleWalletApp: App {
                     keyClient: keyClient,
                     network: .signet
                 )
+                
                 if let _ = try? KeyClient.live.getBackupInfo() {
                     HomeView(
                         viewModel: .init(
@@ -38,7 +40,8 @@ struct BDKSwiftExampleWalletApp: App {
                 }
             }
             .onChange(of: isOnboarding) { oldValue, newValue in
-                BDKClient.live.setNeedsFullScan(true)
+//                BDKClient.live.setNeedsFullScan(true)
+                isNeedFullScan = true
                 navigationPath = NavigationPath()
             }
         }

BDKSwiftExampleWallet/Service/BDKSyncService/BDKSyncService.swift

@@ -13,7 +13,6 @@ protocol BDKSyncService {
     var keyClient: KeyClient { get }
     var network: Network { get }
     var wallet: Wallet? { get }
-    var needsFullScan: Bool { get }
 
     func createWallet(params: String?) throws
     func loadWallet() throws

BDKSwiftExampleWallet/Service/BDKSyncService/EsploraServerSyncService.swift

@@ -14,7 +14,6 @@ final class EsploraServerSyncService: BDKSyncService {
     var keyClient: KeyClient
     var network: Network
     var wallet: Wallet?
-    var needsFullScan = false
 
     private var esploraClient: EsploraClient
 
@@ -23,7 +22,7 @@ final class EsploraServerSyncService: BDKSyncService {
         network: Network = .signet,
         connection: Connection? = nil
     ) {
-        self.connection = connection// ?? (try? Connection.createConnection())
+        self.connection = connection
         self.keyClient = keyClient
         self.network = network
 
@@ -36,7 +35,6 @@ final class EsploraServerSyncService: BDKSyncService {
     func createWallet(params: String?) throws {
         self.connection = try Connection.createConnection()
         self.wallet = try buildWallet(params: params)
-        needsFullScan = true
     }
 
     func loadWallet() throws {
@@ -47,7 +45,6 @@ final class EsploraServerSyncService: BDKSyncService {
 
     func deleteWallet() throws {
         try deleteData()
-        needsFullScan = true
     }
 
     func updateNetwork(network: Network) {

BDKSwiftExampleWallet/Service/BDKSyncService/KyotoSyncService.swift

@@ -14,7 +14,6 @@ final class KyotoSyncService: BDKSyncService {
     var keyClient: KeyClient
     var network: Network
     var wallet: Wallet?
-    var needsFullScan = false
 
     private var node: CbfNode?
     private var client: CbfClient?

BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift

@@ -22,6 +22,7 @@ class OnboardingViewModel: ObservableObject {
     private var bdkSyncService: BDKSyncService
 
     @AppStorage("isOnboarding") var isOnboarding: Bool?
+    @AppStorage("isNeedFullScan") var isNeedFullScan: Bool?
 
     @Published var walletSyncType: WalletSyncType = .esplora {
         didSet {
@@ -99,6 +100,7 @@ class OnboardingViewModel: ObservableObject {
         do {
             try bdkSyncService.deleteWallet()
             try bdkSyncService.createWallet(params: words.isEmpty ? nil : words)
+            isNeedFullScan = true
 
             DispatchQueue.main.async {
                 self.isOnboarding = false

BDKSwiftExampleWallet/View Model/WalletViewModel.swift

@@ -13,8 +13,9 @@ import SwiftUI
 @MainActor
 @Observable
 class WalletViewModel {
+    
     private let bdkSyncService: BDKSyncService
-    let bdkClient: BDKClient
+    private(set) var isNeedFullScan: Bool
     let keyClient: KeyClient
     let priceClient: PriceClient
 
@@ -40,9 +41,6 @@ class WalletViewModel {
     var transactions: [CanonicalTx]
     var walletSyncState: WalletSyncState
     var walletViewError: AppError?
-    var needsFullScan: Bool {
-        bdkClient.needsFullScan()
-    }
 
     private var updateProgress: @Sendable (UInt64, UInt64) -> Void {
         { [weak self] inspected, total in
@@ -63,19 +61,19 @@ class WalletViewModel {
     }
 
     init(
-        bdkClient: BDKClient = .live,
         keyClient: KeyClient = .live,
         priceClient: PriceClient = .live,
         transactions: [CanonicalTx] = [],
         walletSyncState: WalletSyncState = .notStarted,
-        bdkSyncService: BDKSyncService
+        bdkSyncService: BDKSyncService,
+        isNeedFullScan: Bool
     ) {
-        self.bdkClient = bdkClient
         self.keyClient = keyClient
         self.priceClient = priceClient
         self.transactions = transactions
         self.walletSyncState = walletSyncState
         self.bdkSyncService = bdkSyncService
+        self.isNeedFullScan = isNeedFullScan
     }
 
     private func fullScanWithProgress() async {
@@ -84,7 +82,7 @@ class WalletViewModel {
             let inspector = WalletFullScanScriptInspector(updateProgress: updateProgressFullScan)
             try await bdkSyncService.startFullScan(progress: inspector)
 
-//            try await bdkClient.fullScanWithInspector(inspector)
+            isNeedFullScan = false
             self.walletSyncState = .synced
         } catch let error as CannotConnectError {
             self.walletViewError = .generic(message: error.localizedDescription)
@@ -129,7 +127,6 @@ class WalletViewModel {
     func getTransactions() {
         do {
             let transactionDetails = try bdkSyncService.getTransactions()
-//            let transactionDetails = try bdkClient.transactions()
             self.transactions = transactionDetails
         } catch let error as WalletError {
             self.walletViewError = .generic(message: error.localizedDescription)
@@ -146,7 +143,6 @@ class WalletViewModel {
             let inspector = WalletSyncScriptInspector(updateProgress: updateProgress)
             try await bdkSyncService.startSync(progress: inspector)
 
-//            try await bdkClient.syncWithInspector(inspector)
             self.walletSyncState = .synced
         } catch let error as CannotConnectError {
             self.walletViewError = .generic(message: error.localizedDescription)
@@ -167,9 +163,8 @@ class WalletViewModel {
     }
 
     func syncOrFullScan() async {
-        if bdkClient.needsFullScan() {
+        if isNeedFullScan {
             await fullScanWithProgress()
-            bdkClient.setNeedsFullScan(false)
         } else {
             await startSyncWithProgress()
         }

BDKSwiftExampleWallet/View/HomeView.swift

@@ -8,6 +8,8 @@
 import SwiftUI
 
 struct HomeView: View {
+    @AppStorage("isNeedFullScan") var isNeedFullScan: Bool?
+    
     @Bindable var viewModel: HomeViewModel
     @Binding var navigationPath: NavigationPath
 
@@ -17,9 +19,9 @@ struct HomeView: View {
 
             WalletView(
                 viewModel: .init(
-                    bdkClient: .live,
                     priceClient: .live,
-                    bdkSyncService: viewModel.bdkSyncService
+                    bdkSyncService: viewModel.bdkSyncService,
+                    isNeedFullScan: isNeedFullScan ?? false
                 ),
                 sendNavigationPath: $navigationPath
             )

BDKSwiftExampleWallet/View/WalletView.swift

@@ -11,6 +11,7 @@ import SwiftUI
 struct WalletView: View {
     @AppStorage("balanceDisplayFormat") private var balanceFormat: BalanceDisplayFormat =
         .bitcoinSats
+    @AppStorage("isNeedFullScan") var isNeedFullScan: Bool?
     @Bindable var viewModel: WalletViewModel
     @Binding var sendNavigationPath: NavigationPath
     @State private var isFirstAppear = true
@@ -47,8 +48,9 @@ struct WalletView: View {
                         progress: viewModel.progress,
                         inspectedScripts: viewModel.inspectedScripts,
                         totalScripts: viewModel.totalScripts,
-                        needsFullScan: viewModel.needsFullScan
+                        needsFullScan: viewModel.isNeedFullScan
                     ) {
+                        isNeedFullScan = false
                         showAllTransactions = true
                     }