Fix/1151 with evans poc

.github/workflows/cont_integration.yml

@@ -44,6 +44,7 @@ jobs:
           cargo update -p zip:0.6.6 --precise "0.6.2"
           cargo update -p time --precise "0.3.13"
           cargo update -p cc --precise "1.0.81"
+          cargo update -p byteorder --precise "1.4.3"
       - name: Build
         run: cargo build ${{ matrix.features }}
       - name: Test

README.md

@@ -93,6 +93,8 @@ cargo update -p zip:0.6.6 --precise "0.6.2"
 cargo update -p time --precise "0.3.13"
 # cc 1.0.82 has MSRV 1.61.0+
 cargo update -p cc --precise "1.0.81"
+# byteorder 1.5.0 has MSRV 1.60+
+cargo update -p byteorder --precise "1.4.3"
 ```
 
 ## License

crates/bdk/src/wallet/mod.rs

@@ -113,6 +113,33 @@ pub struct Update {
     pub chain: Option<local_chain::Update>,
 }
 
+impl From<TxGraph<ConfirmationTimeAnchor>> for Update {
+    fn from(graph: TxGraph<ConfirmationTimeAnchor>) -> Self {
+        Self {
+            graph,
+            ..Default::default()
+        }
+    }
+}
+
+impl From<BTreeMap<KeychainKind, u32>> for Update {
+    fn from(last_active_indices: BTreeMap<KeychainKind, u32>) -> Self {
+        Self {
+            last_active_indices,
+            ..Default::default()
+        }
+    }
+}
+
+impl From<local_chain::Update> for Update {
+    fn from(chain: local_chain::Update) -> Self {
+        Self {
+            chain: Some(chain),
+            ..Default::default()
+        }
+    }
+}
+
 /// The changes made to a wallet by applying an [`Update`].
 #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize, Default)]
 pub struct ChangeSet {
@@ -1916,10 +1943,13 @@ impl<D> Wallet<D> {
     /// transactions related to your wallet into it.
     ///
     /// [`commit`]: Self::commit
-    pub fn apply_update(&mut self, update: Update) -> Result<(), CannotConnectError>
+    pub fn apply_update<U>(&mut self, update: U) -> Result<(), CannotConnectError>
     where
+        U: Into<Update>,
         D: PersistBackend<ChangeSet>,
     {
+        let update = update.into();
+
         let mut changeset = match update.chain {
             Some(chain_update) => ChangeSet::from(self.chain.apply_update(chain_update)?),
             None => ChangeSet::default(),
@@ -1940,6 +1970,11 @@ impl<D> Wallet<D> {
         Ok(())
     }
 
+    /// Get heights of missing checkpoints.
+    pub fn missing_checkpoints(&self) -> impl Iterator<Item = u32> + '_ {
+        self.tx_graph().missing_heights(self.local_chain())
+    }
+
     /// Commits all currently [`staged`] changed to the persistence backend returning and error when
     /// this fails.
     ///

example-crates/wallet_esplora_async/src/main.rs

@@ -2,7 +2,7 @@ use std::{io::Write, str::FromStr};
 
 use bdk::{
     bitcoin::{Address, Network},
-    wallet::{AddressIndex, Update},
+    wallet::AddressIndex,
     SignOptions, Wallet,
 };
 use bdk_esplora::{esplora_client, EsploraAsyncExt};
@@ -53,17 +53,18 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             (k, k_spks)
         })
         .collect();
+
     let (update_graph, last_active_indices) = client
         .scan_txs_with_keychains(keychain_spks, None, None, STOP_GAP, PARALLEL_REQUESTS)
         .await?;
-    let missing_heights = wallet.tx_graph().missing_heights(wallet.local_chain());
-    let chain_update = client.update_local_chain(prev_tip, missing_heights).await?;
-    let update = Update {
-        last_active_indices,
-        graph: update_graph,
-        chain: Some(chain_update),
-    };
-    wallet.apply_update(update)?;
+    wallet.apply_update(update_graph)?;
+    wallet.apply_update(last_active_indices)?;
+
+    let chain_update = client
+        .update_local_chain(prev_tip, wallet.missing_checkpoints())
+        .await?;
+    wallet.apply_update(chain_update)?;
+
     wallet.commit()?;
     println!();
 

example-crates/wallet_esplora_blocking/src/main.rs

@@ -7,7 +7,7 @@ use std::{io::Write, str::FromStr};
 
 use bdk::{
     bitcoin::{Address, Network},
-    wallet::{AddressIndex, Update},
+    wallet::AddressIndex,
     SignOptions, Wallet,
 };
 use bdk_esplora::{esplora_client, EsploraExt};
@@ -55,15 +55,12 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let (update_graph, last_active_indices) =
         client.scan_txs_with_keychains(keychain_spks, None, None, STOP_GAP, PARALLEL_REQUESTS)?;
-    let missing_heights = wallet.tx_graph().missing_heights(wallet.local_chain());
-    let chain_update = client.update_local_chain(prev_tip, missing_heights)?;
-    let update = Update {
-        last_active_indices,
-        graph: update_graph,
-        chain: Some(chain_update),
-    };
-
-    wallet.apply_update(update)?;
+    wallet.apply_update(update_graph)?;
+    wallet.apply_update(last_active_indices)?;
+
+    let chain_update = client.update_local_chain(prev_tip, wallet.missing_checkpoints())?;
+    wallet.apply_update(chain_update)?;
+
     wallet.commit()?;
     println!();