X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelPublicKeys.java;h=ce8eec40d86c601990c8bfdbdb92f2b4174e5cba;hb=1854b5cebef22ace9e9e4dd191f609818df9ce08;hp=84a1d7e8ebe7eeff890506d8fcb433848b005be2;hpb=e6173a79ce766cef7a660f22fc8fd1220975f6ea;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ChannelPublicKeys.java b/src/main/java/org/ldk/structs/ChannelPublicKeys.java index 84a1d7e8..ce8eec40 100644 --- a/src/main/java/org/ldk/structs/ChannelPublicKeys.java +++ b/src/main/java/org/ldk/structs/ChannelPublicKeys.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; @@ -25,6 +26,7 @@ public class ChannelPublicKeys extends CommonBase { */ public byte[] get_funding_pubkey() { byte[] ret = bindings.ChannelPublicKeys_get_funding_pubkey(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -33,7 +35,9 @@ public class ChannelPublicKeys extends CommonBase { * on-chain channel lock-in 2-of-2 multisig output. */ public void set_funding_pubkey(byte[] val) { - bindings.ChannelPublicKeys_set_funding_pubkey(this.ptr, val); + bindings.ChannelPublicKeys_set_funding_pubkey(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -44,6 +48,7 @@ public class ChannelPublicKeys extends CommonBase { */ public byte[] get_revocation_basepoint() { byte[] ret = bindings.ChannelPublicKeys_get_revocation_basepoint(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -54,7 +59,9 @@ public class ChannelPublicKeys extends CommonBase { * states. */ public void set_revocation_basepoint(byte[] val) { - bindings.ChannelPublicKeys_set_revocation_basepoint(this.ptr, val); + bindings.ChannelPublicKeys_set_revocation_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -64,6 +71,7 @@ public class ChannelPublicKeys extends CommonBase { */ public byte[] get_payment_point() { byte[] ret = bindings.ChannelPublicKeys_get_payment_point(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -73,7 +81,9 @@ public class ChannelPublicKeys extends CommonBase { * static across every commitment transaction. */ public void set_payment_point(byte[] val) { - bindings.ChannelPublicKeys_set_payment_point(this.ptr, val); + bindings.ChannelPublicKeys_set_payment_point(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -83,6 +93,7 @@ public class ChannelPublicKeys extends CommonBase { */ public byte[] get_delayed_payment_basepoint() { byte[] ret = bindings.ChannelPublicKeys_get_delayed_payment_basepoint(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -92,7 +103,9 @@ public class ChannelPublicKeys extends CommonBase { * after some delay (or can be claimed via the revocation path). */ public void set_delayed_payment_basepoint(byte[] val) { - bindings.ChannelPublicKeys_set_delayed_payment_basepoint(this.ptr, val); + bindings.ChannelPublicKeys_set_delayed_payment_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -101,6 +114,7 @@ public class ChannelPublicKeys extends CommonBase { */ public byte[] get_htlc_basepoint() { byte[] ret = bindings.ChannelPublicKeys_get_htlc_basepoint(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -109,27 +123,41 @@ public class ChannelPublicKeys extends CommonBase { * which is used to encumber HTLC-in-flight outputs. */ public void set_htlc_basepoint(byte[] val) { - bindings.ChannelPublicKeys_set_htlc_basepoint(this.ptr, val); + bindings.ChannelPublicKeys_set_htlc_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** * Constructs a new ChannelPublicKeys given each field */ public static ChannelPublicKeys of(byte[] funding_pubkey_arg, byte[] revocation_basepoint_arg, byte[] payment_point_arg, byte[] delayed_payment_basepoint_arg, byte[] htlc_basepoint_arg) { - long ret = bindings.ChannelPublicKeys_new(funding_pubkey_arg, revocation_basepoint_arg, payment_point_arg, delayed_payment_basepoint_arg, htlc_basepoint_arg); - if (ret >= 0 && ret < 1024) { return null; } - ChannelPublicKeys ret_hu_conv = new ChannelPublicKeys(null, ret); + long ret = bindings.ChannelPublicKeys_new(InternalUtils.check_arr_len(funding_pubkey_arg, 33), InternalUtils.check_arr_len(revocation_basepoint_arg, 33), InternalUtils.check_arr_len(payment_point_arg, 33), InternalUtils.check_arr_len(delayed_payment_basepoint_arg, 33), InternalUtils.check_arr_len(htlc_basepoint_arg, 33)); + Reference.reachabilityFence(funding_pubkey_arg); + Reference.reachabilityFence(revocation_basepoint_arg); + Reference.reachabilityFence(payment_point_arg); + Reference.reachabilityFence(delayed_payment_basepoint_arg); + Reference.reachabilityFence(htlc_basepoint_arg); + if (ret >= 0 && ret <= 4096) { return null; } + ChannelPublicKeys ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelPublicKeys(null, ret); } ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; } + long clone_ptr() { + long ret = bindings.ChannelPublicKeys_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + /** * Creates a copy of the ChannelPublicKeys */ public ChannelPublicKeys clone() { long ret = bindings.ChannelPublicKeys_clone(this.ptr); - if (ret >= 0 && ret < 1024) { return null; } - ChannelPublicKeys ret_hu_conv = new ChannelPublicKeys(null, ret); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + ChannelPublicKeys ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelPublicKeys(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -139,6 +167,7 @@ public class ChannelPublicKeys extends CommonBase { */ public byte[] write() { byte[] ret = bindings.ChannelPublicKeys_write(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -147,7 +176,8 @@ public class ChannelPublicKeys extends CommonBase { */ public static Result_ChannelPublicKeysDecodeErrorZ read(byte[] ser) { long ret = bindings.ChannelPublicKeys_read(ser); - if (ret >= 0 && ret < 1024) { return null; } + Reference.reachabilityFence(ser); + if (ret >= 0 && ret <= 4096) { return null; } Result_ChannelPublicKeysDecodeErrorZ ret_hu_conv = Result_ChannelPublicKeysDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }