X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRoutingMessageHandler.java;h=efccb4bf93fab1a92c592cd4dbceb7a40e0d0bae;hb=300b54d26fe5ed89f472ef821ebf67d56c917e49;hp=fc7b1281e9ef528a0a774c56f2d11f375ad6d66b;hpb=f6c75b182a7786062a4966e8939701ef59092509;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/RoutingMessageHandler.java b/src/main/java/org/ldk/structs/RoutingMessageHandler.java
index fc7b1281..efccb4bf 100644
--- a/src/main/java/org/ldk/structs/RoutingMessageHandler.java
+++ b/src/main/java/org/ldk/structs/RoutingMessageHandler.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;
 
 /**
@@ -47,26 +48,31 @@ public class RoutingMessageHandler extends CommonBase {
 		 */
 		Result_boolLightningErrorZ handle_channel_update(ChannelUpdate msg);
 		/**
-		 * Gets a subset of the channel announcements and updates required to dump our routing table
-		 * to a remote node, starting at the short_channel_id indicated by starting_point and
-		 * including the batch_amount entries immediately higher in numerical value than starting_point.
+		 * Gets channel announcements and updates required to dump our routing table to a remote node,
+		 * starting at the short_channel_id indicated by starting_point and including announcements
+		 * for a single channel.
 		 */
-		ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ[] get_next_channel_announcements(long starting_point, byte batch_amount);
+		Option_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ get_next_channel_announcement(long starting_point);
 		/**
-		 * Gets a subset of the node announcements required to dump our routing table to a remote node,
-		 * starting at the node *after* the provided publickey and including batch_amount entries
-		 * immediately higher (as defined by <PublicKey as Ord>::cmp) than starting_point.
+		 * Gets a node announcement required to dump our routing table to a remote node, starting at
+		 * the node *after* the provided pubkey and including up to one announcement immediately
+		 * higher (as defined by <PublicKey as Ord>::cmp) than starting_point.
 		 * If None is provided for starting_point, we start at the first node.
 		 * 
 		 * Note that starting_point (or a relevant inner pointer) may be NULL or all-0s to represent None
+		 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
 		 */
-		NodeAnnouncement[] get_next_node_announcements(byte[] starting_point, byte batch_amount);
+		NodeAnnouncement get_next_node_announcement(byte[] starting_point);
 		/**
 		 * Called when a connection is established with a peer. This can be used to
 		 * perform routing table synchronization using a strategy defined by the
 		 * implementor.
+		 * 
+		 * May return an `Err(())` if the features the peer supports are not sufficient to communicate
+		 * with us. Implementors should be somewhat conservative about doing so, however, as other
+		 * message handlers may still wish to communicate with this peer.
 		 */
-		void sync_routing_table(byte[] their_node_id, Init init);
+		Result_NoneNoneZ peer_connected(byte[] their_node_id, Init init);
 		/**
 		 * Handles the reply of a query we initiated to learn about channels
 		 * for a given range of blocks. We can expect to receive one or more
@@ -90,70 +96,107 @@ public class RoutingMessageHandler extends CommonBase {
 		 * list of short_channel_ids.
 		 */
 		Result_NoneLightningErrorZ handle_query_short_channel_ids(byte[] their_node_id, QueryShortChannelIds msg);
