X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUpdateAddHTLC.java;h=b6986b982270038b2207234e816962521360183e;hb=ffdd56c967087cba7548599934585b8a9a3102e2;hp=0b479f6cfdc6c846b169e24d49ce78a2b9a622f1;hpb=3c60e0fd0da579be9932801c1be2b32014c944a5;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/UpdateAddHTLC.java b/src/main/java/org/ldk/structs/UpdateAddHTLC.java
index 0b479f6c..b6986b98 100644
--- a/src/main/java/org/ldk/structs/UpdateAddHTLC.java
+++ b/src/main/java/org/ldk/structs/UpdateAddHTLC.java
@@ -9,7 +9,9 @@ import javax.annotation.Nullable;
 
 
 /**
- * An update_add_htlc message to be sent or received from a peer
+ * An [`update_add_htlc`] message to be sent to or received from a peer.
+ * 
+ * [`update_add_htlc`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#adding-an-htlc-update_add_htlc
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class UpdateAddHTLC extends CommonBase {
@@ -23,19 +25,23 @@ public class UpdateAddHTLC extends CommonBase {
 	/**
 	 * The channel ID
 	 */
-	public byte[] get_channel_id() {
-		byte[] ret = bindings.UpdateAddHTLC_get_channel_id(this.ptr);
+	public ChannelId get_channel_id() {
+		long ret = bindings.UpdateAddHTLC_get_channel_id(this.ptr);
 		Reference.reachabilityFence(this);
-		return ret;
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelId ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelId(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
 	}
 
 	/**
 	 * The channel ID
 	 */
-	public void set_channel_id(byte[] val) {
-		bindings.UpdateAddHTLC_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+	public void set_channel_id(org.ldk.structs.ChannelId val) {
+		bindings.UpdateAddHTLC_set_channel_id(this.ptr, val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -110,6 +116,105 @@ public class UpdateAddHTLC extends CommonBase {
 		Reference.reachabilityFence(val);
 	}
 
+	/**
+	 * The extra fee skimmed by the sender of this message. See
+	 * [`ChannelConfig::accept_underpaying_htlcs`].
+	 * 
+	 * [`ChannelConfig::accept_underpaying_htlcs`]: crate::util::config::ChannelConfig::accept_underpaying_htlcs
+	 */
+	public Option_u64Z get_skimmed_fee_msat() {
+		long ret = bindings.UpdateAddHTLC_get_skimmed_fee_msat(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.Option_u64Z ret_hu_conv = org.ldk.structs.Option_u64Z.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * The extra fee skimmed by the sender of this message. See
+	 * [`ChannelConfig::accept_underpaying_htlcs`].
+	 * 
+	 * [`ChannelConfig::accept_underpaying_htlcs`]: crate::util::config::ChannelConfig::accept_underpaying_htlcs
+	 */
+	public void set_skimmed_fee_msat(org.ldk.structs.Option_u64Z val) {
+		bindings.UpdateAddHTLC_set_skimmed_fee_msat(this.ptr, val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * The onion routing packet with encrypted data for the next hop.
+	 */
+	public OnionPacket get_onion_routing_packet() {
+		long ret = bindings.UpdateAddHTLC_get_onion_routing_packet(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.OnionPacket ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.OnionPacket(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * The onion routing packet with encrypted data for the next hop.
+	 */
+	public void set_onion_routing_packet(org.ldk.structs.OnionPacket val) {
+		bindings.UpdateAddHTLC_set_onion_routing_packet(this.ptr, val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * Provided if we are relaying or receiving a payment within a blinded path, to decrypt the onion
+	 * routing packet and the recipient-provided encrypted payload within.
+	 * 
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	@Nullable
+	public byte[] get_blinding_point() {
+		byte[] ret = bindings.UpdateAddHTLC_get_blinding_point(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	/**
+	 * Provided if we are relaying or receiving a payment within a blinded path, to decrypt the onion
+	 * routing packet and the recipient-provided encrypted payload within.
+	 * 
+	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	public void set_blinding_point(@Nullable byte[] val) {
+		bindings.UpdateAddHTLC_set_blinding_point(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
+	/**
+	 * Constructs a new UpdateAddHTLC given each field
+	 * 
+	 * Note that blinding_point_arg (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	public static UpdateAddHTLC of(org.ldk.structs.ChannelId channel_id_arg, long htlc_id_arg, long amount_msat_arg, byte[] payment_hash_arg, int cltv_expiry_arg, org.ldk.structs.Option_u64Z skimmed_fee_msat_arg, org.ldk.structs.OnionPacket onion_routing_packet_arg, @Nullable byte[] blinding_point_arg) {
+		long ret = bindings.UpdateAddHTLC_new(channel_id_arg.ptr, htlc_id_arg, amount_msat_arg, InternalUtils.check_arr_len(payment_hash_arg, 32), cltv_expiry_arg, skimmed_fee_msat_arg.ptr, onion_routing_packet_arg.ptr, InternalUtils.check_arr_len(blinding_point_arg, 33));
+		Reference.reachabilityFence(channel_id_arg);
+		Reference.reachabilityFence(htlc_id_arg);
+		Reference.reachabilityFence(amount_msat_arg);
+		Reference.reachabilityFence(payment_hash_arg);
+		Reference.reachabilityFence(cltv_expiry_arg);
+		Reference.reachabilityFence(skimmed_fee_msat_arg);
+		Reference.reachabilityFence(onion_routing_packet_arg);
+		Reference.reachabilityFence(blinding_point_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.UpdateAddHTLC ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UpdateAddHTLC(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(channel_id_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(skimmed_fee_msat_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(onion_routing_packet_arg); };
+		return ret_hu_conv;
+	}
+
 	long clone_ptr() {
 		long ret = bindings.UpdateAddHTLC_clone_ptr(this.ptr);
 		Reference.reachabilityFence(this);
@@ -128,6 +233,35 @@ public class UpdateAddHTLC extends CommonBase {
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Generates a non-cryptographic 64-bit hash of the UpdateAddHTLC.
+	 */
+	public long hash() {
+		long ret = bindings.UpdateAddHTLC_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
+	/**
+	 * Checks if two UpdateAddHTLCs contain equal inner contents.
+	 * This ignores pointers and is_owned flags and looks at the values in fields.
+	 * Two objects with NULL inner values will be considered "equal" here.
+	 */
+	public boolean eq(org.ldk.structs.UpdateAddHTLC b) {
+		boolean ret = bindings.UpdateAddHTLC_eq(this.ptr, b.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(b);
+		if (this != null) { this.ptrs_to.add(b); };
+		return ret;
+	}
+
+	@Override public boolean equals(Object o) {
+		if (!(o instanceof UpdateAddHTLC)) return false;
+		return this.eq((UpdateAddHTLC)o);
+	}
 	/**
 	 * Serialize the UpdateAddHTLC object into a byte array which can be read by UpdateAddHTLC_read
 	 */