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=42dd314b731d08e1dbd5c9dc168ddff212cc1a71;hpb=110f2f104ba8fc34caa7e34e04737f36f064b050;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java b/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java
index 42dd314b..eda82f8e 100644
--- a/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java
+++ b/src/main/java/org/ldk/structs/SpendableOutputDescriptor.java
@@ -8,42 +8,87 @@ import java.util.Arrays;
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class SpendableOutputDescriptor extends CommonBase {
 	private SpendableOutputDescriptor(Object _dummy, long ptr) { super(ptr); }
-	long conv_to_c() { assert false; return 0; /* Should only be called on subclasses */ }
+	@Override @SuppressWarnings("deprecation")
+	protected void finalize() throws Throwable {
+		super.finalize();
+		if (ptr != 0) { bindings.SpendableOutputDescriptor_free(ptr); }
+	}
 	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) {
-			return new StaticOutput(null, ptr);
+			return new StaticOutput(ptr, (bindings.LDKSpendableOutputDescriptor.StaticOutput)raw_val);
 		}
 		if (raw_val.getClass() == bindings.LDKSpendableOutputDescriptor.DynamicOutputP2WSH.class) {
-			return new DynamicOutputP2WSH(null, ptr);
+			return new DynamicOutputP2WSH(ptr, (bindings.LDKSpendableOutputDescriptor.DynamicOutputP2WSH)raw_val);
 		}
 		if (raw_val.getClass() == bindings.LDKSpendableOutputDescriptor.StaticOutputCounterpartyPayment.class) {
-			return new StaticOutputCounterpartyPayment(null, ptr);
+			return new StaticOutputCounterpartyPayment(ptr, (bindings.LDKSpendableOutputDescriptor.StaticOutputCounterpartyPayment)raw_val);
 		}
 		assert false; return null; // Unreachable without extending the (internal) bindings interface
 	}
 
 	public final static class StaticOutput extends SpendableOutputDescriptor {
-		public OutPoint outpoint;
-		public TxOut output;
-		private StaticOutput(Object _dummy, long ptr) { super(null, ptr); }
-		@Override long conv_to_c() { return 0; /*XXX*/ }
+		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;
+		}
 	}
 	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;
-		private DynamicOutputP2WSH(Object _dummy, long ptr) { super(null, ptr); }
-		@Override long conv_to_c() { return 0; /*XXX*/ }
+		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;
+			long output = obj.output;
+			TxOut output_conv = new TxOut(null, output);
+			this.output = output_conv;
+			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, () -> {
+				bindings.C2Tuple_u64u64Z_free(key_derivation_params);
+			});
+			this.key_derivation_params = key_derivation_params_conv;
+			this.revocation_pubkey = obj.revocation_pubkey;
+		}
 	}
 	public final static class StaticOutputCounterpartyPayment extends SpendableOutputDescriptor {
-		public OutPoint outpoint;
-		public TxOut output;
-		public TwoTuple<Long, Long> key_derivation_params;
-		private StaticOutputCounterpartyPayment(Object _dummy, long ptr) { super(null, ptr); }
-		@Override long conv_to_c() { return 0; /*XXX*/ }
+		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);
+			this.output = output_conv;
+			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, () -> {
+				bindings.C2Tuple_u64u64Z_free(key_derivation_params);
+			});
+			this.key_derivation_params = key_derivation_params_conv;
+		}
 	}
 }