X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FBuiltCommitmentTransaction.java;h=e30cbf022697261c0adbf4ad3b6ab4633b27cdfa;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=0e36c36ae706875669034aef6fd503a3fd661aaa;hpb=17113550a5fefab21f39f27fbfe02646b8db53ae;p=ldk-java diff --git a/src/main/java/org/ldk/structs/BuiltCommitmentTransaction.java b/src/main/java/org/ldk/structs/BuiltCommitmentTransaction.java index 0e36c36a..e30cbf02 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 javax.annotation.Nullable; /** @@ -51,25 +52,32 @@ public class BuiltCommitmentTransaction extends CommonBase { * multiple times. */ public void set_txid(byte[] val) { - bindings.BuiltCommitmentTransaction_set_txid(this.ptr, val); + bindings.BuiltCommitmentTransaction_set_txid(this.ptr, InternalUtils.check_arr_len(val, 32)); } /** * Constructs a new BuiltCommitmentTransaction given each field */ - public static BuiltCommitmentTransaction constructor_new(byte[] transaction_arg, byte[] txid_arg) { - long ret = bindings.BuiltCommitmentTransaction_new(transaction_arg, txid_arg); - BuiltCommitmentTransaction ret_hu_conv = new BuiltCommitmentTransaction(null, ret); + public static BuiltCommitmentTransaction of(byte[] transaction_arg, byte[] txid_arg) { + long ret = bindings.BuiltCommitmentTransaction_new(transaction_arg, InternalUtils.check_arr_len(txid_arg, 32)); + 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); return ret_hu_conv; } + long clone_ptr() { + long ret = bindings.BuiltCommitmentTransaction_clone_ptr(this.ptr); + return ret; + } + /** * Creates a copy of the BuiltCommitmentTransaction */ public BuiltCommitmentTransaction clone() { long ret = bindings.BuiltCommitmentTransaction_clone(this.ptr); - BuiltCommitmentTransaction ret_hu_conv = new BuiltCommitmentTransaction(null, ret); + 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); return ret_hu_conv; } @@ -85,8 +93,9 @@ public class BuiltCommitmentTransaction extends CommonBase { /** * Read a BuiltCommitmentTransaction from a byte array, created by BuiltCommitmentTransaction_write */ - public static Result_BuiltCommitmentTransactionDecodeErrorZ constructor_read(byte[] ser) { + public static Result_BuiltCommitmentTransactionDecodeErrorZ read(byte[] ser) { long ret = bindings.BuiltCommitmentTransaction_read(ser); + if (ret >= 0 && ret <= 4096) { return null; } Result_BuiltCommitmentTransactionDecodeErrorZ ret_hu_conv = Result_BuiltCommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -106,7 +115,7 @@ public class BuiltCommitmentTransaction extends CommonBase { * because we are about to broadcast a holder transaction. */ public byte[] sign(byte[] funding_key, byte[] funding_redeemscript, long channel_value_satoshis) { - byte[] ret = bindings.BuiltCommitmentTransaction_sign(this.ptr, funding_key, funding_redeemscript, channel_value_satoshis); + byte[] ret = bindings.BuiltCommitmentTransaction_sign(this.ptr, InternalUtils.check_arr_len(funding_key, 32), funding_redeemscript, channel_value_satoshis); return ret; }