f Account for new ConfirmationTargets

Author: tnull

src/event.rs

@@ -287,7 +287,7 @@ where
 			} => {
 				// Construct the raw transaction with the output that is paid the amount of the
 				// channel.
-				let confirmation_target = ConfirmationTarget::Normal;
+				let confirmation_target = ConfirmationTarget::NonAnchorChannelFee;
 
 				// We set nLockTime to the current height to discourage fee sniping.
 				let cur_height = self.channel_manager.current_best_block().height();
@@ -582,7 +582,7 @@ where
 
 				let output_descriptors = &outputs.iter().collect::<Vec<_>>();
 				let tx_feerate =
-					self.wallet.get_est_sat_per_1000_weight(ConfirmationTarget::Normal);
+					self.wallet.get_est_sat_per_1000_weight(ConfirmationTarget::OnChainSweep);
 
 				// We set nLockTime to the current height to discourage fee sniping.
 				let cur_height = self.channel_manager.current_best_block().height();

src/wallet.rs

@@ -116,17 +116,23 @@ where
 		let mut locked_fee_rate_cache = self.fee_rate_cache.write().unwrap();
 
 		let confirmation_targets = vec![
-			ConfirmationTarget::MempoolMinimum,
-			ConfirmationTarget::Background,
-			ConfirmationTarget::Normal,
-			ConfirmationTarget::HighPriority,
+			ConfirmationTarget::OnChainSweep,
+			ConfirmationTarget::MaxAllowedNonAnchorChannelRemoteFee,
+			ConfirmationTarget::MinAllowedAnchorChannelRemoteFee,
+			ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee,
+			ConfirmationTarget::AnchorChannelFee,
+			ConfirmationTarget::NonAnchorChannelFee,
+			ConfirmationTarget::ChannelCloseMinimum,
 		];
 		for target in confirmation_targets {
 			let num_blocks = match target {
-				ConfirmationTarget::MempoolMinimum => 1008,
-				ConfirmationTarget::Background => 12,
-				ConfirmationTarget::Normal => 6,
-				ConfirmationTarget::HighPriority => 3,
+				ConfirmationTarget::OnChainSweep => 3,
+				ConfirmationTarget::MaxAllowedNonAnchorChannelRemoteFee => 1,
+				ConfirmationTarget::MinAllowedAnchorChannelRemoteFee => 1008,
+				ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee => 12,
+				ConfirmationTarget::AnchorChannelFee => 12,
+				ConfirmationTarget::NonAnchorChannelFee => 6,
+				ConfirmationTarget::ChannelCloseMinimum => 12,
 			};
 
 			let est_fee_rate = self.blockchain.estimate_fee(num_blocks).await;
@@ -211,7 +217,7 @@ where
 	pub(crate) fn send_to_address(
 		&self, address: &bitcoin::Address, amount_msat_or_drain: Option<u64>,
 	) -> Result<Txid, Error> {
-		let confirmation_target = ConfirmationTarget::Normal;
+		let confirmation_target = ConfirmationTarget::NonAnchorChannelFee;
 		let fee_rate = self.estimate_fee_rate(confirmation_target);
 
 		let tx = {
@@ -284,10 +290,13 @@ where
 		let locked_fee_rate_cache = self.fee_rate_cache.read().unwrap();
 
 		let fallback_sats_kwu = match confirmation_target {
-			ConfirmationTarget::MempoolMinimum => FEERATE_FLOOR_SATS_PER_KW,
-			ConfirmationTarget::Background => 500,
-			ConfirmationTarget::Normal => 2000,
-			ConfirmationTarget::HighPriority => 5000,
+			ConfirmationTarget::OnChainSweep => 5000,
+			ConfirmationTarget::MaxAllowedNonAnchorChannelRemoteFee => 25 * 250,
+			ConfirmationTarget::MinAllowedAnchorChannelRemoteFee => FEERATE_FLOOR_SATS_PER_KW,
+			ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee => FEERATE_FLOOR_SATS_PER_KW,
+			ConfirmationTarget::AnchorChannelFee => 500,
+			ConfirmationTarget::NonAnchorChannelFee => 1000,
+			ConfirmationTarget::ChannelCloseMinimum => 500,
 		};
 
 		// We'll fall back on this, if we really don't have any other information.