X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FConfirm.java;h=a5a60b7725019c534e9b095034708c94236e749f;hb=32973ea2749f8efd05b543dd774763513013b38b;hp=8894da4ed70273b7b6a8d3896f636bae11355601;hpb=8aa8a96fc6d8fcdd3fbb419b4b4c12482af14938;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Confirm.java b/src/main/java/org/ldk/structs/Confirm.java
index 8894da4e..a5a60b77 100644
--- a/src/main/java/org/ldk/structs/Confirm.java
+++ b/src/main/java/org/ldk/structs/Confirm.java
@@ -58,7 +58,19 @@ public class Confirm extends CommonBase {
 	protected void finalize() throws Throwable {
 		if (ptr != 0) { bindings.Confirm_free(ptr); } super.finalize();
 	}
-
+	/**
+	 * Destroys the object, freeing associated resources. After this call, any access
+	 * to this object may result in a SEGFAULT or worse.
+	 *
+	 * You should generally NEVER call this method. You should let the garbage collector
+	 * do this for you when it finalizes objects. However, it may be useful for types
+	 * which represent locks and should be closed immediately to avoid holding locks
+	 * until the GC runs.
+	 */
+	public void destroy() {
+		if (ptr != 0) { bindings.Confirm_free(ptr); }
+		ptr = 0;
+	}
 	public static interface ConfirmInterface {
 		/**
 		 * Notifies LDK of transactions confirmed in a block with a given header and height.
@@ -99,6 +111,9 @@ public class Confirm extends CommonBase {
 		 * Returns transactions that must be monitored for reorganization out of the chain along
 		 * with the hash of the block as part of which it had been previously confirmed.
 		 * 
+		 * Note that the returned `Option<BlockHash>` might be `None` for channels created with LDK
+		 * 0.0.112 and prior, in which case you need to manually track previous confirmations.
+		 * 
 		 * Will include any transactions passed to [`transactions_confirmed`] that have insufficient
 		 * confirmations to be safe from a chain reorganization. Will not include any transactions
 		 * passed to [`transaction_unconfirmed`], unless later reconfirmed.
@@ -115,7 +130,7 @@ public class Confirm extends CommonBase {
 		 * [`transactions_confirmed`]: Self::transactions_confirmed
 		 * [`transaction_unconfirmed`]: Self::transaction_unconfirmed
 		 */
-		TwoTuple_TxidBlockHashZ[] get_relevant_txids();
+		TwoTuple_TxidCOption_BlockHashZZ[] get_relevant_txids();
 	}
 	private static class LDKConfirmHolder { Confirm held; }
 	public static Confirm new_impl(ConfirmInterface arg) {
@@ -142,9 +157,9 @@ public class Confirm extends CommonBase {
 				Reference.reachabilityFence(arg);
 			}
 			@Override public long[] get_relevant_txids() {
-				TwoTuple_TxidBlockHashZ[] ret = arg.get_relevant_txids();
+				TwoTuple_TxidCOption_BlockHashZZ[] ret = arg.get_relevant_txids();
 				Reference.reachabilityFence(arg);
-				long[] result = ret != null ? Arrays.stream(ret).mapToLong(ret_conv_25 -> ret_conv_25 == null ? 0 : ret_conv_25.clone_ptr()).toArray() : null;
+				long[] result = ret != null ? Arrays.stream(ret).mapToLong(ret_conv_34 -> ret_conv_34 == null ? 0 : ret_conv_34.clone_ptr()).toArray() : null;
 				return result;
 			}
 		});
@@ -207,6 +222,9 @@ public class Confirm extends CommonBase {
 	 * Returns transactions that must be monitored for reorganization out of the chain along
 	 * with the hash of the block as part of which it had been previously confirmed.
 	 * 
+	 * Note that the returned `Option<BlockHash>` might be `None` for channels created with LDK
+	 * 0.0.112 and prior, in which case you need to manually track previous confirmations.
+	 * 
 	 * Will include any transactions passed to [`transactions_confirmed`] that have insufficient
 	 * confirmations to be safe from a chain reorganization. Will not include any transactions
 	 * passed to [`transaction_unconfirmed`], unless later reconfirmed.
@@ -223,18 +241,18 @@ public class Confirm extends CommonBase {
 	 * [`transactions_confirmed`]: Self::transactions_confirmed
 	 * [`transaction_unconfirmed`]: Self::transaction_unconfirmed
 	 */
-	public TwoTuple_TxidBlockHashZ[] get_relevant_txids() {
+	public TwoTuple_TxidCOption_BlockHashZZ[] get_relevant_txids() {
 		long[] ret = bindings.Confirm_get_relevant_txids(this.ptr);
 		Reference.reachabilityFence(this);
-		int ret_conv_25_len = ret.length;
-		TwoTuple_TxidBlockHashZ[] ret_conv_25_arr = new TwoTuple_TxidBlockHashZ[ret_conv_25_len];
-		for (int z = 0; z < ret_conv_25_len; z++) {
-			long ret_conv_25 = ret[z];
-			TwoTuple_TxidBlockHashZ ret_conv_25_hu_conv = new TwoTuple_TxidBlockHashZ(null, ret_conv_25);
-			if (ret_conv_25_hu_conv != null) { ret_conv_25_hu_conv.ptrs_to.add(this); };
-			ret_conv_25_arr[z] = ret_conv_25_hu_conv;
+		int ret_conv_34_len = ret.length;
+		TwoTuple_TxidCOption_BlockHashZZ[] ret_conv_34_arr = new TwoTuple_TxidCOption_BlockHashZZ[ret_conv_34_len];
+		for (int i = 0; i < ret_conv_34_len; i++) {
+			long ret_conv_34 = ret[i];
+			TwoTuple_TxidCOption_BlockHashZZ ret_conv_34_hu_conv = new TwoTuple_TxidCOption_BlockHashZZ(null, ret_conv_34);
+			if (ret_conv_34_hu_conv != null) { ret_conv_34_hu_conv.ptrs_to.add(this); };
+			ret_conv_34_arr[i] = ret_conv_34_hu_conv;
 		}
-		return ret_conv_25_arr;
+		return ret_conv_34_arr;
 	}
 
 }