X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRevokeAndACK.java;h=8284f9e30f20dcbb98ef9bc5a1b932ddc99f6cf2;hb=1854b5cebef22ace9e9e4dd191f609818df9ce08;hp=514ded4babd564fb71f690b0d878dedd89aacc33;hpb=166ff04616cfee975ce991607ca0df88857193df;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/RevokeAndACK.java b/src/main/java/org/ldk/structs/RevokeAndACK.java
index 514ded4b..8284f9e3 100644
--- a/src/main/java/org/ldk/structs/RevokeAndACK.java
+++ b/src/main/java/org/ldk/structs/RevokeAndACK.java
@@ -2,59 +2,128 @@ 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 revoke_and_ack message to be sent or received from a peer
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class RevokeAndACK extends CommonBase {
 	RevokeAndACK(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.RevokeAndACK_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.RevokeAndACK_free(ptr); }
+	}
+
+	/**
+	 * The channel ID
+	 */
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.RevokeAndACK_get_channel_id(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
 	}
 
-	public RevokeAndACK(RevokeAndACK orig) {
-		super(bindings.RevokeAndACK_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	/**
+	 * The channel ID
+	 */
+	public void set_channel_id(byte[] val) {
+		bindings.RevokeAndACK_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
-	public byte[] get_channel_id(RevokeAndACK this_ptr) {
-		byte[] ret = bindings.RevokeAndACK_get_channel_id(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The secret corresponding to the per-commitment point
+	 */
+	public byte[] get_per_commitment_secret() {
+		byte[] ret = bindings.RevokeAndACK_get_per_commitment_secret(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
-	public void set_channel_id(RevokeAndACK this_ptr, byte[] val) {
-		bindings.RevokeAndACK_set_channel_id(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The secret corresponding to the per-commitment point
+	 */
+	public void set_per_commitment_secret(byte[] val) {
+		bindings.RevokeAndACK_set_per_commitment_secret(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
-	public byte[] get_per_commitment_secret(RevokeAndACK this_ptr) {
-		byte[] ret = bindings.RevokeAndACK_get_per_commitment_secret(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The next sender-broadcast commitment transaction's per-commitment point
+	 */
+	public byte[] get_next_per_commitment_point() {
+		byte[] ret = bindings.RevokeAndACK_get_next_per_commitment_point(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
-	public void set_per_commitment_secret(RevokeAndACK this_ptr, byte[] val) {
-		bindings.RevokeAndACK_set_per_commitment_secret(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The next sender-broadcast commitment transaction's per-commitment point
+	 */
+	public void set_next_per_commitment_point(byte[] val) {
+		bindings.RevokeAndACK_set_next_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
-	public byte[] get_next_per_commitment_point(RevokeAndACK this_ptr) {
-		byte[] ret = bindings.RevokeAndACK_get_next_per_commitment_point(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Constructs a new RevokeAndACK given each field
+	 */
+	public static RevokeAndACK of(byte[] channel_id_arg, byte[] per_commitment_secret_arg, byte[] next_per_commitment_point_arg) {
+		long ret = bindings.RevokeAndACK_new(InternalUtils.check_arr_len(channel_id_arg, 32), InternalUtils.check_arr_len(per_commitment_secret_arg, 32), InternalUtils.check_arr_len(next_per_commitment_point_arg, 33));
+		Reference.reachabilityFence(channel_id_arg);
+		Reference.reachabilityFence(per_commitment_secret_arg);
+		Reference.reachabilityFence(next_per_commitment_point_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		RevokeAndACK ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new RevokeAndACK(null, ret); }
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
+	}
+
+	long clone_ptr() {
+		long ret = bindings.RevokeAndACK_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
-	public void set_next_per_commitment_point(RevokeAndACK this_ptr, byte[] val) {
-		bindings.RevokeAndACK_set_next_per_commitment_point(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Creates a copy of the RevokeAndACK
+	 */
+	public RevokeAndACK clone() {
+		long ret = bindings.RevokeAndACK_clone(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		RevokeAndACK ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new RevokeAndACK(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public RevokeAndACK(byte[] channel_id_arg, byte[] per_commitment_secret_arg, byte[] next_per_commitment_point_arg) {
-		super(bindings.RevokeAndACK_new(channel_id_arg, per_commitment_secret_arg, next_per_commitment_point_arg));
+	/**
+	 * Serialize the RevokeAndACK object into a byte array which can be read by RevokeAndACK_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.RevokeAndACK_write(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
 	}
 
-	// Skipped RevokeAndACK_write
-	public RevokeAndACK(byte[] ser) {
-		super(bindings.RevokeAndACK_read(ser));
+	/**
+	 * Read a RevokeAndACK from a byte array, created by RevokeAndACK_write
+	 */
+	public static Result_RevokeAndACKDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.RevokeAndACK_read(ser);
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_RevokeAndACKDecodeErrorZ ret_hu_conv = Result_RevokeAndACKDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }