X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FOpenChannelV2.java;fp=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FOpenChannelV2.java;h=114e942aa3b3804c8098d9114599e827ee9f37be;hb=ffdd56c967087cba7548599934585b8a9a3102e2;hp=93fad93591af913ff030dcc1176f095a4956a3dd;hpb=7b75443b8305c6a24d3c08520e1785e9d39960e4;p=ldk-java diff --git a/src/main/java/org/ldk/structs/OpenChannelV2.java b/src/main/java/org/ldk/structs/OpenChannelV2.java index 93fad935..114e942a 100644 --- a/src/main/java/org/ldk/structs/OpenChannelV2.java +++ b/src/main/java/org/ldk/structs/OpenChannelV2.java @@ -23,39 +23,25 @@ public class OpenChannelV2 extends CommonBase { } /** - * The genesis hash of the blockchain where the channel is to be opened + * Common fields of `open_channel(2)`-like messages */ - public byte[] get_chain_hash() { - byte[] ret = bindings.OpenChannelV2_get_chain_hash(this.ptr); + public CommonOpenChannelFields get_common_fields() { + long ret = bindings.OpenChannelV2_get_common_fields(this.ptr); Reference.reachabilityFence(this); - return ret; - } - - /** - * The genesis hash of the blockchain where the channel is to be opened - */ - public void set_chain_hash(byte[] val) { - bindings.OpenChannelV2_set_chain_hash(this.ptr, InternalUtils.check_arr_len(val, 32)); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - - /** - * A temporary channel ID derived using a zeroed out value for the channel acceptor's revocation basepoint - */ - public byte[] get_temporary_channel_id() { - byte[] ret = bindings.OpenChannelV2_get_temporary_channel_id(this.ptr); - Reference.reachabilityFence(this); - return ret; + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.CommonOpenChannelFields ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.CommonOpenChannelFields(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; + return ret_hu_conv; } /** - * A temporary channel ID derived using a zeroed out value for the channel acceptor's revocation basepoint + * Common fields of `open_channel(2)`-like messages */ - public void set_temporary_channel_id(byte[] val) { - bindings.OpenChannelV2_set_temporary_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32)); + public void set_common_fields(org.ldk.structs.CommonOpenChannelFields val) { + bindings.OpenChannelV2_set_common_fields(this.ptr, val.ptr); Reference.reachabilityFence(this); Reference.reachabilityFence(val); + if (this != null) { this.ptrs_to.add(val); }; } /** @@ -76,136 +62,6 @@ public class OpenChannelV2 extends CommonBase { Reference.reachabilityFence(val); } - /** - * The feerate for the commitment transaction set by the channel initiator - */ - public int get_commitment_feerate_sat_per_1000_weight() { - int ret = bindings.OpenChannelV2_get_commitment_feerate_sat_per_1000_weight(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * The feerate for the commitment transaction set by the channel initiator - */ - public void set_commitment_feerate_sat_per_1000_weight(int val) { - bindings.OpenChannelV2_set_commitment_feerate_sat_per_1000_weight(this.ptr, val); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - - /** - * Part of the channel value contributed by the channel initiator - */ - public long get_funding_satoshis() { - long ret = bindings.OpenChannelV2_get_funding_satoshis(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * Part of the channel value contributed by the channel initiator - */ - public void set_funding_satoshis(long val) { - bindings.OpenChannelV2_set_funding_satoshis(this.ptr, val); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - - /** - * The threshold below which outputs on transactions broadcast by the channel initiator will be - * omitted - */ - public long get_dust_limit_satoshis() { - long ret = bindings.OpenChannelV2_get_dust_limit_satoshis(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * The threshold below which outputs on transactions broadcast by the channel initiator will be - * omitted - */ - public void set_dust_limit_satoshis(long val) { - bindings.OpenChannelV2_set_dust_limit_satoshis(this.ptr, val); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - - /** - * The maximum inbound HTLC value in flight towards channel initiator, in milli-satoshi - */ - public long get_max_htlc_value_in_flight_msat() { - long ret = bindings.OpenChannelV2_get_max_htlc_value_in_flight_msat(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * The maximum inbound HTLC value in flight towards channel initiator, in milli-satoshi - */ - public void set_max_htlc_value_in_flight_msat(long val) { - bindings.OpenChannelV2_set_max_htlc_value_in_flight_msat(this.ptr, val); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - - /** - * The minimum HTLC size incoming to channel initiator, in milli-satoshi - */ - public long get_htlc_minimum_msat() { - long ret = bindings.OpenChannelV2_get_htlc_minimum_msat(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * The minimum HTLC size incoming to channel initiator, in milli-satoshi - */ - public void set_htlc_minimum_msat(long val) { - bindings.OpenChannelV2_set_htlc_minimum_msat(this.ptr, val); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - - /** - * The number of blocks which the counterparty will have to wait to claim on-chain funds if they - * broadcast a commitment transaction - */ - public short get_to_self_delay() { - short ret = bindings.OpenChannelV2_get_to_self_delay(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * The number of blocks which the counterparty will have to wait to claim on-chain funds if they - * broadcast a commitment transaction - */ - public void set_to_self_delay(short val) { - bindings.OpenChannelV2_set_to_self_delay(this.ptr, val); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - - /** - * The maximum number of inbound HTLCs towards channel initiator - */ - public short get_max_accepted_htlcs() { - short ret = bindings.OpenChannelV2_get_max_accepted_htlcs(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * The maximum number of inbound HTLCs towards channel initiator - */ - public void set_max_accepted_htlcs(short val) { - bindings.OpenChannelV2_set_max_accepted_htlcs(this.ptr, val); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - /** * The locktime for the funding transaction */ @@ -224,116 +80,6 @@ public class OpenChannelV2 extends CommonBase { Reference.reachabilityFence(val); } - /** - * The channel initiator's key controlling the funding transaction - */ - public byte[] get_funding_pubkey() { - byte[] ret = bindings.OpenChannelV2_get_funding_pubkey(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * The channel initiator's key controlling the funding transaction - */ - public void set_funding_pubkey(byte[] val) { - bindings.OpenChannelV2_set_funding_pubkey(this.ptr, InternalUtils.check_arr_len(val, 33)); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - - /** - * Used to derive a revocation key for transactions broadcast by counterparty - */ - public byte[] get_revocation_basepoint() { - byte[] ret = bindings.OpenChannelV2_get_revocation_basepoint(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * Used to derive a revocation key for transactions broadcast by counterparty - */ - public void set_revocation_basepoint(byte[] val) { - bindings.OpenChannelV2_set_revocation_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33)); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - - /** - * A payment key to channel initiator for transactions broadcast by counterparty - */ - public byte[] get_payment_basepoint() { - byte[] ret = bindings.OpenChannelV2_get_payment_basepoint(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * A payment key to channel initiator for transactions broadcast by counterparty - */ - public void set_payment_basepoint(byte[] val) { - bindings.OpenChannelV2_set_payment_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33)); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - - /** - * Used to derive a payment key to channel initiator for transactions broadcast by channel - * initiator - */ - public byte[] get_delayed_payment_basepoint() { - byte[] ret = bindings.OpenChannelV2_get_delayed_payment_basepoint(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * Used to derive a payment key to channel initiator for transactions broadcast by channel - * initiator - */ - public void set_delayed_payment_basepoint(byte[] val) { - bindings.OpenChannelV2_set_delayed_payment_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33)); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - - /** - * Used to derive an HTLC payment key to channel initiator - */ - public byte[] get_htlc_basepoint() { - byte[] ret = bindings.OpenChannelV2_get_htlc_basepoint(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * Used to derive an HTLC payment key to channel initiator - */ - public void set_htlc_basepoint(byte[] val) { - bindings.OpenChannelV2_set_htlc_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33)); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - - /** - * The first to-be-broadcast-by-channel-initiator transaction's per commitment point - */ - public byte[] get_first_per_commitment_point() { - byte[] ret = bindings.OpenChannelV2_get_first_per_commitment_point(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * The first to-be-broadcast-by-channel-initiator transaction's per commitment point - */ - public void set_first_per_commitment_point(byte[] val) { - bindings.OpenChannelV2_set_first_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33)); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - /** * The second to-be-broadcast-by-channel-initiator transaction's per commitment point */ @@ -352,79 +98,6 @@ public class OpenChannelV2 extends CommonBase { Reference.reachabilityFence(val); } - /** - * Channel flags - */ - public byte get_channel_flags() { - byte ret = bindings.OpenChannelV2_get_channel_flags(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - - /** - * Channel flags - */ - public void set_channel_flags(byte val) { - bindings.OpenChannelV2_set_channel_flags(this.ptr, val); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - } - - /** - * Optionally, a request to pre-set the to-channel-initiator output's scriptPubkey for when we - * collaboratively close - */ - public Option_CVec_u8ZZ get_shutdown_scriptpubkey() { - long ret = bindings.OpenChannelV2_get_shutdown_scriptpubkey(this.ptr); - Reference.reachabilityFence(this); - if (ret >= 0 && ret <= 4096) { return null; } - org.ldk.structs.Option_CVec_u8ZZ ret_hu_conv = org.ldk.structs.Option_CVec_u8ZZ.constr_from_ptr(ret); - if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; - return ret_hu_conv; - } - - /** - * Optionally, a request to pre-set the to-channel-initiator output's scriptPubkey for when we - * collaboratively close - */ - public void set_shutdown_scriptpubkey(org.ldk.structs.Option_CVec_u8ZZ val) { - bindings.OpenChannelV2_set_shutdown_scriptpubkey(this.ptr, val.ptr); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - if (this != null) { this.ptrs_to.add(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. - * - * 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.OpenChannelV2_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. - * - * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None - */ - public void set_channel_type(@Nullable org.ldk.structs.ChannelTypeFeatures val) { - bindings.OpenChannelV2_set_channel_type(this.ptr, val == null ? 0 : val.ptr); - Reference.reachabilityFence(this); - Reference.reachabilityFence(val); - if (this != null) { this.ptrs_to.add(val); }; - } - /** * Optionally, a requirement that only confirmed inputs can be added */ @@ -445,38 +118,18 @@ public class OpenChannelV2 extends CommonBase { /** * Constructs a new OpenChannelV2 given each field - * - * Note that channel_type_arg (or a relevant inner pointer) may be NULL or all-0s to represent None */ - public static OpenChannelV2 of(byte[] chain_hash_arg, byte[] temporary_channel_id_arg, int funding_feerate_sat_per_1000_weight_arg, int commitment_feerate_sat_per_1000_weight_arg, long funding_satoshis_arg, long dust_limit_satoshis_arg, long max_htlc_value_in_flight_msat_arg, long htlc_minimum_msat_arg, short to_self_delay_arg, short max_accepted_htlcs_arg, int locktime_arg, byte[] funding_pubkey_arg, byte[] revocation_basepoint_arg, byte[] payment_basepoint_arg, byte[] delayed_payment_basepoint_arg, byte[] htlc_basepoint_arg, byte[] first_per_commitment_point_arg, byte[] second_per_commitment_point_arg, byte channel_flags_arg, org.ldk.structs.Option_CVec_u8ZZ shutdown_scriptpubkey_arg, @Nullable org.ldk.structs.ChannelTypeFeatures channel_type_arg, org.ldk.enums.COption_NoneZ require_confirmed_inputs_arg) { - long ret = bindings.OpenChannelV2_new(InternalUtils.check_arr_len(chain_hash_arg, 32), InternalUtils.check_arr_len(temporary_channel_id_arg, 32), funding_feerate_sat_per_1000_weight_arg, commitment_feerate_sat_per_1000_weight_arg, funding_satoshis_arg, dust_limit_satoshis_arg, max_htlc_value_in_flight_msat_arg, htlc_minimum_msat_arg, to_self_delay_arg, max_accepted_htlcs_arg, locktime_arg, InternalUtils.check_arr_len(funding_pubkey_arg, 33), InternalUtils.check_arr_len(revocation_basepoint_arg, 33), InternalUtils.check_arr_len(payment_basepoint_arg, 33), InternalUtils.check_arr_len(delayed_payment_basepoint_arg, 33), InternalUtils.check_arr_len(htlc_basepoint_arg, 33), InternalUtils.check_arr_len(first_per_commitment_point_arg, 33), InternalUtils.check_arr_len(second_per_commitment_point_arg, 33), channel_flags_arg, shutdown_scriptpubkey_arg.ptr, channel_type_arg == null ? 0 : channel_type_arg.ptr, require_confirmed_inputs_arg); - Reference.reachabilityFence(chain_hash_arg); - Reference.reachabilityFence(temporary_channel_id_arg); + public static OpenChannelV2 of(org.ldk.structs.CommonOpenChannelFields common_fields_arg, int funding_feerate_sat_per_1000_weight_arg, int locktime_arg, byte[] second_per_commitment_point_arg, org.ldk.enums.COption_NoneZ require_confirmed_inputs_arg) { + long ret = bindings.OpenChannelV2_new(common_fields_arg.ptr, funding_feerate_sat_per_1000_weight_arg, locktime_arg, InternalUtils.check_arr_len(second_per_commitment_point_arg, 33), require_confirmed_inputs_arg); + Reference.reachabilityFence(common_fields_arg); Reference.reachabilityFence(funding_feerate_sat_per_1000_weight_arg); - Reference.reachabilityFence(commitment_feerate_sat_per_1000_weight_arg); - Reference.reachabilityFence(funding_satoshis_arg); - Reference.reachabilityFence(dust_limit_satoshis_arg); - Reference.reachabilityFence(max_htlc_value_in_flight_msat_arg); - Reference.reachabilityFence(htlc_minimum_msat_arg); - Reference.reachabilityFence(to_self_delay_arg); - Reference.reachabilityFence(max_accepted_htlcs_arg); Reference.reachabilityFence(locktime_arg); - Reference.reachabilityFence(funding_pubkey_arg); - Reference.reachabilityFence(revocation_basepoint_arg); - Reference.reachabilityFence(payment_basepoint_arg); - Reference.reachabilityFence(delayed_payment_basepoint_arg); - Reference.reachabilityFence(htlc_basepoint_arg); - Reference.reachabilityFence(first_per_commitment_point_arg); Reference.reachabilityFence(second_per_commitment_point_arg); - Reference.reachabilityFence(channel_flags_arg); - Reference.reachabilityFence(shutdown_scriptpubkey_arg); - Reference.reachabilityFence(channel_type_arg); Reference.reachabilityFence(require_confirmed_inputs_arg); if (ret >= 0 && ret <= 4096) { return null; } org.ldk.structs.OpenChannelV2 ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.OpenChannelV2(null, ret); } if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); }; - if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(shutdown_scriptpubkey_arg); }; - if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(channel_type_arg); }; + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(common_fields_arg); }; return ret_hu_conv; } @@ -516,7 +169,7 @@ public class OpenChannelV2 extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public boolean eq(org.ldk.structs.OpenChannelV2 b) { - boolean ret = bindings.OpenChannelV2_eq(this.ptr, b == null ? 0 : b.ptr); + boolean ret = bindings.OpenChannelV2_eq(this.ptr, b.ptr); Reference.reachabilityFence(this); Reference.reachabilityFence(b); if (this != null) { this.ptrs_to.add(b); };