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=447b9bf02a710960c1251d7589725ab7de22a69d;hpb=17113550a5fefab21f39f27fbfe02646b8db53ae;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelAnnouncement.java b/src/main/java/org/ldk/structs/ChannelAnnouncement.java
index 447b9bf0..9382ad91 100644
--- a/src/main/java/org/ldk/structs/ChannelAnnouncement.java
+++ b/src/main/java/org/ldk/structs/ChannelAnnouncement.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;
 
 
 /**
@@ -30,7 +31,7 @@ public class ChannelAnnouncement extends CommonBase {
 	 * 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));
 	}
 
 	/**
@@ -45,7 +46,7 @@ public class ChannelAnnouncement extends CommonBase {
 	 * 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));
 	}
 
 	/**
@@ -60,7 +61,7 @@ public class ChannelAnnouncement extends CommonBase {
 	 * 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));
 	}
 
 	/**
@@ -75,7 +76,7 @@ public class ChannelAnnouncement extends CommonBase {
 	 * 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));
 	}
 
 	/**
@@ -83,7 +84,8 @@ public class ChannelAnnouncement extends CommonBase {
 	 */
 	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;
 	}
@@ -93,26 +95,31 @@ public class ChannelAnnouncement extends CommonBase {
 	 */
 	public void set_contents(UnsignedChannelAnnouncement val) {
 		bindings.ChannelAnnouncement_set_contents(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
 	/**
 	 * Constructs a new ChannelAnnouncement given each field
 	 */
-	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);
+	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);
-		ChannelAnnouncement ret_hu_conv = new ChannelAnnouncement(null, ret);
+		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;
 	}
@@ -128,8 +135,9 @@ public class ChannelAnnouncement extends CommonBase {
 	/**
 	 * Read a ChannelAnnouncement from a byte array, created by ChannelAnnouncement_write
 	 */
-	public static Result_ChannelAnnouncementDecodeErrorZ constructor_read(byte[] ser) {
+	public static Result_ChannelAnnouncementDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.ChannelAnnouncement_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_ChannelAnnouncementDecodeErrorZ ret_hu_conv = Result_ChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}