X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FKeysInterface.java;h=f9d70fcef0ee05a09b430a8a9562fa5532e5d1cf;hb=1854b5cebef22ace9e9e4dd191f609818df9ce08;hp=19a0d62f177a7ada342cd650a6961c527b1de4a6;hpb=1d0c372339e4d0148449728072c95964088412c4;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/KeysInterface.java b/src/main/java/org/ldk/structs/KeysInterface.java
index 19a0d62f..f9d70fce 100644
--- a/src/main/java/org/ldk/structs/KeysInterface.java
+++ b/src/main/java/org/ldk/structs/KeysInterface.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;
 
 /**
@@ -75,6 +76,12 @@ public class KeysInterface extends CommonBase {
 		 * blindly signing the hash.
 		 */
 		Result_RecoverableSignatureNoneZ sign_invoice(byte[] invoice_preimage);
+		/**
+		 * Get secret key material as bytes for use in encrypting and decrypting inbound payment data.
+		 * 
+		 * This method must return the same value each time it is called.
+		 */
+		byte[] get_inbound_payment_key_material();
 	}
 	private static class LDKKeysInterfaceHolder { KeysInterface held; }
 	public static KeysInterface new_impl(KeysInterfaceInterface arg) {
@@ -82,7 +89,8 @@ public class KeysInterface extends CommonBase {
 		impl_holder.held = new KeysInterface(new bindings.LDKKeysInterface() {
 			@Override public byte[] get_node_secret() {
 				byte[] ret = arg.get_node_secret();
-				return ret;
+				byte[] result = InternalUtils.check_arr_len(ret, 32);
+				return result;
 			}
 			@Override public byte[] get_destination_script() {
 				byte[] ret = arg.get_destination_script();
@@ -90,28 +98,33 @@ public class KeysInterface extends CommonBase {
 			}
 			@Override public long get_shutdown_scriptpubkey() {
 				ShutdownScript ret = arg.get_shutdown_scriptpubkey();
-				long result = ret == null ? 0 : ret.ptr & ~1;
-				impl_holder.held.ptrs_to.add(ret);
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
 			@Override public long get_channel_signer(boolean inbound, long channel_value_satoshis) {
 				Sign ret = arg.get_channel_signer(inbound, channel_value_satoshis);
-				long result = ret == null ? 0 : ret.ptr;
+				long result = ret == null ? 0 : ret.clone_ptr();
 				impl_holder.held.ptrs_to.add(ret);
 				return result;
 			}
 			@Override public byte[] get_secure_random_bytes() {
 				byte[] ret = arg.get_secure_random_bytes();
-				return ret;
+				byte[] result = InternalUtils.check_arr_len(ret, 32);
+				return result;
 			}
 			@Override public long read_chan_signer(byte[] reader) {
 				Result_SignDecodeErrorZ ret = arg.read_chan_signer(reader);
-				long result = ret != null ? ret.ptr : 0;
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
 			@Override public long sign_invoice(byte[] invoice_preimage) {
 				Result_RecoverableSignatureNoneZ ret = arg.sign_invoice(invoice_preimage);
-				long result = ret != null ? ret.ptr : 0;
+				long result = ret == null ? 0 : ret.clone_ptr();
+				return result;
+			}
+			@Override public byte[] get_inbound_payment_key_material() {
+				byte[] ret = arg.get_inbound_payment_key_material();
+				byte[] result = InternalUtils.check_arr_len(ret, 32);
 				return result;
 			}
 		});
@@ -124,6 +137,7 @@ public class KeysInterface extends CommonBase {
 	 */
 	public byte[] get_node_secret() {
 		byte[] ret = bindings.KeysInterface_get_node_secret(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -135,6 +149,7 @@ public class KeysInterface extends CommonBase {
 	 */
 	public byte[] get_destination_script() {
 		byte[] ret = bindings.KeysInterface_get_destination_script(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -146,8 +161,9 @@ public class KeysInterface extends CommonBase {
 	 */
 	public ShutdownScript get_shutdown_scriptpubkey() {
 		long ret = bindings.KeysInterface_get_shutdown_scriptpubkey(this.ptr);
-		if (ret < 1024) { return null; }
-		ShutdownScript ret_hu_conv = new ShutdownScript(null, ret);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ShutdownScript ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ShutdownScript(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -160,7 +176,10 @@ public class KeysInterface extends CommonBase {
 	 */
 	public Sign get_channel_signer(boolean inbound, long channel_value_satoshis) {
 		long ret = bindings.KeysInterface_get_channel_signer(this.ptr, inbound, channel_value_satoshis);
-		if (ret < 1024) { return null; }
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(inbound);
+		Reference.reachabilityFence(channel_value_satoshis);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Sign ret_hu_conv = new Sign(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -175,6 +194,7 @@ public class KeysInterface extends CommonBase {
 	 */
 	public byte[] get_secure_random_bytes() {
 		byte[] ret = bindings.KeysInterface_get_secure_random_bytes(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -188,7 +208,9 @@ public class KeysInterface extends CommonBase {
 	 */
 	public Result_SignDecodeErrorZ read_chan_signer(byte[] reader) {
 		long ret = bindings.KeysInterface_read_chan_signer(this.ptr, reader);
-		if (ret < 1024) { return null; }
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(reader);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_SignDecodeErrorZ ret_hu_conv = Result_SignDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
@@ -201,9 +223,22 @@ public class KeysInterface extends CommonBase {
 	 */
 	public Result_RecoverableSignatureNoneZ sign_invoice(byte[] invoice_preimage) {
 		long ret = bindings.KeysInterface_sign_invoice(this.ptr, invoice_preimage);
-		if (ret < 1024) { return null; }
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(invoice_preimage);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_RecoverableSignatureNoneZ ret_hu_conv = Result_RecoverableSignatureNoneZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Get secret key material as bytes for use in encrypting and decrypting inbound payment data.
+	 * 
+	 * This method must return the same value each time it is called.
+	 */
+	public byte[] get_inbound_payment_key_material() {
+		byte[] ret = bindings.KeysInterface_get_inbound_payment_key_material(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 }