X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelAnnouncement.java;h=8ab2d90c05bed6eb580b5d8ad76a38a71ba0a3fc;hb=1854b5cebef22ace9e9e4dd191f609818df9ce08;hp=808d0a679b0488ec01c0b87310d3c4ac434d0de8;hpb=99d1a3bd6dc5c7ed1499b30bfc2b4c66ffaf858a;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ChannelAnnouncement.java b/src/main/java/org/ldk/structs/ChannelAnnouncement.java index 808d0a67..8ab2d90c 100644 --- a/src/main/java/org/ldk/structs/ChannelAnnouncement.java +++ b/src/main/java/org/ldk/structs/ChannelAnnouncement.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 ChannelAnnouncement extends CommonBase { */ public byte[] get_node_signature_1() { byte[] ret = bindings.ChannelAnnouncement_get_node_signature_1(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -31,7 +33,9 @@ public class ChannelAnnouncement extends CommonBase { * Authentication of the announcement by the first public node */ public void set_node_signature_1(byte[] val) { - bindings.ChannelAnnouncement_set_node_signature_1(this.ptr, val); + bindings.ChannelAnnouncement_set_node_signature_1(this.ptr, InternalUtils.check_arr_len(val, 64)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -39,6 +43,7 @@ public class ChannelAnnouncement extends CommonBase { */ public byte[] get_node_signature_2() { byte[] ret = bindings.ChannelAnnouncement_get_node_signature_2(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -46,7 +51,9 @@ public class ChannelAnnouncement extends CommonBase { * Authentication of the announcement by the second public node */ public void set_node_signature_2(byte[] val) { - bindings.ChannelAnnouncement_set_node_signature_2(this.ptr, val); + bindings.ChannelAnnouncement_set_node_signature_2(this.ptr, InternalUtils.check_arr_len(val, 64)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -54,6 +61,7 @@ public class ChannelAnnouncement extends CommonBase { */ public byte[] get_bitcoin_signature_1() { byte[] ret = bindings.ChannelAnnouncement_get_bitcoin_signature_1(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -61,7 +69,9 @@ public class ChannelAnnouncement extends CommonBase { * Proof of funding UTXO ownership by the first public node */ public void set_bitcoin_signature_1(byte[] val) { - bindings.ChannelAnnouncement_set_bitcoin_signature_1(this.ptr, val); + bindings.ChannelAnnouncement_set_bitcoin_signature_1(this.ptr, InternalUtils.check_arr_len(val, 64)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -69,6 +79,7 @@ public class ChannelAnnouncement extends CommonBase { */ public byte[] get_bitcoin_signature_2() { byte[] ret = bindings.ChannelAnnouncement_get_bitcoin_signature_2(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -76,7 +87,9 @@ public class ChannelAnnouncement extends CommonBase { * Proof of funding UTXO ownership by the second public node */ public void set_bitcoin_signature_2(byte[] val) { - bindings.ChannelAnnouncement_set_bitcoin_signature_2(this.ptr, val); + bindings.ChannelAnnouncement_set_bitcoin_signature_2(this.ptr, InternalUtils.check_arr_len(val, 64)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -84,6 +97,7 @@ public class ChannelAnnouncement extends CommonBase { */ public UnsignedChannelAnnouncement get_contents() { long ret = bindings.ChannelAnnouncement_get_contents(this.ptr); + Reference.reachabilityFence(this); if (ret >= 0 && ret <= 4096) { return null; } UnsignedChannelAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new UnsignedChannelAnnouncement(null, ret); } ret_hu_conv.ptrs_to.add(this); @@ -95,24 +109,38 @@ public class ChannelAnnouncement extends CommonBase { */ public void set_contents(UnsignedChannelAnnouncement val) { bindings.ChannelAnnouncement_set_contents(this.ptr, val == null ? 0 : val.ptr & ~1); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** * Constructs a new ChannelAnnouncement given each field */ public static ChannelAnnouncement of(byte[] node_signature_1_arg, byte[] node_signature_2_arg, byte[] bitcoin_signature_1_arg, byte[] bitcoin_signature_2_arg, UnsignedChannelAnnouncement contents_arg) { - long ret = bindings.ChannelAnnouncement_new(node_signature_1_arg, node_signature_2_arg, bitcoin_signature_1_arg, bitcoin_signature_2_arg, contents_arg == null ? 0 : contents_arg.ptr & ~1); + long ret = bindings.ChannelAnnouncement_new(InternalUtils.check_arr_len(node_signature_1_arg, 64), InternalUtils.check_arr_len(node_signature_2_arg, 64), InternalUtils.check_arr_len(bitcoin_signature_1_arg, 64), InternalUtils.check_arr_len(bitcoin_signature_2_arg, 64), contents_arg == null ? 0 : contents_arg.ptr & ~1); + Reference.reachabilityFence(node_signature_1_arg); + Reference.reachabilityFence(node_signature_2_arg); + Reference.reachabilityFence(bitcoin_signature_1_arg); + Reference.reachabilityFence(bitcoin_signature_2_arg); + Reference.reachabilityFence(contents_arg); if (ret >= 0 && ret <= 4096) { return null; } ChannelAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelAnnouncement(null, ret); } ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; } + long clone_ptr() { + long ret = bindings.ChannelAnnouncement_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + /** * Creates a copy of the ChannelAnnouncement */ public ChannelAnnouncement clone() { long ret = bindings.ChannelAnnouncement_clone(this.ptr); + Reference.reachabilityFence(this); if (ret >= 0 && ret <= 4096) { return null; } ChannelAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelAnnouncement(null, ret); } ret_hu_conv.ptrs_to.add(this); @@ -124,6 +152,7 @@ public class ChannelAnnouncement extends CommonBase { */ public byte[] write() { byte[] ret = bindings.ChannelAnnouncement_write(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -132,6 +161,7 @@ public class ChannelAnnouncement extends CommonBase { */ public static Result_ChannelAnnouncementDecodeErrorZ read(byte[] ser) { long ret = bindings.ChannelAnnouncement_read(ser); + Reference.reachabilityFence(ser); if (ret >= 0 && ret <= 4096) { return null; } Result_ChannelAnnouncementDecodeErrorZ ret_hu_conv = Result_ChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv;