Work around our stupid hack with a stupid hack (see XXX in genbindings.py)
[ldk-java] / src / main / java / org / ldk / structs / ChannelKeys.java
index 7283363a61fee779e76818a938a5a47d6d3e3cd9..500e69306f6d5ac81952d529acf6cb171b92b897 100644 (file)
@@ -24,14 +24,14 @@ public class ChannelKeys extends CommonBase {
                byte[] get_per_commitment_point(long idx);
                byte[] release_commitment_secret(long idx);
                TwoTuple<Long, Long> key_derivation_params();
-               Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(int feerate_per_kw, Transaction commitment_tx, PreCalculatedTxCreationKeys keys, HTLCOutputInCommitment[] htlcs);
-               Result_SignatureNoneZ sign_holder_commitment(HolderCommitmentTransaction holder_commitment_tx);
-               Result_CVec_SignatureZNoneZ sign_holder_commitment_htlc_transactions(HolderCommitmentTransaction holder_commitment_tx);
-               Result_SignatureNoneZ sign_justice_transaction(Transaction justice_tx, long input, long amount, byte[] per_commitment_key, HTLCOutputInCommitment htlc);
-               Result_SignatureNoneZ sign_counterparty_htlc_transaction(Transaction htlc_tx, long input, long amount, byte[] per_commitment_point, HTLCOutputInCommitment htlc);
-               Result_SignatureNoneZ sign_closing_transaction(Transaction closing_tx);
+               Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(CommitmentTransaction commitment_tx);
+               Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htlcs(HolderCommitmentTransaction commitment_tx);
+               Result_SignatureNoneZ sign_justice_transaction(byte[] justice_tx, long input, long amount, byte[] per_commitment_key, HTLCOutputInCommitment htlc);
+               Result_SignatureNoneZ sign_counterparty_htlc_transaction(byte[] htlc_tx, long input, long amount, byte[] per_commitment_point, HTLCOutputInCommitment htlc);
+               Result_SignatureNoneZ sign_closing_transaction(byte[] closing_tx);
                Result_SignatureNoneZ sign_channel_announcement(UnsignedChannelAnnouncement msg);
-               void on_accept(ChannelPublicKeys channel_points, short counterparty_selected_contest_delay, short holder_selected_contest_delay);
+               void ready_channel(ChannelTransactionParameters channel_parameters);
+               byte[] write();
        }
        private static class LDKChannelKeysHolder { ChannelKeys held; }
        public static ChannelKeys new_impl(ChannelKeysInterface arg, ChannelPublicKeys pubkeys) {
@@ -50,67 +50,48 @@ public class ChannelKeys extends CommonBase {
                                long result = bindings.C2Tuple_u64u64Z_new(ret.a, ret.b);
                                return result;
                        }
-                       @Override public long sign_counterparty_commitment(int feerate_per_kw, long commitment_tx, long keys, long[] htlcs) {
-                               Transaction commitment_tx_conv = new Transaction(null, commitment_tx);
-                               PreCalculatedTxCreationKeys keys_hu_conv = new PreCalculatedTxCreationKeys(null, keys);
-                               HTLCOutputInCommitment[] arr_conv_24_arr = new HTLCOutputInCommitment[htlcs.length];
-                               for (int y = 0; y < htlcs.length; y++) {
-                                       long arr_conv_24 = htlcs[y];
-                                       HTLCOutputInCommitment arr_conv_24_hu_conv = new HTLCOutputInCommitment(null, arr_conv_24);
-                                       arr_conv_24_arr[y] = arr_conv_24_hu_conv;
-                               }
-                               Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret = arg.sign_counterparty_commitment(feerate_per_kw, commitment_tx_conv, keys_hu_conv, arr_conv_24_arr);
+                       @Override public long sign_counterparty_commitment(long commitment_tx) {
+                               CommitmentTransaction commitment_tx_hu_conv = new CommitmentTransaction(null, commitment_tx);
+                               Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret = arg.sign_counterparty_commitment(commitment_tx_hu_conv);
                                long result = ret != null ? ret.ptr : 0;
-                               ret.ptr = 0;
                                return result;
                        }
-                       @Override public long sign_holder_commitment(long holder_commitment_tx) {
-                               HolderCommitmentTransaction holder_commitment_tx_hu_conv = new HolderCommitmentTransaction(null, holder_commitment_tx);
-                               Result_SignatureNoneZ ret = arg.sign_holder_commitment(holder_commitment_tx_hu_conv);
+                       @Override public long sign_holder_commitment_and_htlcs(long commitment_tx) {
+                               HolderCommitmentTransaction commitment_tx_hu_conv = new HolderCommitmentTransaction(null, commitment_tx);
+                               Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret = arg.sign_holder_commitment_and_htlcs(commitment_tx_hu_conv);
                                long result = ret != null ? ret.ptr : 0;
-                               ret.ptr = 0;
                                return result;
                        }
-                       @Override public long sign_holder_commitment_htlc_transactions(long holder_commitment_tx) {
-                               HolderCommitmentTransaction holder_commitment_tx_hu_conv = new HolderCommitmentTransaction(null, holder_commitment_tx);
-                               Result_CVec_SignatureZNoneZ ret = arg.sign_holder_commitment_htlc_transactions(holder_commitment_tx_hu_conv);
-                               long result = ret != null ? ret.ptr : 0;
-                               ret.ptr = 0;
-                               return result;
-                       }
-                       @Override public long sign_justice_transaction(long justice_tx, long input, long amount, byte[] per_commitment_key, long htlc) {
-                               Transaction justice_tx_conv = new Transaction(null, justice_tx);
+                       @Override public long sign_justice_transaction(byte[] justice_tx, long input, long amount, byte[] per_commitment_key, long htlc) {
                                HTLCOutputInCommitment htlc_hu_conv = new HTLCOutputInCommitment(null, htlc);
-                               Result_SignatureNoneZ ret = arg.sign_justice_transaction(justice_tx_conv, input, amount, per_commitment_key, htlc_hu_conv);
+                               Result_SignatureNoneZ ret = arg.sign_justice_transaction(justice_tx, input, amount, per_commitment_key, htlc_hu_conv);
                                long result = ret != null ? ret.ptr : 0;
-                               ret.ptr = 0;
                                return result;
                        }
-                       @Override public long sign_counterparty_htlc_transaction(long htlc_tx, long input, long amount, byte[] per_commitment_point, long htlc) {
-                               Transaction htlc_tx_conv = new Transaction(null, htlc_tx);
+                       @Override public long sign_counterparty_htlc_transaction(byte[] htlc_tx, long input, long amount, byte[] per_commitment_point, long htlc) {
                                HTLCOutputInCommitment htlc_hu_conv = new HTLCOutputInCommitment(null, htlc);
-                               Result_SignatureNoneZ ret = arg.sign_counterparty_htlc_transaction(htlc_tx_conv, input, amount, per_commitment_point, htlc_hu_conv);
+                               Result_SignatureNoneZ ret = arg.sign_counterparty_htlc_transaction(htlc_tx, input, amount, per_commitment_point, htlc_hu_conv);
                                long result = ret != null ? ret.ptr : 0;
-                               ret.ptr = 0;
                                return result;
                        }
-                       @Override public long sign_closing_transaction(long closing_tx) {
-                               Transaction closing_tx_conv = new Transaction(null, closing_tx);
-                               Result_SignatureNoneZ ret = arg.sign_closing_transaction(closing_tx_conv);
+                       @Override public long sign_closing_transaction(byte[] closing_tx) {
+                               Result_SignatureNoneZ ret = arg.sign_closing_transaction(closing_tx);
                                long result = ret != null ? ret.ptr : 0;
-                               ret.ptr = 0;
                                return result;
                        }
                        @Override public long sign_channel_announcement(long msg) {
                                UnsignedChannelAnnouncement msg_hu_conv = new UnsignedChannelAnnouncement(null, msg);
                                Result_SignatureNoneZ ret = arg.sign_channel_announcement(msg_hu_conv);
                                long result = ret != null ? ret.ptr : 0;
-                               ret.ptr = 0;
                                return result;
                        }
-                       @Override public void on_accept(long channel_points, short counterparty_selected_contest_delay, short holder_selected_contest_delay) {
-                               ChannelPublicKeys channel_points_hu_conv = new ChannelPublicKeys(null, channel_points);
-                               arg.on_accept(channel_points_hu_conv, counterparty_selected_contest_delay, holder_selected_contest_delay);
+                       @Override public void ready_channel(long channel_parameters) {
+                               ChannelTransactionParameters channel_parameters_hu_conv = new ChannelTransactionParameters(null, channel_parameters);
+                               arg.ready_channel(channel_parameters_hu_conv);
+                       }
+                       @Override public byte[] write() {
+                               byte[] ret = arg.write();
+                               return ret;
                        }
                }, pubkeys);
                return impl_holder.held;
@@ -125,71 +106,78 @@ public class ChannelKeys extends CommonBase {
                return ret;
        }
 
-       // Skipped ChannelKeys_key_derivation_params
-       public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(int feerate_per_kw, Transaction commitment_tx, PreCalculatedTxCreationKeys keys, HTLCOutputInCommitment[] htlcs) {
-               long ret = bindings.ChannelKeys_sign_counterparty_commitment(this.ptr, feerate_per_kw, commitment_tx.ptr, keys == null ? 0 : keys.ptr & ~1, Arrays.stream(htlcs).mapToLong(arr_conv_24 -> arr_conv_24 == null ? 0 : arr_conv_24.ptr & ~1).toArray());
-               Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_hu_conv = Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.constr_from_ptr(ret);
-               ret_hu_conv.ptrs_to.add(this);
-               this.ptrs_to.add(keys);
-               /* TODO 2 HTLCOutputInCommitment  */;
-               return ret_hu_conv;
+       public TwoTuple<Long, Long> key_derivation_params() {
+               long ret = bindings.ChannelKeys_key_derivation_params(this.ptr);
+               long ret_a = bindings.LDKC2Tuple_u64u64Z_get_a(ret);
+               long ret_b = bindings.LDKC2Tuple_u64u64Z_get_b(ret);
+               TwoTuple<Long, Long> ret_conv = new TwoTuple<Long, Long>(ret_a, ret_b, () -> {
+                       bindings.C2Tuple_u64u64Z_free(ret);
+               });
+               return ret_conv;
        }
 
-       public Result_SignatureNoneZ sign_holder_commitment(HolderCommitmentTransaction holder_commitment_tx) {
-               long ret = bindings.ChannelKeys_sign_holder_commitment(this.ptr, holder_commitment_tx == null ? 0 : holder_commitment_tx.ptr & ~1);
-               Result_SignatureNoneZ ret_hu_conv = Result_SignatureNoneZ.constr_from_ptr(ret);
-               ret_hu_conv.ptrs_to.add(this);
-               this.ptrs_to.add(holder_commitment_tx);
+       public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(CommitmentTransaction commitment_tx) {
+               long ret = bindings.ChannelKeys_sign_counterparty_commitment(this.ptr, commitment_tx == null ? 0 : commitment_tx.ptr & ~1);
+               Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_hu_conv = Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.constr_from_ptr(ret);
+               this.ptrs_to.add(commitment_tx);
                return ret_hu_conv;
        }
 
-       public Result_CVec_SignatureZNoneZ sign_holder_commitment_htlc_transactions(HolderCommitmentTransaction holder_commitment_tx) {
-               long ret = bindings.ChannelKeys_sign_holder_commitment_htlc_transactions(this.ptr, holder_commitment_tx == null ? 0 : holder_commitment_tx.ptr & ~1);
-               Result_CVec_SignatureZNoneZ ret_hu_conv = Result_CVec_SignatureZNoneZ.constr_from_ptr(ret);
-               ret_hu_conv.ptrs_to.add(this);
-               this.ptrs_to.add(holder_commitment_tx);
+       public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htlcs(HolderCommitmentTransaction commitment_tx) {
+               long ret = bindings.ChannelKeys_sign_holder_commitment_and_htlcs(this.ptr, commitment_tx == null ? 0 : commitment_tx.ptr & ~1);
+               Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_hu_conv = Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.constr_from_ptr(ret);
+               this.ptrs_to.add(commitment_tx);
                return ret_hu_conv;
        }
 
-       public Result_SignatureNoneZ sign_justice_transaction(Transaction justice_tx, long input, long amount, byte[] per_commitment_key, HTLCOutputInCommitment htlc) {
-               long ret = bindings.ChannelKeys_sign_justice_transaction(this.ptr, justice_tx.ptr, input, amount, per_commitment_key, htlc == null ? 0 : htlc.ptr & ~1);
+       public Result_SignatureNoneZ sign_justice_transaction(byte[] justice_tx, long input, long amount, byte[] per_commitment_key, HTLCOutputInCommitment htlc) {
+               long ret = bindings.ChannelKeys_sign_justice_transaction(this.ptr, justice_tx, input, amount, per_commitment_key, htlc == null ? 0 : htlc.ptr & ~1);
                Result_SignatureNoneZ ret_hu_conv = Result_SignatureNoneZ.constr_from_ptr(ret);
-               ret_hu_conv.ptrs_to.add(this);
                this.ptrs_to.add(htlc);
                return ret_hu_conv;
        }
 
-       public Result_SignatureNoneZ sign_counterparty_htlc_transaction(Transaction htlc_tx, long input, long amount, byte[] per_commitment_point, HTLCOutputInCommitment htlc) {
-               long ret = bindings.ChannelKeys_sign_counterparty_htlc_transaction(this.ptr, htlc_tx.ptr, input, amount, per_commitment_point, htlc == null ? 0 : htlc.ptr & ~1);
+       public Result_SignatureNoneZ sign_counterparty_htlc_transaction(byte[] htlc_tx, long input, long amount, byte[] per_commitment_point, HTLCOutputInCommitment htlc) {
+               long ret = bindings.ChannelKeys_sign_counterparty_htlc_transaction(this.ptr, htlc_tx, input, amount, per_commitment_point, htlc == null ? 0 : htlc.ptr & ~1);
                Result_SignatureNoneZ ret_hu_conv = Result_SignatureNoneZ.constr_from_ptr(ret);
-               ret_hu_conv.ptrs_to.add(this);
                this.ptrs_to.add(htlc);
                return ret_hu_conv;
        }
 
-       public Result_SignatureNoneZ sign_closing_transaction(Transaction closing_tx) {
-               long ret = bindings.ChannelKeys_sign_closing_transaction(this.ptr, closing_tx.ptr);
+       public Result_SignatureNoneZ sign_closing_transaction(byte[] closing_tx) {
+               long ret = bindings.ChannelKeys_sign_closing_transaction(this.ptr, closing_tx);
                Result_SignatureNoneZ ret_hu_conv = Result_SignatureNoneZ.constr_from_ptr(ret);
-               ret_hu_conv.ptrs_to.add(this);
                return ret_hu_conv;
        }
 
        public Result_SignatureNoneZ sign_channel_announcement(UnsignedChannelAnnouncement msg) {
                long ret = bindings.ChannelKeys_sign_channel_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1);
                Result_SignatureNoneZ ret_hu_conv = Result_SignatureNoneZ.constr_from_ptr(ret);
-               ret_hu_conv.ptrs_to.add(this);
                this.ptrs_to.add(msg);
                return ret_hu_conv;
        }
 
-       public void on_accept(ChannelPublicKeys channel_points, short counterparty_selected_contest_delay, short holder_selected_contest_delay) {
-               bindings.ChannelKeys_on_accept(this.ptr, channel_points == null ? 0 : channel_points.ptr & ~1, counterparty_selected_contest_delay, holder_selected_contest_delay);
-               this.ptrs_to.add(channel_points);
+       public void ready_channel(ChannelTransactionParameters channel_parameters) {
+               bindings.ChannelKeys_ready_channel(this.ptr, channel_parameters == null ? 0 : channel_parameters.ptr & ~1);
+               this.ptrs_to.add(channel_parameters);
+       }
+
+       public byte[] write() {
+               byte[] ret = bindings.ChannelKeys_write(this.ptr);
+               return ret;
        }
 
        public ChannelPublicKeys get_pubkeys() {
                long ret = bindings.ChannelKeys_get_pubkeys(this.ptr);
                ChannelPublicKeys ret_hu_conv = new ChannelPublicKeys(null, ret);
+               ret_hu_conv.ptrs_to.add(this);
+               return ret_hu_conv;
+       }
+
+       public ChannelKeys clone() {
+               long ret = bindings.ChannelKeys_clone(this.ptr);
+               ChannelKeys ret_hu_conv = new ChannelKeys(null, ret);
+               ret_hu_conv.ptrs_to.add(this);
                return ret_hu_conv;
        }