X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelAnnouncement.java;h=ffac3ff74c6dafcd18365a972cf04dfa54b21a74;hb=2bb592fb946e316dba9f4d1123f8ac72ff4e9bf8;hp=7653ceba2eb1ac9eececf6007525a2c838d46ea6;hpb=32692e00046b7ec16b6a2e20bd54800b2b48d4c0;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelAnnouncement.java b/src/main/java/org/ldk/structs/ChannelAnnouncement.java
index 7653ceba..ffac3ff7 100644
--- a/src/main/java/org/ldk/structs/ChannelAnnouncement.java
+++ b/src/main/java/org/ldk/structs/ChannelAnnouncement.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 channel_announcement message to be sent or received from a peer
+ * A [`channel_announcement`] message to be sent to or received from a peer.
+ * 
+ * [`channel_announcement`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-channel_announcement-message
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class ChannelAnnouncement extends CommonBase {
@@ -24,6 +27,7 @@ public class ChannelAnnouncement extends CommonBase {
 	 */
 	public byte[] get_node_signature_1() {
 		byte[] ret = bindings.ChannelAnnouncement_get_node_signature_1(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -31,7 +35,9 @@ 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));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -39,6 +45,7 @@ public class ChannelAnnouncement extends CommonBase {
 	 */
 	public byte[] get_node_signature_2() {
 		byte[] ret = bindings.ChannelAnnouncement_get_node_signature_2(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -46,7 +53,9 @@ 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));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -54,6 +63,7 @@ public class ChannelAnnouncement extends CommonBase {
 	 */
 	public byte[] get_bitcoin_signature_1() {
 		byte[] ret = bindings.ChannelAnnouncement_get_bitcoin_signature_1(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -61,7 +71,9 @@ 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));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -69,6 +81,7 @@ public class ChannelAnnouncement extends CommonBase {
 	 */
 	public byte[] get_bitcoin_signature_2() {
 		byte[] ret = bindings.ChannelAnnouncement_get_bitcoin_signature_2(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -76,7 +89,9 @@ 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));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -84,46 +99,93 @@ public class ChannelAnnouncement extends CommonBase {
 	 */
 	public UnsignedChannelAnnouncement get_contents() {
 		long ret = bindings.ChannelAnnouncement_get_contents(this.ptr);
-		if (ret >= 0 && 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;
 	}
 
 	/**
 	 * The actual announcement
 	 */
-	public void set_contents(UnsignedChannelAnnouncement val) {
-		bindings.ChannelAnnouncement_set_contents(this.ptr, val == null ? 0 : val.ptr & ~1);
+	public void set_contents(org.ldk.structs.UnsignedChannelAnnouncement val) {
+		bindings.ChannelAnnouncement_set_contents(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
 	 * 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(node_signature_1_arg, node_signature_2_arg, bitcoin_signature_1_arg, bitcoin_signature_2_arg, contents_arg == null ? 0 : contents_arg.ptr & ~1);
-		if (ret >= 0 && ret < 1024) { return null; }
-		ChannelAnnouncement ret_hu_conv = new ChannelAnnouncement(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+	public static ChannelAnnouncement of(byte[] node_signature_1_arg, byte[] node_signature_2_arg, byte[] bitcoin_signature_1_arg, byte[] bitcoin_signature_2_arg, org.ldk.structs.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);
+		Reference.reachabilityFence(node_signature_1_arg);
+		Reference.reachabilityFence(node_signature_2_arg);
+		Reference.reachabilityFence(bitcoin_signature_1_arg);
+		Reference.reachabilityFence(bitcoin_signature_2_arg);
+		Reference.reachabilityFence(contents_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelAnnouncement(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.ChannelAnnouncement_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the ChannelAnnouncement
 	 */
 	public ChannelAnnouncement clone() {
 		long ret = bindings.ChannelAnnouncement_clone(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		ChannelAnnouncement ret_hu_conv = new ChannelAnnouncement(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelAnnouncement(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 ChannelAnnouncement.
+	 */
+	public long hash() {
+		long ret = bindings.ChannelAnnouncement_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
+	/**
+	 * Checks if two ChannelAnnouncements 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.ChannelAnnouncement b) {
+		boolean ret = bindings.ChannelAnnouncement_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 ChannelAnnouncement)) return false;
+		return this.eq((ChannelAnnouncement)o);
+	}
 	/**
 	 * 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);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -132,7 +194,8 @@ public class ChannelAnnouncement extends CommonBase {
 	 */
 	public static Result_ChannelAnnouncementDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.ChannelAnnouncement_read(ser);
-		if (ret >= 0 && ret < 1024) { return null; }
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_ChannelAnnouncementDecodeErrorZ ret_hu_conv = Result_ChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}