X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FKeysManager.java;h=c0c4cfe6b3525854f39d1fe564df577020983244;hb=276893d3b8bd3fcb2bb10e3cab73a69d34831909;hp=ca95138ed299d828e33b5aaa4b496503c602499a;hpb=3d559f3266fde7c6a21248c10d9a7145125b5e69;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/KeysManager.java b/src/main/java/org/ldk/structs/KeysManager.java
index ca95138e..c0c4cfe6 100644
--- a/src/main/java/org/ldk/structs/KeysManager.java
+++ b/src/main/java/org/ldk/structs/KeysManager.java
@@ -2,27 +2,45 @@ 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 KeysManager extends CommonBase {
 	KeysManager(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.KeysManager_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.KeysManager_free(ptr); }
 	}
 
-	public KeysManager(byte[] seed, LDKNetwork network, long starting_time_secs, int starting_time_nanos) {
-		super(bindings.KeysManager_new(seed, network, starting_time_secs, starting_time_nanos));
+	public static KeysManager constructor_new(byte[] seed, long starting_time_secs, int starting_time_nanos) {
+		long ret = bindings.KeysManager_new(seed, starting_time_secs, starting_time_nanos);
+		KeysManager ret_hu_conv = new KeysManager(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
-	public InMemoryChannelKeys derive_channel_keys(long channel_value_satoshis, long params_1, long params_2) {
-		InMemoryChannelKeys ret = new InMemoryChannelKeys(null, bindings.KeysManager_derive_channel_keys(this.ptr, channel_value_satoshis, params_1, params_2));
-		return ret;
+	public InMemorySigner derive_channel_keys(long channel_value_satoshis, byte[] params) {
+		long ret = bindings.KeysManager_derive_channel_keys(this.ptr, channel_value_satoshis, params);
+		InMemorySigner ret_hu_conv = new InMemorySigner(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	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, Arrays.stream(descriptors).mapToLong(descriptors_conv_27 -> descriptors_conv_27.ptr).toArray(), Arrays.stream(outputs).mapToLong(outputs_conv_7 -> outputs_conv_7.ptr).toArray(), change_destination_script, feerate_sat_per_1000_weight);
+		Result_TransactionNoneZ ret_hu_conv = Result_TransactionNoneZ.constr_from_ptr(ret);
+		/* TODO 2 SpendableOutputDescriptor  */;
+		/* TODO 2 TxOut  */;
+		return ret_hu_conv;
 	}
 
 	public KeysInterface as_KeysInterface() {
-		KeysInterface ret = new KeysInterface(null, bindings.KeysManager_as_KeysInterface(this.ptr));
-		ret.ptrs_to.add(this);
-		return ret;
+		long ret = bindings.KeysManager_as_KeysInterface(this.ptr);
+		KeysInterface ret_hu_conv = new KeysInterface(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
 }