[Java] Update auto-generated bindings to LDK 0.1.1

Author: TheBlueMatt

src/main/java/org/ldk/impl/bindings.java

@@ -1814,7 +1814,8 @@ public final static class Forward extends LDKPendingHTLCRouting {
 			public long onion_packet;
 			public long short_channel_id;
 			public long blinded;
-			Forward(long onion_packet, long short_channel_id, long blinded) { this.onion_packet = onion_packet; this.short_channel_id = short_channel_id; this.blinded = blinded; }
+			public long incoming_cltv_expiry;
+			Forward(long onion_packet, long short_channel_id, long blinded, long incoming_cltv_expiry) { this.onion_packet = onion_packet; this.short_channel_id = short_channel_id; this.blinded = blinded; this.incoming_cltv_expiry = incoming_cltv_expiry; }
 		}
 		public final static class Receive extends LDKPendingHTLCRouting {
 			public long payment_data;
@@ -9147,8 +9148,8 @@ public final static class ScriptHash extends LDKFallback {
 	public static native long PendingHTLCRouting_clone_ptr(long arg);
 	// struct LDKPendingHTLCRouting PendingHTLCRouting_clone(const struct LDKPendingHTLCRouting *NONNULL_PTR orig);
 	public static native long PendingHTLCRouting_clone(long orig);
-	// struct LDKPendingHTLCRouting PendingHTLCRouting_forward(struct LDKOnionPacket onion_packet, uint64_t short_channel_id, struct LDKBlindedForward blinded);
-	public static native long PendingHTLCRouting_forward(long onion_packet, long short_channel_id, long blinded);
+	// struct LDKPendingHTLCRouting PendingHTLCRouting_forward(struct LDKOnionPacket onion_packet, uint64_t short_channel_id, struct LDKBlindedForward blinded, struct LDKCOption_u32Z incoming_cltv_expiry);
+	public static native long PendingHTLCRouting_forward(long onion_packet, long short_channel_id, long blinded, long incoming_cltv_expiry);
 	// struct LDKPendingHTLCRouting PendingHTLCRouting_receive(struct LDKFinalOnionHopData payment_data, struct LDKCOption_CVec_u8ZZ payment_metadata, struct LDKCOption_PaymentContextZ payment_context, uint32_t incoming_cltv_expiry, struct LDKThirtyTwoBytes phantom_shared_secret, struct LDKCVec_C2Tuple_u64CVec_u8ZZZ custom_tlvs, bool requires_blinded_error);
 	public static native long PendingHTLCRouting_receive(long payment_data, long payment_metadata, long payment_context, int incoming_cltv_expiry, byte[] phantom_shared_secret, long[] custom_tlvs, boolean requires_blinded_error);
 	// struct LDKPendingHTLCRouting PendingHTLCRouting_receive_keysend(struct LDKFinalOnionHopData payment_data, struct LDKThirtyTwoBytes payment_preimage, struct LDKCOption_CVec_u8ZZ payment_metadata, uint32_t incoming_cltv_expiry, struct LDKCVec_C2Tuple_u64CVec_u8ZZZ custom_tlvs, bool requires_blinded_error, bool has_recipient_created_payment_secret);
@@ -9319,6 +9320,8 @@ public final static class ScriptHash extends LDKFallback {
 	public static native void ChannelManager_force_close_all_channels_broadcasting_latest_txn(long this_arg, String error_message);
 	// void ChannelManager_force_close_all_channels_without_broadcasting_txn(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKStr error_message);
 	public static native void ChannelManager_force_close_all_channels_without_broadcasting_txn(long this_arg, String error_message);
+	// MUST_USE_RES struct LDKCResult_NoneRetryableSendFailureZ ChannelManager_send_payment_with_route(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKRoute route, struct LDKThirtyTwoBytes payment_hash, struct LDKRecipientOnionFields recipient_onion, struct LDKThirtyTwoBytes payment_id);
+	public static native long ChannelManager_send_payment_with_route(long this_arg, long route, byte[] payment_hash, long recipient_onion, byte[] payment_id);
 	// MUST_USE_RES struct LDKCResult_NoneRetryableSendFailureZ ChannelManager_send_payment(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKThirtyTwoBytes payment_hash, struct LDKRecipientOnionFields recipient_onion, struct LDKThirtyTwoBytes payment_id, struct LDKRouteParameters route_params, struct LDKRetry retry_strategy);
 	public static native long ChannelManager_send_payment(long this_arg, byte[] payment_hash, long recipient_onion, byte[] payment_id, long route_params, long retry_strategy);
 	// MUST_USE_RES struct LDKCResult_NoneBolt12PaymentErrorZ ChannelManager_send_payment_for_bolt12_invoice(const struct LDKChannelManager *NONNULL_PTR this_arg, const struct LDKBolt12Invoice *NONNULL_PTR invoice, struct LDKCOption_OffersContextZ context);
@@ -14329,6 +14332,8 @@ public final static class ScriptHash extends LDKFallback {
 	public static native long SpendableOutputDescriptor_read(byte[] ser);
 	// MUST_USE_RES struct LDKCResult_C2Tuple_CVec_u8Zu64ZNoneZ SpendableOutputDescriptor_create_spendable_outputs_psbt(struct LDKCVec_SpendableOutputDescriptorZ descriptors, struct LDKCVec_TxOutZ outputs, struct LDKCVec_u8Z change_destination_script, uint32_t feerate_sat_per_1000_weight, struct LDKCOption_u32Z locktime);
 	public static native long SpendableOutputDescriptor_create_spendable_outputs_psbt(long[] descriptors, long[] outputs, byte[] change_destination_script, int feerate_sat_per_1000_weight, long locktime);
+	// MUST_USE_RES struct LDKOutPoint SpendableOutputDescriptor_spendable_outpoint(const struct LDKSpendableOutputDescriptor *NONNULL_PTR this_arg);
+	public static native long SpendableOutputDescriptor_spendable_outpoint(long this_arg);
 	// void ChannelDerivationParameters_free(struct LDKChannelDerivationParameters this_obj);
 	public static native void ChannelDerivationParameters_free(long this_obj);
 	// uint64_t ChannelDerivationParameters_get_value_satoshis(const struct LDKChannelDerivationParameters *NONNULL_PTR this_ptr);

src/main/java/org/ldk/structs/ChannelManager.java

@@ -1112,6 +1112,24 @@ public void force_close_all_channels_without_broadcasting_txn(java.lang.String e
 		Reference.reachabilityFence(error_message);
 	}
 
+	/**
+	 * Sends a payment along a given route. See [`Self::send_payment`] for more info.
+	 * 
+	 * LDK will not automatically retry this payment, though it may be manually re-sent after an
+	 * [`Event::PaymentFailed`] is generated.
+	 */
+	public Result_NoneRetryableSendFailureZ 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.ptr, InternalUtils.check_arr_len(payment_hash, 32), recipient_onion.ptr, InternalUtils.check_arr_len(payment_id, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(route);
+		Reference.reachabilityFence(payment_hash);
+		Reference.reachabilityFence(recipient_onion);
+		Reference.reachabilityFence(payment_id);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_NoneRetryableSendFailureZ ret_hu_conv = Result_NoneRetryableSendFailureZ.constr_from_ptr(ret);
+		return ret_hu_conv;
+	}
+
 	/**
 	 * Sends a payment to the route found using the provided [`RouteParameters`], retrying failed
 	 * payment paths based on the provided `Retry`.
@@ -1139,7 +1157,8 @@ public void force_close_all_channels_without_broadcasting_txn(java.lang.String e
 	 * [`ChannelManager::list_recent_payments`] for more information.
 	 * 
 	 * Routes are automatically found using the [`Router] provided on startup. To fix a route for a
-	 * particular payment, match the [`PaymentId`] passed to [`Router::find_route_with_id`].
+	 * particular payment, use [`Self::send_payment_with_route`] or match the [`PaymentId`] passed to
+	 * [`Router::find_route_with_id`].
 	 * 
 	 * [`Event::PaymentSent`]: events::Event::PaymentSent
 	 * [`Event::PaymentFailed`]: events::Event::PaymentFailed

src/main/java/org/ldk/structs/ChannelMonitor.java

@@ -580,10 +580,11 @@ public SpendableOutputDescriptor[] get_spendable_outputs(byte[] tx, int confirma
 	 * 
 	 * This function returns a tuple of two booleans, the first indicating whether the monitor is
 	 * fully resolved, and the second whether the monitor needs persistence to ensure it is
-	 * reliably marked as resolved within 4032 blocks.
+	 * reliably marked as resolved within [`ARCHIVAL_DELAY_BLOCKS`] blocks.
 	 * 
-	 * The first boolean is true only if [`Self::get_claimable_balances`] has been empty for at least
-	 * 4032 blocks as an additional protection against any bugs resulting in spuriously empty balance sets.
+	 * The first boolean is true only if [`Self::get_claimable_balances`] has been empty for at
+	 * least [`ARCHIVAL_DELAY_BLOCKS`] blocks as an additional protection against any bugs
+	 * resulting in spuriously empty balance sets.
 	 */
 	public TwoTuple_boolboolZ check_and_update_full_resolution_status(org.ldk.structs.Logger logger) {
 		long ret = bindings.ChannelMonitor_check_and_update_full_resolution_status(this.ptr, logger.ptr);

src/main/java/org/ldk/structs/OutputSpendStatus.java

@@ -75,7 +75,11 @@ private PendingFirstConfirmation(long ptr, bindings.LDKOutputSpendStatus.Pending
 	}
 	/**
 	 * A transaction spending the output has been confirmed on-chain but will be tracked until it
-	 * reaches [`ANTI_REORG_DELAY`] confirmations.
+	 * reaches at least [`PRUNE_DELAY_BLOCKS`] confirmations to ensure [`Event::SpendableOutputs`]
+	 * stemming from lingering [`ChannelMonitor`]s can safely be replayed.
+	 * 
+	 * [`Event::SpendableOutputs`]: crate::events::Event::SpendableOutputs
+	 * [`ChannelMonitor`]: crate::chain::channelmonitor::ChannelMonitor
 	 */
 	public final static class PendingThresholdConfirmations extends OutputSpendStatus {
 		/**

src/main/java/org/ldk/structs/PendingHTLCRouting.java

@@ -56,6 +56,10 @@ public final static class Forward extends PendingHTLCRouting {
 		 * Note that this (or a relevant inner pointer) may be NULL or all-0s to represent None
 		*/
 		@Nullable public final org.ldk.structs.BlindedForward blinded;
+		/**
+		 * The absolute CLTV of the inbound HTLC
+		*/
+		public final org.ldk.structs.Option_u32Z incoming_cltv_expiry;
 		private Forward(long ptr, bindings.LDKPendingHTLCRouting.Forward obj) {
 			super(null, ptr);
 			long onion_packet = obj.onion_packet;
@@ -67,6 +71,10 @@ private Forward(long ptr, bindings.LDKPendingHTLCRouting.Forward obj) {
 			org.ldk.structs.BlindedForward blinded_hu_conv = null; if (blinded < 0 || blinded > 4096) { blinded_hu_conv = new org.ldk.structs.BlindedForward(null, blinded); }
 			if (blinded_hu_conv != null) { blinded_hu_conv.ptrs_to.add(this); };
 			this.blinded = blinded_hu_conv;
+			long incoming_cltv_expiry = obj.incoming_cltv_expiry;
+			org.ldk.structs.Option_u32Z incoming_cltv_expiry_hu_conv = org.ldk.structs.Option_u32Z.constr_from_ptr(incoming_cltv_expiry);
+			if (incoming_cltv_expiry_hu_conv != null) { incoming_cltv_expiry_hu_conv.ptrs_to.add(this); };
+			this.incoming_cltv_expiry = incoming_cltv_expiry_hu_conv;
 		}
 	}
 	/**
@@ -250,11 +258,12 @@ public PendingHTLCRouting clone() {
 	/**
 	 * Utility method to constructs a new Forward-variant PendingHTLCRouting
 	 */
-	public static PendingHTLCRouting forward(org.ldk.structs.OnionPacket onion_packet, long short_channel_id, org.ldk.structs.BlindedForward blinded) {
-		long ret = bindings.PendingHTLCRouting_forward(onion_packet.ptr, short_channel_id, blinded.ptr);
+	public static PendingHTLCRouting forward(org.ldk.structs.OnionPacket onion_packet, long short_channel_id, org.ldk.structs.BlindedForward blinded, org.ldk.structs.Option_u32Z incoming_cltv_expiry) {
+		long ret = bindings.PendingHTLCRouting_forward(onion_packet.ptr, short_channel_id, blinded.ptr, incoming_cltv_expiry.ptr);
 		Reference.reachabilityFence(onion_packet);
 		Reference.reachabilityFence(short_channel_id);
 		Reference.reachabilityFence(blinded);
+		Reference.reachabilityFence(incoming_cltv_expiry);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.PendingHTLCRouting ret_hu_conv = org.ldk.structs.PendingHTLCRouting.constr_from_ptr(ret);
 		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };

src/main/java/org/ldk/structs/SpendableOutputDescriptor.java

@@ -267,4 +267,16 @@ public static Result_SpendableOutputDescriptorDecodeErrorZ read(byte[] ser) {
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Returns the outpoint of the spendable output.
+	 */
+	public OutPoint spendable_outpoint() {
+		long ret = bindings.SpendableOutputDescriptor_spendable_outpoint(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.OutPoint ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.OutPoint(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
 }

src/main/jni/bindings.c

@@ -9514,7 +9514,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_00024LDKPendingHTLCRouting_ini
 	LDKPendingHTLCRouting_Forward_class =
 		(*env)->NewGlobalRef(env, (*env)->FindClass(env, "org/ldk/impl/bindings$LDKPendingHTLCRouting$Forward"));
 	CHECK(LDKPendingHTLCRouting_Forward_class != NULL);
-	LDKPendingHTLCRouting_Forward_meth = (*env)->GetMethodID(env, LDKPendingHTLCRouting_Forward_class, "<init>", "(JJJ)V");
+	LDKPendingHTLCRouting_Forward_meth = (*env)->GetMethodID(env, LDKPendingHTLCRouting_Forward_class, "<init>", "(JJJJ)V");
 	CHECK(LDKPendingHTLCRouting_Forward_meth != NULL);
 	LDKPendingHTLCRouting_Receive_class =
 		(*env)->NewGlobalRef(env, (*env)->FindClass(env, "org/ldk/impl/bindings$LDKPendingHTLCRouting$Receive"));
@@ -9540,7 +9540,8 @@ JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKPendingHTLCRouting_1ref_
 			int64_t blinded_ref = 0;
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(blinded_var);
 			blinded_ref = tag_ptr(blinded_var.inner, false);
-			return (*env)->NewObject(env, LDKPendingHTLCRouting_Forward_class, LDKPendingHTLCRouting_Forward_meth, onion_packet_ref, short_channel_id_conv, blinded_ref);
+			int64_t incoming_cltv_expiry_ref = tag_ptr(&obj->forward.incoming_cltv_expiry, false);
+			return (*env)->NewObject(env, LDKPendingHTLCRouting_Forward_class, LDKPendingHTLCRouting_Forward_meth, onion_packet_ref, short_channel_id_conv, blinded_ref, incoming_cltv_expiry_ref);
 		}
 		case LDKPendingHTLCRouting_Receive: {
 			LDKFinalOnionHopData payment_data_var = obj->receive.payment_data;
@@ -50579,7 +50580,7 @@ JNIEXPORT int64_t JNICALL Java_org_ldk_impl_bindings_PendingHTLCRouting_1clone(J
 	return ret_ref;
 }
 
-JNIEXPORT int64_t JNICALL Java_org_ldk_impl_bindings_PendingHTLCRouting_1forward(JNIEnv *env, jclass clz, int64_t onion_packet, int64_t short_channel_id, int64_t blinded) {
+JNIEXPORT int64_t JNICALL Java_org_ldk_impl_bindings_PendingHTLCRouting_1forward(JNIEnv *env, jclass clz, int64_t onion_packet, int64_t short_channel_id, int64_t blinded, int64_t incoming_cltv_expiry) {
 	LDKOnionPacket onion_packet_conv;
 	onion_packet_conv.inner = untag_ptr(onion_packet);
 	onion_packet_conv.is_owned = ptr_is_owned(onion_packet);
@@ -50590,8 +50591,12 @@ JNIEXPORT int64_t JNICALL Java_org_ldk_impl_bindings_PendingHTLCRouting_1forward
 	blinded_conv.is_owned = ptr_is_owned(blinded);
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(blinded_conv);
 	blinded_conv = BlindedForward_clone(&blinded_conv);
+	void* incoming_cltv_expiry_ptr = untag_ptr(incoming_cltv_expiry);
+	CHECK_ACCESS(incoming_cltv_expiry_ptr);
+	LDKCOption_u32Z incoming_cltv_expiry_conv = *(LDKCOption_u32Z*)(incoming_cltv_expiry_ptr);
+	incoming_cltv_expiry_conv = COption_u32Z_clone((LDKCOption_u32Z*)untag_ptr(incoming_cltv_expiry));
 	LDKPendingHTLCRouting *ret_copy = MALLOC(sizeof(LDKPendingHTLCRouting), "LDKPendingHTLCRouting");
-	*ret_copy = PendingHTLCRouting_forward(onion_packet_conv, short_channel_id, blinded_conv);
+	*ret_copy = PendingHTLCRouting_forward(onion_packet_conv, short_channel_id, blinded_conv, incoming_cltv_expiry_conv);
 	int64_t ret_ref = tag_ptr(ret_copy, true);
 	return ret_ref;
 }
@@ -51807,6 +51812,33 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManager_1force_1close_1
 	ChannelManager_force_close_all_channels_without_broadcasting_txn(&this_arg_conv, error_message_conv);
 }
 
+JNIEXPORT int64_t JNICALL Java_org_ldk_impl_bindings_ChannelManager_1send_1payment_1with_1route(JNIEnv *env, jclass clz, int64_t this_arg, int64_t route, int8_tArray payment_hash, int64_t recipient_onion, int8_tArray payment_id) {
+	LDKChannelManager this_arg_conv;
+	this_arg_conv.inner = untag_ptr(this_arg);
+	this_arg_conv.is_owned = ptr_is_owned(this_arg);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	this_arg_conv.is_owned = false;
+	LDKRoute route_conv;
+	route_conv.inner = untag_ptr(route);
+	route_conv.is_owned = ptr_is_owned(route);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv);
+	route_conv = Route_clone(&route_conv);
+	LDKThirtyTwoBytes payment_hash_ref;
+	CHECK((*env)->GetArrayLength(env, payment_hash) == 32);
+	(*env)->GetByteArrayRegion(env, payment_hash, 0, 32, payment_hash_ref.data);
+	LDKRecipientOnionFields recipient_onion_conv;
+	recipient_onion_conv.inner = untag_ptr(recipient_onion);
+	recipient_onion_conv.is_owned = ptr_is_owned(recipient_onion);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(recipient_onion_conv);
+	recipient_onion_conv = RecipientOnionFields_clone(&recipient_onion_conv);
+	LDKThirtyTwoBytes payment_id_ref;
+	CHECK((*env)->GetArrayLength(env, payment_id) == 32);
+	(*env)->GetByteArrayRegion(env, payment_id, 0, 32, payment_id_ref.data);
+	LDKCResult_NoneRetryableSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneRetryableSendFailureZ), "LDKCResult_NoneRetryableSendFailureZ");
+	*ret_conv = ChannelManager_send_payment_with_route(&this_arg_conv, route_conv, payment_hash_ref, recipient_onion_conv, payment_id_ref);
+	return tag_ptr(ret_conv, true);
+}
+
 JNIEXPORT int64_t JNICALL Java_org_ldk_impl_bindings_ChannelManager_1send_1payment(JNIEnv *env, jclass clz, int64_t this_arg, int8_tArray payment_hash, int64_t recipient_onion, int8_tArray payment_id, int64_t route_params, int64_t retry_strategy) {
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = untag_ptr(this_arg);
@@ -83275,6 +83307,15 @@ JNIEXPORT int64_t JNICALL Java_org_ldk_impl_bindings_SpendableOutputDescriptor_1
 	return tag_ptr(ret_conv, true);
 }
 
+JNIEXPORT int64_t JNICALL Java_org_ldk_impl_bindings_SpendableOutputDescriptor_1spendable_1outpoint(JNIEnv *env, jclass clz, int64_t this_arg) {
+	LDKSpendableOutputDescriptor* this_arg_conv = (LDKSpendableOutputDescriptor*)untag_ptr(this_arg);
+	LDKOutPoint ret_var = SpendableOutputDescriptor_spendable_outpoint(this_arg_conv);
+	int64_t ret_ref = 0;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned);
+	return ret_ref;
+}
+
 JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelDerivationParameters_1free(JNIEnv *env, jclass clz, int64_t this_obj) {
 	LDKChannelDerivationParameters this_obj_conv;
 	this_obj_conv.inner = untag_ptr(this_obj);