X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelKeys.java;h=500e69306f6d5ac81952d529acf6cb171b92b897;hb=3a507eb07003be3e6714e8a87fb397c09b401ce9;hp=b4b9b87b986be2188f50f3c61f61ee444cbdf52c;hpb=4f914d250ae903770128765403d62ce3d8f54126;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelKeys.java b/src/main/java/org/ldk/structs/ChannelKeys.java
index b4b9b87b..500e6930 100644
--- a/src/main/java/org/ldk/structs/ChannelKeys.java
+++ b/src/main/java/org/ldk/structs/ChannelKeys.java
@@ -25,8 +25,7 @@ public class ChannelKeys extends CommonBase {
 		byte[] release_commitment_secret(long idx);
 		TwoTuple<Long, Long> key_derivation_params();
 		Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(CommitmentTransaction commitment_tx);
-		Result_SignatureNoneZ sign_holder_commitment(HolderCommitmentTransaction commitment_tx);
-		Result_CVec_SignatureZNoneZ sign_holder_commitment_htlc_transactions(HolderCommitmentTransaction commitment_tx);
+		Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htlcs(HolderCommitmentTransaction commitment_tx);
 		Result_SignatureNoneZ sign_justice_transaction(byte[] justice_tx, long input, long amount, byte[] per_commitment_key, HTLCOutputInCommitment htlc);
 		Result_SignatureNoneZ sign_counterparty_htlc_transaction(byte[] htlc_tx, long input, long amount, byte[] per_commitment_point, HTLCOutputInCommitment htlc);
 		Result_SignatureNoneZ sign_closing_transaction(byte[] closing_tx);
@@ -57,15 +56,9 @@ public class ChannelKeys extends CommonBase {
 				long result = ret != null ? ret.ptr : 0;
 				return result;
 			}
-			@Override public long sign_holder_commitment(long commitment_tx) {
+			@Override public long sign_holder_commitment_and_htlcs(long commitment_tx) {
 				HolderCommitmentTransaction commitment_tx_hu_conv = new HolderCommitmentTransaction(null, commitment_tx);
-				Result_SignatureNoneZ ret = arg.sign_holder_commitment(commitment_tx_hu_conv);
-				long result = ret != null ? ret.ptr : 0;
-				return result;
-			}
-			@Override public long sign_holder_commitment_htlc_transactions(long commitment_tx) {
-				HolderCommitmentTransaction commitment_tx_hu_conv = new HolderCommitmentTransaction(null, commitment_tx);
-				Result_CVec_SignatureZNoneZ ret = arg.sign_holder_commitment_htlc_transactions(commitment_tx_hu_conv);
+				Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret = arg.sign_holder_commitment_and_htlcs(commitment_tx_hu_conv);
 				long result = ret != null ? ret.ptr : 0;
 				return result;
 			}
@@ -117,7 +110,9 @@ public class ChannelKeys extends CommonBase {
 		long ret = bindings.ChannelKeys_key_derivation_params(this.ptr);
 		long ret_a = bindings.LDKC2Tuple_u64u64Z_get_a(ret);
 		long ret_b = bindings.LDKC2Tuple_u64u64Z_get_b(ret);
-		TwoTuple<Long, Long> ret_conv = new TwoTuple<Long, Long>(ret_a, ret_b);
+		TwoTuple<Long, Long> ret_conv = new TwoTuple<Long, Long>(ret_a, ret_b, () -> {
+			bindings.C2Tuple_u64u64Z_free(ret);
+		});
 		return ret_conv;
 	}
 
@@ -128,16 +123,9 @@ public class ChannelKeys extends CommonBase {
 		return ret_hu_conv;
 	}
 
-	public Result_SignatureNoneZ sign_holder_commitment(HolderCommitmentTransaction commitment_tx) {
-		long ret = bindings.ChannelKeys_sign_holder_commitment(this.ptr, commitment_tx == null ? 0 : commitment_tx.ptr & ~1);
-		Result_SignatureNoneZ ret_hu_conv = Result_SignatureNoneZ.constr_from_ptr(ret);
-		this.ptrs_to.add(commitment_tx);
-		return ret_hu_conv;
-	}
-
-	public Result_CVec_SignatureZNoneZ sign_holder_commitment_htlc_transactions(HolderCommitmentTransaction commitment_tx) {
-		long ret = bindings.ChannelKeys_sign_holder_commitment_htlc_transactions(this.ptr, commitment_tx == null ? 0 : commitment_tx.ptr & ~1);
-		Result_CVec_SignatureZNoneZ ret_hu_conv = Result_CVec_SignatureZNoneZ.constr_from_ptr(ret);
+	public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htlcs(HolderCommitmentTransaction commitment_tx) {
+		long ret = bindings.ChannelKeys_sign_holder_commitment_and_htlcs(this.ptr, commitment_tx == null ? 0 : commitment_tx.ptr & ~1);
+		Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_hu_conv = Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.constr_from_ptr(ret);
 		this.ptrs_to.add(commitment_tx);
 		return ret_hu_conv;
 	}
@@ -182,6 +170,7 @@ public class ChannelKeys extends CommonBase {
 	public ChannelPublicKeys get_pubkeys() {
 		long ret = bindings.ChannelKeys_get_pubkeys(this.ptr);
 		ChannelPublicKeys ret_hu_conv = new ChannelPublicKeys(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}