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

diff --git a/ts/structs/Watch.ts b/ts/structs/Watch.ts
index bf0fd550..b1a752e9 100644
--- a/ts/structs/Watch.ts
+++ b/ts/structs/Watch.ts
@@ -1,5 +1,82 @@
+
+            
+import CommonBase from './CommonBase';
+import * as bindings from '../bindings' // TODO: figure out location
+
+
+
+            export class Watch extends CommonBase {
+
+                bindings_instance?: bindings.LDKWatch;
+
+                constructor(ptr?: number, arg?: bindings.LDKWatch) {
+                    if (Number.isFinite(ptr)) {
+				        super(ptr);
+				        this.bindings_instance = null;
+				    } else {
+				        // TODO: private constructor instantiation
+				        super(bindings.LDKWatch_new(arg));
+				        this.ptrs_to.push(arg);
+				        
+				    }
+                }
+
+                protected finalize() {
+                    if (this.ptr != 0) {
+                        bindings.Watch_free(this.ptr);
+                    }
+                    super.finalize();
+                }
+
+                static new_impl(arg: WatchInterface): Watch {
+                    const impl_holder: LDKWatchHolder = new LDKWatchHolder();
+                    let structImplementation = <bindings.LDKWatch>{
+                        // 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;
+						},
+
+						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;
+						},
+
+						release_pending_monitor_events (): number[] {
+							MonitorEvent[] ret = arg.release_pending_monitor_events();
+				result: number[] = Arrays.stream(ret).map(ret_conv_14 -> ret_conv_14.ptr).toArray(number[]::new);
+				/* TODO 2 MonitorEvent  */;
+				return result;
+						},
+
+						
+                    };
+                    impl_holder.held = new Watch (null, structImplementation);
+                }
+            }
+
+            export interface WatchInterface {
+                watch_channel(funding_txo: OutPoint, monitor: ChannelMonitor): Result_NoneChannelMonitorUpdateErrZ;
+				update_channel(funding_txo: OutPoint, update: ChannelMonitorUpdate): Result_NoneChannelMonitorUpdateErrZ;
+				release_pending_monitor_events(): MonitorEvent[];
+				
+            }
+
+            class LDKWatchHolder {
+                held: Watch;
+            }
 	public Result_NoneChannelMonitorUpdateErrZ watch_channel(OutPoint funding_txo, ChannelMonitor monitor) {
-		uint32_t ret = bindings.Watch_watch_channel(this.ptr, funding_txo == null ? 0 : funding_txo.ptr & ~1, monitor == null ? 0 : monitor.ptr & ~1);
+		number 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);
@@ -7,7 +84,7 @@
 	}
 
 	public Result_NoneChannelMonitorUpdateErrZ update_channel(OutPoint funding_txo, ChannelMonitorUpdate update) {
-		uint32_t ret = bindings.Watch_update_channel(this.ptr, funding_txo == null ? 0 : funding_txo.ptr & ~1, update == null ? 0 : update.ptr & ~1);
+		number 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);
 		this.ptrs_to.add(funding_txo);
 		this.ptrs_to.add(update);
@@ -15,14 +92,15 @@
 	}
 
 	public MonitorEvent[] release_pending_monitor_events() {
-		uint32_t[] ret = bindings.Watch_release_pending_monitor_events(this.ptr);
-		MonitorEvent[] arr_conv_14_arr = new MonitorEvent[ret.length];
+		number[] ret = bindings.Watch_release_pending_monitor_events(this.ptr);
+		MonitorEvent[] ret_conv_14_arr = new MonitorEvent[ret.length];
 		for (int o = 0; o < ret.length; o++) {
-			uint32_t 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;
+			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;
 	}
 
 }