Reduce stack allocation in CBF

Author: rustaceanrob

bdk-ffi/Cargo.lock

@@ -18,7 +18,7 @@ path = "uniffi-bindgen.rs"
 bdk_wallet = { version = "2.2.0", features = ["all-keys", "keys-bip39", "rusqlite"] }
 bdk_esplora = { version = "0.22.1", default-features = false, features = ["std", "blocking", "blocking-https-rustls"] }
 bdk_electrum = { version = "0.23.2", default-features = false, features = ["use-rustls-ring"] }
-bdk_kyoto = { version = "0.15.0" }
+bdk_kyoto = { git = "https://github.com/rustaceanrob/bdk-kyoto.git", rev = "1b61c9c53bc3cd9d2827e04994f7dc14d0f93f5c" }
 
 uniffi = { version = "=0.29.4", features = ["cli"]}
 thiserror = "2.0.17"

bdk-ffi/Cargo.toml

@@ -1,62 +1,48 @@
 import XCTest
 @testable import BitcoinDevKit
 
-//final class LiveKyotoTests: XCTestCase {
-//    private let descriptor = try! Descriptor(
-//        descriptor: "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/1h/0/*)",
-//        network: Network.signet
-//    )
-//    private let changeDescriptor = try! Descriptor(
-//        descriptor: "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/1h/1/*)",
-//        network: Network.signet
-//    )
-//    private let peer = IpAddress.fromIpv4(q1: 68, q2: 47, q3: 229, q4: 218)
-//    private let cwd = FileManager.default.currentDirectoryPath.appending("/temp")
-//
-//    override func tearDownWithError() throws {
-//        let fileManager = FileManager.default
-//        if fileManager.fileExists(atPath: cwd) {
-//            try fileManager.removeItem(atPath: cwd)
-//        }
-//    }
-//
-//    // See: https://github.com/bitcoindevkit/bdk-ffi/issues/842
-//    /*
-//    func testSuccessfullySyncs() async throws {
-//        let persister = try Persister.newInMemory()
-//        let wallet = try Wallet(
-//            descriptor: descriptor,
-//            changeDescriptor: changeDescriptor,
-//            network: Network.signet,
-//            persister: persister
-//        )
-//        let trustedPeer = Peer(address: peer, port: nil, v2Transport: false)
-//        let lightClient = try CbfBuilder()
-//            .peers(peers: [trustedPeer])
-//            .connections(connections: 1)
-//            .scanType(scanType: ScanType.new)
-//            .dataDir(dataDir: cwd)
-//            .build(wallet: wallet)
-//        let client = lightClient.client
-//        let node = lightClient.node
-//        node.run()
-//        Task {
-//            while true {
-//                if let log = try? await client.nextLog() {
-//                    print("\(log)")
-//                }
-//            }
-//        }
-//        let update = try await client.update()
-//        try wallet.applyUpdate(update: update)
-//        let address = wallet.revealNextAddress(keychain: KeychainKind.external).address.description
-//        XCTAssertGreaterThan(
-//            wallet.balance().total.toSat(),
-//            UInt64(0),
-//            "Wallet must have positive balance, please send funds to \(address)"
-//        )
-//        print("Update applied correctly")
-//        try client.shutdown()
-//    }
-//    */
-//}
+final class LiveKyotoTests: XCTestCase {
+    private let descriptor = try! Descriptor(
+        descriptor: "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/1h/0/*)",
+        network: Network.signet
+    )
+    private let changeDescriptor = try! Descriptor(
+        descriptor: "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/1h/1/*)",
+        network: Network.signet
+    )
+    
+    // See: https://github.com/bitcoindevkit/bdk-ffi/issues/842
+    
+    func testSuccessfullySyncs() async throws {
+        let persister = try Persister.newInMemory()
+        let wallet = try Wallet(
+            descriptor: descriptor,
+            changeDescriptor: changeDescriptor,
+            network: Network.signet,
+            persister: persister
+        )
+        let lightClient = CbfBuilder()
+            .build(wallet: wallet)
+        let client = lightClient.client
+        let node = lightClient.node
+        node.run()
+        Task {
+            while true {
+                if let log = try? await client.nextInfo() {
+                    print("\(log)")
+                }
+            }
+        }
+        let update = try await client.update()
+        try wallet.applyUpdate(update: update)
+        let address = wallet.revealNextAddress(keychain: KeychainKind.external).address.description
+        XCTAssertGreaterThan(
+            wallet.balance().total.toSat(),
+            UInt64(0),
+            "Wallet must have positive balance, please send funds to \(address)"
+        )
+        print("Update applied correctly")
+        try client.shutdown()
+    }
+    
+}