From 502197d943d803820fc32e6d5c41cdf70cd38605 Mon Sep 17 00:00:00 2001 From: Antoine Riard Date: Fri, 20 Mar 2020 16:58:13 -0400 Subject: [PATCH] Remove useless local commitment txn signatures check_spend_local_transaction is tasked with detection of onchain local commitment transaction and generate HTLC transaction. Signing an already onchain tx isn't necessary. --- lightning/src/ln/channelmonitor.rs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lightning/src/ln/channelmonitor.rs b/lightning/src/ln/channelmonitor.rs index 717c1409..2ac113b9 100644 --- a/lightning/src/ln/channelmonitor.rs +++ b/lightning/src/ln/channelmonitor.rs @@ -1749,25 +1749,14 @@ impl ChannelMonitor { // HTLCs set may differ between last and previous local commitment txn, in case of one them hitting chain, ensure we cancel all HTLCs backward let mut is_local_tx = false; - if let &mut Some(ref mut local_tx) = &mut self.current_local_signed_commitment_tx { - if local_tx.txid == commitment_txid { - local_tx.tx.add_local_sig(&self.onchain_detection.keys.funding_key(), self.funding_redeemscript.as_ref().unwrap(), self.channel_value_satoshis.unwrap(), &self.secp_ctx); - } - } if let &Some(ref local_tx) = &self.current_local_signed_commitment_tx { if local_tx.txid == commitment_txid { is_local_tx = true; log_trace!(self, "Got latest local commitment tx broadcast, searching for available HTLCs to claim"); - assert!(local_tx.tx.has_local_sig()); let mut res = self.broadcast_by_local_state(local_tx); append_onchain_update!(res); } } - if let &mut Some(ref mut local_tx) = &mut self.prev_local_signed_commitment_tx { - if local_tx.txid == commitment_txid { - local_tx.tx.add_local_sig(&self.onchain_detection.keys.funding_key(), self.funding_redeemscript.as_ref().unwrap(), self.channel_value_satoshis.unwrap(), &self.secp_ctx); - } - } if let &Some(ref local_tx) = &self.prev_local_signed_commitment_tx { if local_tx.txid == commitment_txid { is_local_tx = true; -- 2.30.2