AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #9716 from f321x/fix_swap_exception

Browse Source 
swaps: make swap transport use shared timeout value
This commit is contained in:
ThomasV
2025-04-09 12:06:52 +02:00
committed by GitHub
parent 96793d6e43 aace9aab91
commit fe11fa3f4f
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
electrum/gui/qt/main_window.py
View File

@@ -1225,8 +1225,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
sm = self.wallet.lnworker.swap_manager sm = self.wallet.lnworker.swap_manager
if not sm.is_initialized.is_set(): if not sm.is_initialized.is_set():
async def wait_until_initialized(): async def wait_until_initialized():
timeout = transport.connect_timeout + 1
try: try:
await asyncio.wait_for(sm.is_initialized.wait(), timeout=5) await asyncio.wait_for(sm.is_initialized.wait(), timeout=timeout)
except asyncio.TimeoutError: except asyncio.TimeoutError:
return return
try: try:

11
electrum/submarine_swaps.py
View File

@@ -1268,6 +1268,7 @@ class SwapServerTransport(Logger):
self.network = sm.network self.network = sm.network
self.config = config self.config = config
self.is_connected = asyncio.Event() self.is_connected = asyncio.Event()
self.connect_timeout = 10 if self.uses_proxy else 5
def __enter__(self): def __enter__(self):
pass pass
@@ -1281,6 +1282,10 @@ class SwapServerTransport(Logger):
async def get_pairs(self) -> None: async def get_pairs(self) -> None:
pass pass
@property
def uses_proxy(self):
return self.network.proxy and self.network.proxy.enabled
class HttpTransport(SwapServerTransport): class HttpTransport(SwapServerTransport):
@@ -1403,7 +1408,7 @@ class NostrTransport(SwapServerTransport):
def get_relay_manager(self): def get_relay_manager(self):
assert get_running_loop() == get_asyncio_loop(), f"this must be run on the asyncio thread!" assert get_running_loop() == get_asyncio_loop(), f"this must be run on the asyncio thread!"
if not self.relay_manager: if not self.relay_manager:
if self.network.proxy and self.network.proxy.enabled: if self.uses_proxy:
proxy = make_aiohttp_proxy_connector(self.network.proxy, self.ssl_context) proxy = make_aiohttp_proxy_connector(self.network.proxy, self.ssl_context)
else: else:
proxy: Optional['ProxyConnector'] = None proxy: Optional['ProxyConnector'] = None
@@ -1412,7 +1417,9 @@ class NostrTransport(SwapServerTransport):
private_key=self.nostr_private_key, private_key=self.nostr_private_key,
log=self.logger, log=self.logger,
ssl_context=self.ssl_context, ssl_context=self.ssl_context,
proxy=proxy) proxy=proxy,
connect_timeout=self.connect_timeout
)
return self.relay_manager return self.relay_manager
def get_offer(self, pubkey): def get_offer(self, pubkey):