X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FKeysManager.java;h=25107f069cdd3a65e1c110593163a29337bff7c1;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=87b6c48e96a92441455375e36c85398263951d6e;hpb=ba1af51214a8ea2de62b84cd23b6145173c71752;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/KeysManager.java b/src/main/java/org/ldk/structs/KeysManager.java
index 87b6c48e..25107f06 100644
--- a/src/main/java/org/ldk/structs/KeysManager.java
+++ b/src/main/java/org/ldk/structs/KeysManager.java
@@ -47,9 +47,9 @@ public class KeysManager extends CommonBase {
 	 * detailed description of the guarantee.
 	 */
 	public static KeysManager of(byte[] seed, long starting_time_secs, int starting_time_nanos) {
-		long ret = bindings.KeysManager_new(seed, starting_time_secs, starting_time_nanos);
-		if (ret < 1024) { return null; }
-		KeysManager ret_hu_conv = new KeysManager(null, ret);
+		long ret = bindings.KeysManager_new(InternalUtils.check_arr_len(seed, 32), starting_time_secs, starting_time_nanos);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		KeysManager ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new KeysManager(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		return ret_hu_conv;
 	}
@@ -62,9 +62,9 @@ public class KeysManager extends CommonBase {
 	 * onchain output detection for which a corresponding delayed_payment_key must be derived.
 	 */
 	public InMemorySigner derive_channel_keys(long channel_value_satoshis, byte[] params) {
-		long ret = bindings.KeysManager_derive_channel_keys(this.ptr, channel_value_satoshis, params);
-		if (ret < 1024) { return null; }
-		InMemorySigner ret_hu_conv = new InMemorySigner(null, ret);
+		long ret = bindings.KeysManager_derive_channel_keys(this.ptr, channel_value_satoshis, InternalUtils.check_arr_len(params, 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(this);
 		return ret_hu_conv;
 	}
@@ -84,10 +84,8 @@ public class KeysManager extends CommonBase {
 	 */
 	public Result_TransactionNoneZ spend_spendable_outputs(SpendableOutputDescriptor[] descriptors, TxOut[] outputs, byte[] change_destination_script, int feerate_sat_per_1000_weight) {
 		long ret = bindings.KeysManager_spend_spendable_outputs(this.ptr, descriptors != null ? Arrays.stream(descriptors).mapToLong(descriptors_conv_27 -> descriptors_conv_27.ptr).toArray() : null, outputs != null ? Arrays.stream(outputs).mapToLong(outputs_conv_7 -> outputs_conv_7.ptr).toArray() : null, change_destination_script, feerate_sat_per_1000_weight);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_TransactionNoneZ ret_hu_conv = Result_TransactionNoneZ.constr_from_ptr(ret);
-		/* TODO 2 SpendableOutputDescriptor  */;
-		/* TODO 2 TxOut  */;
 		return ret_hu_conv;
 	}
 
@@ -97,7 +95,7 @@ public class KeysManager extends CommonBase {
 	 */
 	public KeysInterface as_KeysInterface() {
 		long ret = bindings.KeysManager_as_KeysInterface(this.ptr);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		KeysInterface ret_hu_conv = new KeysInterface(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;