X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FBuiltCommitmentTransaction.java;h=52f04d5f48d0e6f8fc6a86d6be45eed24fbee59f;hb=4a36fa97d4eee96099c4a176ea845c52db27e64c;hp=e30cbf022697261c0adbf4ad3b6ab4633b27cdfa;hpb=f3e670e9341decac613d33fc52febf19cea32f20;p=ldk-java diff --git a/src/main/java/org/ldk/structs/BuiltCommitmentTransaction.java b/src/main/java/org/ldk/structs/BuiltCommitmentTransaction.java index e30cbf02..52f04d5f 100644 --- a/src/main/java/org/ldk/structs/BuiltCommitmentTransaction.java +++ b/src/main/java/org/ldk/structs/BuiltCommitmentTransaction.java @@ -4,6 +4,7 @@ import org.ldk.impl.bindings; import org.ldk.enums.*; import org.ldk.util.*; import java.util.Arrays; +import java.lang.ref.Reference; import javax.annotation.Nullable; @@ -24,6 +25,7 @@ public class BuiltCommitmentTransaction extends CommonBase { */ public byte[] get_transaction() { byte[] ret = bindings.BuiltCommitmentTransaction_get_transaction(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -32,6 +34,8 @@ public class BuiltCommitmentTransaction extends CommonBase { */ public void set_transaction(byte[] val) { bindings.BuiltCommitmentTransaction_set_transaction(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -42,6 +46,7 @@ public class BuiltCommitmentTransaction extends CommonBase { */ public byte[] get_txid() { byte[] ret = bindings.BuiltCommitmentTransaction_get_txid(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -53,6 +58,8 @@ public class BuiltCommitmentTransaction extends CommonBase { */ public void set_txid(byte[] val) { bindings.BuiltCommitmentTransaction_set_txid(this.ptr, InternalUtils.check_arr_len(val, 32)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -60,14 +67,17 @@ public class BuiltCommitmentTransaction extends CommonBase { */ public static BuiltCommitmentTransaction of(byte[] transaction_arg, byte[] txid_arg) { long ret = bindings.BuiltCommitmentTransaction_new(transaction_arg, InternalUtils.check_arr_len(txid_arg, 32)); + Reference.reachabilityFence(transaction_arg); + Reference.reachabilityFence(txid_arg); if (ret >= 0 && ret <= 4096) { return null; } - BuiltCommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new BuiltCommitmentTransaction(null, ret); } - ret_hu_conv.ptrs_to.add(ret_hu_conv); + org.ldk.structs.BuiltCommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.BuiltCommitmentTransaction(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); }; return ret_hu_conv; } long clone_ptr() { long ret = bindings.BuiltCommitmentTransaction_clone_ptr(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -76,9 +86,10 @@ public class BuiltCommitmentTransaction extends CommonBase { */ public BuiltCommitmentTransaction clone() { long ret = bindings.BuiltCommitmentTransaction_clone(this.ptr); + Reference.reachabilityFence(this); if (ret >= 0 && ret <= 4096) { return null; } - BuiltCommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new BuiltCommitmentTransaction(null, ret); } - ret_hu_conv.ptrs_to.add(this); + org.ldk.structs.BuiltCommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.BuiltCommitmentTransaction(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } @@ -87,6 +98,7 @@ public class BuiltCommitmentTransaction extends CommonBase { */ public byte[] write() { byte[] ret = bindings.BuiltCommitmentTransaction_write(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -95,6 +107,7 @@ public class BuiltCommitmentTransaction extends CommonBase { */ public static Result_BuiltCommitmentTransactionDecodeErrorZ read(byte[] ser) { long ret = bindings.BuiltCommitmentTransaction_read(ser); + Reference.reachabilityFence(ser); if (ret >= 0 && ret <= 4096) { return null; } Result_BuiltCommitmentTransactionDecodeErrorZ ret_hu_conv = Result_BuiltCommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; @@ -107,15 +120,35 @@ public class BuiltCommitmentTransaction extends CommonBase { */ public byte[] get_sighash_all(byte[] funding_redeemscript, long channel_value_satoshis) { byte[] ret = bindings.BuiltCommitmentTransaction_get_sighash_all(this.ptr, funding_redeemscript, channel_value_satoshis); + Reference.reachabilityFence(this); + Reference.reachabilityFence(funding_redeemscript); + Reference.reachabilityFence(channel_value_satoshis); return ret; } /** - * Sign a transaction, either because we are counter-signing the counterparty's transaction or - * because we are about to broadcast a holder transaction. + * Signs the counterparty's commitment transaction. */ - public byte[] sign(byte[] funding_key, byte[] funding_redeemscript, long channel_value_satoshis) { - byte[] ret = bindings.BuiltCommitmentTransaction_sign(this.ptr, InternalUtils.check_arr_len(funding_key, 32), funding_redeemscript, channel_value_satoshis); + public byte[] sign_counterparty_commitment(byte[] funding_key, byte[] funding_redeemscript, long channel_value_satoshis) { + byte[] ret = bindings.BuiltCommitmentTransaction_sign_counterparty_commitment(this.ptr, InternalUtils.check_arr_len(funding_key, 32), funding_redeemscript, channel_value_satoshis); + Reference.reachabilityFence(this); + Reference.reachabilityFence(funding_key); + Reference.reachabilityFence(funding_redeemscript); + Reference.reachabilityFence(channel_value_satoshis); + return ret; + } + + /** + * Signs the holder commitment transaction because we are about to broadcast it. + */ + public byte[] sign_holder_commitment(byte[] funding_key, byte[] funding_redeemscript, long channel_value_satoshis, org.ldk.structs.EntropySource entropy_source) { + byte[] ret = bindings.BuiltCommitmentTransaction_sign_holder_commitment(this.ptr, InternalUtils.check_arr_len(funding_key, 32), funding_redeemscript, channel_value_satoshis, entropy_source == null ? 0 : entropy_source.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(funding_key); + Reference.reachabilityFence(funding_redeemscript); + Reference.reachabilityFence(channel_value_satoshis); + Reference.reachabilityFence(entropy_source); + if (this != null) { this.ptrs_to.add(entropy_source); }; return ret; }