f Updates for LDK 0.0.112 / BDK 0.24

Author: tnull

src/access.rs

@@ -76,12 +76,15 @@ where
 	pub(crate) async fn sync(&self, confirmables: Vec<&(dyn Confirm + Sync)>) -> Result<(), Error> {
 		let client = &*self.blockchain;
 
-		let cur_height = client.get_height().await?;
+		let tip_hash= client.get_tip_hash().await?;
+		let tip_block_status = client.get_block_status(&tip_hash).await?;
+		let tip_height = tip_block_status.height.unwrap_or(0);
 
 		let mut locked_last_sync_height = self.last_sync_height.lock().await;
-		if cur_height >= locked_last_sync_height.unwrap_or(0) {
-			self.sync_best_block_updated(&confirmables, cur_height, &mut locked_last_sync_height)
-				.await?;
+		if tip_block_status.in_best_chain && (tip_height >= locked_last_sync_height.unwrap_or(0)) {
+			self.sync_best_block_updated(&confirmables, &tip_hash, tip_height).await?;
+			*locked_last_sync_height = Some(tip_height);
+
 			self.sync_transactions_confirmed(&confirmables).await?;
 			self.sync_transaction_unconfirmed(&confirmables).await?;
 		}
@@ -90,18 +93,15 @@ where
 	}
 
 	async fn sync_best_block_updated(
-		&self, confirmables: &Vec<&(dyn Confirm + Sync)>, cur_height: u32,
-		locked_last_sync_height: &mut tokio::sync::MutexGuard<'_, Option<u32>>,
+		&self, confirmables: &Vec<&(dyn Confirm + Sync)>, tip_hash: &BlockHash, tip_height: u32
 	) -> Result<(), Error> {
 		let client = &*self.blockchain;
 
 		// Inform the interface of the new block.
-		let cur_block_header = client.get_header(cur_height).await?;
+		let tip_block_header = client.get_header_by_hash(tip_hash).await?;
 		for c in confirmables {
-			c.best_block_updated(&cur_block_header, cur_height);
+			c.best_block_updated(&tip_block_header, tip_height);
 		}
-
-		**locked_last_sync_height = Some(cur_height);
 		Ok(())
 	}
 
@@ -133,20 +133,17 @@ where
 		for txid in registered_txs {
 			if let Some(tx_status) = client.get_tx_status(&txid).await? {
 				if tx_status.confirmed {
-					if let Some(tx) = client.get_tx(&txid).await? {
-						if let Some(block_height) = tx_status.block_height {
-							// TODO: Switch to `get_header_by_hash` once released upstream (https://github.com/bitcoindevkit/rust-esplora-client/pull/17)
-							let block_header = client.get_header(block_height).await?;
+					if let Some(block_hash) = tx_status.block_hash {
+						if let Some(tx) = client.get_tx(&txid).await? {
+							let block_header = client.get_header_by_hash(&block_hash).await?;
 							if let Some(merkle_proof) = client.get_merkle_proof(&txid).await? {
-								if block_height == merkle_proof.block_height {
-									confirmed_txs.push((
-											tx,
-											block_height,
-											block_header,
-											merkle_proof.pos,
-											));
-									continue;
-								}
+								confirmed_txs.push((
+										tx,
+										merkle_proof.block_height,
+										block_header,
+										merkle_proof.pos,
+										));
+								continue;
 							}
 						}
 					}
@@ -175,19 +172,19 @@ where
 						if spending_tx_status.confirmed {
 							let spending_txid = output_status.txid.unwrap();
 							if let Some(spending_tx) = client.get_tx(&spending_txid).await? {
-								let block_height = spending_tx_status.block_height.unwrap();
-								// TODO: Switch to `get_header_by_hash` once released upstream (https://github.com/bitcoindevkit/rust-esplora-client/pull/17)
-								let block_header = client.get_header(block_height).await?;
-								if let Some(merkle_proof) =
-									client.get_merkle_proof(&spending_txid).await?
-								{
-									confirmed_txs.push((
-										spending_tx,
-										block_height,
-										block_header,
-										merkle_proof.pos,
-									));
-									continue;
+								if let Some(block_hash) = spending_tx_status.block_hash {
+									let block_header = client.get_header_by_hash(&block_hash).await?;
+									if let Some(merkle_proof) =
+										client.get_merkle_proof(&spending_txid).await?
+										{
+											confirmed_txs.push((
+													spending_tx,
+													merkle_proof.block_height,
+													block_header,
+													merkle_proof.pos,
+													));
+											continue;
+										}
 								}
 							}
 						}
@@ -315,9 +312,8 @@ where
 		self.queued_transactions.lock().unwrap().push(*txid);
 	}
 
-	fn register_output(&self, output: WatchedOutput) -> Option<(usize, Transaction)> {
+	fn register_output(&self, output: WatchedOutput) {
 		self.queued_outputs.lock().unwrap().push(output);
-		return None;
 	}
 }