X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FHolderCommitmentTransaction.java;h=713d4a401f995780b445971de60a530176e92378;hb=18faab2952bff2302d55528dea556246be63950a;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..713d4a40 100644
--- a/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
+++ b/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
@@ -2,57 +2,98 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+@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);
+	public static HolderCommitmentTransaction constructor_clone(HolderCommitmentTransaction orig) {
+		long ret = bindings.HolderCommitmentTransaction_clone(orig == null ? 0 : orig.ptr & ~1);
+		HolderCommitmentTransaction ret_hu_conv = new HolderCommitmentTransaction(null, ret);
+		ret_hu_conv.ptrs_to.add(orig);
+		return ret_hu_conv;
 	}
 
-	// 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);
+	public byte[] get_unsigned_tx() {
+		byte[] ret = bindings.HolderCommitmentTransaction_get_unsigned_tx(this.ptr);
 		return ret;
 	}
 
-	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);
+	public void set_unsigned_tx(byte[] val) {
+		bindings.HolderCommitmentTransaction_set_unsigned_tx(this.ptr, val);
 	}
 
-	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);
+	public byte[] get_counterparty_sig() {
+		byte[] ret = bindings.HolderCommitmentTransaction_get_counterparty_sig(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);
+	public void set_counterparty_sig(byte[] val) {
+		bindings.HolderCommitmentTransaction_set_counterparty_sig(this.ptr, val);
 	}
 
-	// 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));
+	public int get_feerate_per_kw() {
+		int ret = bindings.HolderCommitmentTransaction_get_feerate_per_kw(this.ptr);
 		return ret;
 	}
 
+	public void set_feerate_per_kw(int val) {
+		bindings.HolderCommitmentTransaction_set_feerate_per_kw(this.ptr, val);
+	}
+
+	public void set_per_htlc(TwoTuple<HTLCOutputInCommitment, byte[]>[] val) {
+		bindings.HolderCommitmentTransaction_set_per_htlc(this.ptr, Arrays.stream(val).mapToLong(arr_conv_42 -> bindings.C2Tuple_HTLCOutputInCommitmentSignatureZ_new(arr_conv_42.a == null ? 0 : arr_conv_42.a.ptr & ~1/*XXX: this.ptrs_to.add(arr_conv_42_a)*/, arr_conv_42.b)).toArray());
+		/* TODO 2 TwoTuple<HTLCOutputInCommitment, byte[]>  */;
+	}
+
+	public static HolderCommitmentTransaction constructor_new_missing_holder_sig(byte[] unsigned_tx, byte[] counterparty_sig, byte[] holder_funding_key, byte[] counterparty_funding_key, TxCreationKeys keys, int feerate_per_kw, TwoTuple<HTLCOutputInCommitment, byte[]>[] htlc_data) {
+		long ret = bindings.HolderCommitmentTransaction_new_missing_holder_sig(unsigned_tx, counterparty_sig, holder_funding_key, counterparty_funding_key, keys == null ? 0 : keys.ptr & ~1, feerate_per_kw, Arrays.stream(htlc_data).mapToLong(arr_conv_42 -> bindings.C2Tuple_HTLCOutputInCommitmentSignatureZ_new(arr_conv_42.a == null ? 0 : arr_conv_42.a.ptr & ~1/*XXX: this.ptrs_to.add(arr_conv_42_a)*/, arr_conv_42.b)).toArray());
+		HolderCommitmentTransaction ret_hu_conv = new HolderCommitmentTransaction(null, ret);
+		ret_hu_conv.ptrs_to.add(keys);
+		/* TODO 2 TwoTuple<HTLCOutputInCommitment, byte[]>  */;
+		return ret_hu_conv;
+	}
+
+	public TxCreationKeys trust_key_derivation() {
+		long ret = bindings.HolderCommitmentTransaction_trust_key_derivation(this.ptr);
+		TxCreationKeys ret_hu_conv = new TxCreationKeys(null, ret);
+		return ret_hu_conv;
+	}
+
 	public byte[] txid() {
 		byte[] ret = bindings.HolderCommitmentTransaction_txid(this.ptr);
 		return ret;
 	}
 
-	// Skipped HolderCommitmentTransaction_get_holder_sig
-	// Skipped HolderCommitmentTransaction_get_htlc_sigs
-	// Skipped HolderCommitmentTransaction_write
-	// Skipped HolderCommitmentTransaction_read
+	public byte[] get_holder_sig(byte[] funding_key, byte[] funding_redeemscript, long channel_value_satoshis) {
+		byte[] ret = bindings.HolderCommitmentTransaction_get_holder_sig(this.ptr, funding_key, funding_redeemscript, channel_value_satoshis);
+		return ret;
+	}
+
+	public Result_CVec_SignatureZNoneZ get_htlc_sigs(byte[] htlc_base_key, short counterparty_selected_contest_delay) {
+		long ret = bindings.HolderCommitmentTransaction_get_htlc_sigs(this.ptr, htlc_base_key, counterparty_selected_contest_delay);
+		Result_CVec_SignatureZNoneZ ret_hu_conv = Result_CVec_SignatureZNoneZ.constr_from_ptr(ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	public byte[] write(HolderCommitmentTransaction obj) {
+		byte[] ret = bindings.HolderCommitmentTransaction_write(obj == null ? 0 : obj.ptr & ~1);
+		this.ptrs_to.add(obj);
+		return ret;
+	}
+
+	public static HolderCommitmentTransaction constructor_read(byte[] ser) {
+		long ret = bindings.HolderCommitmentTransaction_read(ser);
+		HolderCommitmentTransaction ret_hu_conv = new HolderCommitmentTransaction(null, ret);
+		return ret_hu_conv;
+	}
+
 }