X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FWatch.ts;h=b1a752e9994033b9bb8657a3ab9d7d1f124c9f13;hb=276893d3b8bd3fcb2bb10e3cab73a69d34831909;hp=ea0bdf4b1d8d804f888855247fabfc3effcdcd64;hpb=22f5f4208b1f3b5542292250f1612b944f5cd7fd;p=ldk-java

diff --git a/ts/structs/Watch.ts b/ts/structs/Watch.ts
index ea0bdf4b..b1a752e9 100644
--- a/ts/structs/Watch.ts
+++ b/ts/structs/Watch.ts
@@ -34,7 +34,9 @@ import * as bindings from '../bindings' // TODO: figure out location
                         // todo: in-line interface filling
                         watch_channel (funding_txo: number, monitor: number): number {
 							const funding_txo_hu_conv: OutPoint = new OutPoint(null, funding_txo);
+				funding_txo_hu_conv.ptrs_to.add(this);
 							const monitor_hu_conv: ChannelMonitor = new ChannelMonitor(null, monitor);
+				monitor_hu_conv.ptrs_to.add(this);
 							Result_NoneChannelMonitorUpdateErrZ ret = arg.watch_channel(funding_txo_hu_conv, monitor_hu_conv);
 				result: number = ret != null ? ret.ptr : 0;
 				return result;
@@ -42,7 +44,9 @@ import * as bindings from '../bindings' // TODO: figure out location
 
 						update_channel (funding_txo: number, update: number): number {
 							const funding_txo_hu_conv: OutPoint = new OutPoint(null, funding_txo);
+				funding_txo_hu_conv.ptrs_to.add(this);
 							const update_hu_conv: ChannelMonitorUpdate = new ChannelMonitorUpdate(null, update);
+				update_hu_conv.ptrs_to.add(this);
 							Result_NoneChannelMonitorUpdateErrZ ret = arg.update_channel(funding_txo_hu_conv, update_hu_conv);
 				result: number = ret != null ? ret.ptr : 0;
 				return result;
@@ -50,7 +54,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 
 						release_pending_monitor_events (): number[] {
 							MonitorEvent[] ret = arg.release_pending_monitor_events();
-				result: number[] = (number[])Arrays.stream(ret).map(arr_conv_14 -> arr_conv_14 == null ? 0 : arr_conv_14.ptr & ~1).toArray();
+				result: number[] = Arrays.stream(ret).map(ret_conv_14 -> ret_conv_14.ptr).toArray(number[]::new);
 				/* TODO 2 MonitorEvent  */;
 				return result;
 						},
@@ -89,13 +93,14 @@ import * as bindings from '../bindings' // TODO: figure out location
 
 	public MonitorEvent[] release_pending_monitor_events() {
 		number[] 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++) {
-			number arr_conv_14 = ret[o];
-			const arr_conv_14_hu_conv: MonitorEvent = new MonitorEvent(null, arr_conv_14);
-			arr_conv_14_arr[o] = arr_conv_14_hu_conv;
+			number 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;
 	}
 
 }