X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FKeysManager.java;h=02fcf7115d0ca74e49a071d6c62f309a20b9ba62;hb=07d5d868dfe064aadb28a7f7ca6002c16be9723d;hp=840f8a63162454c007a017b5aaa06a774938e35a;hpb=8aa8a96fc6d8fcdd3fbb419b4b4c12482af14938;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/KeysManager.java b/src/main/java/org/ldk/structs/KeysManager.java
index 840f8a63..02fcf711 100644
--- a/src/main/java/org/ldk/structs/KeysManager.java
+++ b/src/main/java/org/ldk/structs/KeysManager.java
@@ -9,8 +9,8 @@ import javax.annotation.Nullable;
 
 
 /**
- * Simple [`KeysInterface`] implementation that takes a 32-byte seed for use as a BIP 32 extended
- * key and derives keys from that.
+ * Simple implementation of [`EntropySource`], [`NodeSigner`], and [`SignerProvider`] that takes a
+ * 32-byte seed for use as a BIP 32 extended key and derives keys from that.
  * 
  * Your `node_id` is seed/0'.
  * Unilateral closes may use seed/1'.
@@ -63,7 +63,16 @@ public class KeysManager extends CommonBase {
 	}
 
 	/**
-	 * Derive an old [`Sign`] containing per-channel secrets based on a key derivation parameters.
+	 * Gets the \"node_id\" secret key used to sign gossip announcements, decode onion data, etc.
+	 */
+	public byte[] get_node_secret_key() {
+		byte[] ret = bindings.KeysManager_get_node_secret_key(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	/**
+	 * Derive an old [`WriteableEcdsaChannelSigner`] containing per-channel secrets based on a key derivation parameters.
 	 */
 	public InMemorySigner derive_channel_keys(long channel_value_satoshis, byte[] params) {
 		long ret = bindings.KeysManager_derive_channel_keys(this.ptr, channel_value_satoshis, InternalUtils.check_arr_len(params, 32));
@@ -76,11 +85,37 @@ public class KeysManager extends CommonBase {
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Signs the given [`PartiallySignedTransaction`] which spends the given [`SpendableOutputDescriptor`]s.
+	 * The resulting inputs will be finalized and the PSBT will be ready for broadcast if there
+	 * are no other inputs that need signing.
+	 * 
+	 * Returns `Err(())` if the PSBT is missing a descriptor or if we fail to sign.
+	 * 
+	 * May panic if the [`SpendableOutputDescriptor`]s were not generated by channels which used
+	 * this [`KeysManager`] or one of the [`InMemorySigner`] created by this [`KeysManager`].
+	 */
+	public Result_CVec_u8ZNoneZ sign_spendable_outputs_psbt(SpendableOutputDescriptor[] descriptors, byte[] psbt) {
+		long ret = bindings.KeysManager_sign_spendable_outputs_psbt(this.ptr, descriptors != null ? Arrays.stream(descriptors).mapToLong(descriptors_conv_27 -> descriptors_conv_27.ptr).toArray() : null, psbt);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(descriptors);
+		Reference.reachabilityFence(psbt);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_CVec_u8ZNoneZ ret_hu_conv = Result_CVec_u8ZNoneZ.constr_from_ptr(ret);
+		for (SpendableOutputDescriptor descriptors_conv_27: descriptors) { if (this != null) { this.ptrs_to.add(descriptors_conv_27); }; };
+		return ret_hu_conv;
+	}
+
 	/**
 	 * Creates a [`Transaction`] which spends the given descriptors to the given outputs, plus an
 	 * output to the given change destination (if sufficient change value remains). The
 	 * transaction will have a feerate, at least, of the given value.
 	 * 
+	 * The `locktime` argument is used to set the transaction's locktime. If `None`, the
+	 * transaction will have a locktime of 0. It it recommended to set this to the current block
+	 * height to avoid fee sniping, unless you have some specific reason to use a different
+	 * locktime.
+	 * 
 	 * Returns `Err(())` if the output value is greater than the input value minus required fee,
 	 * if a descriptor was duplicated, or if an output descriptor `script_pubkey`
 	 * does not match the one we can spend.
@@ -90,27 +125,56 @@ public class KeysManager extends CommonBase {
 	 * May panic if the [`SpendableOutputDescriptor`]s were not generated by channels which used
 	 * this [`KeysManager`] or one of the [`InMemorySigner`] created by this [`KeysManager`].
 	 */
-	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);
+	public Result_TransactionNoneZ spend_spendable_outputs(SpendableOutputDescriptor[] descriptors, TxOut[] outputs, byte[] change_destination_script, int feerate_sat_per_1000_weight, org.ldk.structs.Option_u32Z locktime) {
+		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, locktime.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(descriptors);
 		Reference.reachabilityFence(outputs);
 		Reference.reachabilityFence(change_destination_script);
 		Reference.reachabilityFence(feerate_sat_per_1000_weight);
+		Reference.reachabilityFence(locktime);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_TransactionNoneZ ret_hu_conv = Result_TransactionNoneZ.constr_from_ptr(ret);
+		for (SpendableOutputDescriptor descriptors_conv_27: descriptors) { if (this != null) { this.ptrs_to.add(descriptors_conv_27); }; };
+		if (this != null) { this.ptrs_to.add(locktime); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Constructs a new EntropySource which calls the relevant methods on this_arg.
+	 * This copies the `inner` pointer in this_arg and thus the returned EntropySource must be freed before this_arg is
+	 */
+	public EntropySource as_EntropySource() {
+		long ret = bindings.KeysManager_as_EntropySource(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		EntropySource ret_hu_conv = new EntropySource(null, ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Constructs a new NodeSigner which calls the relevant methods on this_arg.
+	 * This copies the `inner` pointer in this_arg and thus the returned NodeSigner must be freed before this_arg is
+	 */
+	public NodeSigner as_NodeSigner() {
+		long ret = bindings.KeysManager_as_NodeSigner(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NodeSigner ret_hu_conv = new NodeSigner(null, ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	/**
-	 * Constructs a new KeysInterface which calls the relevant methods on this_arg.
-	 * This copies the `inner` pointer in this_arg and thus the returned KeysInterface must be freed before this_arg is
+	 * Constructs a new SignerProvider which calls the relevant methods on this_arg.
+	 * This copies the `inner` pointer in this_arg and thus the returned SignerProvider must be freed before this_arg is
 	 */
-	public KeysInterface as_KeysInterface() {
-		long ret = bindings.KeysManager_as_KeysInterface(this.ptr);
+	public SignerProvider as_SignerProvider() {
+		long ret = bindings.KeysManager_as_SignerProvider(this.ptr);
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		KeysInterface ret_hu_conv = new KeysInterface(null, ret);
+		SignerProvider ret_hu_conv = new SignerProvider(null, ret);
 		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}