X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FCommitmentUpdate.java;h=4d8af11b7a6e5c7ec17915da8a0255088f5ad540;hb=2bb592fb946e316dba9f4d1123f8ac72ff4e9bf8;hp=d886689d383bb0b8865dd1ec7c01d54175b54c8a;hpb=3d559f3266fde7c6a21248c10d9a7145125b5e69;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/CommitmentUpdate.java b/src/main/java/org/ldk/structs/CommitmentUpdate.java
index d886689d..4d8af11b 100644
--- a/src/main/java/org/ldk/structs/CommitmentUpdate.java
+++ b/src/main/java/org/ldk/structs/CommitmentUpdate.java
@@ -2,46 +2,252 @@ package org.ldk.structs;
 
 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;
 
+
+/**
+ * Struct used to return values from [`RevokeAndACK`] messages, containing a bunch of commitment
+ * transaction updates if they were pending.
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class CommitmentUpdate extends CommonBase {
 	CommitmentUpdate(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.CommitmentUpdate_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.CommitmentUpdate_free(ptr); }
+	}
+
+	/**
+	 * `update_add_htlc` messages which should be sent
+	 */
+	public UpdateAddHTLC[] get_update_add_htlcs() {
+		long[] ret = bindings.CommitmentUpdate_get_update_add_htlcs(this.ptr);
+		Reference.reachabilityFence(this);
+		int ret_conv_15_len = ret.length;
+		UpdateAddHTLC[] ret_conv_15_arr = new UpdateAddHTLC[ret_conv_15_len];
+		for (int p = 0; p < ret_conv_15_len; p++) {
+			long ret_conv_15 = ret[p];
+			org.ldk.structs.UpdateAddHTLC ret_conv_15_hu_conv = null; if (ret_conv_15 < 0 || ret_conv_15 > 4096) { ret_conv_15_hu_conv = new org.ldk.structs.UpdateAddHTLC(null, ret_conv_15); }
+			if (ret_conv_15_hu_conv != null) { ret_conv_15_hu_conv.ptrs_to.add(this); };
+			ret_conv_15_arr[p] = ret_conv_15_hu_conv;
+		}
+		return ret_conv_15_arr;
+	}
+
+	/**
+	 * `update_add_htlc` messages which should be sent
+	 */
+	public void set_update_add_htlcs(UpdateAddHTLC[] val) {
+		bindings.CommitmentUpdate_set_update_add_htlcs(this.ptr, val != null ? Arrays.stream(val).mapToLong(val_conv_15 -> val_conv_15 == null ? 0 : val_conv_15.ptr).toArray() : null);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		for (UpdateAddHTLC val_conv_15: val) { if (this != null) { this.ptrs_to.add(val_conv_15); }; };
+	}
+
+	/**
+	 * `update_fulfill_htlc` messages which should be sent
+	 */
+	public UpdateFulfillHTLC[] get_update_fulfill_htlcs() {
+		long[] ret = bindings.CommitmentUpdate_get_update_fulfill_htlcs(this.ptr);
+		Reference.reachabilityFence(this);
+		int ret_conv_19_len = ret.length;
+		UpdateFulfillHTLC[] ret_conv_19_arr = new UpdateFulfillHTLC[ret_conv_19_len];
+		for (int t = 0; t < ret_conv_19_len; t++) {
+			long ret_conv_19 = ret[t];
+			org.ldk.structs.UpdateFulfillHTLC ret_conv_19_hu_conv = null; if (ret_conv_19 < 0 || ret_conv_19 > 4096) { ret_conv_19_hu_conv = new org.ldk.structs.UpdateFulfillHTLC(null, ret_conv_19); }
+			if (ret_conv_19_hu_conv != null) { ret_conv_19_hu_conv.ptrs_to.add(this); };
+			ret_conv_19_arr[t] = ret_conv_19_hu_conv;
+		}
+		return ret_conv_19_arr;
+	}
+
+	/**
+	 * `update_fulfill_htlc` messages which should be sent
+	 */
+	public void set_update_fulfill_htlcs(UpdateFulfillHTLC[] val) {
+		bindings.CommitmentUpdate_set_update_fulfill_htlcs(this.ptr, val != null ? Arrays.stream(val).mapToLong(val_conv_19 -> val_conv_19 == null ? 0 : val_conv_19.ptr).toArray() : null);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		for (UpdateFulfillHTLC val_conv_19: val) { if (this != null) { this.ptrs_to.add(val_conv_19); }; };
+	}
+
+	/**
+	 * `update_fail_htlc` messages which should be sent
+	 */
+	public UpdateFailHTLC[] get_update_fail_htlcs() {
+		long[] ret = bindings.CommitmentUpdate_get_update_fail_htlcs(this.ptr);
+		Reference.reachabilityFence(this);
+		int ret_conv_16_len = ret.length;
+		UpdateFailHTLC[] ret_conv_16_arr = new UpdateFailHTLC[ret_conv_16_len];
+		for (int q = 0; q < ret_conv_16_len; q++) {
+			long ret_conv_16 = ret[q];
+			org.ldk.structs.UpdateFailHTLC ret_conv_16_hu_conv = null; if (ret_conv_16 < 0 || ret_conv_16 > 4096) { ret_conv_16_hu_conv = new org.ldk.structs.UpdateFailHTLC(null, ret_conv_16); }
+			if (ret_conv_16_hu_conv != null) { ret_conv_16_hu_conv.ptrs_to.add(this); };
+			ret_conv_16_arr[q] = ret_conv_16_hu_conv;
+		}
+		return ret_conv_16_arr;
+	}
+
+	/**
+	 * `update_fail_htlc` messages which should be sent
+	 */
+	public void set_update_fail_htlcs(UpdateFailHTLC[] val) {
+		bindings.CommitmentUpdate_set_update_fail_htlcs(this.ptr, val != null ? Arrays.stream(val).mapToLong(val_conv_16 -> val_conv_16 == null ? 0 : val_conv_16.ptr).toArray() : null);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		for (UpdateFailHTLC val_conv_16: val) { if (this != null) { this.ptrs_to.add(val_conv_16); }; };
+	}
+
+	/**
+	 * `update_fail_malformed_htlc` messages which should be sent
+	 */
+	public UpdateFailMalformedHTLC[] get_update_fail_malformed_htlcs() {
+		long[] ret = bindings.CommitmentUpdate_get_update_fail_malformed_htlcs(this.ptr);
+		Reference.reachabilityFence(this);
+		int ret_conv_25_len = ret.length;
+		UpdateFailMalformedHTLC[] ret_conv_25_arr = new UpdateFailMalformedHTLC[ret_conv_25_len];
+		for (int z = 0; z < ret_conv_25_len; z++) {
+			long ret_conv_25 = ret[z];
+			org.ldk.structs.UpdateFailMalformedHTLC ret_conv_25_hu_conv = null; if (ret_conv_25 < 0 || ret_conv_25 > 4096) { ret_conv_25_hu_conv = new org.ldk.structs.UpdateFailMalformedHTLC(null, ret_conv_25); }
+			if (ret_conv_25_hu_conv != null) { ret_conv_25_hu_conv.ptrs_to.add(this); };
+			ret_conv_25_arr[z] = ret_conv_25_hu_conv;
+		}
+		return ret_conv_25_arr;
+	}
+
+	/**
+	 * `update_fail_malformed_htlc` messages which should be sent
+	 */
+	public void set_update_fail_malformed_htlcs(UpdateFailMalformedHTLC[] val) {
+		bindings.CommitmentUpdate_set_update_fail_malformed_htlcs(this.ptr, val != null ? Arrays.stream(val).mapToLong(val_conv_25 -> val_conv_25 == null ? 0 : val_conv_25.ptr).toArray() : null);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		for (UpdateFailMalformedHTLC val_conv_25: val) { if (this != null) { this.ptrs_to.add(val_conv_25); }; };
+	}
+
+	/**
+	 * An `update_fee` message which should be sent
+	 * 
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	@Nullable
+	public UpdateFee get_update_fee() {
+		long ret = bindings.CommitmentUpdate_get_update_fee(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.UpdateFee ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UpdateFee(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * An `update_fee` message which should be sent
+	 * 
+	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	public void set_update_fee(@Nullable org.ldk.structs.UpdateFee val) {
+		bindings.CommitmentUpdate_set_update_fee(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
-	public CommitmentUpdate(CommitmentUpdate orig) {
-		super(bindings.CommitmentUpdate_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	/**
+	 * A `commitment_signed` message which should be sent
+	 */
+	public CommitmentSigned get_commitment_signed() {
+		long ret = bindings.CommitmentUpdate_get_commitment_signed(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.CommitmentSigned ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.CommitmentSigned(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
 	}
 
-	// Skipped CommitmentUpdate_set_update_add_htlcs
-	// Skipped CommitmentUpdate_set_update_fulfill_htlcs
-	// Skipped CommitmentUpdate_set_update_fail_htlcs
-	// Skipped CommitmentUpdate_set_update_fail_malformed_htlcs
-	public UpdateFee get_update_fee(CommitmentUpdate this_ptr) {
-		UpdateFee ret = new UpdateFee(null, bindings.CommitmentUpdate_get_update_fee(this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * A `commitment_signed` message which should be sent
+	 */
+	public void set_commitment_signed(org.ldk.structs.CommitmentSigned val) {
+		bindings.CommitmentUpdate_set_commitment_signed(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * Constructs a new CommitmentUpdate given each field
+	 * 
+	 * Note that update_fee_arg (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	public static CommitmentUpdate of(UpdateAddHTLC[] update_add_htlcs_arg, UpdateFulfillHTLC[] update_fulfill_htlcs_arg, UpdateFailHTLC[] update_fail_htlcs_arg, UpdateFailMalformedHTLC[] update_fail_malformed_htlcs_arg, @Nullable org.ldk.structs.UpdateFee update_fee_arg, org.ldk.structs.CommitmentSigned commitment_signed_arg) {
+		long ret = bindings.CommitmentUpdate_new(update_add_htlcs_arg != null ? Arrays.stream(update_add_htlcs_arg).mapToLong(update_add_htlcs_arg_conv_15 -> update_add_htlcs_arg_conv_15 == null ? 0 : update_add_htlcs_arg_conv_15.ptr).toArray() : null, update_fulfill_htlcs_arg != null ? Arrays.stream(update_fulfill_htlcs_arg).mapToLong(update_fulfill_htlcs_arg_conv_19 -> update_fulfill_htlcs_arg_conv_19 == null ? 0 : update_fulfill_htlcs_arg_conv_19.ptr).toArray() : null, update_fail_htlcs_arg != null ? Arrays.stream(update_fail_htlcs_arg).mapToLong(update_fail_htlcs_arg_conv_16 -> update_fail_htlcs_arg_conv_16 == null ? 0 : update_fail_htlcs_arg_conv_16.ptr).toArray() : null, update_fail_malformed_htlcs_arg != null ? Arrays.stream(update_fail_malformed_htlcs_arg).mapToLong(update_fail_malformed_htlcs_arg_conv_25 -> update_fail_malformed_htlcs_arg_conv_25 == null ? 0 : update_fail_malformed_htlcs_arg_conv_25.ptr).toArray() : null, update_fee_arg == null ? 0 : update_fee_arg.ptr, commitment_signed_arg == null ? 0 : commitment_signed_arg.ptr);
+		Reference.reachabilityFence(update_add_htlcs_arg);
+		Reference.reachabilityFence(update_fulfill_htlcs_arg);
+		Reference.reachabilityFence(update_fail_htlcs_arg);
+		Reference.reachabilityFence(update_fail_malformed_htlcs_arg);
+		Reference.reachabilityFence(update_fee_arg);
+		Reference.reachabilityFence(commitment_signed_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.CommitmentUpdate ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.CommitmentUpdate(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+		for (UpdateAddHTLC update_add_htlcs_arg_conv_15: update_add_htlcs_arg) { if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(update_add_htlcs_arg_conv_15); }; };
+		for (UpdateFulfillHTLC update_fulfill_htlcs_arg_conv_19: update_fulfill_htlcs_arg) { if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(update_fulfill_htlcs_arg_conv_19); }; };
+		for (UpdateFailHTLC update_fail_htlcs_arg_conv_16: update_fail_htlcs_arg) { if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(update_fail_htlcs_arg_conv_16); }; };
+		for (UpdateFailMalformedHTLC update_fail_malformed_htlcs_arg_conv_25: update_fail_malformed_htlcs_arg) { if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(update_fail_malformed_htlcs_arg_conv_25); }; };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(update_fee_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(commitment_signed_arg); };
+		return ret_hu_conv;
+	}
+
+	long clone_ptr() {
+		long ret = bindings.CommitmentUpdate_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
-	public void set_update_fee(CommitmentUpdate this_ptr, UpdateFee val) {
-		bindings.CommitmentUpdate_set_update_fee(this_ptr.ptr & ~1, val.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		this.ptrs_to.add(val);
+	/**
+	 * Creates a copy of the CommitmentUpdate
+	 */
+	public CommitmentUpdate clone() {
+		long ret = bindings.CommitmentUpdate_clone(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.CommitmentUpdate ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.CommitmentUpdate(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
 	}
 
-	public CommitmentSigned get_commitment_signed(CommitmentUpdate this_ptr) {
-		CommitmentSigned ret = new CommitmentSigned(null, bindings.CommitmentUpdate_get_commitment_signed(this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Generates a non-cryptographic 64-bit hash of the CommitmentUpdate.
+	 */
+	public long hash() {
+		long ret = bindings.CommitmentUpdate_hash(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
-	public void set_commitment_signed(CommitmentUpdate this_ptr, CommitmentSigned val) {
-		bindings.CommitmentUpdate_set_commitment_signed(this_ptr.ptr & ~1, val.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		this.ptrs_to.add(val);
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
+	/**
+	 * Checks if two CommitmentUpdates 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.CommitmentUpdate b) {
+		boolean ret = bindings.CommitmentUpdate_eq(this.ptr, b == null ? 0 : b.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(b);
+		if (this != null) { this.ptrs_to.add(b); };
+		return ret;
 	}
 
-	// Skipped CommitmentUpdate_new
+	@Override public boolean equals(Object o) {
+		if (!(o instanceof CommitmentUpdate)) return false;
+		return this.eq((CommitmentUpdate)o);
+	}
 }