X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FFilter.ts;h=4b43e0367d5726216dec6bf5c7b0d31abeae3985;hb=c3ae2d6897e5a809459c8d9a72a4b3aa0052c8c8;hp=08596b67e79e5d1cccdd0749601554a61557739d;hpb=822471992c6bf6f9985e531cc5940e4cc35e3e4c;p=ldk-java

diff --git a/ts/structs/Filter.ts b/ts/structs/Filter.ts
index 08596b67..4b43e036 100644
--- a/ts/structs/Filter.ts
+++ b/ts/structs/Filter.ts
@@ -1,45 +1,74 @@
 
+            
 import CommonBase from './CommonBase';
 import * as bindings from '../bindings' // TODO: figure out location
 
-public class Filter extends CommonBase {
-	final bindings.LDKFilter bindings_instance;
-	Filter(Object _dummy, long ptr) { super(ptr); bindings_instance = null; }
-	private Filter(bindings.LDKFilter arg) {
-		super(bindings.LDKFilter_new(arg));
-		this.ptrs_to.add(arg);
-		this.bindings_instance = arg;
-	}
-	@Override @SuppressWarnings("deprecation")
-	protected void finalize() throws Throwable {
-		if (ptr != 0) { bindings.Filter_free(ptr); } super.finalize();
-	}
 
-	public static interface FilterInterface {
-		void register_tx(byte[] txid, byte[] script_pubkey);
-		void register_output(OutPoint outpoint, byte[] script_pubkey);
-	}
-	private static class LDKFilterHolder { Filter held; }
-	public static Filter new_impl(FilterInterface arg) {
-		final LDKFilterHolder impl_holder = new LDKFilterHolder();
-		impl_holder.held = new Filter(new bindings.LDKFilter() {
-			@Override public void register_tx(byte[] txid, byte[] script_pubkey) {
-				arg.register_tx(txid, script_pubkey);
-			}
-			@Override public void register_output(uint32_t outpoint, byte[] script_pubkey) {
-				OutPoint outpoint_hu_conv = new OutPoint(null, outpoint);
-				arg.register_output(outpoint_hu_conv, script_pubkey);
-			}
-		});
-		return impl_holder.held;
-	}
-	public void register_tx(byte[] txid, byte[] script_pubkey) {
+
+            export class Filter extends CommonBase {
+
+                bindings_instance?: bindings.LDKFilter;
+
+                constructor(ptr?: number, arg?: bindings.LDKFilter) {
+                    if (Number.isFinite(ptr)) {
+				        super(ptr);
+				        this.bindings_instance = null;
+				    } else {
+				        // TODO: private constructor instantiation
+				        super(bindings.LDKFilter_new(arg));
+				        this.ptrs_to.push(arg);
+				        
+				    }
+                }
+
+                protected finalize() {
+                    if (this.ptr != 0) {
+                        bindings.Filter_free(this.ptr);
+                    }
+                    super.finalize();
+                }
+
+                static new_impl(arg: FilterInterface): Filter {
+                    const impl_holder: LDKFilterHolder = new LDKFilterHolder();
+                    let structImplementation = <bindings.LDKFilter>{
+                        // todo: in-line interface filling
+                        register_tx (txid: Uint8Array, script_pubkey: Uint8Array): void {
+							arg.register_tx(txid, script_pubkey);
+						},
+
+						register_output (output: number): number {
+							const output_hu_conv: WatchedOutput = new WatchedOutput(null, output);
+				output_hu_conv.ptrs_to.add(this);
+							Option_C2Tuple_usizeTransactionZZ ret = arg.register_output(output_hu_conv);
+				result: number = ret.ptr;
+				return result;
+						},
+
+						
+                    };
+                    impl_holder.held = new Filter (null, structImplementation);
+                }
+            }
+
+            export interface FilterInterface {
+                register_tx(txid: Uint8Array, script_pubkey: Uint8Array): void;
+				register_output(output: WatchedOutput): Option_C2Tuple_usizeTransactionZZ;
+				
+            }
+
+            class LDKFilterHolder {
+                held: Filter;
+            }
+	public void register_tx(Uint8Array txid, Uint8Array script_pubkey) {
 		bindings.Filter_register_tx(this.ptr, txid, script_pubkey);
 	}
 
-	public void register_output(OutPoint outpoint, byte[] script_pubkey) {
-		bindings.Filter_register_output(this.ptr, outpoint == null ? 0 : outpoint.ptr & ~1, script_pubkey);
-		this.ptrs_to.add(outpoint);
+	public Option_C2Tuple_usizeTransactionZZ register_output(Uint8Array output_block_hash_arg, OutPoint output_outpoint_arg, Uint8Array output_script_pubkey_arg) {
+		number ret = bindings.Filter_register_output(this.ptr, bindings.WatchedOutput_new(output_block_hash_arg, output_outpoint_arg == null ? 0 : output_outpoint_arg.ptr & ~1, output_script_pubkey_arg));
+		Option_C2Tuple_usizeTransactionZZ ret_hu_conv = Option_C2Tuple_usizeTransactionZZ.constr_from_ptr(ret);
+		ret_hu_conv.ptrs_to.add(this);
+		ret_hu_conv.ptrs_to.add(output_outpoint_arg);
+		return ret_hu_conv;
 	}
 
 }