X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelFeatures.java;h=b6d24de036d619636451e16168c93fbeed4f8dd8;hb=239d70ea23fdf148440dfedf9479944dc0fbf394;hp=609de36df2223821aee1d3a12bce9d3306805364;hpb=d2925e24ac4643ec22eb73495f0424e27def2545;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelFeatures.java b/src/main/java/org/ldk/structs/ChannelFeatures.java
index 609de36d..b6d24de0 100644
--- a/src/main/java/org/ldk/structs/ChannelFeatures.java
+++ b/src/main/java/org/ldk/structs/ChannelFeatures.java
@@ -25,11 +25,11 @@ 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);
+	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);
-		this.ptrs_to.add(b);
+		if (this != null) { this.ptrs_to.add(b); };
 		return ret;
 	}
 
@@ -50,31 +50,43 @@ public class ChannelFeatures extends CommonBase {
 		long ret = bindings.ChannelFeatures_clone(this.ptr);
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		ChannelFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelFeatures(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		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;
 	}
 
+	/**
+	 * Generates a non-cryptographic 64-bit hash of the ChannelFeatures.
+	 */
+	public long hash() {
+		long ret = bindings.ChannelFeatures_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
 	/**
 	 * Create a blank Features with no features set
 	 */
 	public static ChannelFeatures empty() {
 		long ret = bindings.ChannelFeatures_empty();
 		if (ret >= 0 && ret <= 4096) { return null; }
-		ChannelFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelFeatures(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		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 >= 0 && ret <= 4096) { return null; }
-		ChannelFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { 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;
 	}
 
 	/**
@@ -87,6 +99,78 @@ public class ChannelFeatures extends CommonBase {
 		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
 	 */