X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FHolderCommitmentTransaction.java;h=7458cc9b0f1990c570f9371a00675a8311486850;hb=8aa8a96fc6d8fcdd3fbb419b4b4c12482af14938;hp=c37903dc322bf4c98d5f559f06e070fcabef6058;hpb=1854b5cebef22ace9e9e4dd191f609818df9ce08;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java b/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
index c37903dc..7458cc9b 100644
--- a/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
+++ b/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
@@ -40,6 +40,17 @@ public class HolderCommitmentTransaction extends CommonBase {
 		Reference.reachabilityFence(val);
 	}
 
+	/**
+	 * All non-dust counterparty HTLC signatures, in the order they appear in the transaction
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public byte[][] get_counterparty_htlc_sigs() {
+		byte[][] ret = bindings.HolderCommitmentTransaction_get_counterparty_htlc_sigs(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * All non-dust counterparty HTLC signatures, in the order they appear in the transaction
 	 */
@@ -62,8 +73,8 @@ public class HolderCommitmentTransaction extends CommonBase {
 		long ret = bindings.HolderCommitmentTransaction_clone(this.ptr);
 		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);
+		org.ldk.structs.HolderCommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.HolderCommitmentTransaction(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -91,16 +102,17 @@ 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 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));
+	public static HolderCommitmentTransaction of(org.ldk.structs.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, 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);
+		org.ldk.structs.HolderCommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.HolderCommitmentTransaction(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(commitment_tx); };
 		return ret_hu_conv;
 	}