X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FShutdown.java;h=08b4aada0a296ff090f9c5f8e45eeeb813dbd41e;hb=ffdd56c967087cba7548599934585b8a9a3102e2;hp=0eb4462536c582201b37a2a042fc2288f24b2b87;hpb=2a8741cb87eb2b82381a6220a98f80f741147837;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Shutdown.java b/src/main/java/org/ldk/structs/Shutdown.java
index 0eb44625..08b4aada 100644
--- a/src/main/java/org/ldk/structs/Shutdown.java
+++ b/src/main/java/org/ldk/structs/Shutdown.java
@@ -9,7 +9,9 @@ import javax.annotation.Nullable;
 
 
 /**
- * A shutdown message to be sent or received from a peer
+ * A [`shutdown`] message to be sent to or received from a peer.
+ * 
+ * [`shutdown`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#closing-initiation-shutdown
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class Shutdown extends CommonBase {
@@ -23,24 +25,29 @@ public class Shutdown extends CommonBase {
 	/**
 	 * The channel ID
 	 */
-	public byte[] get_channel_id() {
-		byte[] ret = bindings.Shutdown_get_channel_id(this.ptr);
+	public ChannelId get_channel_id() {
+		long ret = bindings.Shutdown_get_channel_id(this.ptr);
 		Reference.reachabilityFence(this);
-		return ret;
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelId ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelId(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
 	}
 
 	/**
 	 * The channel ID
 	 */
-	public void set_channel_id(byte[] val) {
-		bindings.Shutdown_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+	public void set_channel_id(org.ldk.structs.ChannelId val) {
+		bindings.Shutdown_set_channel_id(this.ptr, val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
 	 * The destination of this peer's funds on closing.
-	 * Must be in one of these forms: p2pkh, p2sh, p2wpkh, p2wsh.
+	 * 
+	 * Must be in one of these forms: P2PKH, P2SH, P2WPKH, P2WSH, P2TR.
 	 */
 	public byte[] get_scriptpubkey() {
 		byte[] ret = bindings.Shutdown_get_scriptpubkey(this.ptr);
@@ -50,7 +57,8 @@ public class Shutdown extends CommonBase {
 
 	/**
 	 * The destination of this peer's funds on closing.
-	 * Must be in one of these forms: p2pkh, p2sh, p2wpkh, p2wsh.
+	 * 
+	 * Must be in one of these forms: P2PKH, P2SH, P2WPKH, P2WSH, P2TR.
 	 */
 	public void set_scriptpubkey(byte[] val) {
 		bindings.Shutdown_set_scriptpubkey(this.ptr, val);
@@ -61,13 +69,14 @@ public class Shutdown extends CommonBase {
 	/**
 	 * Constructs a new Shutdown given each field
 	 */
-	public static Shutdown of(byte[] channel_id_arg, byte[] scriptpubkey_arg) {
-		long ret = bindings.Shutdown_new(InternalUtils.check_arr_len(channel_id_arg, 32), scriptpubkey_arg);
+	public static Shutdown of(org.ldk.structs.ChannelId channel_id_arg, byte[] scriptpubkey_arg) {
+		long ret = bindings.Shutdown_new(channel_id_arg.ptr, scriptpubkey_arg);
 		Reference.reachabilityFence(channel_id_arg);
 		Reference.reachabilityFence(scriptpubkey_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.Shutdown ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.Shutdown(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		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(channel_id_arg); };
 		return ret_hu_conv;
 	}
 
@@ -85,10 +94,39 @@ public class Shutdown extends CommonBase {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.Shutdown ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.Shutdown(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 Shutdown.
+	 */
+	public long hash() {
+		long ret = bindings.Shutdown_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
+	/**
+	 * Checks if two Shutdowns 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.Shutdown b) {
+		boolean ret = bindings.Shutdown_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 Shutdown)) return false;
+		return this.eq((Shutdown)o);
+	}
 	/**
 	 * Serialize the Shutdown object into a byte array which can be read by Shutdown_read
 	 */