AaronFiore/electrum
1
0
Fork 0
Code Activity

lnsweep: do not redeem offered HTLCs unless payment was received in full

Browse Source
This commit is contained in:
ThomasV
2022-05-26 11:59:29 +02:00
parent 672326bd12
commit f0237e46be
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
electrum/lnsweep.py
View File

@@ -7,6 +7,7 @@ from enum import Enum, auto
from .util import bfh, bh2u from .util import bfh, bh2u
from .bitcoin import redeem_script_to_address, dust_threshold, construct_witness from .bitcoin import redeem_script_to_address, dust_threshold, construct_witness
from .invoices import PR_PAID
from . import ecc from . import ecc
from .lnutil import (make_commitment_output_to_remote_address, make_commitment_output_to_local_witness_script, from .lnutil import (make_commitment_output_to_remote_address, make_commitment_output_to_local_witness_script,
derive_privkey, derive_pubkey, derive_blinded_pubkey, derive_blinded_privkey, derive_privkey, derive_pubkey, derive_blinded_pubkey, derive_blinded_privkey,
@@ -289,6 +290,10 @@ def create_sweeptxs_for_our_ctx(
subject=LOCAL, subject=LOCAL,
ctn=ctn) ctn=ctn)
for (direction, htlc), (ctx_output_idx, htlc_relative_idx) in htlc_to_ctx_output_idx_map.items(): for (direction, htlc), (ctx_output_idx, htlc_relative_idx) in htlc_to_ctx_output_idx_map.items():
if direction == RECEIVED:
if chan.lnworker.get_payment_status(htlc.payment_hash) != PR_PAID:
# do not redeem this, it might publish the preimage of an incomplete MPP
continue
create_txns_for_htlc( create_txns_for_htlc(
htlc=htlc, htlc=htlc,
htlc_direction=direction, htlc_direction=direction,
@@ -433,6 +438,10 @@ def create_sweeptxs_for_their_ctx(
subject=REMOTE, subject=REMOTE,
ctn=ctn) ctn=ctn)
for (direction, htlc), (ctx_output_idx, htlc_relative_idx) in htlc_to_ctx_output_idx_map.items(): for (direction, htlc), (ctx_output_idx, htlc_relative_idx) in htlc_to_ctx_output_idx_map.items():
if not direction == RECEIVED:
if chan.lnworker.get_payment_status(htlc.payment_hash) != PR_PAID:
# do not redeem this, it might publish the preimage of an incomplete MPP
continue
create_sweeptx_for_htlc( create_sweeptx_for_htlc(
htlc=htlc, htlc=htlc,
is_received_htlc=direction == RECEIVED, is_received_htlc=direction == RECEIVED,
@@ -441,10 +450,14 @@ def create_sweeptxs_for_their_ctx(
def create_htlctx_that_spends_from_our_ctx( def create_htlctx_that_spends_from_our_ctx(
chan: 'Channel', our_pcp: bytes, chan: 'Channel',
ctx: Transaction, htlc: 'UpdateAddHtlc', our_pcp: bytes,
local_htlc_privkey: bytes, preimage: Optional[bytes], ctx: Transaction,
htlc_direction: Direction, htlc_relative_idx: int, htlc: 'UpdateAddHtlc',
local_htlc_privkey: bytes,
preimage: Optional[bytes],
htlc_direction: Direction,
htlc_relative_idx: int,
ctx_output_idx: int) -> Tuple[bytes, Transaction]: ctx_output_idx: int) -> Tuple[bytes, Transaction]:
assert (htlc_direction == RECEIVED) == bool(preimage), 'preimage is required iff htlc is received' assert (htlc_direction == RECEIVED) == bool(preimage), 'preimage is required iff htlc is received'
preimage = preimage or b'' preimage = preimage or b''