X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelAnnouncement.java;h=9382ad91b91a67ea5b52c7e8aa54ee3fc86ebe5f;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=a49a163b771d3c9438d9cdc10577b72a671af637;hpb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelAnnouncement.java b/src/main/java/org/ldk/structs/ChannelAnnouncement.java
index a49a163b..9382ad91 100644
--- a/src/main/java/org/ldk/structs/ChannelAnnouncement.java
+++ b/src/main/java/org/ldk/structs/ChannelAnnouncement.java
@@ -4,7 +4,12 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
+
+/**
+ * A channel_announcement message to be sent or received from a peer
+ */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class ChannelAnnouncement extends CommonBase {
 	ChannelAnnouncement(Object _dummy, long ptr) { super(ptr); }
@@ -14,78 +19,126 @@ public class ChannelAnnouncement extends CommonBase {
 		if (ptr != 0) { bindings.ChannelAnnouncement_free(ptr); }
 	}
 
-	public ChannelAnnouncement clone() {
-		long ret = bindings.ChannelAnnouncement_clone(this.ptr);
-		ChannelAnnouncement ret_hu_conv = new ChannelAnnouncement(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
-		return ret_hu_conv;
-	}
-
+	/**
+	 * Authentication of the announcement by the first public node
+	 */
 	public byte[] get_node_signature_1() {
 		byte[] ret = bindings.ChannelAnnouncement_get_node_signature_1(this.ptr);
 		return ret;
 	}
 
+	/**
+	 * Authentication of the announcement by the first public node
+	 */
 	public void set_node_signature_1(byte[] val) {
-		bindings.ChannelAnnouncement_set_node_signature_1(this.ptr, val);
+		bindings.ChannelAnnouncement_set_node_signature_1(this.ptr, InternalUtils.check_arr_len(val, 64));
 	}
 
+	/**
+	 * Authentication of the announcement by the second public node
+	 */
 	public byte[] get_node_signature_2() {
 		byte[] ret = bindings.ChannelAnnouncement_get_node_signature_2(this.ptr);
 		return ret;
 	}
 
+	/**
+	 * Authentication of the announcement by the second public node
+	 */
 	public void set_node_signature_2(byte[] val) {
-		bindings.ChannelAnnouncement_set_node_signature_2(this.ptr, val);
+		bindings.ChannelAnnouncement_set_node_signature_2(this.ptr, InternalUtils.check_arr_len(val, 64));
 	}
 
+	/**
+	 * Proof of funding UTXO ownership by the first public node
+	 */
 	public byte[] get_bitcoin_signature_1() {
 		byte[] ret = bindings.ChannelAnnouncement_get_bitcoin_signature_1(this.ptr);
 		return ret;
 	}
 
+	/**
+	 * Proof of funding UTXO ownership by the first public node
+	 */
 	public void set_bitcoin_signature_1(byte[] val) {
-		bindings.ChannelAnnouncement_set_bitcoin_signature_1(this.ptr, val);
+		bindings.ChannelAnnouncement_set_bitcoin_signature_1(this.ptr, InternalUtils.check_arr_len(val, 64));
 	}
 
+	/**
+	 * Proof of funding UTXO ownership by the second public node
+	 */
 	public byte[] get_bitcoin_signature_2() {
 		byte[] ret = bindings.ChannelAnnouncement_get_bitcoin_signature_2(this.ptr);
 		return ret;
 	}
 
+	/**
+	 * Proof of funding UTXO ownership by the second public node
+	 */
 	public void set_bitcoin_signature_2(byte[] val) {
-		bindings.ChannelAnnouncement_set_bitcoin_signature_2(this.ptr, val);
+		bindings.ChannelAnnouncement_set_bitcoin_signature_2(this.ptr, InternalUtils.check_arr_len(val, 64));
 	}
 
+	/**
+	 * The actual announcement
+	 */
 	public UnsignedChannelAnnouncement get_contents() {
 		long ret = bindings.ChannelAnnouncement_get_contents(this.ptr);
-		UnsignedChannelAnnouncement ret_hu_conv = new UnsignedChannelAnnouncement(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		UnsignedChannelAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new UnsignedChannelAnnouncement(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
+	/**
+	 * The actual announcement
+	 */
 	public void set_contents(UnsignedChannelAnnouncement val) {
 		bindings.ChannelAnnouncement_set_contents(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
-	public static ChannelAnnouncement constructor_new(byte[] node_signature_1_arg, byte[] node_signature_2_arg, byte[] bitcoin_signature_1_arg, byte[] bitcoin_signature_2_arg, UnsignedChannelAnnouncement contents_arg) {
-		long ret = bindings.ChannelAnnouncement_new(node_signature_1_arg, node_signature_2_arg, bitcoin_signature_1_arg, bitcoin_signature_2_arg, contents_arg == null ? 0 : contents_arg.ptr & ~1);
-		ChannelAnnouncement ret_hu_conv = new ChannelAnnouncement(null, ret);
+	/**
+	 * Constructs a new ChannelAnnouncement given each field
+	 */
+	public static ChannelAnnouncement of(byte[] node_signature_1_arg, byte[] node_signature_2_arg, byte[] bitcoin_signature_1_arg, byte[] bitcoin_signature_2_arg, UnsignedChannelAnnouncement contents_arg) {
+		long ret = bindings.ChannelAnnouncement_new(InternalUtils.check_arr_len(node_signature_1_arg, 64), InternalUtils.check_arr_len(node_signature_2_arg, 64), InternalUtils.check_arr_len(bitcoin_signature_1_arg, 64), InternalUtils.check_arr_len(bitcoin_signature_2_arg, 64), contents_arg == null ? 0 : contents_arg.ptr & ~1);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ChannelAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelAnnouncement(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(contents_arg);
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.ChannelAnnouncement_clone_ptr(this.ptr);
+		return ret;
+	}
+
+	/**
+	 * Creates a copy of the ChannelAnnouncement
+	 */
+	public ChannelAnnouncement clone() {
+		long ret = bindings.ChannelAnnouncement_clone(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ChannelAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelAnnouncement(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Serialize the ChannelAnnouncement object into a byte array which can be read by ChannelAnnouncement_read
+	 */
 	public byte[] write() {
 		byte[] ret = bindings.ChannelAnnouncement_write(this.ptr);
 		return ret;
 	}
 
-	public static ChannelAnnouncement constructor_read(byte[] ser) {
+	/**
+	 * Read a ChannelAnnouncement from a byte array, created by ChannelAnnouncement_write
+	 */
+	public static Result_ChannelAnnouncementDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.ChannelAnnouncement_read(ser);
-		ChannelAnnouncement ret_hu_conv = new ChannelAnnouncement(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_ChannelAnnouncementDecodeErrorZ ret_hu_conv = Result_ChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}