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=092c65614100a5045588eb204eac935026cba488;hpb=17113550a5fefab21f39f27fbfe02646b8db53ae;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Filter.java b/src/main/java/org/ldk/structs/Filter.java
index 092c6561..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
@@ -20,11 +22,10 @@ import java.util.Arrays;
  * 
  * Note that use as part of a [`Watch`] implementation involves reentrancy. Therefore, the `Filter`
  * should not block on I/O. Implementations should instead queue the newly monitored data to be
- * processed later. Then, in order to block until the data has been processed, any `Watch`
+ * processed later. Then, in order to block until the data has been processed, any [`Watch`]
  * invocation that has called the `Filter` must return [`TemporaryFailure`].
  * 
- * [`Watch`]: trait.Watch.html
- * [`TemporaryFailure`]: channelmonitor/enum.ChannelMonitorUpdateErr.html#variant.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
  */
@@ -49,10 +50,17 @@ public class Filter extends CommonBase {
 		 */
 		void register_tx(byte[] txid, byte[] script_pubkey);
 		/**
-		 * Registers interest in spends of a transaction output identified by `outpoint` having
-		 * `script_pubkey` as the spending condition.
+		 * Registers interest in spends of a transaction output.
+		 * 
+		 * Optionally, when `output.block_hash` is set, should return any transaction spending the
+		 * output that is found in the corresponding block along with its index.
+		 * 
+		 * This return value is useful for Electrum clients in order to supply in-block descendant
+		 * transactions which otherwise were not included. This is not necessary for other clients if
+		 * such descendant transactions were already included (e.g., when a BIP 157 client provides the
+		 * full block).
 		 */
-		void register_output(OutPoint outpoint, byte[] script_pubkey);
+		Option_C2Tuple_usizeTransactionZZ register_output(WatchedOutput output);
 	}
 	private static class LDKFilterHolder { Filter held; }
 	public static Filter new_impl(FilterInterface arg) {
@@ -60,10 +68,15 @@ 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 void register_output(long outpoint, byte[] script_pubkey) {
-				OutPoint outpoint_hu_conv = new OutPoint(null, outpoint);
-				arg.register_output(outpoint_hu_conv, script_pubkey);
+			@Override public long register_output(long 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);
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
+				return result;
 			}
 		});
 		return impl_holder.held;
@@ -73,16 +86,31 @@ 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);
 	}
 
 	/**
-	 * Registers interest in spends of a transaction output identified by `outpoint` having
-	 * `script_pubkey` as the spending condition.
+	 * Registers interest in spends of a transaction output.
+	 * 
+	 * Optionally, when `output.block_hash` is set, should return any transaction spending the
+	 * output that is found in the corresponding block along with its index.
+	 * 
+	 * This return value is useful for Electrum clients in order to supply in-block descendant
+	 * transactions which otherwise were not included. This is not necessary for other clients if
+	 * such descendant transactions were already included (e.g., when a BIP 157 client provides the
+	 * full block).
 	 */
-	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(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);
+		return ret_hu_conv;
 	}
 
 }