X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FWatch.java;h=c9b156fbd5146997e446ae25ae8fc4c74e3bc479;hb=276893d3b8bd3fcb2bb10e3cab73a69d34831909;hp=a83f691ec467afe650b6748bb45bcccc3a4a4fe3;hpb=0ddbeb5d1cddaa1d89cad2a63548434b2e1e227a;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Watch.java b/src/main/java/org/ldk/structs/Watch.java
index a83f691e..c9b156fb 100644
--- a/src/main/java/org/ldk/structs/Watch.java
+++ b/src/main/java/org/ldk/structs/Watch.java
@@ -24,37 +24,48 @@ public class Watch extends CommonBase {
 		Result_NoneChannelMonitorUpdateErrZ update_channel(OutPoint funding_txo, ChannelMonitorUpdate update);
 		MonitorEvent[] release_pending_monitor_events();
 	}
-	public Watch(WatchInterface arg) {
-		this(new bindings.LDKWatch() {
+	private static class LDKWatchHolder { Watch held; }
+	public static Watch new_impl(WatchInterface arg) {
+		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);
+				funding_txo_hu_conv.ptrs_to.add(this);
 				ChannelMonitor 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;
-				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);
+				funding_txo_hu_conv.ptrs_to.add(this);
 				ChannelMonitorUpdate 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;
-				ret.ptr = 0;
 				return result;
 			}
 			@Override public long[] release_pending_monitor_events() {
 				MonitorEvent[] ret = arg.release_pending_monitor_events();
-				long[] result = Arrays.stream(ret).mapToLong(arr_conv_14 -> arr_conv_14 == null ? 0 : arr_conv_14.ptr & ~1).toArray();
-				//TODO: May need to call: /* TODO 2 MonitorEvent  */;
+				long[] result = Arrays.stream(ret).mapToLong(ret_conv_14 -> ret_conv_14.ptr).toArray();
+				/* TODO 2 MonitorEvent  */;
 				return result;
 			}
 		});
+		return impl_holder.held;
 	}
-	// Skipped Watch_watch_channel
+	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);
+		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;
+	}
+
 	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);
 		Result_NoneChannelMonitorUpdateErrZ ret_hu_conv = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
 		this.ptrs_to.add(funding_txo);
 		this.ptrs_to.add(update);
 		return ret_hu_conv;
@@ -62,13 +73,14 @@ public class Watch extends CommonBase {
 
 	public MonitorEvent[] release_pending_monitor_events() {
 		long[] ret = bindings.Watch_release_pending_monitor_events(this.ptr);
-		MonitorEvent[] arr_conv_14_arr = new MonitorEvent[ret.length];
+		MonitorEvent[] ret_conv_14_arr = new MonitorEvent[ret.length];
 		for (int o = 0; o < ret.length; o++) {
-			long arr_conv_14 = ret[o];
-			MonitorEvent arr_conv_14_hu_conv = new MonitorEvent(null, arr_conv_14);
-			arr_conv_14_arr[o] = arr_conv_14_hu_conv;
+			long ret_conv_14 = ret[o];
+			MonitorEvent ret_conv_14_hu_conv = MonitorEvent.constr_from_ptr(ret_conv_14);
+			ret_conv_14_hu_conv.ptrs_to.add(this);
+			ret_conv_14_arr[o] = ret_conv_14_hu_conv;
 		}
-		return arr_conv_14_arr;
+		return ret_conv_14_arr;
 	}
 
 }