X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FStaticPaymentOutputDescriptor.java;h=7fcb906ed31d126edbcded28b46c4cf2ac05a87e;hb=6d094e745feaf94c1059555cd1c997965a34bc36;hp=ee0685a0e0546915e769e95906bb2709a1e7c533;hpb=ba1af51214a8ea2de62b84cd23b6145173c71752;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/StaticPaymentOutputDescriptor.java b/src/main/java/org/ldk/structs/StaticPaymentOutputDescriptor.java
index ee0685a0..7fcb906e 100644
--- a/src/main/java/org/ldk/structs/StaticPaymentOutputDescriptor.java
+++ b/src/main/java/org/ldk/structs/StaticPaymentOutputDescriptor.java
@@ -25,8 +25,8 @@ public class StaticPaymentOutputDescriptor extends CommonBase {
 	 */
 	public OutPoint get_outpoint() {
 		long ret = bindings.StaticPaymentOutputDescriptor_get_outpoint(this.ptr);
-		if (ret < 1024) { return null; }
-		OutPoint ret_hu_conv = new OutPoint(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		OutPoint ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new OutPoint(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -36,7 +36,6 @@ public class StaticPaymentOutputDescriptor extends CommonBase {
 	 */
 	public void set_outpoint(OutPoint val) {
 		bindings.StaticPaymentOutputDescriptor_set_outpoint(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
 	/**
@@ -62,7 +61,7 @@ public class StaticPaymentOutputDescriptor extends CommonBase {
 	 * the channel to spend the output.
 	 */
 	public void set_channel_keys_id(byte[] val) {
-		bindings.StaticPaymentOutputDescriptor_set_channel_keys_id(this.ptr, val);
+		bindings.StaticPaymentOutputDescriptor_set_channel_keys_id(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
 	/**
@@ -84,21 +83,25 @@ public class StaticPaymentOutputDescriptor extends CommonBase {
 	 * Constructs a new StaticPaymentOutputDescriptor given each field
 	 */
 	public static StaticPaymentOutputDescriptor of(OutPoint outpoint_arg, TxOut output_arg, byte[] channel_keys_id_arg, long channel_value_satoshis_arg) {
-		long ret = bindings.StaticPaymentOutputDescriptor_new(outpoint_arg == null ? 0 : outpoint_arg.ptr & ~1, output_arg.ptr, channel_keys_id_arg, channel_value_satoshis_arg);
-		if (ret < 1024) { return null; }
-		StaticPaymentOutputDescriptor ret_hu_conv = new StaticPaymentOutputDescriptor(null, ret);
+		long ret = bindings.StaticPaymentOutputDescriptor_new(outpoint_arg == null ? 0 : outpoint_arg.ptr & ~1, output_arg.ptr, InternalUtils.check_arr_len(channel_keys_id_arg, 32), channel_value_satoshis_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		StaticPaymentOutputDescriptor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new StaticPaymentOutputDescriptor(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(outpoint_arg);
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.StaticPaymentOutputDescriptor_clone_ptr(this.ptr);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the StaticPaymentOutputDescriptor
 	 */
 	public StaticPaymentOutputDescriptor clone() {
 		long ret = bindings.StaticPaymentOutputDescriptor_clone(this.ptr);
-		if (ret < 1024) { return null; }
-		StaticPaymentOutputDescriptor ret_hu_conv = new StaticPaymentOutputDescriptor(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		StaticPaymentOutputDescriptor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new StaticPaymentOutputDescriptor(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -116,7 +119,7 @@ public class StaticPaymentOutputDescriptor extends CommonBase {
 	 */
 	public static Result_StaticPaymentOutputDescriptorDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.StaticPaymentOutputDescriptor_read(ser);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_StaticPaymentOutputDescriptorDecodeErrorZ ret_hu_conv = Result_StaticPaymentOutputDescriptorDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}