Map Transactions as byte[] instead of trying to keep a ptr

[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 5b26ba423b712674c5e33a1ff4b374a030aa629a..713d4a401f995780b445971de60a530176e92378 100644 (file)
--- a/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
+++ b/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
@@ -11,7 +11,7 @@ public class HolderCommitmentTransaction extends CommonBase {
        @Override @SuppressWarnings("deprecation")
        protected void finalize() throws Throwable {
                super.finalize();
-               bindings.HolderCommitmentTransaction_free(ptr);
+               if (ptr != 0) { bindings.HolderCommitmentTransaction_free(ptr); }
        }
 
        public static HolderCommitmentTransaction constructor_clone(HolderCommitmentTransaction orig) {
@@ -21,8 +21,15 @@ public class HolderCommitmentTransaction extends CommonBase {
                return ret_hu_conv;
        }
 
-       // Skipped HolderCommitmentTransaction_get_unsigned_tx
-       // Skipped HolderCommitmentTransaction_set_unsigned_tx
+       public byte[] get_unsigned_tx() {
+               byte[] ret = bindings.HolderCommitmentTransaction_get_unsigned_tx(this.ptr);
+               return ret;
+       }
+
+       public void set_unsigned_tx(byte[] val) {
+               bindings.HolderCommitmentTransaction_set_unsigned_tx(this.ptr, val);
+       }
+
        public byte[] get_counterparty_sig() {
                byte[] ret = bindings.HolderCommitmentTransaction_get_counterparty_sig(this.ptr);
                return ret;
@@ -42,11 +49,18 @@ public class HolderCommitmentTransaction extends CommonBase {
        }
 
        public void set_per_htlc(TwoTuple<HTLCOutputInCommitment, byte[]>[] val) {
-               bindings.HolderCommitmentTransaction_set_per_htlc(this.ptr, Arrays.stream(val).mapToLong(arr_conv_42 -> /*TODO b*/0).toArray());
+               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[]>  */;
        }
 
-       // Skipped HolderCommitmentTransaction_new_missing_holder_sig
+       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);