X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FCommitmentTransaction.java;h=9c1a693bbf068ad51b6fdcda730cc45928250838;hb=2f0e19ab23f28c5c1bc11dc6bff24e156da3ec01;hp=276a69d05befe92ec30c0115d5a0861851d02f35;hpb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/CommitmentTransaction.java b/src/main/java/org/ldk/structs/CommitmentTransaction.java
index 276a69d0..9c1a693b 100644
--- a/src/main/java/org/ldk/structs/CommitmentTransaction.java
+++ b/src/main/java/org/ldk/structs/CommitmentTransaction.java
@@ -4,6 +4,7 @@ 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,14 +25,21 @@ public class CommitmentTransaction extends CommonBase {
 		if (ptr != 0) { bindings.CommitmentTransaction_free(ptr); }
 	}
 
+	long clone_ptr() {
+		long ret = bindings.CommitmentTransaction_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the CommitmentTransaction
 	 */
 	public CommitmentTransaction clone() {
 		long ret = bindings.CommitmentTransaction_clone(this.ptr);
+		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		CommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new CommitmentTransaction(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.CommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.CommitmentTransaction(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -40,6 +48,7 @@ public class CommitmentTransaction extends CommonBase {
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.CommitmentTransaction_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -48,6 +57,7 @@ public class CommitmentTransaction extends CommonBase {
 	 */
 	public static Result_CommitmentTransactionDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.CommitmentTransaction_read(ser);
+		Reference.reachabilityFence(ser);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_CommitmentTransactionDecodeErrorZ ret_hu_conv = Result_CommitmentTransactionDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
@@ -58,6 +68,16 @@ public class CommitmentTransaction extends CommonBase {
 	 */
 	public long commitment_number() {
 		long ret = bindings.CommitmentTransaction_commitment_number(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	/**
+	 * The per commitment point used by the broadcaster.
+	 */
+	public byte[] per_commitment_point() {
+		byte[] ret = bindings.CommitmentTransaction_per_commitment_point(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -66,6 +86,7 @@ public class CommitmentTransaction extends CommonBase {
 	 */
 	public long to_broadcaster_value_sat() {
 		long ret = bindings.CommitmentTransaction_to_broadcaster_value_sat(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -74,6 +95,7 @@ public class CommitmentTransaction extends CommonBase {
 	 */
 	public long to_countersignatory_value_sat() {
 		long ret = bindings.CommitmentTransaction_to_countersignatory_value_sat(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -82,6 +104,7 @@ public class CommitmentTransaction extends CommonBase {
 	 */
 	public int feerate_per_kw() {
 		int ret = bindings.CommitmentTransaction_feerate_per_kw(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -95,9 +118,10 @@ public class CommitmentTransaction extends CommonBase {
 	 */
 	public TrustedCommitmentTransaction trust() {
 		long ret = bindings.CommitmentTransaction_trust(this.ptr);
+		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		TrustedCommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new TrustedCommitmentTransaction(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.TrustedCommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.TrustedCommitmentTransaction(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -109,13 +133,17 @@ public class CommitmentTransaction extends CommonBase {
 	 * An external validating signer must call this method before signing
 	 * or using the built transaction.
 	 */
-	public Result_TrustedCommitmentTransactionNoneZ verify(DirectedChannelTransactionParameters channel_parameters, ChannelPublicKeys broadcaster_keys, ChannelPublicKeys countersignatory_keys) {
-		long ret = bindings.CommitmentTransaction_verify(this.ptr, channel_parameters == null ? 0 : channel_parameters.ptr & ~1, broadcaster_keys == null ? 0 : broadcaster_keys.ptr & ~1, countersignatory_keys == null ? 0 : countersignatory_keys.ptr & ~1);
+	public Result_TrustedCommitmentTransactionNoneZ verify(org.ldk.structs.DirectedChannelTransactionParameters channel_parameters, org.ldk.structs.ChannelPublicKeys broadcaster_keys, org.ldk.structs.ChannelPublicKeys countersignatory_keys) {
+		long ret = bindings.CommitmentTransaction_verify(this.ptr, channel_parameters == null ? 0 : channel_parameters.ptr, broadcaster_keys == null ? 0 : broadcaster_keys.ptr, countersignatory_keys == null ? 0 : countersignatory_keys.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(channel_parameters);
+		Reference.reachabilityFence(broadcaster_keys);
+		Reference.reachabilityFence(countersignatory_keys);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_TrustedCommitmentTransactionNoneZ ret_hu_conv = Result_TrustedCommitmentTransactionNoneZ.constr_from_ptr(ret);
-		this.ptrs_to.add(channel_parameters);
-		this.ptrs_to.add(broadcaster_keys);
-		this.ptrs_to.add(countersignatory_keys);
+		if (this != null) { this.ptrs_to.add(channel_parameters); };
+		if (this != null) { this.ptrs_to.add(broadcaster_keys); };
+		if (this != null) { this.ptrs_to.add(countersignatory_keys); };
 		return ret_hu_conv;
 	}