X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FFilter.ts;h=140d9500a36d3da86a87f4c4cea64b2e4a80e142;hb=e2aa598aa07fde645c4fab04df6f49db84a5e6db;hp=fa7bceb17a7635720d42b5ae5c29d1319ade3ff3;hpb=22f5f4208b1f3b5542292250f1612b944f5cd7fd;p=ldk-java

diff --git a/ts/structs/Filter.ts b/ts/structs/Filter.ts
index fa7bceb1..140d9500 100644
--- a/ts/structs/Filter.ts
+++ b/ts/structs/Filter.ts
@@ -36,9 +36,12 @@ import * as bindings from '../bindings' // TODO: figure out location
 							arg.register_tx(txid, script_pubkey);
 						},
 
-						register_output (outpoint: number, script_pubkey: Uint8Array): void {
-							const outpoint_hu_conv: OutPoint = new OutPoint(null, outpoint);
-							arg.register_output(outpoint_hu_conv, 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 == null ? 0 : ret.clone_ptr();
+				return result;
 						},
 
 						
@@ -49,7 +52,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 
             export interface FilterInterface {
                 register_tx(txid: Uint8Array, script_pubkey: Uint8Array): void;
-				register_output(outpoint: OutPoint, script_pubkey: Uint8Array): void;
+				register_output(output: WatchedOutput): Option_C2Tuple_usizeTransactionZZ;
 				
             }
 
@@ -57,12 +60,14 @@ import * as bindings from '../bindings' // TODO: figure out location
                 held: Filter;
             }
 	public void register_tx(Uint8Array txid, Uint8Array script_pubkey) {
-		bindings.Filter_register_tx(this.ptr, txid, script_pubkey);
+		bindings.Filter_register_tx(this.ptr, InternalUtils.check_arr_len(txid, 32), script_pubkey);
 	}
 
-	public void register_output(OutPoint outpoint, Uint8Array 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(WatchedOutput output) {
+		number ret = bindings.Filter_register_output(this.ptr, output == null ? 0 : output.ptr & ~1);
+		Option_C2Tuple_usizeTransactionZZ ret_hu_conv = Option_C2Tuple_usizeTransactionZZ.constr_from_ptr(ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
 }