f Account for new OutputSpendingFee confirmation target

Author: tnull

src/fee_estimator.rs

@@ -42,6 +42,7 @@ where
 			ConfirmationTarget::AnchorChannelFee,
 			ConfirmationTarget::NonAnchorChannelFee,
 			ConfirmationTarget::ChannelCloseMinimum,
+			ConfirmationTarget::OutputSpendingFee,
 		];
 		for target in confirmation_targets {
 			let num_blocks = match target {
@@ -51,6 +52,7 @@ where
 				ConfirmationTarget::AnchorChannelFee => 1008,
 				ConfirmationTarget::NonAnchorChannelFee => 12,
 				ConfirmationTarget::ChannelCloseMinimum => 144,
+				ConfirmationTarget::OutputSpendingFee => 12,
 			};
 
 			let estimates = self.esplora_client.get_fee_estimates().await.map_err(|e| {
@@ -119,6 +121,7 @@ where
 			ConfirmationTarget::AnchorChannelFee => 500,
 			ConfirmationTarget::NonAnchorChannelFee => 1000,
 			ConfirmationTarget::ChannelCloseMinimum => 500,
+			ConfirmationTarget::OutputSpendingFee => 1000,
 		};
 
 		// We'll fall back on this, if we really don't have any other information.

src/sweep.rs

@@ -314,7 +314,7 @@ where
 		&self, output_descriptors: &Vec<SpendableOutputDescriptor>, cur_height: u32,
 	) -> Result<Transaction, ()> {
 		let tx_feerate =
-			self.fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::NonAnchorChannelFee);
+			self.fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::OutputSpendingFee);
 
 		let destination_address = self.wallet.get_new_address().map_err(|e| {
 			log_error!(self.logger, "Failed to get destination address from wallet: {}", e);

src/wallet.rs

@@ -173,7 +173,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::NonAnchorChannelFee;
+		let confirmation_target = ConfirmationTarget::OutputSpendingFee;
 		let fee_rate = FeeRate::from_sat_per_kwu(
 			self.fee_estimator.get_est_sat_per_1000_weight(confirmation_target) as f32,
 		);