X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FInvoice.java;h=cbcad6bd78db4d6cc3e28ba52a0f45418214a5a1;hb=4a36fa97d4eee96099c4a176ea845c52db27e64c;hp=f3cfa94d9675a9ef4bd5fce83790cee64db701ae;hpb=46763b974f120d1795fca6c1e757578784f3305a;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Invoice.java b/src/main/java/org/ldk/structs/Invoice.java
index f3cfa94d..cbcad6bd 100644
--- a/src/main/java/org/ldk/structs/Invoice.java
+++ b/src/main/java/org/ldk/structs/Invoice.java
@@ -12,9 +12,11 @@ import javax.annotation.Nullable;
  * Represents a syntactically and semantically correct lightning BOLT11 invoice.
  * 
  * There are three ways to construct an `Invoice`:
- * 1. using `InvoiceBuilder`
- * 2. using `Invoice::from_signed(SignedRawInvoice)`
- * 3. using `str::parse::<Invoice>(&str)`
+ * 1. using [`InvoiceBuilder`]
+ * 2. using [`Invoice::from_signed`]
+ * 3. using `str::parse::<Invoice>(&str)` (see [`Invoice::from_str`])
+ * 
+ * [`Invoice::from_str`]: crate::Invoice#impl-FromStr
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class Invoice extends CommonBase {
@@ -61,7 +63,7 @@ public class Invoice extends CommonBase {
 	}
 
 	/**
-	 * Checks if two Invoices contain equal inner contents.
+	 * Generates a non-cryptographic 64-bit hash of the Invoice.
 	 */
 	public long hash() {
 		long ret = bindings.Invoice_hash(this.ptr);
@@ -72,6 +74,15 @@ public class Invoice extends CommonBase {
 	@Override public int hashCode() {
 		return (int)this.hash();
 	}
+	/**
+	 * The hash of the [`RawInvoice`] that was signed.
+	 */
+	public byte[] signable_hash() {
+		byte[] ret = bindings.Invoice_signable_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Transform the `Invoice` into it's unchecked version
 	 */
@@ -97,7 +108,7 @@ public class Invoice extends CommonBase {
 	}
 
 	/**
-	 * Constructs an `Invoice` from a `SignedRawInvoice` by checking all its invariants.
+	 * Constructs an `Invoice` from a [`SignedRawInvoice`] by checking all its invariants.
 	 * ```
 	 * use lightning_invoice::*;
 	 * 
@@ -175,6 +186,18 @@ public class Invoice extends CommonBase {
 		return ret;
 	}
 
+	/**
+	 * Get the payment metadata blob if one was included in the invoice
+	 */
+	public Option_CVec_u8ZZ payment_metadata() {
+		long ret = bindings.Invoice_payment_metadata(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.Option_CVec_u8ZZ ret_hu_conv = org.ldk.structs.Option_CVec_u8ZZ.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
 	/**
 	 * Get the invoice features if they were included in the invoice
 	 * 
@@ -199,6 +222,19 @@ public class Invoice extends CommonBase {
 		return ret;
 	}
 
+	/**
+	 * Returns the Duration since the Unix epoch at which the invoice expires.
+	 * Returning None if overflow occurred.
+	 */
+	public Option_DurationZ expires_at() {
+		long ret = bindings.Invoice_expires_at(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.Option_DurationZ ret_hu_conv = org.ldk.structs.Option_DurationZ.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
 	/**
 	 * Returns the invoice's expiry time, if present, otherwise [`DEFAULT_EXPIRY_TIME`].
 	 */
@@ -217,6 +253,26 @@ public class Invoice extends CommonBase {
 		return ret;
 	}
 
+	/**
+	 * Returns the Duration remaining until the invoice expires.
+	 */
+	public long duration_until_expiry() {
+		long ret = bindings.Invoice_duration_until_expiry(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	/**
+	 * Returns the Duration remaining until the invoice expires given the current time.
+	 * `time` is the timestamp as a duration since the Unix epoch.
+	 */
+	public long expiration_remaining_from_epoch(long time) {
+		long ret = bindings.Invoice_expiration_remaining_from_epoch(this.ptr, time);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(time);
+		return ret;
+	}
+
 	/**
 	 * Returns whether the expiry time would pass at the given point in time.
 	 * `at_time` is the timestamp as a duration since the Unix epoch.
@@ -238,6 +294,15 @@ public class Invoice extends CommonBase {
 		return ret;
 	}
 
+	/**
+	 * Returns a list of all fallback addresses as [`Address`]es
+	 */
+	public String[] fallback_addresses() {
+		String[] ret = bindings.Invoice_fallback_addresses(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Returns a list of all routes included in the invoice
 	 */