X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FClosingSigned.java;h=ab3a5478342f4a5967177388d549654fe106dbc5;hb=3c60e0fd0da579be9932801c1be2b32014c944a5;hp=948b60ef1fbfd123d78cb9bdd2fa4f6ddfdac574;hpb=8c0814bf345323be8f16e075a9af0bd43d9400ee;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ClosingSigned.java b/src/main/java/org/ldk/structs/ClosingSigned.java
index 948b60ef..ab3a5478 100644
--- a/src/main/java/org/ldk/structs/ClosingSigned.java
+++ b/src/main/java/org/ldk/structs/ClosingSigned.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,6 +25,7 @@ public class ClosingSigned extends CommonBase {
 	 */
 	public byte[] get_channel_id() {
 		byte[] ret = bindings.ClosingSigned_get_channel_id(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -31,7 +33,9 @@ public class ClosingSigned extends CommonBase {
 	 * The channel ID
 	 */
 	public void set_channel_id(byte[] val) {
-		bindings.ClosingSigned_set_channel_id(this.ptr, val);
+		bindings.ClosingSigned_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -39,6 +43,7 @@ public class ClosingSigned extends CommonBase {
 	 */
 	public long get_fee_satoshis() {
 		long ret = bindings.ClosingSigned_get_fee_satoshis(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -47,6 +52,8 @@ public class ClosingSigned extends CommonBase {
 	 */
 	public void set_fee_satoshis(long val) {
 		bindings.ClosingSigned_set_fee_satoshis(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -54,6 +61,7 @@ public class ClosingSigned extends CommonBase {
 	 */
 	public byte[] get_signature() {
 		byte[] ret = bindings.ClosingSigned_get_signature(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -61,7 +69,9 @@ public class ClosingSigned extends CommonBase {
 	 * A signature on the closing transaction
 	 */
 	public void set_signature(byte[] val) {
-		bindings.ClosingSigned_set_signature(this.ptr, val);
+		bindings.ClosingSigned_set_signature(this.ptr, InternalUtils.check_arr_len(val, 64));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -73,9 +83,10 @@ public class ClosingSigned extends CommonBase {
 	@Nullable
 	public ClosingSignedFeeRange get_fee_range() {
 		long ret = bindings.ClosingSigned_get_fee_range(this.ptr);
-		if (ret < 1024) { return null; }
-		ClosingSignedFeeRange ret_hu_conv = new ClosingSignedFeeRange(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ClosingSignedFeeRange ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ClosingSignedFeeRange(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -86,28 +97,43 @@ public class ClosingSigned extends CommonBase {
 	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
 	public void set_fee_range(@Nullable ClosingSignedFeeRange val) {
-		bindings.ClosingSigned_set_fee_range(this.ptr, val == null ? 0 : val.ptr & ~1);
+		bindings.ClosingSigned_set_fee_range(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
 	 * Constructs a new ClosingSigned given each field
 	 */
 	public static ClosingSigned of(byte[] channel_id_arg, long fee_satoshis_arg, byte[] signature_arg, ClosingSignedFeeRange fee_range_arg) {
-		long ret = bindings.ClosingSigned_new(channel_id_arg, fee_satoshis_arg, signature_arg, fee_range_arg == null ? 0 : fee_range_arg.ptr & ~1);
-		if (ret < 1024) { return null; }
-		ClosingSigned ret_hu_conv = new ClosingSigned(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		long ret = bindings.ClosingSigned_new(InternalUtils.check_arr_len(channel_id_arg, 32), fee_satoshis_arg, InternalUtils.check_arr_len(signature_arg, 64), fee_range_arg == null ? 0 : fee_range_arg.ptr);
+		Reference.reachabilityFence(channel_id_arg);
+		Reference.reachabilityFence(fee_satoshis_arg);
+		Reference.reachabilityFence(signature_arg);
+		Reference.reachabilityFence(fee_range_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ClosingSigned ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ClosingSigned(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(fee_range_arg); };
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.ClosingSigned_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the ClosingSigned
 	 */
 	public ClosingSigned clone() {
 		long ret = bindings.ClosingSigned_clone(this.ptr);
-		if (ret < 1024) { return null; }
-		ClosingSigned ret_hu_conv = new ClosingSigned(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ClosingSigned ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ClosingSigned(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -116,6 +142,7 @@ public class ClosingSigned extends CommonBase {
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.ClosingSigned_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -124,7 +151,8 @@ public class ClosingSigned extends CommonBase {
 	 */
 	public static Result_ClosingSignedDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.ClosingSigned_read(ser);
-		if (ret < 1024) { return null; }
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_ClosingSignedDecodeErrorZ ret_hu_conv = Result_ClosingSignedDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}