X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUnsignedChannelAnnouncement.java;h=d93703ca19a7971fa9e5873fad60d134c211c42e;hb=eab9331afd014558a982441138e222999a9955d1;hp=7af521468be8d32d318b08241c7696c1b45c6beb;hpb=de28908caacda7226bac70837a33cfe6e16417ab;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java b/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java
index 7af52146..d93703ca 100644
--- a/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java
+++ b/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java
@@ -2,95 +2,225 @@ package org.ldk.structs;
 
 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 [`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 {
 	UnsignedChannelAnnouncement(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.UnsignedChannelAnnouncement_free(ptr); super.finalize();
-	}
-
-	public UnsignedChannelAnnouncement(UnsignedChannelAnnouncement orig) {
-		super(bindings.UnsignedChannelAnnouncement_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
-	}
-
-	public ChannelFeatures get_features(UnsignedChannelAnnouncement this_ptr) {
-		ChannelFeatures ret = new ChannelFeatures(null, bindings.UnsignedChannelAnnouncement_get_features(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
-		return ret;
-	}
-
-	// Skipped UnsignedChannelAnnouncement_set_features
-	public byte[] get_chain_hash(UnsignedChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_chain_hash(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		return ret;
-	}
-
-	public void set_chain_hash(UnsignedChannelAnnouncement this_ptr, byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_chain_hash(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
-	}
-
-	public long get_short_channel_id(UnsignedChannelAnnouncement this_ptr) {
-		long ret = bindings.UnsignedChannelAnnouncement_get_short_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+		super.finalize();
+		if (ptr != 0) { bindings.UnsignedChannelAnnouncement_free(ptr); }
+	}
+
+	/**
+	 * The advertised channel features
+	 */
+	public ChannelFeatures get_features() {
+		long ret = bindings.UnsignedChannelAnnouncement_get_features(this.ptr);
+		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;
+	}
+
+	/**
+	 * The advertised channel features
+	 */
+	public void set_features(org.ldk.structs.ChannelFeatures 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); };
+	}
+
+	/**
+	 * The genesis hash of the blockchain where the channel is to be opened
+	 */
+	public byte[] get_chain_hash() {
+		byte[] ret = bindings.UnsignedChannelAnnouncement_get_chain_hash(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
-	public void set_short_channel_id(UnsignedChannelAnnouncement this_ptr, long val) {
-		bindings.UnsignedChannelAnnouncement_set_short_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * 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, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
-	public byte[] get_node_id_1(UnsignedChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_node_id_1(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The short channel ID
+	 */
+	public long get_short_channel_id() {
+		long ret = bindings.UnsignedChannelAnnouncement_get_short_channel_id(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
-	public void set_node_id_1(UnsignedChannelAnnouncement this_ptr, byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_node_id_1(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
-	}
-
-	public byte[] get_node_id_2(UnsignedChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_node_id_2(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The short channel ID
+	 */
+	public void set_short_channel_id(long val) {
+		bindings.UnsignedChannelAnnouncement_set_short_channel_id(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
+	/**
+	 * One of the two `node_id`s which are endpoints of this channel
+	 */
+	public NodeId get_node_id_1() {
+		long ret = bindings.UnsignedChannelAnnouncement_get_node_id_1(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;
+	}
+
+	/**
+	 * One of the two `node_id`s which are endpoints of this channel
+	 */
+	public void set_node_id_1(org.ldk.structs.NodeId val) {
+		bindings.UnsignedChannelAnnouncement_set_node_id_1(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * The other of the two `node_id`s which are endpoints of this channel
+	 */
+	public NodeId get_node_id_2() {
+		long ret = bindings.UnsignedChannelAnnouncement_get_node_id_2(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 other of the two `node_id`s which are endpoints of this channel
+	 */
+	public void set_node_id_2(org.ldk.structs.NodeId val) {
+		bindings.UnsignedChannelAnnouncement_set_node_id_2(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * The funding key for the first node
+	 */
+	public NodeId get_bitcoin_key_1() {
+		long ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_1(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 funding key for the first node
+	 */
+	public void set_bitcoin_key_1(org.ldk.structs.NodeId val) {
+		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_1(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * The funding key for the second node
+	 */
+	public NodeId get_bitcoin_key_2() {
+		long ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_2(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 funding key for the second node
+	 */
+	public void set_bitcoin_key_2(org.ldk.structs.NodeId val) {
+		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_2(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	long clone_ptr() {
+		long ret = bindings.UnsignedChannelAnnouncement_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
-	public void set_node_id_2(UnsignedChannelAnnouncement this_ptr, byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_node_id_2(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
-	}
-
-	public byte[] get_bitcoin_key_1(UnsignedChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_1(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Creates a copy of the UnsignedChannelAnnouncement
+	 */
+	public UnsignedChannelAnnouncement clone() {
+		long ret = bindings.UnsignedChannelAnnouncement_clone(this.ptr);
+		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(org.ldk.structs.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;
 	}
 
-	public void set_bitcoin_key_1(UnsignedChannelAnnouncement this_ptr, byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_1(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	@Override public boolean equals(Object o) {
+		if (!(o instanceof UnsignedChannelAnnouncement)) return false;
+		return this.eq((UnsignedChannelAnnouncement)o);
 	}
-
-	public byte[] get_bitcoin_key_2(UnsignedChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_2(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * 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;
 	}
 
-	public void set_bitcoin_key_2(UnsignedChannelAnnouncement this_ptr, byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_2(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
-	}
-
-	// Skipped UnsignedChannelAnnouncement_write
-	public UnsignedChannelAnnouncement(byte[] ser) {
-		super(bindings.UnsignedChannelAnnouncement_read(ser));
+	/**
+	 * Read a UnsignedChannelAnnouncement from a byte array, created by UnsignedChannelAnnouncement_write
+	 */
+	public static Result_UnsignedChannelAnnouncementDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.UnsignedChannelAnnouncement_read(ser);
+		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;
 	}
 
 }