X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=c_sharp%2Fsrc%2Forg%2Fldk%2Fstructs%2FDelayedPaymentOutputDescriptor.cs;h=b5536ec450da76fd94388d61f2e58cde0122446d;hb=dbcef74f9feb03aa6d8d0ee07854740cac926f6b;hp=2fa6015e02ba4353c61a51a33ebebd8c5eed2963;hpb=7811d2191440c55034e1abfbf3be442d4b25481b;p=ldk-java

diff --git a/c_sharp/src/org/ldk/structs/DelayedPaymentOutputDescriptor.cs b/c_sharp/src/org/ldk/structs/DelayedPaymentOutputDescriptor.cs
index 2fa6015e..b5536ec4 100644
--- a/c_sharp/src/org/ldk/structs/DelayedPaymentOutputDescriptor.cs
+++ b/c_sharp/src/org/ldk/structs/DelayedPaymentOutputDescriptor.cs
@@ -43,16 +43,18 @@ public class DelayedPaymentOutputDescriptor : CommonBase {
 	 * Per commitment point to derive the delayed payment key by key holder.
 	 */
 	public byte[] get_per_commitment_point() {
-		byte[] ret = bindings.DelayedPaymentOutputDescriptor_get_per_commitment_point(this.ptr);
+		long ret = bindings.DelayedPaymentOutputDescriptor_get_per_commitment_point(this.ptr);
 		GC.KeepAlive(this);
-		return ret;
+		if (ret >= 0 && ret <= 4096) { return null; }
+		byte[] ret_conv = InternalUtils.decodeUint8Array(ret);
+		return ret_conv;
 	}
 
 	/**
 	 * Per commitment point to derive the delayed payment key by key holder.
 	 */
 	public void set_per_commitment_point(byte[] val) {
-		bindings.DelayedPaymentOutputDescriptor_set_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33));
+		bindings.DelayedPaymentOutputDescriptor_set_per_commitment_point(this.ptr, InternalUtils.encodeUint8Array(InternalUtils.check_arr_len(val, 33)));
 		GC.KeepAlive(this);
 		GC.KeepAlive(val);
 	}
