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

diff --git a/src/main/java/org/ldk/structs/Score.java b/src/main/java/org/ldk/structs/Score.java
index 902dc021..3f6f7d1a 100644
--- a/src/main/java/org/ldk/structs/Score.java
+++ b/src/main/java/org/ldk/structs/Score.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;
 
 /**
@@ -27,14 +28,28 @@ public class Score extends CommonBase {
 
 	public static interface ScoreInterface {
 		/**
-		 * Returns the fee in msats willing to be paid to avoid routing through the given channel
-		 * in the direction from `source` to `target`.
+		 * Returns the fee in msats willing to be paid to avoid routing `send_amt_msat` through the
+		 * given channel in the direction from `source` to `target`.
+		 * 
+		 * The channel's capacity (less any other MPP parts which are also being considered for use in
+		 * the same payment) is given by `channel_capacity_msat`. It may be guessed from various
+		 * sources or assumed from no data at all.
+		 * 
+		 * For hints provided in the invoice, we assume the channel has sufficient capacity to accept
+		 * the invoice's full amount, and provide a `channel_capacity_msat` of `None`. In all other
+		 * cases it is set to `Some`, even if we're guessing at the channel value.
+		 * 
+		 * Your code should be overflow-safe through a `channel_capacity_msat` of 21 million BTC.
 		 */
-		long channel_penalty_msat(long short_channel_id, NodeId source, NodeId target);
+		long channel_penalty_msat(long short_channel_id, long send_amt_msat, Option_u64Z channel_capacity_msat, NodeId source, NodeId target);
 		/**
 		 * Handles updating channel penalties after failing to route through a channel.
 		 */
 		void payment_path_failed(RouteHop[] path, long short_channel_id);
+		/**
+		 * Handles updating channel penalties after successfully routing along a path.
+		 */
+		void payment_path_successful(RouteHop[] path);
 		/**
 		 * Serialize the object into a byte array
 		 */
@@ -44,10 +59,12 @@ public class Score extends CommonBase {
 	public static Score new_impl(ScoreInterface arg) {
 		final LDKScoreHolder impl_holder = new LDKScoreHolder();
 		impl_holder.held = new Score(new bindings.LDKScore() {
-			@Override public long channel_penalty_msat(long short_channel_id, long source, long target) {
+			@Override public long channel_penalty_msat(long short_channel_id, long send_amt_msat, long channel_capacity_msat, long source, long target) {
+				Option_u64Z channel_capacity_msat_hu_conv = Option_u64Z.constr_from_ptr(channel_capacity_msat);
+				channel_capacity_msat_hu_conv.ptrs_to.add(this);
 				NodeId source_hu_conv = null; if (source < 0 || source > 4096) { source_hu_conv = new NodeId(null, source); }
 				NodeId target_hu_conv = null; if (target < 0 || target > 4096) { target_hu_conv = new NodeId(null, target); }
-				long ret = arg.channel_penalty_msat(short_channel_id, source_hu_conv, target_hu_conv);
+				long ret = arg.channel_penalty_msat(short_channel_id, send_amt_msat, channel_capacity_msat_hu_conv, source_hu_conv, target_hu_conv);
 				return ret;
 			}
 			@Override public void payment_path_failed(long[] path, long short_channel_id) {
@@ -60,6 +77,16 @@ public class Score extends CommonBase {
 				}
 				arg.payment_path_failed(path_conv_10_arr, short_channel_id);
 			}
+			@Override public void payment_path_successful(long[] path) {
+				RouteHop[] path_conv_10_arr = new RouteHop[path.length];
+				for (int k = 0; k < path.length; k++) {
+					long path_conv_10 = path[k];
+					RouteHop path_conv_10_hu_conv = null; if (path_conv_10 < 0 || path_conv_10 > 4096) { path_conv_10_hu_conv = new RouteHop(null, path_conv_10); }
+					path_conv_10_hu_conv.ptrs_to.add(this);
+					path_conv_10_arr[k] = path_conv_10_hu_conv;
+				}
+				arg.payment_path_successful(path_conv_10_arr);
+			}
 			@Override public byte[] write() {
 				byte[] ret = arg.write();
 				return ret;
@@ -68,11 +95,27 @@ public class Score extends CommonBase {
 		return impl_holder.held;
 	}
 	/**
-	 * Returns the fee in msats willing to be paid to avoid routing through the given channel
-	 * in the direction from `source` to `target`.
+	 * Returns the fee in msats willing to be paid to avoid routing `send_amt_msat` through the
+	 * given channel in the direction from `source` to `target`.
+	 * 
+	 * The channel's capacity (less any other MPP parts which are also being considered for use in
+	 * the same payment) is given by `channel_capacity_msat`. It may be guessed from various
+	 * sources or assumed from no data at all.
+	 * 
+	 * For hints provided in the invoice, we assume the channel has sufficient capacity to accept
+	 * the invoice's full amount, and provide a `channel_capacity_msat` of `None`. In all other
+	 * cases it is set to `Some`, even if we're guessing at the channel value.
+	 * 
+	 * Your code should be overflow-safe through a `channel_capacity_msat` of 21 million BTC.
 	 */
-	public long channel_penalty_msat(long short_channel_id, NodeId source, NodeId target) {
-		long ret = bindings.Score_channel_penalty_msat(this.ptr, short_channel_id, source == null ? 0 : source.ptr & ~1, target == null ? 0 : target.ptr & ~1);
+	public long channel_penalty_msat(long short_channel_id, long send_amt_msat, Option_u64Z channel_capacity_msat, NodeId source, NodeId target) {
+		long ret = bindings.Score_channel_penalty_msat(this.ptr, short_channel_id, send_amt_msat, channel_capacity_msat.ptr, source == null ? 0 : source.ptr & ~1, target == null ? 0 : target.ptr & ~1);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(short_channel_id);
+		Reference.reachabilityFence(send_amt_msat);
+		Reference.reachabilityFence(channel_capacity_msat);
+		Reference.reachabilityFence(source);
+		Reference.reachabilityFence(target);
 		this.ptrs_to.add(source);
 		this.ptrs_to.add(target);
 		return ret;
@@ -83,6 +126,18 @@ public class Score extends CommonBase {
 	 */
 	public void payment_path_failed(RouteHop[] path, long short_channel_id) {
 		bindings.Score_payment_path_failed(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr & ~1).toArray() : null, short_channel_id);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(path);
+		Reference.reachabilityFence(short_channel_id);
+	}
+
+	/**
+	 * Handles updating channel penalties after successfully routing along a path.
+	 */
+	public void payment_path_successful(RouteHop[] path) {
+		bindings.Score_payment_path_successful(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr & ~1).toArray() : null);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(path);
 	}
 
 	/**
@@ -90,6 +145,7 @@ public class Score extends CommonBase {
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.Score_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}