Skip to content

Commit 0f11c17

Browse files
committed
More flexible fee rate estimates
1 parent 2c51080 commit 0f11c17

File tree

8 files changed

+112
-82
lines changed

8 files changed

+112
-82
lines changed

fuzz/src/chanmon_consistency.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,10 @@ impl FeeEstimator for FuzzEstimator {
8080
// always return a HighPriority feerate here which is >= the maximum Normal feerate and a
8181
// Background feerate which is <= the minimum Normal feerate.
8282
match conf_target {
83-
ConfirmationTarget::HighPriority => MAX_FEE,
84-
ConfirmationTarget::Background|ConfirmationTarget::MempoolMinimum => 253,
85-
ConfirmationTarget::Normal => cmp::min(self.ret_val.load(atomic::Ordering::Acquire), MAX_FEE),
83+
ConfirmationTarget::MaxAllowedNonAnchorChannelRemoteFee => MAX_FEE * 10,
84+
ConfirmationTarget::OnChainSweep => MAX_FEE,
85+
ConfirmationTarget::ChannelCloseMinimum|ConfirmationTarget::AnchorChannelFee|ConfirmationTarget::MinAllowedAnchorChannelRemoteFee|ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee => 253,
86+
ConfirmationTarget::NonAnchorChannelFee => cmp::min(self.ret_val.load(atomic::Ordering::Acquire), MAX_FEE),
8687
}
8788
}
8889
}

lightning/src/chain/chaininterface.rs

+58-16
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,63 @@ pub trait BroadcasterInterface {
4848
/// estimation.
4949
#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
5050
pub enum ConfirmationTarget {
51-
/// We'd like a transaction to confirm in the future, but don't want to commit most of the fees
52-
/// required to do so yet. The remaining fees will come via a Child-Pays-For-Parent (CPFP) fee
53-
/// bump of the transaction.
51+
/// We have some funds available on chain which we need to spend prior to some expiry time at
52+
/// which point our counterparty may be able to steal them. Generally we have in the high tens to low hundreds of blocks
53+
/// to get our transaction on-chain, but we shouldn't risk too low a fee - this should be a relatively high priority
54+
/// feerate.
55+
OnChainSweep,
56+
/// The highest fee rate we will allow our channel counterparty to have in a non-anchor channel.
5457
///
55-
/// The feerate returned should be the absolute minimum feerate required to enter most node
56-
/// mempools across the network. Note that if you are not able to obtain this feerate estimate,
57-
/// you should likely use the furthest-out estimate allowed by your fee estimator.
58-
MempoolMinimum,
59-
/// We are happy with a transaction confirming slowly, at least within a day or so worth of
60-
/// blocks.
61-
Background,
62-
/// We'd like a transaction to confirm without major delayed, i.e., within the next 12-24 blocks.
63-
Normal,
64-
/// We'd like a transaction to confirm in the next few blocks.
65-
HighPriority,
58+
/// This is the feerate on the transaction which we (or our counterparty) will broadcast in order to
59+
/// close the channel if a channel party goes away. Because our counterparty must ensure they can
60+
/// always broadcast the latest state, this value being too low will cause immediate force-closures.
61+
///
62+
/// Allowing this value to be too high can allow our counterparty to burn our HTLC outputs to dust, which
63+
/// can result in HTLCs failing or force-closures (when the dust HTLCs exceed
64+
/// [`ChannelConfig::max_dust_htlc_exposure`]).
65+
///
66+
/// Because most nodes use a feerate estimate which is based on a relatively high priority transaction
67+
/// entering the current mempool, setting this to a small multiple of your current high priority feerate estimate
68+
/// should suffice.
69+
///
70+
/// [`ChannelConfig::max_dust_htlc_exposure`]: crate::ln::channelmanager::ChannelConfig::max_dust_htlc_exposure
71+
MaxAllowedNonAnchorChannelRemoteFee,
72+
/// This needs to be sufficient to get into the mempool/get confirmed when the channel needs to
73+
/// be force-closed. Setting too low may result in force-closures. Because this is for anchor
74+
/// channels, it can be a low value as we can always bump the fee rate later.
75+
///
76+
/// A good estimate is the expected mempool minimum at the time of force-closure.
77+
MinAllowedAnchorChannelRemoteFee,
78+
/// The lowest fee rate we will allow our channel counterparty to have in a non-anchor channel.
79+
/// This needs to be sufficient to get into the mempool/get confirmed when the channel needs to
80+
/// be force-closed. Setting too low may result in force-closures.
81+
///
82+
/// A good estimate is at least within a day (144) or so worth of blocks.
83+
MinAllowedNonAnchorChannelRemoteFee,
84+
/// Fee rate to use for anchor channels. This is safe to be the mempool minimum when the channel
85+
/// needs to be force-closed.
86+
///
87+
/// This is the feerate for the pre-signed transactions which we will broadcast in the event of
88+
/// a force-closure, and needs to be sufficient at that time.
89+
AnchorChannelFee,
90+
/// Lightning is built around the ability to broadcast a transaction in the future to close our channel
91+
/// and claim all pending funds. In order to do so, pre-anchor channels are built with transactions which
92+
/// we need to be able to broadcast at some point in the future.
93+
///
94+
/// This feerate represents the fee we pick now, which must be sufficient to enter a block at an arbitrary
95+
/// time in the future. Obviously this is not an estimate which is very easy to calculate, so most lightning
96+
/// nodes use some relatively high-priority feerate using the current mempool. This leaves channels
97+
/// subject to being unable to close if feerates rise, and in general you should prefer anchor channels to
98+
/// ensure you can increase the feerate when the transactions need broadcasting.
99+
NonAnchorChannelFee,
100+
/// When cooperative closing channel, the minimum fee rate we will accept. Recommended at least
101+
/// within a day or so worth of blocks.
102+
///
103+
/// This will also be used when initiating a cooperative close of a channel. When closing a channel
104+
/// you can override this fee by using [`ChannelManager::close_channel_with_feerate_and_script`].
105+
///
106+
/// [`ChannelManager::close_channel_with_feerate_and_script`]: crate::ln::channelmanager::ChannelManager::close_channel_with_feerate_and_script
107+
ChannelCloseMinimum,
66108
}
67109

68110
/// A trait which should be implemented to provide feerate information on a number of time
@@ -135,7 +177,7 @@ mod tests {
135177
let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
136178
let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);
137179

138-
assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::Background), FEERATE_FLOOR_SATS_PER_KW);
180+
assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), FEERATE_FLOOR_SATS_PER_KW);
139181
}
140182

