X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c_sharp%2Fsrc%2Forg%2Fldk%2Fstructs%2FRevokeAndACK.cs;h=e4ea40c72873b66eb51cdc649c018af1be96e4be;hb=592c64eb658d92e314a2b983cea16cecf3882474;hp=9e49d2a75629ff4fe7b8007c9a206b7dee0f8d0b;hpb=c6777737ea14e7814b0fa7d6fe16536f31d4a82b;p=ldk-java

diff --git a/c_sharp/src/org/ldk/structs/RevokeAndACK.cs b/c_sharp/src/org/ldk/structs/RevokeAndACK.cs
index 9e49d2a7..e4ea40c7 100644
--- a/c_sharp/src/org/ldk/structs/RevokeAndACK.cs
+++ b/c_sharp/src/org/ldk/structs/RevokeAndACK.cs
@@ -20,35 +20,41 @@ public class RevokeAndACK : CommonBase {
 	/**
 	 * The channel ID
 	 */
-	public byte[] get_channel_id() {
-		byte[] ret = bindings.RevokeAndACK_get_channel_id(this.ptr);
+	public ChannelId get_channel_id() {
+		long ret = bindings.RevokeAndACK_get_channel_id(this.ptr);
 		GC.KeepAlive(this);
-		return ret;
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelId ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelId(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.AddLast(this); };
+		return ret_hu_conv;
 	}
 
 	/**
 	 * The channel ID
 	 */
-	public void set_channel_id(byte[] val) {
-		bindings.RevokeAndACK_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+	public void set_channel_id(org.ldk.structs.ChannelId val) {
+		bindings.RevokeAndACK_set_channel_id(this.ptr, val.ptr);
 		GC.KeepAlive(this);
 		GC.KeepAlive(val);
+		if (this != null) { this.ptrs_to.AddLast(val); };
 	}
 
 	/**
 	 * The secret corresponding to the per-commitment point
 	 */
 	public byte[] get_per_commitment_secret() {
-		byte[] ret = bindings.RevokeAndACK_get_per_commitment_secret(this.ptr);
+		long ret = bindings.RevokeAndACK_get_per_commitment_secret(this.ptr);
 		GC.KeepAlive(this);
-		return ret;
+		if (ret >= 0 && ret <= 4096) { return null; }
+		byte[] ret_conv = InternalUtils.decodeUint8Array(ret);
+		return ret_conv;
 	}
 
 	/**
 	 * The secret corresponding to the per-commitment point
 	 */
 	public void set_per_commitment_secret(byte[] val) {
-		bindings.RevokeAndACK_set_per_commitment_secret(this.ptr, InternalUtils.check_arr_len(val, 32));
+		bindings.RevokeAndACK_set_per_commitment_secret(this.ptr, InternalUtils.encodeUint8Array(InternalUtils.check_arr_len(val, 32)));
 		GC.KeepAlive(this);
 		GC.KeepAlive(val);
 	}
@@ -57,16 +63,18 @@ public class RevokeAndACK : CommonBase {
 	 * The next sender-broadcast commitment transaction's per-commitment point
 	 */
 	public byte[] get_next_per_commitment_point() {
-		byte[] ret = bindings.RevokeAndACK_get_next_per_commitment_point(this.ptr);
+		long ret = bindings.RevokeAndACK_get_next_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;
 	}
 
 	/**
 	 * The next sender-broadcast commitment transaction's per-commitment point
 	 */
 	public void set_next_per_commitment_point(byte[] val) {
-		bindings.RevokeAndACK_set_next_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33));
+		bindings.RevokeAndACK_set_next_per_commitment_point(this.ptr, InternalUtils.encodeUint8Array(InternalUtils.check_arr_len(val, 33)));
 		GC.KeepAlive(this);
 		GC.KeepAlive(val);
 	}
@@ -74,14 +82,15 @@ public class RevokeAndACK : CommonBase {
 	/**
 	 * Constructs a new RevokeAndACK given each field
 	 */
-	public static RevokeAndACK of(byte[] channel_id_arg, byte[] per_commitment_secret_arg, byte[] next_per_commitment_point_arg) {
-		long ret = bindings.RevokeAndACK_new(InternalUtils.check_arr_len(channel_id_arg, 32), InternalUtils.check_arr_len(per_commitment_secret_arg, 32), InternalUtils.check_arr_len(next_per_commitment_point_arg, 33));
+	public static RevokeAndACK of(org.ldk.structs.ChannelId channel_id_arg, byte[] per_commitment_secret_arg, byte[] next_per_commitment_point_arg) {
+		long ret = bindings.RevokeAndACK_new(channel_id_arg.ptr, InternalUtils.encodeUint8Array(InternalUtils.check_arr_len(per_commitment_secret_arg, 32)), InternalUtils.encodeUint8Array(InternalUtils.check_arr_len(next_per_commitment_point_arg, 33)));
 		GC.KeepAlive(channel_id_arg);
 		GC.KeepAlive(per_commitment_secret_arg);
 		GC.KeepAlive(next_per_commitment_point_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.RevokeAndACK ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RevokeAndACK(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(channel_id_arg); };
 		return ret_hu_conv;
 	}
 
@@ -103,13 +112,25 @@ public class RevokeAndACK : CommonBase {
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Generates a non-cryptographic 64-bit hash of the RevokeAndACK.
+	 */
+	public long hash() {
+		long ret = bindings.RevokeAndACK_hash(this.ptr);
+		GC.KeepAlive(this);
+		return ret;
+	}
+
+	public override int GetHashCode() {
+		return (int)this.hash();
+	}
 	/**
 	 * Checks if two RevokeAndACKs contain equal inner contents.
 	 * This ignores pointers and is_owned flags and looks at the values in fields.
 	 * Two objects with NULL inner values will be considered "equal" here.
 	 */
 	public bool eq(org.ldk.structs.RevokeAndACK b) {
-		bool ret = bindings.RevokeAndACK_eq(this.ptr, b == null ? 0 : b.ptr);
+		bool ret = bindings.RevokeAndACK_eq(this.ptr, b.ptr);
 		GC.KeepAlive(this);
 		GC.KeepAlive(b);
 		if (this != null) { this.ptrs_to.AddLast(b); };
@@ -124,16 +145,18 @@ public class RevokeAndACK : CommonBase {
 	 * Serialize the RevokeAndACK object into a byte array which can be read by RevokeAndACK_read
 	 */
 	public byte[] write() {
-		byte[] ret = bindings.RevokeAndACK_write(this.ptr);
+		long ret = bindings.RevokeAndACK_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 RevokeAndACK from a byte array, created by RevokeAndACK_write
 	 */
 	public static Result_RevokeAndACKDecodeErrorZ read(byte[] ser) {
-		long ret = bindings.RevokeAndACK_read(ser);
+		long ret = bindings.RevokeAndACK_read(InternalUtils.encodeUint8Array(ser));
 		GC.KeepAlive(ser);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_RevokeAndACKDecodeErrorZ ret_hu_conv = Result_RevokeAndACKDecodeErrorZ.constr_from_ptr(ret);