X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelMonitor.java;h=68b04ace676866fbdce499a43934ea2a48a72c61;hb=12c3ea6f32816f379249a75863971a1c7e1089a1;hp=32d870a6a27dbcc9bc2f5836ca1cd4986da6ad93;hpb=6f84978154512148a47502caad48038e3f264392;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelMonitor.java b/src/main/java/org/ldk/structs/ChannelMonitor.java
index 32d870a6..68b04ace 100644
--- a/src/main/java/org/ldk/structs/ChannelMonitor.java
+++ b/src/main/java/org/ldk/structs/ChannelMonitor.java
@@ -242,11 +242,9 @@ public class ChannelMonitor extends CommonBase {
 	 * outputs to watch. See [`block_connected`] for details.
 	 * 
 	 * 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.
+	 * blocks. See [`chain::Confirm`] for calling expectations.
 	 * 
 	 * [`block_connected`]: Self::block_connected
-	 * [`update_best_block`]: Self::update_best_block
 	 */
 	public TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] transactions_confirmed(byte[] header, TwoTuple<Long, byte[]>[] txdata, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
 		long[] ret = bindings.ChannelMonitor_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, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
@@ -282,11 +280,9 @@ public class ChannelMonitor extends CommonBase {
 	 * Processes a transaction that was reorganized out of the chain.
 	 * 
 	 * 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.
+	 * than blocks. See [`chain::Confirm`] for calling expectations.
 	 * 
 	 * [`block_disconnected`]: Self::block_disconnected
-	 * [`update_best_block`]: Self::update_best_block
 	 */
 	public void transaction_unconfirmed(byte[] txid, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
 		bindings.ChannelMonitor_transaction_unconfirmed(this.ptr, txid, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
@@ -300,20 +296,12 @@ public class ChannelMonitor extends CommonBase {
 	 * [`block_connected`] for details.
 	 * 
 	 * 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.
+	 * blocks. See [`chain::Confirm`] for calling expectations.
 	 * 
 	 * [`block_connected`]: Self::block_connected
-	 * [`transactions_confirmed`]: Self::transactions_confirmed
-	 * [`transaction_unconfirmed`]: Self::transaction_unconfirmed
 	 */
-	public TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] update_best_block(byte[] header, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
-		long[] ret = bindings.ChannelMonitor_update_best_block(this.ptr, header, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
+	public TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] best_block_updated(byte[] header, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
+		long[] ret = bindings.ChannelMonitor_best_block_updated(this.ptr, header, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
 		TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] ret_conv_46_arr = new TwoTuple[ret.length];
 		for (int u = 0; u < ret.length; u++) {
 			long ret_conv_46 = ret[u];
@@ -349,4 +337,15 @@ public class ChannelMonitor extends CommonBase {
 		return ret;
 	}
 
+	/**
+	 * Gets the latest best block which was connected either via the [`chain::Listen`] or
+	 * [`chain::Confirm`] interfaces.
+	 */
+	public BestBlock current_best_block() {
+		long ret = bindings.ChannelMonitor_current_best_block(this.ptr);
+		BestBlock ret_hu_conv = new BestBlock(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
 }