`bdk_electrum` API improvements and simplifications

* `ElectrumUpdate::missing_full_txs` now returns a `Vec<Txid>` so we
  don't keep a reference to the passed-in `graph`.

* `ElectrumUpdate::finalize*` methods now takes in `missing` txids
  instead of `full_txs`. `Client::batch_transaction_get` is called
within the methods.

Other changes:

* `wallet::ChangeSet` is now made public externally. This is required as
  a wallet db should implement `PersistBackend<wallet::ChangeSet>`.

diff --git a/crates/bdk/src/wallet/mod.rs b/crates/bdk/src/wallet/mod.rs
index f627f969434108e7481b3bfdaf8be2269d3bfdbb..ec6a9dfdc28f4e5043f03080cffae34444deaf40 100644 (file)
--- a/crates/bdk/src/wallet/mod.rs
+++ b/crates/bdk/src/wallet/mod.rs
@@ -97,7 +97,8 @@ pub struct Wallet<D = ()> {
 pub type Update = LocalUpdate<KeychainKind, ConfirmationTimeAnchor>;
 
 // /// The changeset produced internally by applying an update.
-pub(crate) type ChangeSet = LocalChangeSet<KeychainKind, ConfirmationTimeAnchor>;
+pub type ChangeSet = LocalChangeSet<KeychainKind, ConfirmationTimeAnchor>;
+
 /// The address index selection strategy to use to derived an address from the wallet's external
 /// descriptor. See [`Wallet::get_address`]. If you're unsure which one to use use `WalletIndex::New`.
 #[derive(Debug)]

diff --git a/crates/electrum/src/v2.rs b/crates/electrum/src/v2.rs
index 3ddb010283820ccaf4216af3e59de3e588bb9a52..bedfdfac1baa9a7f480ff73fa11a126b00ba3386 100644 (file)
--- a/crates/electrum/src/v2.rs
+++ b/crates/electrum/src/v2.rs
@@ -30,20 +30,22 @@ impl<K, A> Default for ElectrumUpdate<K, A> {
     }
 }
 
-impl<'a, K, A: Anchor> ElectrumUpdate<K, A> {
-    pub fn missing_full_txs<A2>(
-        &'a self,
-        graph: &'a TxGraph<A2>,
-    ) -> impl Iterator<Item = &'a Txid> + 'a {
+impl<K, A: Anchor> ElectrumUpdate<K, A> {
+    pub fn missing_full_txs<A2>(&self, graph: &TxGraph<A2>) -> Vec<Txid> {
         self.graph_update
             .keys()
             .filter(move |&&txid| graph.as_ref().get_tx(txid).is_none())
+            .cloned()
+            .collect()
     }
 
-    pub fn finalize<T>(self, seen_at: Option<u64>, new_txs: T) -> LocalUpdate<K, A>
-    where
-        T: IntoIterator<Item = Transaction>,
-    {
+    pub fn finalize(
+        self,
+        client: &Client,
+        seen_at: Option<u64>,
+        missing: Vec<Txid>,
+    ) -> Result<LocalUpdate<K, A>, Error> {
+        let new_txs = client.batch_transaction_get(&missing)?;
         let mut graph_update = TxGraph::<A>::new(new_txs);
         for (txid, anchors) in self.graph_update {
             if let Some(seen_at) = seen_at {
@@ -53,11 +55,11 @@ impl<'a, K, A: Anchor> ElectrumUpdate<K, A> {
                 let _ = graph_update.insert_anchor(txid, anchor);
             }
         }
-        LocalUpdate {
+        Ok(LocalUpdate {
             keychain: self.keychain_update,
             graph: graph_update,
             chain: self.chain_update,
-        }
+        })
     }
 }
 
@@ -68,16 +70,13 @@ impl<K> ElectrumUpdate<K, ConfirmationHeightAnchor> {
     /// **Note:** The confirmation time might not be precisely correct if there has been a reorg.
     /// Electrum's API intends that we use the merkle proof API, we should change `bdk_electrum` to
     /// use it.
-    pub fn finalize_as_confirmation_time<T>(
+    pub fn finalize_as_confirmation_time(
         self,
         client: &Client,
         seen_at: Option<u64>,
-        new_txs: T,
-    ) -> Result<LocalUpdate<K, ConfirmationTimeAnchor>, Error>
-    where
-        T: IntoIterator<Item = Transaction>,
-    {
-        let update = self.finalize(seen_at, new_txs);
+        missing: Vec<Txid>,
+    ) -> Result<LocalUpdate<K, ConfirmationTimeAnchor>, Error> {
+        let update = self.finalize(client, seen_at, missing)?;
 
         let relevant_heights = {
             let mut visited_heights = HashSet::new();
@@ -111,7 +110,7 @@ impl<K> ElectrumUpdate<K, ConfirmationHeightAnchor> {
                     .anchors
                     .into_iter()
                     .map(|(height_anchor, txid)| {
-                        let confirmation_height = dbg!(height_anchor.confirmation_height);
+                        let confirmation_height = height_anchor.confirmation_height;
                         let confirmation_time = height_to_time[&confirmation_height];
                         let time_anchor = ConfirmationTimeAnchor {
                             anchor_block: height_anchor.anchor_block,

diff --git a/example-crates/example_electrum/src/main.rs b/example-crates/example_electrum/src/main.rs
index f8d2e6afd55fe93a17442ee56d66c8ddb6c26b6c..cfd06c3090a06445aa6100793fb0509a9f9bd002 100644 (file)
--- a/example-crates/example_electrum/src/main.rs
+++ b/example-crates/example_electrum/src/main.rs
@@ -278,20 +278,15 @@ fn main() -> anyhow::Result<()> {
 
     let missing_txids = {
         let graph = &*graph.lock().unwrap();
-        response
-            .missing_full_txs(graph.graph())
-            .cloned()
-            .collect::<Vec<_>>()
+        response.missing_full_txs(graph.graph())
     };
 
-    let new_txs = client
-        .batch_transaction_get(&missing_txids)
-        .context("fetching full transactions")?;
     let now = std::time::UNIX_EPOCH
         .elapsed()
         .expect("must get time")
         .as_secs();
-    let final_update = response.finalize(Some(now), new_txs);
+
+    let final_update = response.finalize(&client, Some(now), missing_txids)?;
 
     let db_changeset = {
         let mut chain = chain.lock().unwrap();