AaronFiore/electrum
1
0
Fork 0
Code Activity

lnpeer: add note about thread-safety, and some checks

Browse Source 
I was calling methods from the Qt console (e.g. peer.pay()) and seeing weird behaviour...
htlc_switch() (running on asyncio thread) was racing with pay() (running on GUI thread).
This commit is contained in:
SomberNight
2023-02-05 22:49:12 +00:00
parent 406b676ce6
commit 046609c5d2
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/lnpeer.py
View File

@@ -63,6 +63,8 @@ LN_P2P_NETWORK_TIMEOUT = 20
class Peer(Logger): class Peer(Logger):
# note: in general this class is NOT thread-safe. Most methods are assumed to be running on asyncio thread.
LOGGING_SHORTCUT = 'P' LOGGING_SHORTCUT = 'P'
ORDERED_MESSAGES = ( ORDERED_MESSAGES = (
@@ -120,6 +122,7 @@ class Peer(Logger):
self.downstream_htlc_resolved_event = asyncio.Event() self.downstream_htlc_resolved_event = asyncio.Event()
def send_message(self, message_name: str, **kwargs): def send_message(self, message_name: str, **kwargs):
assert util.get_running_loop() == util.get_asyncio_loop(), f"this must be run on the asyncio thread!"
assert type(message_name) is str assert type(message_name) is str
if message_name not in self.SPAMMY_MESSAGES: if message_name not in self.SPAMMY_MESSAGES:
self.logger.debug(f"Sending {message_name.upper()}") self.logger.debug(f"Sending {message_name.upper()}")
@@ -1421,6 +1424,7 @@ class Peer(Logger):
self.maybe_send_commitment(chan) self.maybe_send_commitment(chan)
def maybe_send_commitment(self, chan: Channel) -> bool: def maybe_send_commitment(self, chan: Channel) -> bool:
assert util.get_running_loop() == util.get_asyncio_loop(), f"this must be run on the asyncio thread!"
# REMOTE should revoke first before we can sign a new ctx # REMOTE should revoke first before we can sign a new ctx
if chan.hm.is_revack_pending(REMOTE): if chan.hm.is_revack_pending(REMOTE):
return False return False