X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FDirectionalChannelInfo.java;h=55da78714859010785cdbbe555e387c82ab8ec4f;hb=6d094e745feaf94c1059555cd1c997965a34bc36;hp=5610a704c4362e6b1f4a1077296645faa00971a4;hpb=1b870a3ffab1c0024411e30102bc6d198300f095;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/DirectionalChannelInfo.java b/src/main/java/org/ldk/structs/DirectionalChannelInfo.java
index 5610a704..55da7871 100644
--- a/src/main/java/org/ldk/structs/DirectionalChannelInfo.java
+++ b/src/main/java/org/ldk/structs/DirectionalChannelInfo.java
@@ -4,6 +4,7 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
 
 /**
@@ -81,12 +82,31 @@ public class DirectionalChannelInfo extends CommonBase {
 		bindings.DirectionalChannelInfo_set_htlc_minimum_msat(this.ptr, val);
 	}
 
+	/**
+	 * The maximum value which may be relayed to the next hop via the channel.
+	 */
+	public Option_u64Z get_htlc_maximum_msat() {
+		long ret = bindings.DirectionalChannelInfo_get_htlc_maximum_msat(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Option_u64Z ret_hu_conv = Option_u64Z.constr_from_ptr(ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * The maximum value which may be relayed to the next hop via the channel.
+	 */
+	public void set_htlc_maximum_msat(Option_u64Z val) {
+		bindings.DirectionalChannelInfo_set_htlc_maximum_msat(this.ptr, val.ptr);
+	}
+
 	/**
 	 * Fees charged when the channel is used for routing
 	 */
 	public RoutingFees get_fees() {
 		long ret = bindings.DirectionalChannelInfo_get_fees(this.ptr);
-		RoutingFees ret_hu_conv = new RoutingFees(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		RoutingFees ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new RoutingFees(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -96,7 +116,6 @@ public class DirectionalChannelInfo extends CommonBase {
 	 */
 	public void set_fees(RoutingFees val) {
 		bindings.DirectionalChannelInfo_set_fees(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
 	/**
@@ -104,10 +123,14 @@ public class DirectionalChannelInfo extends CommonBase {
 	 * Mostly redundant with the data we store in fields explicitly.
 	 * Everything else is useful only for sending out for initial routing sync.
 	 * Not stored if contains excess data to prevent DoS.
+	 * 
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
+	@Nullable
 	public ChannelUpdate get_last_update_message() {
 		long ret = bindings.DirectionalChannelInfo_get_last_update_message(this.ptr);
-		ChannelUpdate ret_hu_conv = new ChannelUpdate(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ChannelUpdate ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelUpdate(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -117,10 +140,27 @@ public class DirectionalChannelInfo extends CommonBase {
 	 * Mostly redundant with the data we store in fields explicitly.
 	 * Everything else is useful only for sending out for initial routing sync.
 	 * Not stored if contains excess data to prevent DoS.
+	 * 
+	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public void set_last_update_message(ChannelUpdate val) {
+	public void set_last_update_message(@Nullable ChannelUpdate val) {
 		bindings.DirectionalChannelInfo_set_last_update_message(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
+	}
+
+	/**
+	 * Constructs a new DirectionalChannelInfo given each field
+	 */
+	public static DirectionalChannelInfo of(int last_update_arg, boolean enabled_arg, short cltv_expiry_delta_arg, long htlc_minimum_msat_arg, Option_u64Z htlc_maximum_msat_arg, RoutingFees fees_arg, ChannelUpdate last_update_message_arg) {
+		long ret = bindings.DirectionalChannelInfo_new(last_update_arg, enabled_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg.ptr, fees_arg == null ? 0 : fees_arg.ptr & ~1, last_update_message_arg == null ? 0 : last_update_message_arg.ptr & ~1);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		DirectionalChannelInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new DirectionalChannelInfo(null, ret); }
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
+	}
+
+	long clone_ptr() {
+		long ret = bindings.DirectionalChannelInfo_clone_ptr(this.ptr);
+		return ret;
 	}
 
 	/**
@@ -128,7 +168,8 @@ public class DirectionalChannelInfo extends CommonBase {
 	 */
 	public DirectionalChannelInfo clone() {
 		long ret = bindings.DirectionalChannelInfo_clone(this.ptr);
-		DirectionalChannelInfo ret_hu_conv = new DirectionalChannelInfo(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		DirectionalChannelInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new DirectionalChannelInfo(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -144,8 +185,9 @@ public class DirectionalChannelInfo extends CommonBase {
 	/**
 	 * Read a DirectionalChannelInfo from a byte array, created by DirectionalChannelInfo_write
 	 */
-	public static Result_DirectionalChannelInfoDecodeErrorZ constructor_read(byte[] ser) {
+	public static Result_DirectionalChannelInfoDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.DirectionalChannelInfo_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_DirectionalChannelInfoDecodeErrorZ ret_hu_conv = Result_DirectionalChannelInfoDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}