Skip to content

Commit fea9c4e

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. It also implements `FeeEstimator` itself so it can be passed to some public API functions internally.
1 parent a600eee commit fea9c4e

File tree

1 file changed

+68
-3
lines changed

1 file changed

+68
-3
lines changed

lightning/src/chain/chaininterface.rs

Lines changed: 68 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,77 @@ 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+
/// This wrapped method will be implemented with the following unit conversions:
4850
/// * max(satoshis-per-byte * 250, 253)
4951
/// * max(satoshis-per-kbyte / 4, 253)
5052
fn get_est_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32;
5153
}
5254

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

0 commit comments

Comments
 (0)