X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FWatchedOutput.java;h=c0e7403d42dd5ae98aa468c6bada321895826ad9;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=bfb953287107d8143a0b44d80c77caecdd77f8ac;hpb=32692e00046b7ec16b6a2e20bd54800b2b48d4c0;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/WatchedOutput.java b/src/main/java/org/ldk/structs/WatchedOutput.java
index bfb95328..c0e7403d 100644
--- a/src/main/java/org/ldk/structs/WatchedOutput.java
+++ b/src/main/java/org/ldk/structs/WatchedOutput.java
@@ -46,7 +46,7 @@ public class WatchedOutput extends CommonBase {
 	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
 	public void set_block_hash(@Nullable byte[] val) {
-		bindings.WatchedOutput_set_block_hash(this.ptr, val);
+		bindings.WatchedOutput_set_block_hash(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
 	/**
@@ -54,8 +54,8 @@ public class WatchedOutput extends CommonBase {
 	 */
 	public OutPoint get_outpoint() {
 		long ret = bindings.WatchedOutput_get_outpoint(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		OutPoint ret_hu_conv = new OutPoint(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		OutPoint ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new OutPoint(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -86,20 +86,25 @@ public class WatchedOutput extends CommonBase {
 	 * Constructs a new WatchedOutput given each field
 	 */
 	public static WatchedOutput of(byte[] block_hash_arg, OutPoint outpoint_arg, byte[] script_pubkey_arg) {
-		long ret = bindings.WatchedOutput_new(block_hash_arg, outpoint_arg == null ? 0 : outpoint_arg.ptr & ~1, script_pubkey_arg);
-		if (ret >= 0 && ret < 1024) { return null; }
-		WatchedOutput ret_hu_conv = new WatchedOutput(null, ret);
+		long ret = bindings.WatchedOutput_new(InternalUtils.check_arr_len(block_hash_arg, 32), outpoint_arg == null ? 0 : outpoint_arg.ptr & ~1, script_pubkey_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		WatchedOutput ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new WatchedOutput(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.WatchedOutput_clone_ptr(this.ptr);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the WatchedOutput
 	 */
 	public WatchedOutput clone() {
 		long ret = bindings.WatchedOutput_clone(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		WatchedOutput ret_hu_conv = new WatchedOutput(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		WatchedOutput ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new WatchedOutput(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}