f Simplify get_unconfirmed_transactions

.. now that we have the height to check.

Author: tnull

lightning-transaction-sync/src/electrum.rs

@@ -326,36 +326,16 @@ where
 		let relevant_txids = confirmables
 			.iter()
 			.flat_map(|c| c.get_relevant_txids())
-			.collect::<HashSet<(Txid, Option<BlockHash>)>>();
+			.collect::<HashSet<(Txid, u32, Option<BlockHash>)>>();
 
 		let mut unconfirmed_txs = Vec::new();
 
-		for (txid, block_hash_opt) in relevant_txids {
+		for (txid, conf_height, block_hash_opt) in relevant_txids {
 			if let Some(block_hash) = block_hash_opt {
-				match self.client.transaction_get(&txid) {
-					Ok(tx) => {
-						if let Some(tx_out) = tx.output.first() {
-							let script_history = self.client.script_get_history(&tx_out.script_pubkey)?;
-							if let Some(history) = script_history.iter()
-								.filter(|h| h.tx_hash == txid).max_by_key(|x| x.height)
-							{
-								let prob_conf_height = history.height;
-								let block_header = self.client.block_header(
-									prob_conf_height as usize)?;
-								if block_header.block_hash() == block_hash {
-									// Skip if the tx is still confirmed in the block in question.
-									continue;
-								}
-							}
-						}
-					}
-					Err(electrum_client::Error::Protocol(_)) => {
-						// We couldn't find the tx, unconfirming..
-					}
-					Err(e) => {
-						log_error!(self.logger, "Failed to look up transaction {}: {}.", txid, e);
-						return Err(InternalError::Failed);
-					}
+				let block_header = self.client.block_header(conf_height as usize)?;
+				if block_header.block_hash() == block_hash {
+					// Skip if the tx is still confirmed in the block in question.
+					continue;
 				}
 
 				unconfirmed_txs.push(txid);