Merge remote-tracking branch 'upstream/master'

electrum_grs/gui/qml/qetxdetails.py

@@ -260,7 +260,7 @@ def update(self, from_txid: bool = False):
 
         if from_txid:
             self._tx = self._wallet.wallet.db.get_transaction(self._txid)
-            assert self._tx is not None
+            assert self._tx is not None, f'unknown txid "{self._txid}"'
 
         #self._logger.debug(repr(self._tx.to_json()))
 

electrum_grs/lnworker.py

@@ -278,7 +278,6 @@ async def cb(reader, writer):
             except OSError as e:
                 self.logger.error(f"cannot listen for lightning p2p. error: {e!r}")
 
-    @ignore_exceptions  # don't kill outer taskgroup
     async def main_loop(self):
         self.logger.info("starting taskgroup.")
         try:
@@ -937,6 +936,8 @@ async def stop(self):
         if self.lnwatcher:
             await self.lnwatcher.stop()
             self.lnwatcher = None
+        if self.swap_manager:  # may not be present in tests
+            await self.swap_manager.stop()
 
     async def wait_for_received_pending_htlcs_to_get_removed(self):
         assert self.stopping_soon is True

electrum_grs/plugins/trustedcoin/trustedcoin.py

@@ -393,8 +393,6 @@ def add_new_billing_address(self, billing_index: int, address: str, addr_type: s
         self._billing_addresses[addr_type] = billing_addresses_of_this_type
         self.db.put('trustedcoin_billing_addresses', self._billing_addresses['legacy'])
         self.db.put('trustedcoin_billing_addresses_segwit', self._billing_addresses['segwit'])
-        # FIXME this often runs in a daemon thread, where storage.write will fail
-        self.db.write()
 
     def is_billing_address(self, addr: str) -> bool:
         return addr in self._billing_addresses_set

electrum_grs/submarine_swaps.py

@@ -207,8 +207,20 @@ def start_network(self, *, network: 'Network', lnwatcher: 'LNWalletWatcher'):
             self.add_lnwatcher_callback(swap)
 
         self.taskgroup = OldTaskGroup()
-        coro = self.pay_pending_invoices()
-        asyncio.run_coroutine_threadsafe(self.taskgroup.spawn(coro), self.network.asyncio_loop)
+        asyncio.run_coroutine_threadsafe(self.main_loop(), self.network.asyncio_loop)
+
+    async def main_loop(self):
+        self.logger.info("starting taskgroup.")
+        try:
+            async with self.taskgroup as group:
+                await group.spawn(self.pay_pending_invoices())
+        except Exception as e:
+            self.logger.exception("taskgroup died.")
+        finally:
+            self.logger.info("taskgroup stopped.")
+
+    async def stop(self):
+        await self.taskgroup.cancel_remaining()
 
     async def pay_invoice(self, key):
         self.logger.info(f'trying to pay invoice {key}')

electrum_grs/tests/test_lnpeer.py

@@ -147,6 +147,7 @@ def __init__(self, *, local_keypair: Keypair, chans: Iterable['Channel'], tx_que
         self.network = MockNetwork(tx_queue, config=self.config)
         self.taskgroup = OldTaskGroup()
         self.lnwatcher = None
+        self.swap_manager = None
         self.listen_server = None
         self._channels = {chan.channel_id: chan for chan in chans}
         self.payment_info = {}

electrum_grs/wallet.py

@@ -452,7 +452,6 @@ def __init__(self, db: WalletDB, *, config: SimpleConfig):
     def _init_lnworker(self):
         self.lnworker = None
 
-    @ignore_exceptions  # don't kill outer taskgroup
     async def main_loop(self):
         self.logger.info("starting taskgroup.")
         try: