X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FStaticPaymentOutputDescriptor.java;h=bdfac8e2245c620a4a14a91e4ef22648feccd99a;hb=3c60e0fd0da579be9932801c1be2b32014c944a5;hp=a487e0278629b00b22d02a0ce8dd8581bdc13f08;hpb=9d146759e11191b55130be7a1b6988d3f289a168;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/StaticPaymentOutputDescriptor.java b/src/main/java/org/ldk/structs/StaticPaymentOutputDescriptor.java
index a487e027..bdfac8e2 100644
--- a/src/main/java/org/ldk/structs/StaticPaymentOutputDescriptor.java
+++ b/src/main/java/org/ldk/structs/StaticPaymentOutputDescriptor.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;
 
 
@@ -25,9 +26,10 @@ 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);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.OutPoint ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.OutPoint(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -35,7 +37,23 @@ public class StaticPaymentOutputDescriptor extends CommonBase {
 	 * The outpoint which is spendable
 	 */
 	public void set_outpoint(OutPoint val) {
-		bindings.StaticPaymentOutputDescriptor_set_outpoint(this.ptr, val == null ? 0 : val.ptr & ~1);
+		bindings.StaticPaymentOutputDescriptor_set_outpoint(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * The output which is referenced by the given outpoint
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public TxOut get_output() {
+		long ret = bindings.StaticPaymentOutputDescriptor_get_output(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		TxOut ret_conv = new TxOut(null, ret);
+		return ret_conv;
 	}
 
 	/**
@@ -43,6 +61,8 @@ public class StaticPaymentOutputDescriptor extends CommonBase {
 	 */
 	public void set_output(TxOut val) {
 		bindings.StaticPaymentOutputDescriptor_set_output(this.ptr, val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -52,6 +72,7 @@ public class StaticPaymentOutputDescriptor extends CommonBase {
 	 */
 	public byte[] get_channel_keys_id() {
 		byte[] ret = bindings.StaticPaymentOutputDescriptor_get_channel_keys_id(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -61,7 +82,9 @@ 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));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -69,6 +92,7 @@ public class StaticPaymentOutputDescriptor extends CommonBase {
 	 */
 	public long get_channel_value_satoshis() {
 		long ret = bindings.StaticPaymentOutputDescriptor_get_channel_value_satoshis(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -77,27 +101,41 @@ public class StaticPaymentOutputDescriptor extends CommonBase {
 	 */
 	public void set_channel_value_satoshis(long val) {
 		bindings.StaticPaymentOutputDescriptor_set_channel_value_satoshis(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
 	 * 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);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		long ret = bindings.StaticPaymentOutputDescriptor_new(outpoint_arg == null ? 0 : outpoint_arg.ptr, output_arg.ptr, InternalUtils.check_arr_len(channel_keys_id_arg, 32), channel_value_satoshis_arg);
+		Reference.reachabilityFence(outpoint_arg);
+		Reference.reachabilityFence(output_arg);
+		Reference.reachabilityFence(channel_keys_id_arg);
+		Reference.reachabilityFence(channel_value_satoshis_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.StaticPaymentOutputDescriptor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.StaticPaymentOutputDescriptor(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(outpoint_arg); };
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.StaticPaymentOutputDescriptor_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		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);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.StaticPaymentOutputDescriptor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.StaticPaymentOutputDescriptor(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -106,6 +144,7 @@ public class StaticPaymentOutputDescriptor extends CommonBase {
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.StaticPaymentOutputDescriptor_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -114,7 +153,8 @@ public class StaticPaymentOutputDescriptor extends CommonBase {
 	 */
 	public static Result_StaticPaymentOutputDescriptorDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.StaticPaymentOutputDescriptor_read(ser);
-		if (ret < 1024) { return null; }
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_StaticPaymentOutputDescriptorDecodeErrorZ ret_hu_conv = Result_StaticPaymentOutputDescriptorDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}