From 872b89ee9328fed736e0251aed5e946ef7294251 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Fri, 5 Jun 2020 20:06:08 -0400 Subject: [PATCH] fix mempool conflicts following cancelled api calls that send transactions with the `blocking` flag --- lbry/wallet/manager.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lbry/wallet/manager.py b/lbry/wallet/manager.py index 11d90f11d..bff251a06 100644 --- a/lbry/wallet/manager.py +++ b/lbry/wallet/manager.py @@ -300,11 +300,8 @@ class WalletManager: async def broadcast_or_release(self, tx, blocking=False): try: await self.ledger.broadcast(tx) - if blocking: - await self.ledger.wait(tx, timeout=None) - except CodeMessageError as err: - log.warning("transaction rejected, leaving reserved") - raise except: await self.ledger.release_tx(tx) raise + if blocking: + await self.ledger.wait(tx, timeout=None)