X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChainMonitor.java;h=a1406a35639aa5fc2dce5f057a9f9de8451b5b54;hb=b6cc0960eaee5a5bbc7fde79a56152d6dcd649d8;hp=a32ef2d3fad316b3a78f8d9129954534cc10772e;hpb=1b870a3ffab1c0024411e30102bc6d198300f095;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChainMonitor.java b/src/main/java/org/ldk/structs/ChainMonitor.java
index a32ef2d3..a1406a35 100644
--- a/src/main/java/org/ldk/structs/ChainMonitor.java
+++ b/src/main/java/org/ldk/structs/ChainMonitor.java
@@ -14,9 +14,8 @@ import java.util.Arrays;
  * or used independently to monitor channels remotely. See the [module-level documentation] for
  * details.
  * 
- * [`chain::Watch`]: ../trait.Watch.html
- * [`ChannelManager`]: ../../ln/channelmanager/struct.ChannelManager.html
- * [module-level documentation]: index.html
+ * [`ChannelManager`]: crate::ln::channelmanager::ChannelManager
+ * [module-level documentation]: crate::chain::chainmonitor
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class ChainMonitor extends CommonBase {
@@ -27,37 +26,6 @@ public class ChainMonitor extends CommonBase {
 		if (ptr != 0) { bindings.ChainMonitor_free(ptr); }
 	}
 
-	/**
-	 * Dispatches to per-channel monitors, which are responsible for updating their on-chain view
-	 * of a channel and reacting accordingly based on transactions in the connected block. See
-	 * [`ChannelMonitor::block_connected`] for details. Any HTLCs that were resolved on chain will
-	 * be returned by [`chain::Watch::release_pending_monitor_events`].
-	 * 
-	 * Calls back to [`chain::Filter`] if any monitor indicated new outputs to watch. Subsequent
-	 * calls must not exclude any transactions matching the new outputs nor any in-block
-	 * descendants of such transactions. It is not necessary to re-fetch the block to obtain
-	 * updated `txdata`.
-	 * 
-	 * [`ChannelMonitor::block_connected`]: ../channelmonitor/struct.ChannelMonitor.html#method.block_connected
-	 * [`chain::Watch::release_pending_monitor_events`]: ../trait.Watch.html#tymethod.release_pending_monitor_events
-	 * [`chain::Filter`]: ../trait.Filter.html
-	 */
-	public void block_connected(byte[] header, TwoTuple<Long, byte[]>[] txdata, int height) {
-		bindings.ChainMonitor_block_connected(this.ptr, header, Arrays.stream(txdata).mapToLong(txdata_conv_24 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_24.a, txdata_conv_24.b)).toArray(), height);
-		/* TODO 2 TwoTuple<Long, byte[]>  */;
-	}
-
-	/**
-	 * Dispatches to per-channel monitors, which are responsible for updating their on-chain view
-	 * of a channel based on the disconnected block. See [`ChannelMonitor::block_disconnected`] for
-	 * details.
-	 * 
-	 * [`ChannelMonitor::block_disconnected`]: ../channelmonitor/struct.ChannelMonitor.html#method.block_disconnected
-	 */
-	public void block_disconnected(byte[] header, int disconnected_height) {
-		bindings.ChainMonitor_block_disconnected(this.ptr, header, disconnected_height);
-	}
-
 	/**
 	 * Creates a new `ChainMonitor` used to watch on-chain activity pertaining to channels.
 	 * 
@@ -66,10 +34,8 @@ public class ChainMonitor extends CommonBase {
 	 * 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.
-	 * 
-	 * [`chain::Filter`]: ../trait.Filter.html
 	 */
-	public static ChainMonitor constructor_new(Filter chain_source, BroadcasterInterface broadcaster, Logger logger, FeeEstimator feeest, Persist persister) {
+	public static ChainMonitor of(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);
 		ChainMonitor ret_hu_conv = new ChainMonitor(null, ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
@@ -81,6 +47,28 @@ public class ChainMonitor extends CommonBase {
 		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);
+		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);
+		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