Move SpendableOutputDescriptor for closing tx in is_mine

Author: Antoine Riard

lightning/src/ln/channelmonitor.rs

@@ -1873,31 +1873,6 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
 		(local_txn, (commitment_txid, watch_outputs))
 	}
 
-	/// Generate a spendable output event when closing_transaction get registered onchain.
-	fn check_spend_closing_transaction(&self, tx: &Transaction) -> Option<SpendableOutputDescriptor> {
-		if tx.input[0].sequence == 0xFFFFFFFF && !tx.input[0].witness.is_empty() && tx.input[0].witness.last().unwrap().len() == 71 {
-			match self.key_storage {
-				Storage::Local { ref shutdown_pubkey, .. } =>  {
-					let our_channel_close_key_hash = Hash160::hash(&shutdown_pubkey.serialize());
-					let shutdown_script = Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_close_key_hash[..]).into_script();
-					for (idx, output) in tx.output.iter().enumerate() {
-						if shutdown_script == output.script_pubkey {
-							return Some(SpendableOutputDescriptor::StaticOutput {
-								outpoint: BitcoinOutPoint { txid: tx.txid(), vout: idx as u32 },
-								output: output.clone(),
-							});
-						}
-					}
-				}
-				Storage::Watchtower { .. } => {
-					//TODO: we need to ensure an offline client will generate the event when it
-					// comes back online after only the watchtower saw the transaction
-				}
-			}
-		}
-		None
-	}
-
 	/// Used by ChannelManager deserialization to broadcast the latest local state if its copy of
 	/// the Channel was out-of-date. You may use it to get a broadcastable local toxic tx in case of
 	/// fallen-behind, i.e when receiving a channel_reestablish with a proof that our remote side knows
@@ -1988,11 +1963,6 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
 						}
 						claimable_outpoints.append(&mut new_outpoints);
 					}
-					if !funding_txo.is_none() && claimable_outpoints.is_empty() {
-						if let Some(spendable_output) = self.check_spend_closing_transaction(&tx) {
-							spendable_outputs.push(spendable_output);
-						}
-					}
 				} else {
 					if let Some(&(commitment_number, _)) = self.remote_commitment_txn_on_chain.get(&prevout.txid) {
 						let (mut new_outpoints, new_outputs_option) = self.check_spend_remote_htlc(&tx, commitment_number, height);
@@ -2323,6 +2293,20 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
 						output: outp.clone(),
 					});
 				}
+			} else {
+				match self.key_storage {
+					Storage::Local { ref shutdown_pubkey, .. } =>  {
+						let our_channel_close_key_hash = Hash160::hash(&shutdown_pubkey.serialize());
+						let shutdown_script = Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_close_key_hash[..]).into_script();
+						if shutdown_script == outp.script_pubkey {
+							return Some(SpendableOutputDescriptor::StaticOutput {
+								outpoint: BitcoinOutPoint { txid: tx.txid(), vout: i as u32 },
+								output: outp.clone(),
+							});
+						}
+					},
+					_ => {}
+				}
 			}
 		}
 		None