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=b330b6505f9ce9deb7c897b313ed697e87d84dfe;hpb=166ff04616cfee975ce991607ca0df88857193df;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/FundingLocked.java b/src/main/java/org/ldk/structs/FundingLocked.java
index b330b650..924a31fa 100644
--- a/src/main/java/org/ldk/structs/FundingLocked.java
+++ b/src/main/java/org/ldk/structs/FundingLocked.java
@@ -2,48 +2,133 @@ package org.ldk.structs;
 
 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;
 
+
+/**
+ * A funding_locked message to be sent or received from a peer
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class FundingLocked extends CommonBase {
 	FundingLocked(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.FundingLocked_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.FundingLocked_free(ptr); }
+	}
+
+	/**
+	 * The channel ID
+	 */
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.FundingLocked_get_channel_id(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
 	}
 
-	public FundingLocked(FundingLocked orig) {
-		super(bindings.FundingLocked_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	/**
+	 * The channel ID
+	 */
+	public void set_channel_id(byte[] val) {
+		bindings.FundingLocked_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
-	public byte[] get_channel_id(FundingLocked this_ptr) {
-		byte[] ret = bindings.FundingLocked_get_channel_id(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The per-commitment point of the second commitment transaction
+	 */
+	public byte[] get_next_per_commitment_point() {
+		byte[] ret = bindings.FundingLocked_get_next_per_commitment_point(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
-	public void set_channel_id(FundingLocked this_ptr, byte[] val) {
-		bindings.FundingLocked_set_channel_id(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * 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, 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;
 	}
 
-	public byte[] get_next_per_commitment_point(FundingLocked this_ptr) {
-		byte[] ret = bindings.FundingLocked_get_next_per_commitment_point(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * 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, 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;
 	}
 
-	public void set_next_per_commitment_point(FundingLocked this_ptr, byte[] val) {
-		bindings.FundingLocked_set_next_per_commitment_point(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Creates a copy of the FundingLocked
+	 */
+	public FundingLocked clone() {
+		long ret = bindings.FundingLocked_clone(this.ptr);
+		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;
 	}
 
-	public FundingLocked(byte[] channel_id_arg, byte[] next_per_commitment_point_arg) {
-		super(bindings.FundingLocked_new(channel_id_arg, next_per_commitment_point_arg));
+	/**
+	 * Serialize the FundingLocked object into a byte array which can be read by FundingLocked_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.FundingLocked_write(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
 	}
 
-	// Skipped FundingLocked_write
-	public FundingLocked(byte[] ser) {
-		super(bindings.FundingLocked_read(ser));
+	/**
+	 * Read a FundingLocked from a byte array, created by FundingLocked_write
+	 */
+	public static Result_FundingLockedDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.FundingLocked_read(ser);
+		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;
 	}
 
 }