Update java bindings with new generator and new upstream code

[ldk-java] / src / main / java / org / ldk / structs / HolderCommitmentTransaction.java

diff --git a/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java b/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
index aa729ac7d91ce971df9061a03a4e3d9cee1b2905..455c1ed2f9928248d251054cc615593b9580a448 100644 (file)
--- a/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
+++ b/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
@@ -2,64 +2,83 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+
+/**
+ * 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();
-       }
-
-       public HolderCommitmentTransaction(HolderCommitmentTransaction orig) {
-               super(bindings.HolderCommitmentTransaction_clone(orig == null ? 0 : orig.ptr & ~1));
-               this.ptrs_to.add(orig);
+               super.finalize();
+               if (ptr != 0) { bindings.HolderCommitmentTransaction_free(ptr); }
        }
 
-       // 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 == null ? 0 : this_ptr.ptr & ~1);
-               this.ptrs_to.add(this_ptr);
+       /**
+        * Our counterparty's signature for the transaction
+        */
+       public byte[] get_counterparty_sig() {
+               byte[] ret = bindings.HolderCommitmentTransaction_get_counterparty_sig(this.ptr);
                return ret;
        }
 
-       public void set_counterparty_sig(HolderCommitmentTransaction this_ptr, byte[] val) {
-               bindings.HolderCommitmentTransaction_set_counterparty_sig(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-               this.ptrs_to.add(this_ptr);
-       }
-
-       public int get_feerate_per_kw(HolderCommitmentTransaction this_ptr) {
-               int ret = bindings.HolderCommitmentTransaction_get_feerate_per_kw(this_ptr == null ? 0 : 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, val);
        }
 
-       public void set_feerate_per_kw(HolderCommitmentTransaction this_ptr, int val) {
-               bindings.HolderCommitmentTransaction_set_feerate_per_kw(this_ptr == null ? 0 : 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);
        }
 
-       // 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));
-               return ret;
+       /**
+        * Creates a copy of the HolderCommitmentTransaction
+        */
+       public HolderCommitmentTransaction clone() {
+               long ret = bindings.HolderCommitmentTransaction_clone(this.ptr);
+               HolderCommitmentTransaction ret_hu_conv = new HolderCommitmentTransaction(null, ret);
+               ret_hu_conv.ptrs_to.add(this);
+               return ret_hu_conv;
        }
 
-       public byte[] txid() {
-               byte[] ret = bindings.HolderCommitmentTransaction_txid(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[] 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;
+       /**
+        * Read a HolderCommitmentTransaction from a byte array, created by HolderCommitmentTransaction_write
+        */
+       public static Result_HolderCommitmentTransactionDecodeErrorZ constructor_read(byte[] ser) {
+               long ret = bindings.HolderCommitmentTransaction_read(ser);
+               Result_HolderCommitmentTransactionDecodeErrorZ ret_hu_conv = Result_HolderCommitmentTransactionDecodeErrorZ.constr_from_ptr(ret);
+               return ret_hu_conv;
        }
 
-       // Skipped HolderCommitmentTransaction_get_htlc_sigs
-       // Skipped HolderCommitmentTransaction_write
-       public HolderCommitmentTransaction(byte[] ser) {
-               super(bindings.HolderCommitmentTransaction_read(ser));
+       /**
+        * 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 constructor_new(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, counterparty_sig, counterparty_htlc_sigs, holder_funding_key, counterparty_funding_key);
+               HolderCommitmentTransaction ret_hu_conv = new HolderCommitmentTransaction(null, ret);
+               ret_hu_conv.ptrs_to.add(ret_hu_conv);
+               ret_hu_conv.ptrs_to.add(commitment_tx);
+               return ret_hu_conv;
        }
 
 }