X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelKeys.java;h=d3ac3c073d8b48d100ed9a7aa277bd4a2def6f3f;hb=90f8a21c87ba652884d5b94404b9b24a18f0cefc;hp=2639799f3f651d7653491274bd181b4b70a4b599;hpb=aa0e2aade37133339f4113a0cd7465b111f0a0d0;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ChannelKeys.java b/src/main/java/org/ldk/structs/ChannelKeys.java index 2639799f..d3ac3c07 100644 --- a/src/main/java/org/ldk/structs/ChannelKeys.java +++ b/src/main/java/org/ldk/structs/ChannelKeys.java @@ -9,9 +9,10 @@ import java.util.Arrays; public class ChannelKeys extends CommonBase { final bindings.LDKChannelKeys bindings_instance; ChannelKeys(Object _dummy, long ptr) { super(ptr); bindings_instance = null; } - private ChannelKeys(bindings.LDKChannelKeys arg) { - super(bindings.LDKChannelKeys_new(arg)); + private ChannelKeys(bindings.LDKChannelKeys arg, ChannelPublicKeys pubkeys) { + super(bindings.LDKChannelKeys_new(arg, pubkeys == null ? 0 : pubkeys.ptr & ~1)); this.ptrs_to.add(arg); + this.ptrs_to.add(pubkeys); this.bindings_instance = arg; } @Override @SuppressWarnings("deprecation") @@ -23,17 +24,20 @@ public class ChannelKeys extends CommonBase { byte[] get_per_commitment_point(long idx); byte[] release_commitment_secret(long idx); TwoTuple key_derivation_params(); - Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(int feerate_per_kw, Transaction commitment_tx, PreCalculatedTxCreationKeys keys, HTLCOutputInCommitment[] htlcs); + Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(int feerate_per_kw, byte[] 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_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); + byte[] write(); } - public ChannelKeys(ChannelKeysInterface arg) { - this(new bindings.LDKChannelKeys() { + private static class LDKChannelKeysHolder { ChannelKeys held; } + public static ChannelKeys new_impl(ChannelKeysInterface arg, ChannelPublicKeys pubkeys) { + final LDKChannelKeysHolder impl_holder = new LDKChannelKeysHolder(); + impl_holder.held = new ChannelKeys(new bindings.LDKChannelKeys() { @Override public byte[] get_per_commitment_point(long idx) { byte[] ret = arg.get_per_commitment_point(idx); return ret; @@ -47,8 +51,7 @@ 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); + @Override public long sign_counterparty_commitment(int feerate_per_kw, byte[] commitment_tx, long keys, long[] htlcs) { 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++) { @@ -56,7 +59,7 @@ public class ChannelKeys extends CommonBase { 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); + Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret = arg.sign_counterparty_commitment(feerate_per_kw, commitment_tx, keys_hu_conv, arr_conv_24_arr); long result = ret != null ? ret.ptr : 0; ret.ptr = 0; return result; @@ -75,25 +78,22 @@ public class ChannelKeys extends CommonBase { 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; @@ -109,7 +109,12 @@ public class ChannelKeys extends CommonBase { 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 byte[] write() { + byte[] ret = arg.write(); + return ret; + } + }, pubkeys); + return impl_holder.held; } public byte[] get_per_commitment_point(long idx) { byte[] ret = bindings.ChannelKeys_get_per_commitment_point(this.ptr, idx); @@ -122,7 +127,15 @@ public class ChannelKeys extends CommonBase { } // Skipped ChannelKeys_key_derivation_params - // Skipped ChannelKeys_sign_counterparty_commitment + public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(int feerate_per_kw, byte[] commitment_tx, PreCalculatedTxCreationKeys keys, HTLCOutputInCommitment[] htlcs) { + long ret = bindings.ChannelKeys_sign_counterparty_commitment(this.ptr, feerate_per_kw, commitment_tx, 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 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); @@ -139,9 +152,29 @@ public class ChannelKeys extends CommonBase { return ret_hu_conv; } - // Skipped ChannelKeys_sign_justice_transaction - // Skipped ChannelKeys_sign_counterparty_htlc_transaction - // Skipped ChannelKeys_sign_closing_transaction + 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(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(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); @@ -155,4 +188,23 @@ public class ChannelKeys extends CommonBase { this.ptrs_to.add(channel_points); } + 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); + return ret_hu_conv; + } + + public static ChannelKeys constructor_clone(ChannelKeys orig) { + long ret = bindings.ChannelKeys_clone(orig == null ? 0 : orig.ptr); + ChannelKeys ret_hu_conv = new ChannelKeys(null, ret); + ret_hu_conv.ptrs_to.add(ret_hu_conv); + ret_hu_conv.ptrs_to.add(orig); + return ret_hu_conv; + } + }