Always set htlc_maximum_msat

Author: naumenkogs

lightning/src/ln/channel.rs

@@ -3131,8 +3131,15 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 	}
 
 	/// Allowed in any state (including after shutdown)
-	pub fn get_our_htlc_maximum_msat(&self) -> Option<u64> {
-		self.our_htlc_maximum_msat
+	pub fn get_announced_htlc_max_msat(&self) -> u64 {
+		let mut result = cmp::min(
+			self.channel_value_satoshis * 9 / 10, // upper bound by capacity
+			Channel::<ChanSigner>::get_our_max_htlc_value_in_flight_msat(self.channel_value_satoshis)
+		);
+		if let Some(configured_our_htlc_maximum_msat) = self.our_htlc_maximum_msat {
+			result = cmp::min(configured_our_htlc_maximum_msat, result)
+		}
+		result
 	}
 
 	/// Allowed in any state (including after shutdown)

lightning/src/ln/channelmanager.rs

@@ -1211,10 +1211,10 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 			chain_hash: self.genesis_hash,
 			short_channel_id: short_channel_id,
 			timestamp: chan.get_update_time_counter(),
-			flags: (!were_node_one) as u16 | ((!chan.is_live() as u16) << 1),
+			flags: (!were_node_one) as u16 | ((!chan.is_live() as u16) << 1) | (1 << 8),
 			cltv_expiry_delta: CLTV_EXPIRY_DELTA,
 			htlc_minimum_msat: chan.get_our_htlc_minimum_msat(),
-			htlc_maximum_msat: if chan.get_our_htlc_maximum_msat().is_some() { OptionalField::Present(chan.get_our_htlc_maximum_msat().unwrap()) } else { OptionalField::Absent },
+			htlc_maximum_msat: OptionalField::Present(chan.get_announced_htlc_max_msat()),
 			fee_base_msat: chan.get_our_fee_base_msat(&self.fee_estimator),
 			fee_proportional_millionths: chan.get_fee_proportional_millionths(),
 			excess_data: Vec::new(),