added syncronization

Author: r1b2ns

BDKSwiftExampleWallet/App/BDKSwiftExampleWalletApp.swift

@@ -17,7 +17,7 @@ struct BDKSwiftExampleWalletApp: App {
         WindowGroup {
             NavigationStack(path: $navigationPath) {
                 let keyClient = KeyClient.live
-                var syncService: BDKSyncService = EsploraServerSyncService(
+                let syncService: BDKSyncService = EsploraServerSyncService(
                     keyClient: keyClient,
                     network: .bitcoin
                 )

BDKSwiftExampleWallet/Service/BDKSyncService/BDKSyncService.swift

@@ -18,6 +18,8 @@ protocol BDKSyncService {
     func createWallet(params: String?) throws
     func loadWallet() throws
     func deleteWallet() throws
+    func startSync(progress: SyncScriptInspector) async throws
+    func startFullScan(progress: FullScanScriptInspector) async throws
 
     func updateNetwork(network: Network)
     func updateEsploraURL(_ url: String)

BDKSwiftExampleWallet/Service/BDKSyncService/EsploraServerSyncService.swift

@@ -23,7 +23,7 @@ final class EsploraServerSyncService: BDKSyncService {
         network: Network = .signet,
         connection: Connection? = nil
     ) {
-        self.connection = connection
+        self.connection = connection// ?? (try? Connection.createConnection())
         self.keyClient = keyClient
         self.network = network
 
@@ -55,4 +55,41 @@ final class EsploraServerSyncService: BDKSyncService {
         try? keyClient.saveEsploraURL(url)
         self.esploraClient = .init(url: url)
     }
+    
+    func startSync(progress: SyncScriptInspector) async throws {
+        guard let wallet = self.wallet else { throw WalletError.walletNotFound }
+        let esploraClient = self.esploraClient
+        let syncRequest = try wallet.startSyncWithRevealedSpks()
+            .inspectSpks(inspector: progress)
+            .build()
+        let update = try esploraClient.sync(
+            request: syncRequest,
+            parallelRequests: UInt64(5)
+        )
+        let _ = try wallet.applyUpdate(update: update)
+        guard let connection = self.connection else {
+            throw WalletError.dbNotFound
+        }
+        let _ = try wallet.persist(connection: connection)
+    }
+    
+    func startFullScan(progress: FullScanScriptInspector) async throws {
+        guard let wallet = self.wallet else { throw WalletError.walletNotFound }
+        let esploraClient = esploraClient
+        let fullScanRequest = try wallet.startFullScan()
+            .inspectSpksForAllKeychains(inspector: progress)
+            .build()
+        let update = try esploraClient.fullScan(
+            request: fullScanRequest,
+            // using https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki#address-gap-limit
+            stopGap: UInt64(20),
+            // using https://github.com/bitcoindevkit/bdk/blob/master/example-crates/example_wallet_esplora_blocking/src/main.rs
+            parallelRequests: UInt64(5)
+        )
+        let _ = try wallet.applyUpdate(update: update)
+        guard let connection = self.connection else {
+            throw WalletError.dbNotFound
+        }
+        let _ = try wallet.persist(connection: connection)
+    }
 }

BDKSwiftExampleWallet/Service/BDKSyncService/KyotoSyncService.swift

@@ -1,53 +1,5 @@
-////
-////  KyotoSyncService.swift
-////  BDKSwiftExampleWallet
-////
-////  Created by Rubens Machion on 16/05/25.
-////
 //
-//import BitcoinDevKit
-//import Foundation
-//
-//final class KyotoSyncService: BDKSyncService {
-//    
-//    var connection: Connection?
-//    var keyClient: KeyClient
-//    var network: Network
-//    var wallet: Wallet?
-//    var needsFullScan = false
-//    
-//    private var node: CbfNode?
-//    private var client: CbfClient?
-//    
-//    init(
-//        keyClient: KeyClient = .live,
-//        network: Network = .signet,
-//        connection: Connection? = nil
-//    ) {
-//        self.connection = connection
-//        self.keyClient = keyClient
-//        self.network = network
-//    }
-//    
-//    func createWallet(params: String?) throws {
-//        self.wallet = try buildWallet(params: params)
-//    }
-//    
-//    func loadWallet() throws {
-//        
-//    }
-//    
-//    func deleteWallet() throws {
-//        
-//    }
-//    
-//    func updateNetwork(network: Network) {
-//        self.network = network
-//    }
-//}
-
-//
-//  Untitled.swift
+//  KyotoSyncService.swift
 //  BDKSwiftExampleWallet
 //
 //  Created by Rubens Machion on 16/05/25.
@@ -64,7 +16,8 @@ final class KyotoSyncService: BDKSyncService {
     var wallet: Wallet?
     var needsFullScan = false
 
-    private var esploraClient: EsploraClient
+    private var node: CbfNode?
+    private var client: CbfClient?
 
     init(
         keyClient: KeyClient = .live,
@@ -74,33 +27,29 @@ final class KyotoSyncService: BDKSyncService {
         self.connection = connection
         self.keyClient = keyClient
         self.network = network
-        
-        let url = (try? keyClient.getEsploraURL()) ?? network.url
-        self.esploraClient = .init(
-            url: url
-        )
     }
 
     func createWallet(params: String?) throws {
         self.wallet = try buildWallet(params: params)
     }
 
     func loadWallet() throws {
-        let wallet = try loadWalleFromBackup()
-        self.wallet = wallet
+        
     }
 
     func deleteWallet() throws {
-        try deleteData()
-        needsFullScan = true
+        
     }
 
     func updateNetwork(network: Network) {
         self.network = network
     }
 
-    func updateEsploraURL(_ url: String) {
-        try? keyClient.saveEsploraURL(url)
-        self.esploraClient = .init(url: url)
+    func startSync(progress: SyncScriptInspector) async throws {
+        
+    }
+    
+    func startFullScan(progress: FullScanScriptInspector) async throws {
+        
     }
 }

BDKSwiftExampleWallet/View Model/HomeViewModel.swift

@@ -13,7 +13,7 @@ import Foundation
 class HomeViewModel: ObservableObject {
     let bdkClient: BDKClient
 
-    private let bdkSyncService: BDKSyncService
+    let bdkSyncService: BDKSyncService
 
     var homeViewError: AppError?
     var isWalletLoaded = false

BDKSwiftExampleWallet/View Model/WalletViewModel.swift

@@ -61,25 +61,31 @@ class WalletViewModel {
         }
     }
 
+    private let bdkSyncService: BDKSyncService
+    
     init(
         bdkClient: BDKClient = .live,
         keyClient: KeyClient = .live,
         priceClient: PriceClient = .live,
         transactions: [CanonicalTx] = [],
-        walletSyncState: WalletSyncState = .notStarted
+        walletSyncState: WalletSyncState = .notStarted,
+        bdkSyncService: BDKSyncService
     ) {
         self.bdkClient = bdkClient
         self.keyClient = keyClient
         self.priceClient = priceClient
         self.transactions = transactions
         self.walletSyncState = walletSyncState
+        self.bdkSyncService = bdkSyncService
     }
 
     private func fullScanWithProgress() async {
         self.walletSyncState = .syncing
         do {
             let inspector = WalletFullScanScriptInspector(updateProgress: updateProgressFullScan)
-            try await bdkClient.fullScanWithInspector(inspector)
+            try await bdkSyncService.startFullScan(progress: inspector)
+            
+//            try await bdkClient.fullScanWithInspector(inspector)
             self.walletSyncState = .synced
         } catch let error as CannotConnectError {
             self.walletViewError = .generic(message: error.localizedDescription)
@@ -137,7 +143,9 @@ class WalletViewModel {
         self.walletSyncState = .syncing
         do {
             let inspector = WalletSyncScriptInspector(updateProgress: updateProgress)
-            try await bdkClient.syncWithInspector(inspector)
+            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)

BDKSwiftExampleWallet/View/HomeView.swift

@@ -18,7 +18,8 @@ struct HomeView: View {
             WalletView(
                 viewModel: .init(
                     bdkClient: .live,
-                    priceClient: .live
+                    priceClient: .live,
+                    bdkSyncService: viewModel.bdkSyncService
                 ),
                 sendNavigationPath: $navigationPath
             )