X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelCounterparty.java;h=c35b601761744ef4a485e662849fbc91f5a38b0d;hb=300b54d26fe5ed89f472ef821ebf67d56c917e49;hp=afbf447817e34dfd10ecb6691fc9c060127269ea;hpb=a7653cf8717b1f9df4d3f4c4bd0b1f50f3bbc230;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelCounterparty.java b/src/main/java/org/ldk/structs/ChannelCounterparty.java
index afbf4478..c35b6017 100644
--- a/src/main/java/org/ldk/structs/ChannelCounterparty.java
+++ b/src/main/java/org/ldk/structs/ChannelCounterparty.java
@@ -4,6 +4,7 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import java.lang.ref.Reference;
 import javax.annotation.Nullable;
 
 
@@ -25,6 +26,7 @@ public class ChannelCounterparty extends CommonBase {
 	 */
 	public byte[] get_node_id() {
 		byte[] ret = bindings.ChannelCounterparty_get_node_id(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -32,7 +34,9 @@ public class ChannelCounterparty extends CommonBase {
 	 * The node_id of our counterparty
 	 */
 	public void set_node_id(byte[] val) {
-		bindings.ChannelCounterparty_set_node_id(this.ptr, val);
+		bindings.ChannelCounterparty_set_node_id(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -42,9 +46,10 @@ public class ChannelCounterparty extends CommonBase {
 	 */
 	public InitFeatures get_features() {
 		long ret = bindings.ChannelCounterparty_get_features(this.ptr);
-		if (ret < 1024) { return null; }
-		InitFeatures ret_hu_conv = new InitFeatures(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.InitFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.InitFeatures(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -54,8 +59,10 @@ public class ChannelCounterparty extends CommonBase {
 	 * many routing-relevant features are present in the init context.
 	 */
 	public void set_features(InitFeatures val) {
-		bindings.ChannelCounterparty_set_features(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
+		bindings.ChannelCounterparty_set_features(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -69,6 +76,7 @@ public class ChannelCounterparty extends CommonBase {
 	 */
 	public long get_unspendable_punishment_reserve() {
 		long ret = bindings.ChannelCounterparty_get_unspendable_punishment_reserve(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -83,6 +91,8 @@ public class ChannelCounterparty extends CommonBase {
 	 */
 	public void set_unspendable_punishment_reserve(long val) {
 		bindings.ChannelCounterparty_set_unspendable_punishment_reserve(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -94,9 +104,10 @@ public class ChannelCounterparty extends CommonBase {
 	@Nullable
 	public CounterpartyForwardingInfo get_forwarding_info() {
 		long ret = bindings.ChannelCounterparty_get_forwarding_info(this.ptr);
-		if (ret < 1024) { return null; }
-		CounterpartyForwardingInfo ret_hu_conv = new CounterpartyForwardingInfo(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.CounterpartyForwardingInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.CounterpartyForwardingInfo(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -107,31 +118,112 @@ public class ChannelCounterparty extends CommonBase {
 	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
 	public void set_forwarding_info(@Nullable CounterpartyForwardingInfo val) {
-		bindings.ChannelCounterparty_set_forwarding_info(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
+		bindings.ChannelCounterparty_set_forwarding_info(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * The smallest value HTLC (in msat) the remote peer will accept, for this channel. This field
+	 * is only `None` before we have received either the `OpenChannel` or `AcceptChannel` message
+	 * from the remote peer, or for `ChannelCounterparty` objects serialized prior to LDK 0.0.107.
+	 */
+	public Option_u64Z get_outbound_htlc_minimum_msat() {
+		long ret = bindings.ChannelCounterparty_get_outbound_htlc_minimum_msat(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.Option_u64Z ret_hu_conv = org.ldk.structs.Option_u64Z.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * The smallest value HTLC (in msat) the remote peer will accept, for this channel. This field
+	 * is only `None` before we have received either the `OpenChannel` or `AcceptChannel` message
+	 * from the remote peer, or for `ChannelCounterparty` objects serialized prior to LDK 0.0.107.
+	 */
+	public void set_outbound_htlc_minimum_msat(Option_u64Z val) {
+		bindings.ChannelCounterparty_set_outbound_htlc_minimum_msat(this.ptr, val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
+	/**
+	 * The largest value HTLC (in msat) the remote peer currently will accept, for this channel.
+	 */
+	public Option_u64Z get_outbound_htlc_maximum_msat() {
+		long ret = bindings.ChannelCounterparty_get_outbound_htlc_maximum_msat(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.Option_u64Z ret_hu_conv = org.ldk.structs.Option_u64Z.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * The largest value HTLC (in msat) the remote peer currently will accept, for this channel.
+	 */
+	public void set_outbound_htlc_maximum_msat(Option_u64Z val) {
+		bindings.ChannelCounterparty_set_outbound_htlc_maximum_msat(this.ptr, val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
 	 * Constructs a new ChannelCounterparty given each field
 	 */
-	public static ChannelCounterparty of(byte[] node_id_arg, InitFeatures features_arg, long unspendable_punishment_reserve_arg, CounterpartyForwardingInfo forwarding_info_arg) {
-		long ret = bindings.ChannelCounterparty_new(node_id_arg, features_arg == null ? 0 : features_arg.ptr & ~1, unspendable_punishment_reserve_arg, forwarding_info_arg == null ? 0 : forwarding_info_arg.ptr & ~1);
-		if (ret < 1024) { return null; }
-		ChannelCounterparty ret_hu_conv = new ChannelCounterparty(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(features_arg);
-		ret_hu_conv.ptrs_to.add(forwarding_info_arg);
+	public static ChannelCounterparty of(byte[] node_id_arg, InitFeatures features_arg, long unspendable_punishment_reserve_arg, CounterpartyForwardingInfo forwarding_info_arg, Option_u64Z outbound_htlc_minimum_msat_arg, Option_u64Z outbound_htlc_maximum_msat_arg) {
+		long ret = bindings.ChannelCounterparty_new(InternalUtils.check_arr_len(node_id_arg, 33), features_arg == null ? 0 : features_arg.ptr, unspendable_punishment_reserve_arg, forwarding_info_arg == null ? 0 : forwarding_info_arg.ptr, outbound_htlc_minimum_msat_arg.ptr, outbound_htlc_maximum_msat_arg.ptr);
+		Reference.reachabilityFence(node_id_arg);
+		Reference.reachabilityFence(features_arg);
+		Reference.reachabilityFence(unspendable_punishment_reserve_arg);
+		Reference.reachabilityFence(forwarding_info_arg);
+		Reference.reachabilityFence(outbound_htlc_minimum_msat_arg);
+		Reference.reachabilityFence(outbound_htlc_maximum_msat_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelCounterparty ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelCounterparty(null, ret); }
+		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(features_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(forwarding_info_arg); };
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.ChannelCounterparty_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the ChannelCounterparty
 	 */
 	public ChannelCounterparty clone() {
 		long ret = bindings.ChannelCounterparty_clone(this.ptr);
-		if (ret < 1024) { return null; }
-		ChannelCounterparty ret_hu_conv = new ChannelCounterparty(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelCounterparty ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelCounterparty(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Serialize the ChannelCounterparty object into a byte array which can be read by ChannelCounterparty_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.ChannelCounterparty_write(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	/**
+	 * Read a ChannelCounterparty from a byte array, created by ChannelCounterparty_write
+	 */
+	public static Result_ChannelCounterpartyDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.ChannelCounterparty_read(ser);
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_ChannelCounterpartyDecodeErrorZ ret_hu_conv = Result_ChannelCounterpartyDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}