X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c_sharp%2Fsrc%2Forg%2Fldk%2Fstructs%2FStaticPaymentOutputDescriptor.cs;h=e1bf7359796220da7bc48dd7f15baa399976909e;hb=8de7213fbf663ff60322896282dad51e8ab2f001;hp=b302baa194002726f4723887ff39f1fb11b176be;hpb=afc50e5d491a11364849383b75a8f939df703bac;p=ldk-java

diff --git a/c_sharp/src/org/ldk/structs/StaticPaymentOutputDescriptor.cs b/c_sharp/src/org/ldk/structs/StaticPaymentOutputDescriptor.cs
index b302baa1..e1bf7359 100644
--- a/c_sharp/src/org/ldk/structs/StaticPaymentOutputDescriptor.cs
+++ b/c_sharp/src/org/ldk/structs/StaticPaymentOutputDescriptor.cs
@@ -64,9 +64,11 @@ public class StaticPaymentOutputDescriptor : CommonBase {
 	 * This may be useful in re-deriving keys used in the channel to spend the output.
 	 */
 	public byte[] get_channel_keys_id() {
-		byte[] ret = bindings.StaticPaymentOutputDescriptor_get_channel_keys_id(this.ptr);
+		long ret = bindings.StaticPaymentOutputDescriptor_get_channel_keys_id(this.ptr);
 		GC.KeepAlive(this);
-		return ret;
+		if (ret >= 0 && ret <= 4096) { return null; }
+		byte[] ret_conv = InternalUtils.decodeUint8Array(ret);
+		return ret_conv;
 	}
 
 	/**
@@ -74,7 +76,7 @@ public class StaticPaymentOutputDescriptor : CommonBase {
 	 * This may be useful in re-deriving keys used in the channel to spend the output.
 	 */
 	public void set_channel_keys_id(byte[] val) {
-		bindings.StaticPaymentOutputDescriptor_set_channel_keys_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+		bindings.StaticPaymentOutputDescriptor_set_channel_keys_id(this.ptr, InternalUtils.encodeUint8Array(InternalUtils.check_arr_len(val, 32)));
 		GC.KeepAlive(this);
 		GC.KeepAlive(val);
 	}
@@ -97,19 +99,55 @@ public class StaticPaymentOutputDescriptor : CommonBase {
 		GC.KeepAlive(val);
 	}
 
+	/**
+	 * The necessary channel parameters that need to be provided to the re-derived signer through
+	 * [`ChannelSigner::provide_channel_parameters`].
+	 * 
+	 * Added as optional, but always `Some` if the descriptor was produced in v0.0.117 or later.
+	 * 
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	public ChannelTransactionParameters get_channel_transaction_parameters() {
+		long ret = bindings.StaticPaymentOutputDescriptor_get_channel_transaction_parameters(this.ptr);
+		GC.KeepAlive(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelTransactionParameters ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelTransactionParameters(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.AddLast(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * The necessary channel parameters that need to be provided to the re-derived signer through
+	 * [`ChannelSigner::provide_channel_parameters`].
+	 * 
+	 * Added as optional, but always `Some` if the descriptor was produced in v0.0.117 or later.
+	 * 
+	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	public void set_channel_transaction_parameters(org.ldk.structs.ChannelTransactionParameters val) {
+		bindings.StaticPaymentOutputDescriptor_set_channel_transaction_parameters(this.ptr, val == null ? 0 : val.ptr);
+		GC.KeepAlive(this);
+		GC.KeepAlive(val);
+		if (this != null) { this.ptrs_to.AddLast(val); };
+	}
+
 	/**
 	 * Constructs a new StaticPaymentOutputDescriptor given each field
+	 * 
+	 * Note that channel_transaction_parameters_arg (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public static StaticPaymentOutputDescriptor of(org.ldk.structs.OutPoint outpoint_arg, org.ldk.structs.TxOut output_arg, byte[] channel_keys_id_arg, long channel_value_satoshis_arg) {
-		long ret = bindings.StaticPaymentOutputDescriptor_new(outpoint_arg == null ? 0 : outpoint_arg.ptr, output_arg.ptr, InternalUtils.check_arr_len(channel_keys_id_arg, 32), channel_value_satoshis_arg);
+	public static StaticPaymentOutputDescriptor of(org.ldk.structs.OutPoint outpoint_arg, org.ldk.structs.TxOut output_arg, byte[] channel_keys_id_arg, long channel_value_satoshis_arg, org.ldk.structs.ChannelTransactionParameters channel_transaction_parameters_arg) {
+		long ret = bindings.StaticPaymentOutputDescriptor_new(outpoint_arg == null ? 0 : outpoint_arg.ptr, output_arg.ptr, InternalUtils.encodeUint8Array(InternalUtils.check_arr_len(channel_keys_id_arg, 32)), channel_value_satoshis_arg, channel_transaction_parameters_arg == null ? 0 : channel_transaction_parameters_arg.ptr);
 		GC.KeepAlive(outpoint_arg);
 		GC.KeepAlive(output_arg);
 		GC.KeepAlive(channel_keys_id_arg);
 		GC.KeepAlive(channel_value_satoshis_arg);
+		GC.KeepAlive(channel_transaction_parameters_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.StaticPaymentOutputDescriptor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.StaticPaymentOutputDescriptor(null, ret); }
 		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.AddLast(ret_hu_conv); };
 		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.AddLast(outpoint_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.AddLast(channel_transaction_parameters_arg); };
 		return ret_hu_conv;
 	}
 
@@ -131,6 +169,18 @@ public class StaticPaymentOutputDescriptor : CommonBase {
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Generates a non-cryptographic 64-bit hash of the StaticPaymentOutputDescriptor.
+	 */
+	public long hash() {
+		long ret = bindings.StaticPaymentOutputDescriptor_hash(this.ptr);
+		GC.KeepAlive(this);
+		return ret;
+	}
+
+	public override int GetHashCode() {
+		return (int)this.hash();
+	}
 	/**
 	 * Checks if two StaticPaymentOutputDescriptors contain equal inner contents.
 	 * This ignores pointers and is_owned flags and looks at the values in fields.
@@ -148,20 +198,48 @@ public class StaticPaymentOutputDescriptor : CommonBase {
 		if (!(o is StaticPaymentOutputDescriptor)) return false;
 		return this.eq((StaticPaymentOutputDescriptor)o);
 	}
+	/**
+	 * Returns the `witness_script` of the spendable output.
+	 * 
+	 * Note that this will only return `Some` for [`StaticPaymentOutputDescriptor`]s that
+	 * originated from an anchor outputs channel, as they take the form of a P2WSH script.
+	 */
+	public Option_CVec_u8ZZ witness_script() {
+		long ret = bindings.StaticPaymentOutputDescriptor_witness_script(this.ptr);
+		GC.KeepAlive(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.Option_CVec_u8ZZ ret_hu_conv = org.ldk.structs.Option_CVec_u8ZZ.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.AddLast(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * The maximum length a well-formed witness spending one of these should have.
+	 * Note: If you have the grind_signatures feature enabled, this will be at least 1 byte
+	 * shorter.
+	 */
+	public long max_witness_length() {
+		long ret = bindings.StaticPaymentOutputDescriptor_max_witness_length(this.ptr);
+		GC.KeepAlive(this);
+		return ret;
+	}
+
 	/**
 	 * Serialize the StaticPaymentOutputDescriptor object into a byte array which can be read by StaticPaymentOutputDescriptor_read
 	 */
 	public byte[] write() {
-		byte[] ret = bindings.StaticPaymentOutputDescriptor_write(this.ptr);
+		long ret = bindings.StaticPaymentOutputDescriptor_write(this.ptr);
 		GC.KeepAlive(this);
-		return ret;
+		if (ret >= 0 && ret <= 4096) { return null; }
+		byte[] ret_conv = InternalUtils.decodeUint8Array(ret);
+		return ret_conv;
 	}
 
 	/**
 	 * Read a StaticPaymentOutputDescriptor from a byte array, created by StaticPaymentOutputDescriptor_write
 	 */
 	public static Result_StaticPaymentOutputDescriptorDecodeErrorZ read(byte[] ser) {
-		long ret = bindings.StaticPaymentOutputDescriptor_read(ser);
+		long ret = bindings.StaticPaymentOutputDescriptor_read(InternalUtils.encodeUint8Array(ser));
 		GC.KeepAlive(ser);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_StaticPaymentOutputDescriptorDecodeErrorZ ret_hu_conv = Result_StaticPaymentOutputDescriptorDecodeErrorZ.constr_from_ptr(ret);