f Check for Protocol error also when confirming transactions

Author: tnull

lightning-transaction-sync/src/electrum.rs

@@ -213,16 +213,25 @@ where
 		let mut watched_txs = Vec::with_capacity(sync_state.watched_transactions.len());
 
 		for txid in &sync_state.watched_transactions {
-			if let Ok(tx) = self.client.transaction_get(&txid) {
-				watched_txs.push((txid, tx.clone()));
-				if let Some(tx_out) = tx.output.first() {
-					// We watch an arbitrary output of the transaction of interest in order to
-					// retrieve the associated script history, before narrowing down our search
-					// through `filter`ing by `txid` below.
-					watched_script_pubkeys.push(tx_out.script_pubkey.clone());
-				} else {
-					debug_assert!(false, "Failed due to retrieving invalid tx data.");
-					log_error!(self.logger, "Failed due to retrieving invalid tx data.");
+			match self.client.transaction_get(&txid) {
+				Ok(tx) => {
+					watched_txs.push((txid, tx.clone()));
+					if let Some(tx_out) = tx.output.first() {
+						// We watch an arbitrary output of the transaction of interest in order to
+						// retrieve the associated script history, before narrowing down our search
+						// through `filter`ing by `txid` below.
+						watched_script_pubkeys.push(tx_out.script_pubkey.clone());
+					} else {
+						debug_assert!(false, "Failed due to retrieving invalid tx data.");
+						log_error!(self.logger, "Failed due to retrieving invalid tx data.");
+						return Err(InternalError::Failed);
+					}
+				}
+				Err(electrum_client::Error::Protocol(_)) => {
+					// We couldn't find the tx, do nothing.
+				}
+				Err(e) => {
+					log_error!(self.logger, "Failed to look up transaction {}: {}.", txid, e);
 					return Err(InternalError::Failed);
 				}
 			}