X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FNodeAnnouncement.java;h=d43231761eda7b11846e2d3b220b290969ca23b8;hb=ffdd56c967087cba7548599934585b8a9a3102e2;hp=8c65c84e8c7dd30a78329acb84be04f09bde7d1a;hpb=e6173a79ce766cef7a660f22fc8fd1220975f6ea;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/NodeAnnouncement.java b/src/main/java/org/ldk/structs/NodeAnnouncement.java
index 8c65c84e..d4323176 100644
--- a/src/main/java/org/ldk/structs/NodeAnnouncement.java
+++ b/src/main/java/org/ldk/structs/NodeAnnouncement.java
@@ -4,11 +4,14 @@ 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 node_announcement message to be sent or received from a peer
+ * A [`node_announcement`] message to be sent to or received from a peer.
+ * 
+ * [`node_announcement`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-node_announcement-message
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class NodeAnnouncement extends CommonBase {
@@ -24,6 +27,7 @@ public class NodeAnnouncement extends CommonBase {
 	 */
 	public byte[] get_signature() {
 		byte[] ret = bindings.NodeAnnouncement_get_signature(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -31,7 +35,9 @@ public class NodeAnnouncement extends CommonBase {
 	 * The signature by the node key
 	 */
 	public void set_signature(byte[] val) {
-		bindings.NodeAnnouncement_set_signature(this.ptr, val);
+		bindings.NodeAnnouncement_set_signature(this.ptr, InternalUtils.check_arr_len(val, 64));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -39,46 +45,90 @@ public class NodeAnnouncement extends CommonBase {
 	 */
 	public UnsignedNodeAnnouncement get_contents() {
 		long ret = bindings.NodeAnnouncement_get_contents(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		UnsignedNodeAnnouncement ret_hu_conv = new UnsignedNodeAnnouncement(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.UnsignedNodeAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UnsignedNodeAnnouncement(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	/**
 	 * The actual content of the announcement
 	 */
-	public void set_contents(UnsignedNodeAnnouncement val) {
-		bindings.NodeAnnouncement_set_contents(this.ptr, val == null ? 0 : val.ptr & ~1);
+	public void set_contents(org.ldk.structs.UnsignedNodeAnnouncement val) {
+		bindings.NodeAnnouncement_set_contents(this.ptr, val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
 	 * Constructs a new NodeAnnouncement given each field
 	 */
-	public static NodeAnnouncement of(byte[] signature_arg, UnsignedNodeAnnouncement contents_arg) {
-		long ret = bindings.NodeAnnouncement_new(signature_arg, contents_arg == null ? 0 : contents_arg.ptr & ~1);
-		if (ret >= 0 && ret < 1024) { return null; }
-		NodeAnnouncement ret_hu_conv = new NodeAnnouncement(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+	public static NodeAnnouncement of(byte[] signature_arg, org.ldk.structs.UnsignedNodeAnnouncement contents_arg) {
+		long ret = bindings.NodeAnnouncement_new(InternalUtils.check_arr_len(signature_arg, 64), contents_arg.ptr);
+		Reference.reachabilityFence(signature_arg);
+		Reference.reachabilityFence(contents_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.NodeAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NodeAnnouncement(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(contents_arg); };
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.NodeAnnouncement_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the NodeAnnouncement
 	 */
 	public NodeAnnouncement clone() {
 		long ret = bindings.NodeAnnouncement_clone(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		NodeAnnouncement ret_hu_conv = new NodeAnnouncement(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.NodeAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NodeAnnouncement(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Generates a non-cryptographic 64-bit hash of the NodeAnnouncement.
+	 */
+	public long hash() {
+		long ret = bindings.NodeAnnouncement_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
+	/**
+	 * Checks if two NodeAnnouncements 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(org.ldk.structs.NodeAnnouncement b) {
+		boolean ret = bindings.NodeAnnouncement_eq(this.ptr, 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 NodeAnnouncement)) return false;
+		return this.eq((NodeAnnouncement)o);
+	}
 	/**
 	 * Serialize the NodeAnnouncement object into a byte array which can be read by NodeAnnouncement_read
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.NodeAnnouncement_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -87,7 +137,8 @@ public class NodeAnnouncement extends CommonBase {
 	 */
 	public static Result_NodeAnnouncementDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.NodeAnnouncement_read(ser);
-		if (ret >= 0 && ret < 1024) { return null; }
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NodeAnnouncementDecodeErrorZ ret_hu_conv = Result_NodeAnnouncementDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}