X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FFilter.java;h=764f2cbbd70f96b4427bd64d1e7fdc65199b3d81;hb=6d094e745feaf94c1059555cd1c997965a34bc36;hp=701e70f5c0ad06ff894c34aada3f4e38b437348f;hpb=ba1af51214a8ea2de62b84cd23b6145173c71752;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Filter.java b/src/main/java/org/ldk/structs/Filter.java
index 701e70f5..764f2cbb 100644
--- a/src/main/java/org/ldk/structs/Filter.java
+++ b/src/main/java/org/ldk/structs/Filter.java
@@ -24,7 +24,7 @@ import javax.annotation.Nullable;
  * processed later. Then, in order to block until the data has been processed, any [`Watch`]
  * invocation that has called the `Filter` must return [`TemporaryFailure`].
  * 
- * [`TemporaryFailure`]: channelmonitor::ChannelMonitorUpdateErr::TemporaryFailure
+ * [`TemporaryFailure`]: ChannelMonitorUpdateErr::TemporaryFailure
  * [BIP 157]: https://github.com/bitcoin/bips/blob/master/bip-0157.mediawiki
  * [BIP 158]: https://github.com/bitcoin/bips/blob/master/bip-0158.mediawiki
  */
@@ -69,10 +69,10 @@ public class Filter extends CommonBase {
 				arg.register_tx(txid, script_pubkey);
 			}
 			@Override public long register_output(long output) {
-				WatchedOutput output_hu_conv = new WatchedOutput(null, output);
+				WatchedOutput output_hu_conv = null; if (output < 0 || output > 4096) { output_hu_conv = new WatchedOutput(null, output); }
 				output_hu_conv.ptrs_to.add(this);
 				Option_C2Tuple_usizeTransactionZZ ret = arg.register_output(output_hu_conv);
-				long result = ret.ptr;
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
 		});
@@ -83,7 +83,7 @@ public class Filter extends CommonBase {
 	 * a spending condition.
 	 */
 	public void register_tx(byte[] txid, byte[] 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);
 	}
 
 	/**
@@ -99,10 +99,9 @@ public class Filter extends CommonBase {
 	 */
 	public Option_C2Tuple_usizeTransactionZZ register_output(WatchedOutput output) {
 		long ret = bindings.Filter_register_output(this.ptr, output == null ? 0 : output.ptr & ~1);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Option_C2Tuple_usizeTransactionZZ ret_hu_conv = Option_C2Tuple_usizeTransactionZZ.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(this);
-		this.ptrs_to.add(output);
 		return ret_hu_conv;
 	}