f Fix ChannelDetails htlc min/max

Author: ViktorTigerstrom

lightning/src/ln/channel.rs

@@ -4290,16 +4290,16 @@ impl<Signer: Sign> Channel<Signer> {
 
 	/// Allowed in any state (including after shutdown), but will return none before TheirInitSent
 	pub fn get_holder_htlc_maximum_msat(&self) -> Option<u64> {
-		if self.channel_state >= ChannelState::TheirInitSent as u32 {
-			return None;
+		match &self.counterparty_selected_channel_reserve_satoshis {
+			None => None,
+			Some(counterparty_reserve) => {
+				let holder_reserve = self.holder_selected_channel_reserve_satoshis;
+				cmp::min(
+					Some((self.channel_value_satoshis - counterparty_reserve - holder_reserve) * 1000),
+					Some(self.holder_max_htlc_value_in_flight_msat)
+				)
+			}
 		}
-		let counterparty_reserve = self.counterparty_selected_channel_reserve_satoshis.unwrap_or(0);
-		let holder_reserve = self.holder_selected_channel_reserve_satoshis;
-
-		cmp::min(
-			Some((self.channel_value_satoshis - counterparty_reserve + holder_reserve) * 1000),
-			Some(self.holder_max_htlc_value_in_flight_msat)
-		)
 	}
 
 	/// Allowed in any state (including after shutdown)

lightning/src/ln/channelmanager.rs

@@ -1304,9 +1304,9 @@ pub struct ChannelDetails {
 	/// True if this channel is (or will be) publicly-announced.
 	pub is_public: bool,
 	/// The smallest value HTLC (in msat) we will accept, for this channel.
-	pub htlc_minimum_msat: u64,
+	pub inbound_htlc_minimum_msat: u64,
 	/// The largest value HTLC (in msat) we currently will accept, for this channel.
-	pub htlc_maximum_msat: Option<u64>,
+	pub inbound_htlc_maximum_msat: Option<u64>,
 }
 
 impl ChannelDetails {
@@ -1944,8 +1944,8 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 					is_funding_locked: channel.is_usable(),
 					is_usable: channel.is_live(),
 					is_public: channel.should_announce(),
-					htlc_minimum_msat: channel.get_holder_htlc_minimum_msat(),
-					htlc_maximum_msat: channel.get_holder_htlc_maximum_msat()
+					inbound_htlc_minimum_msat: channel.get_holder_htlc_minimum_msat(),
+					inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat()
 				});
 			}
 		}
@@ -6087,8 +6087,8 @@ impl_writeable_tlv_based!(ChannelDetails, {
 	(28, is_funding_locked, required),
 	(30, is_usable, required),
 	(32, is_public, required),
-	(34, htlc_minimum_msat, required),
-	(36, htlc_maximum_msat, option),
+	(33, inbound_htlc_minimum_msat, required),
+	(34, inbound_htlc_maximum_msat, option),
 });
 
 impl_writeable_tlv_based!(PhantomRouteHints, {

lightning/src/routing/router.rs

@@ -1682,8 +1682,8 @@ mod tests {
 			force_close_spend_delay: None,
 			is_outbound: true, is_funding_locked: true,
 			is_usable: true, is_public: true,
-			htlc_minimum_msat: 0,
-			htlc_maximum_msat: None,
+			inbound_htlc_minimum_msat: 0,
+			inbound_htlc_maximum_msat: None,
 		}
 	}
 
@@ -5382,8 +5382,8 @@ mod benches {
 			is_funding_locked: true,
 			is_usable: true,
 			is_public: true,
-			htlc_minimum_msat: 1_000,
-			htlc_maximum_msat: None,
+			inbound_htlc_minimum_msat: 0,
+			inbound_htlc_maximum_msat: None,
 		}
 	}