X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUnsignedChannelAnnouncement.java;h=c83bc7e4941ff68123030f84231ae0edf110cb24;hb=13cdf8bde340072288b39a5e29f0946d3e095ad4;hp=d0ff748a6602f04ba5d60635ab50101543f1c46b;hpb=8c0814bf345323be8f16e075a9af0bd43d9400ee;p=ldk-java diff --git a/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java b/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java index d0ff748a..c83bc7e4 100644 --- a/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java +++ b/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.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,8 +25,9 @@ public class UnsignedChannelAnnouncement extends CommonBase { */ public ChannelFeatures get_features() { long ret = bindings.UnsignedChannelAnnouncement_get_features(this.ptr); - if (ret < 1024) { return null; } - ChannelFeatures ret_hu_conv = new ChannelFeatures(null, ret); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.ChannelFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelFeatures(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -34,7 +36,10 @@ public class UnsignedChannelAnnouncement extends CommonBase { * The advertised channel features */ public void set_features(ChannelFeatures val) { - bindings.UnsignedChannelAnnouncement_set_features(this.ptr, val == null ? 0 : val.ptr & ~1); + bindings.UnsignedChannelAnnouncement_set_features(this.ptr, val == null ? 0 : val.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); + this.ptrs_to.add(val); } /** @@ -42,6 +47,7 @@ public class UnsignedChannelAnnouncement extends CommonBase { */ public byte[] get_chain_hash() { byte[] ret = bindings.UnsignedChannelAnnouncement_get_chain_hash(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -49,7 +55,9 @@ public class UnsignedChannelAnnouncement extends CommonBase { * The genesis hash of the blockchain where the channel is to be opened */ public void set_chain_hash(byte[] val) { - bindings.UnsignedChannelAnnouncement_set_chain_hash(this.ptr, val); + bindings.UnsignedChannelAnnouncement_set_chain_hash(this.ptr, InternalUtils.check_arr_len(val, 32)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -57,6 +65,7 @@ public class UnsignedChannelAnnouncement extends CommonBase { */ public long get_short_channel_id() { long ret = bindings.UnsignedChannelAnnouncement_get_short_channel_id(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -65,6 +74,8 @@ public class UnsignedChannelAnnouncement extends CommonBase { */ public void set_short_channel_id(long val) { bindings.UnsignedChannelAnnouncement_set_short_channel_id(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -72,6 +83,7 @@ public class UnsignedChannelAnnouncement extends CommonBase { */ public byte[] get_node_id_1() { byte[] ret = bindings.UnsignedChannelAnnouncement_get_node_id_1(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -79,7 +91,9 @@ public class UnsignedChannelAnnouncement extends CommonBase { * One of the two node_ids which are endpoints of this channel */ public void set_node_id_1(byte[] val) { - bindings.UnsignedChannelAnnouncement_set_node_id_1(this.ptr, val); + bindings.UnsignedChannelAnnouncement_set_node_id_1(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -87,6 +101,7 @@ public class UnsignedChannelAnnouncement extends CommonBase { */ public byte[] get_node_id_2() { byte[] ret = bindings.UnsignedChannelAnnouncement_get_node_id_2(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -94,7 +109,9 @@ public class UnsignedChannelAnnouncement extends CommonBase { * The other of the two node_ids which are endpoints of this channel */ public void set_node_id_2(byte[] val) { - bindings.UnsignedChannelAnnouncement_set_node_id_2(this.ptr, val); + bindings.UnsignedChannelAnnouncement_set_node_id_2(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -102,6 +119,7 @@ public class UnsignedChannelAnnouncement extends CommonBase { */ public byte[] get_bitcoin_key_1() { byte[] ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_1(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -109,7 +127,9 @@ public class UnsignedChannelAnnouncement extends CommonBase { * The funding key for the first node */ public void set_bitcoin_key_1(byte[] val) { - bindings.UnsignedChannelAnnouncement_set_bitcoin_key_1(this.ptr, val); + bindings.UnsignedChannelAnnouncement_set_bitcoin_key_1(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -117,6 +137,7 @@ public class UnsignedChannelAnnouncement extends CommonBase { */ public byte[] get_bitcoin_key_2() { byte[] ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_2(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -124,7 +145,15 @@ public class UnsignedChannelAnnouncement extends CommonBase { * The funding key for the second node */ public void set_bitcoin_key_2(byte[] val) { - bindings.UnsignedChannelAnnouncement_set_bitcoin_key_2(this.ptr, val); + bindings.UnsignedChannelAnnouncement_set_bitcoin_key_2(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); + } + + long clone_ptr() { + long ret = bindings.UnsignedChannelAnnouncement_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; } /** @@ -132,8 +161,9 @@ public class UnsignedChannelAnnouncement extends CommonBase { */ public UnsignedChannelAnnouncement clone() { long ret = bindings.UnsignedChannelAnnouncement_clone(this.ptr); - if (ret < 1024) { return null; } - UnsignedChannelAnnouncement ret_hu_conv = new UnsignedChannelAnnouncement(null, ret); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.UnsignedChannelAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UnsignedChannelAnnouncement(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -143,6 +173,7 @@ public class UnsignedChannelAnnouncement extends CommonBase { */ public byte[] write() { byte[] ret = bindings.UnsignedChannelAnnouncement_write(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -151,7 +182,8 @@ public class UnsignedChannelAnnouncement extends CommonBase { */ public static Result_UnsignedChannelAnnouncementDecodeErrorZ read(byte[] ser) { long ret = bindings.UnsignedChannelAnnouncement_read(ser); - if (ret < 1024) { return null; } + Reference.reachabilityFence(ser); + if (ret >= 0 && ret <= 4096) { return null; } Result_UnsignedChannelAnnouncementDecodeErrorZ ret_hu_conv = Result_UnsignedChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }