X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FFilter.java;h=8d3e19fbf67290c11169962fc58a85b7cda70652;hb=ff3dacec3be60f870d81f6df11bd9fff92aa6047;hp=9200d9a14311e47e9fb8e5ba4dd49d3bf3651d76;hpb=c3ae2d6897e5a809459c8d9a72a4b3aa0052c8c8;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Filter.java b/src/main/java/org/ldk/structs/Filter.java
index 9200d9a1..8d3e19fb 100644
--- a/src/main/java/org/ldk/structs/Filter.java
+++ b/src/main/java/org/ldk/structs/Filter.java
@@ -4,6 +4,8 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import java.lang.ref.Reference;
+import javax.annotation.Nullable;
 
 /**
  * The `Filter` trait defines behavior for indicating chain activity of interest pertaining to
@@ -23,7 +25,7 @@ import java.util.Arrays;
  * 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
  */
@@ -66,12 +68,14 @@ public class Filter extends CommonBase {
 		impl_holder.held = new Filter(new bindings.LDKFilter() {
 			@Override public void register_tx(byte[] txid, byte[] script_pubkey) {
 				arg.register_tx(txid, script_pubkey);
+				Reference.reachabilityFence(arg);
 			}
 			@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;
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
 		});
@@ -82,7 +86,10 @@ 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);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(txid);
+		Reference.reachabilityFence(script_pubkey);
 	}
 
 	/**
@@ -96,11 +103,13 @@ public class Filter extends CommonBase {
 	 * such descendant transactions were already included (e.g., when a BIP 157 client provides the
 	 * full block).
 	 */
-	public Option_C2Tuple_usizeTransactionZZ register_output(byte[] output_block_hash_arg, OutPoint output_outpoint_arg, byte[] output_script_pubkey_arg) {
-		long 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);
+	public Option_C2Tuple_usizeTransactionZZ register_output(WatchedOutput output) {
+		long ret = bindings.Filter_register_output(this.ptr, output == null ? 0 : output.ptr & ~1);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(output);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.Option_C2Tuple_usizeTransactionZZ ret_hu_conv = org.ldk.structs.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;
 	}