X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FAccess.java;h=e4c1954e37638016036de6ca027d33ecd2447186;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=6b4c9a9fcbb4a3028654330c2cc49cf3d290a092;hpb=4f914d250ae903770128765403d62ce3d8f54126;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Access.java b/src/main/java/org/ldk/structs/Access.java
index 6b4c9a9f..e4c1954e 100644
--- a/src/main/java/org/ldk/structs/Access.java
+++ b/src/main/java/org/ldk/structs/Access.java
@@ -4,7 +4,12 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
+/**
+ * The `Access` trait defines behavior for accessing chain data and state, such as blocks and
+ * UTXOs.
+ */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class Access extends CommonBase {
 	final bindings.LDKAccess bindings_instance;
@@ -20,6 +25,13 @@ public class Access extends CommonBase {
 	}
 
 	public static interface AccessInterface {
+		/**
+		 * Returns the transaction output of a funding transaction encoded by [`short_channel_id`].
+		 * Returns an error if `genesis_hash` is for a different chain or if such a transaction output
+		 * is unknown.
+		 * 
+		 * [`short_channel_id`]: https://github.com/lightningnetwork/lightning-rfc/blob/master/07-routing-gossip.md#definition-of-short_channel_id
+		 */
 		Result_TxOutAccessErrorZ get_utxo(byte[] genesis_hash, long short_channel_id);
 	}
 	private static class LDKAccessHolder { Access held; }
@@ -28,14 +40,22 @@ public class Access extends CommonBase {
 		impl_holder.held = new Access(new bindings.LDKAccess() {
 			@Override public long get_utxo(byte[] genesis_hash, long short_channel_id) {
 				Result_TxOutAccessErrorZ ret = arg.get_utxo(genesis_hash, short_channel_id);
-				long result = ret != null ? ret.ptr : 0;
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
 		});
 		return impl_holder.held;
 	}
+	/**
+	 * Returns the transaction output of a funding transaction encoded by [`short_channel_id`].
+	 * Returns an error if `genesis_hash` is for a different chain or if such a transaction output
+	 * is unknown.
+	 * 
+	 * [`short_channel_id`]: https://github.com/lightningnetwork/lightning-rfc/blob/master/07-routing-gossip.md#definition-of-short_channel_id
+	 */
 	public Result_TxOutAccessErrorZ get_utxo(byte[] genesis_hash, long short_channel_id) {
-		long ret = bindings.Access_get_utxo(this.ptr, genesis_hash, short_channel_id);
+		long ret = bindings.Access_get_utxo(this.ptr, InternalUtils.check_arr_len(genesis_hash, 32), short_channel_id);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_TxOutAccessErrorZ ret_hu_conv = Result_TxOutAccessErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}