LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ignore exceptions raised in lnworker.on_network_update.

Browse source 
Exception raised there may cancel the network's main taskgroup.
This commit is contained in:
ThomasV 2019-08-30 09:54:32 +02:00
parent d0cfb3ae12
commit 5ec1db4d51
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
electrum/lnworker.py
View file

@ -377,6 +377,7 @@ class LNWallet(LNWorker):
self.sync_with_local_watchtower(), self.sync_with_local_watchtower(),
self.sync_with_remote_watchtower(), self.sync_with_remote_watchtower(),
]: ]:
# FIXME: exceptions in those coroutines will cancel network.main_taskgroup
asyncio.run_coroutine_threadsafe(self.network.main_taskgroup.spawn(coro), self.network.asyncio_loop) asyncio.run_coroutine_threadsafe(self.network.main_taskgroup.spawn(coro), self.network.asyncio_loop)
def peer_closed(self, peer): def peer_closed(self, peer):
@ -570,6 +571,7 @@ class LNWallet(LNWorker):
self.channel_db.remove_channel(chan.short_channel_id) self.channel_db.remove_channel(chan.short_channel_id)
# detect who closed and set sweep_info # detect who closed and set sweep_info
sweep_info = chan.sweep_ctx(closing_tx) sweep_info = chan.sweep_ctx(closing_tx)
self.logger.info(f'sweep_info length: {len(sweep_info)}')
# create and broadcast transaction # create and broadcast transaction
for prevout, e_tx in sweep_info.items(): for prevout, e_tx in sweep_info.items():
name, csv_delay, cltv_expiry, gen_tx = e_tx name, csv_delay, cltv_expiry, gen_tx = e_tx
@ -662,6 +664,7 @@ class LNWallet(LNWorker):
500_000) 500_000)
return total_value_sat > min_value_worth_closing_channel_over_sat return total_value_sat > min_value_worth_closing_channel_over_sat
@ignore_exceptions
@log_exceptions @log_exceptions
async def on_network_update(self, event, *args): async def on_network_update(self, event, *args):
# TODO # TODO
@ -676,6 +679,7 @@ class LNWallet(LNWorker):
if chan.is_closed(): if chan.is_closed():
continue continue
if chan.get_state() != 'CLOSED' and self.should_channel_be_closed_due_to_expiring_htlcs(chan): if chan.get_state() != 'CLOSED' and self.should_channel_be_closed_due_to_expiring_htlcs(chan):
self.logger.info(f"force-closing due to expiring htlcs")
await self.force_close_channel(chan.channel_id) await self.force_close_channel(chan.channel_id)
continue continue
if chan.short_channel_id is None: if chan.short_channel_id is None:
@ -1043,7 +1047,11 @@ class LNWallet(LNWorker):
chan.set_force_closed() chan.set_force_closed()
self.save_channel(chan) self.save_channel(chan)
self.on_channels_updated() self.on_channels_updated()
try:
await self.network.broadcast_transaction(tx) await self.network.broadcast_transaction(tx)
except Exception as e:
self.logger.info(f'could NOT publish {tx.txid()}, {str(e)}')
return
return tx.txid() return tx.txid()
def remove_channel(self, chan_id): def remove_channel(self, chan_id):