X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FSpendableOutputDescriptor.java;h=902795cabeafd5ebf073a14dac8e4cd1855fc853;hb=f385eff0dd0aa61fbf21ae946c424f4a6a26de04;hp=d07fb081a351a7190e89a9f0646e12f3cc8ed115;hpb=d2925e24ac4643ec22eb73495f0424e27def2545;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java b/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java
index d07fb081..902795ca 100644
--- a/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java
+++ b/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java
@@ -48,16 +48,16 @@ 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;
-			OutPoint outpoint_hu_conv = null; if (outpoint < 0 || outpoint > 4096) { outpoint_hu_conv = new OutPoint(null, outpoint); }
-			outpoint_hu_conv.ptrs_to.add(this);
+			org.ldk.structs.OutPoint outpoint_hu_conv = null; if (outpoint < 0 || outpoint > 4096) { outpoint_hu_conv = new org.ldk.structs.OutPoint(null, outpoint); }
+			if (outpoint_hu_conv != null) { outpoint_hu_conv.ptrs_to.add(this); };
 			this.outpoint = outpoint_hu_conv;
 			long output = obj.output;
 			TxOut output_conv = new TxOut(null, output);
@@ -95,12 +95,12 @@ 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;
-			DelayedPaymentOutputDescriptor delayed_payment_output_hu_conv = null; if (delayed_payment_output < 0 || delayed_payment_output > 4096) { delayed_payment_output_hu_conv = new DelayedPaymentOutputDescriptor(null, delayed_payment_output); }
-			delayed_payment_output_hu_conv.ptrs_to.add(this);
+			org.ldk.structs.DelayedPaymentOutputDescriptor delayed_payment_output_hu_conv = null; if (delayed_payment_output < 0 || delayed_payment_output > 4096) { delayed_payment_output_hu_conv = new org.ldk.structs.DelayedPaymentOutputDescriptor(null, delayed_payment_output); }
+			if (delayed_payment_output_hu_conv != null) { delayed_payment_output_hu_conv.ptrs_to.add(this); };
 			this.delayed_payment_output = delayed_payment_output_hu_conv;
 		}
 	}
@@ -114,12 +114,12 @@ 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;
-			StaticPaymentOutputDescriptor static_payment_output_hu_conv = null; if (static_payment_output < 0 || static_payment_output > 4096) { static_payment_output_hu_conv = new StaticPaymentOutputDescriptor(null, static_payment_output); }
-			static_payment_output_hu_conv.ptrs_to.add(this);
+			org.ldk.structs.StaticPaymentOutputDescriptor static_payment_output_hu_conv = null; if (static_payment_output < 0 || static_payment_output > 4096) { static_payment_output_hu_conv = new org.ldk.structs.StaticPaymentOutputDescriptor(null, static_payment_output); }
+			if (static_payment_output_hu_conv != null) { static_payment_output_hu_conv.ptrs_to.add(this); };
 			this.static_payment_output = static_payment_output_hu_conv;
 		}
 	}
@@ -136,8 +136,8 @@ public class SpendableOutputDescriptor extends CommonBase {
 		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);
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.SpendableOutputDescriptor ret_hu_conv = org.ldk.structs.SpendableOutputDescriptor.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -145,12 +145,13 @@ public class SpendableOutputDescriptor extends CommonBase {
 	 * Utility method to constructs a new StaticOutput-variant SpendableOutputDescriptor
 	 */
 	public static SpendableOutputDescriptor static_output(OutPoint outpoint, TxOut output) {
-		long ret = bindings.SpendableOutputDescriptor_static_output(outpoint == null ? 0 : outpoint.ptr & ~1, output.ptr);
+		long ret = bindings.SpendableOutputDescriptor_static_output(outpoint == null ? 0 : outpoint.ptr, output.ptr);
 		Reference.reachabilityFence(outpoint);
 		Reference.reachabilityFence(output);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		SpendableOutputDescriptor ret_hu_conv = SpendableOutputDescriptor.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.SpendableOutputDescriptor ret_hu_conv = org.ldk.structs.SpendableOutputDescriptor.constr_from_ptr(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); };
 		return ret_hu_conv;
 	}
 
@@ -158,11 +159,12 @@ public class SpendableOutputDescriptor extends CommonBase {
 	 * Utility method to constructs a new DelayedPaymentOutput-variant SpendableOutputDescriptor
 	 */
 	public static SpendableOutputDescriptor delayed_payment_output(DelayedPaymentOutputDescriptor a) {
-		long ret = bindings.SpendableOutputDescriptor_delayed_payment_output(a == null ? 0 : a.ptr & ~1);
+		long ret = bindings.SpendableOutputDescriptor_delayed_payment_output(a == null ? 0 : a.ptr);
 		Reference.reachabilityFence(a);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		SpendableOutputDescriptor ret_hu_conv = SpendableOutputDescriptor.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.SpendableOutputDescriptor ret_hu_conv = org.ldk.structs.SpendableOutputDescriptor.constr_from_ptr(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(a); };
 		return ret_hu_conv;
 	}
 
@@ -170,11 +172,12 @@ public class SpendableOutputDescriptor extends CommonBase {
 	 * Utility method to constructs a new StaticPaymentOutput-variant SpendableOutputDescriptor
 	 */
 	public static SpendableOutputDescriptor static_payment_output(StaticPaymentOutputDescriptor a) {
-		long ret = bindings.SpendableOutputDescriptor_static_payment_output(a == null ? 0 : a.ptr & ~1);
+		long ret = bindings.SpendableOutputDescriptor_static_payment_output(a == null ? 0 : a.ptr);
 		Reference.reachabilityFence(a);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		SpendableOutputDescriptor ret_hu_conv = SpendableOutputDescriptor.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.SpendableOutputDescriptor ret_hu_conv = org.ldk.structs.SpendableOutputDescriptor.constr_from_ptr(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(a); };
 		return ret_hu_conv;
 	}