Merge pull request #788 from benthecarman/open-channel-all

Add ability to open channel / splice with all on-chain funds

Author: tnull

bindings/ldk_node.udl

@@ -103,8 +103,14 @@ interface Node {
 	[Throws=NodeError]
 	UserChannelId open_announced_channel(PublicKey node_id, SocketAddress address, u64 channel_amount_sats, u64? push_to_counterparty_msat, ChannelConfig? channel_config);
 	[Throws=NodeError]
+	UserChannelId open_channel_with_all(PublicKey node_id, SocketAddress address, u64? push_to_counterparty_msat, ChannelConfig? channel_config);
+	[Throws=NodeError]
+	UserChannelId open_announced_channel_with_all(PublicKey node_id, SocketAddress address, u64? push_to_counterparty_msat, ChannelConfig? channel_config);
+	[Throws=NodeError]
 	void splice_in([ByRef]UserChannelId user_channel_id, PublicKey counterparty_node_id, u64 splice_amount_sats);
 	[Throws=NodeError]
+	void splice_in_with_all([ByRef]UserChannelId user_channel_id, PublicKey counterparty_node_id);
+	[Throws=NodeError]
 	void splice_out([ByRef]UserChannelId user_channel_id, PublicKey counterparty_node_id, [ByRef]Address address, u64 splice_amount_sats);
 	[Throws=NodeError]
 	void close_channel([ByRef]UserChannelId user_channel_id, PublicKey counterparty_node_id);

src/event.rs

@@ -1164,52 +1164,45 @@ where
 				}
 
 				let anchor_channel = channel_type.requires_anchors_zero_fee_htlc_tx();
-				if anchor_channel {
-					if let Some(anchor_channels_config) =
-						self.config.anchor_channels_config.as_ref()
-					{
-						let cur_anchor_reserve_sats = crate::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 required_amount_sats = if anchor_channels_config
-							.trusted_peers_no_reserve
-							.contains(&counterparty_node_id)
-						{
-							0
-						} else {
-							anchor_channels_config.per_channel_reserve_sats
-						};
+				if anchor_channel && self.config.anchor_channels_config.is_none() {
+					log_error!(
+						self.logger,
+						"Rejecting inbound channel from peer {} due to Anchor channels being disabled.",
+						counterparty_node_id,
+					);
+					self.channel_manager
+						.force_close_broadcasting_latest_txn(
+							&temporary_channel_id,
+							&counterparty_node_id,
+							"Channel request rejected".to_string(),
+						)
+						.unwrap_or_else(|e| {
+							log_error!(self.logger, "Failed to reject channel: {:?}", e)
+						});
+					return Ok(());
+				}
 
-						if spendable_amount_sats < required_amount_sats {
-							log_error!(
-								self.logger,
-								"Rejecting inbound Anchor channel from peer {} due to insufficient available on-chain reserves. Available: {}/{}sats",
-								counterparty_node_id,
-								spendable_amount_sats,
-								required_amount_sats,
-							);
-							self.channel_manager
-								.force_close_broadcasting_latest_txn(
-									&temporary_channel_id,
-									&counterparty_node_id,
-									"Channel request rejected".to_string(),
-								)
-								.unwrap_or_else(|e| {
-									log_error!(self.logger, "Failed to reject channel: {:?}", e)
-								});
-							return Ok(());
-						}
-					} else {
+				let required_reserve_sats = crate::new_channel_anchor_reserve_sats(
+					&self.config,
+					&counterparty_node_id,
+					anchor_channel,
+				);
+
+				if required_reserve_sats > 0 {
+					let cur_anchor_reserve_sats = crate::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);
+
+					if spendable_amount_sats < required_reserve_sats {
 						log_error!(
 							self.logger,
-							"Rejecting inbound channel from peer {} due to Anchor channels being disabled.",
+							"Rejecting inbound Anchor channel from peer {} due to insufficient available on-chain reserves. Available: {}/{}sats",
 							counterparty_node_id,
+							spendable_amount_sats,
+							required_reserve_sats,
 						);
 						self.channel_manager
 							.force_close_broadcasting_latest_txn(