141183
#[test]
@@ -144,6 +186,6 @@ mod tests {
144186
let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
145187
let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);
146188

147-
assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::Background), sat_per_kw);
189+
assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), sat_per_kw);
148190
}
149191
}

lightning/src/chain/onchaintx.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
580580
if cached_request.is_malleable() {
581581
if cached_request.requires_external_funding() {
582582
let target_feerate_sat_per_1000_weight = cached_request.compute_package_feerate(
583-
fee_estimator, ConfirmationTarget::HighPriority, force_feerate_bump
583+
fee_estimator, ConfirmationTarget::OnChainSweep, force_feerate_bump
584584
);
585585
if let Some(htlcs) = cached_request.construct_malleable_package_with_external_funding(self) {
586586
return Some((
@@ -631,7 +631,7 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
631631
debug_assert_eq!(tx.txid(), self.holder_commitment.trust().txid(),
632632
"Holder commitment transaction mismatch");
633633

634-
let conf_target = ConfirmationTarget::HighPriority;
634+
let conf_target = ConfirmationTarget::OnChainSweep;
635635
let package_target_feerate_sat_per_1000_weight = cached_request
636636
.compute_package_feerate(fee_estimator, conf_target, force_feerate_bump);
637637
if let Some(input_amount_sat) = output.funding_amount {

lightning/src/chain/package.rs

+7-22
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use crate::ln::PaymentPreimage;
2424
use crate::ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment};
2525
use crate::ln::chan_utils;
2626
use crate::ln::msgs::DecodeError;
27-
use crate::chain::chaininterface::{FeeEstimator, ConfirmationTarget, MIN_RELAY_FEE_SAT_PER_1000_WEIGHT};
27+
use crate::chain::chaininterface::{FeeEstimator, ConfirmationTarget, MIN_RELAY_FEE_SAT_PER_1000_WEIGHT, compute_feerate_sat_per_1000_weight};
2828
use crate::sign::WriteableEcdsaChannelSigner;
2929
use crate::chain::onchaintx::{ExternalHTLCClaim, OnchainTxHandler};
3030
use crate::util::logger::Logger;
@@ -1111,30 +1111,15 @@ fn compute_fee_from_spent_amounts<F: Deref, L: Deref>(input_amounts: u64, predic
11111111
where F::Target: FeeEstimator,
11121112
L::Target: Logger,
11131113
{
1114-
let mut updated_feerate = fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::HighPriority) as u64;
1115-
let mut fee = updated_feerate * (predicted_weight as u64) / 1000;
1114+
let sweep_feerate = fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::OnChainSweep);
1115+
let fee_rate = cmp::min(sweep_feerate, compute_feerate_sat_per_1000_weight(input_amounts / 2, predicted_weight as u64)) as u64;
1116+
let fee = fee_rate * (predicted_weight as u64) / 1000;
11161117
if input_amounts <= fee {
1117-
updated_feerate = fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::Normal) as u64;
1118-
fee = updated_feerate * (predicted_weight as u64) / 1000;
1119-
if input_amounts <= fee {
1120-
updated_feerate = fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::Background) as u64;
1121-
fee = updated_feerate * (predicted_weight as u64) / 1000;
1122-
if input_amounts <= fee {
1123-
log_error!(logger, "Failed to generate an on-chain punishment tx as even low priority fee ({} sat) was more than the entire claim balance ({} sat)",
1118+
log_error!(logger, "Failed to generate an on-chain punishment tx as even low priority fee ({} sat) was more than the entire claim balance ({} sat)",
11241119
fee, input_amounts);
1125-
None
1126-
} else {
1127-
log_warn!(logger, "Used low priority fee for on-chain punishment tx as high priority fee was more than the entire claim balance ({} sat)",
1128-
input_amounts);
1129-
Some((fee, updated_feerate))
1130-
}
1131-
} else {
1132-
log_warn!(logger, "Used medium priority fee for on-chain punishment tx as high priority fee was more than the entire claim balance ({} sat)",
1133-
input_amounts);
1134-
Some((fee, updated_feerate))
1135-
}
1120+
None
11361121
} else {
1137-
Some((fee, updated_feerate))
1122+
Some((fee, fee_rate))
11381123
}
11391124
}
11401125

lightning/src/ln/channel.rs

+12-14
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
11681168
match self.config.options.max_dust_htlc_exposure {
11691169
MaxDustHTLCExposure::FeeRateMultiplier(multiplier) => {
11701170
let feerate_per_kw = fee_estimator.bounded_sat_per_1000_weight(
1171-
ConfirmationTarget::HighPriority);
1171+
ConfirmationTarget::OnChainSweep);
11721172
feerate_per_kw as u64 * multiplier
11731173
},
11741174
MaxDustHTLCExposure::FixedLimitMsat(limit) => limit,
@@ -2155,21 +2155,17 @@ impl<SP: Deref> Channel<SP> where
21552155
// apply to channels supporting anchor outputs since HTLC transactions are pre-signed with a
21562156
// zero fee, so their fee is no longer considered to determine dust limits.
21572157
if !channel_type.supports_anchors_zero_fee_htlc_tx() {
2158-
let upper_limit = cmp::max(250 * 25,
2159-
fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::HighPriority) as u64 * 10);
2158+
let upper_limit =
2159+
fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::MaxAllowedNonAnchorChannelRemoteFee) as u64;
21602160
if feerate_per_kw as u64 > upper_limit {
21612161
return Err(ChannelError::Close(format!("Peer's feerate much too high. Actual: {}. Our expected upper limit: {}", feerate_per_kw, upper_limit)));
21622162
}
21632163
}
21642164

2165-
// We can afford to use a lower bound with anchors than previously since we can now bump
2166-
// fees when broadcasting our commitment. However, we must still make sure we meet the
2167-
// minimum mempool feerate, until package relay is deployed, such that we can ensure the
2168-
// commitment transaction propagates throughout node mempools on its own.
21692165
let lower_limit_conf_target = if channel_type.supports_anchors_zero_fee_htlc_tx() {
2170-
ConfirmationTarget::MempoolMinimum
2166+
ConfirmationTarget::MinAllowedAnchorChannelRemoteFee
21712167
} else {
2172-
ConfirmationTarget::Background
2168+
ConfirmationTarget::MinAllowedNonAnchorChannelRemoteFee
21732169
};
21742170
let lower_limit = fee_estimator.bounded_sat_per_1000_weight(lower_limit_conf_target);
21752171
// Some fee estimators round up to the next full sat/vbyte (ie 250 sats per kw), causing
@@ -4155,8 +4151,10 @@ impl<SP: Deref> Channel<SP> where
41554151
// Propose a range from our current Background feerate to our Normal feerate plus our
41564152
// force_close_avoidance_max_fee_satoshis.
41574153
// If we fail to come to consensus, we'll have to force-close.
4158-
let mut proposed_feerate = fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::Background);
4159-
let normal_feerate = fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::Normal);
4154+
let mut proposed_feerate = fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::ChannelCloseMinimum);
4155+
// Use NonAnchorChannelFee because this should be an estimate for a channel close
4156+
// that we don't expect to be need fee bumping
4157+
let normal_feerate = fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::NonAnchorChannelFee);
41604158
let mut proposed_max_feerate = if self.context.is_outbound() { normal_feerate } else { u32::max_value() };
41614159

