X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FCommitmentTransaction.java;h=b4dda5259391b6000a26166524dbcf03196603c4;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=ceb8a799f00315de4094e371f0bdf70e2b8982a2;hpb=ba1af51214a8ea2de62b84cd23b6145173c71752;p=ldk-java diff --git a/src/main/java/org/ldk/structs/CommitmentTransaction.java b/src/main/java/org/ldk/structs/CommitmentTransaction.java index ceb8a799..b4dda525 100644 --- a/src/main/java/org/ldk/structs/CommitmentTransaction.java +++ b/src/main/java/org/ldk/structs/CommitmentTransaction.java @@ -8,7 +8,7 @@ import javax.annotation.Nullable; /** - * This class tracks the per-transaction information needed to build a commitment transaction and to + * This class tracks the per-transaction information needed to build a commitment transaction and will * actually build it and sign. It is used for holder transactions that we sign only when needed * and for transactions we sign for the counterparty. * @@ -24,13 +24,18 @@ public class CommitmentTransaction extends CommonBase { if (ptr != 0) { bindings.CommitmentTransaction_free(ptr); } } + long clone_ptr() { + long ret = bindings.CommitmentTransaction_clone_ptr(this.ptr); + return ret; + } + /** * Creates a copy of the CommitmentTransaction */ public CommitmentTransaction clone() { long ret = bindings.CommitmentTransaction_clone(this.ptr); - if (ret < 1024) { return null; } - CommitmentTransaction ret_hu_conv = new CommitmentTransaction(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + CommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new CommitmentTransaction(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -48,7 +53,7 @@ public class CommitmentTransaction extends CommonBase { */ public static Result_CommitmentTransactionDecodeErrorZ read(byte[] ser) { long ret = bindings.CommitmentTransaction_read(ser); - if (ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Result_CommitmentTransactionDecodeErrorZ ret_hu_conv = Result_CommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -91,12 +96,12 @@ public class CommitmentTransaction extends CommonBase { * Applies a wrapper which allows access to these fields. * * This should only be used if you fully trust the builder of this object. It should not - * \tbe used by an external signer - instead use the verify function. + * be used by an external signer - instead use the verify function. */ public TrustedCommitmentTransaction trust() { long ret = bindings.CommitmentTransaction_trust(this.ptr); - if (ret < 1024) { return null; } - TrustedCommitmentTransaction ret_hu_conv = new TrustedCommitmentTransaction(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + TrustedCommitmentTransaction ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new TrustedCommitmentTransaction(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -111,7 +116,7 @@ public class CommitmentTransaction extends CommonBase { */ public Result_TrustedCommitmentTransactionNoneZ verify(DirectedChannelTransactionParameters channel_parameters, ChannelPublicKeys broadcaster_keys, ChannelPublicKeys countersignatory_keys) { long ret = bindings.CommitmentTransaction_verify(this.ptr, channel_parameters == null ? 0 : channel_parameters.ptr & ~1, broadcaster_keys == null ? 0 : broadcaster_keys.ptr & ~1, countersignatory_keys == null ? 0 : countersignatory_keys.ptr & ~1); - if (ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Result_TrustedCommitmentTransactionNoneZ ret_hu_conv = Result_TrustedCommitmentTransactionNoneZ.constr_from_ptr(ret); this.ptrs_to.add(channel_parameters); this.ptrs_to.add(broadcaster_keys);