X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FNetworkGraph.java;h=1c2469d4db487ae0bbf67a081a73db4b6e96773d;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=69d615eddae0afd08b200a5f0b08942a47962e06;hpb=b0c50b891cbca28d3bd1d86276c132ff5221d8e4;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/NetworkGraph.java b/src/main/java/org/ldk/structs/NetworkGraph.java
index 69d615ed..1c2469d4 100644
--- a/src/main/java/org/ldk/structs/NetworkGraph.java
+++ b/src/main/java/org/ldk/structs/NetworkGraph.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;
 
 
 /**
@@ -18,12 +19,18 @@ public class NetworkGraph extends CommonBase {
 		if (ptr != 0) { bindings.NetworkGraph_free(ptr); }
 	}
 
+	long clone_ptr() {
+		long ret = bindings.NetworkGraph_clone_ptr(this.ptr);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the NetworkGraph
 	 */
 	public NetworkGraph clone() {
 		long ret = bindings.NetworkGraph_clone(this.ptr);
-		NetworkGraph ret_hu_conv = new NetworkGraph(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NetworkGraph ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NetworkGraph(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -41,6 +48,7 @@ public class NetworkGraph extends CommonBase {
 	 */
 	public static Result_NetworkGraphDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.NetworkGraph_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NetworkGraphDecodeErrorZ ret_hu_conv = Result_NetworkGraphDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
@@ -49,12 +57,24 @@ public class NetworkGraph extends CommonBase {
 	 * Creates a new, empty, network graph.
 	 */
 	public static NetworkGraph of(byte[] genesis_hash) {
-		long ret = bindings.NetworkGraph_new(genesis_hash);
-		NetworkGraph ret_hu_conv = new NetworkGraph(null, ret);
+		long ret = bindings.NetworkGraph_new(InternalUtils.check_arr_len(genesis_hash, 32));
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NetworkGraph ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NetworkGraph(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Returns a read-only view of the network graph.
+	 */
+	public ReadOnlyNetworkGraph read_only() {
+		long ret = bindings.NetworkGraph_read_only(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ReadOnlyNetworkGraph ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ReadOnlyNetworkGraph(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
 	/**
 	 * For an already known node (from channel announcements), update its stored properties from a
 	 * given node announcement.
@@ -65,6 +85,7 @@ public class NetworkGraph extends CommonBase {
 	 */
 	public Result_NoneLightningErrorZ update_node_from_announcement(NodeAnnouncement msg) {
 		long ret = bindings.NetworkGraph_update_node_from_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(msg);
 		return ret_hu_conv;
@@ -78,6 +99,7 @@ public class NetworkGraph extends CommonBase {
 	 */
 	public Result_NoneLightningErrorZ update_node_from_unsigned_announcement(UnsignedNodeAnnouncement msg) {
 		long ret = bindings.NetworkGraph_update_node_from_unsigned_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(msg);
 		return ret_hu_conv;
@@ -93,8 +115,9 @@ public class NetworkGraph extends CommonBase {
 	 * If a `chain::Access` object is provided via `chain_access`, it will be called to verify
 	 * the corresponding UTXO exists on chain and is correctly-formatted.
 	 */
-	public Result_NoneLightningErrorZ update_channel_from_announcement(ChannelAnnouncement msg, Access chain_access) {
-		long ret = bindings.NetworkGraph_update_channel_from_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1, chain_access == null ? 0 : chain_access.ptr);
+	public Result_NoneLightningErrorZ update_channel_from_announcement(ChannelAnnouncement msg, Option_AccessZ chain_access) {
+		long ret = bindings.NetworkGraph_update_channel_from_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1, chain_access.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(msg);
 		this.ptrs_to.add(chain_access);
@@ -109,8 +132,9 @@ public class NetworkGraph extends CommonBase {
 	 * If a `chain::Access` object is provided via `chain_access`, it will be called to verify
 	 * the corresponding UTXO exists on chain and is correctly-formatted.
 	 */
-	public Result_NoneLightningErrorZ update_channel_from_unsigned_announcement(UnsignedChannelAnnouncement msg, Access chain_access) {
-		long ret = bindings.NetworkGraph_update_channel_from_unsigned_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1, chain_access == null ? 0 : chain_access.ptr);
+	public Result_NoneLightningErrorZ update_channel_from_unsigned_announcement(UnsignedChannelAnnouncement msg, Option_AccessZ chain_access) {
+		long ret = bindings.NetworkGraph_update_channel_from_unsigned_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1, chain_access.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(msg);
 		this.ptrs_to.add(chain_access);
@@ -127,6 +151,13 @@ public class NetworkGraph extends CommonBase {
 		bindings.NetworkGraph_close_channel_from_update(this.ptr, short_channel_id, is_permanent);
 	}
 
+	/**
+	 * Marks a node in the graph as failed.
+	 */
+	public void fail_node(byte[] _node_id, boolean is_permanent) {
+		bindings.NetworkGraph_fail_node(this.ptr, InternalUtils.check_arr_len(_node_id, 33), is_permanent);
+	}
+
 	/**
 	 * For an already known (from announcement) channel, update info about one of the directions
 	 * of the channel.
@@ -137,6 +168,7 @@ public class NetworkGraph extends CommonBase {
 	 */
 	public Result_NoneLightningErrorZ update_channel(ChannelUpdate msg) {
 		long ret = bindings.NetworkGraph_update_channel(this.ptr, msg == null ? 0 : msg.ptr & ~1);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(msg);
 		return ret_hu_conv;
@@ -149,6 +181,7 @@ public class NetworkGraph extends CommonBase {
 	 */
 	public Result_NoneLightningErrorZ update_channel_unsigned(UnsignedChannelUpdate msg) {
 		long ret = bindings.NetworkGraph_update_channel_unsigned(this.ptr, msg == null ? 0 : msg.ptr & ~1);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(msg);
 		return ret_hu_conv;