[Java] Update auto-generated bindings to LDK 0.0.123
[ldk-java] / src / main / java / org / ldk / structs / Event.java
index 445b0bda10b817e5ba02e1302aaaff2316b1845f..28b27e8bb444c3d0f5b5cd0bce98c2681aa382d2 100644 (file)
@@ -111,7 +111,7 @@ public class Event extends CommonBase {
                 * 
                 * [`ChannelManager::funding_transaction_generated`]: crate::ln::channelmanager::ChannelManager::funding_transaction_generated
                */
-               public final byte[] temporary_channel_id;
+               public final org.ldk.structs.ChannelId temporary_channel_id;
                /**
                 * The counterparty's node_id, which you'll need to pass back into
                 * [`ChannelManager::funding_transaction_generated`].
@@ -141,7 +141,10 @@ public class Event extends CommonBase {
                public final org.ldk.util.UInt128 user_channel_id;
                private FundingGenerationReady(long ptr, bindings.LDKEvent.FundingGenerationReady obj) {
                        super(null, ptr);
-                       this.temporary_channel_id = obj.temporary_channel_id;
+                       long temporary_channel_id = obj.temporary_channel_id;
+                       org.ldk.structs.ChannelId temporary_channel_id_hu_conv = null; if (temporary_channel_id < 0 || temporary_channel_id > 4096) { temporary_channel_id_hu_conv = new org.ldk.structs.ChannelId(null, temporary_channel_id); }
+                       if (temporary_channel_id_hu_conv != null) { temporary_channel_id_hu_conv.ptrs_to.add(this); };
+                       this.temporary_channel_id = temporary_channel_id_hu_conv;
                        this.counterparty_node_id = obj.counterparty_node_id;
                        this.channel_value_satoshis = obj.channel_value_satoshis;
                        this.output_script = obj.output_script;
@@ -242,8 +245,10 @@ public class Event extends CommonBase {
                public final org.ldk.structs.PaymentPurpose purpose;
                /**
                 * The `channel_id` indicating over which channel we received the payment.
+                * 
+                * Note that this (or a relevant inner pointer) may be NULL or all-0s to represent None
                */
-               public final org.ldk.structs.Option_ThirtyTwoBytesZ via_channel_id;
+               @Nullable public final org.ldk.structs.ChannelId via_channel_id;
                /**
                 * The `user_channel_id` indicating over which channel we received the payment.
                */
@@ -273,7 +278,7 @@ public class Event extends CommonBase {
                        if (purpose_hu_conv != null) { purpose_hu_conv.ptrs_to.add(this); };
                        this.purpose = purpose_hu_conv;
                        long via_channel_id = obj.via_channel_id;
-                       org.ldk.structs.Option_ThirtyTwoBytesZ via_channel_id_hu_conv = org.ldk.structs.Option_ThirtyTwoBytesZ.constr_from_ptr(via_channel_id);
+                       org.ldk.structs.ChannelId via_channel_id_hu_conv = null; if (via_channel_id < 0 || via_channel_id > 4096) { via_channel_id_hu_conv = new org.ldk.structs.ChannelId(null, via_channel_id); }
                        if (via_channel_id_hu_conv != null) { via_channel_id_hu_conv.ptrs_to.add(this); };
                        this.via_channel_id = via_channel_id_hu_conv;
                        long via_user_channel_id = obj.via_user_channel_id;
@@ -784,9 +789,15 @@ public class Event extends CommonBase {
        /**
         * Used to indicate that an output which you should know how to spend was confirmed on chain
         * and is now spendable.
-        * Such an output will *not* ever be spent by rust-lightning, and are not at risk of your
+        * 
+        * Such an output will *never* be spent directly by LDK, and are not at risk of your
         * counterparty spending them due to some kind of timeout. Thus, you need to store them
         * somewhere and spend them when you create on-chain transactions.
+        * 
+        * You may hand them to the [`OutputSweeper`] utility which will store and (re-)generate spending
+        * transactions for you.
+        * 
+        * [`OutputSweeper`]: crate::util::sweep::OutputSweeper
         */
        public final static class SpendableOutputs extends Event {
                /**
@@ -797,8 +808,10 @@ public class Event extends CommonBase {
                 * The `channel_id` indicating which channel the spendable outputs belong to.
                 * 
                 * This will always be `Some` for events generated by LDK versions 0.0.117 and above.
+                * 
+                * Note that this (or a relevant inner pointer) may be NULL or all-0s to represent None
                */
-               public final org.ldk.structs.Option_ThirtyTwoBytesZ channel_id;
+               @Nullable public final org.ldk.structs.ChannelId channel_id;
                private SpendableOutputs(long ptr, bindings.LDKEvent.SpendableOutputs obj) {
                        super(null, ptr);
                        long[] outputs = obj.outputs;
@@ -812,7 +825,7 @@ public class Event extends CommonBase {
                        }
                        this.outputs = outputs_conv_27_arr;
                        long channel_id = obj.channel_id;
-                       org.ldk.structs.Option_ThirtyTwoBytesZ channel_id_hu_conv = org.ldk.structs.Option_ThirtyTwoBytesZ.constr_from_ptr(channel_id);
+                       org.ldk.structs.ChannelId channel_id_hu_conv = null; if (channel_id < 0 || channel_id > 4096) { channel_id_hu_conv = new org.ldk.structs.ChannelId(null, channel_id); }
                        if (channel_id_hu_conv != null) { channel_id_hu_conv.ptrs_to.add(this); };
                        this.channel_id = channel_id_hu_conv;
                }
@@ -823,17 +836,37 @@ public class Event extends CommonBase {
         */
        public final static class PaymentForwarded extends Event {
                /**
-                * The incoming channel between the previous node and us. This is only `None` for events
-                * generated or serialized by versions prior to 0.0.107.
+                * The channel id of the incoming channel between the previous node and us.
+                * 
+                * This is only `None` for events generated or serialized by versions prior to 0.0.107.
+                * 
+                * Note that this (or a relevant inner pointer) may be NULL or all-0s to represent None
+               */
+               @Nullable public final org.ldk.structs.ChannelId prev_channel_id;
+               /**
+                * The channel id of the outgoing channel between the next node and us.
+                * 
+                * This is only `None` for events generated or serialized by versions prior to 0.0.107.
+                * 
+                * Note that this (or a relevant inner pointer) may be NULL or all-0s to represent None
+               */
+               @Nullable public final org.ldk.structs.ChannelId next_channel_id;
+               /**
+                * The `user_channel_id` of the incoming channel between the previous node and us.
+                * 
+                * This is only `None` for events generated or serialized by versions prior to 0.0.122.
                */
-               public final org.ldk.structs.Option_ThirtyTwoBytesZ prev_channel_id;
+               public final org.ldk.structs.Option_U128Z prev_user_channel_id;
                /**
-                * The outgoing channel between the next node and us. This is only `None` for events
-                * generated or serialized by versions prior to 0.0.107.
+                * The `user_channel_id` of the outgoing channel between the next node and us.
+                * 
+                * This will be `None` if the payment was settled via an on-chain transaction. See the
+                * caveat described for the `total_fee_earned_msat` field. Moreover it will be `None` for
+                * events generated or serialized by versions prior to 0.0.122.
                */
-               public final org.ldk.structs.Option_ThirtyTwoBytesZ next_channel_id;
+               public final org.ldk.structs.Option_U128Z next_user_channel_id;
                /**
-                * The fee, in milli-satoshis, which was earned as a result of the payment.
+                * The total fee, in milli-satoshis, which was earned as a result of the payment.
                 * 
                 * Note that if we force-closed the channel over which we forwarded an HTLC while the HTLC
                 * was pending, the amount the next hop claimed will have been rounded down to the nearest
@@ -844,10 +877,26 @@ public class Event extends CommonBase {
                 * If the channel which sent us the payment has been force-closed, we will claim the funds
                 * via an on-chain transaction. In that case we do not yet know the on-chain transaction
                 * fees which we will spend and will instead set this to `None`. It is possible duplicate
-                * `PaymentForwarded` events are generated for the same payment iff `fee_earned_msat` is
+                * `PaymentForwarded` events are generated for the same payment iff `total_fee_earned_msat` is
                 * `None`.
                */
-               public final org.ldk.structs.Option_u64Z fee_earned_msat;
+               public final org.ldk.structs.Option_u64Z total_fee_earned_msat;
+               /**
+                * The share of the total fee, in milli-satoshis, which was withheld in addition to the
+                * forwarding fee.
+                * 
+                * This will only be `Some` if we forwarded an intercepted HTLC with less than the
+                * expected amount. This means our counterparty accepted to receive less than the invoice
+                * amount, e.g., by claiming the payment featuring a corresponding
+                * [`PaymentClaimable::counterparty_skimmed_fee_msat`].
+                * 
+                * Will also always be `None` for events serialized with LDK prior to version 0.0.122.
+                * 
+                * The caveat described above the `total_fee_earned_msat` field applies here as well.
+                * 
+                * [`PaymentClaimable::counterparty_skimmed_fee_msat`]: Self::PaymentClaimable::counterparty_skimmed_fee_msat
+               */
+               public final org.ldk.structs.Option_u64Z skimmed_fee_msat;
                /**
                 * If this is `true`, the forwarded HTLC was claimed by our counterparty via an on-chain
                 * transaction.
@@ -856,23 +905,35 @@ public class Event extends CommonBase {
                /**
                 * The final amount forwarded, in milli-satoshis, after the fee is deducted.
                 * 
-                * The caveat described above the `fee_earned_msat` field applies here as well.
+                * The caveat described above the `total_fee_earned_msat` field applies here as well.
                */
                public final org.ldk.structs.Option_u64Z outbound_amount_forwarded_msat;
                private PaymentForwarded(long ptr, bindings.LDKEvent.PaymentForwarded obj) {
                        super(null, ptr);
                        long prev_channel_id = obj.prev_channel_id;
-                       org.ldk.structs.Option_ThirtyTwoBytesZ prev_channel_id_hu_conv = org.ldk.structs.Option_ThirtyTwoBytesZ.constr_from_ptr(prev_channel_id);
+                       org.ldk.structs.ChannelId prev_channel_id_hu_conv = null; if (prev_channel_id < 0 || prev_channel_id > 4096) { prev_channel_id_hu_conv = new org.ldk.structs.ChannelId(null, prev_channel_id); }
                        if (prev_channel_id_hu_conv != null) { prev_channel_id_hu_conv.ptrs_to.add(this); };
                        this.prev_channel_id = prev_channel_id_hu_conv;
                        long next_channel_id = obj.next_channel_id;
-                       org.ldk.structs.Option_ThirtyTwoBytesZ next_channel_id_hu_conv = org.ldk.structs.Option_ThirtyTwoBytesZ.constr_from_ptr(next_channel_id);
+                       org.ldk.structs.ChannelId next_channel_id_hu_conv = null; if (next_channel_id < 0 || next_channel_id > 4096) { next_channel_id_hu_conv = new org.ldk.structs.ChannelId(null, next_channel_id); }
                        if (next_channel_id_hu_conv != null) { next_channel_id_hu_conv.ptrs_to.add(this); };
                        this.next_channel_id = next_channel_id_hu_conv;
-                       long fee_earned_msat = obj.fee_earned_msat;
-                       org.ldk.structs.Option_u64Z fee_earned_msat_hu_conv = org.ldk.structs.Option_u64Z.constr_from_ptr(fee_earned_msat);
-                       if (fee_earned_msat_hu_conv != null) { fee_earned_msat_hu_conv.ptrs_to.add(this); };
-                       this.fee_earned_msat = fee_earned_msat_hu_conv;
+                       long prev_user_channel_id = obj.prev_user_channel_id;
+                       org.ldk.structs.Option_U128Z prev_user_channel_id_hu_conv = org.ldk.structs.Option_U128Z.constr_from_ptr(prev_user_channel_id);
+                       if (prev_user_channel_id_hu_conv != null) { prev_user_channel_id_hu_conv.ptrs_to.add(this); };
+                       this.prev_user_channel_id = prev_user_channel_id_hu_conv;
+                       long next_user_channel_id = obj.next_user_channel_id;
+                       org.ldk.structs.Option_U128Z next_user_channel_id_hu_conv = org.ldk.structs.Option_U128Z.constr_from_ptr(next_user_channel_id);
+                       if (next_user_channel_id_hu_conv != null) { next_user_channel_id_hu_conv.ptrs_to.add(this); };
+                       this.next_user_channel_id = next_user_channel_id_hu_conv;
+                       long total_fee_earned_msat = obj.total_fee_earned_msat;
+                       org.ldk.structs.Option_u64Z total_fee_earned_msat_hu_conv = org.ldk.structs.Option_u64Z.constr_from_ptr(total_fee_earned_msat);
+                       if (total_fee_earned_msat_hu_conv != null) { total_fee_earned_msat_hu_conv.ptrs_to.add(this); };
+                       this.total_fee_earned_msat = total_fee_earned_msat_hu_conv;
+                       long skimmed_fee_msat = obj.skimmed_fee_msat;
+                       org.ldk.structs.Option_u64Z skimmed_fee_msat_hu_conv = org.ldk.structs.Option_u64Z.constr_from_ptr(skimmed_fee_msat);
+                       if (skimmed_fee_msat_hu_conv != null) { skimmed_fee_msat_hu_conv.ptrs_to.add(this); };
+                       this.skimmed_fee_msat = skimmed_fee_msat_hu_conv;
                        this.claim_from_onchain_tx = obj.claim_from_onchain_tx;
                        long outbound_amount_forwarded_msat = obj.outbound_amount_forwarded_msat;
                        org.ldk.structs.Option_u64Z outbound_amount_forwarded_msat_hu_conv = org.ldk.structs.Option_u64Z.constr_from_ptr(outbound_amount_forwarded_msat);
@@ -892,7 +953,7 @@ public class Event extends CommonBase {
                /**
                 * The `channel_id` of the channel that is pending confirmation.
                */
-               public final byte[] channel_id;
+               public final org.ldk.structs.ChannelId channel_id;
                /**
                 * The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound
                 * channels, or to [`ChannelManager::accept_inbound_channel`] for inbound channels if
@@ -908,8 +969,10 @@ public class Event extends CommonBase {
                 * The `temporary_channel_id` this channel used to be known by during channel establishment.
                 * 
                 * Will be `None` for channels created prior to LDK version 0.0.115.
+                * 
+                * Note that this (or a relevant inner pointer) may be NULL or all-0s to represent None
                */
-               public final org.ldk.structs.Option_ThirtyTwoBytesZ former_temporary_channel_id;
+               @Nullable public final org.ldk.structs.ChannelId former_temporary_channel_id;
                /**
                 * The `node_id` of the channel counterparty.
                */
@@ -918,14 +981,25 @@ public class Event extends CommonBase {
                 * The outpoint of the channel's funding transaction.
                */
                public final org.ldk.structs.OutPoint funding_txo;
+               /**
+                * The features that this channel will operate with.
+                * 
+                * Will be `None` for channels created prior to LDK version 0.0.122.
+                * 
+                * Note that this (or a relevant inner pointer) may be NULL or all-0s to represent None
+               */
+               @Nullable public final org.ldk.structs.ChannelTypeFeatures channel_type;
                private ChannelPending(long ptr, bindings.LDKEvent.ChannelPending obj) {
                        super(null, ptr);
-                       this.channel_id = obj.channel_id;
+                       long channel_id = obj.channel_id;
+                       org.ldk.structs.ChannelId channel_id_hu_conv = null; if (channel_id < 0 || channel_id > 4096) { channel_id_hu_conv = new org.ldk.structs.ChannelId(null, channel_id); }
+                       if (channel_id_hu_conv != null) { channel_id_hu_conv.ptrs_to.add(this); };
+                       this.channel_id = channel_id_hu_conv;
                        byte[] user_channel_id = obj.user_channel_id;
                        org.ldk.util.UInt128 user_channel_id_conv = new org.ldk.util.UInt128(user_channel_id);
                        this.user_channel_id = user_channel_id_conv;
                        long former_temporary_channel_id = obj.former_temporary_channel_id;
-                       org.ldk.structs.Option_ThirtyTwoBytesZ former_temporary_channel_id_hu_conv = org.ldk.structs.Option_ThirtyTwoBytesZ.constr_from_ptr(former_temporary_channel_id);
+                       org.ldk.structs.ChannelId former_temporary_channel_id_hu_conv = null; if (former_temporary_channel_id < 0 || former_temporary_channel_id > 4096) { former_temporary_channel_id_hu_conv = new org.ldk.structs.ChannelId(null, former_temporary_channel_id); }
                        if (former_temporary_channel_id_hu_conv != null) { former_temporary_channel_id_hu_conv.ptrs_to.add(this); };
                        this.former_temporary_channel_id = former_temporary_channel_id_hu_conv;
                        this.counterparty_node_id = obj.counterparty_node_id;
@@ -933,6 +1007,10 @@ public class Event extends CommonBase {
                        org.ldk.structs.OutPoint funding_txo_hu_conv = null; if (funding_txo < 0 || funding_txo > 4096) { funding_txo_hu_conv = new org.ldk.structs.OutPoint(null, funding_txo); }
                        if (funding_txo_hu_conv != null) { funding_txo_hu_conv.ptrs_to.add(this); };
                        this.funding_txo = funding_txo_hu_conv;
+                       long channel_type = obj.channel_type;
+                       org.ldk.structs.ChannelTypeFeatures channel_type_hu_conv = null; if (channel_type < 0 || channel_type > 4096) { channel_type_hu_conv = new org.ldk.structs.ChannelTypeFeatures(null, channel_type); }
+                       if (channel_type_hu_conv != null) { channel_type_hu_conv.ptrs_to.add(this); };
+                       this.channel_type = channel_type_hu_conv;
                }
        }
        /**
@@ -945,7 +1023,7 @@ public class Event extends CommonBase {
                /**
                 * The `channel_id` of the channel that is ready.
                */
-               public final byte[] channel_id;
+               public final org.ldk.structs.ChannelId channel_id;
                /**
                 * The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound
                 * channels, or to [`ChannelManager::accept_inbound_channel`] for inbound channels if
@@ -967,7 +1045,10 @@ public class Event extends CommonBase {
                public final org.ldk.structs.ChannelTypeFeatures channel_type;
                private ChannelReady(long ptr, bindings.LDKEvent.ChannelReady obj) {
                        super(null, ptr);
-                       this.channel_id = obj.channel_id;
+                       long channel_id = obj.channel_id;
+                       org.ldk.structs.ChannelId channel_id_hu_conv = null; if (channel_id < 0 || channel_id > 4096) { channel_id_hu_conv = new org.ldk.structs.ChannelId(null, channel_id); }
+                       if (channel_id_hu_conv != null) { channel_id_hu_conv.ptrs_to.add(this); };
+                       this.channel_id = channel_id_hu_conv;
                        byte[] user_channel_id = obj.user_channel_id;
                        org.ldk.util.UInt128 user_channel_id_conv = new org.ldk.util.UInt128(user_channel_id);
                        this.user_channel_id = user_channel_id_conv;
@@ -979,8 +1060,8 @@ public class Event extends CommonBase {
                }
        }
        /**
-        * Used to indicate that a previously opened channel with the given `channel_id` is in the
-        * process of closure.
+        * Used to indicate that a channel that got past the initial handshake with the given `channel_id` is in the
+        * process of closure. This includes previously opened channels, and channels that time out from not being funded.
         * 
         * Note that this event is only triggered for accepted channels: if the
         * [`UserConfig::manually_accept_inbound_channels`] config flag is set to true and the channel is
@@ -994,7 +1075,7 @@ public class Event extends CommonBase {
                 * The `channel_id` of the channel which has been closed. Note that on-chain transactions
                 * resolving the channel are likely still awaiting confirmation.
                */
-               public final byte[] channel_id;
+               public final org.ldk.structs.ChannelId channel_id;
                /**
                 * The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound
                 * channels, or to [`ChannelManager::accept_inbound_channel`] for inbound channels if
@@ -1036,7 +1117,10 @@ public class Event extends CommonBase {
                @Nullable public final org.ldk.structs.OutPoint channel_funding_txo;
                private ChannelClosed(long ptr, bindings.LDKEvent.ChannelClosed obj) {
                        super(null, ptr);
-                       this.channel_id = obj.channel_id;
+                       long channel_id = obj.channel_id;
+                       org.ldk.structs.ChannelId channel_id_hu_conv = null; if (channel_id < 0 || channel_id > 4096) { channel_id_hu_conv = new org.ldk.structs.ChannelId(null, channel_id); }
+                       if (channel_id_hu_conv != null) { channel_id_hu_conv.ptrs_to.add(this); };
+                       this.channel_id = channel_id_hu_conv;
                        byte[] user_channel_id = obj.user_channel_id;
                        org.ldk.util.UInt128 user_channel_id_conv = new org.ldk.util.UInt128(user_channel_id);
                        this.user_channel_id = user_channel_id_conv;
@@ -1065,14 +1149,17 @@ public class Event extends CommonBase {
                /**
                 * The channel_id of the channel which has been closed.
                */
-               public final byte[] channel_id;
+               public final org.ldk.structs.ChannelId channel_id;
                /**
                 * The full transaction received from the user
                */
                public final byte[] transaction;
                private DiscardFunding(long ptr, bindings.LDKEvent.DiscardFunding obj) {
                        super(null, ptr);
-                       this.channel_id = obj.channel_id;
+                       long channel_id = obj.channel_id;
+                       org.ldk.structs.ChannelId channel_id_hu_conv = null; if (channel_id < 0 || channel_id > 4096) { channel_id_hu_conv = new org.ldk.structs.ChannelId(null, channel_id); }
+                       if (channel_id_hu_conv != null) { channel_id_hu_conv.ptrs_to.add(this); };
+                       this.channel_id = channel_id_hu_conv;
                        this.transaction = obj.transaction;
                }
        }
@@ -1101,7 +1188,7 @@ public class Event extends CommonBase {
                 * [`ChannelManager::accept_inbound_channel`]: crate::ln::channelmanager::ChannelManager::accept_inbound_channel
                 * [`ChannelManager::force_close_without_broadcasting_txn`]: crate::ln::channelmanager::ChannelManager::force_close_without_broadcasting_txn
                */
-               public final byte[] temporary_channel_id;
+               public final org.ldk.structs.ChannelId temporary_channel_id;
                /**
                 * The node_id of the counterparty requesting to open the channel.
                 * 
@@ -1142,7 +1229,10 @@ public class Event extends CommonBase {
                public final org.ldk.structs.ChannelTypeFeatures channel_type;
                private OpenChannelRequest(long ptr, bindings.LDKEvent.OpenChannelRequest obj) {
                        super(null, ptr);
-                       this.temporary_channel_id = obj.temporary_channel_id;
+                       long temporary_channel_id = obj.temporary_channel_id;
+                       org.ldk.structs.ChannelId temporary_channel_id_hu_conv = null; if (temporary_channel_id < 0 || temporary_channel_id > 4096) { temporary_channel_id_hu_conv = new org.ldk.structs.ChannelId(null, temporary_channel_id); }
+                       if (temporary_channel_id_hu_conv != null) { temporary_channel_id_hu_conv.ptrs_to.add(this); };
+                       this.temporary_channel_id = temporary_channel_id_hu_conv;
                        this.counterparty_node_id = obj.counterparty_node_id;
                        this.funding_satoshis = obj.funding_satoshis;
                        this.push_msat = obj.push_msat;
@@ -1170,14 +1260,17 @@ public class Event extends CommonBase {
                /**
                 * The channel over which the HTLC was received.
                */
-               public final byte[] prev_channel_id;
+               public final org.ldk.structs.ChannelId prev_channel_id;
                /**
                 * Destination of the HTLC that failed to be processed.
                */
                public final org.ldk.structs.HTLCDestination failed_next_destination;
                private HTLCHandlingFailed(long ptr, bindings.LDKEvent.HTLCHandlingFailed obj) {
                        super(null, ptr);
-                       this.prev_channel_id = obj.prev_channel_id;
+                       long prev_channel_id = obj.prev_channel_id;
+                       org.ldk.structs.ChannelId prev_channel_id_hu_conv = null; if (prev_channel_id < 0 || prev_channel_id > 4096) { prev_channel_id_hu_conv = new org.ldk.structs.ChannelId(null, prev_channel_id); }
+                       if (prev_channel_id_hu_conv != null) { prev_channel_id_hu_conv.ptrs_to.add(this); };
+                       this.prev_channel_id = prev_channel_id_hu_conv;
                        long failed_next_destination = obj.failed_next_destination;
                        org.ldk.structs.HTLCDestination failed_next_destination_hu_conv = org.ldk.structs.HTLCDestination.constr_from_ptr(failed_next_destination);
                        if (failed_next_destination_hu_conv != null) { failed_next_destination_hu_conv.ptrs_to.add(this); };
@@ -1225,8 +1318,8 @@ public class Event extends CommonBase {
        /**
         * Utility method to constructs a new FundingGenerationReady-variant Event
         */
-       public static Event funding_generation_ready(byte[] temporary_channel_id, byte[] counterparty_node_id, long channel_value_satoshis, byte[] output_script, org.ldk.util.UInt128 user_channel_id) {
-               long ret = bindings.Event_funding_generation_ready(InternalUtils.check_arr_len(temporary_channel_id, 32), InternalUtils.check_arr_len(counterparty_node_id, 33), channel_value_satoshis, output_script, user_channel_id.getLEBytes());
+       public static Event funding_generation_ready(org.ldk.structs.ChannelId temporary_channel_id, byte[] counterparty_node_id, long channel_value_satoshis, byte[] output_script, org.ldk.util.UInt128 user_channel_id) {
+               long ret = bindings.Event_funding_generation_ready(temporary_channel_id.ptr, InternalUtils.check_arr_len(counterparty_node_id, 33), channel_value_satoshis, output_script, user_channel_id.getLEBytes());
                Reference.reachabilityFence(temporary_channel_id);
                Reference.reachabilityFence(counterparty_node_id);
                Reference.reachabilityFence(channel_value_satoshis);
@@ -1235,14 +1328,15 @@ public class Event extends CommonBase {
                if (ret >= 0 && ret <= 4096) { return null; }
                org.ldk.structs.Event ret_hu_conv = org.ldk.structs.Event.constr_from_ptr(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(temporary_channel_id); };
                return ret_hu_conv;
        }
 
        /**
         * Utility method to constructs a new PaymentClaimable-variant Event
         */
-       public static Event payment_claimable(byte[] receiver_node_id, byte[] payment_hash, org.ldk.structs.RecipientOnionFields onion_fields, long amount_msat, long counterparty_skimmed_fee_msat, org.ldk.structs.PaymentPurpose purpose, org.ldk.structs.Option_ThirtyTwoBytesZ via_channel_id, org.ldk.structs.Option_U128Z via_user_channel_id, org.ldk.structs.Option_u32Z claim_deadline) {
-               long ret = bindings.Event_payment_claimable(InternalUtils.check_arr_len(receiver_node_id, 33), InternalUtils.check_arr_len(payment_hash, 32), onion_fields == null ? 0 : onion_fields.ptr, amount_msat, counterparty_skimmed_fee_msat, purpose.ptr, via_channel_id.ptr, via_user_channel_id.ptr, claim_deadline.ptr);
+       public static Event payment_claimable(byte[] receiver_node_id, byte[] payment_hash, org.ldk.structs.RecipientOnionFields onion_fields, long amount_msat, long counterparty_skimmed_fee_msat, org.ldk.structs.PaymentPurpose purpose, org.ldk.structs.ChannelId via_channel_id, org.ldk.structs.Option_U128Z via_user_channel_id, org.ldk.structs.Option_u32Z claim_deadline) {
+               long ret = bindings.Event_payment_claimable(InternalUtils.check_arr_len(receiver_node_id, 33), InternalUtils.check_arr_len(payment_hash, 32), onion_fields.ptr, amount_msat, counterparty_skimmed_fee_msat, purpose.ptr, via_channel_id.ptr, via_user_channel_id.ptr, claim_deadline.ptr);
                Reference.reachabilityFence(receiver_node_id);
                Reference.reachabilityFence(payment_hash);
                Reference.reachabilityFence(onion_fields);
@@ -1267,7 +1361,7 @@ public class Event extends CommonBase {
         * Utility method to constructs a new PaymentClaimed-variant Event
         */
        public static Event payment_claimed(byte[] receiver_node_id, byte[] payment_hash, long amount_msat, org.ldk.structs.PaymentPurpose purpose, ClaimedHTLC[] htlcs, org.ldk.structs.Option_u64Z sender_intended_total_msat) {
-               long ret = bindings.Event_payment_claimed(InternalUtils.check_arr_len(receiver_node_id, 33), InternalUtils.check_arr_len(payment_hash, 32), amount_msat, purpose.ptr, htlcs != null ? Arrays.stream(htlcs).mapToLong(htlcs_conv_13 -> htlcs_conv_13 == null ? 0 : htlcs_conv_13.ptr).toArray() : null, sender_intended_total_msat.ptr);
+               long ret = bindings.Event_payment_claimed(InternalUtils.check_arr_len(receiver_node_id, 33), InternalUtils.check_arr_len(payment_hash, 32), amount_msat, purpose.ptr, htlcs != null ? Arrays.stream(htlcs).mapToLong(htlcs_conv_13 -> htlcs_conv_13.ptr).toArray() : null, sender_intended_total_msat.ptr);
                Reference.reachabilityFence(receiver_node_id);
                Reference.reachabilityFence(payment_hash);
                Reference.reachabilityFence(amount_msat);
@@ -1345,7 +1439,7 @@ public class Event extends CommonBase {
         * Utility method to constructs a new PaymentPathSuccessful-variant Event
         */
        public static Event payment_path_successful(byte[] payment_id, org.ldk.structs.Option_ThirtyTwoBytesZ payment_hash, org.ldk.structs.Path path) {
-               long ret = bindings.Event_payment_path_successful(InternalUtils.check_arr_len(payment_id, 32), payment_hash.ptr, path == null ? 0 : path.ptr);
+               long ret = bindings.Event_payment_path_successful(InternalUtils.check_arr_len(payment_id, 32), payment_hash.ptr, path.ptr);
                Reference.reachabilityFence(payment_id);
                Reference.reachabilityFence(payment_hash);
                Reference.reachabilityFence(path);
@@ -1361,7 +1455,7 @@ public class Event extends CommonBase {
         * Utility method to constructs a new PaymentPathFailed-variant Event
         */
        public static Event payment_path_failed(org.ldk.structs.Option_ThirtyTwoBytesZ payment_id, byte[] payment_hash, boolean payment_failed_permanently, org.ldk.structs.PathFailure failure, org.ldk.structs.Path path, org.ldk.structs.Option_u64Z short_channel_id) {
-               long ret = bindings.Event_payment_path_failed(payment_id.ptr, InternalUtils.check_arr_len(payment_hash, 32), payment_failed_permanently, failure.ptr, path == null ? 0 : path.ptr, short_channel_id.ptr);
+               long ret = bindings.Event_payment_path_failed(payment_id.ptr, InternalUtils.check_arr_len(payment_hash, 32), payment_failed_permanently, failure.ptr, path.ptr, short_channel_id.ptr);
                Reference.reachabilityFence(payment_id);
                Reference.reachabilityFence(payment_hash);
                Reference.reachabilityFence(payment_failed_permanently);
@@ -1382,7 +1476,7 @@ public class Event extends CommonBase {
         * Utility method to constructs a new ProbeSuccessful-variant Event
         */
        public static Event probe_successful(byte[] payment_id, byte[] payment_hash, org.ldk.structs.Path path) {
-               long ret = bindings.Event_probe_successful(InternalUtils.check_arr_len(payment_id, 32), InternalUtils.check_arr_len(payment_hash, 32), path == null ? 0 : path.ptr);
+               long ret = bindings.Event_probe_successful(InternalUtils.check_arr_len(payment_id, 32), InternalUtils.check_arr_len(payment_hash, 32), path.ptr);
                Reference.reachabilityFence(payment_id);
                Reference.reachabilityFence(payment_hash);
                Reference.reachabilityFence(path);
@@ -1397,7 +1491,7 @@ public class Event extends CommonBase {
         * Utility method to constructs a new ProbeFailed-variant Event
         */
        public static Event probe_failed(byte[] payment_id, byte[] payment_hash, org.ldk.structs.Path path, org.ldk.structs.Option_u64Z short_channel_id) {
-               long ret = bindings.Event_probe_failed(InternalUtils.check_arr_len(payment_id, 32), InternalUtils.check_arr_len(payment_hash, 32), path == null ? 0 : path.ptr, short_channel_id.ptr);
+               long ret = bindings.Event_probe_failed(InternalUtils.check_arr_len(payment_id, 32), InternalUtils.check_arr_len(payment_hash, 32), path.ptr, short_channel_id.ptr);
                Reference.reachabilityFence(payment_id);
                Reference.reachabilityFence(payment_hash);
                Reference.reachabilityFence(path);
@@ -1441,7 +1535,7 @@ public class Event extends CommonBase {
        /**
         * Utility method to constructs a new SpendableOutputs-variant Event
         */
-       public static Event spendable_outputs(SpendableOutputDescriptor[] outputs, org.ldk.structs.Option_ThirtyTwoBytesZ channel_id) {
+       public static Event spendable_outputs(SpendableOutputDescriptor[] outputs, org.ldk.structs.ChannelId channel_id) {
                long ret = bindings.Event_spendable_outputs(outputs != null ? Arrays.stream(outputs).mapToLong(outputs_conv_27 -> outputs_conv_27.ptr).toArray() : null, channel_id.ptr);
                Reference.reachabilityFence(outputs);
                Reference.reachabilityFence(channel_id);
@@ -1456,11 +1550,14 @@ public class Event extends CommonBase {
        /**
         * Utility method to constructs a new PaymentForwarded-variant Event
         */
-       public static Event payment_forwarded(org.ldk.structs.Option_ThirtyTwoBytesZ prev_channel_id, org.ldk.structs.Option_ThirtyTwoBytesZ next_channel_id, org.ldk.structs.Option_u64Z fee_earned_msat, boolean claim_from_onchain_tx, org.ldk.structs.Option_u64Z outbound_amount_forwarded_msat) {
-               long ret = bindings.Event_payment_forwarded(prev_channel_id.ptr, next_channel_id.ptr, fee_earned_msat.ptr, claim_from_onchain_tx, outbound_amount_forwarded_msat.ptr);
+       public static Event payment_forwarded(org.ldk.structs.ChannelId prev_channel_id, org.ldk.structs.ChannelId next_channel_id, org.ldk.structs.Option_U128Z prev_user_channel_id, org.ldk.structs.Option_U128Z next_user_channel_id, org.ldk.structs.Option_u64Z total_fee_earned_msat, org.ldk.structs.Option_u64Z skimmed_fee_msat, boolean claim_from_onchain_tx, org.ldk.structs.Option_u64Z outbound_amount_forwarded_msat) {
+               long ret = bindings.Event_payment_forwarded(prev_channel_id.ptr, next_channel_id.ptr, prev_user_channel_id.ptr, next_user_channel_id.ptr, total_fee_earned_msat.ptr, skimmed_fee_msat.ptr, claim_from_onchain_tx, outbound_amount_forwarded_msat.ptr);
                Reference.reachabilityFence(prev_channel_id);
                Reference.reachabilityFence(next_channel_id);
-               Reference.reachabilityFence(fee_earned_msat);
+               Reference.reachabilityFence(prev_user_channel_id);
+               Reference.reachabilityFence(next_user_channel_id);
+               Reference.reachabilityFence(total_fee_earned_msat);
+               Reference.reachabilityFence(skimmed_fee_msat);
                Reference.reachabilityFence(claim_from_onchain_tx);
                Reference.reachabilityFence(outbound_amount_forwarded_msat);
                if (ret >= 0 && ret <= 4096) { return null; }
@@ -1468,7 +1565,10 @@ public class Event extends CommonBase {
                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(prev_channel_id); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(next_channel_id); };
-               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(fee_earned_msat); };
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(prev_user_channel_id); };
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(next_user_channel_id); };
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(total_fee_earned_msat); };
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(skimmed_fee_msat); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(outbound_amount_forwarded_msat); };
                return ret_hu_conv;
        }
@@ -1476,26 +1576,29 @@ public class Event extends CommonBase {
        /**
         * Utility method to constructs a new ChannelPending-variant Event
         */
-       public static Event channel_pending(byte[] channel_id, org.ldk.util.UInt128 user_channel_id, org.ldk.structs.Option_ThirtyTwoBytesZ former_temporary_channel_id, byte[] counterparty_node_id, org.ldk.structs.OutPoint funding_txo) {
-               long ret = bindings.Event_channel_pending(InternalUtils.check_arr_len(channel_id, 32), user_channel_id.getLEBytes(), former_temporary_channel_id.ptr, InternalUtils.check_arr_len(counterparty_node_id, 33), funding_txo == null ? 0 : funding_txo.ptr);
+       public static Event channel_pending(org.ldk.structs.ChannelId channel_id, org.ldk.util.UInt128 user_channel_id, org.ldk.structs.ChannelId former_temporary_channel_id, byte[] counterparty_node_id, org.ldk.structs.OutPoint funding_txo, org.ldk.structs.ChannelTypeFeatures channel_type) {
+               long ret = bindings.Event_channel_pending(channel_id.ptr, user_channel_id.getLEBytes(), former_temporary_channel_id.ptr, InternalUtils.check_arr_len(counterparty_node_id, 33), funding_txo.ptr, channel_type.ptr);
                Reference.reachabilityFence(channel_id);
                Reference.reachabilityFence(user_channel_id);
                Reference.reachabilityFence(former_temporary_channel_id);
                Reference.reachabilityFence(counterparty_node_id);
                Reference.reachabilityFence(funding_txo);
+               Reference.reachabilityFence(channel_type);
                if (ret >= 0 && ret <= 4096) { return null; }
                org.ldk.structs.Event ret_hu_conv = org.ldk.structs.Event.constr_from_ptr(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(channel_id); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(former_temporary_channel_id); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(funding_txo); };
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(channel_type); };
                return ret_hu_conv;
        }
 
        /**
         * Utility method to constructs a new ChannelReady-variant Event
         */
-       public static Event channel_ready(byte[] channel_id, org.ldk.util.UInt128 user_channel_id, byte[] counterparty_node_id, org.ldk.structs.ChannelTypeFeatures channel_type) {
-               long ret = bindings.Event_channel_ready(InternalUtils.check_arr_len(channel_id, 32), user_channel_id.getLEBytes(), InternalUtils.check_arr_len(counterparty_node_id, 33), channel_type == null ? 0 : channel_type.ptr);
+       public static Event channel_ready(org.ldk.structs.ChannelId channel_id, org.ldk.util.UInt128 user_channel_id, byte[] counterparty_node_id, org.ldk.structs.ChannelTypeFeatures channel_type) {
+               long ret = bindings.Event_channel_ready(channel_id.ptr, user_channel_id.getLEBytes(), InternalUtils.check_arr_len(counterparty_node_id, 33), channel_type.ptr);
                Reference.reachabilityFence(channel_id);
                Reference.reachabilityFence(user_channel_id);
                Reference.reachabilityFence(counterparty_node_id);
@@ -1503,6 +1606,7 @@ public class Event extends CommonBase {
                if (ret >= 0 && ret <= 4096) { return null; }
                org.ldk.structs.Event ret_hu_conv = org.ldk.structs.Event.constr_from_ptr(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(channel_id); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(channel_type); };
                return ret_hu_conv;
        }
@@ -1510,8 +1614,8 @@ public class Event extends CommonBase {
        /**
         * Utility method to constructs a new ChannelClosed-variant Event
         */
-       public static Event channel_closed(byte[] channel_id, org.ldk.util.UInt128 user_channel_id, org.ldk.structs.ClosureReason reason, byte[] counterparty_node_id, org.ldk.structs.Option_u64Z channel_capacity_sats, org.ldk.structs.OutPoint channel_funding_txo) {
-               long ret = bindings.Event_channel_closed(InternalUtils.check_arr_len(channel_id, 32), user_channel_id.getLEBytes(), reason.ptr, InternalUtils.check_arr_len(counterparty_node_id, 33), channel_capacity_sats.ptr, channel_funding_txo == null ? 0 : channel_funding_txo.ptr);
+       public static Event channel_closed(org.ldk.structs.ChannelId channel_id, org.ldk.util.UInt128 user_channel_id, org.ldk.structs.ClosureReason reason, byte[] counterparty_node_id, org.ldk.structs.Option_u64Z channel_capacity_sats, org.ldk.structs.OutPoint channel_funding_txo) {
+               long ret = bindings.Event_channel_closed(channel_id.ptr, user_channel_id.getLEBytes(), reason.ptr, InternalUtils.check_arr_len(counterparty_node_id, 33), channel_capacity_sats.ptr, channel_funding_txo.ptr);
                Reference.reachabilityFence(channel_id);
                Reference.reachabilityFence(user_channel_id);
                Reference.reachabilityFence(reason);
@@ -1521,6 +1625,7 @@ public class Event extends CommonBase {
                if (ret >= 0 && ret <= 4096) { return null; }
                org.ldk.structs.Event ret_hu_conv = org.ldk.structs.Event.constr_from_ptr(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(channel_id); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(reason); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(channel_capacity_sats); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(channel_funding_txo); };
@@ -1530,21 +1635,22 @@ public class Event extends CommonBase {
        /**
         * Utility method to constructs a new DiscardFunding-variant Event
         */
-       public static Event discard_funding(byte[] channel_id, byte[] transaction) {
-               long ret = bindings.Event_discard_funding(InternalUtils.check_arr_len(channel_id, 32), transaction);
+       public static Event discard_funding(org.ldk.structs.ChannelId channel_id, byte[] transaction) {
+               long ret = bindings.Event_discard_funding(channel_id.ptr, transaction);
                Reference.reachabilityFence(channel_id);
                Reference.reachabilityFence(transaction);
                if (ret >= 0 && ret <= 4096) { return null; }
                org.ldk.structs.Event ret_hu_conv = org.ldk.structs.Event.constr_from_ptr(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(channel_id); };
                return ret_hu_conv;
        }
 
        /**
         * Utility method to constructs a new OpenChannelRequest-variant Event
         */
-       public static Event open_channel_request(byte[] temporary_channel_id, byte[] counterparty_node_id, long funding_satoshis, long push_msat, org.ldk.structs.ChannelTypeFeatures channel_type) {
-               long ret = bindings.Event_open_channel_request(InternalUtils.check_arr_len(temporary_channel_id, 32), InternalUtils.check_arr_len(counterparty_node_id, 33), funding_satoshis, push_msat, channel_type == null ? 0 : channel_type.ptr);
+       public static Event open_channel_request(org.ldk.structs.ChannelId temporary_channel_id, byte[] counterparty_node_id, long funding_satoshis, long push_msat, org.ldk.structs.ChannelTypeFeatures channel_type) {
+               long ret = bindings.Event_open_channel_request(temporary_channel_id.ptr, InternalUtils.check_arr_len(counterparty_node_id, 33), funding_satoshis, push_msat, channel_type.ptr);
                Reference.reachabilityFence(temporary_channel_id);
                Reference.reachabilityFence(counterparty_node_id);
                Reference.reachabilityFence(funding_satoshis);
@@ -1553,6 +1659,7 @@ public class Event extends CommonBase {
                if (ret >= 0 && ret <= 4096) { return null; }
                org.ldk.structs.Event ret_hu_conv = org.ldk.structs.Event.constr_from_ptr(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(temporary_channel_id); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(channel_type); };
                return ret_hu_conv;
        }
@@ -1560,13 +1667,14 @@ public class Event extends CommonBase {
        /**
         * Utility method to constructs a new HTLCHandlingFailed-variant Event
         */
-       public static Event htlchandling_failed(byte[] prev_channel_id, org.ldk.structs.HTLCDestination failed_next_destination) {
-               long ret = bindings.Event_htlchandling_failed(InternalUtils.check_arr_len(prev_channel_id, 32), failed_next_destination.ptr);
+       public static Event htlchandling_failed(org.ldk.structs.ChannelId prev_channel_id, org.ldk.structs.HTLCDestination failed_next_destination) {
+               long ret = bindings.Event_htlchandling_failed(prev_channel_id.ptr, failed_next_destination.ptr);
                Reference.reachabilityFence(prev_channel_id);
                Reference.reachabilityFence(failed_next_destination);
                if (ret >= 0 && ret <= 4096) { return null; }
                org.ldk.structs.Event ret_hu_conv = org.ldk.structs.Event.constr_from_ptr(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(prev_channel_id); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(failed_next_destination); };
                return ret_hu_conv;
        }
@@ -1589,7 +1697,7 @@ public class Event extends CommonBase {
         * This ignores pointers and is_owned flags and looks at the values in fields.
         */
        public boolean eq(org.ldk.structs.Event b) {
-               boolean ret = bindings.Event_eq(this.ptr, b == null ? 0 : b.ptr);
+               boolean ret = bindings.Event_eq(this.ptr, b.ptr);
                Reference.reachabilityFence(this);
                Reference.reachabilityFence(b);
                return ret;