From 049857d528bf561af18cb471a098e52dc3404e94 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Sat, 8 Jun 2019 18:45:35 +0200 Subject: [PATCH] on_revoke_and_ack: be robust to exceptions raised in lnwatcher --- electrum/lnchannel.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/electrum/lnchannel.py b/electrum/lnchannel.py index fe007e502..3167b92fa 100644 --- a/electrum/lnchannel.py +++ b/electrum/lnchannel.py @@ -473,9 +473,13 @@ class Channel(Logger): # if there are update_add_htlc msgs between commitment_signed and rev_ack, # this might break prev_remote_commitment = self.pending_commitment(REMOTE) - self.config[REMOTE].revocation_store.add_next_entry(revocation.per_commitment_secret) - self.process_new_revocation_secret(revocation.per_commitment_secret) + + # be robust to exceptions raised in lnwatcher + try: + self.process_new_revocation_secret(revocation.per_commitment_secret) + except Exception as e: + self.logger.info("Could not process revocation secret: {}".format(repr(e))) ##### start applying fee/htlc changes