[Java] Update auto-generated bindings to 0.0.115
[ldk-java] / src / main / java / org / ldk / structs / ChannelManager.java
index 902b633b0253649e19af459127c7eba80385c460..dd34eb87ba0fee76d55749092c825019f64f6977 100644 (file)
@@ -12,39 +12,55 @@ import javax.annotation.Nullable;
  * Manager which keeps track of a number of channels and sends messages to the appropriate
  * channel, also tracking HTLC preimages and forwarding onion packets appropriately.
  * 
- * Implements ChannelMessageHandler, handling the multi-channel parts and passing things through
+ * Implements [`ChannelMessageHandler`], handling the multi-channel parts and passing things through
  * to individual Channels.
  * 
- * Implements Writeable to write out all channel state to disk. Implies peer_disconnected() for
+ * Implements [`Writeable`] to write out all channel state to disk. Implies [`peer_disconnected`] for
  * all peers during write/read (though does not modify this instance, only the instance being
- * serialized). This will result in any channels which have not yet exchanged funding_created (ie
- * called funding_transaction_generated for outbound channels).
+ * serialized). This will result in any channels which have not yet exchanged [`funding_created`] (i.e.,
+ * called [`funding_transaction_generated`] for outbound channels) being closed.
  * 
- * Note that you can be a bit lazier about writing out ChannelManager than you can be with
- * ChannelMonitors. With ChannelMonitors you MUST write each monitor update out to disk before
- * returning from chain::Watch::watch_/update_channel, with ChannelManagers, writing updates
- * happens out-of-band (and will prevent any other ChannelManager operations from occurring during
+ * Note that you can be a bit lazier about writing out `ChannelManager` than you can be with
+ * [`ChannelMonitor`]. With [`ChannelMonitor`] you MUST write each monitor update out to disk before
+ * returning from [`chain::Watch::watch_channel`]/[`update_channel`], with ChannelManagers, writing updates
+ * happens out-of-band (and will prevent any other `ChannelManager` operations from occurring during
  * the serialization process). If the deserialized version is out-of-date compared to the
- * ChannelMonitors passed by reference to read(), those channels will be force-closed based on the
- * ChannelMonitor state and no funds will be lost (mod on-chain transaction fees).
+ * [`ChannelMonitor`] passed by reference to [`read`], those channels will be force-closed based on the
+ * `ChannelMonitor` state and no funds will be lost (mod on-chain transaction fees).
  * 
- * Note that the deserializer is only implemented for (BlockHash, ChannelManager), which
- * tells you the last block hash which was block_connect()ed. You MUST rescan any blocks along
- * the \"reorg path\" (ie call block_disconnected() until you get to a common block and then call
- * block_connected() to step towards your best block) upon deserialization before using the
- * object!
+ * Note that the deserializer is only implemented for `(`[`BlockHash`]`, `[`ChannelManager`]`)`, which
+ * tells you the last block hash which was connected. You should get the best block tip before using the manager.
+ * See [`chain::Listen`] and [`chain::Confirm`] for more details.
  * 
- * Note that ChannelManager is responsible for tracking liveness of its channels and generating
- * ChannelUpdate messages informing peers that the channel is temporarily disabled. To avoid
+ * Note that `ChannelManager` is responsible for tracking liveness of its channels and generating
+ * [`ChannelUpdate`] messages informing peers that the channel is temporarily disabled. To avoid
  * spam due to quick disconnection/reconnection, updates are not sent until the channel has been
  * offline for a full minute. In order to track this, you must call
- * timer_tick_occurred roughly once per minute, though it doesn't have to be perfect.
+ * [`timer_tick_occurred`] roughly once per minute, though it doesn't have to be perfect.
  * 
- * Rather than using a plain ChannelManager, it is preferable to use either a SimpleArcChannelManager
- * a SimpleRefChannelManager, for conciseness. See their documentation for more details, but
- * essentially you should default to using a SimpleRefChannelManager, and use a
- * SimpleArcChannelManager when you require a ChannelManager with a static lifetime, such as when
+ * To avoid trivial DoS issues, `ChannelManager` limits the number of inbound connections and
+ * inbound channels without confirmed funding transactions. This may result in nodes which we do
+ * not have a channel with being unable to connect to us or open new channels with us if we have
+ * many peers with unfunded channels.
+ * 
+ * Because it is an indication of trust, inbound channels which we've accepted as 0conf are
+ * exempted from the count of unfunded channels. Similarly, outbound channels and connections are
+ * never limited. Please ensure you limit the count of such channels yourself.
+ * 
+ * Rather than using a plain `ChannelManager`, it is preferable to use either a [`SimpleArcChannelManager`]
+ * a [`SimpleRefChannelManager`], for conciseness. See their documentation for more details, but
+ * essentially you should default to using a [`SimpleRefChannelManager`], and use a
+ * [`SimpleArcChannelManager`] when you require a `ChannelManager` with a static lifetime, such as when
  * you're using lightning-net-tokio.
