X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelPublicKeys.java;h=dbe5c3bbf33f9e596a94216240799cc98e6639ae;hb=f385eff0dd0aa61fbf21ae946c424f4a6a26de04;hp=c67b24a71cbf69da3515ef2b9c9b37fb63b71ca9;hpb=1b870a3ffab1c0024411e30102bc6d198300f095;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelPublicKeys.java b/src/main/java/org/ldk/structs/ChannelPublicKeys.java
index c67b24a7..dbe5c3bb 100644
--- a/src/main/java/org/ldk/structs/ChannelPublicKeys.java
+++ b/src/main/java/org/ldk/structs/ChannelPublicKeys.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;
 
 
 /**
@@ -24,6 +26,7 @@ public class ChannelPublicKeys extends CommonBase {
 	 */
 	public byte[] get_funding_pubkey() {
 		byte[] ret = bindings.ChannelPublicKeys_get_funding_pubkey(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -32,7 +35,9 @@ public class ChannelPublicKeys extends CommonBase {
 	 * on-chain channel lock-in 2-of-2 multisig output.
 	 */
 	public void set_funding_pubkey(byte[] val) {
-		bindings.ChannelPublicKeys_set_funding_pubkey(this.ptr, val);
+		bindings.ChannelPublicKeys_set_funding_pubkey(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -43,6 +48,7 @@ public class ChannelPublicKeys extends CommonBase {
 	 */
 	public byte[] get_revocation_basepoint() {
 		byte[] ret = bindings.ChannelPublicKeys_get_revocation_basepoint(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -53,7 +59,9 @@ public class ChannelPublicKeys extends CommonBase {
 	 * states.
 	 */
 	public void set_revocation_basepoint(byte[] val) {
-		bindings.ChannelPublicKeys_set_revocation_basepoint(this.ptr, val);
+		bindings.ChannelPublicKeys_set_revocation_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -63,6 +71,7 @@ public class ChannelPublicKeys extends CommonBase {
 	 */
 	public byte[] get_payment_point() {
 		byte[] ret = bindings.ChannelPublicKeys_get_payment_point(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -72,7 +81,9 @@ public class ChannelPublicKeys extends CommonBase {
 	 * static across every commitment transaction.
 	 */
 	public void set_payment_point(byte[] val) {
-		bindings.ChannelPublicKeys_set_payment_point(this.ptr, val);
+		bindings.ChannelPublicKeys_set_payment_point(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -82,6 +93,7 @@ public class ChannelPublicKeys extends CommonBase {
 	 */
 	public byte[] get_delayed_payment_basepoint() {
 		byte[] ret = bindings.ChannelPublicKeys_get_delayed_payment_basepoint(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -91,7 +103,9 @@ public class ChannelPublicKeys extends CommonBase {
 	 * after some delay (or can be claimed via the revocation path).
 	 */
 	public void set_delayed_payment_basepoint(byte[] val) {
-		bindings.ChannelPublicKeys_set_delayed_payment_basepoint(this.ptr, val);
+		bindings.ChannelPublicKeys_set_delayed_payment_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -100,6 +114,7 @@ public class ChannelPublicKeys extends CommonBase {
 	 */
 	public byte[] get_htlc_basepoint() {
 		byte[] ret = bindings.ChannelPublicKeys_get_htlc_basepoint(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -108,26 +123,42 @@ public class ChannelPublicKeys extends CommonBase {
 	 * which is used to encumber HTLC-in-flight outputs.
 	 */
 	public void set_htlc_basepoint(byte[] val) {
-		bindings.ChannelPublicKeys_set_htlc_basepoint(this.ptr, val);
+		bindings.ChannelPublicKeys_set_htlc_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
 	 * Constructs a new ChannelPublicKeys given each field
 	 */
-	public static ChannelPublicKeys constructor_new(byte[] funding_pubkey_arg, byte[] revocation_basepoint_arg, byte[] payment_point_arg, byte[] delayed_payment_basepoint_arg, byte[] htlc_basepoint_arg) {
-		long ret = bindings.ChannelPublicKeys_new(funding_pubkey_arg, revocation_basepoint_arg, payment_point_arg, delayed_payment_basepoint_arg, htlc_basepoint_arg);
-		ChannelPublicKeys ret_hu_conv = new ChannelPublicKeys(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+	public static ChannelPublicKeys of(byte[] funding_pubkey_arg, byte[] revocation_basepoint_arg, byte[] payment_point_arg, byte[] delayed_payment_basepoint_arg, byte[] htlc_basepoint_arg) {
+		long ret = bindings.ChannelPublicKeys_new(InternalUtils.check_arr_len(funding_pubkey_arg, 33), InternalUtils.check_arr_len(revocation_basepoint_arg, 33), InternalUtils.check_arr_len(payment_point_arg, 33), InternalUtils.check_arr_len(delayed_payment_basepoint_arg, 33), InternalUtils.check_arr_len(htlc_basepoint_arg, 33));
+		Reference.reachabilityFence(funding_pubkey_arg);
+		Reference.reachabilityFence(revocation_basepoint_arg);
+		Reference.reachabilityFence(payment_point_arg);
+		Reference.reachabilityFence(delayed_payment_basepoint_arg);
+		Reference.reachabilityFence(htlc_basepoint_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelPublicKeys ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelPublicKeys(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.ChannelPublicKeys_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the ChannelPublicKeys
 	 */
 	public ChannelPublicKeys clone() {
 		long ret = bindings.ChannelPublicKeys_clone(this.ptr);
-		ChannelPublicKeys ret_hu_conv = new ChannelPublicKeys(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelPublicKeys ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelPublicKeys(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -136,14 +167,17 @@ public class ChannelPublicKeys extends CommonBase {
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.ChannelPublicKeys_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
 	/**
 	 * Read a ChannelPublicKeys from a byte array, created by ChannelPublicKeys_write
 	 */
-	public static Result_ChannelPublicKeysDecodeErrorZ constructor_read(byte[] ser) {
+	public static Result_ChannelPublicKeysDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.ChannelPublicKeys_read(ser);
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_ChannelPublicKeysDecodeErrorZ ret_hu_conv = Result_ChannelPublicKeysDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}