X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUnsignedNodeAnnouncement.java;h=e2503758813b0a4baecc8813178989750835eac9;hb=2bb592fb946e316dba9f4d1123f8ac72ff4e9bf8;hp=3bacc584f6fc5c4d7261c603425df56c94a13e81;hpb=b0c50b891cbca28d3bd1d86276c132ff5221d8e4;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/UnsignedNodeAnnouncement.java b/src/main/java/org/ldk/structs/UnsignedNodeAnnouncement.java
index 3bacc584..e2503758 100644
--- a/src/main/java/org/ldk/structs/UnsignedNodeAnnouncement.java
+++ b/src/main/java/org/ldk/structs/UnsignedNodeAnnouncement.java
@@ -4,10 +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;
 
 
 /**
- * The unsigned part of a node_announcement
+ * The unsigned part of a [`node_announcement`] message.
+ * 
+ * [`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 UnsignedNodeAnnouncement extends CommonBase {
@@ -23,17 +27,21 @@ public class UnsignedNodeAnnouncement extends CommonBase {
 	 */
 	public NodeFeatures get_features() {
 		long ret = bindings.UnsignedNodeAnnouncement_get_features(this.ptr);
-		NodeFeatures ret_hu_conv = new NodeFeatures(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.NodeFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NodeFeatures(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	/**
 	 * The advertised features
 	 */
-	public void set_features(NodeFeatures val) {
-		bindings.UnsignedNodeAnnouncement_set_features(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
+	public void set_features(org.ldk.structs.NodeFeatures val) {
+		bindings.UnsignedNodeAnnouncement_set_features(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -41,6 +49,7 @@ public class UnsignedNodeAnnouncement extends CommonBase {
 	 */
 	public int get_timestamp() {
 		int ret = bindings.UnsignedNodeAnnouncement_get_timestamp(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -49,23 +58,32 @@ public class UnsignedNodeAnnouncement extends CommonBase {
 	 */
 	public void set_timestamp(int val) {
 		bindings.UnsignedNodeAnnouncement_set_timestamp(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
-	 * The node_id this announcement originated from (don't rebroadcast the node_announcement back
+	 * The `node_id` this announcement originated from (don't rebroadcast the `node_announcement` back
 	 * to this node).
 	 */
-	public byte[] get_node_id() {
-		byte[] ret = bindings.UnsignedNodeAnnouncement_get_node_id(this.ptr);
-		return ret;
+	public NodeId get_node_id() {
+		long ret = bindings.UnsignedNodeAnnouncement_get_node_id(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.NodeId ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NodeId(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
 	}
 
 	/**
-	 * The node_id this announcement originated from (don't rebroadcast the node_announcement back
+	 * The `node_id` this announcement originated from (don't rebroadcast the `node_announcement` back
 	 * to this node).
 	 */
-	public void set_node_id(byte[] val) {
-		bindings.UnsignedNodeAnnouncement_set_node_id(this.ptr, val);
+	public void set_node_id(org.ldk.structs.NodeId val) {
+		bindings.UnsignedNodeAnnouncement_set_node_id(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -73,6 +91,7 @@ public class UnsignedNodeAnnouncement extends CommonBase {
 	 */
 	public byte[] get_rgb() {
 		byte[] ret = bindings.UnsignedNodeAnnouncement_get_rgb(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -80,32 +99,70 @@ public class UnsignedNodeAnnouncement extends CommonBase {
 	 * An RGB color for UI purposes
 	 */
 	public void set_rgb(byte[] val) {
-		bindings.UnsignedNodeAnnouncement_set_rgb(this.ptr, val);
+		bindings.UnsignedNodeAnnouncement_set_rgb(this.ptr, InternalUtils.check_arr_len(val, 3));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
-	 * An alias, for UI purposes.  This should be sanitized before use.  There is no guarantee
-	 * of uniqueness.
+	 * An alias, for UI purposes.
+	 * 
+	 * This should be sanitized before use. There is no guarantee of uniqueness.
 	 */
-	public byte[] get_alias() {
-		byte[] ret = bindings.UnsignedNodeAnnouncement_get_alias(this.ptr);
-		return ret;
+	public NodeAlias get_alias() {
+		long ret = bindings.UnsignedNodeAnnouncement_get_alias(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.NodeAlias ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NodeAlias(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * An alias, for UI purposes.
+	 * 
+	 * This should be sanitized before use. There is no guarantee of uniqueness.
+	 */
+	public void set_alias(org.ldk.structs.NodeAlias val) {
+		bindings.UnsignedNodeAnnouncement_set_alias(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
-	 * An alias, for UI purposes.  This should be sanitized before use.  There is no guarantee
-	 * of uniqueness.
+	 * List of addresses on which this node is reachable
+	 * 
+	 * Returns a copy of the field.
 	 */
-	public void set_alias(byte[] val) {
-		bindings.UnsignedNodeAnnouncement_set_alias(this.ptr, val);
+	public SocketAddress[] get_addresses() {
+		long[] ret = bindings.UnsignedNodeAnnouncement_get_addresses(this.ptr);
+		Reference.reachabilityFence(this);
+		int ret_conv_15_len = ret.length;
+		SocketAddress[] ret_conv_15_arr = new SocketAddress[ret_conv_15_len];
+		for (int p = 0; p < ret_conv_15_len; p++) {
+			long ret_conv_15 = ret[p];
+			org.ldk.structs.SocketAddress ret_conv_15_hu_conv = org.ldk.structs.SocketAddress.constr_from_ptr(ret_conv_15);
+			if (ret_conv_15_hu_conv != null) { ret_conv_15_hu_conv.ptrs_to.add(this); };
+			ret_conv_15_arr[p] = ret_conv_15_hu_conv;
+		}
+		return ret_conv_15_arr;
 	}
 
 	/**
 	 * List of addresses on which this node is reachable
 	 */
-	public void set_addresses(NetAddress[] val) {
-		bindings.UnsignedNodeAnnouncement_set_addresses(this.ptr, Arrays.stream(val).mapToLong(val_conv_12 -> val_conv_12.ptr).toArray());
-		/* TODO 2 NetAddress  */;
+	public void set_addresses(SocketAddress[] val) {
+		bindings.UnsignedNodeAnnouncement_set_addresses(this.ptr, val != null ? Arrays.stream(val).mapToLong(val_conv_15 -> val_conv_15.ptr).toArray() : null);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		for (SocketAddress val_conv_15: val) { if (this != null) { this.ptrs_to.add(val_conv_15); }; };
+	}
+
+	long clone_ptr() {
+		long ret = bindings.UnsignedNodeAnnouncement_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
 	}
 
 	/**
@@ -113,16 +170,48 @@ public class UnsignedNodeAnnouncement extends CommonBase {
 	 */
 	public UnsignedNodeAnnouncement clone() {
 		long ret = bindings.UnsignedNodeAnnouncement_clone(this.ptr);
-		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;
 	}
 
+	/**
+	 * Generates a non-cryptographic 64-bit hash of the UnsignedNodeAnnouncement.
+	 */
+	public long hash() {
+		long ret = bindings.UnsignedNodeAnnouncement_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
+	/**
+	 * Checks if two UnsignedNodeAnnouncements 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.UnsignedNodeAnnouncement b) {
+		boolean ret = bindings.UnsignedNodeAnnouncement_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 UnsignedNodeAnnouncement)) return false;
+		return this.eq((UnsignedNodeAnnouncement)o);
+	}
 	/**
 	 * Serialize the UnsignedNodeAnnouncement object into a byte array which can be read by UnsignedNodeAnnouncement_read
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.UnsignedNodeAnnouncement_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -131,6 +220,8 @@ public class UnsignedNodeAnnouncement extends CommonBase {
 	 */
 	public static Result_UnsignedNodeAnnouncementDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.UnsignedNodeAnnouncement_read(ser);
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_UnsignedNodeAnnouncementDecodeErrorZ ret_hu_conv = Result_UnsignedNodeAnnouncementDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}