X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChainMonitor.java;h=bed7751667474fc9874f7ac35658b43fbedbab7c;hb=db1a11032b4164540a2d3403696be12bbca70e94;hp=ae957504105d1ee275e30d1323c6d673cc0adae4;hpb=18faab2952bff2302d55528dea556246be63950a;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChainMonitor.java b/src/main/java/org/ldk/structs/ChainMonitor.java
index ae957504..bed77516 100644
--- a/src/main/java/org/ldk/structs/ChainMonitor.java
+++ b/src/main/java/org/ldk/structs/ChainMonitor.java
@@ -4,7 +4,20 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
+
+/**
+ * An implementation of [`chain::Watch`] for monitoring channels.
+ * 
+ * Connected and disconnected blocks must be provided to `ChainMonitor` as documented by
+ * [`chain::Watch`]. May be used in conjunction with [`ChannelManager`] to monitor channels locally
+ * or used independently to monitor channels remotely. See the [module-level documentation] for
+ * details.
+ * 
+ * [`ChannelManager`]: crate::ln::channelmanager::ChannelManager
+ * [module-level documentation]: crate::chain::chainmonitor
+ */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class ChainMonitor extends CommonBase {
 	ChainMonitor(Object _dummy, long ptr) { super(ptr); }
@@ -14,34 +27,73 @@ public class ChainMonitor extends CommonBase {
 		if (ptr != 0) { bindings.ChainMonitor_free(ptr); }
 	}
 
-	public void block_connected(byte[] header, TwoTuple<Long, byte[]>[] txdata, int height) {
-		bindings.ChainMonitor_block_connected(this.ptr, header, Arrays.stream(txdata).mapToLong(arr_conv_24 -> bindings.C2Tuple_usizeTransactionZ_new(arr_conv_24.a, arr_conv_24.b)).toArray(), height);
-		/* TODO 2 TwoTuple<Long, byte[]>  */;
-	}
-
-	public void block_disconnected(byte[] header, int disconnected_height) {
-		bindings.ChainMonitor_block_disconnected(this.ptr, header, disconnected_height);
-	}
-
-	public static ChainMonitor constructor_new(Filter chain_source, BroadcasterInterface broadcaster, Logger logger, FeeEstimator feeest) {
-		long ret = bindings.ChainMonitor_new(chain_source == null ? 0 : chain_source.ptr, broadcaster == null ? 0 : broadcaster.ptr, logger == null ? 0 : logger.ptr, feeest == null ? 0 : feeest.ptr);
+	/**
+	 * Creates a new `ChainMonitor` used to watch on-chain activity pertaining to channels.
+	 * 
+	 * When an optional chain source implementing [`chain::Filter`] is provided, the chain monitor
+	 * will call back to it indicating transactions and outputs of interest. This allows clients to
+	 * pre-filter blocks or only fetch blocks matching a compact filter. Otherwise, clients may
+	 * always need to fetch full blocks absent another means for determining which blocks contain
+	 * transactions relevant to the watched channels.
+	 * 
+	 * Note that chain_source (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	public static ChainMonitor of(@Nullable Filter chain_source, BroadcasterInterface broadcaster, Logger logger, FeeEstimator feeest, Persist persister) {
+		long ret = bindings.ChainMonitor_new(chain_source == null ? 0 : chain_source.ptr, broadcaster == null ? 0 : broadcaster.ptr, logger == null ? 0 : logger.ptr, feeest == null ? 0 : feeest.ptr, persister == null ? 0 : persister.ptr);
+		if (ret < 1024) { return null; }
 		ChainMonitor ret_hu_conv = new ChainMonitor(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		ret_hu_conv.ptrs_to.add(chain_source);
 		ret_hu_conv.ptrs_to.add(broadcaster);
 		ret_hu_conv.ptrs_to.add(logger);
 		ret_hu_conv.ptrs_to.add(feeest);
+		ret_hu_conv.ptrs_to.add(persister);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Constructs a new Listen which calls the relevant methods on this_arg.
+	 * This copies the `inner` pointer in this_arg and thus the returned Listen must be freed before this_arg is
+	 */
+	public Listen as_Listen() {
+		long ret = bindings.ChainMonitor_as_Listen(this.ptr);
+		if (ret < 1024) { return null; }
+		Listen ret_hu_conv = new Listen(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Constructs a new Confirm which calls the relevant methods on this_arg.
+	 * This copies the `inner` pointer in this_arg and thus the returned Confirm must be freed before this_arg is
+	 */
+	public Confirm as_Confirm() {
+		long ret = bindings.ChainMonitor_as_Confirm(this.ptr);
+		if (ret < 1024) { return null; }
+		Confirm ret_hu_conv = new Confirm(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Constructs a new Watch which calls the relevant methods on this_arg.
+	 * This copies the `inner` pointer in this_arg and thus the returned Watch must be freed before this_arg is
+	 */
 	public Watch as_Watch() {
 		long ret = bindings.ChainMonitor_as_Watch(this.ptr);
+		if (ret < 1024) { return null; }
 		Watch ret_hu_conv = new Watch(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Constructs a new EventsProvider which calls the relevant methods on this_arg.
+	 * This copies the `inner` pointer in this_arg and thus the returned EventsProvider must be freed before this_arg is
+	 */
 	public EventsProvider as_EventsProvider() {
 		long ret = bindings.ChainMonitor_as_EventsProvider(this.ptr);
+		if (ret < 1024) { return null; }
 		EventsProvider ret_hu_conv = new EventsProvider(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;