AaronFiore/electrum
1
0
Fork 0
Code Activity

lnpeer: if close_channel times out, check unconfirmed_closing_txid before raising an exception

Browse Source
This commit is contained in:
ThomasV
2021-03-26 09:21:49 +01:00
parent 5beadaab95
commit b64fcfb9e3
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/lnchannel.py
View File

@@ -304,7 +304,7 @@ class AbstractChannel(Logger, ABC):
# we must not trust the server with unconfirmed transactions,
# because the state transition is irreversible. if the remote
# force closed, we remain OPEN until the closing tx is confirmed
self.closing_detected = True
self.unconfirmed_closing_txid = closing_txid
if self.lnworker:
util.trigger_callback('channel', self.lnworker.wallet, self)
@@ -339,7 +339,7 @@ class AbstractChannel(Logger, ABC):
def get_state_for_GUI(self) -> str:
cs = self.get_state()
if cs == ChannelState.OPEN and self.closing_detected:
if cs == ChannelState.OPEN and self.unconfirmed_closing_txid:
return 'FORCE-CLOSING'
return cs.name
@@ -419,7 +419,7 @@ class ChannelBackup(AbstractChannel):
self.config = {}
if self.is_imported:
self.init_config(cb)
self.closing_detected = False # not a state, only for GUI
self.unconfirmed_closing_txid = None # not a state, only for GUI
def init_config(self, cb):
self.config[LOCAL] = LocalConfig.from_seed(
@@ -553,7 +553,7 @@ class Channel(AbstractChannel):
self._receive_fail_reasons = {} # type: Dict[int, (bytes, OnionRoutingFailure)]
self._ignore_max_htlc_value = False # used in tests
self.should_request_force_close = False
self.closing_detected = False # not a state, only for GUI
self.unconfirmed_closing_txid = None # not a state, only for GUI
def has_onchain_backup(self):
return self.storage.get('has_onchain_backup', False)
@@ -735,7 +735,7 @@ class Channel(AbstractChannel):
def get_state_for_GUI(self):
cs_name = super().get_state_for_GUI()
if self.is_closed() or self.closing_detected:
if self.is_closed() or self.unconfirmed_closing_txid:
return cs_name
ps = self.peer_state
if ps != PeerState.GOOD: