X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FOutPoint.java;h=42a79f04e686da3ca2603b6c48f1bcc13e003cb3;hb=c45b91b3165ba0ff774d12d357188cae979574d3;hp=071bc1ea2f6359e96cece0bb5220236b259d67e4;hpb=3d559f3266fde7c6a21248c10d9a7145125b5e69;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/OutPoint.java b/src/main/java/org/ldk/structs/OutPoint.java
index 071bc1ea..42a79f04 100644
--- a/src/main/java/org/ldk/structs/OutPoint.java
+++ b/src/main/java/org/ldk/structs/OutPoint.java
@@ -2,50 +2,98 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+
+/**
+ * A reference to a transaction output.
+ * 
+ * Differs from bitcoin::blockdata::transaction::OutPoint as the index is a u16 instead of u32
+ * due to LN's restrictions on index values. Should reduce (possibly) unsafe conversions this way.
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class OutPoint extends CommonBase {
 	OutPoint(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.OutPoint_free(ptr); super.finalize();
-	}
-
-	public OutPoint(OutPoint orig) {
-		super(bindings.OutPoint_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+		super.finalize();
+		if (ptr != 0) { bindings.OutPoint_free(ptr); }
 	}
 
-	public byte[] get_txid(OutPoint this_ptr) {
-		byte[] ret = bindings.OutPoint_get_txid(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The referenced transaction's txid.
+	 */
+	public byte[] get_txid() {
+		byte[] ret = bindings.OutPoint_get_txid(this.ptr);
 		return ret;
 	}
 
-	public void set_txid(OutPoint this_ptr, byte[] val) {
-		bindings.OutPoint_set_txid(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The referenced transaction's txid.
+	 */
+	public void set_txid(byte[] val) {
+		bindings.OutPoint_set_txid(this.ptr, val);
 	}
 
-	public short get_index(OutPoint this_ptr) {
-		short ret = bindings.OutPoint_get_index(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The index of the referenced output in its transaction's vout.
+	 */
+	public short get_index() {
+		short ret = bindings.OutPoint_get_index(this.ptr);
 		return ret;
 	}
 
-	public void set_index(OutPoint this_ptr, short val) {
-		bindings.OutPoint_set_index(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The index of the referenced output in its transaction's vout.
+	 */
+	public void set_index(short val) {
+		bindings.OutPoint_set_index(this.ptr, val);
+	}
+
+	/**
+	 * Constructs a new OutPoint given each field
+	 */
+	public static OutPoint constructor_new(byte[] txid_arg, short index_arg) {
+		long ret = bindings.OutPoint_new(txid_arg, index_arg);
+		OutPoint ret_hu_conv = new OutPoint(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
-	public OutPoint(byte[] txid_arg, short index_arg) {
-		super(bindings.OutPoint_new(txid_arg, index_arg));
+	/**
+	 * Creates a copy of the OutPoint
+	 */
+	public OutPoint clone() {
+		long ret = bindings.OutPoint_clone(this.ptr);
+		OutPoint ret_hu_conv = new OutPoint(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
+	/**
+	 * Convert an `OutPoint` to a lightning channel id.
+	 */
 	public byte[] to_channel_id() {
 		byte[] ret = bindings.OutPoint_to_channel_id(this.ptr);
 		return ret;
 	}
 
-	// Skipped OutPoint_write
-	// Skipped OutPoint_read
+	/**
+	 * Serialize the OutPoint object into a byte array which can be read by OutPoint_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.OutPoint_write(this.ptr);
+		return ret;
+	}
+
+	/**
+	 * Read a OutPoint from a byte array, created by OutPoint_write
+	 */
+	public static Result_OutPointDecodeErrorZ constructor_read(byte[] ser) {
+		long ret = bindings.OutPoint_read(ser);
+		Result_OutPointDecodeErrorZ ret_hu_conv = Result_OutPointDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
+	}
+
 }