f Also do last-minute check for unconfirmations

Author: tnull

lightning-transaction-sync/src/esplora.rs

@@ -106,8 +106,18 @@ where
 				// Update the known tip to the newest one.
 				if tip_is_new {
 					// First check for any unconfirmed transactions and act on it immediately.
-					match maybe_await!(self.sync_unconfirmed_transactions(&mut sync_state, &confirmables)) {
-						Ok(()) => {},
+					match maybe_await!(self.get_unconfirmed_transactions(&confirmables)) {
+						Ok(unconfirmed_txs) => {
+							// Double-check the tip hash. If if it changed, a reorg happened since
+							// we started syncing and we need to restart last-minute.
+							let check_tip_hash = maybe_await!(self.client.get_tip_hash())?;
+							if check_tip_hash != tip_hash {
+								tip_hash = check_tip_hash;
+								continue;
+							}
+
+							self.sync_unconfirmed_transactions(&mut sync_state, &confirmables, unconfirmed_txs);
+						},
 						Err(err) => {
 							// (Semi-)permanent failure, retry later.
 							log_error!(self.logger, "Failed during transaction sync, aborting.");
@@ -301,34 +311,42 @@ where
 	}
 
 	#[maybe_async]
-	fn sync_unconfirmed_transactions(
-		&self, sync_state: &mut SyncState, confirmables: &Vec<&(dyn Confirm + Sync + Send)>,
-	) -> Result<(), InternalError> {
+	fn get_unconfirmed_transactions(
+		&self, confirmables: &Vec<&(dyn Confirm + Sync + Send)>,
+	) -> Result<Vec<Txid>, InternalError> {
 		// Query the interface for relevant txids and check whether the relevant blocks are still
-		// in the best chain, mark them unconfirmed otherwise. If the transactions have been
-		// reconfirmed in another block, we'll confirm them in the next sync iteration.
+		// in the best chain, mark them unconfirmed otherwise
 		let relevant_txids = confirmables
 			.iter()
 			.flat_map(|c| c.get_relevant_txids())
 			.collect::<HashSet<(Txid, Option<BlockHash>)>>();
 
+		let mut unconfirmed_txs = Vec::new();
+
 		for (txid, block_hash_opt) in relevant_txids {
 			if let Some(block_hash) = block_hash_opt {
 				let block_status = maybe_await!(self.client.get_block_status(&block_hash))?;
 				if block_status.in_best_chain {
 					// Skip if the block in question is still confirmed.
 					continue;
 				}
+
+				unconfirmed_txs.push(txid);
 			}
+		}
+		Ok(unconfirmed_txs)
+	}
 
+	fn sync_unconfirmed_transactions(
+		&self, sync_state: &mut SyncState, confirmables: &Vec<&(dyn Confirm + Sync + Send)>, unconfirmed_txs: Vec<Txid>,
+	) {
+		for txid in unconfirmed_txs {
 			for c in confirmables {
 				c.transaction_unconfirmed(&txid);
 			}
 
 			sync_state.watched_transactions.insert(txid);
 		}
-
-		Ok(())
 	}
 
 	/// Returns a reference to the underlying esplora client.