X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUpdateFee.java;h=64e4c26e3bf42bc4ca89361732aaae74068a0ffb;hb=2bb592fb946e316dba9f4d1123f8ac72ff4e9bf8;hp=9756771bd8f6280f6514c103a4bd898c80c40cea;hpb=ad15b3a4dbf3fbc7f08ef22d656bae79e8182008;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/UpdateFee.java b/src/main/java/org/ldk/structs/UpdateFee.java
index 9756771b..64e4c26e 100644
--- a/src/main/java/org/ldk/structs/UpdateFee.java
+++ b/src/main/java/org/ldk/structs/UpdateFee.java
@@ -2,49 +2,140 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
+import java.lang.ref.Reference;
+import javax.annotation.Nullable;
 
+
+/**
+ * An [`update_fee`] message to be sent to or received from a peer
+ * 
+ * [`update_fee`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#updating-fees-update_fee
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class UpdateFee extends CommonBase {
 	UpdateFee(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
 		super.finalize();
-		bindings.UpdateFee_free(ptr);
+		if (ptr != 0) { bindings.UpdateFee_free(ptr); }
+	}
+
+	/**
+	 * The channel ID
+	 */
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.UpdateFee_get_channel_id(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
 	}
 
-	public UpdateFee(UpdateFee orig) {
-		super(bindings.UpdateFee_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	/**
+	 * The channel ID
+	 */
+	public void set_channel_id(byte[] val) {
+		bindings.UpdateFee_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
-	public byte[] get_channel_id(UpdateFee this_ptr) {
-		byte[] ret = bindings.UpdateFee_get_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Fee rate per 1000-weight of the transaction
+	 */
+	public int get_feerate_per_kw() {
+		int ret = bindings.UpdateFee_get_feerate_per_kw(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
-	public void set_channel_id(UpdateFee this_ptr, byte[] val) {
-		bindings.UpdateFee_set_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Fee rate per 1000-weight of the transaction
+	 */
+	public void set_feerate_per_kw(int val) {
+		bindings.UpdateFee_set_feerate_per_kw(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
-	public int get_feerate_per_kw(UpdateFee this_ptr) {
-		int ret = bindings.UpdateFee_get_feerate_per_kw(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Constructs a new UpdateFee given each field
+	 */
+	public static UpdateFee of(byte[] channel_id_arg, int feerate_per_kw_arg) {
+		long ret = bindings.UpdateFee_new(InternalUtils.check_arr_len(channel_id_arg, 32), feerate_per_kw_arg);
+		Reference.reachabilityFence(channel_id_arg);
+		Reference.reachabilityFence(feerate_per_kw_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.UpdateFee ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UpdateFee(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+		return ret_hu_conv;
+	}
+
+	long clone_ptr() {
+		long ret = bindings.UpdateFee_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
-	public void set_feerate_per_kw(UpdateFee this_ptr, int val) {
-		bindings.UpdateFee_set_feerate_per_kw(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Creates a copy of the UpdateFee
+	 */
+	public UpdateFee clone() {
+		long ret = bindings.UpdateFee_clone(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.UpdateFee ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UpdateFee(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
 	}
 
-	public UpdateFee(byte[] channel_id_arg, int feerate_per_kw_arg) {
-		super(bindings.UpdateFee_new(channel_id_arg, feerate_per_kw_arg));
+	/**
+	 * Generates a non-cryptographic 64-bit hash of the UpdateFee.
+	 */
+	public long hash() {
+		long ret = bindings.UpdateFee_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
+	/**
+	 * Checks if two UpdateFees 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 boolean eq(org.ldk.structs.UpdateFee b) {
+		boolean ret = bindings.UpdateFee_eq(this.ptr, b == null ? 0 : b.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(b);
+		if (this != null) { this.ptrs_to.add(b); };
+		return ret;
+	}
+
+	@Override public boolean equals(Object o) {
+		if (!(o instanceof UpdateFee)) return false;
+		return this.eq((UpdateFee)o);
+	}
+	/**
+	 * Serialize the UpdateFee object into a byte array which can be read by UpdateFee_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.UpdateFee_write(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
 	}
 
-	// Skipped UpdateFee_write
-	public UpdateFee(byte[] ser) {
-		super(bindings.UpdateFee_read(ser));
+	/**
+	 * Read a UpdateFee from a byte array, created by UpdateFee_write
+	 */
+	public static Result_UpdateFeeDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.UpdateFee_read(ser);
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_UpdateFeeDecodeErrorZ ret_hu_conv = Result_UpdateFeeDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }