Skip to content

Commit 9c0c3b0

Browse files
committed
Add LowerBoundedFeeEstimator to set FeeEstimator min rates
`LowerBoundedFeeEstimator` is a wrapper for `Deref`s to `FeeEstimator`s that limits the get_est_sat_per_1000_weight() method to no less than 253 sats/kW.
1 parent fda3819 commit 9c0c3b0

File tree

1 file changed

+69
-3
lines changed

1 file changed

+69
-3
lines changed

lightning/src/chain/chaininterface.rs

Lines changed: 69 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
//! Includes traits for monitoring and receiving notifications of new blocks and block
1414
//! disconnections, transaction broadcasting, and feerate information requests.
1515
16+
use core::{cmp, ops::Deref};
17+
1618
use bitcoin::blockdata::transaction::Transaction;
1719

1820
/// An interface to send a transaction to the Bitcoin network.
@@ -41,14 +43,78 @@ pub enum ConfirmationTarget {
4143
pub trait FeeEstimator {
4244
/// Gets estimated satoshis of fee required per 1000 Weight-Units.
4345
///
44-
/// Must return a value no smaller than 253 (ie 1 satoshi-per-byte rounded up to ensure later
45-
/// round-downs don't put us below 1 satoshi-per-byte).
46+
/// LDK will wrap this method and ensure that the value returned is no smaller than 253
47+
/// (ie 1 satoshi-per-byte rounded up to ensure later round-downs don't put us below 1 satoshi-per-byte).
4648
///
47-
/// This method can be implemented with the following unit conversions:
49+
/// The following unit conversions can be used to convert to sats/KW. Note that it is not
50+
/// necessary to use max() as the minimum of 253 will be enforced by LDK:
4851
/// * max(satoshis-per-byte * 250, 253)
4952
/// * max(satoshis-per-kbyte / 4, 253)
5053
fn get_est_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32;
5154
}
5255

56+
// We need `FeeEstimator` implemented so that in some places where we only have a shared
57+
// reference to a `Deref` to a `FeeEstimator`, we can still wrap it.
58+
impl<D: Deref> FeeEstimator for D where D::Target: FeeEstimator {
59+
fn get_est_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
60+
(**self).get_est_sat_per_1000_weight(confirmation_target)
61+
}
62+
}
63+
5364
/// Minimum relay fee as required by bitcoin network mempool policy.
5465
pub const MIN_RELAY_FEE_SAT_PER_1000_WEIGHT: u64 = 4000;
66+
/// Minimum feerate that takes a sane approach to bitcoind weight-to-vbytes rounding.
67+
/// See the following Core Lightning commit for an explanation:
68+
/// https://github.com/ElementsProject/lightning/commit/2e687b9b352c9092b5e8bd4a688916ac50b44af0
69+
pub const FEERATE_FLOOR_SATS_PER_KW: u32 = 253;
70+
71+
/// Wraps a `Deref` to a `FeeEstimator` so that any fee estimations provided by it
72+
/// are bounded below by `FEERATE_FLOOR_SATS_PER_KW` (253 sats/KW)
73+
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F) where F::Target: FeeEstimator;
74+
75+
impl<F: Deref> LowerBoundedFeeEstimator<F> where F::Target: FeeEstimator {
76+
/// Creates a new `LowerBoundedFeeEstimator` which wraps the provided fee_estimator
77+
pub fn new(fee_estimator: F) -> Self {
78+
LowerBoundedFeeEstimator(fee_estimator)
79+
}
80+
81+
pub fn get_est_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
82+
cmp::max(
83+
self.0.get_est_sat_per_1000_weight(confirmation_target),
84+
FEERATE_FLOOR_SATS_PER_KW,
85+
)
86+
}
87+
}
88+
89+
#[cfg(test)]
90+
mod tests {
91+
use super::{FEERATE_FLOOR_SATS_PER_KW, LowerBoundedFeeEstimator, ConfirmationTarget, FeeEstimator};
92+
93+
struct TestFeeEstimator {
94+
sat_per_kw: u32,
95+
}
96+
97+
impl FeeEstimator for TestFeeEstimator {
98+
fn get_est_sat_per_1000_weight(&self, _: ConfirmationTarget) -> u32 {
99+
self.sat_per_kw
100+
}
101+
}
102+
103+
#[test]
104+
fn test_fee_estimator_less_than_floor() {
105+
let sat_per_kw = FEERATE_FLOOR_SATS_PER_KW - 1;
106+
let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
107+
let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);
108+
109+
assert_eq!(fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background), FEERATE_FLOOR_SATS_PER_KW);
110+
}
111+
112+
#[test]
113+
fn test_fee_estimator_greater_than_floor() {
114+
let sat_per_kw = FEERATE_FLOOR_SATS_PER_KW + 1;
115+
let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
116+
let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);
117+
118+
assert_eq!(fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background), sat_per_kw);
119+
}
120+
}

0 commit comments

Comments
 (0)