fix connection and syncronization

Author: r1b2ns

BDKSwiftExampleWallet.xcodeproj/project.pbxproj

@@ -239,9 +239,9 @@
 		7745E1922DD7D2E600D52A40 /* BDKSyncService */ = {
 			isa = PBXGroup;
 			children = (
+				7745E1902DD7C47600D52A40 /* BDKSyncService.swift */,
 				7745E1952DD7D8FD00D52A40 /* KyotoSyncService.swift */,
 				7745E1932DD7D2F500D52A40 /* EsploraServerSyncService.swift */,
-				7745E1902DD7C47600D52A40 /* BDKSyncService.swift */,
 			);
 			path = BDKSyncService;
 			sourceTree = "<group>";

BDKSwiftExampleWallet/Extensions/BDK+Extensions/Connection+Extensions.swift

@@ -6,9 +6,19 @@ extension Connection {
         let documentsDirectoryURL = URL.defaultWalletDirectory
         let walletDataDirectoryURL = documentsDirectoryURL.appendingPathComponent(URL.walletDirectoryName)
 
+        if FileManager.default.fileExists(atPath: walletDataDirectoryURL.path) {
+            try FileManager.default.removeItem(at: walletDataDirectoryURL)
+        }
+        
         try FileManager.default.ensureDirectoryExists(at: walletDataDirectoryURL)
         try FileManager.default.removeOldFlatFileIfNeeded(at: documentsDirectoryURL)
         let connection = try Connection(path: URL.persistenceBackendPath)
         return connection
     }
+    
+    static func loadConnection() throws -> Connection {
+        let persistenceBackendPath = URL.persistenceBackendPath
+        let connection = try Connection(path: persistenceBackendPath)
+        return connection
+    }
 }

BDKSwiftExampleWallet/Service/BDKSyncService/BDKSyncService.swift

@@ -23,13 +23,14 @@ protocol BDKSyncService {
 
     func updateNetwork(network: Network)
     func updateEsploraURL(_ url: String)
+    
+    func getTransactions() throws -> [CanonicalTx]
+    func getBalance() throws -> Balance
 }
 
 extension BDKSyncService {
     func buildWallet(params: String?) throws -> Wallet {
-        guard let newConnection = self.connection == nil ?
-                try Connection.createConnection() :
-                    self.connection else {
+        guard let connection = self.connection else {
             throw WalletError.dbNotFound
         }
 
@@ -45,7 +46,7 @@ extension BDKSyncService {
             descriptor: descriptor,
             changeDescriptor: changeDescriptor,
             network: network,
-            connection: newConnection
+            connection: connection
         )
 
         return wallet
@@ -151,18 +152,16 @@ extension BDKSyncService {
     }
 
     func loadWalleFromBackup() throws -> Wallet {
+        guard let connection = self.connection else {
+            throw WalletError.dbNotFound
+        }
+        
         let backupInfo = try keyClient.getBackupInfo()
         let descriptor = try Descriptor(descriptor: backupInfo.descriptor, network: self.network)
         let changeDescriptor = try Descriptor(
             descriptor: backupInfo.changeDescriptor,
             network: self.network
         )
-        
-        try FileManager.default.ensureDirectoryExists(at: URL.walletDataDirectoryURL)
-        try FileManager.default.removeOldFlatFileIfNeeded(at: URL.defaultWalletDirectory)
-        let persistenceBackendPath = URL.persistenceBackendPath
-        let connection = try Connection(path: persistenceBackendPath)
-
         let wallet = try Wallet.load(
             descriptor: descriptor,
             changeDescriptor: changeDescriptor,

BDKSwiftExampleWallet/Service/BDKSyncService/EsploraServerSyncService.swift

@@ -34,10 +34,13 @@ 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 {
+        self.connection = try Connection.loadConnection()
         let wallet = try loadWalleFromBackup()
         self.wallet = wallet
     }
@@ -92,4 +95,21 @@ final class EsploraServerSyncService: BDKSyncService {
         }
         let _ = try wallet.persist(connection: connection)
     }
+    
+    func getTransactions() throws -> [CanonicalTx] {
+        guard let wallet = self.wallet else {
+            throw WalletError.walletNotFound
+        }
+        let transactions = wallet.transactions()
+        let sortedTransactions = transactions.sorted { (tx1, tx2) in
+            return tx1.chainPosition.isBefore(tx2.chainPosition)
+        }
+        return sortedTransactions
+    }
+    
+    func getBalance() throws -> Balance {
+        guard let wallet = self.wallet else { throw WalletError.walletNotFound }
+        let balance = wallet.balance()
+        return balance
+    }
 }

BDKSwiftExampleWallet/Service/BDKSyncService/KyotoSyncService.swift

@@ -52,4 +52,12 @@ final class KyotoSyncService: BDKSyncService {
     func startFullScan(progress: FullScanScriptInspector) async throws {
 
     }
+    
+    func getTransactions() throws -> [CanonicalTx] {
+        []
+    }
+    
+    func getBalance() throws -> Balance {
+        fatalError("Missing implementation")
+    }
 }

BDKSwiftExampleWallet/View Model/WalletViewModel.swift

@@ -13,6 +13,7 @@ import SwiftUI
 @MainActor
 @Observable
 class WalletViewModel {
+    private let bdkSyncService: BDKSyncService
     let bdkClient: BDKClient
     let keyClient: KeyClient
     let priceClient: PriceClient
@@ -60,8 +61,6 @@ class WalletViewModel {
             }
         }
     }
-
-    private let bdkSyncService: BDKSyncService
 
     init(
         bdkClient: BDKClient = .live,
@@ -104,7 +103,8 @@ class WalletViewModel {
 
     func getBalance() {
         do {
-            let balance = try bdkClient.getBalance()
+//            let balance = try bdkClient.getBalance()
+            let balance = try bdkSyncService.getBalance()
             self.balanceTotal = balance.total.toSat()
         } catch let error as WalletError {
             self.walletViewError = .generic(message: error.localizedDescription)
@@ -128,7 +128,8 @@ class WalletViewModel {
 
     func getTransactions() {
         do {
-            let transactionDetails = try bdkClient.transactions()
+            let transactionDetails = try bdkSyncService.getTransactions()
+//            let transactionDetails = try bdkClient.transactions()
             self.transactions = transactionDetails
         } catch let error as WalletError {
             self.walletViewError = .generic(message: error.localizedDescription)