AaronFiore/electrum
1
0
Fork 0
Code Activity

lnworker: if two instances of the same wallet are trying to connect

Browse Source 
simultaneously, give priority to the existing connection
This commit is contained in:
ThomasV
2024-06-03 18:20:41 +02:00
parent ae1a3e75cd
commit 0c48fd495f
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
electrum/lnpeer.py
View File

@@ -1259,11 +1259,12 @@ class Peer(Logger):
else: else:
# all good # all good
fut.set_result((we_must_resend_revoke_and_ack, their_next_local_ctn)) fut.set_result((we_must_resend_revoke_and_ack, their_next_local_ctn))
# Block processing of further incoming messages until we finished our part of chan-reest. # Block processing of further incoming messages until we finished our part of chan-reest.
# This is needed for the replaying of our local unacked updates to be sane (if the peer # This is needed for the replaying of our local unacked updates to be sane (if the peer
# also replays some messages we must not react to them until we finished replaying our own). # also replays some messages we must not react to them until we finished replaying our own).
# (it would be sufficient to only block messages related to this channel, but this is easier) # (it would be sufficient to only block messages related to this channel, but this is easier)
await self._chan_reest_finished[chan.channel_id].wait() await self._chan_reest_finished[chan.channel_id].wait()
# Note: if the above event is never set, we won't detect if the connection was closed by remote...
def _send_channel_reestablish(self, chan: Channel): def _send_channel_reestablish(self, chan: Channel):
assert self.is_initialized() assert self.is_initialized()

7
electrum/lnworker.py
View File

@@ -351,12 +351,13 @@ class LNWorker(Logger, EventListener, NetworkRetryManager[LNPeerAddr]):
return peer return peer
async def _add_peer_from_transport(self, *, node_id: bytes, transport: LNTransportBase) -> Peer: async def _add_peer_from_transport(self, *, node_id: bytes, transport: LNTransportBase) -> Peer:
peer = Peer(self, node_id, transport)
with self.lock: with self.lock:
existing_peer = self._peers.get(node_id) existing_peer = self._peers.get(node_id)
if existing_peer: if existing_peer:
existing_peer.close_and_cleanup() # two instances of the same wallet are attempting to connect simultaneously.
assert node_id not in self._peers # give priority to existing connection
return
peer = Peer(self, node_id, transport)
self._peers[node_id] = peer self._peers[node_id] = peer
await self.taskgroup.spawn(peer.main_loop()) await self.taskgroup.spawn(peer.main_loop())
return peer return peer