AaronFiore/electrum
1
0
Fork 0
Code Activity

allow transition from FORCE_CLOSING to REDEEMED. define REDEEM_AFTER_DOUBLE_SPENT_DELAY

Browse Source
This commit is contained in:
ThomasV
2020-03-06 11:40:08 +01:00
parent 28452e2d46
commit 15fb8c0415
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/lnworker.py
View File

@@ -704,8 +704,11 @@ class LNWallet(LNWorker):
return chan
async def update_unfunded_channel(self, chan, funding_txid):
if chan.get_state() in [channel_states.PREOPENING, channel_states.OPENING]:
if chan.get_state() in [channel_states.PREOPENING, channel_states.OPENING, channel_states.FORCE_CLOSING]:
if chan.constraints.is_initiator:
# set channel state to REDEEMED so that it can be removed manually
# to protect ourselves against a server lying by omission,
# we check that funding_inputs have been double spent and deeply mined
inputs = chan.storage.get('funding_inputs', [])
if not inputs:
self.logger.info(f'channel funding inputs are not provided')
@@ -716,9 +719,8 @@ class LNWallet(LNWorker):
continue
if spender_txid != funding_txid:
tx_mined_height = self.wallet.get_tx_height(spender_txid)
if tx_mined_height.conf > 6:
if tx_mined_height.conf > lnutil.REDEEM_AFTER_DOUBLE_SPENT_DELAY:
self.logger.info(f'channel is double spent {inputs}')
# set to REDEEMED so that it can be removed manually
chan.set_state(channel_states.REDEEMED)
break
else: