X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FWatch.java;h=11482c5d587cda776bfe56970da1002044009aa7;hb=db55d4ed1b9ee1b2712db1df0f9b0081a70e269b;hp=d560838a914125396516e731fe3eb86440667af5;hpb=f8c25e52ce878136043ddc4dbfac6c6640f1d4f6;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Watch.java b/src/main/java/org/ldk/structs/Watch.java
index d560838a..11482c5d 100644
--- a/src/main/java/org/ldk/structs/Watch.java
+++ b/src/main/java/org/ldk/structs/Watch.java
@@ -4,6 +4,7 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
 /**
  * The `Watch` trait defines behavior for watching on-chain activity pertaining to channels as
@@ -24,9 +25,7 @@ import java.util.Arrays;
  * 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 {
@@ -50,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
@@ -62,7 +64,6 @@ 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);
 		/**
@@ -95,8 +96,7 @@ public class Watch extends CommonBase {
 			}
 			@Override public long[] release_pending_monitor_events() {
 				MonitorEvent[] ret = arg.release_pending_monitor_events();
-				long[] result = Arrays.stream(ret).mapToLong(ret_conv_14 -> ret_conv_14.ptr).toArray();
-				/* TODO 2 MonitorEvent  */;
+				long[] result = ret != null ? Arrays.stream(ret).mapToLong(ret_conv_14 -> ret_conv_14.ptr).toArray() : null;
 				return result;
 			}
 		});
@@ -109,15 +109,17 @@ 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; }
 		Result_NoneChannelMonitorUpdateErrZ ret_hu_conv = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret);
-		this.ptrs_to.add(funding_txo);
-		this.ptrs_to.add(monitor);
 		return ret_hu_conv;
 	}
 
@@ -128,13 +130,11 @@ 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; }
 		Result_NoneChannelMonitorUpdateErrZ ret_hu_conv = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret);
-		this.ptrs_to.add(funding_txo);
-		this.ptrs_to.add(update);
 		return ret_hu_conv;
 	}