X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FInvoice.java;h=968b221ac58c07301c19a824b9ee649ad8027ed3;hb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;hp=695f35decfced543f1bb30630408d6fd80eb7016;hpb=b6cc0960eaee5a5bbc7fde79a56152d6dcd649d8;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Invoice.java b/src/main/java/org/ldk/structs/Invoice.java
index 695f35de..968b221a 100644
--- a/src/main/java/org/ldk/structs/Invoice.java
+++ b/src/main/java/org/ldk/structs/Invoice.java
@@ -4,6 +4,7 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
 
 /**
@@ -39,7 +40,8 @@ public class Invoice extends CommonBase {
 	 */
 	public Invoice clone() {
 		long ret = bindings.Invoice_clone(this.ptr);
-		Invoice ret_hu_conv = new Invoice(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Invoice ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new Invoice(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -49,9 +51,10 @@ public class Invoice extends CommonBase {
 	 */
 	public SignedRawInvoice into_signed_raw() {
 		long ret = bindings.Invoice_into_signed_raw(this.ptr);
-		SignedRawInvoice ret_hu_conv = new SignedRawInvoice(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		SignedRawInvoice ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new SignedRawInvoice(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
-		this.ptrs_to.add(this);
+		;
 		return ret_hu_conv;
 	}
 
@@ -60,6 +63,7 @@ public class Invoice extends CommonBase {
 	 */
 	public Result_NoneSemanticErrorZ check_signature() {
 		long ret = bindings.Invoice_check_signature(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneSemanticErrorZ ret_hu_conv = Result_NoneSemanticErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
@@ -69,10 +73,17 @@ public class Invoice extends CommonBase {
 	 * ```
 	 * use lightning_invoice::*;
 	 * 
-	 * let invoice = \"lnbc1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqdp\\
-	 * \tl2pkx2ctnv5sxxmmwwd5kgetjypeh2ursdae8g6twvus8g6rfwvs8qun0dfjkxaq8rkx3yf5tcsyz3d7\\
-	 * \t3gafnh3cax9rn449d9p5uxz9ezhhypd0elx87sjle52x86fux2ypatgddc6k63n7erqz25le42c4u4ec\\
-	 * \tky03ylcqca784w\";
+	 * let invoice = \"lnbc100p1psj9jhxdqud3jxktt5w46x7unfv9kz6mn0v3jsnp4q0d3p2sfluzdx45tqcs\\
+	 * h2pu5qc7lgq0xs578ngs6s0s68ua4h7cvspp5q6rmq35js88zp5dvwrv9m459tnk2zunwj5jalqtyxqulh0l\\
+	 * 5gflssp5nf55ny5gcrfl30xuhzj3nphgj27rstekmr9fw3ny5989s300gyus9qyysgqcqpcrzjqw2sxwe993\\
+	 * h5pcm4dxzpvttgza8zhkqxpgffcrf5v25nwpr3cmfg7z54kuqq8rgqqqqqqqq2qqqqq9qq9qrzjqd0ylaqcl\\
+	 * j9424x9m8h2vcukcgnm6s56xfgu3j78zyqzhgs4hlpzvznlugqq9vsqqqqqqqlgqqqqqeqq9qrzjqwldmj9d\\
+	 * ha74df76zhx6l9we0vjdquygcdt3kssupehe64g6yyp5yz5rhuqqwccqqyqqqqlgqqqqjcqq9qrzjqf9e58a\\
+	 * guqr0rcun0ajlvmzq3ek63cw2w282gv3z5uupmuwvgjtq2z55qsqqg6qqqyqqqrtnqqqzq3cqygrzjqvphms\\
+	 * ywntrrhqjcraumvc4y6r8v4z5v593trte429v4hredj7ms5z52usqq9ngqqqqqqqlgqqqqqqgq9qrzjq2v0v\\
+	 * p62g49p7569ev48cmulecsxe59lvaw3wlxm7r982zxa9zzj7z5l0cqqxusqqyqqqqlgqqqqqzsqygarl9fh3\\
+	 * 8s0gyuxjjgux34w75dnc6xp2l35j7es3jd4ugt3lu0xzre26yg5m7ke54n2d5sym4xcmxtl8238xxvw5h5h5\\
+	 * j5r6drg6k6zcqj0fcwg\";
 	 * 
 	 * let signed = invoice.parse::<SignedRawInvoice>().unwrap();
 	 * 
@@ -81,8 +92,8 @@ public class Invoice extends CommonBase {
 	 */
 	public static Result_InvoiceSemanticErrorZ from_signed(SignedRawInvoice signed_invoice) {
 		long ret = bindings.Invoice_from_signed(signed_invoice == null ? 0 : signed_invoice.ptr & ~1);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_InvoiceSemanticErrorZ ret_hu_conv = Result_InvoiceSemanticErrorZ.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(signed_invoice);
 		return ret_hu_conv;
 	}
 
@@ -104,7 +115,10 @@ public class Invoice extends CommonBase {
 
 	/**
 	 * Get the payee's public key if one was included in the invoice
+	 * 
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
+	@Nullable
 	public byte[] payee_pub_key() {
 		byte[] ret = bindings.Invoice_payee_pub_key(this.ptr);
 		return ret;
@@ -120,10 +134,14 @@ public class Invoice extends CommonBase {
 
 	/**
 	 * Get the invoice features if they were included in the invoice
+	 * 
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
+	@Nullable
 	public InvoiceFeatures features() {
 		long ret = bindings.Invoice_features(this.ptr);
-		InvoiceFeatures ret_hu_conv = new InvoiceFeatures(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		InvoiceFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new InvoiceFeatures(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -144,6 +162,14 @@ public class Invoice extends CommonBase {
 		return ret;
 	}
 
+	/**
+	 * Returns whether the invoice has expired.
+	 */
+	public boolean is_expired() {
+		boolean ret = bindings.Invoice_is_expired(this.ptr);
+		return ret;
+	}
+
 	/**
 	 * Returns the invoice's `min_final_cltv_expiry` time, if present, otherwise
 	 * [`DEFAULT_MIN_FINAL_CLTV_EXPIRY`].
@@ -161,7 +187,7 @@ public class Invoice extends CommonBase {
 		PrivateRoute[] ret_conv_14_arr = new PrivateRoute[ret.length];
 		for (int o = 0; o < ret.length; o++) {
 			long ret_conv_14 = ret[o];
-			PrivateRoute ret_conv_14_hu_conv = new PrivateRoute(null, ret_conv_14);
+			PrivateRoute ret_conv_14_hu_conv = null; if (ret_conv_14 < 0 || ret_conv_14 > 4096) { ret_conv_14_hu_conv = new PrivateRoute(null, ret_conv_14); }
 			ret_conv_14_hu_conv.ptrs_to.add(this);
 			ret_conv_14_arr[o] = ret_conv_14_hu_conv;
 		}
@@ -176,7 +202,7 @@ public class Invoice extends CommonBase {
 		RouteHint[] ret_conv_11_arr = new RouteHint[ret.length];
 		for (int l = 0; l < ret.length; l++) {
 			long ret_conv_11 = ret[l];
-			RouteHint ret_conv_11_hu_conv = new RouteHint(null, ret_conv_11);
+			RouteHint ret_conv_11_hu_conv = null; if (ret_conv_11 < 0 || ret_conv_11 > 4096) { ret_conv_11_hu_conv = new RouteHint(null, ret_conv_11); }
 			ret_conv_11_hu_conv.ptrs_to.add(this);
 			ret_conv_11_arr[l] = ret_conv_11_hu_conv;
 		}
@@ -192,10 +218,11 @@ public class Invoice extends CommonBase {
 	}
 
 	/**
-	 * Returns the amount if specified in the invoice as pico <currency>.
+	 * Returns the amount if specified in the invoice as millisatoshis.
 	 */
-	public Option_u64Z amount_pico_btc() {
-		long ret = bindings.Invoice_amount_pico_btc(this.ptr);
+	public Option_u64Z amount_milli_satoshis() {
+		long ret = bindings.Invoice_amount_milli_satoshis(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Option_u64Z ret_hu_conv = Option_u64Z.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -204,8 +231,9 @@ public class Invoice extends CommonBase {
 	/**
 	 * Read a Invoice object from a string
 	 */
-	public static Result_InvoiceNoneZ from_str(String s) {
+	public static Result_InvoiceNoneZ from_str(java.lang.String s) {
 		long ret = bindings.Invoice_from_str(s);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_InvoiceNoneZ ret_hu_conv = Result_InvoiceNoneZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}