X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUnsignedChannelAnnouncement.java;h=d042e41b80565c763d7caf0a566417c2c69f8119;hb=300b54d26fe5ed89f472ef821ebf67d56c917e49;hp=4f789fa42560d521ba8709602b637686bc3784c2;hpb=ba1af51214a8ea2de62b84cd23b6145173c71752;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java b/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java
index 4f789fa4..d042e41b 100644
--- a/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java
+++ b/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.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,9 +25,10 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 */
 	public ChannelFeatures get_features() {
 		long ret = bindings.UnsignedChannelAnnouncement_get_features(this.ptr);
-		if (ret < 1024) { return null; }
-		ChannelFeatures ret_hu_conv = new ChannelFeatures(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelFeatures(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -34,8 +36,10 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 * The advertised channel features
 	 */
 	public void set_features(ChannelFeatures val) {
-		bindings.UnsignedChannelAnnouncement_set_features(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
+		bindings.UnsignedChannelAnnouncement_set_features(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -43,6 +47,7 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 */
 	public byte[] get_chain_hash() {
 		byte[] ret = bindings.UnsignedChannelAnnouncement_get_chain_hash(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -50,7 +55,9 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 * The genesis hash of the blockchain where the channel is to be opened
 	 */
 	public void set_chain_hash(byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_chain_hash(this.ptr, val);
+		bindings.UnsignedChannelAnnouncement_set_chain_hash(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -58,6 +65,7 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 */
 	public long get_short_channel_id() {
 		long ret = bindings.UnsignedChannelAnnouncement_get_short_channel_id(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -66,6 +74,8 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 */
 	public void set_short_channel_id(long val) {
 		bindings.UnsignedChannelAnnouncement_set_short_channel_id(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -73,6 +83,7 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 */
 	public byte[] get_node_id_1() {
 		byte[] ret = bindings.UnsignedChannelAnnouncement_get_node_id_1(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -80,7 +91,9 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 * One of the two node_ids which are endpoints of this channel
 	 */
 	public void set_node_id_1(byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_node_id_1(this.ptr, val);
+		bindings.UnsignedChannelAnnouncement_set_node_id_1(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -88,6 +101,7 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 */
 	public byte[] get_node_id_2() {
 		byte[] ret = bindings.UnsignedChannelAnnouncement_get_node_id_2(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -95,7 +109,9 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 * The other of the two node_ids which are endpoints of this channel
 	 */
 	public void set_node_id_2(byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_node_id_2(this.ptr, val);
+		bindings.UnsignedChannelAnnouncement_set_node_id_2(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -103,6 +119,7 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 */
 	public byte[] get_bitcoin_key_1() {
 		byte[] ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_1(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -110,7 +127,9 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 * The funding key for the first node
 	 */
 	public void set_bitcoin_key_1(byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_1(this.ptr, val);
+		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_1(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -118,6 +137,7 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 */
 	public byte[] get_bitcoin_key_2() {
 		byte[] ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_2(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -125,7 +145,15 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 * The funding key for the second node
 	 */
 	public void set_bitcoin_key_2(byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_2(this.ptr, val);
+		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_2(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
+	long clone_ptr() {
+		long ret = bindings.UnsignedChannelAnnouncement_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
 	}
 
 	/**
@@ -133,17 +161,36 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 */
 	public UnsignedChannelAnnouncement clone() {
 		long ret = bindings.UnsignedChannelAnnouncement_clone(this.ptr);
-		if (ret < 1024) { return null; }
-		UnsignedChannelAnnouncement ret_hu_conv = new UnsignedChannelAnnouncement(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.UnsignedChannelAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UnsignedChannelAnnouncement(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Checks if two UnsignedChannelAnnouncements contain equal inner contents.
+	 * This ignores pointers and is_owned flags and looks at the values in fields.
+	 * Two objects with NULL inner values will be considered "equal" here.
+	 */
+	public boolean eq(UnsignedChannelAnnouncement b) {
+		boolean ret = bindings.UnsignedChannelAnnouncement_eq(this.ptr, b == null ? 0 : b.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(b);
+		if (this != null) { this.ptrs_to.add(b); };
+		return ret;
+	}
+
+	@Override public boolean equals(Object o) {
+		if (!(o instanceof UnsignedChannelAnnouncement)) return false;
+		return this.eq((UnsignedChannelAnnouncement)o);
+	}
 	/**
 	 * Serialize the UnsignedChannelAnnouncement object into a byte array which can be read by UnsignedChannelAnnouncement_read
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.UnsignedChannelAnnouncement_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -152,7 +199,8 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	 */
 	public static Result_UnsignedChannelAnnouncementDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.UnsignedChannelAnnouncement_read(ser);
-		if (ret < 1024) { return null; }
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_UnsignedChannelAnnouncementDecodeErrorZ ret_hu_conv = Result_UnsignedChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}