X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FFundingCreated.java;h=ce30b15f8459bdb5d01ab7c63d99866ad38ecad0;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=66f485110998da2aa0b43e65f71f0f4f0150f84c;hpb=166ff04616cfee975ce991607ca0df88857193df;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/FundingCreated.java b/src/main/java/org/ldk/structs/FundingCreated.java
index 66f48511..ce30b15f 100644
--- a/src/main/java/org/ldk/structs/FundingCreated.java
+++ b/src/main/java/org/ldk/structs/FundingCreated.java
@@ -2,70 +2,126 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
+import javax.annotation.Nullable;
 
+
+/**
+ * A funding_created message to be sent or received from a peer
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class FundingCreated extends CommonBase {
 	FundingCreated(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.FundingCreated_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.FundingCreated_free(ptr); }
+	}
+
+	/**
+	 * A temporary channel ID, until the funding is established
+	 */
+	public byte[] get_temporary_channel_id() {
+		byte[] ret = bindings.FundingCreated_get_temporary_channel_id(this.ptr);
+		return ret;
 	}
 
-	public FundingCreated(FundingCreated orig) {
-		super(bindings.FundingCreated_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	/**
+	 * A temporary channel ID, until the funding is established
+	 */
+	public void set_temporary_channel_id(byte[] val) {
+		bindings.FundingCreated_set_temporary_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
-	public byte[] get_temporary_channel_id(FundingCreated this_ptr) {
-		byte[] ret = bindings.FundingCreated_get_temporary_channel_id(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The funding transaction ID
+	 */
+	public byte[] get_funding_txid() {
+		byte[] ret = bindings.FundingCreated_get_funding_txid(this.ptr);
 		return ret;
 	}
 
-	public void set_temporary_channel_id(FundingCreated this_ptr, byte[] val) {
-		bindings.FundingCreated_set_temporary_channel_id(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The funding transaction ID
+	 */
+	public void set_funding_txid(byte[] val) {
+		bindings.FundingCreated_set_funding_txid(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
-	public byte[] get_funding_txid(FundingCreated this_ptr) {
-		byte[] ret = bindings.FundingCreated_get_funding_txid(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The specific output index funding this channel
+	 */
+	public short get_funding_output_index() {
+		short ret = bindings.FundingCreated_get_funding_output_index(this.ptr);
 		return ret;
 	}
 
-	public void set_funding_txid(FundingCreated this_ptr, byte[] val) {
-		bindings.FundingCreated_set_funding_txid(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The specific output index funding this channel
+	 */
+	public void set_funding_output_index(short val) {
+		bindings.FundingCreated_set_funding_output_index(this.ptr, val);
 	}
 
-	public short get_funding_output_index(FundingCreated this_ptr) {
-		short ret = bindings.FundingCreated_get_funding_output_index(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The signature of the channel initiator (funder) on the initial commitment transaction
+	 */
+	public byte[] get_signature() {
+		byte[] ret = bindings.FundingCreated_get_signature(this.ptr);
 		return ret;
 	}
 
-	public void set_funding_output_index(FundingCreated this_ptr, short val) {
-		bindings.FundingCreated_set_funding_output_index(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The signature of the channel initiator (funder) on the initial commitment transaction
+	 */
+	public void set_signature(byte[] val) {
+		bindings.FundingCreated_set_signature(this.ptr, InternalUtils.check_arr_len(val, 64));
 	}
 
-	public byte[] get_signature(FundingCreated this_ptr) {
-		byte[] ret = bindings.FundingCreated_get_signature(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Constructs a new FundingCreated given each field
+	 */
+	public static FundingCreated of(byte[] temporary_channel_id_arg, byte[] funding_txid_arg, short funding_output_index_arg, byte[] signature_arg) {
+		long ret = bindings.FundingCreated_new(InternalUtils.check_arr_len(temporary_channel_id_arg, 32), InternalUtils.check_arr_len(funding_txid_arg, 32), funding_output_index_arg, InternalUtils.check_arr_len(signature_arg, 64));
+		if (ret >= 0 && ret <= 4096) { return null; }
+		FundingCreated ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new FundingCreated(null, ret); }
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
+	}
+
+	long clone_ptr() {
+		long ret = bindings.FundingCreated_clone_ptr(this.ptr);
 		return ret;
 	}
 
-	public void set_signature(FundingCreated this_ptr, byte[] val) {
-		bindings.FundingCreated_set_signature(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Creates a copy of the FundingCreated
+	 */
+	public FundingCreated clone() {
+		long ret = bindings.FundingCreated_clone(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		FundingCreated ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new FundingCreated(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public FundingCreated(byte[] temporary_channel_id_arg, byte[] funding_txid_arg, short funding_output_index_arg, byte[] signature_arg) {
-		super(bindings.FundingCreated_new(temporary_channel_id_arg, funding_txid_arg, funding_output_index_arg, signature_arg));
+	/**
+	 * Serialize the FundingCreated object into a byte array which can be read by FundingCreated_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.FundingCreated_write(this.ptr);
+		return ret;
 	}
 
-	// Skipped FundingCreated_write
-	public FundingCreated(byte[] ser) {
-		super(bindings.FundingCreated_read(ser));
+	/**
+	 * Read a FundingCreated from a byte array, created by FundingCreated_write
+	 */
+	public static Result_FundingCreatedDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.FundingCreated_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_FundingCreatedDecodeErrorZ ret_hu_conv = Result_FundingCreatedDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }