X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRawInvoice.java;h=107e6c0e1d9bd54221c727945ac5233875827909;hb=890e35a4387758c0447aab34166caa579bbf3a08;hp=1a6a07d0f6f259c0454465fce433550db0b1fff8;hpb=32692e00046b7ec16b6a2e20bd54800b2b48d4c0;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/RawInvoice.java b/src/main/java/org/ldk/structs/RawInvoice.java
index 1a6a07d0..107e6c0e 100644
--- a/src/main/java/org/ldk/structs/RawInvoice.java
+++ b/src/main/java/org/ldk/structs/RawInvoice.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;
 
 
@@ -28,9 +29,10 @@ public class RawInvoice extends CommonBase {
 	 */
 	public RawDataPart get_data() {
 		long ret = bindings.RawInvoice_get_data(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		RawDataPart ret_hu_conv = new RawDataPart(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.RawDataPart ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RawDataPart(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -38,7 +40,10 @@ public class RawInvoice extends CommonBase {
 	 * data part
 	 */
 	public void set_data(RawDataPart val) {
-		bindings.RawInvoice_set_data(this.ptr, val == null ? 0 : val.ptr & ~1);
+		bindings.RawInvoice_set_data(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -47,8 +52,20 @@ public class RawInvoice extends CommonBase {
 	 * Two objects with NULL inner values will be considered "equal" here.
 	 */
 	public boolean eq(RawInvoice b) {
-		boolean ret = bindings.RawInvoice_eq(this.ptr, b == null ? 0 : b.ptr & ~1);
-		this.ptrs_to.add(b);
+		boolean ret = bindings.RawInvoice_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 RawInvoice)) return false;
+		return this.eq((RawInvoice)o);
+	}
+	long clone_ptr() {
+		long ret = bindings.RawInvoice_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -57,17 +74,31 @@ public class RawInvoice extends CommonBase {
 	 */
 	public RawInvoice clone() {
 		long ret = bindings.RawInvoice_clone(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		RawInvoice ret_hu_conv = new RawInvoice(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.RawInvoice ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RawInvoice(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	/**
-	 * Calculate the hash of the encoded `RawInvoice`
+	 * Checks if two RawInvoices contain equal inner contents.
+	 */
+	public long hash() {
+		long ret = bindings.RawInvoice_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
+	/**
+	 * Calculate the hash of the encoded `RawInvoice` which should be signed.
 	 */
-	public byte[] hash() {
-		byte[] ret = bindings.RawInvoice_hash(this.ptr);
+	public byte[] signable_hash() {
+		byte[] ret = bindings.RawInvoice_signable_hash(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -77,9 +108,10 @@ public class RawInvoice extends CommonBase {
 	@Nullable
 	public Sha256 payment_hash() {
 		long ret = bindings.RawInvoice_payment_hash(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		Sha256 ret_hu_conv = new Sha256(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.Sha256 ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.Sha256(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -89,9 +121,10 @@ public class RawInvoice extends CommonBase {
 	@Nullable
 	public Description description() {
 		long ret = bindings.RawInvoice_description(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		Description ret_hu_conv = new Description(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.Description ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.Description(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -101,9 +134,10 @@ public class RawInvoice extends CommonBase {
 	@Nullable
 	public PayeePubKey payee_pub_key() {
 		long ret = bindings.RawInvoice_payee_pub_key(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		PayeePubKey ret_hu_conv = new PayeePubKey(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.PayeePubKey ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.PayeePubKey(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -113,9 +147,10 @@ public class RawInvoice extends CommonBase {
 	@Nullable
 	public Sha256 description_hash() {
 		long ret = bindings.RawInvoice_description_hash(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		Sha256 ret_hu_conv = new Sha256(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.Sha256 ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.Sha256(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -125,9 +160,10 @@ public class RawInvoice extends CommonBase {
 	@Nullable
 	public ExpiryTime expiry_time() {
 		long ret = bindings.RawInvoice_expiry_time(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		ExpiryTime ret_hu_conv = new ExpiryTime(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ExpiryTime ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ExpiryTime(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -137,9 +173,10 @@ public class RawInvoice extends CommonBase {
 	@Nullable
 	public MinFinalCltvExpiry min_final_cltv_expiry() {
 		long ret = bindings.RawInvoice_min_final_cltv_expiry(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		MinFinalCltvExpiry ret_hu_conv = new MinFinalCltvExpiry(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.MinFinalCltvExpiry ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.MinFinalCltvExpiry(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -149,6 +186,7 @@ public class RawInvoice extends CommonBase {
 	@Nullable
 	public byte[] payment_secret() {
 		byte[] ret = bindings.RawInvoice_payment_secret(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -158,19 +196,22 @@ public class RawInvoice extends CommonBase {
 	@Nullable
 	public InvoiceFeatures features() {
 		long ret = bindings.RawInvoice_features(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		InvoiceFeatures ret_hu_conv = new InvoiceFeatures(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.InvoiceFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.InvoiceFeatures(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	public PrivateRoute[] private_routes() {
 		long[] ret = bindings.RawInvoice_private_routes(this.ptr);
-		PrivateRoute[] ret_conv_14_arr = new PrivateRoute[ret.length];
-		for (int o = 0; o < ret.length; o++) {
+		Reference.reachabilityFence(this);
+		int ret_conv_14_len = ret.length;
+		PrivateRoute[] ret_conv_14_arr = new PrivateRoute[ret_conv_14_len];
+		for (int o = 0; o < ret_conv_14_len; o++) {
 			long ret_conv_14 = ret[o];
-			PrivateRoute ret_conv_14_hu_conv = new PrivateRoute(null, ret_conv_14);
-			ret_conv_14_hu_conv.ptrs_to.add(this);
+			org.ldk.structs.PrivateRoute ret_conv_14_hu_conv = null; if (ret_conv_14 < 0 || ret_conv_14 > 4096) { ret_conv_14_hu_conv = new org.ldk.structs.PrivateRoute(null, ret_conv_14); }
+			if (ret_conv_14_hu_conv != null) { ret_conv_14_hu_conv.ptrs_to.add(this); };
 			ret_conv_14_arr[o] = ret_conv_14_hu_conv;
 		}
 		return ret_conv_14_arr;
@@ -178,14 +219,16 @@ public class RawInvoice extends CommonBase {
 
 	public Option_u64Z amount_pico_btc() {
 		long ret = bindings.RawInvoice_amount_pico_btc(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		Option_u64Z ret_hu_conv = Option_u64Z.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.Option_u64Z ret_hu_conv = org.ldk.structs.Option_u64Z.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	public Currency currency() {
 		Currency ret = bindings.RawInvoice_currency(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}