Rewrite the world, with several interdependant changes (but several still WIP)

[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 e48709b798d6de13419f7964e7d76584041d24a4..4dd599a51dfabbba3446e5750dc6e479a61eb7c8 100644 (file)
--- a/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
+++ b/src/main/java/org/ldk/structs/HolderCommitmentTransaction.java
@@ -2,7 +2,10 @@ 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")
@@ -11,40 +14,43 @@ public class HolderCommitmentTransaction extends CommonBase {
                bindings.HolderCommitmentTransaction_free(ptr);
        }
 
-       public HolderCommitmentTransaction(HolderCommitmentTransaction orig) {
-               super(bindings.HolderCommitmentTransaction_clone(orig == null ? 0 : 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 == null ? 0 : 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_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 void set_counterparty_sig(byte[] val) {
+               bindings.HolderCommitmentTransaction_set_counterparty_sig(this.ptr, val);
        }
 
-       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);
+       public int get_feerate_per_kw() {
+               int ret = bindings.HolderCommitmentTransaction_get_feerate_per_kw(this.ptr);
                return ret;
        }
 
-       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);
+       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 -> /*TODO b*/0).toArray());
+               /* TODO 2 TwoTuple<HTLCOutputInCommitment, byte[]>  */;
        }
 
-       // 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;
+               long ret = bindings.HolderCommitmentTransaction_trust_key_derivation(this.ptr);
+               TxCreationKeys ret_hu_conv = new TxCreationKeys(null, ret);
+               return ret_hu_conv;
        }
 
        public byte[] txid() {
@@ -64,8 +70,10 @@ public class HolderCommitmentTransaction extends CommonBase {
                return ret;
        }
 
-       public HolderCommitmentTransaction(byte[] ser) {
-               super(bindings.HolderCommitmentTransaction_read(ser));
+       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;
        }
 
 }