+		/**
+		 * Gets the node feature flags which this handler itself supports. All available handlers are
+		 * queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
+		 * which are broadcasted in our [`NodeAnnouncement`] message.
+		 */
+		NodeFeatures provided_node_features();
+		/**
+		 * Gets the init feature flags which should be sent to the given peer. All available handlers
+		 * are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
+		 * which are sent in our [`Init`] message.
+		 * 
+		 * Note that this method is called before [`Self::peer_connected`].
+		 */
+		InitFeatures provided_init_features(byte[] their_node_id);
 	}
 	private static class LDKRoutingMessageHandlerHolder { RoutingMessageHandler held; }
 	public static RoutingMessageHandler new_impl(RoutingMessageHandlerInterface arg, MessageSendEventsProvider.MessageSendEventsProviderInterface MessageSendEventsProvider_impl) {
 		final LDKRoutingMessageHandlerHolder impl_holder = new LDKRoutingMessageHandlerHolder();
 		impl_holder.held = new RoutingMessageHandler(new bindings.LDKRoutingMessageHandler() {
 			@Override public long handle_node_announcement(long msg) {
-				NodeAnnouncement msg_hu_conv = new NodeAnnouncement(null, msg);
+				org.ldk.structs.NodeAnnouncement msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new org.ldk.structs.NodeAnnouncement(null, msg); }
 				Result_boolLightningErrorZ ret = arg.handle_node_announcement(msg_hu_conv);
-				long result = ret != null ? ret.ptr : 0;
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
 			@Override public long handle_channel_announcement(long msg) {
-				ChannelAnnouncement msg_hu_conv = new ChannelAnnouncement(null, msg);
+				org.ldk.structs.ChannelAnnouncement msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new org.ldk.structs.ChannelAnnouncement(null, msg); }
 				Result_boolLightningErrorZ ret = arg.handle_channel_announcement(msg_hu_conv);
-				long result = ret != null ? ret.ptr : 0;
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
 			@Override public long handle_channel_update(long msg) {
-				ChannelUpdate msg_hu_conv = new ChannelUpdate(null, msg);
+				org.ldk.structs.ChannelUpdate msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new org.ldk.structs.ChannelUpdate(null, msg); }
 				Result_boolLightningErrorZ ret = arg.handle_channel_update(msg_hu_conv);
-				long result = ret != null ? ret.ptr : 0;
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
-			@Override public long[] get_next_channel_announcements(long starting_point, byte batch_amount) {
-				ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ[] ret = arg.get_next_channel_announcements(starting_point, batch_amount);
-				long[] result = ret != null ? Arrays.stream(ret).mapToLong(ret_conv_59 -> ret_conv_59 != null ? ret_conv_59.ptr : 0).toArray() : null;
+			@Override public long get_next_channel_announcement(long starting_point) {
+				Option_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ ret = arg.get_next_channel_announcement(starting_point);
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
-			@Override public long[] get_next_node_announcements(byte[] starting_point, byte batch_amount) {
-				NodeAnnouncement[] ret = arg.get_next_node_announcements(starting_point, batch_amount);
-				long[] result = ret != null ? Arrays.stream(ret).mapToLong(ret_conv_18 -> ret_conv_18 == null ? 0 : ret_conv_18.ptr & ~1).toArray() : null;
-				for (NodeAnnouncement ret_conv_18: ret) { impl_holder.held.ptrs_to.add(ret_conv_18); };
+			@Override public long get_next_node_announcement(byte[] starting_point) {
+				NodeAnnouncement ret = arg.get_next_node_announcement(starting_point);
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
-			@Override public void sync_routing_table(byte[] their_node_id, long init) {
-				Init init_hu_conv = new Init(null, init);
-				arg.sync_routing_table(their_node_id, init_hu_conv);
+			@Override public long peer_connected(byte[] their_node_id, long init) {
+				org.ldk.structs.Init init_hu_conv = null; if (init < 0 || init > 4096) { init_hu_conv = new org.ldk.structs.Init(null, init); }
+				Result_NoneNoneZ ret = arg.peer_connected(their_node_id, init_hu_conv);
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
+				return result;
 			}
 			@Override public long handle_reply_channel_range(byte[] their_node_id, long msg) {
-				ReplyChannelRange msg_hu_conv = new ReplyChannelRange(null, msg);
-				msg_hu_conv.ptrs_to.add(this);
+				org.ldk.structs.ReplyChannelRange msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new org.ldk.structs.ReplyChannelRange(null, msg); }
+				if (msg_hu_conv != null) { msg_hu_conv.ptrs_to.add(this); };
 				Result_NoneLightningErrorZ ret = arg.handle_reply_channel_range(their_node_id, msg_hu_conv);
-				long result = ret != null ? ret.ptr : 0;
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
 			@Override public long handle_reply_short_channel_ids_end(byte[] their_node_id, long msg) {
-				ReplyShortChannelIdsEnd msg_hu_conv = new ReplyShortChannelIdsEnd(null, msg);
-				msg_hu_conv.ptrs_to.add(this);
+				org.ldk.structs.ReplyShortChannelIdsEnd msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new org.ldk.structs.ReplyShortChannelIdsEnd(null, msg); }
+				if (msg_hu_conv != null) { msg_hu_conv.ptrs_to.add(this); };
 				Result_NoneLightningErrorZ ret = arg.handle_reply_short_channel_ids_end(their_node_id, msg_hu_conv);
-				long result = ret != null ? ret.ptr : 0;
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
 			@Override public long handle_query_channel_range(byte[] their_node_id, long msg) {
-				QueryChannelRange msg_hu_conv = new QueryChannelRange(null, msg);
-				msg_hu_conv.ptrs_to.add(this);
+				org.ldk.structs.QueryChannelRange msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new org.ldk.structs.QueryChannelRange(null, msg); }
+				if (msg_hu_conv != null) { msg_hu_conv.ptrs_to.add(this); };
 				Result_NoneLightningErrorZ ret = arg.handle_query_channel_range(their_node_id, msg_hu_conv);
-				long result = ret != null ? ret.ptr : 0;
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
 			@Override public long handle_query_short_channel_ids(byte[] their_node_id, long msg) {
-				QueryShortChannelIds msg_hu_conv = new QueryShortChannelIds(null, msg);
-				msg_hu_conv.ptrs_to.add(this);
+				org.ldk.structs.QueryShortChannelIds msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new org.ldk.structs.QueryShortChannelIds(null, msg); }
+				if (msg_hu_conv != null) { msg_hu_conv.ptrs_to.add(this); };
 				Result_NoneLightningErrorZ ret = arg.handle_query_short_channel_ids(their_node_id, msg_hu_conv);
-				long result = ret != null ? ret.ptr : 0;
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
+				return result;
+			}
+			@Override public long provided_node_features() {
+				NodeFeatures ret = arg.provided_node_features();
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
+				return result;
+			}
+			@Override public long provided_init_features(byte[] their_node_id) {
+				InitFeatures ret = arg.provided_init_features(their_node_id);
+				Reference.reachabilityFence(arg);
+				long result = ret == null ? 0 : ret.clone_ptr();
 				return result;
 			}
 		}, MessageSendEventsProvider.new_impl(MessageSendEventsProvider_impl).bindings_instance);
@@ -174,10 +217,12 @@ public class RoutingMessageHandler extends CommonBase {
 	 * false or returning an Err otherwise.
 	 */
 	public Result_boolLightningErrorZ handle_node_announcement(NodeAnnouncement msg) {
-		long ret = bindings.RoutingMessageHandler_handle_node_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1);
-		if (ret < 1024) { return null; }
+		long ret = bindings.RoutingMessageHandler_handle_node_announcement(this.ptr, msg == null ? 0 : msg.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(msg);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_boolLightningErrorZ ret_hu_conv = Result_boolLightningErrorZ.constr_from_ptr(ret);
-		this.ptrs_to.add(msg);
+		if (this != null) { this.ptrs_to.add(msg); };
 		return ret_hu_conv;
 	}
 
@@ -186,10 +231,12 @@ public class RoutingMessageHandler extends CommonBase {
 	 * or returning an Err otherwise.
 	 */
 	public Result_boolLightningErrorZ handle_channel_announcement(ChannelAnnouncement msg) {
-		long ret = bindings.RoutingMessageHandler_handle_channel_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1);
-		if (ret < 1024) { return null; }
+		long ret = bindings.RoutingMessageHandler_handle_channel_announcement(this.ptr, msg == null ? 0 : msg.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(msg);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_boolLightningErrorZ ret_hu_conv = Result_boolLightningErrorZ.constr_from_ptr(ret);
-		this.ptrs_to.add(msg);
+		if (this != null) { this.ptrs_to.add(msg); };
 		return ret_hu_conv;
 	}
 
@@ -198,58 +245,68 @@ public class RoutingMessageHandler extends CommonBase {
 	 * false or returning an Err otherwise.
 	 */
 	public Result_boolLightningErrorZ handle_channel_update(ChannelUpdate msg) {
-		long ret = bindings.RoutingMessageHandler_handle_channel_update(this.ptr, msg == null ? 0 : msg.ptr & ~1);
-		if (ret < 1024) { return null; }
+		long ret = bindings.RoutingMessageHandler_handle_channel_update(this.ptr, msg == null ? 0 : msg.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(msg);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_boolLightningErrorZ ret_hu_conv = Result_boolLightningErrorZ.constr_from_ptr(ret);
-		this.ptrs_to.add(msg);
+		if (this != null) { this.ptrs_to.add(msg); };
 		return ret_hu_conv;
 	}
 
 	/**
-	 * Gets a subset of the channel announcements and updates required to dump our routing table
-	 * to a remote node, starting at the short_channel_id indicated by starting_point and
-	 * including the batch_amount entries immediately higher in numerical value than starting_point.
+	 * Gets channel announcements and updates required to dump our routing table to a remote node,
+	 * starting at the short_channel_id indicated by starting_point and including announcements
+	 * for a single channel.
 	 */
-	public ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ[] get_next_channel_announcements(long starting_point, byte batch_amount) {
-		long[] ret = bindings.RoutingMessageHandler_get_next_channel_announcements(this.ptr, starting_point, batch_amount);
-		ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ[] ret_conv_59_arr = new ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ[ret.length];
-		for (int h = 0; h < ret.length; h++) {
-			long ret_conv_59 = ret[h];
-			ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ ret_conv_59_hu_conv = new ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ(null, ret_conv_59);
-			ret_conv_59_hu_conv.ptrs_to.add(this);
-			ret_conv_59_arr[h] = ret_conv_59_hu_conv;
-		}
-		return ret_conv_59_arr;
+	public Option_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ get_next_channel_announcement(long starting_point) {
+		long ret = bindings.RoutingMessageHandler_get_next_channel_announcement(this.ptr, starting_point);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(starting_point);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.Option_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ ret_hu_conv = org.ldk.structs.Option_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
 	}
 
 	/**
-	 * Gets a subset of the node announcements required to dump our routing table to a remote node,
-	 * starting at the node *after* the provided publickey and including batch_amount entries
-	 * immediately higher (as defined by <PublicKey as Ord>::cmp) than starting_point.
+	 * Gets a node announcement required to dump our routing table to a remote node, starting at
+	 * the node *after* the provided pubkey and including up to one announcement immediately
+	 * higher (as defined by <PublicKey as Ord>::cmp) than starting_point.
 	 * If None is provided for starting_point, we start at the first node.
 	 * 
 	 * Note that starting_point (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public NodeAnnouncement[] get_next_node_announcements(@Nullable byte[] starting_point, byte batch_amount) {
-		long[] ret = bindings.RoutingMessageHandler_get_next_node_announcements(this.ptr, starting_point, batch_amount);
-		NodeAnnouncement[] ret_conv_18_arr = new NodeAnnouncement[ret.length];
-		for (int s = 0; s < ret.length; s++) {
-			long ret_conv_18 = ret[s];
-			NodeAnnouncement ret_conv_18_hu_conv = new NodeAnnouncement(null, ret_conv_18);
-			ret_conv_18_hu_conv.ptrs_to.add(this);
-			ret_conv_18_arr[s] = ret_conv_18_hu_conv;
-		}
-		return ret_conv_18_arr;
+	@Nullable
+	public NodeAnnouncement get_next_node_announcement(@Nullable byte[] starting_point) {
+		long ret = bindings.RoutingMessageHandler_get_next_node_announcement(this.ptr, InternalUtils.check_arr_len(starting_point, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(starting_point);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.NodeAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NodeAnnouncement(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
 	}
 
 	/**
 	 * Called when a connection is established with a peer. This can be used to
 	 * perform routing table synchronization using a strategy defined by the
 	 * implementor.
+	 * 
+	 * May return an `Err(())` if the features the peer supports are not sufficient to communicate
+	 * with us. Implementors should be somewhat conservative about doing so, however, as other
+	 * message handlers may still wish to communicate with this peer.
 	 */
-	public void sync_routing_table(byte[] their_node_id, Init init) {
-		bindings.RoutingMessageHandler_sync_routing_table(this.ptr, their_node_id, init == null ? 0 : init.ptr & ~1);
-		this.ptrs_to.add(init);
+	public Result_NoneNoneZ peer_connected(byte[] their_node_id, Init init) {
+		long ret = bindings.RoutingMessageHandler_peer_connected(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), init == null ? 0 : init.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(their_node_id);
+		Reference.reachabilityFence(init);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_NoneNoneZ ret_hu_conv = Result_NoneNoneZ.constr_from_ptr(ret);
+		if (this != null) { this.ptrs_to.add(init); };
+		return ret_hu_conv;
 	}
 
 	/**
@@ -258,10 +315,13 @@ public class RoutingMessageHandler extends CommonBase {
 	 * replies to a single query.
 	 */
 	public Result_NoneLightningErrorZ handle_reply_channel_range(byte[] their_node_id, ReplyChannelRange msg) {
-		long ret = bindings.RoutingMessageHandler_handle_reply_channel_range(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
-		if (ret < 1024) { return null; }
+		long ret = bindings.RoutingMessageHandler_handle_reply_channel_range(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(their_node_id);
+		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;
 	}
 
@@ -272,10 +332,13 @@ public class RoutingMessageHandler extends CommonBase {
 	 * gossip messages.
 	 */
 	public Result_NoneLightningErrorZ handle_reply_short_channel_ids_end(byte[] their_node_id, ReplyShortChannelIdsEnd msg) {
-		long ret = bindings.RoutingMessageHandler_handle_reply_short_channel_ids_end(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
-		if (ret < 1024) { return null; }
+		long ret = bindings.RoutingMessageHandler_handle_reply_short_channel_ids_end(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(their_node_id);
+		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;
 	}
 
@@ -284,10 +347,13 @@ public class RoutingMessageHandler extends CommonBase {
 	 * for the requested range of blocks.
 	 */
 	public Result_NoneLightningErrorZ handle_query_channel_range(byte[] their_node_id, QueryChannelRange msg) {
-		long ret = bindings.RoutingMessageHandler_handle_query_channel_range(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
-		if (ret < 1024) { return null; }
+		long ret = bindings.RoutingMessageHandler_handle_query_channel_range(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(their_node_id);
+		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;
 	}
 
@@ -296,10 +362,44 @@ public class RoutingMessageHandler extends CommonBase {
 	 * list of short_channel_ids.
 	 */
 	public Result_NoneLightningErrorZ handle_query_short_channel_ids(byte[] their_node_id, QueryShortChannelIds msg) {
-		long ret = bindings.RoutingMessageHandler_handle_query_short_channel_ids(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
-		if (ret < 1024) { return null; }
+		long ret = bindings.RoutingMessageHandler_handle_query_short_channel_ids(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(their_node_id);
+		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;
+	}
+
+	/**
+	 * Gets the node feature flags which this handler itself supports. All available handlers are
+	 * queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
+	 * which are broadcasted in our [`NodeAnnouncement`] message.
+	 */
+	public NodeFeatures provided_node_features() {
+		long ret = bindings.RoutingMessageHandler_provided_node_features(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.NodeFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NodeFeatures(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Gets the init feature flags which should be sent to the given peer. All available handlers
+	 * are queried similarly and their feature flags are OR'd together to form the [`InitFeatures`]
+	 * which are sent in our [`Init`] message.
+	 * 
+	 * Note that this method is called before [`Self::peer_connected`].
+	 */
+	public InitFeatures provided_init_features(byte[] their_node_id) {
+		long ret = bindings.RoutingMessageHandler_provided_init_features(this.ptr, InternalUtils.check_arr_len(their_node_id, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(their_node_id);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.InitFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.InitFeatures(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}