X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FSpendableOutputDescriptor.java;h=40d06ee06ba6ffbcc4966614febf07b1e0f4e73b;hb=ff3dacec3be60f870d81f6df11bd9fff92aa6047;hp=34ff18ac1ec03dc60d5a8e10d9d5b42a0823af8e;hpb=6d094e745feaf94c1059555cd1c997965a34bc36;p=ldk-java diff --git a/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java b/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java index 34ff18ac..40d06ee0 100644 --- a/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java +++ b/src/main/java/org/ldk/structs/SpendableOutputDescriptor.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; @@ -47,11 +48,11 @@ public class SpendableOutputDescriptor extends CommonBase { /** * The outpoint which is spendable */ - public final OutPoint outpoint; + public final org.ldk.structs.OutPoint outpoint; /** * The output which is referenced by the given outpoint. */ - public final TxOut output; + public final org.ldk.structs.TxOut output; private StaticOutput(long ptr, bindings.LDKSpendableOutputDescriptor.StaticOutput obj) { super(null, ptr); long outpoint = obj.outpoint; @@ -94,7 +95,7 @@ public class SpendableOutputDescriptor extends CommonBase { * chan_utils::get_revokeable_redeemscript. */ public final static class DelayedPaymentOutput extends SpendableOutputDescriptor { - public final DelayedPaymentOutputDescriptor delayed_payment_output; + public final org.ldk.structs.DelayedPaymentOutputDescriptor delayed_payment_output; private DelayedPaymentOutput(long ptr, bindings.LDKSpendableOutputDescriptor.DelayedPaymentOutput obj) { super(null, ptr); long delayed_payment_output = obj.delayed_payment_output; @@ -113,7 +114,7 @@ public class SpendableOutputDescriptor extends CommonBase { * allowing us to claim the non-HTLC-encumbered outputs immediately. */ public final static class StaticPaymentOutput extends SpendableOutputDescriptor { - public final StaticPaymentOutputDescriptor static_payment_output; + public final org.ldk.structs.StaticPaymentOutputDescriptor static_payment_output; private StaticPaymentOutput(long ptr, bindings.LDKSpendableOutputDescriptor.StaticPaymentOutput obj) { super(null, ptr); long static_payment_output = obj.static_payment_output; @@ -124,6 +125,7 @@ public class SpendableOutputDescriptor extends CommonBase { } long clone_ptr() { long ret = bindings.SpendableOutputDescriptor_clone_ptr(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -132,8 +134,9 @@ public class SpendableOutputDescriptor extends CommonBase { */ public SpendableOutputDescriptor clone() { long ret = bindings.SpendableOutputDescriptor_clone(this.ptr); + Reference.reachabilityFence(this); if (ret >= 0 && ret <= 4096) { return null; } - SpendableOutputDescriptor ret_hu_conv = SpendableOutputDescriptor.constr_from_ptr(ret); + org.ldk.structs.SpendableOutputDescriptor ret_hu_conv = org.ldk.structs.SpendableOutputDescriptor.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -143,8 +146,10 @@ public class SpendableOutputDescriptor extends CommonBase { */ public static SpendableOutputDescriptor static_output(OutPoint outpoint, TxOut output) { long ret = bindings.SpendableOutputDescriptor_static_output(outpoint == null ? 0 : outpoint.ptr & ~1, output.ptr); + Reference.reachabilityFence(outpoint); + Reference.reachabilityFence(output); if (ret >= 0 && ret <= 4096) { return null; } - SpendableOutputDescriptor ret_hu_conv = SpendableOutputDescriptor.constr_from_ptr(ret); + org.ldk.structs.SpendableOutputDescriptor ret_hu_conv = org.ldk.structs.SpendableOutputDescriptor.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; } @@ -154,8 +159,9 @@ public class SpendableOutputDescriptor extends CommonBase { */ public static SpendableOutputDescriptor delayed_payment_output(DelayedPaymentOutputDescriptor a) { long ret = bindings.SpendableOutputDescriptor_delayed_payment_output(a == null ? 0 : a.ptr & ~1); + Reference.reachabilityFence(a); if (ret >= 0 && ret <= 4096) { return null; } - SpendableOutputDescriptor ret_hu_conv = SpendableOutputDescriptor.constr_from_ptr(ret); + org.ldk.structs.SpendableOutputDescriptor ret_hu_conv = org.ldk.structs.SpendableOutputDescriptor.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; } @@ -165,8 +171,9 @@ public class SpendableOutputDescriptor extends CommonBase { */ public static SpendableOutputDescriptor static_payment_output(StaticPaymentOutputDescriptor a) { long ret = bindings.SpendableOutputDescriptor_static_payment_output(a == null ? 0 : a.ptr & ~1); + Reference.reachabilityFence(a); if (ret >= 0 && ret <= 4096) { return null; } - SpendableOutputDescriptor ret_hu_conv = SpendableOutputDescriptor.constr_from_ptr(ret); + org.ldk.structs.SpendableOutputDescriptor ret_hu_conv = org.ldk.structs.SpendableOutputDescriptor.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; } @@ -176,6 +183,7 @@ public class SpendableOutputDescriptor extends CommonBase { */ public byte[] write() { byte[] ret = bindings.SpendableOutputDescriptor_write(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -184,6 +192,7 @@ public class SpendableOutputDescriptor extends CommonBase { */ public static Result_SpendableOutputDescriptorDecodeErrorZ read(byte[] ser) { long ret = bindings.SpendableOutputDescriptor_read(ser); + Reference.reachabilityFence(ser); if (ret >= 0 && ret <= 4096) { return null; } Result_SpendableOutputDescriptorDecodeErrorZ ret_hu_conv = Result_SpendableOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv;