X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FPayer.java;h=5d4590629800368a59df0a58b60a98c8c446a5a4;hb=d87886bb194886ef86d3597a5cdc142b6ccc89e9;hp=bb7c58c035dbbbcafd59761c08185e31c1e50a9d;hpb=99d1a3bd6dc5c7ed1499b30bfc2b4c66ffaf858a;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Payer.java b/src/main/java/org/ldk/structs/Payer.java
index bb7c58c0..5d459062 100644
--- a/src/main/java/org/ldk/structs/Payer.java
+++ b/src/main/java/org/ldk/structs/Payer.java
@@ -4,6 +4,7 @@ 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;
 
 /**
@@ -38,10 +39,18 @@ public class Payer extends CommonBase {
 		 * Note that payment_secret (or a relevant inner pointer) may be NULL or all-0s to represent None
 		 */
 		Result_PaymentIdPaymentSendFailureZ send_payment(Route route, byte[] payment_hash, byte[] payment_secret);
+		/**
+		 * Sends a spontaneous payment over the Lightning Network using the given [`Route`].
+		 */
+		Result_PaymentIdPaymentSendFailureZ send_spontaneous_payment(Route route, byte[] payment_preimage);
 		/**
 		 * Retries a failed payment path for the [`PaymentId`] using the given [`Route`].
 		 */
 		Result_NonePaymentSendFailureZ retry_payment(Route route, byte[] payment_id);
+		/**
+		 * Signals that no further retries for the given payment will occur.
+		 */
+		void abandon_payment(byte[] payment_id);
 	}
 	private static class LDKPayerHolder { Payer held; }
 	public static Payer new_impl(PayerInterface arg) {
@@ -49,25 +58,35 @@ public class Payer extends CommonBase {
 		impl_holder.held = new Payer(new bindings.LDKPayer() {
 			@Override public byte[] node_id() {
 				byte[] ret = arg.node_id();
-				return ret;
+				byte[] result = InternalUtils.check_arr_len(ret, 33);
+				return result;
 			}
 			@Override public long[] first_hops() {
 				ChannelDetails[] ret = arg.first_hops();
-				long[] result = ret != null ? Arrays.stream(ret).mapToLong(ret_conv_16 -> ret_conv_16 == null ? 0 : ret_conv_16.ptr & ~1).toArray() : null;
+				long[] result = ret != null ? Arrays.stream(ret).mapToLong(ret_conv_16 -> ret_conv_16 == null ? 0 : ret_conv_16.clone_ptr()).toArray() : null;
 				return result;
 			}
 			@Override public long send_payment(long route, byte[] payment_hash, byte[] payment_secret) {
 				Route route_hu_conv = null; if (route < 0 || route > 4096) { route_hu_conv = new Route(null, route); }
 				Result_PaymentIdPaymentSendFailureZ ret = arg.send_payment(route_hu_conv, payment_hash, payment_secret);
-				long result = ret != null ? ret.ptr : 0;
+				long result = ret == null ? 0 : ret.clone_ptr();
+				return result;
+			}
+			@Override public long send_spontaneous_payment(long route, byte[] payment_preimage) {
+				Route route_hu_conv = null; if (route < 0 || route > 4096) { route_hu_conv = new Route(null, route); }
+				Result_PaymentIdPaymentSendFailureZ ret = arg.send_spontaneous_payment(route_hu_conv, payment_preimage);
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
 			@Override public long retry_payment(long route, byte[] payment_id) {
 				Route route_hu_conv = null; if (route < 0 || route > 4096) { route_hu_conv = new Route(null, route); }
 				Result_NonePaymentSendFailureZ ret = arg.retry_payment(route_hu_conv, payment_id);
-				long result = ret != null ? ret.ptr : 0;
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
+			@Override public void abandon_payment(byte[] payment_id) {
+				arg.abandon_payment(payment_id);
+			}
 		});
 		return impl_holder.held;
 	}
@@ -76,6 +95,7 @@ public class Payer extends CommonBase {
 	 */
 	public byte[] node_id() {
 		byte[] ret = bindings.Payer_node_id(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -84,8 +104,10 @@ public class Payer extends CommonBase {
 	 */
 	public ChannelDetails[] first_hops() {
 		long[] ret = bindings.Payer_first_hops(this.ptr);
-		ChannelDetails[] ret_conv_16_arr = new ChannelDetails[ret.length];
-		for (int q = 0; q < ret.length; q++) {
+		Reference.reachabilityFence(this);
+		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];
 			ChannelDetails ret_conv_16_hu_conv = null; if (ret_conv_16 < 0 || ret_conv_16 > 4096) { ret_conv_16_hu_conv = new ChannelDetails(null, ret_conv_16); }
 			ret_conv_16_hu_conv.ptrs_to.add(this);
@@ -100,7 +122,25 @@ public class Payer extends CommonBase {
 	 * Note that payment_secret (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
 	public Result_PaymentIdPaymentSendFailureZ send_payment(Route route, byte[] payment_hash, @Nullable byte[] payment_secret) {
-		long ret = bindings.Payer_send_payment(this.ptr, route == null ? 0 : route.ptr & ~1, payment_hash, payment_secret);
+		long ret = bindings.Payer_send_payment(this.ptr, route == null ? 0 : route.ptr & ~1, InternalUtils.check_arr_len(payment_hash, 32), InternalUtils.check_arr_len(payment_secret, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(route);
+		Reference.reachabilityFence(payment_hash);
+		Reference.reachabilityFence(payment_secret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_PaymentIdPaymentSendFailureZ ret_hu_conv = Result_PaymentIdPaymentSendFailureZ.constr_from_ptr(ret);
+		this.ptrs_to.add(route);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Sends a spontaneous payment over the Lightning Network using the given [`Route`].
+	 */
+	public Result_PaymentIdPaymentSendFailureZ send_spontaneous_payment(Route route, byte[] payment_preimage) {
+		long ret = bindings.Payer_send_spontaneous_payment(this.ptr, route == null ? 0 : route.ptr & ~1, InternalUtils.check_arr_len(payment_preimage, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(route);
+		Reference.reachabilityFence(payment_preimage);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_PaymentIdPaymentSendFailureZ ret_hu_conv = Result_PaymentIdPaymentSendFailureZ.constr_from_ptr(ret);
 		this.ptrs_to.add(route);
@@ -111,11 +151,23 @@ public class Payer extends CommonBase {
 	 * Retries a failed payment path for the [`PaymentId`] using the given [`Route`].
 	 */
 	public Result_NonePaymentSendFailureZ retry_payment(Route route, byte[] payment_id) {
-		long ret = bindings.Payer_retry_payment(this.ptr, route == null ? 0 : route.ptr & ~1, payment_id);
+		long ret = bindings.Payer_retry_payment(this.ptr, route == null ? 0 : route.ptr & ~1, InternalUtils.check_arr_len(payment_id, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(route);
+		Reference.reachabilityFence(payment_id);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NonePaymentSendFailureZ ret_hu_conv = Result_NonePaymentSendFailureZ.constr_from_ptr(ret);
 		this.ptrs_to.add(route);
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Signals that no further retries for the given payment will occur.
+	 */
+	public void abandon_payment(byte[] payment_id) {
+		bindings.Payer_abandon_payment(this.ptr, InternalUtils.check_arr_len(payment_id, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(payment_id);
+	}
+
 }