X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUnsignedChannelAnnouncement.java;h=ebf3bc6e8fd216fe60309e5a2845eb20530895b6;hb=ffdd56c967087cba7548599934585b8a9a3102e2;hp=c83bc7e4941ff68123030f84231ae0edf110cb24;hpb=13cdf8bde340072288b39a5e29f0946d3e095ad4;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java b/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java
index c83bc7e4..ebf3bc6e 100644
--- a/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java
+++ b/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java
@@ -9,7 +9,9 @@ import javax.annotation.Nullable;
 
 
 /**
- * The unsigned part of a channel_announcement
+ * The unsigned part of a [`channel_announcement`] message.
+ * 
+ * [`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 UnsignedChannelAnnouncement extends CommonBase {
@@ -28,18 +30,18 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 		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); }
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	/**
 	 * The advertised channel features
 	 */
-	public void set_features(ChannelFeatures val) {
-		bindings.UnsignedChannelAnnouncement_set_features(this.ptr, val == null ? 0 : val.ptr);
+	public void set_features(org.ldk.structs.ChannelFeatures val) {
+		bindings.UnsignedChannelAnnouncement_set_features(this.ptr, val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
-		this.ptrs_to.add(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -79,75 +81,141 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 	}
 
 	/**
-	 * One of the two node_ids which are endpoints of this channel
+	 * One of the two `node_id`s which are endpoints of this channel
 	 */
-	public byte[] get_node_id_1() {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_node_id_1(this.ptr);
+	public NodeId get_node_id_1() {
+		long ret = bindings.UnsignedChannelAnnouncement_get_node_id_1(this.ptr);
 		Reference.reachabilityFence(this);
-		return ret;
+		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;
 	}
 
 	/**
-	 * One of the two node_ids which are endpoints of this channel
+	 * One of the two `node_id`s which are endpoints of this channel
 	 */
-	public void set_node_id_1(byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_node_id_1(this.ptr, InternalUtils.check_arr_len(val, 33));
+	public void set_node_id_1(org.ldk.structs.NodeId val) {
+		bindings.UnsignedChannelAnnouncement_set_node_id_1(this.ptr, val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
-	 * The other of the two node_ids which are endpoints of this channel
+	 * The other of the two `node_id`s which are endpoints of this channel
 	 */
-	public byte[] get_node_id_2() {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_node_id_2(this.ptr);
+	public NodeId get_node_id_2() {
+		long ret = bindings.UnsignedChannelAnnouncement_get_node_id_2(this.ptr);
 		Reference.reachabilityFence(this);
-		return ret;
+		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 other of the two node_ids which are endpoints of this channel
+	 * The other of the two `node_id`s which are endpoints of this channel
 	 */
-	public void set_node_id_2(byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_node_id_2(this.ptr, InternalUtils.check_arr_len(val, 33));
+	public void set_node_id_2(org.ldk.structs.NodeId val) {
+		bindings.UnsignedChannelAnnouncement_set_node_id_2(this.ptr, val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
 	 * The funding key for the first node
 	 */
-	public byte[] get_bitcoin_key_1() {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_1(this.ptr);
+	public NodeId get_bitcoin_key_1() {
+		long ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_1(this.ptr);
 		Reference.reachabilityFence(this);
-		return ret;
+		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 funding key for the first node
 	 */
-	public void set_bitcoin_key_1(byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_1(this.ptr, InternalUtils.check_arr_len(val, 33));
+	public void set_bitcoin_key_1(org.ldk.structs.NodeId val) {
+		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_1(this.ptr, val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
 	 * The funding key for the second node
 	 */
-	public byte[] get_bitcoin_key_2() {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_2(this.ptr);
+	public NodeId get_bitcoin_key_2() {
+		long ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_2(this.ptr);
 		Reference.reachabilityFence(this);
-		return ret;
+		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 funding key for the second node
 	 */
-	public void set_bitcoin_key_2(byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_2(this.ptr, InternalUtils.check_arr_len(val, 33));
+	public void set_bitcoin_key_2(org.ldk.structs.NodeId val) {
+		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_2(this.ptr, val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * Excess data which was signed as a part of the message which we do not (yet) understand how
+	 * to decode.
+	 * 
+	 * This is stored to ensure forward-compatibility as new fields are added to the lightning gossip protocol.
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public byte[] get_excess_data() {
+		byte[] ret = bindings.UnsignedChannelAnnouncement_get_excess_data(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	/**
+	 * Excess data which was signed as a part of the message which we do not (yet) understand how
+	 * to decode.
+	 * 
+	 * This is stored to ensure forward-compatibility as new fields are added to the lightning gossip protocol.
+	 */
+	public void set_excess_data(byte[] val) {
+		bindings.UnsignedChannelAnnouncement_set_excess_data(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
+	/**
+	 * Constructs a new UnsignedChannelAnnouncement given each field
+	 */
+	public static UnsignedChannelAnnouncement of(org.ldk.structs.ChannelFeatures features_arg, byte[] chain_hash_arg, long short_channel_id_arg, org.ldk.structs.NodeId node_id_1_arg, org.ldk.structs.NodeId node_id_2_arg, org.ldk.structs.NodeId bitcoin_key_1_arg, org.ldk.structs.NodeId bitcoin_key_2_arg, byte[] excess_data_arg) {
+		long ret = bindings.UnsignedChannelAnnouncement_new(features_arg.ptr, InternalUtils.check_arr_len(chain_hash_arg, 32), short_channel_id_arg, node_id_1_arg.ptr, node_id_2_arg.ptr, bitcoin_key_1_arg.ptr, bitcoin_key_2_arg.ptr, excess_data_arg);
+		Reference.reachabilityFence(features_arg);
+		Reference.reachabilityFence(chain_hash_arg);
+		Reference.reachabilityFence(short_channel_id_arg);
+		Reference.reachabilityFence(node_id_1_arg);
+		Reference.reachabilityFence(node_id_2_arg);
+		Reference.reachabilityFence(bitcoin_key_1_arg);
+		Reference.reachabilityFence(bitcoin_key_2_arg);
+		Reference.reachabilityFence(excess_data_arg);
+		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(ret_hu_conv); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(features_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(node_id_1_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(node_id_2_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(bitcoin_key_1_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(bitcoin_key_2_arg); };
+		return ret_hu_conv;
 	}
 
 	long clone_ptr() {
@@ -164,10 +232,39 @@ public class UnsignedChannelAnnouncement extends CommonBase {
 		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); }
-		ret_hu_conv.ptrs_to.add(this);
+		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 UnsignedChannelAnnouncement.
+	 */
+	public long hash() {
+		long ret = bindings.UnsignedChannelAnnouncement_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
+	/**
+	 * 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(org.ldk.structs.UnsignedChannelAnnouncement b) {
+		boolean ret = bindings.UnsignedChannelAnnouncement_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 UnsignedChannelAnnouncement)) return false;
+		return this.eq((UnsignedChannelAnnouncement)o);
+	}
 	/**
 	 * Serialize the UnsignedChannelAnnouncement object into a byte array which can be read by UnsignedChannelAnnouncement_read
 	 */