no message

Author: rubensmachion

BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift

@@ -11,8 +11,8 @@ import Foundation
 private class BDKService {
     static var shared: BDKService = BDKService()
 
-    private let service: BDKSyncService = KyotoService()
-//    private let service: BDKSyncService = EsploraService()
+//    private let service: BDKSyncService = KyotoService()
+    private let service: BDKSyncService = EsploraService()
 
     private var balance: Balance?
     private var connection: Connection?
@@ -92,6 +92,9 @@ private class BDKService {
     }
 
     func deleteWallet() throws {
+        Task {
+            try await service.stopService()
+        }
         try service.deleteWallet()
         needsFullScan = true
     }

BDKSwiftExampleWallet/Service/BDKSyncService/KyotoService.swift

@@ -10,7 +10,7 @@ import Foundation
 
 final class KyotoService: BDKSyncService {
 
-    private static let nodeHeight: UInt32 = 300_000
+    private static let nodeHeight: UInt32 = 200_000
 
     static let shared = KyotoService()
 
@@ -22,6 +22,7 @@ final class KyotoService: BDKSyncService {
     private var client: CbfClient?
     private var node: CbfNode?
     private var connected = false
+    private var isScanRunning = false
 
     private var fullScanProgress: FullScanProgress?
     private var syncProgress: SyncScanProgress?
@@ -48,6 +49,7 @@ final class KyotoService: BDKSyncService {
     }
 
     func startSync(progress: @escaping SyncScanProgress) async throws {
+        if isScanRunning { return }
         guard let wallet = self.wallet else {
             throw WalletError.walletNotFound
         }
@@ -57,10 +59,12 @@ final class KyotoService: BDKSyncService {
         self.syncProgress = progress
         self.client = nodeComponents.client
         self.node = nodeComponents.node
+        isScanRunning = true
         try await startListen()
     }
 
     func startFullScan(progress: @escaping FullScanProgress) async throws {
+        if isScanRunning { return }
         guard let wallet = self.wallet else {
             throw WalletError.walletNotFound
         }
@@ -70,19 +74,37 @@ final class KyotoService: BDKSyncService {
         self.fullScanProgress = progress
         self.client = nodeComponents.client
         self.node = nodeComponents.node
+        isScanRunning = true
         try await startListen()
     }
 
     func send(address: String, amount: UInt64, feeRate: UInt64) async throws {
-        
+        let psbt = try buildTransaction(
+            address: address,
+            amount: amount,
+            feeRate: feeRate
+        )
+        try await signAndBroadcast(psbt: psbt)
     }
 
     func stopService() async throws {
+        isScanRunning = false
         try await client?.shutdown()
     }
 
     // MARK: - Private
 
+    private func signAndBroadcast(psbt: Psbt) async throws {
+        guard let wallet = self.wallet else { throw WalletError.walletNotFound }
+        let isSigned = try wallet.sign(psbt: psbt)
+        if isSigned {
+            let transaction = try psbt.extractTx()
+            try await client?.broadcast(transaction: transaction)
+        } else {
+            throw WalletError.notSigned
+        }
+    }
+    
     private func buildNode(from wallet: Wallet, scanType: ScanType) throws -> CbfComponents {
         try CbfBuilder()
             .dataDir(dataDir: Connection.dataDir)
@@ -100,11 +122,14 @@ final class KyotoService: BDKSyncService {
 
     @discardableResult
     func startUpdating() async throws -> Bool {
-        guard let update = await self.client?.update() else { return false }
+        guard let update = await self.client?.update() else {
+            isScanRunning = false
+            return false
+        }
         try self.wallet?.applyUpdate(update: update)
         let _ = try self.wallet?.persist(connection: self.connection ?? Connection.loadConnection())
         print("######### walletUpdated")
-        
+        isScanRunning = false
         return true
     }
 
@@ -133,7 +158,7 @@ final class KyotoService: BDKSyncService {
     private func updateWarn() {
         Task {
             while true {
-                if let warn = try? await self.client!.nextWarning() {
+                if let warn = try? await self.client?.nextWarning() {
                     switch warn {
                     case .needConnections:
                         print("######### disconnected")

BDKSwiftExampleWallet/Utilities/Constants.swift

@@ -29,9 +29,11 @@ struct Constants {
             struct Signet {
                 static let bdk = "http://signet.bitcoindevkit.net"
                 static let mutiny = "https://mutinynet.com/api"
+                static let mempoolspace = "https://mempool.space/signet/api"
                 static let allValues = [
                     mutiny,
                     bdk,
+                    mempoolspace,
                 ]
             }
             struct Testnet {