X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fchannelmonitor.rs;h=e16a533cb1d608102c91a0fce5e8d8792ab8493d;hb=5824e226cad67e32d5e8be71ebbb6f91a3fc2116;hp=a41d853311ce924f388eaa5efbbb2ceb79489a64;hpb=0fa67fb96c19290039eb424d40a05de92b7a3e02;p=rust-lightning

diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
index a41d8533..e16a533c 100644
--- a/lightning/src/chain/channelmonitor.rs
+++ b/lightning/src/chain/channelmonitor.rs
@@ -42,7 +42,7 @@ use crate::chain;
 use crate::chain::{BestBlock, WatchedOutput};
 use crate::chain::chaininterface::{BroadcasterInterface, FeeEstimator, LowerBoundedFeeEstimator};
 use crate::chain::transaction::{OutPoint, TransactionData};
-use crate::chain::keysinterface::{SpendableOutputDescriptor, StaticPaymentOutputDescriptor, DelayedPaymentOutputDescriptor, Sign, KeysInterface};
+use crate::chain::keysinterface::{SpendableOutputDescriptor, StaticPaymentOutputDescriptor, DelayedPaymentOutputDescriptor, Sign, SignerProvider, EntropySource};
 #[cfg(anchors)]
 use crate::chain::onchaintx::ClaimEvent;
 use crate::chain::onchaintx::OnchainTxHandler;
@@ -2325,6 +2325,17 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 					log_trace!(logger, "Updating ChannelMonitor: channel force closed, should broadcast: {}", should_broadcast);
 					self.lockdown_from_offchain = true;
 					if *should_broadcast {
+						// There's no need to broadcast our commitment transaction if we've seen one
+						// confirmed (even with 1 confirmation) as it'll be rejected as
+						// duplicate/conflicting.
+						let detected_funding_spend = self.funding_spend_confirmed.is_some() ||
+							self.onchain_events_awaiting_threshold_conf.iter().find(|event| match event.event {
+								OnchainEvent::FundingSpendConfirmation { .. } => true,
+								_ => false,
+							}).is_some();
+						if detected_funding_spend {
+							continue;
+						}
 						self.broadcast_latest_holder_commitment_txn(broadcaster, logger);
 						// If the channel supports anchor outputs, we'll need to emit an external
 						// event to be consumed such that a child transaction is broadcast with a
@@ -3693,7 +3704,7 @@ where
 
 const MAX_ALLOC_SIZE: usize = 64*1024;
 
-impl<'a, K: KeysInterface> ReadableArgs<&'a K>
+impl<'a, K: EntropySource + SignerProvider> ReadableArgs<&'a K>
 		for (BlockHash, ChannelMonitor<K::Signer>) {
 	fn read<R: io::Read>(reader: &mut R, keys_manager: &'a K) -> Result<Self, DecodeError> {
 		macro_rules! unwrap_obj {