X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FTxCreationKeys.java;h=f063faadfe20ca78851c89c29f5f56027cb7fc33;hb=9e8763c71cd61d55be7c869d973524f75209a3f3;hp=e013ca15fa9147716ba7ea4a525c74bb91af79cf;hpb=3d559f3266fde7c6a21248c10d9a7145125b5e69;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/TxCreationKeys.java b/src/main/java/org/ldk/structs/TxCreationKeys.java
index e013ca15..f063faad 100644
--- a/src/main/java/org/ldk/structs/TxCreationKeys.java
+++ b/src/main/java/org/ldk/structs/TxCreationKeys.java
@@ -2,79 +2,100 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class TxCreationKeys extends CommonBase {
 	TxCreationKeys(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.TxCreationKeys_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.TxCreationKeys_free(ptr); }
 	}
 
-	public TxCreationKeys(TxCreationKeys orig) {
-		super(bindings.TxCreationKeys_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	public byte[] get_per_commitment_point() {
+		byte[] ret = bindings.TxCreationKeys_get_per_commitment_point(this.ptr);
+		return ret;
+	}
+
+	public void set_per_commitment_point(byte[] val) {
+		bindings.TxCreationKeys_set_per_commitment_point(this.ptr, val);
 	}
 
-	public byte[] get_per_commitment_point(TxCreationKeys this_ptr) {
-		byte[] ret = bindings.TxCreationKeys_get_per_commitment_point(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_revocation_key() {
+		byte[] ret = bindings.TxCreationKeys_get_revocation_key(this.ptr);
 		return ret;
 	}
 
-	public void set_per_commitment_point(TxCreationKeys this_ptr, byte[] val) {
-		bindings.TxCreationKeys_set_per_commitment_point(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_revocation_key(byte[] val) {
+		bindings.TxCreationKeys_set_revocation_key(this.ptr, val);
 	}
 
-	public byte[] get_revocation_key(TxCreationKeys this_ptr) {
-		byte[] ret = bindings.TxCreationKeys_get_revocation_key(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_broadcaster_htlc_key() {
+		byte[] ret = bindings.TxCreationKeys_get_broadcaster_htlc_key(this.ptr);
 		return ret;
 	}
 
-	public void set_revocation_key(TxCreationKeys this_ptr, byte[] val) {
-		bindings.TxCreationKeys_set_revocation_key(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_broadcaster_htlc_key(byte[] val) {
+		bindings.TxCreationKeys_set_broadcaster_htlc_key(this.ptr, val);
 	}
 
-	public byte[] get_broadcaster_htlc_key(TxCreationKeys this_ptr) {
-		byte[] ret = bindings.TxCreationKeys_get_broadcaster_htlc_key(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_countersignatory_htlc_key() {
+		byte[] ret = bindings.TxCreationKeys_get_countersignatory_htlc_key(this.ptr);
 		return ret;
 	}
 
-	public void set_broadcaster_htlc_key(TxCreationKeys this_ptr, byte[] val) {
-		bindings.TxCreationKeys_set_broadcaster_htlc_key(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_countersignatory_htlc_key(byte[] val) {
+		bindings.TxCreationKeys_set_countersignatory_htlc_key(this.ptr, val);
 	}
 
-	public byte[] get_countersignatory_htlc_key(TxCreationKeys this_ptr) {
-		byte[] ret = bindings.TxCreationKeys_get_countersignatory_htlc_key(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_broadcaster_delayed_payment_key() {
+		byte[] ret = bindings.TxCreationKeys_get_broadcaster_delayed_payment_key(this.ptr);
 		return ret;
 	}
 
-	public void set_countersignatory_htlc_key(TxCreationKeys this_ptr, byte[] val) {
-		bindings.TxCreationKeys_set_countersignatory_htlc_key(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_broadcaster_delayed_payment_key(byte[] val) {
+		bindings.TxCreationKeys_set_broadcaster_delayed_payment_key(this.ptr, val);
+	}
+
+	public static TxCreationKeys constructor_new(byte[] per_commitment_point_arg, byte[] revocation_key_arg, byte[] broadcaster_htlc_key_arg, byte[] countersignatory_htlc_key_arg, byte[] broadcaster_delayed_payment_key_arg) {
+		long ret = bindings.TxCreationKeys_new(per_commitment_point_arg, revocation_key_arg, broadcaster_htlc_key_arg, countersignatory_htlc_key_arg, broadcaster_delayed_payment_key_arg);
+		TxCreationKeys ret_hu_conv = new TxCreationKeys(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
-	public byte[] get_broadcaster_delayed_payment_key(TxCreationKeys this_ptr) {
-		byte[] ret = bindings.TxCreationKeys_get_broadcaster_delayed_payment_key(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public TxCreationKeys clone() {
+		long ret = bindings.TxCreationKeys_clone(this.ptr);
+		TxCreationKeys ret_hu_conv = new TxCreationKeys(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	public byte[] write() {
+		byte[] ret = bindings.TxCreationKeys_write(this.ptr);
 		return ret;
 	}
 
-	public void set_broadcaster_delayed_payment_key(TxCreationKeys this_ptr, byte[] val) {
-		bindings.TxCreationKeys_set_broadcaster_delayed_payment_key(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public static Result_TxCreationKeysDecodeErrorZ constructor_read(byte[] ser) {
+		long ret = bindings.TxCreationKeys_read(ser);
+		Result_TxCreationKeysDecodeErrorZ ret_hu_conv = Result_TxCreationKeysDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
+	}
+
+	public static Result_TxCreationKeysErrorZ constructor_derive_new(byte[] per_commitment_point, byte[] broadcaster_delayed_payment_base, byte[] broadcaster_htlc_base, byte[] countersignatory_revocation_base, byte[] countersignatory_htlc_base) {
+		long ret = bindings.TxCreationKeys_derive_new(per_commitment_point, broadcaster_delayed_payment_base, broadcaster_htlc_base, countersignatory_revocation_base, countersignatory_htlc_base);
+		Result_TxCreationKeysErrorZ ret_hu_conv = Result_TxCreationKeysErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
-	public TxCreationKeys(byte[] per_commitment_point_arg, byte[] revocation_key_arg, byte[] broadcaster_htlc_key_arg, byte[] countersignatory_htlc_key_arg, byte[] broadcaster_delayed_payment_key_arg) {
-		super(bindings.TxCreationKeys_new(per_commitment_point_arg, revocation_key_arg, broadcaster_htlc_key_arg, countersignatory_htlc_key_arg, broadcaster_delayed_payment_key_arg));
+	public static Result_TxCreationKeysErrorZ constructor_from_channel_static_keys(byte[] per_commitment_point, ChannelPublicKeys broadcaster_keys, ChannelPublicKeys countersignatory_keys) {
+		long ret = bindings.TxCreationKeys_from_channel_static_keys(per_commitment_point, broadcaster_keys == null ? 0 : broadcaster_keys.ptr & ~1, countersignatory_keys == null ? 0 : countersignatory_keys.ptr & ~1);
+		Result_TxCreationKeysErrorZ ret_hu_conv = Result_TxCreationKeysErrorZ.constr_from_ptr(ret);
+		ret_hu_conv.ptrs_to.add(broadcaster_keys);
+		ret_hu_conv.ptrs_to.add(countersignatory_keys);
+		return ret_hu_conv;
 	}
 
-	// Skipped TxCreationKeys_write
-	// Skipped TxCreationKeys_read
-	// Skipped TxCreationKeys_derive_new
 }