X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FDelayedPaymentOutputDescriptor.java;h=7ba24726b1fc5ea457925b27615877e424c21294;hb=890e35a4387758c0447aab34166caa579bbf3a08;hp=c0b84328a43f7c4cbd3b4133330e55fae42f377c;hpb=99d1a3bd6dc5c7ed1499b30bfc2b4c66ffaf858a;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/DelayedPaymentOutputDescriptor.java b/src/main/java/org/ldk/structs/DelayedPaymentOutputDescriptor.java
index c0b84328..7ba24726 100644
--- a/src/main/java/org/ldk/structs/DelayedPaymentOutputDescriptor.java
+++ b/src/main/java/org/ldk/structs/DelayedPaymentOutputDescriptor.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 DelayedPaymentOutputDescriptor extends CommonBase {
 	 */
 	public OutPoint get_outpoint() {
 		long ret = bindings.DelayedPaymentOutputDescriptor_get_outpoint(this.ptr);
+		Reference.reachabilityFence(this);
 		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);
+		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,10 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 * The outpoint which is spendable
 	 */
 	public void set_outpoint(OutPoint val) {
-		bindings.DelayedPaymentOutputDescriptor_set_outpoint(this.ptr, val == null ? 0 : val.ptr & ~1);
+		bindings.DelayedPaymentOutputDescriptor_set_outpoint(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -43,6 +48,7 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 */
 	public byte[] get_per_commitment_point() {
 		byte[] ret = bindings.DelayedPaymentOutputDescriptor_get_per_commitment_point(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -50,7 +56,9 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 * Per commitment point to derive delayed_payment_key by key holder
 	 */
 	public void set_per_commitment_point(byte[] val) {
-		bindings.DelayedPaymentOutputDescriptor_set_per_commitment_point(this.ptr, val);
+		bindings.DelayedPaymentOutputDescriptor_set_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -59,6 +67,7 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 */
 	public short get_to_self_delay() {
 		short ret = bindings.DelayedPaymentOutputDescriptor_get_to_self_delay(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -68,6 +77,21 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 */
 	public void set_to_self_delay(short val) {
 		bindings.DelayedPaymentOutputDescriptor_set_to_self_delay(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
+	/**
+	 * The output which is referenced by the given outpoint
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public TxOut get_output() {
+		long ret = bindings.DelayedPaymentOutputDescriptor_get_output(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		TxOut ret_conv = new TxOut(null, ret);
+		return ret_conv;
 	}
 
 	/**
@@ -75,6 +99,8 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 */
 	public void set_output(TxOut val) {
 		bindings.DelayedPaymentOutputDescriptor_set_output(this.ptr, val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -83,6 +109,7 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 */
 	public byte[] get_revocation_pubkey() {
 		byte[] ret = bindings.DelayedPaymentOutputDescriptor_get_revocation_pubkey(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -91,7 +118,9 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 * derive the witnessScript for this output.
 	 */
 	public void set_revocation_pubkey(byte[] val) {
-		bindings.DelayedPaymentOutputDescriptor_set_revocation_pubkey(this.ptr, val);
+		bindings.DelayedPaymentOutputDescriptor_set_revocation_pubkey(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -101,6 +130,7 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 */
 	public byte[] get_channel_keys_id() {
 		byte[] ret = bindings.DelayedPaymentOutputDescriptor_get_channel_keys_id(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -110,7 +140,9 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 * the channel to spend the output.
 	 */
 	public void set_channel_keys_id(byte[] val) {
-		bindings.DelayedPaymentOutputDescriptor_set_channel_keys_id(this.ptr, val);
+		bindings.DelayedPaymentOutputDescriptor_set_channel_keys_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -118,6 +150,7 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 */
 	public long get_channel_value_satoshis() {
 		long ret = bindings.DelayedPaymentOutputDescriptor_get_channel_value_satoshis(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -126,27 +159,44 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 */
 	public void set_channel_value_satoshis(long val) {
 		bindings.DelayedPaymentOutputDescriptor_set_channel_value_satoshis(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
 	 * Constructs a new DelayedPaymentOutputDescriptor given each field
 	 */
 	public static DelayedPaymentOutputDescriptor of(OutPoint outpoint_arg, byte[] per_commitment_point_arg, short to_self_delay_arg, TxOut output_arg, byte[] revocation_pubkey_arg, byte[] channel_keys_id_arg, long channel_value_satoshis_arg) {
-		long ret = bindings.DelayedPaymentOutputDescriptor_new(outpoint_arg == null ? 0 : outpoint_arg.ptr & ~1, per_commitment_point_arg, to_self_delay_arg, output_arg.ptr, revocation_pubkey_arg, channel_keys_id_arg, channel_value_satoshis_arg);
+		long ret = bindings.DelayedPaymentOutputDescriptor_new(outpoint_arg == null ? 0 : outpoint_arg.ptr, InternalUtils.check_arr_len(per_commitment_point_arg, 33), to_self_delay_arg, output_arg.ptr, InternalUtils.check_arr_len(revocation_pubkey_arg, 33), InternalUtils.check_arr_len(channel_keys_id_arg, 32), channel_value_satoshis_arg);
+		Reference.reachabilityFence(outpoint_arg);
+		Reference.reachabilityFence(per_commitment_point_arg);
+		Reference.reachabilityFence(to_self_delay_arg);
+		Reference.reachabilityFence(output_arg);
+		Reference.reachabilityFence(revocation_pubkey_arg);
+		Reference.reachabilityFence(channel_keys_id_arg);
+		Reference.reachabilityFence(channel_value_satoshis_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		DelayedPaymentOutputDescriptor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new DelayedPaymentOutputDescriptor(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.DelayedPaymentOutputDescriptor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.DelayedPaymentOutputDescriptor(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.DelayedPaymentOutputDescriptor_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the DelayedPaymentOutputDescriptor
 	 */
 	public DelayedPaymentOutputDescriptor clone() {
 		long ret = bindings.DelayedPaymentOutputDescriptor_clone(this.ptr);
+		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		DelayedPaymentOutputDescriptor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new DelayedPaymentOutputDescriptor(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.DelayedPaymentOutputDescriptor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.DelayedPaymentOutputDescriptor(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -155,6 +205,7 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.DelayedPaymentOutputDescriptor_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -163,6 +214,7 @@ public class DelayedPaymentOutputDescriptor extends CommonBase {
 	 */
 	public static Result_DelayedPaymentOutputDescriptorDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.DelayedPaymentOutputDescriptor_read(ser);
+		Reference.reachabilityFence(ser);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_DelayedPaymentOutputDescriptorDecodeErrorZ ret_hu_conv = Result_DelayedPaymentOutputDescriptorDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;