X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FTxCreationKeys.java;h=f1e78509b50369e4ec0709e8d30312492699799f;hb=23cf651a6855035c3fde1cf62cb86002a5731342;hp=22e03cf428c886b9561bfaaa8b4e638daefcb641;hpb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;p=ldk-java diff --git a/src/main/java/org/ldk/structs/TxCreationKeys.java b/src/main/java/org/ldk/structs/TxCreationKeys.java index 22e03cf4..f1e78509 100644 --- a/src/main/java/org/ldk/structs/TxCreationKeys.java +++ b/src/main/java/org/ldk/structs/TxCreationKeys.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; @@ -34,6 +35,7 @@ public class TxCreationKeys extends CommonBase { */ public byte[] get_per_commitment_point() { byte[] ret = bindings.TxCreationKeys_get_per_commitment_point(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -41,7 +43,9 @@ public class TxCreationKeys extends CommonBase { * The broadcaster's per-commitment public key which was used to derive the other keys. */ public void set_per_commitment_point(byte[] val) { - bindings.TxCreationKeys_set_per_commitment_point(this.ptr, val); + bindings.TxCreationKeys_set_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -51,6 +55,7 @@ public class TxCreationKeys extends CommonBase { */ public byte[] get_revocation_key() { byte[] ret = bindings.TxCreationKeys_get_revocation_key(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -60,7 +65,9 @@ public class TxCreationKeys extends CommonBase { * an old state. */ public void set_revocation_key(byte[] val) { - bindings.TxCreationKeys_set_revocation_key(this.ptr, val); + bindings.TxCreationKeys_set_revocation_key(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -68,6 +75,7 @@ public class TxCreationKeys extends CommonBase { */ public byte[] get_broadcaster_htlc_key() { byte[] ret = bindings.TxCreationKeys_get_broadcaster_htlc_key(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -75,7 +83,9 @@ public class TxCreationKeys extends CommonBase { * Broadcaster's HTLC Key */ public void set_broadcaster_htlc_key(byte[] val) { - bindings.TxCreationKeys_set_broadcaster_htlc_key(this.ptr, val); + bindings.TxCreationKeys_set_broadcaster_htlc_key(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -83,6 +93,7 @@ public class TxCreationKeys extends CommonBase { */ public byte[] get_countersignatory_htlc_key() { byte[] ret = bindings.TxCreationKeys_get_countersignatory_htlc_key(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -90,7 +101,9 @@ public class TxCreationKeys extends CommonBase { * Countersignatory's HTLC Key */ public void set_countersignatory_htlc_key(byte[] val) { - bindings.TxCreationKeys_set_countersignatory_htlc_key(this.ptr, val); + bindings.TxCreationKeys_set_countersignatory_htlc_key(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -98,6 +111,7 @@ public class TxCreationKeys extends CommonBase { */ public byte[] get_broadcaster_delayed_payment_key() { byte[] ret = bindings.TxCreationKeys_get_broadcaster_delayed_payment_key(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -105,25 +119,39 @@ public class TxCreationKeys extends CommonBase { * Broadcaster's Payment Key (which isn't allowed to be spent from for some delay) */ public void set_broadcaster_delayed_payment_key(byte[] val) { - bindings.TxCreationKeys_set_broadcaster_delayed_payment_key(this.ptr, val); + bindings.TxCreationKeys_set_broadcaster_delayed_payment_key(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** * Constructs a new TxCreationKeys given each field */ public static TxCreationKeys of(byte[] per_commitment_point_arg, byte[] revocation_key_arg, byte[] broadcaster_htlc_key_arg, byte[] countersignatory_htlc_key_arg, byte[] broadcaster_delayed_payment_key_arg) { - long ret = bindings.TxCreationKeys_new(per_commitment_point_arg, revocation_key_arg, broadcaster_htlc_key_arg, countersignatory_htlc_key_arg, broadcaster_delayed_payment_key_arg); + long ret = bindings.TxCreationKeys_new(InternalUtils.check_arr_len(per_commitment_point_arg, 33), InternalUtils.check_arr_len(revocation_key_arg, 33), InternalUtils.check_arr_len(broadcaster_htlc_key_arg, 33), InternalUtils.check_arr_len(countersignatory_htlc_key_arg, 33), InternalUtils.check_arr_len(broadcaster_delayed_payment_key_arg, 33)); + Reference.reachabilityFence(per_commitment_point_arg); + Reference.reachabilityFence(revocation_key_arg); + Reference.reachabilityFence(broadcaster_htlc_key_arg); + Reference.reachabilityFence(countersignatory_htlc_key_arg); + Reference.reachabilityFence(broadcaster_delayed_payment_key_arg); if (ret >= 0 && ret <= 4096) { return null; } TxCreationKeys ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new TxCreationKeys(null, ret); } ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; } + long clone_ptr() { + long ret = bindings.TxCreationKeys_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + /** * Creates a copy of the TxCreationKeys */ public TxCreationKeys clone() { long ret = bindings.TxCreationKeys_clone(this.ptr); + Reference.reachabilityFence(this); if (ret >= 0 && ret <= 4096) { return null; } TxCreationKeys ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new TxCreationKeys(null, ret); } ret_hu_conv.ptrs_to.add(this); @@ -135,6 +163,7 @@ public class TxCreationKeys extends CommonBase { */ public byte[] write() { byte[] ret = bindings.TxCreationKeys_write(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -143,6 +172,7 @@ public class TxCreationKeys extends CommonBase { */ public static Result_TxCreationKeysDecodeErrorZ read(byte[] ser) { long ret = bindings.TxCreationKeys_read(ser); + Reference.reachabilityFence(ser); if (ret >= 0 && ret <= 4096) { return null; } Result_TxCreationKeysDecodeErrorZ ret_hu_conv = Result_TxCreationKeysDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; @@ -153,7 +183,12 @@ public class TxCreationKeys extends CommonBase { * Key set is asymmetric and can't be used as part of counter-signatory set of transactions. */ public static Result_TxCreationKeysErrorZ derive_new(byte[] per_commitment_point, byte[] broadcaster_delayed_payment_base, byte[] broadcaster_htlc_base, byte[] countersignatory_revocation_base, byte[] countersignatory_htlc_base) { - long ret = bindings.TxCreationKeys_derive_new(per_commitment_point, broadcaster_delayed_payment_base, broadcaster_htlc_base, countersignatory_revocation_base, countersignatory_htlc_base); + long ret = bindings.TxCreationKeys_derive_new(InternalUtils.check_arr_len(per_commitment_point, 33), InternalUtils.check_arr_len(broadcaster_delayed_payment_base, 33), InternalUtils.check_arr_len(broadcaster_htlc_base, 33), InternalUtils.check_arr_len(countersignatory_revocation_base, 33), InternalUtils.check_arr_len(countersignatory_htlc_base, 33)); + Reference.reachabilityFence(per_commitment_point); + Reference.reachabilityFence(broadcaster_delayed_payment_base); + Reference.reachabilityFence(broadcaster_htlc_base); + Reference.reachabilityFence(countersignatory_revocation_base); + Reference.reachabilityFence(countersignatory_htlc_base); if (ret >= 0 && ret <= 4096) { return null; } Result_TxCreationKeysErrorZ ret_hu_conv = Result_TxCreationKeysErrorZ.constr_from_ptr(ret); return ret_hu_conv; @@ -164,7 +199,10 @@ public class TxCreationKeys extends CommonBase { * Key set is asymmetric and can't be used as part of counter-signatory set of transactions. */ public static Result_TxCreationKeysErrorZ from_channel_static_keys(byte[] per_commitment_point, ChannelPublicKeys broadcaster_keys, ChannelPublicKeys countersignatory_keys) { - long ret = bindings.TxCreationKeys_from_channel_static_keys(per_commitment_point, broadcaster_keys == null ? 0 : broadcaster_keys.ptr & ~1, countersignatory_keys == null ? 0 : countersignatory_keys.ptr & ~1); + long ret = bindings.TxCreationKeys_from_channel_static_keys(InternalUtils.check_arr_len(per_commitment_point, 33), broadcaster_keys == null ? 0 : broadcaster_keys.ptr & ~1, countersignatory_keys == null ? 0 : countersignatory_keys.ptr & ~1); + Reference.reachabilityFence(per_commitment_point); + Reference.reachabilityFence(broadcaster_keys); + Reference.reachabilityFence(countersignatory_keys); if (ret >= 0 && ret <= 4096) { return null; } Result_TxCreationKeysErrorZ ret_hu_conv = Result_TxCreationKeysErrorZ.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(broadcaster_keys);