X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fconfig.rs;h=bd8b40b66567e8a5346e8e551568aaf1d539eae5;hb=5840374d088321afabbed62976d78d4864988102;hp=c591cacb3463fd6e216a24da8390bdce6ddde1f9;hpb=e7b2bca1d6b58ff9e2ccc3c0ca7d3c9afadb67e2;p=rust-lightning

diff --git a/lightning/src/util/config.rs b/lightning/src/util/config.rs
index c591cacb..bd8b40b6 100644
--- a/lightning/src/util/config.rs
+++ b/lightning/src/util/config.rs
@@ -47,6 +47,28 @@ pub struct ChannelHandshakeConfig {
 	/// Default value: 1. If the value is less than 1, it is ignored and set to 1, as is required
 	/// by the protocol.
 	pub our_htlc_minimum_msat: u64,
+	/// If set, we attempt to negotiate the `scid_privacy` (referred to as `scid_alias` in the
+	/// BOLTs) option for outbound private channels. This provides better privacy by not including
+	/// our real on-chain channel UTXO in each invoice and requiring that our counterparty only
+	/// relay HTLCs to us using the channel's SCID alias.
+	///
+	/// If this option is set, channels may be created that will not be readable by LDK versions
+	/// prior to 0.0.106, causing [`ChannelManager`]'s read method to return a
+	/// [`DecodeError:InvalidValue`].
+	///
+	/// Note that setting this to true does *not* prevent us from opening channels with
+	/// counterparties that do not support the `scid_alias` option; we will simply fall back to a
+	/// private channel without that option.
+	///
+	/// Ignored if the channel is negotiated to be announced, see
+	/// [`ChannelConfig::announced_channel`] and
+	/// [`ChannelHandshakeLimits::force_announced_channel_preference`] for more.
+	///
+	/// Default value: false. This value is likely to change to true in the future.
+	///
+	/// [`ChannelManager`]: crate::ln::channelmanager::ChannelManager
+	/// [`DecodeError:InvalidValue`]: crate::ln::msgs::DecodeError::InvalidValue
+	pub negotiate_scid_privacy: bool,
 }
 
 impl Default for ChannelHandshakeConfig {
@@ -55,6 +77,7 @@ impl Default for ChannelHandshakeConfig {
 			minimum_depth: 6,
 			our_to_self_delay: BREAKDOWN_TIMEOUT,
 			our_htlc_minimum_msat: 1,
+			negotiate_scid_privacy: false,
 		}
 	}
 }
@@ -305,6 +328,20 @@ pub struct UserConfig {
 	/// If this is set to false, we do not accept inbound requests to open a new channel.
 	/// Default value: true.
 	pub accept_inbound_channels: bool,
+	/// If this is set to true, the user needs to manually accept inbound requests to open a new
+	/// channel.
+	///
+	/// When set to true, [`Event::OpenChannelRequest`] will be triggered once a request to open a
+	/// new inbound channel is received through a [`msgs::OpenChannel`] message. In that case, a
+	/// [`msgs::AcceptChannel`] message will not be sent back to the counterparty node unless the
+	/// user explicitly chooses to accept the request.
+	///
+	/// Default value: false.
+	///
+	/// [`Event::OpenChannelRequest`]: crate::util::events::Event::OpenChannelRequest
+	/// [`msgs::OpenChannel`]: crate::ln::msgs::OpenChannel
+	/// [`msgs::AcceptChannel`]: crate::ln::msgs::AcceptChannel
+	pub manually_accept_inbound_channels: bool,
 }
 
 impl Default for UserConfig {
@@ -315,6 +352,7 @@ impl Default for UserConfig {
 			channel_options: ChannelConfig::default(),
 			accept_forwards_to_priv_channels: false,
 			accept_inbound_channels: true,
+			manually_accept_inbound_channels: false,
 		}
 	}
 }