LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
electrum/lnchannel.py
View file

@ -99,6 +99,7 @@ state_transitions = [
(cs.CLOSING, cs.CLOSING), # if we reestablish (cs.CLOSING, cs.CLOSING), # if we reestablish
(cs.CLOSING, cs.CLOSED), (cs.CLOSING, cs.CLOSED),
(cs.FORCE_CLOSING, cs.CLOSED), (cs.FORCE_CLOSING, cs.CLOSED),
(cs.FORCE_CLOSING, cs.REDEEMED),
(cs.CLOSED, cs.REDEEMED), (cs.CLOSED, cs.REDEEMED),
(cs.OPENING, cs.REDEEMED), # channel never funded (dropped from mempool) (cs.OPENING, cs.REDEEMED), # channel never funded (dropped from mempool)
(cs.PREOPENING, cs.REDEEMED), # channel never funded (cs.PREOPENING, cs.REDEEMED), # channel never funded

1
electrum/lnutil.py
View file

@ -135,6 +135,7 @@ class PaymentFailure(UserFacingException): pass
# TODO make some of these values configurable? # TODO make some of these values configurable?
DEFAULT_TO_SELF_DELAY = 144 DEFAULT_TO_SELF_DELAY = 144
REDEEM_AFTER_DOUBLE_SPENT_DELAY = 30
##### CLTV-expiry-delta-related values ##### CLTV-expiry-delta-related values
# see https://github.com/lightningnetwork/lightning-rfc/blob/master/02-peer-protocol.md#cltv_expiry_delta-selection # see https://github.com/lightningnetwork/lightning-rfc/blob/master/02-peer-protocol.md#cltv_expiry_delta-selection

8
electrum/lnworker.py
View file

@ -704,8 +704,11 @@ class LNWallet(LNWorker):
return chan return chan
async def update_unfunded_channel(self, chan, funding_txid): 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: 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', []) inputs = chan.storage.get('funding_inputs', [])
if not inputs: if not inputs:
self.logger.info(f'channel funding inputs are not provided') self.logger.info(f'channel funding inputs are not provided')
@ -716,9 +719,8 @@ class LNWallet(LNWorker):
continue continue
if spender_txid != funding_txid: if spender_txid != funding_txid:
tx_mined_height = self.wallet.get_tx_height(spender_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}') 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) chan.set_state(channel_states.REDEEMED)
break break
else: else: