X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRouter.java;h=856b73d76a7c65661703e6eb2625c4345e34f87f;hb=76982ad5233afc2759d085bb243f33149369ab9b;hp=294fc2545f794d5385f666d56d7e520b8021b173;hpb=227672ae3d27961f63d45913aad01dbae1f53e99;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Router.java b/src/main/java/org/ldk/structs/Router.java
index 294fc254..856b73d7 100644
--- a/src/main/java/org/ldk/structs/Router.java
+++ b/src/main/java/org/ldk/structs/Router.java
@@ -30,13 +30,29 @@ public class Router extends CommonBase {
 		 * 
 		 * Note that first_hops (or a relevant inner pointer) may be NULL or all-0s to represent None
 		 */
-		Result_RouteLightningErrorZ find_route(byte[] payer, RouteParameters route_params, byte[] payment_hash, ChannelDetails[] first_hops, Score scorer);
+		Result_RouteLightningErrorZ find_route(byte[] payer, RouteParameters route_params, byte[] payment_hash, ChannelDetails[] first_hops, InFlightHtlcs inflight_htlcs);
+		/**
+		 * Lets the router know that payment through a specific path has failed.
+		 */
+		void notify_payment_path_failed(RouteHop[] path, long short_channel_id);
+		/**
+		 * Lets the router know that payment through a specific path was successful.
+		 */
+		void notify_payment_path_successful(RouteHop[] path);
+		/**
+		 * Lets the router know that a payment probe was successful.
+		 */
+		void notify_payment_probe_successful(RouteHop[] path);
+		/**
+		 * Lets the router know that a payment probe failed.
+		 */
+		void notify_payment_probe_failed(RouteHop[] path, long short_channel_id);
 	}
 	private static class LDKRouterHolder { Router held; }
 	public static Router new_impl(RouterInterface arg) {
 		final LDKRouterHolder impl_holder = new LDKRouterHolder();
 		impl_holder.held = new Router(new bindings.LDKRouter() {
-			@Override public long find_route(byte[] payer, long route_params, byte[] payment_hash, long[] first_hops, long scorer) {
+			@Override public long find_route(byte[] payer, long route_params, byte[] payment_hash, long[] first_hops, long inflight_htlcs) {
 				org.ldk.structs.RouteParameters route_params_hu_conv = null; if (route_params < 0 || route_params > 4096) { route_params_hu_conv = new org.ldk.structs.RouteParameters(null, route_params); }
 				int first_hops_conv_16_len = first_hops.length;
 				ChannelDetails[] first_hops_conv_16_arr = new ChannelDetails[first_hops_conv_16_len];
@@ -46,13 +62,61 @@ public class Router extends CommonBase {
 					if (first_hops_conv_16_hu_conv != null) { first_hops_conv_16_hu_conv.ptrs_to.add(this); };
 					first_hops_conv_16_arr[q] = first_hops_conv_16_hu_conv;
 				}
-				Score ret_hu_conv = new Score(null, scorer);
-				if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
-				Result_RouteLightningErrorZ ret = arg.find_route(payer, route_params_hu_conv, payment_hash, first_hops_conv_16_arr, ret_hu_conv);
+				org.ldk.structs.InFlightHtlcs inflight_htlcs_hu_conv = null; if (inflight_htlcs < 0 || inflight_htlcs > 4096) { inflight_htlcs_hu_conv = new org.ldk.structs.InFlightHtlcs(null, inflight_htlcs); }
+				if (inflight_htlcs_hu_conv != null) { inflight_htlcs_hu_conv.ptrs_to.add(this); };
+				Result_RouteLightningErrorZ ret = arg.find_route(payer, route_params_hu_conv, payment_hash, first_hops_conv_16_arr, inflight_htlcs_hu_conv);
 				Reference.reachabilityFence(arg);
 				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
+			@Override public void notify_payment_path_failed(long[] path, long short_channel_id) {
+				int path_conv_10_len = path.length;
+				RouteHop[] path_conv_10_arr = new RouteHop[path_conv_10_len];
+				for (int k = 0; k < path_conv_10_len; k++) {
+					long path_conv_10 = path[k];
+					org.ldk.structs.RouteHop path_conv_10_hu_conv = null; if (path_conv_10 < 0 || path_conv_10 > 4096) { path_conv_10_hu_conv = new org.ldk.structs.RouteHop(null, path_conv_10); }
+					if (path_conv_10_hu_conv != null) { path_conv_10_hu_conv.ptrs_to.add(this); };
+					path_conv_10_arr[k] = path_conv_10_hu_conv;
+				}
+				arg.notify_payment_path_failed(path_conv_10_arr, short_channel_id);
+				Reference.reachabilityFence(arg);
+			}
+			@Override public void notify_payment_path_successful(long[] path) {
+				int path_conv_10_len = path.length;
+				RouteHop[] path_conv_10_arr = new RouteHop[path_conv_10_len];
+				for (int k = 0; k < path_conv_10_len; k++) {
+					long path_conv_10 = path[k];
+					org.ldk.structs.RouteHop path_conv_10_hu_conv = null; if (path_conv_10 < 0 || path_conv_10 > 4096) { path_conv_10_hu_conv = new org.ldk.structs.RouteHop(null, path_conv_10); }
+					if (path_conv_10_hu_conv != null) { path_conv_10_hu_conv.ptrs_to.add(this); };
+					path_conv_10_arr[k] = path_conv_10_hu_conv;
+				}
+				arg.notify_payment_path_successful(path_conv_10_arr);
+				Reference.reachabilityFence(arg);
+			}
+			@Override public void notify_payment_probe_successful(long[] path) {
+				int path_conv_10_len = path.length;
+				RouteHop[] path_conv_10_arr = new RouteHop[path_conv_10_len];
+				for (int k = 0; k < path_conv_10_len; k++) {
+					long path_conv_10 = path[k];
+					org.ldk.structs.RouteHop path_conv_10_hu_conv = null; if (path_conv_10 < 0 || path_conv_10 > 4096) { path_conv_10_hu_conv = new org.ldk.structs.RouteHop(null, path_conv_10); }
+					if (path_conv_10_hu_conv != null) { path_conv_10_hu_conv.ptrs_to.add(this); };
+					path_conv_10_arr[k] = path_conv_10_hu_conv;
+				}
+				arg.notify_payment_probe_successful(path_conv_10_arr);
+				Reference.reachabilityFence(arg);
+			}
+			@Override public void notify_payment_probe_failed(long[] path, long short_channel_id) {
+				int path_conv_10_len = path.length;
+				RouteHop[] path_conv_10_arr = new RouteHop[path_conv_10_len];
+				for (int k = 0; k < path_conv_10_len; k++) {
+					long path_conv_10 = path[k];
+					org.ldk.structs.RouteHop path_conv_10_hu_conv = null; if (path_conv_10 < 0 || path_conv_10 > 4096) { path_conv_10_hu_conv = new org.ldk.structs.RouteHop(null, path_conv_10); }
+					if (path_conv_10_hu_conv != null) { path_conv_10_hu_conv.ptrs_to.add(this); };
+					path_conv_10_arr[k] = path_conv_10_hu_conv;
+				}
+				arg.notify_payment_probe_failed(path_conv_10_arr, short_channel_id);
+				Reference.reachabilityFence(arg);
+			}
 		});
 		return impl_holder.held;
 	}
@@ -61,20 +125,70 @@ public class Router extends CommonBase {
 	 * 
 	 * Note that first_hops (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public Result_RouteLightningErrorZ find_route(byte[] payer, RouteParameters route_params, byte[] payment_hash, @Nullable ChannelDetails[] first_hops, Score scorer) {
-		long ret = bindings.Router_find_route(this.ptr, InternalUtils.check_arr_len(payer, 33), route_params == null ? 0 : route_params.ptr, InternalUtils.check_arr_len(payment_hash, 32), first_hops != null ? Arrays.stream(first_hops).mapToLong(first_hops_conv_16 -> first_hops_conv_16 == null ? 0 : first_hops_conv_16.ptr).toArray() : null, scorer == null ? 0 : scorer.ptr);
+	public Result_RouteLightningErrorZ find_route(byte[] payer, RouteParameters route_params, byte[] payment_hash, @Nullable ChannelDetails[] first_hops, InFlightHtlcs inflight_htlcs) {
+		long ret = bindings.Router_find_route(this.ptr, InternalUtils.check_arr_len(payer, 33), route_params == null ? 0 : route_params.ptr, InternalUtils.check_arr_len(payment_hash, 32), first_hops != null ? Arrays.stream(first_hops).mapToLong(first_hops_conv_16 -> first_hops_conv_16 == null ? 0 : first_hops_conv_16.ptr).toArray() : null, inflight_htlcs == null ? 0 : inflight_htlcs.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(payer);
 		Reference.reachabilityFence(route_params);
 		Reference.reachabilityFence(payment_hash);
 		Reference.reachabilityFence(first_hops);
-		Reference.reachabilityFence(scorer);
+		Reference.reachabilityFence(inflight_htlcs);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_RouteLightningErrorZ ret_hu_conv = Result_RouteLightningErrorZ.constr_from_ptr(ret);
 		if (this != null) { this.ptrs_to.add(route_params); };
 		for (ChannelDetails first_hops_conv_16: first_hops) { if (this != null) { this.ptrs_to.add(first_hops_conv_16); }; };
-		if (this != null) { this.ptrs_to.add(scorer); };
+		if (this != null) { this.ptrs_to.add(inflight_htlcs); };
+		// Due to rust's strict-ownership memory model, in some cases we need to "move"
+		// an object to pass exclusive ownership to the function being called.
+		// In most cases, we avoid this being visible in GC'd languages by cloning the object
+		// at the FFI layer, creating a new object which Rust can claim ownership of
+		// However, in some cases (eg here), there is no way to clone an object, and thus
+		// we actually have to pass full ownership to Rust.
+		// Thus, after this call, inflight_htlcs is reset to null and is now a dummy object.
+		inflight_htlcs.ptr = 0;;
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Lets the router know that payment through a specific path has failed.
+	 */
+	public void notify_payment_path_failed(RouteHop[] path, long short_channel_id) {
+		bindings.Router_notify_payment_path_failed(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr).toArray() : null, short_channel_id);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(path);
+		Reference.reachabilityFence(short_channel_id);
+		for (RouteHop path_conv_10: path) { if (this != null) { this.ptrs_to.add(path_conv_10); }; };
+	}
+
+	/**
+	 * Lets the router know that payment through a specific path was successful.
+	 */
+	public void notify_payment_path_successful(RouteHop[] path) {
+		bindings.Router_notify_payment_path_successful(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr).toArray() : null);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(path);
+		for (RouteHop path_conv_10: path) { if (this != null) { this.ptrs_to.add(path_conv_10); }; };
+	}
+
+	/**
+	 * Lets the router know that a payment probe was successful.
+	 */
+	public void notify_payment_probe_successful(RouteHop[] path) {
+		bindings.Router_notify_payment_probe_successful(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr).toArray() : null);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(path);
+		for (RouteHop path_conv_10: path) { if (this != null) { this.ptrs_to.add(path_conv_10); }; };
+	}
+
+	/**
+	 * Lets the router know that a payment probe failed.
+	 */
+	public void notify_payment_probe_failed(RouteHop[] path, long short_channel_id) {
+		bindings.Router_notify_payment_probe_failed(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr).toArray() : null, short_channel_id);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(path);
+		Reference.reachabilityFence(short_channel_id);
+		for (RouteHop path_conv_10: path) { if (this != null) { this.ptrs_to.add(path_conv_10); }; };
+	}
+
 }