Include 0FC channels in anchor channel checks

Author: tankyleo

src/event.rs

@@ -1157,7 +1157,8 @@ where
 					}
 				}
 
-				let anchor_channel = channel_type.requires_anchors_zero_fee_htlc_tx();
+				let anchor_channel = channel_type.requires_anchors_zero_fee_htlc_tx()
+					|| channel_type.requires_anchor_zero_fee_commitments();
 				if anchor_channel {
 					if let Some(anchor_channels_config) =
 						self.config.anchor_channels_config.as_ref()

src/lib.rs

@@ -1148,11 +1148,11 @@ impl Node {
 			.peer_by_node_id(peer_node_id)
 			.ok_or(Error::ConnectionFailed)?
 			.init_features;
+		let anchor_channel = init_features.requires_anchors_zero_fee_htlc_tx()
+			|| init_features.requires_anchor_zero_fee_commitments();
 		let required_funds_sats = amount_sats
 			+ self.config.anchor_channels_config.as_ref().map_or(0, |c| {
-				if init_features.requires_anchors_zero_fee_htlc_tx()
-					&& !c.trusted_peers_no_reserve.contains(peer_node_id)
-				{
+				if anchor_channel && !c.trusted_peers_no_reserve.contains(peer_node_id) {
 					c.per_channel_reserve_sats
 				} else {
 					0
@@ -1827,9 +1827,10 @@ pub(crate) fn total_anchor_channels_reserve_sats(
 				!anchor_channels_config.trusted_peers_no_reserve.contains(&c.counterparty.node_id)
 					&& c.channel_shutdown_state
 						.map_or(true, |s| s != ChannelShutdownState::ShutdownComplete)
-					&& c.channel_type
-						.as_ref()
-						.map_or(false, |t| t.requires_anchors_zero_fee_htlc_tx())
+					&& c.channel_type.as_ref().map_or(false, |t| {
+						t.requires_anchors_zero_fee_htlc_tx()
+							|| t.requires_anchor_zero_fee_commitments()
+					})
 			})
 			.count() as u64
 			* anchor_channels_config.per_channel_reserve_sats

src/liquidity.rs

@@ -747,9 +747,11 @@ where
 					total_anchor_channels_reserve_sats(&self.channel_manager, &self.config);
 				let spendable_amount_sats =
 					self.wallet.get_spendable_amount_sats(cur_anchor_reserve_sats).unwrap_or(0);
+				let anchor_channel = init_features.requires_anchors_zero_fee_htlc_tx()
+					|| init_features.requires_anchor_zero_fee_commitments();
 				let required_funds_sats = channel_amount_sats
 					+ self.config.anchor_channels_config.as_ref().map_or(0, |c| {
-						if init_features.requires_anchors_zero_fee_htlc_tx()
+						if anchor_channel
 							&& !c.trusted_peers_no_reserve.contains(&their_network_key)
 						{
 							c.per_channel_reserve_sats