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=cb025587703ae9de64b036ef8d528c2f0d575980;hpb=110f2f104ba8fc34caa7e34e04737f36f064b050;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/TxCreationKeys.java b/src/main/java/org/ldk/structs/TxCreationKeys.java
index cb025587..f063faad 100644
--- a/src/main/java/org/ldk/structs/TxCreationKeys.java
+++ b/src/main/java/org/ldk/structs/TxCreationKeys.java
@@ -11,14 +11,7 @@ public class TxCreationKeys extends CommonBase {
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
 		super.finalize();
-		bindings.TxCreationKeys_free(ptr);
-	}
-
-	public static TxCreationKeys constructor_clone(TxCreationKeys orig) {
-		long ret = bindings.TxCreationKeys_clone(orig == null ? 0 : orig.ptr & ~1);
-		TxCreationKeys ret_hu_conv = new TxCreationKeys(null, ret);
-		ret_hu_conv.ptrs_to.add(orig);
-		return ret_hu_conv;
+		if (ptr != 0) { bindings.TxCreationKeys_free(ptr); }
 	}
 
 	public byte[] get_per_commitment_point() {
@@ -69,20 +62,40 @@ public class TxCreationKeys extends CommonBase {
 	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 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(TxCreationKeys obj) {
-		byte[] ret = bindings.TxCreationKeys_write(obj == null ? 0 : obj.ptr & ~1);
-		this.ptrs_to.add(obj);
+	public byte[] write() {
+		byte[] ret = bindings.TxCreationKeys_write(this.ptr);
 		return ret;
 	}
 
-	public static TxCreationKeys constructor_read(byte[] ser) {
+	public static Result_TxCreationKeysDecodeErrorZ constructor_read(byte[] ser) {
 		long ret = bindings.TxCreationKeys_read(ser);
-		TxCreationKeys ret_hu_conv = new TxCreationKeys(null, ret);
+		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 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_derive_new
 }