ln/refactor: move success/timeout dust limits into helper

This commit pulls calculation of second stage fees into a helper
function. A side effect of this refactor is that it fixes a rounding
issue in commit_and_htlc_tx_fees_sat. Previously, rounding down of
feerate would happen after multiplying by the number of HTLCs. Now the
feerate will be rounded down before multiplying by the number of HTLCs.

This wasn't a serious issue - it would just cause us very slightly
over estimate our dust exposure at certain feerates that needed
rounding. A hard-coded value in test_nondust_htlc_excess_fees_are_dust
is updated to account for this rounding change.

Author: carlaKC

lightning/src/ln/chan_utils.rs

@@ -41,6 +41,7 @@ use bitcoin::secp256k1::{ecdsa::Signature, Message, Secp256k1};
 use bitcoin::secp256k1::{PublicKey, Scalar, SecretKey};
 use bitcoin::{secp256k1, Sequence, Witness};
 
+use super::channel::second_stage_tx_fees_sat;
 use super::channel_keys::{
 	DelayedPaymentBasepoint, DelayedPaymentKey, HtlcBasepoint, HtlcKey, RevocationBasepoint,
 	RevocationKey,
@@ -239,13 +240,13 @@ pub(crate) fn commit_tx_fee_sat(feerate_per_kw: u32, num_htlcs: usize, channel_t
 pub(crate) fn commit_and_htlc_tx_fees_sat(feerate_per_kw: u32, num_accepted_htlcs: usize, num_offered_htlcs: usize, channel_type_features: &ChannelTypeFeatures) -> u64 {
 	let num_htlcs = num_accepted_htlcs + num_offered_htlcs;
 	let commit_tx_fees_sat = commit_tx_fee_sat(feerate_per_kw, num_htlcs, channel_type_features);
-	let htlc_tx_fees_sat = if !channel_type_features.supports_anchors_zero_fee_htlc_tx() {
-		num_accepted_htlcs as u64 * htlc_success_tx_weight(channel_type_features) * feerate_per_kw as u64 / 1000
-	  + num_offered_htlcs as u64 * htlc_timeout_tx_weight(channel_type_features) * feerate_per_kw as u64 / 1000
-	} else {
-		0
-	};
-	commit_tx_fees_sat + htlc_tx_fees_sat
+	let (htlc_success_tx_fee_sat, htlc_timeout_tx_fee_sat) = second_stage_tx_fees_sat(
+		channel_type_features, feerate_per_kw,
+	);
+
+	commit_tx_fees_sat
+	+ num_accepted_htlcs as u64 * htlc_success_tx_fee_sat
+	+ num_offered_htlcs as u64 * htlc_timeout_tx_fee_sat
 }
 
 /// Returns a fee estimate for the commitment transaction depending on channel type.
@@ -826,16 +827,17 @@ pub(crate) fn build_htlc_input(commitment_txid: &Txid, htlc: &HTLCOutputInCommit
 pub(crate) fn build_htlc_output(
 	feerate_per_kw: u32, contest_delay: u16, htlc: &HTLCOutputInCommitment, channel_type_features: &ChannelTypeFeatures, broadcaster_delayed_payment_key: &DelayedPaymentKey, revocation_key: &RevocationKey
 ) -> TxOut {
-	let weight = if htlc.offered {
-		htlc_timeout_tx_weight(channel_type_features)
-	} else {
-		htlc_success_tx_weight(channel_type_features)
-	};
-	let output_value = if channel_type_features.supports_anchors_zero_fee_htlc_tx() {
-		htlc.to_bitcoin_amount()
-	} else {
-		let total_fee = Amount::from_sat(feerate_per_kw as u64 * weight / 1000);
-		htlc.to_bitcoin_amount() - total_fee
+	let (htlc_success_tx_fee_sat, htlc_timeout_tx_fee_sat) = second_stage_tx_fees_sat(
+		channel_type_features, feerate_per_kw,
+	);
+
+	let output_value = {
+		let total_fee = if htlc.offered {
+			htlc_timeout_tx_fee_sat
+		} else {
+			htlc_success_tx_fee_sat
+		};
+		htlc.to_bitcoin_amount() - Amount::from_sat(total_fee)
 	};
 
 	TxOut {