X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelReestablish.java;h=42c7696cf26aecff061d9237511d7cea215577eb;hb=ffdd56c967087cba7548599934585b8a9a3102e2;hp=458bbcd8e291e36e1a196966f999b8cfe3180573;hpb=5cdb34f643d09f21c147c9d0b2f8888609e43429;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelReestablish.java b/src/main/java/org/ldk/structs/ChannelReestablish.java
index 458bbcd8..42c7696c 100644
--- a/src/main/java/org/ldk/structs/ChannelReestablish.java
+++ b/src/main/java/org/ldk/structs/ChannelReestablish.java
@@ -25,19 +25,23 @@ public class ChannelReestablish extends CommonBase {
 	/**
 	 * The channel ID
 	 */
-	public byte[] get_channel_id() {
-		byte[] ret = bindings.ChannelReestablish_get_channel_id(this.ptr);
+	public ChannelId get_channel_id() {
+		long ret = bindings.ChannelReestablish_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.ChannelReestablish_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+	public void set_channel_id(org.ldk.structs.ChannelId val) {
+		bindings.ChannelReestablish_set_channel_id(this.ptr, val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -76,6 +80,85 @@ public class ChannelReestablish extends CommonBase {
 		Reference.reachabilityFence(val);
 	}
 
+	/**
+	 * Proof that the sender knows the per-commitment secret of a specific commitment transaction
+	 * belonging to the recipient
+	 */
+	public byte[] get_your_last_per_commitment_secret() {
+		byte[] ret = bindings.ChannelReestablish_get_your_last_per_commitment_secret(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	/**
+	 * Proof that the sender knows the per-commitment secret of a specific commitment transaction
+	 * belonging to the recipient
+	 */
+	public void set_your_last_per_commitment_secret(byte[] val) {
+		bindings.ChannelReestablish_set_your_last_per_commitment_secret(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
+	/**
+	 * The sender's per-commitment point for their current commitment transaction
+	 */
+	public byte[] get_my_current_per_commitment_point() {
+		byte[] ret = bindings.ChannelReestablish_get_my_current_per_commitment_point(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	/**
+	 * The sender's per-commitment point for their current commitment transaction
+	 */
+	public void set_my_current_per_commitment_point(byte[] val) {
+		bindings.ChannelReestablish_set_my_current_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
+	/**
+	 * The next funding transaction ID
+	 */
+	public Option_ThirtyTwoBytesZ get_next_funding_txid() {
+		long ret = bindings.ChannelReestablish_get_next_funding_txid(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.Option_ThirtyTwoBytesZ ret_hu_conv = org.ldk.structs.Option_ThirtyTwoBytesZ.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * The next funding transaction ID
+	 */
+	public void set_next_funding_txid(org.ldk.structs.Option_ThirtyTwoBytesZ val) {
+		bindings.ChannelReestablish_set_next_funding_txid(this.ptr, val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * Constructs a new ChannelReestablish given each field
+	 */
+	public static ChannelReestablish of(org.ldk.structs.ChannelId channel_id_arg, long next_local_commitment_number_arg, long next_remote_commitment_number_arg, byte[] your_last_per_commitment_secret_arg, byte[] my_current_per_commitment_point_arg, org.ldk.structs.Option_ThirtyTwoBytesZ next_funding_txid_arg) {
+		long ret = bindings.ChannelReestablish_new(channel_id_arg.ptr, next_local_commitment_number_arg, next_remote_commitment_number_arg, InternalUtils.check_arr_len(your_last_per_commitment_secret_arg, 32), InternalUtils.check_arr_len(my_current_per_commitment_point_arg, 33), next_funding_txid_arg.ptr);
+		Reference.reachabilityFence(channel_id_arg);
+		Reference.reachabilityFence(next_local_commitment_number_arg);
+		Reference.reachabilityFence(next_remote_commitment_number_arg);
+		Reference.reachabilityFence(your_last_per_commitment_secret_arg);
+		Reference.reachabilityFence(my_current_per_commitment_point_arg);
+		Reference.reachabilityFence(next_funding_txid_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelReestablish ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelReestablish(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(next_funding_txid_arg); };
+		return ret_hu_conv;
+	}
+
 	long clone_ptr() {
 		long ret = bindings.ChannelReestablish_clone_ptr(this.ptr);
 		Reference.reachabilityFence(this);
@@ -94,13 +177,25 @@ public class ChannelReestablish extends CommonBase {
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Generates a non-cryptographic 64-bit hash of the ChannelReestablish.
+	 */
+	public long hash() {
+		long ret = bindings.ChannelReestablish_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
 	/**
 	 * Checks if two ChannelReestablishs 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.ChannelReestablish b) {
-		boolean ret = bindings.ChannelReestablish_eq(this.ptr, b == null ? 0 : b.ptr);
+		boolean ret = bindings.ChannelReestablish_eq(this.ptr, b.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(b);
 		if (this != null) { this.ptrs_to.add(b); };