+ * 
+ * [`peer_disconnected`]: msgs::ChannelMessageHandler::peer_disconnected
+ * [`funding_created`]: msgs::FundingCreated
+ * [`funding_transaction_generated`]: Self::funding_transaction_generated
+ * [`BlockHash`]: bitcoin::hash_types::BlockHash
+ * [`update_channel`]: chain::Watch::update_channel
+ * [`ChannelUpdate`]: msgs::ChannelUpdate
+ * [`timer_tick_occurred`]: Self::timer_tick_occurred
+ * [`read`]: ReadableArgs::read
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class ChannelManager extends CommonBase {
@@ -56,24 +72,32 @@ public class ChannelManager extends CommonBase {
        }
 
        /**
-        * Constructs a new ChannelManager to hold several channels and route between them.
+        * Constructs a new `ChannelManager` to hold several channels and route between them.
         * 
         * This is the main \"logic hub\" for all channel-related actions, and implements
-        * ChannelMessageHandler.
+        * [`ChannelMessageHandler`].
         * 
         * Non-proportional fees are fixed according to our risk using the provided fee estimator.
         * 
-        * Users need to notify the new ChannelManager when a new block is connected or
-        * disconnected using its `block_connected` and `block_disconnected` methods, starting
-        * from after `params.latest_hash`.
+        * Users need to notify the new `ChannelManager` when a new block is connected or
+        * disconnected using its [`block_connected`] and [`block_disconnected`] methods, starting
+        * from after [`params.best_block.block_hash`]. See [`chain::Listen`] and [`chain::Confirm`] for
+        * more details.
+        * 
+        * [`block_connected`]: chain::Listen::block_connected
+        * [`block_disconnected`]: chain::Listen::block_disconnected
+        * [`params.best_block.block_hash`]: chain::BestBlock::block_hash
         */
-       public static ChannelManager of(org.ldk.structs.FeeEstimator fee_est, org.ldk.structs.Watch chain_monitor, org.ldk.structs.BroadcasterInterface tx_broadcaster, org.ldk.structs.Logger logger, org.ldk.structs.KeysInterface keys_manager, org.ldk.structs.UserConfig config, org.ldk.structs.ChainParameters params) {
-               long ret = bindings.ChannelManager_new(fee_est == null ? 0 : fee_est.ptr, chain_monitor == null ? 0 : chain_monitor.ptr, tx_broadcaster == null ? 0 : tx_broadcaster.ptr, logger == null ? 0 : logger.ptr, keys_manager == null ? 0 : keys_manager.ptr, config == null ? 0 : config.ptr, params == null ? 0 : params.ptr);
+       public static ChannelManager of(org.ldk.structs.FeeEstimator fee_est, org.ldk.structs.Watch chain_monitor, org.ldk.structs.BroadcasterInterface tx_broadcaster, org.ldk.structs.Router router, org.ldk.structs.Logger logger, org.ldk.structs.EntropySource entropy_source, org.ldk.structs.NodeSigner node_signer, org.ldk.structs.SignerProvider signer_provider, org.ldk.structs.UserConfig config, org.ldk.structs.ChainParameters params) {
+               long ret = bindings.ChannelManager_new(fee_est == null ? 0 : fee_est.ptr, chain_monitor == null ? 0 : chain_monitor.ptr, tx_broadcaster == null ? 0 : tx_broadcaster.ptr, router == null ? 0 : router.ptr, logger == null ? 0 : logger.ptr, entropy_source == null ? 0 : entropy_source.ptr, node_signer == null ? 0 : node_signer.ptr, signer_provider == null ? 0 : signer_provider.ptr, config == null ? 0 : config.ptr, params == null ? 0 : params.ptr);
                Reference.reachabilityFence(fee_est);
                Reference.reachabilityFence(chain_monitor);
                Reference.reachabilityFence(tx_broadcaster);
+               Reference.reachabilityFence(router);
                Reference.reachabilityFence(logger);
-               Reference.reachabilityFence(keys_manager);
+               Reference.reachabilityFence(entropy_source);
+               Reference.reachabilityFence(node_signer);
+               Reference.reachabilityFence(signer_provider);
                Reference.reachabilityFence(config);
                Reference.reachabilityFence(params);
                if (ret >= 0 && ret <= 4096) { return null; }
@@ -82,8 +106,11 @@ public class ChannelManager extends CommonBase {
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(fee_est); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(chain_monitor); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(tx_broadcaster); };
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(router); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(logger); };
-               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(keys_manager); };
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(entropy_source); };
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(node_signer); };
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(signer_provider); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(config); };
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(params); };
                return ret_hu_conv;
