X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FWatch.java;h=be66801bf7bae8108d3c6bbd96a5982538f3b7ab;hb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;hp=9bf7a60359be09b15536c8e630bcf3782c089aa9;hpb=e6173a79ce766cef7a660f22fc8fd1220975f6ea;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Watch.java b/src/main/java/org/ldk/structs/Watch.java
index 9bf7a603..be66801b 100644
--- a/src/main/java/org/ldk/structs/Watch.java
+++ b/src/main/java/org/ldk/structs/Watch.java
@@ -25,9 +25,7 @@ import javax.annotation.Nullable;
  * funds in the channel. See [`ChannelMonitorUpdateErr`] for more details about how to handle
  * multiple instances.
  * 
- * [`ChannelMonitor`]: channelmonitor::ChannelMonitor
- * [`ChannelMonitorUpdateErr`]: channelmonitor::ChannelMonitorUpdateErr
- * [`PermanentFailure`]: channelmonitor::ChannelMonitorUpdateErr::PermanentFailure
+ * [`PermanentFailure`]: ChannelMonitorUpdateErr::PermanentFailure
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class Watch extends CommonBase {
@@ -51,6 +49,9 @@ public class Watch extends CommonBase {
 		 * with any spends of outputs returned by [`get_outputs_to_watch`]. In practice, this means
 		 * calling [`block_connected`] and [`block_disconnected`] on the monitor.
 		 * 
+		 * Note: this interface MUST error with `ChannelMonitorUpdateErr::PermanentFailure` if
+		 * the given `funding_txo` has previously been registered via `watch_channel`.
+		 * 
 		 * [`get_outputs_to_watch`]: channelmonitor::ChannelMonitor::get_outputs_to_watch
 		 * [`block_connected`]: channelmonitor::ChannelMonitor::block_connected
 		 * [`block_disconnected`]: channelmonitor::ChannelMonitor::block_disconnected
@@ -63,12 +64,18 @@ public class Watch extends CommonBase {
 		 * [`ChannelMonitorUpdateErr`] for invariants around returning an error.
 		 * 
 		 * [`update_monitor`]: channelmonitor::ChannelMonitor::update_monitor
-		 * [`ChannelMonitorUpdateErr`]: channelmonitor::ChannelMonitorUpdateErr
 		 */
 		Result_NoneChannelMonitorUpdateErrZ update_channel(OutPoint funding_txo, ChannelMonitorUpdate update);
 		/**
 		 * Returns any monitor events since the last call. Subsequent calls must only return new
 		 * events.
+		 * 
+		 * Note that after any block- or transaction-connection calls to a [`ChannelMonitor`], no
+		 * further events may be returned here until the [`ChannelMonitor`] has been fully persisted
+		 * to disk.
+		 * 
+		 * For details on asynchronous [`ChannelMonitor`] updating and returning
+		 * [`MonitorEvent::UpdateCompleted`] here, see [`ChannelMonitorUpdateErr::TemporaryFailure`].
 		 */
 		MonitorEvent[] release_pending_monitor_events();
 	}
@@ -77,18 +84,18 @@ public class Watch extends CommonBase {
 		final LDKWatchHolder impl_holder = new LDKWatchHolder();
 		impl_holder.held = new Watch(new bindings.LDKWatch() {
 			@Override public long watch_channel(long funding_txo, long monitor) {
-				OutPoint funding_txo_hu_conv = new OutPoint(null, funding_txo);
+				OutPoint funding_txo_hu_conv = null; if (funding_txo < 0 || funding_txo > 4096) { funding_txo_hu_conv = new OutPoint(null, funding_txo); }
 				funding_txo_hu_conv.ptrs_to.add(this);
-				ChannelMonitor monitor_hu_conv = new ChannelMonitor(null, monitor);
+				ChannelMonitor monitor_hu_conv = null; if (monitor < 0 || monitor > 4096) { monitor_hu_conv = new ChannelMonitor(null, monitor); }
 				monitor_hu_conv.ptrs_to.add(this);
 				Result_NoneChannelMonitorUpdateErrZ ret = arg.watch_channel(funding_txo_hu_conv, monitor_hu_conv);
 				long result = ret != null ? ret.ptr : 0;
 				return result;
 			}
 			@Override public long update_channel(long funding_txo, long update) {
-				OutPoint funding_txo_hu_conv = new OutPoint(null, funding_txo);
+				OutPoint funding_txo_hu_conv = null; if (funding_txo < 0 || funding_txo > 4096) { funding_txo_hu_conv = new OutPoint(null, funding_txo); }
 				funding_txo_hu_conv.ptrs_to.add(this);
-				ChannelMonitorUpdate update_hu_conv = new ChannelMonitorUpdate(null, update);
+				ChannelMonitorUpdate update_hu_conv = null; if (update < 0 || update > 4096) { update_hu_conv = new ChannelMonitorUpdate(null, update); }
 				update_hu_conv.ptrs_to.add(this);
 				Result_NoneChannelMonitorUpdateErrZ ret = arg.update_channel(funding_txo_hu_conv, update_hu_conv);
 				long result = ret != null ? ret.ptr : 0;
@@ -109,13 +116,16 @@ public class Watch extends CommonBase {
 	 * with any spends of outputs returned by [`get_outputs_to_watch`]. In practice, this means
 	 * calling [`block_connected`] and [`block_disconnected`] on the monitor.
 	 * 
+	 * Note: this interface MUST error with `ChannelMonitorUpdateErr::PermanentFailure` if
+	 * the given `funding_txo` has previously been registered via `watch_channel`.
+	 * 
 	 * [`get_outputs_to_watch`]: channelmonitor::ChannelMonitor::get_outputs_to_watch
 	 * [`block_connected`]: channelmonitor::ChannelMonitor::block_connected
 	 * [`block_disconnected`]: channelmonitor::ChannelMonitor::block_disconnected
 	 */
 	public Result_NoneChannelMonitorUpdateErrZ watch_channel(OutPoint funding_txo, ChannelMonitor monitor) {
 		long ret = bindings.Watch_watch_channel(this.ptr, funding_txo == null ? 0 : funding_txo.ptr & ~1, monitor == null ? 0 : monitor.ptr & ~1);
-		if (ret >= 0 && ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneChannelMonitorUpdateErrZ ret_hu_conv = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
@@ -127,11 +137,10 @@ public class Watch extends CommonBase {
 	 * [`ChannelMonitorUpdateErr`] for invariants around returning an error.
 	 * 
 	 * [`update_monitor`]: channelmonitor::ChannelMonitor::update_monitor
-	 * [`ChannelMonitorUpdateErr`]: channelmonitor::ChannelMonitorUpdateErr
 	 */
 	public Result_NoneChannelMonitorUpdateErrZ update_channel(OutPoint funding_txo, ChannelMonitorUpdate update) {
 		long ret = bindings.Watch_update_channel(this.ptr, funding_txo == null ? 0 : funding_txo.ptr & ~1, update == null ? 0 : update.ptr & ~1);
-		if (ret >= 0 && ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneChannelMonitorUpdateErrZ ret_hu_conv = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
@@ -139,6 +148,13 @@ public class Watch extends CommonBase {
 	/**
 	 * Returns any monitor events since the last call. Subsequent calls must only return new
 	 * events.
+	 * 
+	 * Note that after any block- or transaction-connection calls to a [`ChannelMonitor`], no
+	 * further events may be returned here until the [`ChannelMonitor`] has been fully persisted
+	 * to disk.
+	 * 
+	 * For details on asynchronous [`ChannelMonitor`] updating and returning
+	 * [`MonitorEvent::UpdateCompleted`] here, see [`ChannelMonitorUpdateErr::TemporaryFailure`].
 	 */
 	public MonitorEvent[] release_pending_monitor_events() {
 		long[] ret = bindings.Watch_release_pending_monitor_events(this.ptr);