Add ConfirmationTarget::OutputSpendingFee

tnull · tnull · commit ec956516d1db · 2024-04-18T16:20:02.000+02:00
diff --git a/fuzz/src/chanmon_consistency.rs b/fuzz/src/chanmon_consistency.rs
@@ -84,7 +84,7 @@ impl FeeEstimator for FuzzEstimator {
 		// Background feerate which is <= the minimum Normal feerate.
 		match conf_target {
 			ConfirmationTarget::OnChainSweep => MAX_FEE,
-			ConfirmationTarget::ChannelCloseMinimum|ConfirmationTarget::AnchorChannelFee|ConfirmationTarget::MinAllowedAnchorChannelRemoteFee|ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee => 253,
+			ConfirmationTarget::ChannelCloseMinimum|ConfirmationTarget::AnchorChannelFee|ConfirmationTarget::MinAllowedAnchorChannelRemoteFee|ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee|ConfirmationTarget::OutputSpendingFee => 253,
 			ConfirmationTarget::NonAnchorChannelFee => cmp::min(self.ret_val.load(atomic::Ordering::Acquire), MAX_FEE),
 		}
 	}
diff --git a/lightning/src/chain/chaininterface.rs b/lightning/src/chain/chaininterface.rs
@@ -124,6 +124,8 @@ pub enum ConfirmationTarget {
 	///
 	/// [`ChannelManager::close_channel_with_feerate_and_script`]: crate::ln::channelmanager::ChannelManager::close_channel_with_feerate_and_script
 	ChannelCloseMinimum,
+	/// XXX
+	OutputSpendingFee,
 }
 
 /// A trait which should be implemented to provide feerate information on a number of time

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ impl FeeEstimator for FuzzEstimator {`
`84`	`84`	`// Background feerate which is <= the minimum Normal feerate.`
`85`	`85`	`match conf_target {`
`86`	`86`	`ConfirmationTarget::OnChainSweep => MAX_FEE,`
`87`		`- ConfirmationTarget::ChannelCloseMinimum\|ConfirmationTarget::AnchorChannelFee\|ConfirmationTarget::MinAllowedAnchorChannelRemoteFee\|ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee => 253,`
	`87`	`+ ConfirmationTarget::ChannelCloseMinimum\|ConfirmationTarget::AnchorChannelFee\|ConfirmationTarget::MinAllowedAnchorChannelRemoteFee\|ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee\|ConfirmationTarget::OutputSpendingFee => 253,`
`88`	`88`	`ConfirmationTarget::NonAnchorChannelFee => cmp::min(self.ret_val.load(atomic::Ordering::Acquire), MAX_FEE),`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,8 @@ pub enum ConfirmationTarget {`
`124`	`124`	`///`
`125`	`125`	/// [`ChannelManager::close_channel_with_feerate_and_script`]: crate::ln::channelmanager::ChannelManager::close_channel_with_feerate_and_script
`126`	`126`	`ChannelCloseMinimum,`
	`127`	`+ /// XXX`
	`128`	`+ OutputSpendingFee,`
`127`	`129`	`}`
`128`	`130`
`129`	`131`	`/// A trait which should be implemented to provide feerate information on a number of time`