X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FInvoicePayer.java;h=d8a7022e2e4c6bffa2a1dbaddaefc4f2d040de5f;hb=1854b5cebef22ace9e9e4dd191f609818df9ce08;hp=a54ee10b19506fcd2d2c0393704b5604aac149aa;hpb=5fd405f7a48aaeca779c45c88ec6b3d3d3dbf0e4;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/InvoicePayer.java b/src/main/java/org/ldk/structs/InvoicePayer.java
index a54ee10b..d8a7022e 100644
--- a/src/main/java/org/ldk/structs/InvoicePayer.java
+++ b/src/main/java/org/ldk/structs/InvoicePayer.java
@@ -4,11 +4,16 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import java.lang.ref.Reference;
 import javax.annotation.Nullable;
 
 
 /**
- * A utility for paying [`Invoice]`s.
+ * A utility for paying [`Invoice`]s and sending spontaneous payments.
+ * 
+ * See [module-level documentation] for details.
+ * 
+ * [module-level documentation]: crate::payment
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class InvoicePayer extends CommonBase {
@@ -25,8 +30,14 @@ public class InvoicePayer extends CommonBase {
 	 * Will forward any [`Event::PaymentPathFailed`] events to the decorated `event_handler` once
 	 * `retry_attempts` has been exceeded for a given [`Invoice`].
 	 */
-	public static InvoicePayer of(Payer payer, Router router, LockableScore scorer, Logger logger, EventHandler event_handler, RetryAttempts retry_attempts) {
+	public static InvoicePayer of(Payer payer, Router router, MultiThreadedLockableScore scorer, Logger logger, EventHandler event_handler, RetryAttempts retry_attempts) {
 		long ret = bindings.InvoicePayer_new(payer == null ? 0 : payer.ptr, router == null ? 0 : router.ptr, scorer == null ? 0 : scorer.ptr & ~1, logger == null ? 0 : logger.ptr, event_handler == null ? 0 : event_handler.ptr, retry_attempts == null ? 0 : retry_attempts.ptr & ~1);
+		Reference.reachabilityFence(payer);
+		Reference.reachabilityFence(router);
+		Reference.reachabilityFence(scorer);
+		Reference.reachabilityFence(logger);
+		Reference.reachabilityFence(event_handler);
+		Reference.reachabilityFence(retry_attempts);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		InvoicePayer ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new InvoicePayer(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
@@ -47,6 +58,8 @@ public class InvoicePayer extends CommonBase {
 	 */
 	public Result_PaymentIdPaymentErrorZ pay_invoice(Invoice invoice) {
 		long ret = bindings.InvoicePayer_pay_invoice(this.ptr, invoice == null ? 0 : invoice.ptr & ~1);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(invoice);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_PaymentIdPaymentErrorZ ret_hu_conv = Result_PaymentIdPaymentErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(invoice);
@@ -63,12 +76,34 @@ public class InvoicePayer extends CommonBase {
 	 */
 	public Result_PaymentIdPaymentErrorZ pay_zero_value_invoice(Invoice invoice, long amount_msats) {
 		long ret = bindings.InvoicePayer_pay_zero_value_invoice(this.ptr, invoice == null ? 0 : invoice.ptr & ~1, amount_msats);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(invoice);
+		Reference.reachabilityFence(amount_msats);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_PaymentIdPaymentErrorZ ret_hu_conv = Result_PaymentIdPaymentErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(invoice);
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Pays `pubkey` an amount using the hash of the given preimage, caching it for later use in
+	 * case a retry is needed.
+	 * 
+	 * You should ensure that `payment_preimage` is unique and that its `payment_hash` has never
+	 * been paid before. Because [`InvoicePayer`] is stateless no effort is made to do so for you.
+	 */
+	public Result_PaymentIdPaymentErrorZ pay_pubkey(byte[] pubkey, byte[] payment_preimage, long amount_msats, int final_cltv_expiry_delta) {
+		long ret = bindings.InvoicePayer_pay_pubkey(this.ptr, InternalUtils.check_arr_len(pubkey, 33), InternalUtils.check_arr_len(payment_preimage, 32), amount_msats, final_cltv_expiry_delta);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(pubkey);
+		Reference.reachabilityFence(payment_preimage);
+		Reference.reachabilityFence(amount_msats);
+		Reference.reachabilityFence(final_cltv_expiry_delta);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_PaymentIdPaymentErrorZ ret_hu_conv = Result_PaymentIdPaymentErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
+	}
+
 	/**
 	 * Removes the payment cached by the given payment hash.
 	 * 
@@ -77,6 +112,8 @@ public class InvoicePayer extends CommonBase {
 	 */
 	public void remove_cached_payment(byte[] payment_hash) {
 		bindings.InvoicePayer_remove_cached_payment(this.ptr, InternalUtils.check_arr_len(payment_hash, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(payment_hash);
 	}
 
 	/**
@@ -85,6 +122,7 @@ public class InvoicePayer extends CommonBase {
 	 */
 	public EventHandler as_EventHandler() {
 		long ret = bindings.InvoicePayer_as_EventHandler(this.ptr);
+		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		EventHandler ret_hu_conv = new EventHandler(null, ret);
 		ret_hu_conv.ptrs_to.add(this);