X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FSpendableOutputDescriptor.java;h=eda82f8ebca432cad1c3e863317bb5f43039dd28;hb=3a507eb07003be3e6714e8a87fb397c09b401ce9;hp=c812679b1602466eba48c8a39b759918ea12ea88;hpb=371e82300e5de678404f0addc47a20636077df5d;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java b/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java
index c812679b..eda82f8e 100644
--- a/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java
+++ b/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java
@@ -11,9 +11,8 @@ public class SpendableOutputDescriptor extends CommonBase {
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
 		super.finalize();
-		bindings.SpendableOutputDescriptor_free(ptr);
+		if (ptr != 0) { bindings.SpendableOutputDescriptor_free(ptr); }
 	}
-	long conv_to_c() { assert false; return 0; /* Should only be called on subclasses */ }
 	static SpendableOutputDescriptor constr_from_ptr(long ptr) {
 		bindings.LDKSpendableOutputDescriptor raw_val = bindings.LDKSpendableOutputDescriptor_ref_from_ptr(ptr);
 		if (raw_val.getClass() == bindings.LDKSpendableOutputDescriptor.StaticOutput.class) {
@@ -29,30 +28,31 @@ public class SpendableOutputDescriptor extends CommonBase {
 	}
 
 	public final static class StaticOutput extends SpendableOutputDescriptor {
-		public OutPoint outpoint;
-		public TxOut output;
+		public final OutPoint outpoint;
+		public final TxOut output;
 		private StaticOutput(long ptr, bindings.LDKSpendableOutputDescriptor.StaticOutput obj) {
 			super(null, ptr);
 			long outpoint = obj.outpoint;
 			OutPoint outpoint_hu_conv = new OutPoint(null, outpoint);
+			outpoint_hu_conv.ptrs_to.add(this);
 			this.outpoint = outpoint_hu_conv;
 			long output = obj.output;
 			TxOut output_conv = new TxOut(null, output);
 			this.output = output_conv;
 		}
-		@Override long conv_to_c() { return 0; /*XXX*/ }
 	}
 	public final static class DynamicOutputP2WSH extends SpendableOutputDescriptor {
-		public OutPoint outpoint;
-		public byte[] per_commitment_point;
-		public short to_self_delay;
-		public TxOut output;
-		public TwoTuple<Long, Long> key_derivation_params;
-		public byte[] revocation_pubkey;
+		public final OutPoint outpoint;
+		public final byte[] per_commitment_point;
+		public final short to_self_delay;
+		public final TxOut output;
+		public final TwoTuple<Long, Long> key_derivation_params;
+		public final byte[] revocation_pubkey;
 		private DynamicOutputP2WSH(long ptr, bindings.LDKSpendableOutputDescriptor.DynamicOutputP2WSH obj) {
 			super(null, ptr);
 			long outpoint = obj.outpoint;
 			OutPoint outpoint_hu_conv = new OutPoint(null, outpoint);
+			outpoint_hu_conv.ptrs_to.add(this);
 			this.outpoint = outpoint_hu_conv;
 			this.per_commitment_point = obj.per_commitment_point;
 			this.to_self_delay = obj.to_self_delay;
@@ -62,20 +62,22 @@ public class SpendableOutputDescriptor extends CommonBase {
 			long key_derivation_params = obj.key_derivation_params;
 			long key_derivation_params_a = bindings.LDKC2Tuple_u64u64Z_get_a(key_derivation_params);
 			long key_derivation_params_b = bindings.LDKC2Tuple_u64u64Z_get_b(key_derivation_params);
-			TwoTuple<Long, Long> key_derivation_params_conv = new TwoTuple<Long, Long>(key_derivation_params_a, key_derivation_params_b);
+			TwoTuple<Long, Long> key_derivation_params_conv = new TwoTuple<Long, Long>(key_derivation_params_a, key_derivation_params_b, () -> {
+				bindings.C2Tuple_u64u64Z_free(key_derivation_params);
+			});
 			this.key_derivation_params = key_derivation_params_conv;
 			this.revocation_pubkey = obj.revocation_pubkey;
 		}
-		@Override long conv_to_c() { return 0; /*XXX*/ }
 	}
 	public final static class StaticOutputCounterpartyPayment extends SpendableOutputDescriptor {
-		public OutPoint outpoint;
-		public TxOut output;
-		public TwoTuple<Long, Long> key_derivation_params;
+		public final OutPoint outpoint;
+		public final TxOut output;
+		public final TwoTuple<Long, Long> key_derivation_params;
 		private StaticOutputCounterpartyPayment(long ptr, bindings.LDKSpendableOutputDescriptor.StaticOutputCounterpartyPayment obj) {
 			super(null, ptr);
 			long outpoint = obj.outpoint;
 			OutPoint outpoint_hu_conv = new OutPoint(null, outpoint);
+			outpoint_hu_conv.ptrs_to.add(this);
 			this.outpoint = outpoint_hu_conv;
 			long output = obj.output;
 			TxOut output_conv = new TxOut(null, output);
@@ -83,9 +85,10 @@ public class SpendableOutputDescriptor extends CommonBase {
 			long key_derivation_params = obj.key_derivation_params;
 			long key_derivation_params_a = bindings.LDKC2Tuple_u64u64Z_get_a(key_derivation_params);
 			long key_derivation_params_b = bindings.LDKC2Tuple_u64u64Z_get_b(key_derivation_params);
-			TwoTuple<Long, Long> key_derivation_params_conv = new TwoTuple<Long, Long>(key_derivation_params_a, key_derivation_params_b);
+			TwoTuple<Long, Long> key_derivation_params_conv = new TwoTuple<Long, Long>(key_derivation_params_a, key_derivation_params_b, () -> {
+				bindings.C2Tuple_u64u64Z_free(key_derivation_params);
+			});
 			this.key_derivation_params = key_derivation_params_conv;
 		}
-		@Override long conv_to_c() { return 0; /*XXX*/ }
 	}
 }