X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FFundingSigned.java;h=93e9a633ba3764307a0fe540e97fd624a6baebb7;hb=2bb592fb946e316dba9f4d1123f8ac72ff4e9bf8;hp=037a9c177b4cf2b44cca385ee7ef685351c9d24d;hpb=1b870a3ffab1c0024411e30102bc6d198300f095;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/FundingSigned.java b/src/main/java/org/ldk/structs/FundingSigned.java
index 037a9c17..93e9a633 100644
--- a/src/main/java/org/ldk/structs/FundingSigned.java
+++ b/src/main/java/org/ldk/structs/FundingSigned.java
@@ -4,10 +4,16 @@ 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 funding_signed message to be sent or received from a peer
+ * A [`funding_signed`] message to be sent to or received from a peer.
+ * 
+ * Used in V1 channel establishment
+ * 
+ * [`funding_signed`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-funding_signed-message
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class FundingSigned extends CommonBase {
@@ -23,6 +29,7 @@ public class FundingSigned extends CommonBase {
 	 */
 	public byte[] get_channel_id() {
 		byte[] ret = bindings.FundingSigned_get_channel_id(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -30,57 +37,105 @@ public class FundingSigned extends CommonBase {
 	 * The channel ID
 	 */
 	public void set_channel_id(byte[] val) {
-		bindings.FundingSigned_set_channel_id(this.ptr, val);
+		bindings.FundingSigned_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
-	 * The signature of the channel acceptor (fundee) on the funding transaction
+	 * The signature of the channel acceptor (fundee) on the initial commitment transaction
 	 */
 	public byte[] get_signature() {
 		byte[] ret = bindings.FundingSigned_get_signature(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
 	/**
-	 * The signature of the channel acceptor (fundee) on the funding transaction
+	 * The signature of the channel acceptor (fundee) on the initial commitment transaction
 	 */
 	public void set_signature(byte[] val) {
-		bindings.FundingSigned_set_signature(this.ptr, val);
+		bindings.FundingSigned_set_signature(this.ptr, InternalUtils.check_arr_len(val, 64));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
 	 * Constructs a new FundingSigned given each field
 	 */
-	public static FundingSigned constructor_new(byte[] channel_id_arg, byte[] signature_arg) {
-		long ret = bindings.FundingSigned_new(channel_id_arg, signature_arg);
-		FundingSigned ret_hu_conv = new FundingSigned(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+	public static FundingSigned of(byte[] channel_id_arg, byte[] signature_arg) {
+		long ret = bindings.FundingSigned_new(InternalUtils.check_arr_len(channel_id_arg, 32), InternalUtils.check_arr_len(signature_arg, 64));
+		Reference.reachabilityFence(channel_id_arg);
+		Reference.reachabilityFence(signature_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.FundingSigned ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.FundingSigned(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.FundingSigned_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the FundingSigned
 	 */
 	public FundingSigned clone() {
 		long ret = bindings.FundingSigned_clone(this.ptr);
-		FundingSigned ret_hu_conv = new FundingSigned(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.FundingSigned ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.FundingSigned(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 FundingSigned.
+	 */
+	public long hash() {
+		long ret = bindings.FundingSigned_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
+	/**
+	 * Checks if two FundingSigneds 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.FundingSigned b) {
+		boolean ret = bindings.FundingSigned_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 FundingSigned)) return false;
+		return this.eq((FundingSigned)o);
+	}
 	/**
 	 * Serialize the FundingSigned object into a byte array which can be read by FundingSigned_read
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.FundingSigned_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
 	/**
 	 * Read a FundingSigned from a byte array, created by FundingSigned_write
 	 */
-	public static Result_FundingSignedDecodeErrorZ constructor_read(byte[] ser) {
+	public static Result_FundingSignedDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.FundingSigned_read(ser);
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_FundingSignedDecodeErrorZ ret_hu_conv = Result_FundingSignedDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}