X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FShutdownScript.java;h=c40b2b77a564f3e17e045aec3ebd5bc9e54655e5;hb=890e35a4387758c0447aab34166caa579bbf3a08;hp=f180526c4b188da9897497ba70bf862b090dec96;hpb=1854b5cebef22ace9e9e4dd191f609818df9ce08;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ShutdownScript.java b/src/main/java/org/ldk/structs/ShutdownScript.java
index f180526c..c40b2b77 100644
--- a/src/main/java/org/ldk/structs/ShutdownScript.java
+++ b/src/main/java/org/ldk/structs/ShutdownScript.java
@@ -11,7 +11,7 @@ import javax.annotation.Nullable;
 /**
  * A script pubkey for shutting down a channel as defined by [BOLT #2].
  * 
- * [BOLT #2]: https://github.com/lightningnetwork/lightning-rfc/blob/master/02-peer-protocol.md
+ * [BOLT #2]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class ShutdownScript extends CommonBase {
@@ -35,8 +35,8 @@ public class ShutdownScript extends CommonBase {
 		long ret = bindings.ShutdownScript_clone(this.ptr);
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		ShutdownScript ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ShutdownScript(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.ShutdownScript ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ShutdownScript(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -67,8 +67,8 @@ public class ShutdownScript extends CommonBase {
 		long ret = bindings.ShutdownScript_new_p2wpkh(InternalUtils.check_arr_len(pubkey_hash, 20));
 		Reference.reachabilityFence(pubkey_hash);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		ShutdownScript ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ShutdownScript(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.ShutdownScript ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ShutdownScript(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -79,8 +79,8 @@ public class ShutdownScript extends CommonBase {
 		long ret = bindings.ShutdownScript_new_p2wsh(InternalUtils.check_arr_len(script_hash, 32));
 		Reference.reachabilityFence(script_hash);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		ShutdownScript ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ShutdownScript(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.ShutdownScript ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ShutdownScript(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -94,8 +94,8 @@ public class ShutdownScript extends CommonBase {
 	 * 
 	 * This function may return an error if `program` is invalid for the segwit `version`.
 	 */
-	public static Result_ShutdownScriptInvalidShutdownScriptZ new_witness_program(byte version, byte[] program) {
-		long ret = bindings.ShutdownScript_new_witness_program(version, program);
+	public static Result_ShutdownScriptInvalidShutdownScriptZ new_witness_program(WitnessVersion version, byte[] program) {
+		long ret = bindings.ShutdownScript_new_witness_program(version.getVal(), program);
 		Reference.reachabilityFence(version);
 		Reference.reachabilityFence(program);
 		if (ret >= 0 && ret <= 4096) { return null; }
@@ -109,7 +109,7 @@ public class ShutdownScript extends CommonBase {
 	public byte[] into_inner() {
 		byte[] ret = bindings.ShutdownScript_into_inner(this.ptr);
 		Reference.reachabilityFence(this);
-		;
+		if (this != null) { this.ptrs_to.add(this); };
 		return ret;
 	}
 
@@ -131,10 +131,10 @@ public class ShutdownScript extends CommonBase {
 	 * Specifically, checks for compliance with feature `option_shutdown_anysegwit`.
 	 */
 	public boolean is_compatible(InitFeatures features) {
-		boolean ret = bindings.ShutdownScript_is_compatible(this.ptr, features == null ? 0 : features.ptr & ~1);
+		boolean ret = bindings.ShutdownScript_is_compatible(this.ptr, features == null ? 0 : features.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(features);
-		this.ptrs_to.add(features);
+		if (this != null) { this.ptrs_to.add(features); };
 		return ret;
 	}