Add deadline height to UrgentOnChainSweep

fuzz/src/chanmon_consistency.rs

@@ -98,7 +98,7 @@ impl FeeEstimator for FuzzEstimator {
 		// always return a HighPriority feerate here which is >= the maximum Normal feerate and a
 		// Background feerate which is <= the minimum Normal feerate.
 		match conf_target {
-			ConfirmationTarget::MaximumFeeEstimate | ConfirmationTarget::UrgentOnChainSweep => {
+			ConfirmationTarget::MaximumFeeEstimate | ConfirmationTarget::UrgentOnChainSweep(_) => {
 				MAX_FEE
 			},
 			ConfirmationTarget::ChannelCloseMinimum

lightning/src/chain/chaininterface.rs

@@ -61,7 +61,9 @@ pub enum ConfirmationTarget {
 	/// Generally we have in the high tens to low hundreds of blocks to get our transaction
 	/// on-chain (it doesn't have to happen in the next few blocks!), but we shouldn't risk too low
 	/// a fee - this should be a relatively high priority feerate.
-	UrgentOnChainSweep,
+	///
+	/// If a target confirmation height is known, it can be set as the parameter.
+	UrgentOnChainSweep(Option<u32>),
 	/// This is the lowest feerate we will allow our channel counterparty to have in an anchor
 	/// channel in order to close the channel if a channel party goes away.
 	///

lightning/src/chain/channelmonitor.rs

@@ -2744,19 +2744,32 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 		// Treat the sweep as urgent as long as there is at least one HTLC which is pending on a
 		// valid commitment transaction.
 		if !self.current_holder_commitment_tx.htlc_outputs.is_empty() {
-			return ConfirmationTarget::UrgentOnChainSweep;
+			let minimum_expiry = self.current_holder_commitment_tx.htlc_outputs
+				.iter()
+				.map(|o| o.0.cltv_expiry)
+				.min();
+			return ConfirmationTarget::UrgentOnChainSweep(minimum_expiry);
 		}
 		if self.prev_holder_signed_commitment_tx.as_ref().map(|t| !t.htlc_outputs.is_empty()).unwrap_or(false) {
-			return ConfirmationTarget::UrgentOnChainSweep;
+			let minimum_expiry = self.prev_holder_signed_commitment_tx.as_ref().map(|t| t.htlc_outputs
+				.iter()
+				.map(|o| o.0.cltv_expiry)
+				.min()
+			).flatten();
+			return ConfirmationTarget::UrgentOnChainSweep(minimum_expiry);
 		}
 		if let Some(txid) = self.current_counterparty_commitment_txid {
-			if !self.counterparty_claimable_outpoints.get(&txid).unwrap().is_empty() {
-				return ConfirmationTarget::UrgentOnChainSweep;
+			let claimable_outpoints = self.counterparty_claimable_outpoints.get(&txid).unwrap();
+			if !claimable_outpoints.is_empty() {
+				let minimum_expiry = claimable_outpoints.iter().map(|o|o.0.cltv_expiry).min();
+				return ConfirmationTarget::UrgentOnChainSweep(minimum_expiry);
 			}
 		}
 		if let Some(txid) = self.prev_counterparty_commitment_txid {
-			if !self.counterparty_claimable_outpoints.get(&txid).unwrap().is_empty() {
-				return ConfirmationTarget::UrgentOnChainSweep;
+			let claimable_outpoints = self.counterparty_claimable_outpoints.get(&txid).unwrap();
+			if !claimable_outpoints.is_empty() {
+				let minimum_expiry = claimable_outpoints.iter().map(|o|o.0.cltv_expiry).min();
+				return ConfirmationTarget::UrgentOnChainSweep(minimum_expiry);
 			}
 		}
 		ConfirmationTarget::OutputSpendingFee

lightning/src/chain/onchaintx.rs

@@ -1417,7 +1417,7 @@ mod tests {
 			1,
 			1,
 			&&broadcaster,
-			ConfirmationTarget::UrgentOnChainSweep,
+			ConfirmationTarget::UrgentOnChainSweep(Some(2)),
 			&fee_estimator,
 			&logger,
 		);
@@ -1440,7 +1440,7 @@ mod tests {
 			2,
 			2,
 			&&broadcaster,
-			ConfirmationTarget::UrgentOnChainSweep,
+			ConfirmationTarget::UrgentOnChainSweep(Some(3)),
 			&fee_estimator,
 			&logger,
 		);

lightning/src/chain/package.rs

@@ -1689,7 +1689,7 @@ mod tests {
 		let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 		let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);
 		let fee_rate_strategy = FeerateStrategy::ForceBump;
-		let confirmation_target = ConfirmationTarget::UrgentOnChainSweep;
+		let confirmation_target = ConfirmationTarget::UrgentOnChainSweep(None);
 
 		{
 			// Check underflow doesn't occur

lightning/src/ln/monitor_tests.rs

@@ -2556,7 +2556,7 @@ fn do_test_yield_anchors_events(have_htlcs: bool) {
 	// Note that if we use the wrong target, we will immediately broadcast the commitment
 	// transaction as no bump is required.
 	if have_htlcs {
-		nodes[0].fee_estimator.target_override.lock().unwrap().insert(ConfirmationTarget::UrgentOnChainSweep, 500);
+		nodes[0].fee_estimator.target_override.lock().unwrap().insert(ConfirmationTarget::UrgentOnChainSweep(Some(81)), 500);
 	} else {
 		nodes[0].fee_estimator.target_override.lock().unwrap().insert(ConfirmationTarget::OutputSpendingFee, 500);
 	}