X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FCounterpartyChannelTransactionParameters.java;h=ce9db6448ea2dc2b9b25372224ce6aacedfee248;hb=07d5d868dfe064aadb28a7f7ca6002c16be9723d;hp=52ccf569e9a4e57a5e09f7dada374b20792150ee;hpb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/CounterpartyChannelTransactionParameters.java b/src/main/java/org/ldk/structs/CounterpartyChannelTransactionParameters.java
index 52ccf569..ce9db644 100644
--- a/src/main/java/org/ldk/structs/CounterpartyChannelTransactionParameters.java
+++ b/src/main/java/org/ldk/structs/CounterpartyChannelTransactionParameters.java
@@ -4,6 +4,7 @@ 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;
 
 
@@ -24,17 +25,21 @@ public class CounterpartyChannelTransactionParameters extends CommonBase {
 	 */
 	public ChannelPublicKeys get_pubkeys() {
 		long ret = bindings.CounterpartyChannelTransactionParameters_get_pubkeys(this.ptr);
+		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		ChannelPublicKeys ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelPublicKeys(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.ChannelPublicKeys ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelPublicKeys(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	/**
 	 * Counter-party public keys
 	 */
-	public void set_pubkeys(ChannelPublicKeys val) {
-		bindings.CounterpartyChannelTransactionParameters_set_pubkeys(this.ptr, val == null ? 0 : val.ptr & ~1);
+	public void set_pubkeys(org.ldk.structs.ChannelPublicKeys val) {
+		bindings.CounterpartyChannelTransactionParameters_set_pubkeys(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -42,6 +47,7 @@ public class CounterpartyChannelTransactionParameters extends CommonBase {
 	 */
 	public short get_selected_contest_delay() {
 		short ret = bindings.CounterpartyChannelTransactionParameters_get_selected_contest_delay(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -50,35 +56,77 @@ public class CounterpartyChannelTransactionParameters extends CommonBase {
 	 */
 	public void set_selected_contest_delay(short val) {
 		bindings.CounterpartyChannelTransactionParameters_set_selected_contest_delay(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
 	 * Constructs a new CounterpartyChannelTransactionParameters given each field
 	 */
-	public static CounterpartyChannelTransactionParameters of(ChannelPublicKeys pubkeys_arg, short selected_contest_delay_arg) {
-		long ret = bindings.CounterpartyChannelTransactionParameters_new(pubkeys_arg == null ? 0 : pubkeys_arg.ptr & ~1, selected_contest_delay_arg);
+	public static CounterpartyChannelTransactionParameters of(org.ldk.structs.ChannelPublicKeys pubkeys_arg, short selected_contest_delay_arg) {
+		long ret = bindings.CounterpartyChannelTransactionParameters_new(pubkeys_arg == null ? 0 : pubkeys_arg.ptr, selected_contest_delay_arg);
+		Reference.reachabilityFence(pubkeys_arg);
+		Reference.reachabilityFence(selected_contest_delay_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		CounterpartyChannelTransactionParameters ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new CounterpartyChannelTransactionParameters(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.CounterpartyChannelTransactionParameters ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.CounterpartyChannelTransactionParameters(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(pubkeys_arg); };
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.CounterpartyChannelTransactionParameters_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the CounterpartyChannelTransactionParameters
 	 */
 	public CounterpartyChannelTransactionParameters clone() {
 		long ret = bindings.CounterpartyChannelTransactionParameters_clone(this.ptr);
+		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		CounterpartyChannelTransactionParameters ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new CounterpartyChannelTransactionParameters(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.CounterpartyChannelTransactionParameters ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.CounterpartyChannelTransactionParameters(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 CounterpartyChannelTransactionParameters.
+	 */
+	public long hash() {
+		long ret = bindings.CounterpartyChannelTransactionParameters_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
+	/**
+	 * Checks if two CounterpartyChannelTransactionParameterss 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.CounterpartyChannelTransactionParameters b) {
+		boolean ret = bindings.CounterpartyChannelTransactionParameters_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 CounterpartyChannelTransactionParameters)) return false;
+		return this.eq((CounterpartyChannelTransactionParameters)o);
+	}
 	/**
 	 * Serialize the CounterpartyChannelTransactionParameters object into a byte array which can be read by CounterpartyChannelTransactionParameters_read
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.CounterpartyChannelTransactionParameters_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -87,6 +135,7 @@ public class CounterpartyChannelTransactionParameters extends CommonBase {
 	 */
 	public static Result_CounterpartyChannelTransactionParametersDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.CounterpartyChannelTransactionParameters_read(ser);
+		Reference.reachabilityFence(ser);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_CounterpartyChannelTransactionParametersDecodeErrorZ ret_hu_conv = Result_CounterpartyChannelTransactionParametersDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;