X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FAcceptChannel.java;h=fc0b4a5c1bd0ae0efadd58eaf701b77f5f2be7ac;hb=f385eff0dd0aa61fbf21ae946c424f4a6a26de04;hp=4e19d30ebf5c228d6d2c965c2ad4093e0e594bb0;hpb=1b870a3ffab1c0024411e30102bc6d198300f095;p=ldk-java diff --git a/src/main/java/org/ldk/structs/AcceptChannel.java b/src/main/java/org/ldk/structs/AcceptChannel.java index 4e19d30e..fc0b4a5c 100644 --- a/src/main/java/org/ldk/structs/AcceptChannel.java +++ b/src/main/java/org/ldk/structs/AcceptChannel.java @@ -4,6 +4,8 @@ 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; /** @@ -23,6 +25,7 @@ public class AcceptChannel extends CommonBase { */ public byte[] get_temporary_channel_id() { byte[] ret = bindings.AcceptChannel_get_temporary_channel_id(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -30,7 +33,9 @@ public class AcceptChannel extends CommonBase { * A temporary channel ID, until the funding outpoint is announced */ public void set_temporary_channel_id(byte[] val) { - bindings.AcceptChannel_set_temporary_channel_id(this.ptr, val); + bindings.AcceptChannel_set_temporary_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -38,6 +43,7 @@ public class AcceptChannel extends CommonBase { */ public long get_dust_limit_satoshis() { long ret = bindings.AcceptChannel_get_dust_limit_satoshis(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -46,6 +52,8 @@ public class AcceptChannel extends CommonBase { */ public void set_dust_limit_satoshis(long val) { bindings.AcceptChannel_set_dust_limit_satoshis(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -53,6 +61,7 @@ public class AcceptChannel extends CommonBase { */ public long get_max_htlc_value_in_flight_msat() { long ret = bindings.AcceptChannel_get_max_htlc_value_in_flight_msat(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -61,6 +70,8 @@ public class AcceptChannel extends CommonBase { */ public void set_max_htlc_value_in_flight_msat(long val) { bindings.AcceptChannel_set_max_htlc_value_in_flight_msat(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -68,6 +79,7 @@ public class AcceptChannel extends CommonBase { */ public long get_channel_reserve_satoshis() { long ret = bindings.AcceptChannel_get_channel_reserve_satoshis(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -76,6 +88,8 @@ public class AcceptChannel extends CommonBase { */ public void set_channel_reserve_satoshis(long val) { bindings.AcceptChannel_set_channel_reserve_satoshis(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -83,6 +97,7 @@ public class AcceptChannel extends CommonBase { */ public long get_htlc_minimum_msat() { long ret = bindings.AcceptChannel_get_htlc_minimum_msat(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -91,6 +106,8 @@ public class AcceptChannel extends CommonBase { */ public void set_htlc_minimum_msat(long val) { bindings.AcceptChannel_set_htlc_minimum_msat(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -98,6 +115,7 @@ public class AcceptChannel extends CommonBase { */ public int get_minimum_depth() { int ret = bindings.AcceptChannel_get_minimum_depth(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -106,6 +124,8 @@ public class AcceptChannel extends CommonBase { */ public void set_minimum_depth(int val) { bindings.AcceptChannel_set_minimum_depth(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -113,6 +133,7 @@ public class AcceptChannel extends CommonBase { */ public short get_to_self_delay() { short ret = bindings.AcceptChannel_get_to_self_delay(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -121,6 +142,8 @@ public class AcceptChannel extends CommonBase { */ public void set_to_self_delay(short val) { bindings.AcceptChannel_set_to_self_delay(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -128,6 +151,7 @@ public class AcceptChannel extends CommonBase { */ public short get_max_accepted_htlcs() { short ret = bindings.AcceptChannel_get_max_accepted_htlcs(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -136,6 +160,8 @@ public class AcceptChannel extends CommonBase { */ public void set_max_accepted_htlcs(short val) { bindings.AcceptChannel_set_max_accepted_htlcs(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -143,6 +169,7 @@ public class AcceptChannel extends CommonBase { */ public byte[] get_funding_pubkey() { byte[] ret = bindings.AcceptChannel_get_funding_pubkey(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -150,7 +177,9 @@ public class AcceptChannel extends CommonBase { * The sender's key controlling the funding transaction */ public void set_funding_pubkey(byte[] val) { - bindings.AcceptChannel_set_funding_pubkey(this.ptr, val); + bindings.AcceptChannel_set_funding_pubkey(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -158,6 +187,7 @@ public class AcceptChannel extends CommonBase { */ public byte[] get_revocation_basepoint() { byte[] ret = bindings.AcceptChannel_get_revocation_basepoint(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -165,7 +195,9 @@ public class AcceptChannel extends CommonBase { * Used to derive a revocation key for transactions broadcast by counterparty */ public void set_revocation_basepoint(byte[] val) { - bindings.AcceptChannel_set_revocation_basepoint(this.ptr, val); + bindings.AcceptChannel_set_revocation_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -173,6 +205,7 @@ public class AcceptChannel extends CommonBase { */ public byte[] get_payment_point() { byte[] ret = bindings.AcceptChannel_get_payment_point(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -180,7 +213,9 @@ public class AcceptChannel extends CommonBase { * A payment key to sender for transactions broadcast by counterparty */ public void set_payment_point(byte[] val) { - bindings.AcceptChannel_set_payment_point(this.ptr, val); + bindings.AcceptChannel_set_payment_point(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -188,6 +223,7 @@ public class AcceptChannel extends CommonBase { */ public byte[] get_delayed_payment_basepoint() { byte[] ret = bindings.AcceptChannel_get_delayed_payment_basepoint(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -195,7 +231,9 @@ public class AcceptChannel extends CommonBase { * Used to derive a payment key to sender for transactions broadcast by sender */ public void set_delayed_payment_basepoint(byte[] val) { - bindings.AcceptChannel_set_delayed_payment_basepoint(this.ptr, val); + bindings.AcceptChannel_set_delayed_payment_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -203,6 +241,7 @@ public class AcceptChannel extends CommonBase { */ public byte[] get_htlc_basepoint() { byte[] ret = bindings.AcceptChannel_get_htlc_basepoint(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -210,7 +249,9 @@ public class AcceptChannel extends CommonBase { * Used to derive an HTLC payment key to sender for transactions broadcast by counterparty */ public void set_htlc_basepoint(byte[] val) { - bindings.AcceptChannel_set_htlc_basepoint(this.ptr, val); + bindings.AcceptChannel_set_htlc_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -218,6 +259,7 @@ public class AcceptChannel extends CommonBase { */ public byte[] get_first_per_commitment_point() { byte[] ret = bindings.AcceptChannel_get_first_per_commitment_point(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -225,7 +267,50 @@ public class AcceptChannel extends CommonBase { * The first to-be-broadcast-by-sender transaction's per commitment point */ public void set_first_per_commitment_point(byte[] val) { - bindings.AcceptChannel_set_first_per_commitment_point(this.ptr, val); + bindings.AcceptChannel_set_first_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); + } + + /** + * The channel type that this channel will represent. If none is set, we derive the channel + * type from the intersection of our feature bits with our counterparty's feature bits from + * the Init message. + * + * This is required to match the equivalent field in [`OpenChannel::channel_type`]. + * + * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None + */ + @Nullable + public ChannelTypeFeatures get_channel_type() { + long ret = bindings.AcceptChannel_get_channel_type(this.ptr); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.ChannelTypeFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelTypeFeatures(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; + return ret_hu_conv; + } + + /** + * The channel type that this channel will represent. If none is set, we derive the channel + * type from the intersection of our feature bits with our counterparty's feature bits from + * the Init message. + * + * This is required to match the equivalent field in [`OpenChannel::channel_type`]. + * + * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None + */ + public void set_channel_type(@Nullable ChannelTypeFeatures val) { + bindings.AcceptChannel_set_channel_type(this.ptr, val == null ? 0 : val.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); + if (this != null) { this.ptrs_to.add(val); }; + } + + long clone_ptr() { + long ret = bindings.AcceptChannel_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; } /** @@ -233,8 +318,10 @@ public class AcceptChannel extends CommonBase { */ public AcceptChannel clone() { long ret = bindings.AcceptChannel_clone(this.ptr); - AcceptChannel ret_hu_conv = new AcceptChannel(null, ret); - ret_hu_conv.ptrs_to.add(this); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.AcceptChannel ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.AcceptChannel(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } @@ -243,14 +330,17 @@ public class AcceptChannel extends CommonBase { */ public byte[] write() { byte[] ret = bindings.AcceptChannel_write(this.ptr); + Reference.reachabilityFence(this); return ret; } /** * Read a AcceptChannel from a byte array, created by AcceptChannel_write */ - public static Result_AcceptChannelDecodeErrorZ constructor_read(byte[] ser) { + public static Result_AcceptChannelDecodeErrorZ read(byte[] ser) { long ret = bindings.AcceptChannel_read(ser); + Reference.reachabilityFence(ser); + if (ret >= 0 && ret <= 4096) { return null; } Result_AcceptChannelDecodeErrorZ ret_hu_conv = Result_AcceptChannelDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }