f correctly figure out the to-self value

Author: TheBlueMatt

lightning/src/chain/channelmonitor.rs

@@ -1361,17 +1361,15 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 		let us = self.inner.lock().unwrap();
 
 		let mut confirmed_txid = us.funding_spend_confirmed;
+		let mut pending_commitment_tx_conf_thresh = None;
 		if let Some((txid, conf_thresh)) = us.onchain_events_awaiting_threshold_conf.iter().find_map(|event| {
 			if let OnchainEvent::FundingSpendConfirmation { txid, .. } = event.event {
 				Some((txid, event.confirmation_threshold()))
 			} else { None }
 		}) {
 			debug_assert!(us.funding_spend_confirmed.is_none(), "We have a pending funding spend awaiting confirmation, we can't have confirmed it already!");
 			confirmed_txid = Some(txid);
-			res.push(ClaimableBalance::ClaimableAwaitingConfirmations {
-				claimable_amount_satoshis: us.current_holder_commitment_tx.to_self_value_sat,
-				confirmation_height: conf_thresh,
-			});
+			pending_commitment_tx_conf_thresh = Some(conf_thresh);
 		}
 
 		macro_rules! walk_htlcs {
@@ -1410,19 +1408,65 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 		}
 
 		if let Some(txid) = confirmed_txid {
+			let mut found_commitment_tx = false;
 			if Some(txid) == us.current_counterparty_commitment_txid || Some(txid) == us.prev_counterparty_commitment_txid {
 				walk_htlcs!(false, us.counterparty_claimable_outpoints.get(&txid).unwrap().iter().map(|(a, _)| a));
+				if let Some(conf_thresh) = pending_commitment_tx_conf_thresh {
+					if let Some(value) = us.onchain_events_awaiting_threshold_conf.iter().find_map(|event| {
+						if let OnchainEvent::MaturingOutput {
+							descriptor: SpendableOutputDescriptor::StaticPaymentOutput(descriptor)
+						} = &event.event {
+							Some(descriptor.output.value)
+						} else { None }
+					}) {
+						res.push(ClaimableBalance::ClaimableAwaitingConfirmations {
+							claimable_amount_satoshis: value,
+							confirmation_height: conf_thresh,
+						});
+					} else {
+						// If a counterparty commitment transaction is awaiting confirmation, we
+						// should also have a StaticPaymentOutput MaturingOutput event awaiting
+						// confirmation with the same height. Not having one implies something has
+						// gone terribly wrong with our commitment txid tracking.
+						debug_assert!(false);
+					}
+				}
+				found_commitment_tx = true;
 			} else if txid == us.current_holder_commitment_tx.txid {
 				walk_htlcs!(true, us.current_holder_commitment_tx.htlc_outputs.iter().map(|(a, _, _)| a));
+				if let Some(conf_thresh) = pending_commitment_tx_conf_thresh {
+					res.push(ClaimableBalance::ClaimableAwaitingConfirmations {
+						claimable_amount_satoshis: us.current_holder_commitment_tx.to_self_value_sat,
+						confirmation_height: conf_thresh,
+					});
+				}
+				found_commitment_tx = true;
 			} else if let Some(prev_commitment) = &us.prev_holder_signed_commitment_tx {
 				if txid == prev_commitment.txid {
 					walk_htlcs!(true, prev_commitment.htlc_outputs.iter().map(|(a, _, _)| a));
+					if let Some(conf_thresh) = pending_commitment_tx_conf_thresh {
+						res.push(ClaimableBalance::ClaimableAwaitingConfirmations {
+							claimable_amount_satoshis: prev_commitment.to_self_value_sat,
+							confirmation_height: conf_thresh,
+						});
+					}
+					found_commitment_tx = true;
+				}
+			}
+			if !found_commitment_tx {
+				if let Some(conf_thresh) = pending_commitment_tx_conf_thresh {
+					// We blindly assume this is a cooperative close transaction here, and that the
+					// counterparty didn't misbehave. At worst we've over-estimated the amount we can
+					// claim as we'll punish a misbehaving counterparty (as long as we didn't
+					// misbehave).
+					res.push(ClaimableBalance::ClaimableAwaitingConfirmations {
+						claimable_amount_satoshis: us.current_holder_commitment_tx.to_self_value_sat,
+						confirmation_height: conf_thresh,
+					});
 				}
 			}
 			// TODO: Add logic to provide claimable balances for counterparty broadcasting revoked
 			// outputs.
-			// Otherwise assume we closed with a cooperative close which only needs the
-			// `ClaimableAwaitingConfirmations` balance pushed first.
 		} else {
 			let mut claimable_inbound_htlc_value_sat = 0;
 			for (htlc, _, _) in us.current_holder_commitment_tx.htlc_outputs.iter() {