@@ -101,20 +103,24 @@ public class DelayedPaymentOutputDescriptor : CommonBase {
 	 * The revocation point specific to the commitment transaction which was broadcast. Used to
 	 * derive the witnessScript for this output.
 	 */
-	public byte[] get_revocation_pubkey() {
-		byte[] ret = bindings.DelayedPaymentOutputDescriptor_get_revocation_pubkey(this.ptr);
+	public RevocationKey get_revocation_pubkey() {
+		long ret = bindings.DelayedPaymentOutputDescriptor_get_revocation_pubkey(this.ptr);
 		GC.KeepAlive(this);
-		return ret;
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.RevocationKey ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RevocationKey(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.AddLast(this); };
+		return ret_hu_conv;
 	}
 
 	/**
 	 * The revocation point specific to the commitment transaction which was broadcast. Used to
 	 * derive the witnessScript for this output.
 	 */
-	public void set_revocation_pubkey(byte[] val) {
-		bindings.DelayedPaymentOutputDescriptor_set_revocation_pubkey(this.ptr, InternalUtils.check_arr_len(val, 33));
+	public void set_revocation_pubkey(org.ldk.structs.RevocationKey val) {
+		bindings.DelayedPaymentOutputDescriptor_set_revocation_pubkey(this.ptr, val == null ? 0 : val.ptr);
 		GC.KeepAlive(this);
 		GC.KeepAlive(val);
+		if (this != null) { this.ptrs_to.AddLast(val); };
 	}
 
 	/**
@@ -122,9 +128,11 @@ public class DelayedPaymentOutputDescriptor : 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.DelayedPaymentOutputDescriptor_get_channel_keys_id(this.ptr);
+		long ret = bindings.DelayedPaymentOutputDescriptor_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;
 	}
 
 	/**
@@ -132,7 +140,7 @@ public class DelayedPaymentOutputDescriptor : 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.DelayedPaymentOutputDescriptor_set_channel_keys_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+		bindings.DelayedPaymentOutputDescriptor_set_channel_keys_id(this.ptr, InternalUtils.encodeUint8Array(InternalUtils.check_arr_len(val, 32)));
 		GC.KeepAlive(this);
 		GC.KeepAlive(val);
 	}
@@ -158,8 +166,8 @@ public class DelayedPaymentOutputDescriptor : CommonBase {
 	/**
 	 * Constructs a new DelayedPaymentOutputDescriptor given each field
 	 */
-	public static DelayedPaymentOutputDescriptor of(org.ldk.structs.OutPoint outpoint_arg, byte[] per_commitment_point_arg, short to_self_delay_arg, org.ldk.structs.TxOut output_arg, byte[] revocation_pubkey_arg, byte[] channel_keys_id_arg, long channel_value_satoshis_arg) {
-		long ret = bindings.DelayedPaymentOutputDescriptor_new(outpoint_arg == null ? 0 : outpoint_arg.ptr, InternalUtils.check_arr_len(per_commitment_point_arg, 33), to_self_delay_arg, output_arg.ptr, InternalUtils.check_arr_len(revocation_pubkey_arg, 33), InternalUtils.check_arr_len(channel_keys_id_arg, 32), channel_value_satoshis_arg);
+	public static DelayedPaymentOutputDescriptor of(org.ldk.structs.OutPoint outpoint_arg, byte[] per_commitment_point_arg, short to_self_delay_arg, org.ldk.structs.TxOut output_arg, org.ldk.structs.RevocationKey revocation_pubkey_arg, byte[] channel_keys_id_arg, long channel_value_satoshis_arg) {
+		long ret = bindings.DelayedPaymentOutputDescriptor_new(outpoint_arg == null ? 0 : outpoint_arg.ptr, InternalUtils.encodeUint8Array(InternalUtils.check_arr_len(per_commitment_point_arg, 33)), to_self_delay_arg, output_arg.ptr, revocation_pubkey_arg == null ? 0 : revocation_pubkey_arg.ptr, InternalUtils.encodeUint8Array(InternalUtils.check_arr_len(channel_keys_id_arg, 32)), channel_value_satoshis_arg);
 		GC.KeepAlive(outpoint_arg);
 		GC.KeepAlive(per_commitment_point_arg);
 		GC.KeepAlive(to_self_delay_arg);
@@ -171,6 +179,7 @@ public class DelayedPaymentOutputDescriptor : CommonBase {
 		org.ldk.structs.DelayedPaymentOutputDescriptor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.DelayedPaymentOutputDescriptor(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(revocation_pubkey_arg); };
 		return ret_hu_conv;
 	}
 
@@ -192,6 +201,18 @@ public class DelayedPaymentOutputDescriptor : CommonBase {
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Generates a non-cryptographic 64-bit hash of the DelayedPaymentOutputDescriptor.
+	 */
+	public long hash() {
+		long ret = bindings.DelayedPaymentOutputDescriptor_hash(this.ptr);
+		GC.KeepAlive(this);
+		return ret;
+	}
+
+	public override int GetHashCode() {
+		return (int)this.hash();
+	}
 	/**
 	 * Checks if two DelayedPaymentOutputDescriptors contain equal inner contents.
 	 * This ignores pointers and is_owned flags and looks at the values in fields.
@@ -213,16 +234,18 @@ public class DelayedPaymentOutputDescriptor : CommonBase {
 	 * Serialize the DelayedPaymentOutputDescriptor object into a byte array which can be read by DelayedPaymentOutputDescriptor_read
 	 */
 	public byte[] write() {
-		byte[] ret = bindings.DelayedPaymentOutputDescriptor_write(this.ptr);
+		long ret = bindings.DelayedPaymentOutputDescriptor_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 DelayedPaymentOutputDescriptor from a byte array, created by DelayedPaymentOutputDescriptor_write
 	 */
 	public static Result_DelayedPaymentOutputDescriptorDecodeErrorZ read(byte[] ser) {
-		long ret = bindings.DelayedPaymentOutputDescriptor_read(ser);
+		long ret = bindings.DelayedPaymentOutputDescriptor_read(InternalUtils.encodeUint8Array(ser));
 		GC.KeepAlive(ser);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_DelayedPaymentOutputDescriptorDecodeErrorZ ret_hu_conv = Result_DelayedPaymentOutputDescriptorDecodeErrorZ.constr_from_ptr(ret);