X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChainMonitor.java;h=724561d63b27cdd4df92afad939a0f9c9365fd25;hb=6f84978154512148a47502caad48038e3f264392;hp=a32ef2d3fad316b3a78f8d9129954534cc10772e;hpb=17113550a5fefab21f39f27fbfe02646b8db53ae;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..724561d6 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 {
@@ -37,27 +36,84 @@ public class ChainMonitor extends CommonBase {
 	 * 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 and reacting accordingly to newly confirmed transactions. For details, see
+	 * [`ChannelMonitor::transactions_confirmed`].
+	 * 
+	 * Used instead of [`block_connected`] by clients that are notified of transactions rather than
+	 * blocks. May be called before or after [`update_best_block`] for transactions in the
+	 * corresponding block. See [`update_best_block`] for further calling expectations.
+	 * 
+	 * [`block_connected`]: Self::block_connected
+	 * [`update_best_block`]: Self::update_best_block
+	 */
+	public void transactions_confirmed(byte[] header, TwoTuple<Long, byte[]>[] txdata, int height) {
+		bindings.ChainMonitor_transactions_confirmed(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 and reacting accordingly based on the new chain tip. For details, see
+	 * [`ChannelMonitor::update_best_block`].
+	 * 
+	 * Used instead of [`block_connected`] by clients that are notified of transactions rather than
+	 * blocks. May be called before or after [`transactions_confirmed`] for the corresponding
+	 * block.
+	 * 
+	 * Must be called after new blocks become available for the most recent block. Intermediary
+	 * blocks, however, may be safely skipped. In the event of a chain re-organization, this only
+	 * needs to be called for the most recent block assuming `transaction_unconfirmed` is called
+	 * for any affected transactions.
+	 * 
+	 * [`block_connected`]: Self::block_connected
+	 * [`transactions_confirmed`]: Self::transactions_confirmed
+	 * [`transaction_unconfirmed`]: Self::transaction_unconfirmed
+	 */
+	public void update_best_block(byte[] header, int height) {
+		bindings.ChainMonitor_update_best_block(this.ptr, header, height);
+	}
+
 	/**
 	 * 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);
 	}
 
+	/**
+	 * Dispatches to per-channel monitors, which are responsible for updating their on-chain view
+	 * of a channel based on transactions unconfirmed as a result of a chain reorganization. See
+	 * [`ChannelMonitor::transaction_unconfirmed`] for details.
+	 * 
+	 * Used instead of [`block_disconnected`] by clients that are notified of transactions rather
+	 * than blocks. May be called before or after [`update_best_block`] for transactions in the
+	 * corresponding block. See [`update_best_block`] for further calling expectations.
+	 * 
+	 * [`block_disconnected`]: Self::block_disconnected
+	 * [`update_best_block`]: Self::update_best_block
+	 */
+	public void transaction_unconfirmed(byte[] txid) {
+		bindings.ChainMonitor_transaction_unconfirmed(this.ptr, txid);
+	}
+
+	/**
+	 * Returns the set of txids that should be monitored for re-organization out of the chain.
+	 */
+	public byte[][] get_relevant_txids() {
+		byte[][] ret = bindings.ChainMonitor_get_relevant_txids(this.ptr);
+		return ret;
+	}
+
 	/**
 	 * Creates a new `ChainMonitor` used to watch on-chain activity pertaining to channels.
 	 * 
@@ -66,8 +122,6 @@ 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) {
 		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);