feat(kyoto)!: update to latest version

Author: rustaceanrob

bdk-ffi/Cargo.lock

@@ -22,7 +22,7 @@ bdk_wallet = { version = "1.2.0", features = ["all-keys", "keys-bip39", "rusqlit
 bdk_core = { version = "0.4.1" }
 bdk_esplora = { version = "0.20.1", default-features = false, features = ["std", "blocking", "blocking-https-rustls"] }
 bdk_electrum = { version = "0.21.0", default-features = false, features = ["use-rustls-ring"] }
-bdk_kyoto = { version = "0.9.0" }
+bdk_kyoto = { version = "0.10.0" }
 
 uniffi = { version = "=0.29.1" }
 thiserror = "1.0.58"

bdk-ffi/Cargo.toml

@@ -265,9 +265,15 @@ impl CbfClient {
 
     /// Return an [`Update`]. This is method returns once the node syncs to the rest of
     /// the network or a new block has been gossiped.
-    pub async fn update(&self) -> Arc<Update> {
-        let update = self.update_rx.lock().await.update().await;
-        Arc::new(Update(update))
+    pub async fn update(&self) -> Result<Update, CbfError> {
+        let update = self
+            .update_rx
+            .lock()
+            .await
+            .update()
+            .await
+            .map_err(|_| CbfError::NodeStopped)?;
+        Ok(Update(update))
     }
 
     /// Add scripts for the node to watch for as they are revealed. Typically used after creating
@@ -318,6 +324,8 @@ impl CbfClient {
 pub enum Info {
     /// All the required connections have been met. This is subject to change.
     ConnectionsMet,
+    /// The node was able to successfully connect to a remote peer.
+    SuccessfulHandshake,
     /// A percentage value of filters that have been scanned.
     Progress { progress: f32 },
     /// A state in the node syncing process.
@@ -331,6 +339,7 @@ impl From<bdk_kyoto::Info> for Info {
     fn from(value: bdk_kyoto::Info) -> Info {
         match value {
             bdk_kyoto::Info::ConnectionsMet => Info::ConnectionsMet,
+            bdk_kyoto::Info::SuccessfulHandshake => Info::SuccessfulHandshake,
             bdk_kyoto::Info::Progress(progress) => Info::Progress {
                 progress: progress.percentage_complete(),
             },
@@ -365,7 +374,7 @@ pub enum Warning {
     CorruptedHeaders,
     /// A transaction got rejected, likely for being an insufficient fee or non-standard transaction.
     TransactionRejected {
-        txid: String,
+        wtxid: String,
         reason: Option<String>,
     },
     /// A database failed to persist some data and may retry again
@@ -397,7 +406,7 @@ impl From<Warn> for Warning {
             Warn::TransactionRejected { payload } => {
                 let reason = payload.reason.map(|r| r.into_string());
                 Warning::TransactionRejected {
-                    txid: payload.txid.to_string(),
+                    wtxid: payload.wtxid.to_string(),
                     reason,
                 }
             }

bdk-ffi/src/kyoto.rs

@@ -1,4 +1,4 @@
-from bdkpython import Connection, Network, Descriptor, KeychainKind, CbfBuilder, CbfComponents, CbfClient, CbfNode, IpAddress, ScanType, Peer, Update, Wallet
+from bdkpython import Connection, Network, Descriptor, KeychainKind, CbfBuilder, CbfComponents, CbfClient, CbfNode, CbfError, IpAddress, ScanType, Peer, Update, Wallet
 import unittest
 import os
 import asyncio
@@ -45,15 +45,18 @@ async def log_loop(client: CbfClient):
                 print(log)
         log_task = asyncio.create_task(log_loop(client))
         node.run()
-        update: Update = await client.update()
-        wallet.apply_update(update)
-        self.assertGreater(
-            wallet.balance().total.to_sat(),
-            0,
-            f"Wallet balance must be greater than 0! Please send funds to {wallet.reveal_next_address(KeychainKind.EXTERNAL).address} and try again."
-        )
-        log_task.cancel()
-        await client.shutdown()
+        try:
+            update: Update = await client.update()
+            wallet.apply_update(update)
+            self.assertGreater(
+                wallet.balance().total.to_sat(),
+                0,
+                f"Wallet balance must be greater than 0! Please send funds to {wallet.reveal_next_address(KeychainKind.EXTERNAL).address} and try again."
+            )
+            log_task.cancel()
+            client.shutdown()
+        except CbfError as e:
+            raise e
 
 if __name__ == "__main__":
     unittest.main()

bdk-python/tests/test_live_kyoto.py

@@ -45,7 +45,7 @@ final class LiveKyotoTests: XCTestCase {
                 }
             }
         }
-        let update = await client.update()
+        let update = try await client.update()
         try wallet.applyUpdate(update: update)
         let address = wallet.revealNextAddress(keychain: KeychainKind.external).address.description
         XCTAssertGreaterThan(