fixup: Rename balance members to highlight they don't include fees

Author: tankyleo

lightning/src/ln/channel.rs

@@ -4350,7 +4350,7 @@ where
 			return Err(ChannelError::close(format!("Remote HTLC add would put them over our max HTLC value ({})", self.holder_max_htlc_value_in_flight_msat)));
 		}
 
-		let remote_balance_before_fee_msat = next_remote_commitment_stats.counterparty_balance_msat.ok_or(ChannelError::close("Remote HTLC add would overdraw remaining funds".to_owned()))?;
+		let remote_balance_before_fee_msat = next_remote_commitment_stats.counterparty_balance_before_fee_msat.ok_or(ChannelError::close("Remote HTLC add would overdraw remaining funds".to_owned()))?;
 
 		// Check that the remote can afford to pay for this HTLC on-chain at the current
 		// feerate_per_kw, while maintaining their channel reserve (as required by the spec).
@@ -4381,7 +4381,7 @@ where
 
 		if funding.is_outbound() {
 			let next_local_commitment_stats = self.get_next_local_commitment_stats(funding, Some(HTLCAmountDirection { outbound: false, amount_msat: msg.amount_msat }), include_counterparty_unknown_htlcs, fee_spike_buffer_htlc, self.feerate_per_kw, dust_exposure_limiting_feerate);
-			let holder_balance_msat = next_local_commitment_stats.holder_balance_msat.expect("Adding an inbound HTLC should never exhaust the holder's balance before fees");
+			let holder_balance_msat = next_local_commitment_stats.holder_balance_before_fee_msat.expect("Adding an inbound HTLC should never exhaust the holder's balance before fees");
 			// Check that they won't violate our local required channel reserve by adding this HTLC.
 			if holder_balance_msat < funding.counterparty_selected_channel_reserve_satoshis.unwrap() * 1000 + next_local_commitment_stats.commit_tx_fee_sat * 1000 {
 				return Err(ChannelError::close("Cannot accept HTLC that would put our balance under counterparty-announced channel reserve value".to_owned()));
@@ -4520,7 +4520,7 @@ where
 		// Include outbound update_add_htlc's in the holding cell, and those which haven't yet been ACK'ed by the counterparty (ie. LocalAnnounced HTLCs)
 		let include_counterparty_unknown_htlcs = true;
 		let next_remote_commitment_stats = self.get_next_remote_commitment_stats(funding, None, include_counterparty_unknown_htlcs, CONCURRENT_INBOUND_HTLC_FEE_BUFFER as usize, feerate_per_kw, dust_exposure_limiting_feerate);
-		let holder_balance_msat = next_remote_commitment_stats.holder_balance_msat.expect("The holder's balance before fees should never underflow.");
+		let holder_balance_msat = next_remote_commitment_stats.holder_balance_before_fee_msat.expect("The holder's balance before fees should never underflow.");
 		// Note that `stats.commit_tx_fee_sat` accounts for any HTLCs that transition from non-dust to dust under a higher feerate (in the case where HTLC-transactions pay endogenous fees).
 		if holder_balance_msat < next_remote_commitment_stats.commit_tx_fee_sat * 1000 + funding.counterparty_selected_channel_reserve_satoshis.unwrap() * 1000 {
 			//TODO: auto-close after a number of failures?
@@ -4588,7 +4588,7 @@ where
 			}
 			// We unwrap here; if the HTLC exhausts the counterparty's balance, we should have rejected it at `update_add_htlc`, here the HTLC is already
 			// irrevocably committed to the channel.
-			let remote_balance_before_fee_msat = next_remote_commitment_stats.counterparty_balance_msat.expect("The counterparty's balance before fees should never underflow");
+			let remote_balance_before_fee_msat = next_remote_commitment_stats.counterparty_balance_before_fee_msat.expect("The counterparty's balance before fees should never underflow");
 			if remote_balance_before_fee_msat.saturating_sub(funding.holder_selected_channel_reserve_satoshis * 1000) < remote_fee_incl_fee_spike_buffer_htlc_msat {
 				log_info!(logger, "Attempting to fail HTLC due to fee spike buffer violation in channel {}. Rebalancing is required.", &self.channel_id());
 				return Err(LocalHTLCFailureReason::FeeSpikeBuffer);

lightning/src/sign/tx_builder.rs

@@ -37,8 +37,8 @@ impl HTLCAmountDirection {
 pub(crate) struct NextCommitmentStats {
 	pub inbound_htlcs_count: usize,
 	pub inbound_htlcs_value_msat: u64,
-	pub holder_balance_msat: Option<u64>,
-	pub counterparty_balance_msat: Option<u64>,
+	pub holder_balance_before_fee_msat: Option<u64>,
+	pub counterparty_balance_before_fee_msat: Option<u64>,
 	pub nondust_htlc_count: usize,
 	pub commit_tx_fee_sat: u64,
 	pub dust_exposure_msat: u64,
@@ -187,12 +187,13 @@ impl TxBuilder for SpecTxBuilder {
 			value_to_counterparty_msat.checked_sub(inbound_htlcs_value_msat);
 
 		// Subtract the anchors from the channel funder
-		let (holder_balance_msat, counterparty_balance_msat) = subtract_addl_outputs(
-			is_outbound_from_holder,
-			value_to_holder_after_htlcs_msat,
-			value_to_counterparty_after_htlcs_msat,
-			channel_type,
-		);
+		let (holder_balance_before_fee_msat, counterparty_balance_before_fee_msat) =
+			subtract_addl_outputs(
+				is_outbound_from_holder,
+				value_to_holder_after_htlcs_msat,
+				value_to_counterparty_after_htlcs_msat,
+				channel_type,
+			);
 
 		// Increment the feerate by a buffer to calculate dust exposure
 		let dust_buffer_feerate = get_dust_buffer_feerate(feerate_per_kw);
@@ -244,8 +245,8 @@ impl TxBuilder for SpecTxBuilder {
 		NextCommitmentStats {
 			inbound_htlcs_count,
 			inbound_htlcs_value_msat,
-			holder_balance_msat,
-			counterparty_balance_msat,
+			holder_balance_before_fee_msat,
+			counterparty_balance_before_fee_msat,
 			nondust_htlc_count: nondust_htlc_count + addl_nondust_htlc_count,
 			commit_tx_fee_sat,
 			dust_exposure_msat,