gossipd: use autoconnect-seeker-peers setting

Author: endothermicdev

gossipd/gossipd.c

@@ -432,7 +432,8 @@ static void gossip_init(struct daemon *daemon, const u8 *msg)
 				     &daemon->id,
 				     &dev_gossip_time,
 				     &daemon->dev_fast_gossip,
-				     &daemon->dev_fast_gossip_prune)) {
+				     &daemon->dev_fast_gossip_prune,
+				     &daemon->autoconnect_seeker_peers)) {
 		master_badmsg(WIRE_GOSSIPD_INIT, msg);
 	}
 

gossipd/gossipd.h

@@ -79,6 +79,9 @@ struct daemon {
 
 	/* Speed up pruning. */
 	bool dev_fast_gossip_prune;
+
+	/* Minimum gossip peers - seeker connects to random peers to fill. */
+	u32 autoconnect_seeker_peers;
 };
 
 struct range_query_reply {

gossipd/gossipd_wire.csv

@@ -12,6 +12,7 @@ msgdata,gossipd_init,id,node_id,
 msgdata,gossipd_init,dev_gossip_time,?u32,
 msgdata,gossipd_init,dev_fast_gossip,bool,
 msgdata,gossipd_init,dev_fast_gossip_prune,bool,
+msgdata,gossipd_init,autoconnect_seeker_peers,u32,
 
 # Gossipd tells us all our public channel_updates before init_reply.
 msgtype,gossipd_init_cupdate,3101

gossipd/seeker.c

@@ -25,6 +25,8 @@
 #define GOSSIP_SEEKER_RESYNC_INTERVAL(seeker) \
 	DEV_FAST_GOSSIP((seeker)->daemon->dev_fast_gossip, 30, 3600)
 
+#define SEEKER_GOSSIPERS 10
+
 enum seeker_state {
 	/* Still streaming gossip from single peer. */
 	STARTING_UP,
@@ -152,7 +154,9 @@ struct seeker *new_seeker(struct daemon *daemon)
 	uintmap_init(&seeker->unknown_scids);
 	uintmap_init(&seeker->stale_scids);
 	seeker->random_peer = NULL;
-	seeker->gossiper = tal_arrz(seeker, struct peer *, 10);
+	u32 gossipers = daemon->autoconnect_seeker_peers > SEEKER_GOSSIPERS ?
+			daemon->autoconnect_seeker_peers : SEEKER_GOSSIPERS;
+	seeker->gossiper = tal_arrz(seeker, struct peer *, gossipers);
 	seeker->preferred_peer = NULL;
 	seeker->unknown_nodes = false;
 	seeker->last_full_sync_peer = NULL;
@@ -1017,7 +1021,8 @@ static void maybe_get_new_peer(struct seeker *seeker)
 {
 	size_t connected_peers = peer_node_id_map_count(seeker->daemon->peers);
 
-	if (connected_peers >= tal_count(seeker->gossiper))
+	/* Respect user-defined autoconnect peer limit. */
+	if (connected_peers >= seeker->daemon->autoconnect_seeker_peers)
 		return;
 
 	status_debug("seeker: need more peers for gossip (have %zu)",

lightningd/gossip_control.c

@@ -333,7 +333,8 @@ void gossip_init(struct lightningd *ld, int connectd_fd)
 	    &ld->our_nodeid,
 	    ld->dev_gossip_time ? &ld->dev_gossip_time: NULL,
 	    ld->dev_fast_gossip,
-	    ld->dev_fast_gossip_prune);
+	    ld->dev_fast_gossip_prune,
+	    ld->autoconnect_seeker_peers);
 
 	subd_req(ld->gossip, ld->gossip, take(msg), -1, 0,
 		 gossipd_init_done, NULL);

tests/test_gossip.py

@@ -2335,12 +2335,20 @@ def test_gossip_seeker_autoconnect(node_factory):
     necessary."""
 
     port = node_factory.get_unused_port()
-    opts = [{}, {}, {'bind-addr': f'127.0.0.1:{port}',
-                     'announce-addr': f'127.0.0.1:{port}'}]
-    # l1, l2 = node_factory.get_nodes(2)
+    opts = [{'autoconnect-seeker-peers': 0, 'may_reconnect': True},
+            {'may_reconnect': True},
+            {'bind-addr': f'127.0.0.1:{port}',
+             'announce-addr': f'127.0.0.1:{port}'}]
     l1, l2, l3 = node_factory.line_graph(3, opts=opts, wait_for_announce=True)
-    # L1 and L3 should autoconnect with valid node announcement connection addresses
-    # Wait for seeker to decide to autoconnect
+    l2.daemon.wait_for_log('gossipd: seeker: need more peers for gossip')
+    time.sleep(1)
+    # The seeker wants more peers, but l1 should not autoconnect due to option.
+    assert not l1.daemon.is_in_log(r'lightningd: attempting connection to ')
+
+    # Try again with default settings.
+    del l1.daemon.opts['autoconnect-seeker-peers']
+    l1.restart()
+    # L1 and L3 should autoconnect with valid node announcement connection addresses.
     l1.daemon.wait_for_log('gossipd: seeker: need more peers for gossip')
     l1.daemon.wait_for_log(r'lightningd: attempting connection to '
                            rf'{l3.info["id"]} for additional gossip')