X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FCommitmentUpdate.java;h=049a26c7407530de457a0493ab96860a3ae5a272;hb=b9716bc7ee492882e4643c9365971fef3761989f;hp=dbd15bc6b45046202c7e90c72dddcc631d975cc8;hpb=b6cc0960eaee5a5bbc7fde79a56152d6dcd649d8;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/CommitmentUpdate.java b/src/main/java/org/ldk/structs/CommitmentUpdate.java
index dbd15bc6..049a26c7 100644
--- a/src/main/java/org/ldk/structs/CommitmentUpdate.java
+++ b/src/main/java/org/ldk/structs/CommitmentUpdate.java
@@ -4,6 +4,7 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
 
 /**
@@ -19,43 +20,107 @@ public class CommitmentUpdate extends CommonBase {
 		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);
+		UpdateAddHTLC[] ret_conv_15_arr = new UpdateAddHTLC[ret.length];
+		for (int p = 0; p < ret.length; p++) {
+			long ret_conv_15 = ret[p];
+			UpdateAddHTLC ret_conv_15_hu_conv = new UpdateAddHTLC(null, ret_conv_15);
+			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, Arrays.stream(val).mapToLong(val_conv_15 -> val_conv_15 == null ? 0 : val_conv_15.ptr & ~1).toArray());
-		/* TODO 2 UpdateAddHTLC  */;
+		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 & ~1).toArray() : null);
+		for (UpdateAddHTLC val_conv_15: val) { 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);
+		UpdateFulfillHTLC[] ret_conv_19_arr = new UpdateFulfillHTLC[ret.length];
+		for (int t = 0; t < ret.length; t++) {
+			long ret_conv_19 = ret[t];
+			UpdateFulfillHTLC ret_conv_19_hu_conv = new UpdateFulfillHTLC(null, ret_conv_19);
+			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, Arrays.stream(val).mapToLong(val_conv_19 -> val_conv_19 == null ? 0 : val_conv_19.ptr & ~1).toArray());
-		/* TODO 2 UpdateFulfillHTLC  */;
+		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 & ~1).toArray() : null);
+		for (UpdateFulfillHTLC val_conv_19: val) { 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);
+		UpdateFailHTLC[] ret_conv_16_arr = new UpdateFailHTLC[ret.length];
+		for (int q = 0; q < ret.length; q++) {
+			long ret_conv_16 = ret[q];
+			UpdateFailHTLC ret_conv_16_hu_conv = new UpdateFailHTLC(null, ret_conv_16);
+			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, Arrays.stream(val).mapToLong(val_conv_16 -> val_conv_16 == null ? 0 : val_conv_16.ptr & ~1).toArray());
-		/* TODO 2 UpdateFailHTLC  */;
+		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 & ~1).toArray() : null);
+		for (UpdateFailHTLC val_conv_16: val) { 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);
+		UpdateFailMalformedHTLC[] ret_conv_25_arr = new UpdateFailMalformedHTLC[ret.length];
+		for (int z = 0; z < ret.length; z++) {
+			long ret_conv_25 = ret[z];
+			UpdateFailMalformedHTLC ret_conv_25_hu_conv = new UpdateFailMalformedHTLC(null, ret_conv_25);
+			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, Arrays.stream(val).mapToLong(val_conv_25 -> val_conv_25 == null ? 0 : val_conv_25.ptr & ~1).toArray());
-		/* TODO 2 UpdateFailMalformedHTLC  */;
+		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 & ~1).toArray() : null);
+		for (UpdateFailMalformedHTLC val_conv_25: val) { 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);
+		if (ret < 1024) { return null; }
 		UpdateFee ret_hu_conv = new UpdateFee(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -63,8 +128,10 @@ public class CommitmentUpdate extends CommonBase {
 
 	/**
 	 * 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(UpdateFee val) {
+	public void set_update_fee(@Nullable UpdateFee val) {
 		bindings.CommitmentUpdate_set_update_fee(this.ptr, val == null ? 0 : val.ptr & ~1);
 		this.ptrs_to.add(val);
 	}
@@ -74,6 +141,7 @@ public class CommitmentUpdate extends CommonBase {
 	 */
 	public CommitmentSigned get_commitment_signed() {
 		long ret = bindings.CommitmentUpdate_get_commitment_signed(this.ptr);
+		if (ret < 1024) { return null; }
 		CommitmentSigned ret_hu_conv = new CommitmentSigned(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -91,13 +159,14 @@ public class CommitmentUpdate extends CommonBase {
 	 * Constructs a new CommitmentUpdate given each field
 	 */
 	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, UpdateFee update_fee_arg, CommitmentSigned commitment_signed_arg) {
-		long ret = bindings.CommitmentUpdate_new(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 & ~1).toArray(), 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 & ~1).toArray(), 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 & ~1).toArray(), 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 & ~1).toArray(), update_fee_arg == null ? 0 : update_fee_arg.ptr & ~1, commitment_signed_arg == null ? 0 : commitment_signed_arg.ptr & ~1);
+		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 & ~1).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 & ~1).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 & ~1).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 & ~1).toArray() : null, update_fee_arg == null ? 0 : update_fee_arg.ptr & ~1, commitment_signed_arg == null ? 0 : commitment_signed_arg.ptr & ~1);
+		if (ret < 1024) { return null; }
 		CommitmentUpdate ret_hu_conv = new CommitmentUpdate(null, ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		/* TODO 2 UpdateAddHTLC  */;
-		/* TODO 2 UpdateFulfillHTLC  */;
-		/* TODO 2 UpdateFailHTLC  */;
-		/* TODO 2 UpdateFailMalformedHTLC  */;
+		for (UpdateAddHTLC update_add_htlcs_arg_conv_15: update_add_htlcs_arg) { ret_hu_conv.ptrs_to.add(update_add_htlcs_arg_conv_15); };
+		for (UpdateFulfillHTLC update_fulfill_htlcs_arg_conv_19: update_fulfill_htlcs_arg) { ret_hu_conv.ptrs_to.add(update_fulfill_htlcs_arg_conv_19); };
+		for (UpdateFailHTLC update_fail_htlcs_arg_conv_16: update_fail_htlcs_arg) { 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) { ret_hu_conv.ptrs_to.add(update_fail_malformed_htlcs_arg_conv_25); };
 		ret_hu_conv.ptrs_to.add(update_fee_arg);
 		ret_hu_conv.ptrs_to.add(commitment_signed_arg);
 		return ret_hu_conv;
@@ -108,6 +177,7 @@ public class CommitmentUpdate extends CommonBase {
 	 */
 	public CommitmentUpdate clone() {
 		long ret = bindings.CommitmentUpdate_clone(this.ptr);
+		if (ret < 1024) { return null; }
 		CommitmentUpdate ret_hu_conv = new CommitmentUpdate(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;