offers: replace listincoming with listincoming2

Also preserves the 'avoid a blinded path through private channel' logic
which was disrupted by adding node features regardless of public gossip.

plugins/offers_invreq_hook.c

@@ -314,7 +314,7 @@ static struct command_result *listincoming_done(struct command *cmd,
 		 * we could use listpeers, but if it's private we probably
 		 * don't want to blinded route through it! */
 		pftok = json_get_member(buf, t, "peer_features");
-		if (!pftok)
+		if (!pftok || !ci.public)
 			continue;
 		features = json_tok_bin_from_hex(tmpctx, buf, pftok);
 		if (!feature_offered(features, OPT_ROUTE_BLINDING))
@@ -422,7 +422,7 @@ static struct command_result *add_blindedpaths(struct command *cmd,
 {
 	struct out_req *req;
 
-	req = jsonrpc_request_start(cmd->plugin, cmd, "listincoming",
+	req = jsonrpc_request_start(cmd->plugin, cmd, "listincoming2",
 				    listincoming_done, listincoming_done, ir);
 	return send_outreq(cmd->plugin, req);
 }