X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fconfig.rs;h=ec34f5322890f2095fcc56f22d237dedc2b76a56;hb=328407351c6aeb84e9407281ec5d35b1a4690650;hp=c9c76f4e9fa5480e2c8a6be0a642b2192db903ca;hpb=ddcd9b0463a923c16768e8a4c51ace83b0524ad3;p=rust-lightning

diff --git a/lightning/src/util/config.rs b/lightning/src/util/config.rs
index c9c76f4e..ec34f532 100644
--- a/lightning/src/util/config.rs
+++ b/lightning/src/util/config.rs
@@ -120,13 +120,12 @@ pub struct ChannelHandshakeConfig {
 	/// any attacker who is able to take control of a channel can just as easily send the funds via
 	/// lightning payments, so we never require that our counterparties support this option.
 	///
-	/// The upfront key committed is provided from [`KeysInterface::get_shutdown_scriptpubkey`].
+	/// The upfront key committed is provided from [`SignerProvider::get_shutdown_scriptpubkey`].
 	///
 	/// Default value: true.
 	///
-	/// [`KeysInterface::get_shutdown_scriptpubkey`]: crate::chain::keysinterface::KeysInterface::get_shutdown_scriptpubkey
+	/// [`SignerProvider::get_shutdown_scriptpubkey`]: crate::chain::keysinterface::SignerProvider::get_shutdown_scriptpubkey
 	pub commit_upfront_shutdown_pubkey: bool,
-
 	/// The Proportion of the channel value to configure as counterparty's channel reserve,
 	/// i.e., `their_channel_reserve_satoshis` for both outbound and inbound channels.
 	///
@@ -149,7 +148,28 @@ pub struct ChannelHandshakeConfig {
 	///                as 1000 sats instead, which is a safe implementation-specific lower bound.
 	/// Maximum value: 1,000,000, any values larger than 1 Million will be treated as 1 Million (or 100%)
 	///                instead, although channel negotiations will fail in that case.
-	pub their_channel_reserve_proportional_millionths: u32
+	pub their_channel_reserve_proportional_millionths: u32,
+	#[cfg(anchors)]
+	/// If set, we attempt to negotiate the `anchors_zero_fee_htlc_tx`option for outbound channels.
+	///
+	/// If this option is set, channels may be created that will not be readable by LDK versions
+	/// prior to 0.0.114, 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 `anchors_zero_fee_htlc_tx` option; we will simply
+	/// fall back to a `static_remote_key` channel.
+	///
+	/// LDK will not support the legacy `option_anchors` commitment version due to a discovered
+	/// vulnerability after its deployment. For more context, see the [`SIGHASH_SINGLE + update_fee
+	/// Considered Harmful`] mailing list post.
+	///
+	/// 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
+	/// [`SIGHASH_SINGLE + update_fee Considered Harmful`]: https://lists.linuxfoundation.org/pipermail/lightning-dev/2020-September/002796.html
+	pub negotiate_anchors_zero_fee_htlc_tx: bool,
 }
 
 impl Default for ChannelHandshakeConfig {
@@ -163,6 +183,8 @@ impl Default for ChannelHandshakeConfig {
 			announced_channel: false,
 			commit_upfront_shutdown_pubkey: true,
 			their_channel_reserve_proportional_millionths: 10_000,
+			#[cfg(anchors)]
+			negotiate_anchors_zero_fee_htlc_tx: false,
 		}
 	}
 }
@@ -171,7 +193,7 @@ impl Default for ChannelHandshakeConfig {
 ///
 /// These limits are only applied to our counterparty's limits, not our own.
 ///
-/// Use 0/<type>::max_value() as appropriate to skip checking.
+/// Use 0/`<type>::max_value()` as appropriate to skip checking.
 ///
 /// Provides sane defaults for most configurations.
 ///
@@ -501,7 +523,7 @@ pub struct UserConfig {
 	///
 	/// Default value: false.
 	///
-	/// [`Event::OpenChannelRequest`]: crate::util::events::Event::OpenChannelRequest
+	/// [`Event::OpenChannelRequest`]: crate::events::Event::OpenChannelRequest
 	/// [`msgs::OpenChannel`]: crate::ln::msgs::OpenChannel
 	/// [`msgs::AcceptChannel`]: crate::ln::msgs::AcceptChannel
 	pub manually_accept_inbound_channels: bool,
@@ -514,7 +536,7 @@ pub struct UserConfig {
 	///  Default value: false.
 	///
 	/// [`ChannelManager::get_intercept_scid`]: crate::ln::channelmanager::ChannelManager::get_intercept_scid
-	/// [`Event::HTLCIntercepted`]: crate::util::events::Event::HTLCIntercepted
+	/// [`Event::HTLCIntercepted`]: crate::events::Event::HTLCIntercepted
 	pub accept_intercept_htlcs: bool,
 }