X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelManager.java;h=9359cfb836791ac7181b0efb3deb3d7d915f9771;hb=0e5e33e2bb46c905f6c9478fbfcda11be6b309ff;hp=e3ce61382a98ac6be58f9434692a44106dbe4105;hpb=9d146759e11191b55130be7a1b6988d3f289a168;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelManager.java b/src/main/java/org/ldk/structs/ChannelManager.java
index e3ce6138..9359cfb8 100644
--- a/src/main/java/org/ldk/structs/ChannelManager.java
+++ b/src/main/java/org/ldk/structs/ChannelManager.java
@@ -70,7 +70,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public static ChannelManager of(FeeEstimator fee_est, Watch chain_monitor, BroadcasterInterface tx_broadcaster, Logger logger, KeysInterface keys_manager, UserConfig config, 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 & ~1, params == null ? 0 : params.ptr & ~1);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		ChannelManager ret_hu_conv = new ChannelManager(null, ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		ret_hu_conv.ptrs_to.add(fee_est);
@@ -86,7 +86,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public UserConfig get_current_default_configuration() {
 		long ret = bindings.ChannelManager_get_current_default_configuration(this.ptr);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		UserConfig ret_hu_conv = new UserConfig(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -95,28 +95,37 @@ public class ChannelManager extends CommonBase {
 	/**
 	 * Creates a new outbound channel to the given remote node and with the given value.
 	 * 
-	 * user_id will be provided back as user_channel_id in FundingGenerationReady events to allow
-	 * tracking of which events correspond with which create_channel call. Note that the
-	 * user_channel_id defaults to 0 for inbound channels, so you may wish to avoid using 0 for
-	 * user_id here. user_id has no meaning inside of LDK, it is simply copied to events and
-	 * otherwise ignored.
+	 * `user_channel_id` will be provided back as in
+	 * [`Event::FundingGenerationReady::user_channel_id`] to allow tracking of which events
+	 * correspond with which `create_channel` call. Note that the `user_channel_id` defaults to 0
+	 * for inbound channels, so you may wish to avoid using 0 for `user_channel_id` here.
+	 * `user_channel_id` has no meaning inside of LDK, it is simply copied to events and otherwise
+	 * ignored.
 	 * 
-	 * If successful, will generate a SendOpenChannel message event, so you should probably poll
-	 * PeerManager::process_events afterwards.
-	 * 
-	 * Raises APIError::APIMisuseError when channel_value_satoshis > 2**24 or push_msat is
-	 * greater than channel_value_satoshis * 1k or channel_value_satoshis is < 1000.
+	 * Raises [`APIError::APIMisuseError`] when `channel_value_satoshis` > 2**24 or `push_msat` is
+	 * greater than `channel_value_satoshis * 1k` or `channel_value_satoshis < 1000`.
 	 * 
 	 * Note that we do not check if you are currently connected to the given peer. If no
 	 * connection is available, the outbound `open_channel` message may fail to send, resulting in
-	 * the channel eventually being silently forgotten.
+	 * the channel eventually being silently forgotten (dropped on reload).
+	 * 
+	 * Returns the new Channel's temporary `channel_id`. This ID will appear as
+	 * [`Event::FundingGenerationReady::temporary_channel_id`] and in
+	 * [`ChannelDetails::channel_id`] until after
+	 * [`ChannelManager::funding_transaction_generated`] is called, swapping the Channel's ID for
+	 * one derived from the funding transaction's TXID. If the counterparty rejects the channel
+	 * immediately, this temporary ID will appear in [`Event::ChannelClosed::channel_id`].
+	 * 
+	 * [`Event::FundingGenerationReady::user_channel_id`]: events::Event::FundingGenerationReady::user_channel_id
+	 * [`Event::FundingGenerationReady::temporary_channel_id`]: events::Event::FundingGenerationReady::temporary_channel_id
+	 * [`Event::ChannelClosed::channel_id`]: events::Event::ChannelClosed::channel_id
 	 * 
 	 * Note that override_config (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public Result_NoneAPIErrorZ create_channel(byte[] their_network_key, long channel_value_satoshis, long push_msat, long user_id, @Nullable UserConfig override_config) {
-		long ret = bindings.ChannelManager_create_channel(this.ptr, their_network_key, channel_value_satoshis, push_msat, user_id, override_config == null ? 0 : override_config.ptr & ~1);
-		if (ret < 1024) { return null; }
-		Result_NoneAPIErrorZ ret_hu_conv = Result_NoneAPIErrorZ.constr_from_ptr(ret);
+	public Result__u832APIErrorZ create_channel(byte[] their_network_key, long channel_value_satoshis, long push_msat, long user_channel_id, @Nullable UserConfig override_config) {
+		long ret = bindings.ChannelManager_create_channel(this.ptr, their_network_key, channel_value_satoshis, push_msat, user_channel_id, override_config == null ? 0 : override_config.ptr & ~1);
+		if (ret >= 0 && ret < 1024) { return null; }
+		Result__u832APIErrorZ ret_hu_conv = Result__u832APIErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
 
@@ -177,7 +186,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public Result_NoneAPIErrorZ close_channel(byte[] channel_id) {
 		long ret = bindings.ChannelManager_close_channel(this.ptr, channel_id);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		Result_NoneAPIErrorZ ret_hu_conv = Result_NoneAPIErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
@@ -205,7 +214,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public Result_NoneAPIErrorZ close_channel_with_target_feerate(byte[] channel_id, int target_feerate_sats_per_1000_weight) {
 		long ret = bindings.ChannelManager_close_channel_with_target_feerate(this.ptr, channel_id, target_feerate_sats_per_1000_weight);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		Result_NoneAPIErrorZ ret_hu_conv = Result_NoneAPIErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
@@ -216,7 +225,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public Result_NoneAPIErrorZ force_close_channel(byte[] channel_id) {
 		long ret = bindings.ChannelManager_force_close_channel(this.ptr, channel_id);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		Result_NoneAPIErrorZ ret_hu_conv = Result_NoneAPIErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
@@ -272,9 +281,27 @@ public class ChannelManager extends CommonBase {
 	 * 
 	 * Note that payment_secret (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public Result_NonePaymentSendFailureZ send_payment(Route route, byte[] payment_hash, @Nullable byte[] payment_secret) {
+	public Result_PaymentIdPaymentSendFailureZ send_payment(Route route, byte[] payment_hash, @Nullable byte[] payment_secret) {
 		long ret = bindings.ChannelManager_send_payment(this.ptr, route == null ? 0 : route.ptr & ~1, payment_hash, payment_secret);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
+		Result_PaymentIdPaymentSendFailureZ ret_hu_conv = Result_PaymentIdPaymentSendFailureZ.constr_from_ptr(ret);
+		this.ptrs_to.add(route);
+		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, or if the payment
+	 * for the given `payment_id` cannot be found (likely due to timeout or success).
+	 * 
+	 * [`send_payment`]: [`ChannelManager::send_payment`]
+	 */
+	public Result_NonePaymentSendFailureZ retry_payment(Route route, PaymentId payment_id) {
+		long ret = bindings.ChannelManager_retry_payment(this.ptr, route == null ? 0 : route.ptr & ~1, payment_id == null ? 0 : payment_id.ptr & ~1);
+		if (ret >= 0 && ret < 1024) { return null; }
 		Result_NonePaymentSendFailureZ ret_hu_conv = Result_NonePaymentSendFailureZ.constr_from_ptr(ret);
 		this.ptrs_to.add(route);
 		return ret_hu_conv;
@@ -298,10 +325,10 @@ 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(Route route, @Nullable byte[] payment_preimage) {
+	public Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ send_spontaneous_payment(Route route, @Nullable byte[] payment_preimage) {
 		long ret = bindings.ChannelManager_send_spontaneous_payment(this.ptr, route == null ? 0 : route.ptr & ~1, payment_preimage);
-		if (ret < 1024) { return null; }
-		Result_PaymentHashPaymentSendFailureZ ret_hu_conv = Result_PaymentHashPaymentSendFailureZ.constr_from_ptr(ret);
+		if (ret >= 0 && ret < 1024) { return null; }
+		Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ ret_hu_conv = Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ.constr_from_ptr(ret);
 		this.ptrs_to.add(route);
 		return ret_hu_conv;
 	}
@@ -330,7 +357,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public Result_NoneAPIErrorZ funding_transaction_generated(byte[] temporary_channel_id, byte[] funding_transaction) {
 		long ret = bindings.ChannelManager_funding_transaction_generated(this.ptr, temporary_channel_id, funding_transaction);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		Result_NoneAPIErrorZ ret_hu_conv = Result_NoneAPIErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
@@ -472,7 +499,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public TwoTuple_PaymentHashPaymentSecretZ create_inbound_payment(Option_u64Z min_value_msat, int invoice_expiry_delta_secs, long user_payment_id) {
 		long ret = bindings.ChannelManager_create_inbound_payment(this.ptr, min_value_msat.ptr, invoice_expiry_delta_secs, user_payment_id);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		TwoTuple_PaymentHashPaymentSecretZ ret_hu_conv = new TwoTuple_PaymentHashPaymentSecretZ(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -527,7 +554,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public Result_PaymentSecretAPIErrorZ create_inbound_payment_for_hash(byte[] payment_hash, Option_u64Z min_value_msat, int invoice_expiry_delta_secs, long user_payment_id) {
 		long ret = bindings.ChannelManager_create_inbound_payment_for_hash(this.ptr, payment_hash, min_value_msat.ptr, invoice_expiry_delta_secs, user_payment_id);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		Result_PaymentSecretAPIErrorZ ret_hu_conv = Result_PaymentSecretAPIErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
@@ -538,7 +565,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public MessageSendEventsProvider as_MessageSendEventsProvider() {
 		long ret = bindings.ChannelManager_as_MessageSendEventsProvider(this.ptr);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		MessageSendEventsProvider ret_hu_conv = new MessageSendEventsProvider(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -550,7 +577,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public EventsProvider as_EventsProvider() {
 		long ret = bindings.ChannelManager_as_EventsProvider(this.ptr);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		EventsProvider ret_hu_conv = new EventsProvider(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -562,7 +589,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public Listen as_Listen() {
 		long ret = bindings.ChannelManager_as_Listen(this.ptr);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		Listen ret_hu_conv = new Listen(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -574,7 +601,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public Confirm as_Confirm() {
 		long ret = bindings.ChannelManager_as_Confirm(this.ptr);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		Confirm ret_hu_conv = new Confirm(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -607,7 +634,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public BestBlock current_best_block() {
 		long ret = bindings.ChannelManager_current_best_block(this.ptr);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		BestBlock ret_hu_conv = new BestBlock(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -619,7 +646,7 @@ public class ChannelManager extends CommonBase {
 	 */
 	public ChannelMessageHandler as_ChannelMessageHandler() {
 		long ret = bindings.ChannelManager_as_ChannelMessageHandler(this.ptr);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret < 1024) { return null; }
 		ChannelMessageHandler ret_hu_conv = new ChannelMessageHandler(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;