X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FFilter.ts;h=140d9500a36d3da86a87f4c4cea64b2e4a80e142;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=4b43e0367d5726216dec6bf5c7b0d31abeae3985;hpb=c3ae2d6897e5a809459c8d9a72a4b3aa0052c8c8;p=ldk-java diff --git a/ts/structs/Filter.ts b/ts/structs/Filter.ts index 4b43e036..140d9500 100644 --- a/ts/structs/Filter.ts +++ b/ts/structs/Filter.ts @@ -40,7 +40,7 @@ import * as bindings from '../bindings' // TODO: figure out location 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; + result: number = ret == null ? 0 : ret.clone_ptr(); return result; }, @@ -60,14 +60,13 @@ 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 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)); + 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); - ret_hu_conv.ptrs_to.add(output_outpoint_arg); return ret_hu_conv; }