X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FFundingLocked.java;h=924a31faefc3936a2de73ae40e5aa8ca10147103;hb=ff3dacec3be60f870d81f6df11bd9fff92aa6047;hp=2208f2f4d24aad0fefcfe94b08cbbb521881a600;hpb=db1a11032b4164540a2d3403696be12bbca70e94;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/FundingLocked.java b/src/main/java/org/ldk/structs/FundingLocked.java
index 2208f2f4..924a31fa 100644
--- a/src/main/java/org/ldk/structs/FundingLocked.java
+++ b/src/main/java/org/ldk/structs/FundingLocked.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;
 
 
@@ -24,6 +25,7 @@ public class FundingLocked extends CommonBase {
 	 */
 	public byte[] get_channel_id() {
 		byte[] ret = bindings.FundingLocked_get_channel_id(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -31,7 +33,9 @@ public class FundingLocked extends CommonBase {
 	 * The channel ID
 	 */
 	public void set_channel_id(byte[] val) {
-		bindings.FundingLocked_set_channel_id(this.ptr, val);
+		bindings.FundingLocked_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -39,6 +43,7 @@ public class FundingLocked extends CommonBase {
 	 */
 	public byte[] get_next_per_commitment_point() {
 		byte[] ret = bindings.FundingLocked_get_next_per_commitment_point(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -46,27 +51,62 @@ public class FundingLocked extends CommonBase {
 	 * The per-commitment point of the second commitment transaction
 	 */
 	public void set_next_per_commitment_point(byte[] val) {
-		bindings.FundingLocked_set_next_per_commitment_point(this.ptr, val);
+		bindings.FundingLocked_set_next_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
+	/**
+	 * If set, provides a short_channel_id alias for this channel. The sender will accept payments
+	 * to be forwarded over this SCID and forward them to this messages' recipient.
+	 */
+	public Option_u64Z get_short_channel_id_alias() {
+		long ret = bindings.FundingLocked_get_short_channel_id_alias(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);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * If set, provides a short_channel_id alias for this channel. The sender will accept payments
+	 * to be forwarded over this SCID and forward them to this messages' recipient.
+	 */
+	public void set_short_channel_id_alias(Option_u64Z val) {
+		bindings.FundingLocked_set_short_channel_id_alias(this.ptr, val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
 	 * Constructs a new FundingLocked given each field
 	 */
-	public static FundingLocked of(byte[] channel_id_arg, byte[] next_per_commitment_point_arg) {
-		long ret = bindings.FundingLocked_new(channel_id_arg, next_per_commitment_point_arg);
-		if (ret < 1024) { return null; }
-		FundingLocked ret_hu_conv = new FundingLocked(null, ret);
+	public static FundingLocked of(byte[] channel_id_arg, byte[] next_per_commitment_point_arg, Option_u64Z short_channel_id_alias_arg) {
+		long ret = bindings.FundingLocked_new(InternalUtils.check_arr_len(channel_id_arg, 32), InternalUtils.check_arr_len(next_per_commitment_point_arg, 33), short_channel_id_alias_arg.ptr);
+		Reference.reachabilityFence(channel_id_arg);
+		Reference.reachabilityFence(next_per_commitment_point_arg);
+		Reference.reachabilityFence(short_channel_id_alias_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		FundingLocked ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new FundingLocked(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.FundingLocked_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the FundingLocked
 	 */
 	public FundingLocked clone() {
 		long ret = bindings.FundingLocked_clone(this.ptr);
-		if (ret < 1024) { return null; }
-		FundingLocked ret_hu_conv = new FundingLocked(null, ret);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		FundingLocked ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new FundingLocked(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -76,6 +116,7 @@ public class FundingLocked extends CommonBase {
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.FundingLocked_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -84,7 +125,8 @@ public class FundingLocked extends CommonBase {
 	 */
 	public static Result_FundingLockedDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.FundingLocked_read(ser);
-		if (ret < 1024) { return null; }
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_FundingLockedDecodeErrorZ ret_hu_conv = Result_FundingLockedDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}