f Adjust confirmation targets and resulting fee rates

Author: tnull

src/event.rs

@@ -581,8 +581,9 @@ where
 				});
 
 				let output_descriptors = &outputs.iter().collect::<Vec<_>>();
-				let tx_feerate =
-					self.wallet.get_est_sat_per_1000_weight(ConfirmationTarget::OnChainSweep);
+				let tx_feerate = self
+					.wallet
+					.get_est_sat_per_1000_weight(ConfirmationTarget::NonAnchorChannelFee);
 
 				// We set nLockTime to the current height to discourage fee sniping.
 				let cur_height = self.channel_manager.current_best_block().height();

src/wallet.rs

@@ -126,25 +126,38 @@ where
 		];
 		for target in confirmation_targets {
 			let num_blocks = match target {
-				ConfirmationTarget::OnChainSweep => 3,
+				ConfirmationTarget::OnChainSweep => 6,
 				ConfirmationTarget::MaxAllowedNonAnchorChannelRemoteFee => 1,
 				ConfirmationTarget::MinAllowedAnchorChannelRemoteFee => 1008,
-				ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee => 12,
-				ConfirmationTarget::AnchorChannelFee => 12,
-				ConfirmationTarget::NonAnchorChannelFee => 6,
-				ConfirmationTarget::ChannelCloseMinimum => 12,
+				ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee => 144,
+				ConfirmationTarget::AnchorChannelFee => 1008,
+				ConfirmationTarget::NonAnchorChannelFee => 12,
+				ConfirmationTarget::ChannelCloseMinimum => 144,
 			};
 
 			let est_fee_rate = self.blockchain.estimate_fee(num_blocks).await;
 
 			match est_fee_rate {
 				Ok(rate) => {
-					locked_fee_rate_cache.insert(target, rate);
+					// LDK 0.0.118 introduced changes to the `ConfirmationTarget` semantics that
+					// require some post-estimation adjustments to the fee rates, which we do here.
+					let adjusted_fee_rate = match target {
+						ConfirmationTarget::MaxAllowedNonAnchorChannelRemoteFee => {
+							let really_high_prio = rate.as_sat_per_vb() * 10.0;
+							FeeRate::from_sat_per_vb(really_high_prio)
+						}
+						ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee => {
+							let slightly_less_than_background = rate.fee_wu(1000) - 250;
+							FeeRate::from_sat_per_kwu(slightly_less_than_background as f32)
+						}
+						_ => rate,
+					};
+					locked_fee_rate_cache.insert(target, adjusted_fee_rate);
 					log_trace!(
 						self.logger,
 						"Fee rate estimation updated for {:?}: {} sats/kwu",
 						target,
-						rate.fee_wu(1000)
+						adjusted_fee_rate.fee_wu(1000)
 					);
 				}
 				Err(e) => {