X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FHolderCommitmentTransaction.java;h=23716acf4c01b2f21b2ae6dffd50ccb5e4ce4ded;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=eb83c6a4ff9819776652a02f6a5ee03157fb3315;hpb=d063d65c20bf007f42dc2ae52bd62dc1c2ef51e4;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java b/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
index eb83c6a4..23716acf 100644
--- a/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
+++ b/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
@@ -2,57 +2,91 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
+import javax.annotation.Nullable;
 
+
+/**
+ * Information needed to build and sign a holder's commitment transaction.
+ * 
+ * The transaction is only signed once we are ready to broadcast.
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class HolderCommitmentTransaction extends CommonBase {
 	HolderCommitmentTransaction(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.HolderCommitmentTransaction_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.HolderCommitmentTransaction_free(ptr); }
 	}
 
-	public HolderCommitmentTransaction(HolderCommitmentTransaction orig) {
-		super(bindings.HolderCommitmentTransaction_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	/**
+	 * Our counterparty's signature for the transaction
+	 */
+	public byte[] get_counterparty_sig() {
+		byte[] ret = bindings.HolderCommitmentTransaction_get_counterparty_sig(this.ptr);
+		return ret;
 	}
 
-	// Skipped HolderCommitmentTransaction_get_unsigned_tx
-	// Skipped HolderCommitmentTransaction_set_unsigned_tx
-	public byte[] get_counterparty_sig(HolderCommitmentTransaction this_ptr) {
-		byte[] ret = bindings.HolderCommitmentTransaction_get_counterparty_sig(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	/**
+	 * Our counterparty's signature for the transaction
+	 */
+	public void set_counterparty_sig(byte[] val) {
+		bindings.HolderCommitmentTransaction_set_counterparty_sig(this.ptr, InternalUtils.check_arr_len(val, 64));
 	}
 
-	public void set_counterparty_sig(HolderCommitmentTransaction this_ptr, byte[] val) {
-		bindings.HolderCommitmentTransaction_set_counterparty_sig(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * 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 != null ? Arrays.stream(val).map(val_conv_8 -> InternalUtils.check_arr_len(val_conv_8, 64)).toArray(byte[][]::new) : null);
 	}
 
-	public int get_feerate_per_kw(HolderCommitmentTransaction this_ptr) {
-		int ret = bindings.HolderCommitmentTransaction_get_feerate_per_kw(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	long clone_ptr() {
+		long ret = bindings.HolderCommitmentTransaction_clone_ptr(this.ptr);
 		return ret;
 	}
 
-	public void set_feerate_per_kw(HolderCommitmentTransaction this_ptr, int val) {
-		bindings.HolderCommitmentTransaction_set_feerate_per_kw(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Creates a copy of the HolderCommitmentTransaction
+	 */
+	public HolderCommitmentTransaction clone() {
+		long ret = bindings.HolderCommitmentTransaction_clone(this.ptr);
+		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;
 	}
 
-	// Skipped HolderCommitmentTransaction_set_per_htlc
-	// Skipped HolderCommitmentTransaction_new_missing_holder_sig
-	public TxCreationKeys trust_key_derivation() {
-		TxCreationKeys ret = new TxCreationKeys(null, bindings.HolderCommitmentTransaction_trust_key_derivation(this.ptr));
+	/**
+	 * Serialize the HolderCommitmentTransaction object into a byte array which can be read by HolderCommitmentTransaction_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.HolderCommitmentTransaction_write(this.ptr);
 		return ret;
 	}
 
-	public byte[] txid() {
-		byte[] ret = bindings.HolderCommitmentTransaction_txid(this.ptr);
-		return ret;
+	/**
+	 * Read a HolderCommitmentTransaction from a byte array, created by HolderCommitmentTransaction_write
+	 */
+	public static Result_HolderCommitmentTransactionDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.HolderCommitmentTransaction_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_HolderCommitmentTransactionDecodeErrorZ ret_hu_conv = Result_HolderCommitmentTransactionDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * 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));
+		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);
+		return ret_hu_conv;
 	}
 
-	// Skipped HolderCommitmentTransaction_get_holder_sig
-	// Skipped HolderCommitmentTransaction_get_htlc_sigs
-	// Skipped HolderCommitmentTransaction_write
-	// Skipped HolderCommitmentTransaction_read
 }