X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FNetworkGraph.java;h=e3414f4821f84e58704d876793e15e918fc910c3;hb=5e9de82b3a7712a41189756d9d16d946142b2ac5;hp=e69a40b6687c632351f732f6e5e09c344d9be3b3;hpb=47341beaeecf907f422f126500baf586d54a0d41;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/NetworkGraph.java b/src/main/java/org/ldk/structs/NetworkGraph.java
index e69a40b6..e3414f48 100644
--- a/src/main/java/org/ldk/structs/NetworkGraph.java
+++ b/src/main/java/org/ldk/structs/NetworkGraph.java
@@ -29,7 +29,7 @@ public class NetworkGraph extends CommonBase {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		EventHandler ret_hu_conv = new EventHandler(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -51,7 +51,7 @@ public class NetworkGraph extends CommonBase {
 		Reference.reachabilityFence(arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NetworkGraphDecodeErrorZ ret_hu_conv = Result_NetworkGraphDecodeErrorZ.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(arg);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(arg); };
 		return ret_hu_conv;
 	}
 
@@ -64,8 +64,8 @@ public class NetworkGraph extends CommonBase {
 		Reference.reachabilityFence(logger);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.NetworkGraph ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NetworkGraph(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(logger);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(logger); };
 		return ret_hu_conv;
 	}
 
@@ -77,7 +77,7 @@ public class NetworkGraph extends CommonBase {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.ReadOnlyNetworkGraph ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ReadOnlyNetworkGraph(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -90,7 +90,7 @@ public class NetworkGraph extends CommonBase {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.Option_u32Z ret_hu_conv = org.ldk.structs.Option_u32Z.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -113,12 +113,12 @@ public class NetworkGraph extends CommonBase {
 	 * routing messages from a source using a protocol other than the lightning P2P protocol.
 	 */
 	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);
+		long ret = bindings.NetworkGraph_update_node_from_announcement(this.ptr, msg == null ? 0 : msg.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(msg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
-		this.ptrs_to.add(msg);
+		if (this != null) { this.ptrs_to.add(msg); };
 		return ret_hu_conv;
 	}
 
@@ -129,12 +129,12 @@ public class NetworkGraph extends CommonBase {
 	 * peers.
 	 */
 	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);
+		long ret = bindings.NetworkGraph_update_node_from_unsigned_announcement(this.ptr, msg == null ? 0 : msg.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(msg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
-		this.ptrs_to.add(msg);
+		if (this != null) { this.ptrs_to.add(msg); };
 		return ret_hu_conv;
 	}
 
@@ -149,14 +149,14 @@ public class NetworkGraph extends CommonBase {
 	 * the corresponding UTXO exists on chain and is correctly-formatted.
 	 */
 	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);
+		long ret = bindings.NetworkGraph_update_channel_from_announcement(this.ptr, msg == null ? 0 : msg.ptr, chain_access.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(msg);
 		Reference.reachabilityFence(chain_access);
 		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);
+		if (this != null) { this.ptrs_to.add(msg); };
+		if (this != null) { this.ptrs_to.add(chain_access); };
 		return ret_hu_conv;
 	}
 
@@ -169,14 +169,14 @@ public class NetworkGraph extends CommonBase {
 	 * the corresponding UTXO exists on chain and is correctly-formatted.
 	 */
 	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);
+		long ret = bindings.NetworkGraph_update_channel_from_unsigned_announcement(this.ptr, msg == null ? 0 : msg.ptr, chain_access.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(msg);
 		Reference.reachabilityFence(chain_access);
 		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);
+		if (this != null) { this.ptrs_to.add(msg); };
+		if (this != null) { this.ptrs_to.add(chain_access); };
 		return ret_hu_conv;
 	}
 
@@ -189,7 +189,7 @@ public class NetworkGraph extends CommonBase {
 	 * All other parameters as used in [`msgs::UnsignedChannelAnnouncement`] fields.
 	 */
 	public Result_NoneLightningErrorZ add_channel_from_partial_announcement(long short_channel_id, long timestamp, ChannelFeatures features, byte[] node_id_1, byte[] node_id_2) {
-		long ret = bindings.NetworkGraph_add_channel_from_partial_announcement(this.ptr, short_channel_id, timestamp, features == null ? 0 : features.ptr & ~1, InternalUtils.check_arr_len(node_id_1, 33), InternalUtils.check_arr_len(node_id_2, 33));
+		long ret = bindings.NetworkGraph_add_channel_from_partial_announcement(this.ptr, short_channel_id, timestamp, features == null ? 0 : features.ptr, InternalUtils.check_arr_len(node_id_1, 33), InternalUtils.check_arr_len(node_id_2, 33));
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(short_channel_id);
 		Reference.reachabilityFence(timestamp);
@@ -198,6 +198,7 @@ public class NetworkGraph extends CommonBase {
 		Reference.reachabilityFence(node_id_2);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
+		if (this != null) { this.ptrs_to.add(features); };
 		return ret_hu_conv;
 	}
 
@@ -215,13 +216,13 @@ public class NetworkGraph extends CommonBase {
 	}
 
 	/**
-	 * Marks a node in the graph as failed.
+	 * Marks a node in the graph as permanently failed, effectively removing it and its channels
+	 * from local storage.
 	 */
-	public void node_failed(byte[] _node_id, boolean is_permanent) {
-		bindings.NetworkGraph_node_failed(this.ptr, InternalUtils.check_arr_len(_node_id, 33), is_permanent);
+	public void node_failed_permanent(byte[] node_id) {
+		bindings.NetworkGraph_node_failed_permanent(this.ptr, InternalUtils.check_arr_len(node_id, 33));
 		Reference.reachabilityFence(this);
-		Reference.reachabilityFence(_node_id);
-		Reference.reachabilityFence(is_permanent);
+		Reference.reachabilityFence(node_id);
 	}
 
 	/**
@@ -236,11 +237,14 @@ public class NetworkGraph extends CommonBase {
 	 * Note that for users of the `lightning-background-processor` crate this method may be
 	 * automatically called regularly for you.
 	 * 
+	 * This method will also cause us to stop tracking removed nodes and channels if they have been
+	 * in the map for a while so that these can be resynced from gossip in the future.
+	 * 
 	 * This method is only available with the `std` feature. See
-	 * [`NetworkGraph::remove_stale_channels_with_time`] for `no-std` use.
+	 * [`NetworkGraph::remove_stale_channels_and_tracking_with_time`] for `no-std` use.
 	 */
-	public void remove_stale_channels() {
-		bindings.NetworkGraph_remove_stale_channels(this.ptr);
+	public void remove_stale_channels_and_tracking() {
+		bindings.NetworkGraph_remove_stale_channels_and_tracking(this.ptr);
 		Reference.reachabilityFence(this);
 	}
 
@@ -253,11 +257,14 @@ public class NetworkGraph extends CommonBase {
 	 * updates every two weeks, the non-normative section of BOLT 7 currently suggests that
 	 * pruning occur for updates which are at least two weeks old, which we implement here.
 	 * 
+	 * This method will also cause us to stop tracking removed nodes and channels if they have been
+	 * in the map for a while so that these can be resynced from gossip in the future.
+	 * 
 	 * This function takes the current unix time as an argument. For users with the `std` feature
-	 * enabled, [`NetworkGraph::remove_stale_channels`] may be preferable.
+	 * enabled, [`NetworkGraph::remove_stale_channels_and_tracking`] may be preferable.
 	 */
-	public void remove_stale_channels_with_time(long current_time_unix) {
-		bindings.NetworkGraph_remove_stale_channels_with_time(this.ptr, current_time_unix);
+	public void remove_stale_channels_and_tracking_with_time(long current_time_unix) {
+		bindings.NetworkGraph_remove_stale_channels_and_tracking_with_time(this.ptr, current_time_unix);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(current_time_unix);
 	}
@@ -274,12 +281,12 @@ public class NetworkGraph extends CommonBase {
 	 * materially in the future will be rejected.
 	 */
 	public Result_NoneLightningErrorZ update_channel(ChannelUpdate msg) {
-		long ret = bindings.NetworkGraph_update_channel(this.ptr, msg == null ? 0 : msg.ptr & ~1);
+		long ret = bindings.NetworkGraph_update_channel(this.ptr, msg == null ? 0 : msg.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(msg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
-		this.ptrs_to.add(msg);
+		if (this != null) { this.ptrs_to.add(msg); };
 		return ret_hu_conv;
 	}
 
@@ -292,12 +299,12 @@ public class NetworkGraph extends CommonBase {
 	 * materially in the future will be rejected.
 	 */
 	public Result_NoneLightningErrorZ update_channel_unsigned(UnsignedChannelUpdate msg) {
-		long ret = bindings.NetworkGraph_update_channel_unsigned(this.ptr, msg == null ? 0 : msg.ptr & ~1);
+		long ret = bindings.NetworkGraph_update_channel_unsigned(this.ptr, msg == null ? 0 : msg.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(msg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
-		this.ptrs_to.add(msg);
+		if (this != null) { this.ptrs_to.add(msg); };
 		return ret_hu_conv;
 	}