X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FHolderCommitmentTransaction.java;h=c37903dc322bf4c98d5f559f06e070fcabef6058;hb=1854b5cebef22ace9e9e4dd191f609818df9ce08;hp=455c1ed2f9928248d251054cc615593b9580a448;hpb=1b870a3ffab1c0024411e30102bc6d198300f095;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java b/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
index 455c1ed2..c37903dc 100644
--- a/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
+++ b/src/main/java/org/ldk/structs/HolderCommitmentTransaction.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;
 
 
 /**
@@ -25,6 +27,7 @@ public class HolderCommitmentTransaction extends CommonBase {
 	 */
 	public byte[] get_counterparty_sig() {
 		byte[] ret = bindings.HolderCommitmentTransaction_get_counterparty_sig(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -32,14 +35,24 @@ public class HolderCommitmentTransaction extends CommonBase {
 	 * Our counterparty's signature for the transaction
 	 */
 	public void set_counterparty_sig(byte[] val) {
-		bindings.HolderCommitmentTransaction_set_counterparty_sig(this.ptr, val);
+		bindings.HolderCommitmentTransaction_set_counterparty_sig(this.ptr, InternalUtils.check_arr_len(val, 64));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
 	 * All non-dust counterparty HTLC signatures, in the order they appear in the transaction
 	 */
 	public void set_counterparty_htlc_sigs(byte[][] val) {
-		bindings.HolderCommitmentTransaction_set_counterparty_htlc_sigs(this.ptr, val);
+		bindings.HolderCommitmentTransaction_set_counterparty_htlc_sigs(this.ptr, val != null ? Arrays.stream(val).map(val_conv_8 -> InternalUtils.check_arr_len(val_conv_8, 64)).toArray(byte[][]::new) : null);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
+	long clone_ptr() {
+		long ret = bindings.HolderCommitmentTransaction_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
 	}
 
 	/**
@@ -47,7 +60,9 @@ public class HolderCommitmentTransaction extends CommonBase {
 	 */
 	public HolderCommitmentTransaction clone() {
 		long ret = bindings.HolderCommitmentTransaction_clone(this.ptr);
-		HolderCommitmentTransaction ret_hu_conv = new HolderCommitmentTransaction(null, ret);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		HolderCommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new HolderCommitmentTransaction(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -57,14 +72,17 @@ public class HolderCommitmentTransaction extends CommonBase {
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.HolderCommitmentTransaction_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
 	/**
 	 * Read a HolderCommitmentTransaction from a byte array, created by HolderCommitmentTransaction_write
 	 */
-	public static Result_HolderCommitmentTransactionDecodeErrorZ constructor_read(byte[] ser) {
+	public static Result_HolderCommitmentTransactionDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.HolderCommitmentTransaction_read(ser);
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_HolderCommitmentTransactionDecodeErrorZ ret_hu_conv = Result_HolderCommitmentTransactionDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
@@ -73,11 +91,16 @@ public class HolderCommitmentTransaction extends CommonBase {
 	 * Create a new holder transaction with the given counterparty signatures.
 	 * The funding keys are used to figure out which signature should go first when building the transaction for broadcast.
 	 */
-	public static HolderCommitmentTransaction constructor_new(CommitmentTransaction commitment_tx, byte[] counterparty_sig, byte[][] counterparty_htlc_sigs, byte[] holder_funding_key, byte[] counterparty_funding_key) {
-		long ret = bindings.HolderCommitmentTransaction_new(commitment_tx == null ? 0 : commitment_tx.ptr & ~1, counterparty_sig, counterparty_htlc_sigs, holder_funding_key, counterparty_funding_key);
-		HolderCommitmentTransaction ret_hu_conv = new HolderCommitmentTransaction(null, ret);
+	public static HolderCommitmentTransaction of(CommitmentTransaction commitment_tx, byte[] counterparty_sig, byte[][] counterparty_htlc_sigs, byte[] holder_funding_key, byte[] counterparty_funding_key) {
+		long ret = bindings.HolderCommitmentTransaction_new(commitment_tx == null ? 0 : commitment_tx.ptr & ~1, InternalUtils.check_arr_len(counterparty_sig, 64), counterparty_htlc_sigs != null ? Arrays.stream(counterparty_htlc_sigs).map(counterparty_htlc_sigs_conv_8 -> InternalUtils.check_arr_len(counterparty_htlc_sigs_conv_8, 64)).toArray(byte[][]::new) : null, InternalUtils.check_arr_len(holder_funding_key, 33), InternalUtils.check_arr_len(counterparty_funding_key, 33));
+		Reference.reachabilityFence(commitment_tx);
+		Reference.reachabilityFence(counterparty_sig);
+		Reference.reachabilityFence(counterparty_htlc_sigs);
+		Reference.reachabilityFence(holder_funding_key);
+		Reference.reachabilityFence(counterparty_funding_key);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		HolderCommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new HolderCommitmentTransaction(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(commitment_tx);
 		return ret_hu_conv;
 	}