X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelFeatures.java;h=107c6e2903716780b815a7c763975879305003ea;hb=07d5d868dfe064aadb28a7f7ca6002c16be9723d;hp=95f2863fa0ba16394051bfe605e1eafe47d60eae;hpb=7d6be8a5ef72a4ebfe07660cce55f43f6cc30b80;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelFeatures.java b/src/main/java/org/ldk/structs/ChannelFeatures.java
index 95f2863f..107c6e29 100644
--- a/src/main/java/org/ldk/structs/ChannelFeatures.java
+++ b/src/main/java/org/ldk/structs/ChannelFeatures.java
@@ -4,6 +4,7 @@ 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;
 
 
@@ -24,9 +25,21 @@ public class ChannelFeatures extends CommonBase {
 	 * 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(ChannelFeatures b) {
-		boolean ret = bindings.ChannelFeatures_eq(this.ptr, b == null ? 0 : b.ptr & ~1);
-		this.ptrs_to.add(b);
+	public boolean eq(org.ldk.structs.ChannelFeatures b) {
+		boolean ret = bindings.ChannelFeatures_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 ChannelFeatures)) return false;
+		return this.eq((ChannelFeatures)o);
+	}
+	long clone_ptr() {
+		long ret = bindings.ChannelFeatures_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -35,9 +48,10 @@ public class ChannelFeatures extends CommonBase {
 	 */
 	public ChannelFeatures clone() {
 		long ret = bindings.ChannelFeatures_clone(this.ptr);
-		if (ret < 1024) { return null; }
-		ChannelFeatures ret_hu_conv = new ChannelFeatures(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelFeatures(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -46,21 +60,21 @@ public class ChannelFeatures extends CommonBase {
 	 */
 	public static ChannelFeatures empty() {
 		long ret = bindings.ChannelFeatures_empty();
-		if (ret < 1024) { return null; }
-		ChannelFeatures ret_hu_conv = new ChannelFeatures(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelFeatures(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
 	/**
-	 * Creates a Features with the bits set which are known by the implementation
+	 * Returns true if this `Features` object contains required features unknown by `other`.
 	 */
-	public static ChannelFeatures known() {
-		long ret = bindings.ChannelFeatures_known();
-		if (ret < 1024) { return null; }
-		ChannelFeatures ret_hu_conv = new ChannelFeatures(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		return ret_hu_conv;
+	public boolean requires_unknown_bits_from(org.ldk.structs.ChannelFeatures other) {
+		boolean ret = bindings.ChannelFeatures_requires_unknown_bits_from(this.ptr, other == null ? 0 : other.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(other);
+		if (this != null) { this.ptrs_to.add(other); };
+		return ret;
 	}
 
 	/**
@@ -69,14 +83,88 @@ public class ChannelFeatures extends CommonBase {
 	 */
 	public boolean requires_unknown_bits() {
 		boolean ret = bindings.ChannelFeatures_requires_unknown_bits(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
+	/**
+	 * Sets a required feature bit. Errors if `bit` is outside the feature range as defined
+	 * by [BOLT 9].
+	 * 
+	 * Note: Required bits are even. If an odd bit is given, then the corresponding even bit will
+	 * be set instead (i.e., `bit - 1`).
+	 * 
+	 * [BOLT 9]: https://github.com/lightning/bolts/blob/master/09-features.md
+	 */
+	public Result_NoneNoneZ set_required_feature_bit(long bit) {
+		long ret = bindings.ChannelFeatures_set_required_feature_bit(this.ptr, bit);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(bit);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_NoneNoneZ ret_hu_conv = Result_NoneNoneZ.constr_from_ptr(ret);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Sets an optional feature bit. Errors if `bit` is outside the feature range as defined
+	 * by [BOLT 9].
+	 * 
+	 * Note: Optional bits are odd. If an even bit is given, then the corresponding odd bit will be
+	 * set instead (i.e., `bit + 1`).
+	 * 
+	 * [BOLT 9]: https://github.com/lightning/bolts/blob/master/09-features.md
+	 */
+	public Result_NoneNoneZ set_optional_feature_bit(long bit) {
+		long ret = bindings.ChannelFeatures_set_optional_feature_bit(this.ptr, bit);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(bit);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_NoneNoneZ ret_hu_conv = Result_NoneNoneZ.constr_from_ptr(ret);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Sets a required custom feature bit. Errors if `bit` is outside the custom range as defined
+	 * by [bLIP 2] or if it is a known `T` feature.
+	 * 
+	 * Note: Required bits are even. If an odd bit is given, then the corresponding even bit will
+	 * be set instead (i.e., `bit - 1`).
+	 * 
+	 * [bLIP 2]: https://github.com/lightning/blips/blob/master/blip-0002.md#feature-bits
+	 */
+	public Result_NoneNoneZ set_required_custom_bit(long bit) {
+		long ret = bindings.ChannelFeatures_set_required_custom_bit(this.ptr, bit);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(bit);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_NoneNoneZ ret_hu_conv = Result_NoneNoneZ.constr_from_ptr(ret);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Sets an optional custom feature bit. Errors if `bit` is outside the custom range as defined
+	 * by [bLIP 2] or if it is a known `T` feature.
+	 * 
+	 * Note: Optional bits are odd. If an even bit is given, then the corresponding odd bit will be
+	 * set instead (i.e., `bit + 1`).
+	 * 
+	 * [bLIP 2]: https://github.com/lightning/blips/blob/master/blip-0002.md#feature-bits
+	 */
+	public Result_NoneNoneZ set_optional_custom_bit(long bit) {
+		long ret = bindings.ChannelFeatures_set_optional_custom_bit(this.ptr, bit);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(bit);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_NoneNoneZ ret_hu_conv = Result_NoneNoneZ.constr_from_ptr(ret);
+		return ret_hu_conv;
+	}
+
 	/**
 	 * Serialize the ChannelFeatures object into a byte array which can be read by ChannelFeatures_read
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.ChannelFeatures_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -85,7 +173,8 @@ public class ChannelFeatures extends CommonBase {
 	 */
 	public static Result_ChannelFeaturesDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.ChannelFeatures_read(ser);
-		if (ret < 1024) { return null; }
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_ChannelFeaturesDecodeErrorZ ret_hu_conv = Result_ChannelFeaturesDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}