Skip to content

Fix check peer connection before connecting #525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jossec101 merged 1 commit into from
Jun 30, 2026
Merged

Fix check peer connection before connecting #525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions src/Services/LightningClientService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,24 @@ public AsyncServerStreamingCall<ChannelEventUpdate> SubscribeChannelEvents(Node
public async Task ConnectToPeer(Node node, string peerPubKey, Lightning.LightningClient? client = null)
{
client ??= GetLightningClient(node.Endpoint);
var metadata = new Metadata { { "macaroon", node.ChannelAdminMacaroon } };
var isPeerAlreadyConnected = false;

// If we're already connected to the peer there's nothing to do.
try
{
var peers = await client.ListPeersAsync(new ListPeersRequest(), metadata);
if (peers.Peers.Any(p => p.PubKey == peerPubKey))
{
_logger.LogInformation("Peer: {Pubkey} already connected", peerPubKey);
return;
}
}
catch (Exception e)
{
_logger.LogWarning(e, "Could not list peers on node {NodeId} before connecting to {Pubkey}", node.Id, peerPubKey);
}

ConnectPeerResponse connectPeerResponse = null;
try
{
Expand All @@ -284,14 +300,17 @@ public async Task ConnectToPeer(Node node, string peerPubKey, Lightning.Lightnin
//For now, we only rely on pure tcp IPV4 connections
var addr = nodeInfo?.Addresses.FirstOrDefault(x => x.Network == "tcp")?.Addr;

if (string.IsNullOrEmpty(addr))
{
throw new PeerNotOnlineException(
$"peer {peerPubKey} has no known address to connect to and is not already connected");
}

connectPeerResponse = await client.ConnectPeerAsync(new ConnectPeerRequest
{
Addr = new LightningAddress { Host = addr, Pubkey = nodeInfo.PubKey },
Perm = true
}, new Metadata
{
{ "macaroon", node.ChannelAdminMacaroon }
});
}, metadata);
}
//We avoid to stop the method if the peer is already connected
catch (RpcException e)
Expand Down
Loading