X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUserConfig.java;h=7a3a99a88aae36db71bf80b4194f8e3250dc71ca;hb=7b75443b8305c6a24d3c08520e1785e9d39960e4;hp=455fb1d7159ddd1091db4d99744ec394edf387ad;hpb=2a8741cb87eb2b82381a6220a98f80f741147837;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/UserConfig.java b/src/main/java/org/ldk/structs/UserConfig.java
index 455fb1d7..7a3a99a8 100644
--- a/src/main/java/org/ldk/structs/UserConfig.java
+++ b/src/main/java/org/ldk/structs/UserConfig.java
@@ -24,66 +24,69 @@ public class UserConfig extends CommonBase {
 	}
 
 	/**
-	 * Channel config that we propose to our counterparty.
+	 * Channel handshake config that we propose to our counterparty.
 	 */
-	public ChannelHandshakeConfig get_own_channel_config() {
-		long ret = bindings.UserConfig_get_own_channel_config(this.ptr);
+	public ChannelHandshakeConfig get_channel_handshake_config() {
+		long ret = bindings.UserConfig_get_channel_handshake_config(this.ptr);
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.ChannelHandshakeConfig ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelHandshakeConfig(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	/**
-	 * Channel config that we propose to our counterparty.
+	 * Channel handshake config that we propose to our counterparty.
 	 */
-	public void set_own_channel_config(ChannelHandshakeConfig val) {
-		bindings.UserConfig_set_own_channel_config(this.ptr, val == null ? 0 : val.ptr & ~1);
+	public void set_channel_handshake_config(org.ldk.structs.ChannelHandshakeConfig val) {
+		bindings.UserConfig_set_channel_handshake_config(this.ptr, val == null ? 0 : val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
-	 * Limits applied to our counterparty's proposed channel config settings.
+	 * Limits applied to our counterparty's proposed channel handshake config settings.
 	 */
-	public ChannelHandshakeLimits get_peer_channel_config_limits() {
-		long ret = bindings.UserConfig_get_peer_channel_config_limits(this.ptr);
+	public ChannelHandshakeLimits get_channel_handshake_limits() {
+		long ret = bindings.UserConfig_get_channel_handshake_limits(this.ptr);
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.ChannelHandshakeLimits ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelHandshakeLimits(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	/**
-	 * Limits applied to our counterparty's proposed channel config settings.
+	 * Limits applied to our counterparty's proposed channel handshake config settings.
 	 */
-	public void set_peer_channel_config_limits(ChannelHandshakeLimits val) {
-		bindings.UserConfig_set_peer_channel_config_limits(this.ptr, val == null ? 0 : val.ptr & ~1);
+	public void set_channel_handshake_limits(org.ldk.structs.ChannelHandshakeLimits val) {
+		bindings.UserConfig_set_channel_handshake_limits(this.ptr, val == null ? 0 : val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
 	 * Channel config which affects behavior during channel lifetime.
 	 */
-	public ChannelConfig get_channel_options() {
-		long ret = bindings.UserConfig_get_channel_options(this.ptr);
+	public ChannelConfig get_channel_config() {
+		long ret = bindings.UserConfig_get_channel_config(this.ptr);
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.ChannelConfig ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelConfig(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	/**
 	 * Channel config which affects behavior during channel lifetime.
 	 */
-	public void set_channel_options(ChannelConfig val) {
-		bindings.UserConfig_set_channel_options(this.ptr, val == null ? 0 : val.ptr & ~1);
+	public void set_channel_config(org.ldk.structs.ChannelConfig val) {
+		bindings.UserConfig_set_channel_config(this.ptr, val == null ? 0 : val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -92,7 +95,7 @@ public class UserConfig extends CommonBase {
 	 * node which is not online reliably.
 	 * 
 	 * For nodes which are not online reliably, you should set all channels to *not* be announced
-	 * (using [`ChannelConfig::announced_channel`] and
+	 * (using [`ChannelHandshakeConfig::announced_channel`] and
 	 * [`ChannelHandshakeLimits::force_announced_channel_preference`]) and set this to false to
 	 * ensure you are not exposed to any forwarding risk.
 	 * 
@@ -116,7 +119,7 @@ public class UserConfig extends CommonBase {
 	 * node which is not online reliably.
 	 * 
 	 * For nodes which are not online reliably, you should set all channels to *not* be announced
-	 * (using [`ChannelConfig::announced_channel`] and
+	 * (using [`ChannelHandshakeConfig::announced_channel`] and
 	 * [`ChannelHandshakeLimits::force_announced_channel_preference`]) and set this to false to
 	 * ensure you are not exposed to any forwarding risk.
 	 * 
@@ -165,7 +168,7 @@ public class UserConfig extends CommonBase {
 	 * 
 	 * 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
 	 */
@@ -186,7 +189,7 @@ public class UserConfig extends CommonBase {
 	 * 
 	 * 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
 	 */
@@ -196,20 +199,97 @@ public class UserConfig extends CommonBase {
 		Reference.reachabilityFence(val);
 	}
 
+	/**
+	 * If this is set to true, LDK will intercept HTLCs that are attempting to be forwarded over
+	 * fake short channel ids generated via [`ChannelManager::get_intercept_scid`]. Upon HTLC
+	 * intercept, LDK will generate an [`Event::HTLCIntercepted`] which MUST be handled by the user.
+	 * 
+	 * Setting this to true may break backwards compatibility with LDK versions < 0.0.113.
+	 * 
+	 * Default value: false.
+	 * 
+	 * [`ChannelManager::get_intercept_scid`]: crate::ln::channelmanager::ChannelManager::get_intercept_scid
+	 * [`Event::HTLCIntercepted`]: crate::events::Event::HTLCIntercepted
+	 */
+	public boolean get_accept_intercept_htlcs() {
+		boolean ret = bindings.UserConfig_get_accept_intercept_htlcs(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	/**
+	 * If this is set to true, LDK will intercept HTLCs that are attempting to be forwarded over
+	 * fake short channel ids generated via [`ChannelManager::get_intercept_scid`]. Upon HTLC
+	 * intercept, LDK will generate an [`Event::HTLCIntercepted`] which MUST be handled by the user.
+	 * 
+	 * Setting this to true may break backwards compatibility with LDK versions < 0.0.113.
+	 * 
+	 * Default value: false.
+	 * 
+	 * [`ChannelManager::get_intercept_scid`]: crate::ln::channelmanager::ChannelManager::get_intercept_scid
+	 * [`Event::HTLCIntercepted`]: crate::events::Event::HTLCIntercepted
+	 */
+	public void set_accept_intercept_htlcs(boolean val) {
+		bindings.UserConfig_set_accept_intercept_htlcs(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
+	/**
+	 * If this is set to false, when receiving a keysend payment we'll fail it if it has multiple
+	 * parts. If this is set to true, we'll accept the payment.
+	 * 
+	 * Setting this to true will break backwards compatibility upon downgrading to an LDK
+	 * version < 0.0.116 while receiving an MPP keysend. If we have already received an MPP
+	 * keysend, downgrading will cause us to fail to deserialize [`ChannelManager`].
+	 * 
+	 * Default value: false.
+	 * 
+	 * [`ChannelManager`]: crate::ln::channelmanager::ChannelManager
+	 */
+	public boolean get_accept_mpp_keysend() {
+		boolean ret = bindings.UserConfig_get_accept_mpp_keysend(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	/**
+	 * If this is set to false, when receiving a keysend payment we'll fail it if it has multiple
+	 * parts. If this is set to true, we'll accept the payment.
+	 * 
+	 * Setting this to true will break backwards compatibility upon downgrading to an LDK
+	 * version < 0.0.116 while receiving an MPP keysend. If we have already received an MPP
+	 * keysend, downgrading will cause us to fail to deserialize [`ChannelManager`].
+	 * 
+	 * Default value: false.
+	 * 
+	 * [`ChannelManager`]: crate::ln::channelmanager::ChannelManager
+	 */
+	public void set_accept_mpp_keysend(boolean val) {
+		bindings.UserConfig_set_accept_mpp_keysend(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
 	/**
 	 * Constructs a new UserConfig given each field
 	 */
-	public static UserConfig of(ChannelHandshakeConfig own_channel_config_arg, ChannelHandshakeLimits peer_channel_config_limits_arg, ChannelConfig channel_options_arg, boolean accept_forwards_to_priv_channels_arg, boolean accept_inbound_channels_arg, boolean manually_accept_inbound_channels_arg) {
-		long ret = bindings.UserConfig_new(own_channel_config_arg == null ? 0 : own_channel_config_arg.ptr & ~1, peer_channel_config_limits_arg == null ? 0 : peer_channel_config_limits_arg.ptr & ~1, channel_options_arg == null ? 0 : channel_options_arg.ptr & ~1, accept_forwards_to_priv_channels_arg, accept_inbound_channels_arg, manually_accept_inbound_channels_arg);
-		Reference.reachabilityFence(own_channel_config_arg);
-		Reference.reachabilityFence(peer_channel_config_limits_arg);
-		Reference.reachabilityFence(channel_options_arg);
+	public static UserConfig of(org.ldk.structs.ChannelHandshakeConfig channel_handshake_config_arg, org.ldk.structs.ChannelHandshakeLimits channel_handshake_limits_arg, org.ldk.structs.ChannelConfig channel_config_arg, boolean accept_forwards_to_priv_channels_arg, boolean accept_inbound_channels_arg, boolean manually_accept_inbound_channels_arg, boolean accept_intercept_htlcs_arg, boolean accept_mpp_keysend_arg) {
+		long ret = bindings.UserConfig_new(channel_handshake_config_arg == null ? 0 : channel_handshake_config_arg.ptr, channel_handshake_limits_arg == null ? 0 : channel_handshake_limits_arg.ptr, channel_config_arg == null ? 0 : channel_config_arg.ptr, accept_forwards_to_priv_channels_arg, accept_inbound_channels_arg, manually_accept_inbound_channels_arg, accept_intercept_htlcs_arg, accept_mpp_keysend_arg);
+		Reference.reachabilityFence(channel_handshake_config_arg);
+		Reference.reachabilityFence(channel_handshake_limits_arg);
+		Reference.reachabilityFence(channel_config_arg);
 		Reference.reachabilityFence(accept_forwards_to_priv_channels_arg);
 		Reference.reachabilityFence(accept_inbound_channels_arg);
 		Reference.reachabilityFence(manually_accept_inbound_channels_arg);
+		Reference.reachabilityFence(accept_intercept_htlcs_arg);
+		Reference.reachabilityFence(accept_mpp_keysend_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.UserConfig ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UserConfig(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(channel_handshake_config_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(channel_handshake_limits_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(channel_config_arg); };
 		return ret_hu_conv;
 	}
 
@@ -227,7 +307,7 @@ public class UserConfig extends CommonBase {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.UserConfig ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UserConfig(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -238,7 +318,7 @@ public class UserConfig extends CommonBase {
 		long ret = bindings.UserConfig_default();
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.UserConfig ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UserConfig(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}