AaronFiore/electrum
1
0
Fork 0
Code Activity

Refactor: move calls to lnworker methods out of the tx creation functions

Browse Source 
(follow-up f0237e46be)
This commit is contained in:
ThomasV
2022-05-26 14:49:22 +02:00
parent f0237e46be
commit 30a98578c8
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
electrum/lnsweep.py
View File

@@ -245,12 +245,11 @@ def create_sweeptxs_for_our_ctx(
# HTLCs # HTLCs
def create_txns_for_htlc( def create_txns_for_htlc(
*, htlc: 'UpdateAddHtlc', htlc_direction: Direction, *, htlc: 'UpdateAddHtlc',
ctx_output_idx: int, htlc_relative_idx: int): htlc_direction: Direction,
if htlc_direction == RECEIVED: ctx_output_idx: int,
preimage = chan.lnworker.get_preimage(htlc.payment_hash) htlc_relative_idx: int,
else: preimage: Optional[bytes]):
preimage = None
htlctx_witness_script, htlc_tx = create_htlctx_that_spends_from_our_ctx( htlctx_witness_script, htlc_tx = create_htlctx_that_spends_from_our_ctx(
chan=chan, chan=chan,
our_pcp=our_pcp, our_pcp=our_pcp,
@@ -291,14 +290,19 @@ def create_sweeptxs_for_our_ctx(
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 direction == RECEIVED:
if chan.lnworker.get_payment_status(htlc.payment_hash) != PR_PAID: if chan.lnworker.get_payment_status(htlc.payment_hash) == PR_PAID:
preimage = chan.lnworker.get_preimage(htlc.payment_hash)
else:
# do not redeem this, it might publish the preimage of an incomplete MPP # do not redeem this, it might publish the preimage of an incomplete MPP
continue continue
else:
preimage = None
create_txns_for_htlc( create_txns_for_htlc(
htlc=htlc, htlc=htlc,
htlc_direction=direction, htlc_direction=direction,
ctx_output_idx=ctx_output_idx, ctx_output_idx=ctx_output_idx,
htlc_relative_idx=htlc_relative_idx) htlc_relative_idx=htlc_relative_idx,
preimage=preimage)
return txs return txs
@@ -398,12 +402,10 @@ def create_sweeptxs_for_their_ctx(
gen_tx=sweep_tx) gen_tx=sweep_tx)
# HTLCs # HTLCs
def create_sweeptx_for_htlc( def create_sweeptx_for_htlc(
htlc: 'UpdateAddHtlc', is_received_htlc: bool, *, htlc: 'UpdateAddHtlc',
ctx_output_idx: int) -> None: is_received_htlc: bool,
if not is_received_htlc and not is_revocation: ctx_output_idx: int,
preimage = chan.lnworker.get_preimage(htlc.payment_hash) preimage: Optional[bytes]) -> None:
else:
preimage = None
htlc_output_witness_script = make_htlc_output_witness_script( htlc_output_witness_script = make_htlc_output_witness_script(
is_received_htlc=is_received_htlc, is_received_htlc=is_received_htlc,
remote_revocation_pubkey=our_revocation_pubkey, remote_revocation_pubkey=our_revocation_pubkey,
@@ -438,14 +440,20 @@ 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: is_received_htlc = direction == RECEIVED
if chan.lnworker.get_payment_status(htlc.payment_hash) != PR_PAID: if not is_received_htlc and not is_revocation:
if chan.lnworker.get_payment_status(htlc.payment_hash) == PR_PAID:
preimage = chan.lnworker.get_preimage(htlc.payment_hash)
else:
# do not redeem this, it might publish the preimage of an incomplete MPP # do not redeem this, it might publish the preimage of an incomplete MPP
continue continue
else:
preimage = None
create_sweeptx_for_htlc( create_sweeptx_for_htlc(
htlc=htlc, htlc=htlc,
is_received_htlc=direction == RECEIVED, is_received_htlc=is_received_htlc,
ctx_output_idx=ctx_output_idx) ctx_output_idx=ctx_output_idx,
preimage=preimage)
return txs return txs