X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChainMonitor.java;h=df02a761d56f9f1539f82aa36c437a162f826742;hb=ff3dacec3be60f870d81f6df11bd9fff92aa6047;hp=724561d63b27cdd4df92afad939a0f9c9365fd25;hpb=8b3981918227cf2c033b4b568b4040e8af05d3be;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChainMonitor.java b/src/main/java/org/ldk/structs/ChainMonitor.java
index 724561d6..df02a761 100644
--- a/src/main/java/org/ldk/structs/ChainMonitor.java
+++ b/src/main/java/org/ldk/structs/ChainMonitor.java
@@ -4,6 +4,8 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import java.lang.ref.Reference;
+import javax.annotation.Nullable;
 
 
 /**
@@ -27,111 +29,142 @@ public class ChainMonitor extends CommonBase {
 	}
 
 	/**
-	 * 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`].
+	 * Creates a new `ChainMonitor` used to watch on-chain activity pertaining to channels.
 	 * 
-	 * 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`.
+	 * 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.
 	 */
-	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[]>  */;
+	public static ChainMonitor of(Option_FilterZ chain_source, BroadcasterInterface broadcaster, Logger logger, FeeEstimator feeest, Persist persister) {
+		long ret = bindings.ChainMonitor_new(chain_source.ptr, broadcaster == null ? 0 : broadcaster.ptr, logger == null ? 0 : logger.ptr, feeest == null ? 0 : feeest.ptr, persister == null ? 0 : persister.ptr);
+		Reference.reachabilityFence(chain_source);
+		Reference.reachabilityFence(broadcaster);
+		Reference.reachabilityFence(logger);
+		Reference.reachabilityFence(feeest);
+		Reference.reachabilityFence(persister);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ChainMonitor ret_hu_conv = null; if (ret < 0 || ret > 4096) { 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;
 	}
 
 	/**
-	 * 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`].
+	 * Gets the balances in the contained [`ChannelMonitor`]s which are claimable on-chain or
+	 * claims which are awaiting confirmation.
 	 * 
-	 * 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.
+	 * Includes the balances from each [`ChannelMonitor`] *except* those included in
+	 * `ignored_channels`, allowing you to filter out balances from channels which are still open
+	 * (and whose balance should likely be pulled from the [`ChannelDetails`]).
 	 * 
-	 * [`block_connected`]: Self::block_connected
-	 * [`update_best_block`]: Self::update_best_block
+	 * See [`ChannelMonitor::get_claimable_balances`] for more details on the exact criteria for
+	 * inclusion in the return value.
 	 */
-	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[]>  */;
+	public Balance[] get_claimable_balances(ChannelDetails[] ignored_channels) {
+		long[] ret = bindings.ChainMonitor_get_claimable_balances(this.ptr, ignored_channels != null ? Arrays.stream(ignored_channels).mapToLong(ignored_channels_conv_16 -> ignored_channels_conv_16 == null ? 0 : ignored_channels_conv_16.ptr & ~1).toArray() : null);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(ignored_channels);
+		int ret_conv_9_len = ret.length;
+		Balance[] ret_conv_9_arr = new Balance[ret_conv_9_len];
+		for (int j = 0; j < ret_conv_9_len; j++) {
+			long ret_conv_9 = ret[j];
+			org.ldk.structs.Balance ret_conv_9_hu_conv = org.ldk.structs.Balance.constr_from_ptr(ret_conv_9);
+			ret_conv_9_hu_conv.ptrs_to.add(this);
+			ret_conv_9_arr[j] = ret_conv_9_hu_conv;
+		}
+		return ret_conv_9_arr;
 	}
 
 	/**
-	 * 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`].
+	 * Gets the [`LockedChannelMonitor`] for a given funding outpoint, returning an `Err` if no
+	 * such [`ChannelMonitor`] is currently being monitored for.
 	 * 
-	 * 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
+	 * Note that the result holds a mutex over our monitor set, and should not be held
+	 * indefinitely.
 	 */
-	public void update_best_block(byte[] header, int height) {
-		bindings.ChainMonitor_update_best_block(this.ptr, header, height);
+	public Result_LockedChannelMonitorNoneZ get_monitor(OutPoint funding_txo) {
+		long ret = bindings.ChainMonitor_get_monitor(this.ptr, funding_txo == null ? 0 : funding_txo.ptr & ~1);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(funding_txo);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_LockedChannelMonitorNoneZ ret_hu_conv = Result_LockedChannelMonitorNoneZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 	/**
-	 * 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.
+	 * Lists the funding outpoint of each [`ChannelMonitor`] being monitored.
+	 * 
+	 * Note that [`ChannelMonitor`]s are not removed when a channel is closed as they are always
+	 * monitoring for on-chain state resolutions.
 	 */
-	public void block_disconnected(byte[] header, int disconnected_height) {
-		bindings.ChainMonitor_block_disconnected(this.ptr, header, disconnected_height);
+	public OutPoint[] list_monitors() {
+		long[] ret = bindings.ChainMonitor_list_monitors(this.ptr);
+		Reference.reachabilityFence(this);
+		int ret_conv_10_len = ret.length;
+		OutPoint[] ret_conv_10_arr = new OutPoint[ret_conv_10_len];
+		for (int k = 0; k < ret_conv_10_len; k++) {
+			long ret_conv_10 = ret[k];
+			OutPoint ret_conv_10_hu_conv = null; if (ret_conv_10 < 0 || ret_conv_10 > 4096) { ret_conv_10_hu_conv = new OutPoint(null, ret_conv_10); }
+			ret_conv_10_hu_conv.ptrs_to.add(this);
+			ret_conv_10_arr[k] = ret_conv_10_hu_conv;
+		}
+		return ret_conv_10_arr;
 	}
 
 	/**
-	 * 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.
+	 * Indicates the persistence of a [`ChannelMonitor`] has completed after
+	 * [`ChannelMonitorUpdateErr::TemporaryFailure`] was returned from an update operation.
 	 * 
-	 * 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.
+	 * Thus, the anticipated use is, at a high level:
+	 * 1) This [`ChainMonitor`] calls [`Persist::update_persisted_channel`] which stores the
+	 * update to disk and begins updating any remote (e.g. watchtower/backup) copies,
+	 * returning [`ChannelMonitorUpdateErr::TemporaryFailure`],
+	 * 2) once all remote copies are updated, you call this function with the
+	 * `completed_update_id` that completed, and once all pending updates have completed the
+	 * channel will be re-enabled.
 	 * 
-	 * [`block_disconnected`]: Self::block_disconnected
-	 * [`update_best_block`]: Self::update_best_block
+	 * Returns an [`APIError::APIMisuseError`] if `funding_txo` does not match any currently
+	 * registered [`ChannelMonitor`]s.
 	 */
-	public void transaction_unconfirmed(byte[] txid) {
-		bindings.ChainMonitor_transaction_unconfirmed(this.ptr, txid);
+	public Result_NoneAPIErrorZ channel_monitor_updated(OutPoint funding_txo, MonitorUpdateId completed_update_id) {
+		long ret = bindings.ChainMonitor_channel_monitor_updated(this.ptr, funding_txo == null ? 0 : funding_txo.ptr & ~1, completed_update_id == null ? 0 : completed_update_id.ptr & ~1);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(funding_txo);
+		Reference.reachabilityFence(completed_update_id);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_NoneAPIErrorZ ret_hu_conv = Result_NoneAPIErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 	/**
-	 * Returns the set of txids that should be monitored for re-organization out of the chain.
+	 * 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 byte[][] get_relevant_txids() {
-		byte[][] ret = bindings.ChainMonitor_get_relevant_txids(this.ptr);
-		return ret;
+	public Listen as_Listen() {
+		long ret = bindings.ChainMonitor_as_Listen(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Listen ret_hu_conv = new Listen(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
 	/**
-	 * 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.
+	 * 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 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);
-		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);
+	public Confirm as_Confirm() {
+		long ret = bindings.ChainMonitor_as_Confirm(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Confirm ret_hu_conv = new Confirm(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
@@ -141,6 +174,8 @@ public class ChainMonitor extends CommonBase {
 	 */
 	public Watch as_Watch() {
 		long ret = bindings.ChainMonitor_as_Watch(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Watch ret_hu_conv = new Watch(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -152,6 +187,8 @@ public class ChainMonitor extends CommonBase {
 	 */
 	public EventsProvider as_EventsProvider() {
 		long ret = bindings.ChainMonitor_as_EventsProvider(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		EventsProvider ret_hu_conv = new EventsProvider(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;