X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FFundingSigned.java;h=b56363bc3e780b8da995860eca484cd6830025fc;hb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;hp=1d1fef6179fe2bb0170c7a4e07750b9d99d70fc2;hpb=d063d65c20bf007f42dc2ae52bd62dc1c2ef51e4;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/FundingSigned.java b/src/main/java/org/ldk/structs/FundingSigned.java
index 1d1fef61..b56363bc 100644
--- a/src/main/java/org/ldk/structs/FundingSigned.java
+++ b/src/main/java/org/ldk/structs/FundingSigned.java
@@ -2,45 +2,91 @@ 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_signed message to be sent or received from a peer
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class FundingSigned extends CommonBase {
 	FundingSigned(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.FundingSigned_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.FundingSigned_free(ptr); }
+	}
+
+	/**
+	 * The channel ID
+	 */
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.FundingSigned_get_channel_id(this.ptr);
+		return ret;
 	}
 
-	public FundingSigned(FundingSigned orig) {
-		super(bindings.FundingSigned_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	/**
+	 * The channel ID
+	 */
+	public void set_channel_id(byte[] val) {
+		bindings.FundingSigned_set_channel_id(this.ptr, val);
 	}
 
-	public byte[] get_channel_id(FundingSigned this_ptr) {
-		byte[] ret = bindings.FundingSigned_get_channel_id(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The signature of the channel acceptor (fundee) on the initial commitment transaction
+	 */
+	public byte[] get_signature() {
+		byte[] ret = bindings.FundingSigned_get_signature(this.ptr);
 		return ret;
 	}
 
-	public void set_channel_id(FundingSigned this_ptr, byte[] val) {
-		bindings.FundingSigned_set_channel_id(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The signature of the channel acceptor (fundee) on the initial commitment transaction
+	 */
+	public void set_signature(byte[] val) {
+		bindings.FundingSigned_set_signature(this.ptr, val);
 	}
 
-	public byte[] get_signature(FundingSigned this_ptr) {
-		byte[] ret = bindings.FundingSigned_get_signature(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	/**
+	 * Constructs a new FundingSigned given each field
+	 */
+	public static FundingSigned of(byte[] channel_id_arg, byte[] signature_arg) {
+		long ret = bindings.FundingSigned_new(channel_id_arg, signature_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		FundingSigned ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new FundingSigned(null, ret); }
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Creates a copy of the FundingSigned
+	 */
+	public FundingSigned clone() {
+		long ret = bindings.FundingSigned_clone(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		FundingSigned ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new FundingSigned(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public void set_signature(FundingSigned this_ptr, byte[] val) {
-		bindings.FundingSigned_set_signature(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Serialize the FundingSigned object into a byte array which can be read by FundingSigned_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.FundingSigned_write(this.ptr);
+		return ret;
 	}
 
-	public FundingSigned(byte[] channel_id_arg, byte[] signature_arg) {
-		super(bindings.FundingSigned_new(channel_id_arg, signature_arg));
+	/**
+	 * Read a FundingSigned from a byte array, created by FundingSigned_write
+	 */
+	public static Result_FundingSignedDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.FundingSigned_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_FundingSignedDecodeErrorZ ret_hu_conv = Result_FundingSignedDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
-	// Skipped FundingSigned_write
-	// Skipped FundingSigned_read
 }