41624160
// The spec requires that (when the channel does not have anchors) we only send absolute
@@ -5727,9 +5725,9 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
57275725
debug_assert!(channel_type.is_subset(&channelmanager::provided_channel_type_features(&config)));
57285726

57295727
let commitment_conf_target = if channel_type.supports_anchors_zero_fee_htlc_tx() {
5730-
ConfirmationTarget::MempoolMinimum
5728+
ConfirmationTarget::AnchorChannelFee
57315729
} else {
5732-
ConfirmationTarget::Normal
5730+
ConfirmationTarget::NonAnchorChannelFee
57335731
};
57345732
let commitment_feerate = fee_estimator.bounded_sat_per_1000_weight(commitment_conf_target);
57355733

@@ -6019,7 +6017,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
60196017
// whatever reason.
60206018
if self.context.channel_type.supports_anchors_zero_fee_htlc_tx() {
60216019
self.context.channel_type.clear_anchors_zero_fee_htlc_tx();
6022-
self.context.feerate_per_kw = fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::Normal);
6020+
self.context.feerate_per_kw = fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::NonAnchorChannelFee);
60236021
assert!(!self.context.channel_transaction_parameters.channel_type_features.supports_anchors_nonzero_fee_htlc_tx());
60246022
} else if self.context.channel_type.supports_scid_privacy() {
60256023
self.context.channel_type.clear_scid_privacy();

0 commit comments

Comments
 (0)