@@ -145,7 +172,7 @@ public class ChannelManager extends CommonBase {
        }
 
        /**
-        * Gets the list of open channels, in random order. See ChannelDetail field documentation for
+        * Gets the list of open channels, in random order. See [`ChannelDetails`] field documentation for
         * more information.
         */
        public ChannelDetails[] list_channels() {
@@ -163,14 +190,12 @@ public class ChannelManager extends CommonBase {
        }
 
        /**
-        * Gets the list of usable channels, in random order. Useful as an argument to [`find_route`]
-        * to ensure non-announced channels are used.
+        * Gets the list of usable channels, in random order. Useful as an argument to
+        * [`Router::find_route`] to ensure non-announced channels are used.
         * 
         * These are guaranteed to have their [`ChannelDetails::is_usable`] value set to true, see the
         * documentation for [`ChannelDetails::is_usable`] for more info on exactly what the criteria
         * are.
-        * 
-        * [`find_route`]: crate::routing::router::find_route
         */
        public ChannelDetails[] list_usable_channels() {
                long[] ret = bindings.ChannelManager_list_usable_channels(this.ptr);
@@ -186,6 +211,48 @@ public class ChannelManager extends CommonBase {
                return ret_conv_16_arr;
        }
 
+       /**
+        * Gets the list of channels we have with a given counterparty, in random order.
+        */
+       public ChannelDetails[] list_channels_with_counterparty(byte[] counterparty_node_id) {
+               long[] ret = bindings.ChannelManager_list_channels_with_counterparty(this.ptr, InternalUtils.check_arr_len(counterparty_node_id, 33));
+               Reference.reachabilityFence(this);
+               Reference.reachabilityFence(counterparty_node_id);
+               int ret_conv_16_len = ret.length;
+               ChannelDetails[] ret_conv_16_arr = new ChannelDetails[ret_conv_16_len];
+               for (int q = 0; q < ret_conv_16_len; q++) {
+                       long ret_conv_16 = ret[q];
+                       org.ldk.structs.ChannelDetails ret_conv_16_hu_conv = null; if (ret_conv_16 < 0 || ret_conv_16 > 4096) { ret_conv_16_hu_conv = new org.ldk.structs.ChannelDetails(null, ret_conv_16); }
+                       if (ret_conv_16_hu_conv != null) { ret_conv_16_hu_conv.ptrs_to.add(this); };
+                       ret_conv_16_arr[q] = ret_conv_16_hu_conv;
+               }
+               return ret_conv_16_arr;
+       }
+
+       /**
+        * Returns in an undefined order recent payments that -- if not fulfilled -- have yet to find a
+        * successful path, or have unresolved HTLCs.
+        * 
+        * This can be useful for payments that may have been prepared, but ultimately not sent, as a
+        * result of a crash. If such a payment exists, is not listed here, and an
+        * [`Event::PaymentSent`] has not been received, you may consider resending the payment.
+        * 
+        * [`Event::PaymentSent`]: events::Event::PaymentSent
+        */
+       public RecentPaymentDetails[] list_recent_payments() {
+               long[] ret = bindings.ChannelManager_list_recent_payments(this.ptr);
+               Reference.reachabilityFence(this);
+               int ret_conv_22_len = ret.length;
+               RecentPaymentDetails[] ret_conv_22_arr = new RecentPaymentDetails[ret_conv_22_len];
+               for (int w = 0; w < ret_conv_22_len; w++) {
+                       long ret_conv_22 = ret[w];
+                       org.ldk.structs.RecentPaymentDetails ret_conv_22_hu_conv = org.ldk.structs.RecentPaymentDetails.constr_from_ptr(ret_conv_22);
+                       if (ret_conv_22_hu_conv != null) { ret_conv_22_hu_conv.ptrs_to.add(this); };
+                       ret_conv_22_arr[w] = ret_conv_22_hu_conv;
+               }
+               return ret_conv_22_arr;
+       }
+
        /**
         * Begins the process of closing a channel. After this call (plus some timeout), no new HTLCs
         * will be accepted on the given channel, and after additional timeout/the closing of all
@@ -199,11 +266,12 @@ public class ChannelManager extends CommonBase {
         * would appear on a force-closure transaction, whichever is lower. We will allow our
         * counterparty to pay as much fee as they'd like, however.
         * 
-        * May generate a SendShutdown message event on success, which should be relayed.
+        * May generate a [`SendShutdown`] message event on success, which should be relayed.
         * 
         * [`ChannelConfig::force_close_avoidance_max_fee_satoshis`]: crate::util::config::ChannelConfig::force_close_avoidance_max_fee_satoshis
         * [`Background`]: crate::chain::chaininterface::ConfirmationTarget::Background
         * [`Normal`]: crate::chain::chaininterface::ConfirmationTarget::Normal
+        * [`SendShutdown`]: crate::events::MessageSendEvent::SendShutdown
         */
        public Result_NoneAPIErrorZ close_channel(byte[] channel_id, byte[] counterparty_node_id) {
                long ret = bindings.ChannelManager_close_channel(this.ptr, InternalUtils.check_arr_len(channel_id, 32), InternalUtils.check_arr_len(counterparty_node_id, 33));
@@ -230,11 +298,12 @@ public class ChannelManager extends CommonBase {
         * transaction feerate below `target_feerate_sat_per_1000_weight` (or the feerate which
         * will appear on a force-closure transaction, whichever is lower).
         * 
-        * May generate a SendShutdown message event on success, which should be relayed.
+        * May generate a [`SendShutdown`] message event on success, which should be relayed.
         * 
         * [`ChannelConfig::force_close_avoidance_max_fee_satoshis`]: crate::util::config::ChannelConfig::force_close_avoidance_max_fee_satoshis
         * [`Background`]: crate::chain::chaininterface::ConfirmationTarget::Background
         * [`Normal`]: crate::chain::chaininterface::ConfirmationTarget::Normal
+        * [`SendShutdown`]: crate::events::MessageSendEvent::SendShutdown
         */
        public Result_NoneAPIErrorZ close_channel_with_target_feerate(byte[] channel_id, byte[] counterparty_node_id, int target_feerate_sats_per_1000_weight) {
                long ret = bindings.ChannelManager_close_channel_with_target_feerate(this.ptr, InternalUtils.check_arr_len(channel_id, 32), InternalUtils.check_arr_len(counterparty_node_id, 33), target_feerate_sats_per_1000_weight);
@@ -302,14 +371,19 @@ public class ChannelManager extends CommonBase {
        /**
         * Sends a payment along a given route.
         * 
-        * Value parameters are provided via the last hop in route, see documentation for RouteHop
+        * Value parameters are provided via the last hop in route, see documentation for [`RouteHop`]
         * fields for more info.
         * 
+        * May generate [`UpdateHTLCs`] message(s) event on success, which should be relayed (e.g. via
+        * [`PeerManager::process_events`]).
+        * 
+        * # Avoiding Duplicate Payments
+        * 
         * If a pending payment is currently in-flight with the same [`PaymentId`] provided, this
         * method will error with an [`APIError::InvalidRoute`]. Note, however, that once a payment
         * is no longer pending (either via [`ChannelManager::abandon_payment`], or handling of an
-        * [`Event::PaymentSent`]) LDK will not stop you from sending a second payment with the same
-        * [`PaymentId`].
+        * [`Event::PaymentSent`] or [`Event::PaymentFailed`]) LDK will not stop you from sending a
+        * second payment with the same [`PaymentId`].
         * 
         * Thus, in order to ensure duplicate payments are not sent, you should implement your own
         * tracking of payments, including state to indicate once a payment has completed. Because you
@@ -317,12 +391,16 @@ public class ChannelManager extends CommonBase {
         * consider using the [`PaymentHash`] as the key for tracking payments. In that case, the
         * [`PaymentId`] should be a copy of the [`PaymentHash`] bytes.
         * 
-        * May generate SendHTLCs message(s) event on success, which should be relayed (e.g. via
-        * [`PeerManager::process_events`]).
+        * Additionally, in the scenario where we begin the process of sending a payment, but crash
+        * before `send_payment` returns (or prior to [`ChannelMonitorUpdate`] persistence if you're
+        * using [`ChannelMonitorUpdateStatus::InProgress`]), the payment may be lost on restart. See
+        * [`ChannelManager::list_recent_payments`] for more information.
+        * 
+        * # Possible Error States on [`PaymentSendFailure`]
         * 
-        * Each path may have a different return value, and PaymentSendValue may return a Vec with
+        * Each path may have a different return value, and [`PaymentSendFailure`] may return a `Vec` with
         * each entry matching the corresponding-index entry in the route paths, see
-        * PaymentSendFailure for more info.
+        * [`PaymentSendFailure`] for more info.
         * 
         * In general, a path may raise:
         * [`APIError::InvalidRoute`] when an invalid route or forwarding parameter (cltv_delta, fee,
@@ -333,80 +411,65 @@ public class ChannelManager extends CommonBase {
         * [`APIError::MonitorUpdateInProgress`] if a new monitor update failure prevented sending the
         * relevant updates.
         * 
-        * Note that depending on the type of the PaymentSendFailure the HTLC may have been
+        * Note that depending on the type of the [`PaymentSendFailure`] the HTLC may have been
         * irrevocably committed to on our end. In such a case, do NOT retry the payment with a
         * different route unless you intend to pay twice!
         * 
-        * payment_secret is unrelated to payment_hash (or PaymentPreimage) and exists to authenticate
-        * the sender to the recipient and prevent payment-probing (deanonymization) attacks. For
-        * newer nodes, it will be provided to you in the invoice. If you do not have one, the Route
-        * must not contain multiple paths as multi-path payments require a recipient-provided
-        * payment_secret.
-        * 
-        * If a payment_secret *is* provided, we assume that the invoice had the payment_secret feature
-        * bit set (either as required or as available). If multiple paths are present in the Route,
-        * we assume the invoice had the basic_mpp feature set.
-        * 
         * [`Event::PaymentSent`]: events::Event::PaymentSent
+        * [`Event::PaymentFailed`]: events::Event::PaymentFailed
+        * [`UpdateHTLCs`]: events::MessageSendEvent::UpdateHTLCs
         * [`PeerManager::process_events`]: crate::ln::peer_handler::PeerManager::process_events
-        * 
-        * Note that payment_secret (or a relevant inner pointer) may be NULL or all-0s to represent None
+        * [`ChannelMonitorUpdateStatus::InProgress`]: crate::chain::ChannelMonitorUpdateStatus::InProgress
         */
-       public Result_NonePaymentSendFailureZ send_payment(org.ldk.structs.Route route, byte[] payment_hash, @Nullable byte[] payment_secret, byte[] payment_id) {
-               long ret = bindings.ChannelManager_send_payment(this.ptr, route == null ? 0 : route.ptr, InternalUtils.check_arr_len(payment_hash, 32), InternalUtils.check_arr_len(payment_secret, 32), InternalUtils.check_arr_len(payment_id, 32));
+       public Result_NonePaymentSendFailureZ send_payment_with_route(org.ldk.structs.Route route, byte[] payment_hash, org.ldk.structs.RecipientOnionFields recipient_onion, byte[] payment_id) {
+               long ret = bindings.ChannelManager_send_payment_with_route(this.ptr, route == null ? 0 : route.ptr, InternalUtils.check_arr_len(payment_hash, 32), recipient_onion == null ? 0 : recipient_onion.ptr, InternalUtils.check_arr_len(payment_id, 32));
                Reference.reachabilityFence(this);
                Reference.reachabilityFence(route);
                Reference.reachabilityFence(payment_hash);
-               Reference.reachabilityFence(payment_secret);
+               Reference.reachabilityFence(recipient_onion);
                Reference.reachabilityFence(payment_id);
                if (ret >= 0 && ret <= 4096) { return null; }
                Result_NonePaymentSendFailureZ ret_hu_conv = Result_NonePaymentSendFailureZ.constr_from_ptr(ret);
                if (this != null) { this.ptrs_to.add(route); };
+               if (this != null) { this.ptrs_to.add(recipient_onion); };
                return ret_hu_conv;
        }
 
        /**
-        * Retries a payment along the given [`Route`].
-        * 
-        * Errors returned are a superset of those returned from [`send_payment`], so see
-        * [`send_payment`] documentation for more details on errors. This method will also error if the
-        * retry amount puts the payment more than 10% over the payment's total amount, if the payment
-        * for the given `payment_id` cannot be found (likely due to timeout or success), or if
-        * further retries have been disabled with [`abandon_payment`].
-        * 
-        * [`send_payment`]: [`ChannelManager::send_payment`]
-        * [`abandon_payment`]: [`ChannelManager::abandon_payment`]
+        * Similar to [`ChannelManager::send_payment`], but will automatically find a route based on
+        * `route_params` and retry failed payment paths based on `retry_strategy`.
         */
-       public Result_NonePaymentSendFailureZ retry_payment(org.ldk.structs.Route route, byte[] payment_id) {
-               long ret = bindings.ChannelManager_retry_payment(this.ptr, route == null ? 0 : route.ptr, InternalUtils.check_arr_len(payment_id, 32));
+       public Result_NoneRetryableSendFailureZ send_payment(byte[] payment_hash, org.ldk.structs.RecipientOnionFields recipient_onion, byte[] payment_id, org.ldk.structs.RouteParameters route_params, org.ldk.structs.Retry retry_strategy) {
+               long ret = bindings.ChannelManager_send_payment(this.ptr, InternalUtils.check_arr_len(payment_hash, 32), recipient_onion == null ? 0 : recipient_onion.ptr, InternalUtils.check_arr_len(payment_id, 32), route_params == null ? 0 : route_params.ptr, retry_strategy.ptr);
                Reference.reachabilityFence(this);
-               Reference.reachabilityFence(route);
+               Reference.reachabilityFence(payment_hash);
+               Reference.reachabilityFence(recipient_onion);
                Reference.reachabilityFence(payment_id);
+               Reference.reachabilityFence(route_params);
+               Reference.reachabilityFence(retry_strategy);
                if (ret >= 0 && ret <= 4096) { return null; }
-               Result_NonePaymentSendFailureZ ret_hu_conv = Result_NonePaymentSendFailureZ.constr_from_ptr(ret);
-               if (this != null) { this.ptrs_to.add(route); };
+               Result_NoneRetryableSendFailureZ ret_hu_conv = Result_NoneRetryableSendFailureZ.constr_from_ptr(ret);
+               if (this != null) { this.ptrs_to.add(recipient_onion); };
+               if (this != null) { this.ptrs_to.add(route_params); };
+               if (this != null) { this.ptrs_to.add(retry_strategy); };
                return ret_hu_conv;
        }
 
        /**
-        * Signals that no further retries for the given payment will occur.
+        * Signals that no further retries for the given payment should occur. Useful if you have a
+        * pending outbound payment with retries remaining, but wish to stop retrying the payment before
+        * retries are exhausted.
         * 
-        * After this method returns, no future calls to [`retry_payment`] for the given `payment_id`
-        * are allowed. If no [`Event::PaymentFailed`] event had been generated before, one will be
-        * generated as soon as there are no remaining pending HTLCs for this payment.
+        * If no [`Event::PaymentFailed`] event had been generated before, one will be generated as soon
+        * as there are no remaining pending HTLCs for this payment.
         * 
         * Note that calling this method does *not* prevent a payment from succeeding. You must still
         * wait until you receive either a [`Event::PaymentFailed`] or [`Event::PaymentSent`] event to
         * determine the ultimate status of a payment.
         * 
         * If an [`Event::PaymentFailed`] event is generated and we restart without this
-        * [`ChannelManager`] having been persisted, the payment may still be in the pending state
-        * upon restart. This allows further calls to [`retry_payment`] (and requiring a second call
-        * to [`abandon_payment`] to mark the payment as failed again). Otherwise, future calls to
-        * [`retry_payment`] will fail with [`PaymentSendFailure::ParameterError`].
+        * [`ChannelManager`] having been persisted, another [`Event::PaymentFailed`] may be generated.
         * 
-        * [`abandon_payment`]: Self::abandon_payment
-        * [`retry_payment`]: Self::retry_payment
         * [`Event::PaymentFailed`]: events::Event::PaymentFailed
         * [`Event::PaymentSent`]: events::Event::PaymentSent
         */
@@ -435,15 +498,44 @@ public class ChannelManager extends CommonBase {
         * 
         * Note that payment_preimage (or a relevant inner pointer) may be NULL or all-0s to represent None
         */
-       public Result_PaymentHashPaymentSendFailureZ send_spontaneous_payment(org.ldk.structs.Route route, @Nullable byte[] payment_preimage, byte[] payment_id) {
-               long ret = bindings.ChannelManager_send_spontaneous_payment(this.ptr, route == null ? 0 : route.ptr, InternalUtils.check_arr_len(payment_preimage, 32), InternalUtils.check_arr_len(payment_id, 32));
+       public Result_PaymentHashPaymentSendFailureZ send_spontaneous_payment(org.ldk.structs.Route route, @Nullable byte[] payment_preimage, org.ldk.structs.RecipientOnionFields recipient_onion, byte[] payment_id) {
+               long ret = bindings.ChannelManager_send_spontaneous_payment(this.ptr, route == null ? 0 : route.ptr, InternalUtils.check_arr_len(payment_preimage, 32), recipient_onion == null ? 0 : recipient_onion.ptr, InternalUtils.check_arr_len(payment_id, 32));
                Reference.reachabilityFence(this);
                Reference.reachabilityFence(route);
                Reference.reachabilityFence(payment_preimage);
+               Reference.reachabilityFence(recipient_onion);
                Reference.reachabilityFence(payment_id);
                if (ret >= 0 && ret <= 4096) { return null; }
                Result_PaymentHashPaymentSendFailureZ ret_hu_conv = Result_PaymentHashPaymentSendFailureZ.constr_from_ptr(ret);
                if (this != null) { this.ptrs_to.add(route); };
+               if (this != null) { this.ptrs_to.add(recipient_onion); };
+               return ret_hu_conv;
+       }
+
+       /**
+        * Similar to [`ChannelManager::send_spontaneous_payment`], but will automatically find a route
+        * based on `route_params` and retry failed payment paths based on `retry_strategy`.
+        * 
+        * See [`PaymentParameters::for_keysend`] for help in constructing `route_params` for spontaneous
+        * payments.
+        * 
+        * [`PaymentParameters::for_keysend`]: crate::routing::router::PaymentParameters::for_keysend
+        * 
+        * Note that payment_preimage (or a relevant inner pointer) may be NULL or all-0s to represent None
+        */
+       public Result_PaymentHashRetryableSendFailureZ send_spontaneous_payment_with_retry(@Nullable byte[] payment_preimage, org.ldk.structs.RecipientOnionFields recipient_onion, byte[] payment_id, org.ldk.structs.RouteParameters route_params, org.ldk.structs.Retry retry_strategy) {
+               long ret = bindings.ChannelManager_send_spontaneous_payment_with_retry(this.ptr, InternalUtils.check_arr_len(payment_preimage, 32), recipient_onion == null ? 0 : recipient_onion.ptr, InternalUtils.check_arr_len(payment_id, 32), route_params == null ? 0 : route_params.ptr, retry_strategy.ptr);
+               Reference.reachabilityFence(this);
+               Reference.reachabilityFence(payment_preimage);
+               Reference.reachabilityFence(recipient_onion);
+               Reference.reachabilityFence(payment_id);
+               Reference.reachabilityFence(route_params);
+               Reference.reachabilityFence(retry_strategy);
+               if (ret >= 0 && ret <= 4096) { return null; }
+               Result_PaymentHashRetryableSendFailureZ ret_hu_conv = Result_PaymentHashRetryableSendFailureZ.constr_from_ptr(ret);
+               if (this != null) { this.ptrs_to.add(recipient_onion); };
+               if (this != null) { this.ptrs_to.add(route_params); };
+               if (this != null) { this.ptrs_to.add(retry_strategy); };
                return ret_hu_conv;
        }
 
@@ -452,13 +544,13 @@ public class ChannelManager extends CommonBase {
         * [`PaymentHash`] of probes based on a static secret and a random [`PaymentId`], which allows
         * us to easily discern them from real payments.
         */
-       public Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ send_probe(RouteHop[] hops) {
-               long ret = bindings.ChannelManager_send_probe(this.ptr, hops != null ? Arrays.stream(hops).mapToLong(hops_conv_10 -> hops_conv_10 == null ? 0 : hops_conv_10.ptr).toArray() : null);
+       public Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ send_probe(org.ldk.structs.Path path) {
+               long ret = bindings.ChannelManager_send_probe(this.ptr, path == null ? 0 : path.ptr);
                Reference.reachabilityFence(this);
-               Reference.reachabilityFence(hops);
+               Reference.reachabilityFence(path);
                if (ret >= 0 && ret <= 4096) { return null; }
                Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ ret_hu_conv = Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ.constr_from_ptr(ret);
-               for (RouteHop hops_conv_10: hops) { if (this != null) { this.ptrs_to.add(hops_conv_10); }; };
+               if (this != null) { this.ptrs_to.add(path); };
                return ret_hu_conv;
        }
 
@@ -491,8 +583,8 @@ public class ChannelManager extends CommonBase {
         * implemented by Bitcoin Core wallet. See <https://bitcoinops.org/en/topics/fee-sniping/>
         * for more details.
         * 
-        * [`Event::FundingGenerationReady`]: crate::util::events::Event::FundingGenerationReady
-        * [`Event::ChannelClosed`]: crate::util::events::Event::ChannelClosed
+        * [`Event::FundingGenerationReady`]: crate::events::Event::FundingGenerationReady
+        * [`Event::ChannelClosed`]: crate::events::Event::ChannelClosed
         */
        public Result_NoneAPIErrorZ funding_transaction_generated(byte[] temporary_channel_id, byte[] counterparty_node_id, byte[] funding_transaction) {
                long ret = bindings.ChannelManager_funding_transaction_generated(this.ptr, InternalUtils.check_arr_len(temporary_channel_id, 32), InternalUtils.check_arr_len(counterparty_node_id, 33), funding_transaction);
@@ -563,12 +655,12 @@ public class ChannelManager extends CommonBase {
         * [`UserConfig::accept_intercept_htlcs`]: crate::util::config::UserConfig::accept_intercept_htlcs
         * [`HTLCIntercepted`]: events::Event::HTLCIntercepted
         */
-       public Result_NoneAPIErrorZ forward_intercepted_htlc(byte[] intercept_id, byte[] next_hop_channel_id, byte[] _next_node_id, long amt_to_forward_msat) {
-               long ret = bindings.ChannelManager_forward_intercepted_htlc(this.ptr, InternalUtils.check_arr_len(intercept_id, 32), InternalUtils.check_arr_len(next_hop_channel_id, 32), InternalUtils.check_arr_len(_next_node_id, 33), amt_to_forward_msat);
+       public Result_NoneAPIErrorZ forward_intercepted_htlc(byte[] intercept_id, byte[] next_hop_channel_id, byte[] next_node_id, long amt_to_forward_msat) {
+               long ret = bindings.ChannelManager_forward_intercepted_htlc(this.ptr, InternalUtils.check_arr_len(intercept_id, 32), InternalUtils.check_arr_len(next_hop_channel_id, 32), InternalUtils.check_arr_len(next_node_id, 33), amt_to_forward_msat);
                Reference.reachabilityFence(this);
                Reference.reachabilityFence(intercept_id);
                Reference.reachabilityFence(next_hop_channel_id);
-               Reference.reachabilityFence(_next_node_id);
+               Reference.reachabilityFence(next_node_id);
                Reference.reachabilityFence(amt_to_forward_msat);
                if (ret >= 0 && ret <= 4096) { return null; }
                Result_NoneAPIErrorZ ret_hu_conv = Result_NoneAPIErrorZ.constr_from_ptr(ret);
@@ -609,14 +701,18 @@ public class ChannelManager extends CommonBase {
         * 
         * This currently includes:
         * Increasing or decreasing the on-chain feerate estimates for our outbound channels,
-        * Broadcasting `ChannelUpdate` messages if we've been disconnected from our peer for more
+        * Broadcasting [`ChannelUpdate`] messages if we've been disconnected from our peer for more
         * than a minute, informing the network that they should no longer attempt to route over
         * the channel.
-        * Expiring a channel's previous `ChannelConfig` if necessary to only allow forwarding HTLCs
-        * with the current `ChannelConfig`.
+        * Expiring a channel's previous [`ChannelConfig`] if necessary to only allow forwarding HTLCs
+        * with the current [`ChannelConfig`].
+        * Removing peers which have disconnected but and no longer have any channels.
         * 
-        * Note that this may cause reentrancy through `chain::Watch::update_channel` calls or feerate
+        * Note that this may cause reentrancy through [`chain::Watch::update_channel`] calls or feerate
         * estimate fetches.
+        * 
+        * [`ChannelUpdate`]: msgs::ChannelUpdate
+        * [`ChannelConfig`]: crate::util::config::ChannelConfig
         */
        public void timer_tick_occurred() {
                bindings.ChannelManager_timer_tick_occurred(this.ptr);
@@ -644,21 +740,36 @@ public class ChannelManager extends CommonBase {
                Reference.reachabilityFence(payment_hash);
        }
 
+       /**
+        * This is a variant of [`ChannelManager::fail_htlc_backwards`] that allows you to specify the
+        * reason for the failure.
+        * 
+        * See [`FailureCode`] for valid failure codes.
+        */
+       public void fail_htlc_backwards_with_reason(byte[] payment_hash, org.ldk.enums.FailureCode failure_code) {
+               bindings.ChannelManager_fail_htlc_backwards_with_reason(this.ptr, InternalUtils.check_arr_len(payment_hash, 32), failure_code);
+               Reference.reachabilityFence(this);
+               Reference.reachabilityFence(payment_hash);
+               Reference.reachabilityFence(failure_code);
+       }
+
        /**
         * Provides a payment preimage in response to [`Event::PaymentClaimable`], generating any
         * [`MessageSendEvent`]s needed to claim the payment.
         * 
-        * Note that calling this method does *not* guarantee that the payment has been claimed. You
-        * must* wait for an [`Event::PaymentClaimed`] event which upon a successful claim will be
-        * provided to your [`EventHandler`] when [`process_pending_events`] is next called.
+        * This method is guaranteed to ensure the payment has been claimed but only if the current
+        * height is strictly below [`Event::PaymentClaimable::claim_deadline`]. To avoid race
+        * conditions, you should wait for an [`Event::PaymentClaimed`] before considering the payment
+        * successful. It will generally be available in the next [`process_pending_events`] call.
         * 
         * Note that if you did not set an `amount_msat` when calling [`create_inbound_payment`] or
         * [`create_inbound_payment_for_hash`] you must check that the amount in the `PaymentClaimable`
         * event matches your expectation. If you fail to do so and call this method, you may provide
         * the sender \"proof-of-payment\" when they did not fulfill the full expected payment.
         * 
-        * [`Event::PaymentClaimable`]: crate::util::events::Event::PaymentClaimable
-        * [`Event::PaymentClaimed`]: crate::util::events::Event::PaymentClaimed
+        * [`Event::PaymentClaimable`]: crate::events::Event::PaymentClaimable
+        * [`Event::PaymentClaimable::claim_deadline`]: crate::events::Event::PaymentClaimable::claim_deadline
+        * [`Event::PaymentClaimed`]: crate::events::Event::PaymentClaimed
         * [`process_pending_events`]: EventsProvider::process_pending_events
         * [`create_inbound_payment`]: Self::create_inbound_payment
         * [`create_inbound_payment_for_hash`]: Self::create_inbound_payment_for_hash
@@ -746,7 +857,8 @@ public class ChannelManager extends CommonBase {
         * [`PaymentHash`] and [`PaymentPreimage`] for you.
         * 
         * The [`PaymentPreimage`] will ultimately be returned to you in the [`PaymentClaimable`], which
-        * will have the [`PaymentClaimable::payment_preimage`] field filled in. That should then be
+        * will have the [`PaymentClaimable::purpose`] be [`PaymentPurpose::InvoicePayment`] with
+        * its [`PaymentPurpose::InvoicePayment::payment_preimage`] field filled in. That should then be
         * passed directly to [`claim_funds`].
         * 
         * See [`create_inbound_payment_for_hash`] for detailed documentation on behavior and requirements.
@@ -761,18 +873,26 @@ public class ChannelManager extends CommonBase {
         * 
         * Errors if `min_value_msat` is greater than total bitcoin supply.
         * 
+        * If `min_final_cltv_expiry_delta` is set to some value, then the payment will not be receivable
+        * on versions of LDK prior to 0.0.114.
+        * 
         * [`claim_funds`]: Self::claim_funds
         * [`PaymentClaimable`]: events::Event::PaymentClaimable
-        * [`PaymentClaimable::payment_preimage`]: events::Event::PaymentClaimable::payment_preimage
+        * [`PaymentClaimable::purpose`]: events::Event::PaymentClaimable::purpose
+        * [`PaymentPurpose::InvoicePayment`]: events::PaymentPurpose::InvoicePayment
+        * [`PaymentPurpose::InvoicePayment::payment_preimage`]: events::PaymentPurpose::InvoicePayment::payment_preimage
         * [`create_inbound_payment_for_hash`]: Self::create_inbound_payment_for_hash
         */
-       public Result_C2Tuple_PaymentHashPaymentSecretZNoneZ create_inbound_payment(org.ldk.structs.Option_u64Z min_value_msat, int invoice_expiry_delta_secs) {
-               long ret = bindings.ChannelManager_create_inbound_payment(this.ptr, min_value_msat.ptr, invoice_expiry_delta_secs);
+       public Result_C2Tuple_PaymentHashPaymentSecretZNoneZ create_inbound_payment(org.ldk.structs.Option_u64Z min_value_msat, int invoice_expiry_delta_secs, org.ldk.structs.Option_u16Z min_final_cltv_expiry_delta) {
+               long ret = bindings.ChannelManager_create_inbound_payment(this.ptr, min_value_msat.ptr, invoice_expiry_delta_secs, min_final_cltv_expiry_delta.ptr);
                Reference.reachabilityFence(this);
                Reference.reachabilityFence(min_value_msat);
                Reference.reachabilityFence(invoice_expiry_delta_secs);
+               Reference.reachabilityFence(min_final_cltv_expiry_delta);
                if (ret >= 0 && ret <= 4096) { return null; }
                Result_C2Tuple_PaymentHashPaymentSecretZNoneZ ret_hu_conv = Result_C2Tuple_PaymentHashPaymentSecretZNoneZ.constr_from_ptr(ret);
+               if (this != null) { this.ptrs_to.add(min_value_msat); };
+               if (this != null) { this.ptrs_to.add(min_final_cltv_expiry_delta); };
                return ret_hu_conv;
        }
 
@@ -794,6 +914,7 @@ public class ChannelManager extends CommonBase {
                Reference.reachabilityFence(invoice_expiry_delta_secs);
                if (ret >= 0 && ret <= 4096) { return null; }
                Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ ret_hu_conv = Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ.constr_from_ptr(ret);
+               if (this != null) { this.ptrs_to.add(min_value_msat); };
                return ret_hu_conv;
        }
 
@@ -826,8 +947,8 @@ public class ChannelManager extends CommonBase {
         * If you need exact expiry semantics, you should enforce them upon receipt of
         * [`PaymentClaimable`].
         * 
-        * Note that invoices generated for inbound payments should have their `min_final_cltv_expiry`
-        * set to at least [`MIN_FINAL_CLTV_EXPIRY`].
+        * Note that invoices generated for inbound payments should have their `min_final_cltv_expiry_delta`
+        * set to at least [`MIN_FINAL_CLTV_EXPIRY_DELTA`].
         * 
         * Note that a malicious eavesdropper can intuit whether an inbound payment was created by
         * `create_inbound_payment` or `create_inbound_payment_for_hash` based on runtime.
@@ -839,17 +960,23 @@ public class ChannelManager extends CommonBase {
         * 
         * Errors if `min_value_msat` is greater than total bitcoin supply.
         * 
+        * If `min_final_cltv_expiry_delta` is set to some value, then the payment will not be receivable
+        * on versions of LDK prior to 0.0.114.
+        * 
         * [`create_inbound_payment`]: Self::create_inbound_payment
         * [`PaymentClaimable`]: events::Event::PaymentClaimable
         */
-       public Result_PaymentSecretNoneZ create_inbound_payment_for_hash(byte[] payment_hash, org.ldk.structs.Option_u64Z min_value_msat, int invoice_expiry_delta_secs) {
-               long ret = bindings.ChannelManager_create_inbound_payment_for_hash(this.ptr, InternalUtils.check_arr_len(payment_hash, 32), min_value_msat.ptr, invoice_expiry_delta_secs);
+       public Result_PaymentSecretNoneZ create_inbound_payment_for_hash(byte[] payment_hash, org.ldk.structs.Option_u64Z min_value_msat, int invoice_expiry_delta_secs, org.ldk.structs.Option_u16Z min_final_cltv_expiry) {
+               long ret = bindings.ChannelManager_create_inbound_payment_for_hash(this.ptr, InternalUtils.check_arr_len(payment_hash, 32), min_value_msat.ptr, invoice_expiry_delta_secs, min_final_cltv_expiry.ptr);
                Reference.reachabilityFence(this);
                Reference.reachabilityFence(payment_hash);
                Reference.reachabilityFence(min_value_msat);
                Reference.reachabilityFence(invoice_expiry_delta_secs);
+               Reference.reachabilityFence(min_final_cltv_expiry);
                if (ret >= 0 && ret <= 4096) { return null; }
                Result_PaymentSecretNoneZ ret_hu_conv = Result_PaymentSecretNoneZ.constr_from_ptr(ret);
+               if (this != null) { this.ptrs_to.add(min_value_msat); };
+               if (this != null) { this.ptrs_to.add(min_final_cltv_expiry); };
                return ret_hu_conv;
        }
 
@@ -872,6 +999,7 @@ public class ChannelManager extends CommonBase {
                Reference.reachabilityFence(invoice_expiry_delta_secs);
                if (ret >= 0 && ret <= 4096) { return null; }
                Result_PaymentSecretAPIErrorZ ret_hu_conv = Result_PaymentSecretAPIErrorZ.constr_from_ptr(ret);
+               if (this != null) { this.ptrs_to.add(min_value_msat); };
                return ret_hu_conv;
        }
 
@@ -997,60 +1125,81 @@ public class ChannelManager extends CommonBase {
        }
 
        /**
-        * Blocks until ChannelManager needs to be persisted or a timeout is reached. It returns a bool
-        * indicating whether persistence is necessary. Only one listener on
-        * [`await_persistable_update`], [`await_persistable_update_timeout`], or a future returned by
-        * [`get_persistable_update_future`] is guaranteed to be woken up.
+        * Gets a [`Future`] that completes when this [`ChannelManager`] needs to be persisted.
         * 
-        * Note that this method is not available with the `no-std` feature.
-        * 
-        * [`await_persistable_update`]: Self::await_persistable_update
-        * [`await_persistable_update_timeout`]: Self::await_persistable_update_timeout
-        * [`get_persistable_update_future`]: Self::get_persistable_update_future
+        * Note that callbacks registered on the [`Future`] MUST NOT call back into this
+        * [`ChannelManager`] and should instead register actions to be taken later.
         */
-       public boolean await_persistable_update_timeout(long max_wait) {
-               boolean ret = bindings.ChannelManager_await_persistable_update_timeout(this.ptr, max_wait);
+       public Future get_persistable_update_future() {
+               long ret = bindings.ChannelManager_get_persistable_update_future(this.ptr);
                Reference.reachabilityFence(this);
-               Reference.reachabilityFence(max_wait);
-               return ret;
+               if (ret >= 0 && ret <= 4096) { return null; }
+               org.ldk.structs.Future ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.Future(null, ret); }
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+               return ret_hu_conv;
        }
 
        /**
-        * Blocks until ChannelManager needs to be persisted. Only one listener on
-        * [`await_persistable_update`], `await_persistable_update_timeout`, or a future returned by
-        * [`get_persistable_update_future`] is guaranteed to be woken up.
-        * 
-        * [`await_persistable_update`]: Self::await_persistable_update
-        * [`get_persistable_update_future`]: Self::get_persistable_update_future
+        * Gets the latest best block which was connected either via the [`chain::Listen`] or
+        * [`chain::Confirm`] interfaces.
         */
-       public void await_persistable_update() {
-               bindings.ChannelManager_await_persistable_update(this.ptr);
+       public BestBlock current_best_block() {
+               long ret = bindings.ChannelManager_current_best_block(this.ptr);
                Reference.reachabilityFence(this);
+               if (ret >= 0 && ret <= 4096) { return null; }
+               org.ldk.structs.BestBlock ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.BestBlock(null, ret); }
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+               return ret_hu_conv;
        }
 
        /**
-        * Gets a [`Future`] that completes when a persistable update is available. Note that
-        * callbacks registered on the [`Future`] MUST NOT call back into this [`ChannelManager`] and
-        * should instead register actions to be taken later.
+        * Fetches the set of [`NodeFeatures`] flags which are provided by or required by
+        * [`ChannelManager`].
         */
-       public Future get_persistable_update_future() {
-               long ret = bindings.ChannelManager_get_persistable_update_future(this.ptr);
+       public NodeFeatures node_features() {
+               long ret = bindings.ChannelManager_node_features(this.ptr);
                Reference.reachabilityFence(this);
                if (ret >= 0 && ret <= 4096) { return null; }
-               org.ldk.structs.Future ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.Future(null, ret); }
+               org.ldk.structs.NodeFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NodeFeatures(null, ret); }
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
                return ret_hu_conv;
        }
 
        /**
-        * Gets the latest best block which was connected either via the [`chain::Listen`] or
-        * [`chain::Confirm`] interfaces.
+        * Fetches the set of [`ChannelFeatures`] flags which are provided by or required by
+        * [`ChannelManager`].
         */
-       public BestBlock current_best_block() {
-               long ret = bindings.ChannelManager_current_best_block(this.ptr);
+       public ChannelFeatures channel_features() {
+               long ret = bindings.ChannelManager_channel_features(this.ptr);
                Reference.reachabilityFence(this);
                if (ret >= 0 && ret <= 4096) { return null; }
-               org.ldk.structs.BestBlock ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.BestBlock(null, ret); }
+               org.ldk.structs.ChannelFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelFeatures(null, ret); }
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+               return ret_hu_conv;
+       }
+
+       /**
+        * Fetches the set of [`ChannelTypeFeatures`] flags which are provided by or required by
+        * [`ChannelManager`].
+        */
+       public ChannelTypeFeatures channel_type_features() {
+               long ret = bindings.ChannelManager_channel_type_features(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;
+       }
+
+       /**
+        * Fetches the set of [`InitFeatures`] flags which are provided by or required by
+        * [`ChannelManager`].
+        */
+       public InitFeatures init_features() {
+               long ret = bindings.ChannelManager_init_features(this.ptr);
+               Reference.reachabilityFence(this);
+               if (ret >= 0 && ret <= 4096) { return null; }
+               org.ldk.structs.InitFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.InitFeatures(null, ret); }
                if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
                return ret_hu_conv;
        }
@@ -1077,17 +1226,4 @@ public class ChannelManager extends CommonBase {
                return ret;
        }
 
-       /**
-        * Constructs a new Payer which calls the relevant methods on this_arg.
-        * This copies the `inner` pointer in this_arg and thus the returned Payer must be freed before this_arg is
-        */
-       public Payer as_Payer() {
-               long ret = bindings.ChannelManager_as_Payer(this.ptr);
-               Reference.reachabilityFence(this);
-               if (ret >= 0 && ret <= 4096) { return null; }
-               Payer ret_hu_conv = new Payer(null, ret);
-               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
-               return ret_hu_conv;
-       }
-
 }