X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FInMemorySigner.java;h=5b4b67bcd4e16e35668c62733f02227bc560ada9;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=d3bf409e85a70e046a25152eee03c9134bca6ef2;hpb=1b870a3ffab1c0024411e30102bc6d198300f095;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/InMemorySigner.java b/src/main/java/org/ldk/structs/InMemorySigner.java
index d3bf409e..5b4b67bc 100644
--- a/src/main/java/org/ldk/structs/InMemorySigner.java
+++ b/src/main/java/org/ldk/structs/InMemorySigner.java
@@ -4,6 +4,7 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
 
 /**
@@ -33,7 +34,7 @@ public class InMemorySigner extends CommonBase {
 	 * Private key of anchor tx
 	 */
 	public void set_funding_key(byte[] val) {
-		bindings.InMemorySigner_set_funding_key(this.ptr, val);
+		bindings.InMemorySigner_set_funding_key(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
 	/**
@@ -48,7 +49,7 @@ public class InMemorySigner extends CommonBase {
 	 * Holder secret key for blinded revocation pubkey
 	 */
 	public void set_revocation_base_key(byte[] val) {
-		bindings.InMemorySigner_set_revocation_base_key(this.ptr, val);
+		bindings.InMemorySigner_set_revocation_base_key(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
 	/**
@@ -63,7 +64,7 @@ public class InMemorySigner extends CommonBase {
 	 * Holder secret key used for our balance in counterparty-broadcasted commitment transactions
 	 */
 	public void set_payment_key(byte[] val) {
-		bindings.InMemorySigner_set_payment_key(this.ptr, val);
+		bindings.InMemorySigner_set_payment_key(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
 	/**
@@ -78,7 +79,7 @@ public class InMemorySigner extends CommonBase {
 	 * Holder secret key used in HTLC tx
 	 */
 	public void set_delayed_payment_base_key(byte[] val) {
-		bindings.InMemorySigner_set_delayed_payment_base_key(this.ptr, val);
+		bindings.InMemorySigner_set_delayed_payment_base_key(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
 	/**
@@ -93,7 +94,7 @@ public class InMemorySigner extends CommonBase {
 	 * Holder htlc secret key used in commitment tx htlc outputs
 	 */
 	public void set_htlc_base_key(byte[] val) {
-		bindings.InMemorySigner_set_htlc_base_key(this.ptr, val);
+		bindings.InMemorySigner_set_htlc_base_key(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
 	/**
@@ -108,7 +109,12 @@ public class InMemorySigner extends CommonBase {
 	 * Commitment seed
 	 */
 	public void set_commitment_seed(byte[] val) {
-		bindings.InMemorySigner_set_commitment_seed(this.ptr, val);
+		bindings.InMemorySigner_set_commitment_seed(this.ptr, InternalUtils.check_arr_len(val, 32));
+	}
+
+	long clone_ptr() {
+		long ret = bindings.InMemorySigner_clone_ptr(this.ptr);
+		return ret;
 	}
 
 	/**
@@ -116,7 +122,8 @@ public class InMemorySigner extends CommonBase {
 	 */
 	public InMemorySigner clone() {
 		long ret = bindings.InMemorySigner_clone(this.ptr);
-		InMemorySigner ret_hu_conv = new InMemorySigner(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		InMemorySigner ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new InMemorySigner(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -124,9 +131,10 @@ public class InMemorySigner extends CommonBase {
 	/**
 	 * Create a new InMemorySigner
 	 */
-	public static InMemorySigner constructor_new(byte[] funding_key, byte[] revocation_base_key, byte[] payment_key, byte[] delayed_payment_base_key, byte[] htlc_base_key, byte[] commitment_seed, long channel_value_satoshis, byte[] channel_keys_id) {
-		long ret = bindings.InMemorySigner_new(funding_key, revocation_base_key, payment_key, delayed_payment_base_key, htlc_base_key, commitment_seed, channel_value_satoshis, channel_keys_id);
-		InMemorySigner ret_hu_conv = new InMemorySigner(null, ret);
+	public static InMemorySigner of(byte[] funding_key, byte[] revocation_base_key, byte[] payment_key, byte[] delayed_payment_base_key, byte[] htlc_base_key, byte[] commitment_seed, long channel_value_satoshis, byte[] channel_keys_id) {
+		long ret = bindings.InMemorySigner_new(InternalUtils.check_arr_len(funding_key, 32), InternalUtils.check_arr_len(revocation_base_key, 32), InternalUtils.check_arr_len(payment_key, 32), InternalUtils.check_arr_len(delayed_payment_base_key, 32), InternalUtils.check_arr_len(htlc_base_key, 32), InternalUtils.check_arr_len(commitment_seed, 32), channel_value_satoshis, InternalUtils.check_arr_len(channel_keys_id, 32));
+		if (ret >= 0 && ret <= 4096) { return null; }
+		InMemorySigner ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new InMemorySigner(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		return ret_hu_conv;
 	}
@@ -137,7 +145,8 @@ public class InMemorySigner extends CommonBase {
 	 */
 	public ChannelPublicKeys counterparty_pubkeys() {
 		long ret = bindings.InMemorySigner_counterparty_pubkeys(this.ptr);
-		ChannelPublicKeys ret_hu_conv = new ChannelPublicKeys(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ChannelPublicKeys ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelPublicKeys(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -179,7 +188,8 @@ public class InMemorySigner extends CommonBase {
 	 */
 	public OutPoint funding_outpoint() {
 		long ret = bindings.InMemorySigner_funding_outpoint(this.ptr);
-		OutPoint ret_hu_conv = new OutPoint(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		OutPoint ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new OutPoint(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -192,7 +202,8 @@ public class InMemorySigner extends CommonBase {
 	 */
 	public ChannelTransactionParameters get_channel_parameters() {
 		long ret = bindings.InMemorySigner_get_channel_parameters(this.ptr);
-		ChannelTransactionParameters ret_hu_conv = new ChannelTransactionParameters(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ChannelTransactionParameters ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelTransactionParameters(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -206,6 +217,7 @@ public class InMemorySigner extends CommonBase {
 	 */
 	public Result_CVec_CVec_u8ZZNoneZ sign_counterparty_payment_input(byte[] spend_tx, long input_idx, StaticPaymentOutputDescriptor descriptor) {
 		long ret = bindings.InMemorySigner_sign_counterparty_payment_input(this.ptr, spend_tx, input_idx, descriptor == null ? 0 : descriptor.ptr & ~1);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_CVec_CVec_u8ZZNoneZ ret_hu_conv = Result_CVec_CVec_u8ZZNoneZ.constr_from_ptr(ret);
 		this.ptrs_to.add(descriptor);
 		return ret_hu_conv;
@@ -221,17 +233,31 @@ public class InMemorySigner extends CommonBase {
 	 */
 	public Result_CVec_CVec_u8ZZNoneZ sign_dynamic_p2wsh_input(byte[] spend_tx, long input_idx, DelayedPaymentOutputDescriptor descriptor) {
 		long ret = bindings.InMemorySigner_sign_dynamic_p2wsh_input(this.ptr, spend_tx, input_idx, descriptor == null ? 0 : descriptor.ptr & ~1);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_CVec_CVec_u8ZZNoneZ ret_hu_conv = Result_CVec_CVec_u8ZZNoneZ.constr_from_ptr(ret);
 		this.ptrs_to.add(descriptor);
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Constructs a new BaseSign which calls the relevant methods on this_arg.
+	 * This copies the `inner` pointer in this_arg and thus the returned BaseSign must be freed before this_arg is
+	 */
+	public BaseSign as_BaseSign() {
+		long ret = bindings.InMemorySigner_as_BaseSign(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		BaseSign ret_hu_conv = new BaseSign(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
 	/**
 	 * Constructs a new Sign which calls the relevant methods on this_arg.
 	 * This copies the `inner` pointer in this_arg and thus the returned Sign must be freed before this_arg is
 	 */
 	public Sign as_Sign() {
 		long ret = bindings.InMemorySigner_as_Sign(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Sign ret_hu_conv = new Sign(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -248,8 +274,9 @@ public class InMemorySigner extends CommonBase {
 	/**
 	 * Read a InMemorySigner from a byte array, created by InMemorySigner_write
 	 */
-	public static Result_InMemorySignerDecodeErrorZ constructor_read(byte[] ser) {
+	public static Result_InMemorySignerDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.InMemorySigner_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_InMemorySignerDecodeErrorZ ret_hu_conv = Result_InMemorySignerDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}